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 001/216] [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 6490dfe252b292..dda9d85ec43c5b 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 002/216] 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 0268846772f2c4..2e078e3404fe60 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 d340aaeeef25e0..649f8ef077e3f6 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 00000000000000..d72eef080923dd
--- /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 32f9f37b9ba53c..4b46adf399363c 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 d622af2f663a14..c1b1619abd2479 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 baeb1587d57a9e..4eba0576ff2352 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 e4f297b29c3728..09b79cae4aac2a 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 4e484dce7826f0..e81ef1d6b2482e 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 8874ce5f04b7c2..0ad9ae8f2014f8 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 a771113acd2310..7a230c20f6cd02 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 ee0b0714febc0b..3bc19a578a4170 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 f8a108a5a4c58f..261f16229460ac 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 003/216] [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 ba7eb598c120d2..0674e5b35c61fb 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 5e29fca3971806..90d8da346c71d4 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 004/216] 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 7528b00f926d02..2b4908c156e51e 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 78a1df0b9c1c78..3ffd58b945ddbb 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 76b3e8e39791a9..0c4d9096aa31ab 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 8adaf9f1219319..9cbc2373ef9433 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 2dad6f2c425e55..3f8341df3d2950 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 1712c31187b029..83ad17757f3a6f 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 abebb2650ad08a..d82d116396cd65 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 54484ba34636fb..7b2e5f14fc4b65 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 005/216] [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 9c514e429c3747..28030dd509835e 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 d9bd3e59d281f1..f6eb131a8a733b 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 2090a92bf0de4c..ed8d865d2d2889 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 c13439a3c5928e..48ebc2add00539 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 afd2d023d16bad..54a08e9d45af50 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 006/216] 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 35dd462d88425e..63ebb47dfc5734 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 2a278a251c30f0..8cbc064c1c90ce 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 31eac38222afbc..5986374b338cfe 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 3befadc3ca5a31..be97231fdca469 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 e471f8322f164a..ce606af086893c 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 ef2aa62c4a7de5..9bb1d679938edf 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 1ed9898149a679..d021038fda94fb 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 4d3445d469da2e..a0bda245d667b5 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 c6ca7df4cc3e77..fb1a2d97672b01 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 ee8d7cc55a9f19..68281fc11f3402 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 712d0106459b1e..c35a5b463f5732 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 9d62c67460136d..5c4c53b65b6dc2 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 007/216] [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 a4d42bcf51d01b..e1b5ffcd0e0f5e 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 00000000000000..833937835f8704
--- /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 1fd0ec761b1aec..7daf1b798749bf 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 c9b29e8692f447..204c5e9ae6da2b 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 441a51bcba646d..44e5e09e506af2 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 6fd139b470ce15..501ca6d33d5af1 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 12676b7c15f1c0..392bd90ffbabc9 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 008/216] [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 7a5d84da527dbc..948e2357effb04 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 009/216] [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 edb5dda2ca6da7..a188eb7619e6be 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 43271dc40ba126..4a7bd02d0442bd 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 96b0343efdf720..35f51b3c65f950 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 600bc999849d1d..3a0a5b04c58740 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 d72891fad8f537..8b795fca415125 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 af9d2b0ffefe30..9a971e0087d122 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 6d70795c422d93..609f690903bf28 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 67dc1d50eefcdb..f77485f39a98d4 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 0f4b8d1472b3fa..8fdbe282eece5d 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 6c443fed3c99d4..02badd3ccee8f3 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 013afd5cd58f5a..dfe45a00e05132 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 10678dc033eb5d..293a487777fd21 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 e7c86e1d3d66be..90781e7b48b4ae 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 93ffc35161fa96..be0b8fb64c76aa 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 7cb8b76e7b5244..14a9c5e33aca0f 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 82f16ff58d135e..f6921ddcdf508c 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 3d72f98f35355c..a9101f54ada55c 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 233ba70968fa18..f0f4ba07ab2ae0 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 010/216] [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 8c2a46f80a3a8d..a07d0830907b6d 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 46418e52d85484..84f6f30f064f9e 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 740555fd87897d..b80d1365659dda 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 c5e080e3c81758..e1ee1153a28ac5 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 dac901f4963048..b3cef400089b03 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 b7c494807672e3..9250a4499662f4 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 992a186d41d784..247130f4895bb2 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 5101e64235c626..d113b465fdf2f5 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 4d0906514b5e17..d3e2d42f972a9b 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 703ef6584f1647..687099541b3d28 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 6e09764ec763b0..00000000000000
--- 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 011/216] [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 e5037a6477aca4..acf642f250a7b7 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 ebe1c12e2a0797..6365bb8caa9631 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 06829e6ef6f1e3..36feb3f6203c80 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 4fe3d5c66696e9..81c30579cd4dde 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 14b0e72317c666..f7f8b30324bcad 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 6319fc0d68543f..61c197f2ba1496 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 00000000000000..3a19f03547b5b2
--- /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 a3278b6c231b94..9db40ebf5521f5 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 c9732f2311758e..11b743ecc4bb65 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 576483a5ab9c28..0ce2c0d7ea5663 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 aaf4aa6e6222d4..66cb4ad9fba32f 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 0034de85fce17e..1da7508049f247 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 e7f20a66d09f09..00000000000000
--- 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 00000000000000..359134e015f7f2
--- /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 a29ecd07c5e45a..00000000000000
--- 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 00000000000000..6cffde577b35ee
--- /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 5f15d929a4916e..00000000000000
--- 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 babbbf7638ebef..fb32752fe24ea6 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 0143cc4af24e33..d3c73090f25f2d 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 dbd48f3a856345..22f0114d16afe4 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 6ed81bf8f45d51..f7b8c60a5c71f1 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 500ab44d966941..ec1cdb987f4b32 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 61de37bbfad11a..b80e9e70c54faa 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 12b53ad1eaf524..00000000000000
--- 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 00000000000000..d9ed7a0bf51eb9
--- /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 00000000000000..70e7c21da8cb68
--- /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 00000000000000..34ac8f3e270e6d
--- /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 0bb6543482bd68..12df0715449528 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 00000000000000..3953521df18179
--- /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 00000000000000..545488be2cd5e0
--- /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 00000000000000..2e2ed5b38bb871
--- /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 00000000000000..3ca1a1cc83371d
--- /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 99e6bfb99472c3..7c7c0b70c0eedf 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 d71e38d0b31dee..b38a7347705466 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 28719fde87b0c4..00000000000000
--- 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 ea539578c885c6..fef79c7782bb05 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 45a8e63f70e835..00000000000000
--- 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 aa20c0eb1d3262..d47136679604fd 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 a8f7fd3f4bdfa9..00000000000000
--- 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 8534893e7e3b38..00000000000000
--- 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 1f5b5c399a642d..00000000000000
--- 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 abf6db416c7f4a..00000000000000
--- 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 f5661eae91a8ca..00000000000000
--- 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 f02ac2096675fc..00000000000000
--- 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 fcba2fd1358b01..00000000000000
--- 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 60126b85c313e8..7fe7134f5f5db6 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 383e61b5aacde2..00000000000000
--- 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 a94e875a71845e..ca9d59e295a29d 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 2d01749be30873..00000000000000
--- 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 ea539578c885c6..fef79c7782bb05 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 03538fad9aa83a..00000000000000
--- 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 72bfd4b15a78ad..00000000000000
--- 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 5bea22f0b3a76b..e1c89314a2ec56 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 012/216] [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 d9de7951a86f4e..51a9377b9fd04e 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 a39c9f18bcdb8d..f041e1fd82a9f5 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 f1a933fb34d663..a691dd98e70815 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 00000000000000..409f82c9d1560d
--- /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 950a61db33f177..ed8a5129c7ff6d 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 b79b7df48a6de3..a6520c8f0e06f3 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 97d97700b11aee..33f7a1d97db139 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 d9a0bf291d0e43..bcc420435e5d9d 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 c64ed608339b67..8a5344e0754db6 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 3913b96b3e11a1..fd1ff566a77198 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 c715a0aaa3b207..499983561e89d3 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 79665b6a393df7..4afd71fd67a69c 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 853265ae6e5deb..3da30442835564 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 013/216] [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 84316a1b9105d2..9bab590d1f5ea9 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 014/216] 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 2562657a716244..7de5fb581643ac 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 5da3ce1a84408c..79ecbb238314a2 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 00000000000000..f92ccf848f4093
--- /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 e2c544d2d0ba65..f4684e1c60349e 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 00000000000000..9c404676b9ffd0
--- /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 118362f494b474..0b51c00475d7e1 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 de1f206118447e..d520f63fe74845 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 015/216] [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 00000000000000..e8e0e583a7c6da
--- /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 00000000000000..1ccf890597edc1
--- /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 58f0bf16e93f22..485b0ed7682fad 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 016/216] [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 d86901c41e4366..a91113ab2d1c41 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 3ffb1afef7469c..0083881e9f7487 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 017/216] [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 ad4479d3a324b2..fa614ae87b2905 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 3f6edc81e30ef4..a2dfdc94d8058c 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 47659e055936e5..826acd41e27a99 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 018/216] [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 654f4dce0ebf3c..a0d9352ee9f82a 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 b261c83e30ddeb..8582a003c6fa88 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 53f3a7a274429e..9ad649c292fb7a 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 d0f5893bdb88a6..fa4decccb34b10 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 4c5efce9baf129..53549cfcdbce7e 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 fee966a56923d0..e4531ff03587b0 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 6aa3e1e608bfe8..134fc9389694dd 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 0f4f6c65d083c5..ada89c33be7e29 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 019/216] [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 b2a59788b50f9a..e4dfa698137439 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 b8986cea48d4e7..3f75b5ad866695 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 020/216] [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 5bab2e3c789705..ca17d331c67e58 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 021/216] 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 20bc1387a3c4e7..e8883111c95f64 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 bb0a4b9e2ba9b4..777b1cf3bb80d7 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 5f002aa7fad7b7..29944edf382f43 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 6ec15d328714d3..58627a199a1814 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 2b7be8f4b7539e..722589ce7e2bb4 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 022/216] [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 25274928aa2b7a..a8be0fe97524e6 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 6be1f037f967e1..f2032b5bef2180 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 d5b069f7b81e79..306a38f5d2a28f 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 b22b74ebc53bc2..c80f24a21d958d 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 e2ba81da917b3e..4d4f10bbaa5997 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 4f4a9aacd79aae..3c34b04a77a500 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 5bcc4a00ccd820..3cdfac92572b19 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 a17fd6d2702ddc..2d26d867b8718e 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 cf09bc512916fa..60ce575148f4c1 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 0c82444dd9397b..50213b9f1a42c4 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 c76c5f20fa88bd..026735f413eabd 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 b38ed94e132e1f..85d8bdcb2582f4 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 229a03de396008..d107c0b2620919 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 4800e87c180e2a..6fbf9ca800f795 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 075dd13d9819b6..0d47aab2c64bde 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 133863f8e2148f..df7fc85b63d4ae 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 85d348bb14be02..aa4674f75bcd09 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 38482c0a70fc94..da7d91933bd2a0 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 7db683caf2bb22..8e4f7366a7657f 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 1c4666955dde08..4f353a6ff9e6f1 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 c375ea7b19b376..5b02f63a1c7f70 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 22090e1a241e7b..8ee2d4fda7bf84 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 00491937e9aae3..f5345b2276e8a7 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 16a398011fc536..e66968a50709e8 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 11781cb7195999..ad751a10314378 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 7d931725fa6ebb..5b5f69a0aef744 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 1bffe7a1cfc248..6025fc5ca6452d 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 f3cc5c2eec8a32..8a504281b03f76 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 334276142ca428..2ae938bb34104d 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 0e4bea426c5913..af9c4b5409964d 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 6ac2bbf355961b..f1a214b7cd436e 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 e73aa5f4566a7a..d913a92e2ee0e3 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 00171867871390..a8b34362d95793 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 0ba6480fe42a10..46208f3753fa14 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 2d3edb0f5f6cce..c619d8f764bc42 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 3a4b4915f3c8b7..140212e4148eb8 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 a2eb76b9831f0b..963c6b2e53ed64 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 e43ab9de86ef76..7b20cefdc67f0a 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 9d480259d49de5..629efa90a71ea9 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 cdef5f16e5cd76..7af823070889f4 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 d501bda08c3a54..1dc75575636fbf 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 e82b42869e44d8..9b6ee099116f39 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 e4c84fd3c3b83d..f647d8d00e0844 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 3aa9ac20bba9e8..d9c26a9c26cc97 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 0a1ba97bd01ea4..b3b6a2b0c7fab2 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 7305247192f57c..6d7f11f01fae02 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 7ff8eb9424d5fc..005a0c38c8a8b9 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 e923407765f8fe..74e21c7d174792 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 24a744ce308322..adf1a76bfb9011 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 529f2199e46dc6..11041593506557 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 69a25b3b24bace..854ecc40d76abc 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 cae5d1b7e0f1fd..d9dcbfe25a4c2d 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 8a68b26abad200..e4014b22a6c091 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 2ea75dbd758cb8..e4804329c0f307 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 4379759608aba3..30312987d166c3 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 24104439cd0ec0..3a5c4d9e69d496 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 73bf20a5a175e7..63c82c5662df66 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 1895caf4dea812..37d5468c773bf2 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 ac46bcbdbc083d..bce10f640691b7 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 2825dc28ad18f6..5d9e338425bdae 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 234a09e9607b9b..bd019c9a80c4c5 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 759622804444e3..f0bbc892d7d9c4 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 cd38aff3f21642..fac03d31b57bfe 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 7fcb9f915c5608..c1b782d612ccbc 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 3392a1bff23b8c..a4c62b98fb0609 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 e76379d171bf7c..e3dedeef07eb56 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 b9e7f941ee5dff..8b81789f6aa8f9 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 0cf6fcdb3875a6..2aaf0012acabf5 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 59715dae441f49..32d78480325e62 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 7465751d5cd49b..3f2e00f0976de8 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 9550eea6ca6aa7..bb0856c0452d53 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 343426953add6d..4cf60d2c9d0def 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 44b50c74bafe62..73a804fcbda8f1 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 50692dae3856fa..740ff47e5abe5d 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 8f938c0ceee6d2..c6c5cbce2c095e 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 023/216] [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 8291b673cd17a8..f17bf172b0fb18 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 0777b9b9d8e573..f7adf91e307da4 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 bca179b437521a..3ee109376d975b 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 af2ed97ad81254..30a92c21ff6610 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 0ba7b7df97853c..900cd02622aaf3 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 5489dcffc52c4e..663d7c18bb370d 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 738cdd611a7ba3..92e35b257f24ad 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 d80bf779a5d17f..660be9514a92f3 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 24906790a9fc9c..585a1281cbf51d 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 869eee67d381dc..31e6240993d365 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 48a6079c58ac0a..ac6bf63c371104 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 2236bc576e2b66..57454291d43c56 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 ef12fca690f0c3..8ef53c1e0b4258 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 e6c8a5f6ac8520..4c37d95f6b0509 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 05bb2ef6738888..2972ed2d0231b6 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 ac1ff9da2fea08..c1b19fd5549e75 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 3fce2562f528e0..4ac3fc89500f91 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 d7fd0d3661c86e..7b6eb11efc4943 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 9473a1523b8ca7..1b87c48dc7193d 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 95cc47e68f8a15..c101f1354b703d 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 f2dcf28c017433..d1ecf8fa0973a3 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 00000000000000..f6882c8aed2144
--- /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 00000000000000..268b98542fe115
--- /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 00000000000000..f2a29f022ff5e4
--- /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 00000000000000..36dc10c05f0b97
--- /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 00000000000000..0e47a632bbf3f3
--- /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 024/216] [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 521fbf209870c0..f11d6cdb8d26d8 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 57f27ee76184b4..76ffada510e51c 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 e986fa37c2b2c8..4ad654614237dc 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 65cc4a6c4a704b..de72ac5c5a574e 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 fece2522de574f..a543f95bf4ffb2 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 85781c48f95129..ea9494c7073d4f 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 025/216] 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 8dc81dceaccd61..0150554a609065 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 d29120e6ee9ace..ef9a682d609ec6 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 9cfe99fd3bbf83..4339c2fa13c0f8 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 026/216] [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 d489970b55f29d..e49899da85e0d0 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 8101b01a83b08b..f413610ebd9844 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 8214c081e6ce16..3b6d1684e08e1c 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 217e6a30a33b4f..a750a9ea7af673 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 fa4b8b821f9f8a..29b2a77df348eb 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 c57769e9e15dae..9f5b5cdf475526 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 e5c573ba1ec021..551384da2cca78 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 f6e201b395c377..a42a10d6518a01 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 d4e0bd1d54da1c..ec2d8144cf3ffc 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 7248399d1f93f5..fbdddea32deb4f 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 9ff45ebdbb21b7..e448729f44a98b 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 027/216] [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 2f57566159a700..818f9805628e17 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 e87699825b4e1d..2e69d3625d7ff0 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 00000000000000..83866a2b6afec0
--- /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 803bc7f13f59e1..b238c5aa346adb 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 fc933b6c7fd355..bf1d5ffc1101ee 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 dbdda3f38afd5b..a101210185a638 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 1b4ed21a1635cf..0517cb9034d0aa 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 bce5dd7f58643b..f945402ec5fc2a 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 212b06a4c98954..c1424785b22a54 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 00000000000000..0ec8d2e15c34a8
--- /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 d58a89db97d740..bdf10b5e549193 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 00000000000000..6efe8725535838
--- /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 1f22ab01001010..69137681e0597f 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 c306446b9780d4..acd575badbe5b8 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 028/216] 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 99361107047c27..82d6bb9be15f67 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 029/216] [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 46fc002e76e7ff..be3a1e82356c8b 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 7340b1c021eba4..0955f196df176a 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 f3e67f84b2880f..311aa0c04c9abf 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 016ebfa0faee40..dee53a624baff5 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 5c92b23d594de7..3ec968e4a0e1a1 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 830d92ef2efc0c..8e641194ab8994 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 9e5c6be43f7289..80d21ae1182842 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 feb4a404b2359d..54c6cf432aa89f 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 abc86826e77dd7..0969a3c360e4ad 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 ae17cf4c3a562f..efffbc10473d42 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 849dbc25fe4db9..8792f917fb4d6a 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 43c10d552ab4e1..1b88f965909ebb 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 4daa45aec2a740..8e567bfb59c650 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 f6ff4451b5d8e3..4a6c65e55a6b66 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 00000000000000..82d844aae80161
--- /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 00000000000000..92d14fb94a2d89
--- /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 00000000000000..c0e4e466c7b62c
--- /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 dc9a1fab9ec020..fc603af3619a4d 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 f4836379ca273f..957d559087f5e1 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 030/216] 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 63a44b54d454f0..42cee6ef0e58a7 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 f4b7ae12299093..348412e593d9e8 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 72054b1628fc20..04771b34bf69ff 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 eaa35eece5a2c8..10e603a8da8bbc 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 c3b7847b0f8bab..44897184f88f25 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 031/216] 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 382bde510170fd..b0f98f807fd44b 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 fdd694e73394e3..003d842cc3d6f2 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 032/216] 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 d3d4fe054ec348..0e8775fa611b5a 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 033/216] [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 03051ead357c96..21f82c6ab4c986 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 6ff218ca06059f..c724e6a2c711fd 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 a2c8531def2ba4..41fc6ba57d715f 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 00000000000000..c9efa5e54dccf6
--- /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 00000000000000..a2419ef16df3ab
--- /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 13e9d0df549f8a..484a3d593026e1 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 6611ee2385d108..46923e07d225ad 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 9d45a411b51302..be289b0e85e66b 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 39d88bd8e4724d..f20a58b9ffa36a 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 0d367e03a799f3..944631d4e9fb5f 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 7482068454a97c..c97895cdfe2363 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 00000000000000..6b1938655dc33f
--- /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 00000000000000..dffba3e6e04368
--- /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 034/216] 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 3eefd3e665cd62..593ada470b118b 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 ab824957087fc1..2eb34529d044c5 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 00000000000000..6569a641de3a2c
--- /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 b0c855afa8be99..b29d15f5e5c727 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 0e859ecef31c6c..b5cbf80b084f79 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 00000000000000..24688512370472
--- /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 a480e63ff4a923..779205377621d4 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 604133a1c2dc7b..4cbbc142edd40f 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 035/216] 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 21f82c6ab4c986..03051ead357c96 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 c724e6a2c711fd..6ff218ca06059f 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 41fc6ba57d715f..a2c8531def2ba4 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 c9efa5e54dccf6..00000000000000
--- 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 a2419ef16df3ab..00000000000000
--- 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 484a3d593026e1..13e9d0df549f8a 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 46923e07d225ad..6611ee2385d108 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 be289b0e85e66b..9d45a411b51302 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 f20a58b9ffa36a..39d88bd8e4724d 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 944631d4e9fb5f..0d367e03a799f3 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 c97895cdfe2363..7482068454a97c 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 6b1938655dc33f..00000000000000
--- 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 dffba3e6e04368..00000000000000
--- 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 036/216] 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 72ec73ad810e6d..a82ca011b8a5df 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 037/216] 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 a82ca011b8a5df..72ec73ad810e6d 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 038/216] [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 b4af2310243701..1e5632719fb72c 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 039/216] [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 3b964588bef199..75d48056cf4584 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 040/216] 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 597bb9bc2376a0..ccc73d4fb858ec 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 c709c74497bd0f..00000000000000
--- 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 98d7b0610abeab..e9bc19e9c92a98 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 4d111c8f20887f..76e4f222f02285 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 0d7fcf3b10bca3..18760170afa1f2 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 f33176a32954d4..00000000000000
--- 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 99ce4cb08af479..00000000000000
--- 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 00000000000000..2a480a7a3954f4
--- /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 00000000000000..641d95cbf94117
--- /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 bf40eaee206365..8bf726b4a6388b 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 3b1087d72c677a..06fd250ebe4f93 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 d7c1b3331c4479..6a0b1122c70534 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 f10d6370c09d15..dc040ccb736159 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 ad57041a124c99..57a26d5ea3c797 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 3132f639e536f9..d162c9d8e364b7 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 36f0eb73b1de7b..0267e069399972 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 76bcf5f7df665b..5c91d5a8c73ed6 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 4f4bf50f07b8e1..6780ca6b59f4d7 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 f8f04c59766b38..45869fd12d2b4b 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 f39282a6f9cb0c..adfdecdd7c9761 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 bf9dcc4abe01c1..3c79706422cd43 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 70413757de9da2..4894f19e38df42 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 5e765a9632e55a..2b5b8ad071fb58 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 49c129d0ae67d7..5a216b75a83b9a 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 4f26686e1f5e0c..1108ffc2481615 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 ebd068caadfb9f..578c5f39d71ea1 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 62058f6d478e7b..fa2659ca130a03 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 aa77335991e2cd..5e613343c302fa 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 06de48a215881a..30cd47c9d44e17 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 9695c9171a7714..eb2a9ca3daf5f7 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 cd7f4973f886c0..6186906bc3a42b 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 82d0c095bfe95b..471e482a20e962 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 aff749ca975342..cc6d8171e7a037 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 176c5386961a54..722d75d00f78fc 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 1353877fa4629a..4439a4fb9fdbbe 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 13da0a3c9242e2..8bd43b6be0a8d4 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 043435c48a211e..501c96b12fde86 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 ca07fd84523728..088598829a3e14 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 70295046d19f41..d7dcf779376bff 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 041/216] [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 78e6a11fa78a47..19a5c2dc087625 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 042/216] [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 66423259ec1556..07e69d850f1732 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 a425f9b49add0d..560d4c6928e4e4 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 15fa13b1a08f12..8deda03ece70eb 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 043/216] [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 2cfe232bf5653c..fe959e570ab986 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 c02a763c401011..f101c30a1241b9 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 3da3caaaa4a4f8..0624d66a9598bb 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 ff260f7dc42fd8..9d4df065a0a4fa 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 cc9bfb1db04d5e..1fb7c284c0dfda 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 8cf9b9c656d8f2..0e49fe17089f0b 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 d8853015d362a5..4afcba14abef48 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 da18eb70e5874c..2aabacb061667f 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 45e359679056fd..6561269630d9c7 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 35f6dd65925bad..188b11177eaec6 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 a233b3debab8d0..cc59f52b1f30fb 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 031aa00eb6613d..ca43e4f258adda 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 03b65a8bd145c5..f3421aefaf38df 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 62202d5e1e438e..a386167b7a193c 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 a788b06f919058..8b9b92faf90316 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 80e14702c6f227..5443bb261ab10b 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 00000000000000..a9457a9d3307cb
--- /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 627bd10d7c2c83..5d71bf8651d88a 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 9178d0e08f3e04..00000000000000
--- 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 4fa04bb64b1777..1b10756c2975c3 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 d757d6a8b73051..190985f70659d4 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 836b34227a37c2..e588edfe352406 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 4101f6519829b7..d9b7602971e8dd 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 870099ffb350e4..a0547a45885611 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 00000000000000..389d8c8b3bf0f0
--- /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 00000000000000..be693707e06b4c
--- /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 49e71f159fe6ff..3eac2bc9705e01 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 c35b7b04932fbd..00000000000000
--- 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 9457f766409b8f..00000000000000
--- 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 00000000000000..787802e508ca7b
--- /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 00000000000000..e76e8348022844
--- /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 00000000000000..82f0020b1b3895
--- /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 00000000000000..a7d465d1776366
--- /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 6e78af7f42f52b..61d85c033b5448 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 e9ab348f164c72..36ececcdfd8df5 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 f8769bfd0d6187..6c44c15faf4bf3 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 3bcfce513cb125..0d7596d92a5a14 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 648915b6dae0c5..90e549c873436c 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 00000000000000..de620271243d12
--- /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 00000000000000..2845e3bd120234
--- /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 00000000000000..5d00370caf2cce
--- /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 00000000000000..0dfb4f949f0c73
--- /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 00000000000000..4e8441bd64b117
--- /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 00000000000000..88db2f82984c1a
--- /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 00000000000000..7015ebb40a71d4
--- /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 00000000000000..6ef3cfc8ec1a25
--- /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 00000000000000..3a66c29649b3fe
--- /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 00000000000000..c2ae2f82eaa462
--- /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 00000000000000..d933e100eabc6e
--- /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 00000000000000..fb833a40807d21
--- /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 00000000000000..17d721cc96c02b
--- /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 00000000000000..1a78a6c71030a1
--- /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 b6fa85db2bfe90..fbe3bb3ed6769f 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 89b7a0a2fbce01..3d9e1809c7cd5a 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 948024ae85dda4..49a4c92a24ebdc 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 dc48332e052de0..4459d187eead7b 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 0b83c4caf1b30e..0ebba06e6bea92 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 6859d916a61afd..ba2f537e7c5de4 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 d7b87adfff78b1..23f36cef89ee67 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 34095848dbd2cd..52c0ac9a500269 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 c70fc0464b1315..766afb11a87c04 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 1e5021a3ad0bed..ddefab90c0a368 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 308e006b5aba0a..1a9e6be46bd555 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 8be130b4028c6b..cd65b7adfeadd6 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 0270c1d8f5d398..a7a8f11034b7d7 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 47d445e63b9428..ac30c634097600 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 29d6f978bd05e2..7e5cafd3ceecca 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 bf0e0dd7f56f24..e8f8982d7163cc 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 ee89abf59ee236..6cc3bb2a2c7e15 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 dd07f5958d666c..8b95c412e4c1c1 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 cf729fe0ff3010..27662585d01fac 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 68fbec3e8429d1..dbd93de6b50e01 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 41506bdd71e3c4..82237a5ddffed5 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 0269774a446c1f..b02fb9db286126 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 9a2daefcd8c6e6..063c7a6a1fa19f 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 881fe02af5b09c..1ce6bae8ff6031 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 770ea8d420c20e..a0d3a57eabb7a0 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 5b2566ffab7c02..e452b74ab35e87 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 1a9f133b846fb7..f8992876427860 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 0ca62c10f55f39..645a78bfc99b8e 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 178884a7ee6790..65db00f1e68c18 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 06394c2aa916c2..08ffe520e53d5d 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 2dda664a7f675d..8a1264d254e40f 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 37217eaeaab2a7..0e6e208df8a53f 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 a1494a023201fc..20a276dbb4f411 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 3e32cebf19ac22..b75e831ac875cd 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 ab0a2ba24ba663..3a47da9fee01f8 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 a8cc7b72eb17f2..9f4aa2e18000d0 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 ce1659176faaf7..4321dca7102a13 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 59f92ee0a7ffca..3cd73d90bdd16f 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 d554d159a196fd..b30c155d43cbe2 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 6c2579bd3e4e2a..ca71101864fda6 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 9bb79f2937c684..e03a085e9bc885 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 58a2043502d279..8f29365fdca1bb 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 7b4ea5458f4a61..fc673397ef177d 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 ff59d46de758d9..4f8ceb8effe982 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 ca60de612c3d58..942e9b7f33a402 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 f6d47639ef7c50..76128341e6ddc8 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 88b36b9572fc7b..05aa75f5862410 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 2a04a35830a471..834982009b9d09 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 335ce897dce7b3..aead711f2d73ed 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 a5e88c8eb7fde9..6401276203faa6 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 49545f090d9232..f42878ffac5010 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 c9afb9d4c1fb72..e3905dc2acf457 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 68352c6e584ccc..6127d22110e787 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 f46d2c65c565fd..40bea852cd59c1 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 92fc93453b9f1d..7b5c3b5337c02d 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 a691dd98e70815..1017cbb6a2c61f 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 fd1ff566a77198..d2b66207d86028 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 25ca89ce9186e0..1f08210aa41f37 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 92f3e27d6d5b82..e0a29581ea076d 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 b864e707086524..510fc33dd80242 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 15d141ccc328ea..c18a8279ce3213 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 d8eecb9c7e606c..c1282aef8b343e 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 796fa370dab255..4ed16824cc3a6c 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 0b51c00475d7e1..92cc35e9e78ca3 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 d520f63fe74845..59d0e63ef2d4aa 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 cf750434ab3243..9f7907ec391879 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 98b49af15019be..0b552613ad1d7b 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 6018c4da2ddffa..a03050bd76a71a 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 0d5c553a786fa5..d9c27d67ae3295 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 9ed1c890bf57f4..7852167fcc1cbb 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 044/216] [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 e2f0a7c06b4004..6df051e83b97c2 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 d0e238f8c5c40c..4354c735747be9 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 6ea0c36328eed1..507ce63c7b815f 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 00000000000000..7aec8e15c317ca
--- /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 00000000000000..20fab93aaf304a
--- /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 2b8de7ed16b08e..8e507cbc921a29 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 00000000000000..2905274bef1cb0
--- /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 00000000000000..872639dd9fb7ea
--- /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 00000000000000..3bd27259ad80c9
--- /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 0ec0db9f32776f..6a8d56ff41a04e 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 b5f35a198fa9e5..03754c7be7a5da 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 00000000000000..6c29a2244c203d
--- /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 00000000000000..178aa06eee8775
--- /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 00000000000000..1d4a7919b89f53
--- /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 00000000000000..2b417a4c6a8e16
--- /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 1f08210aa41f37..38120bf42fbba2 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 045/216] 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 ad071125674797..c43b58d3aa9899 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 abf20b44cd17f2..4df2f07bfcf41e 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 03c116c39dd80e..13d4ac9bbf7d0c 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 d39b1e134c9dc4..853cca035a2914 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 6c10ae9046cabb..6d799ebb0014e6 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 8f2bde3856019a..c931ce544f5d51 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 f6ffa49c2e6b27..ab9a611fc3a5c0 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 b67d0536fb3365..eb6059747426d2 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 00000000000000..f5bab09b9bcc0f
--- /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 00000000000000..87180a520090fb
--- /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 00000000000000..2117cea433b5c6
--- /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 00000000000000..2a51d4d1a514d4
--- /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 00000000000000..a2725f02066550
--- /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 00000000000000..75a57e98fece28
--- /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 70ad235fb89718..ebd0a99531755b 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 00000000000000..faa971509eca2c
--- /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 00000000000000..59ce43c4bea622
--- /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 00000000000000..76dfacf132f0a4
--- /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 00000000000000..600c56988ac75d
--- /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 00000000000000..ba4002d932f575
--- /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 a54cdac56c218e..b0320b05ecadc8 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 a76ab8e5c926aa..201f56bf925d1d 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 5703c613adbd77..e12396e9fa7b9d 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 00000000000000..97bf3c4cff8eb0
--- /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 00000000000000..69a8726b0588a5
--- /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 40e5814d30fb3b..95eeaaedf94c59 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 5b6862fa21bbc1..00000000000000
--- 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 4417a19b287929..1fea85ea239d5d 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 910de33c30e627..0aba4d517e43ab 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 00000000000000..51a47b6c2d953d
--- /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 00000000000000..f60c713973d583
--- /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 00000000000000..5131d1d01ff022
--- /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 00000000000000..4ce833f2966cc6
--- /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 d625302d97eed3..b0bda93ef8b720 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 00000000000000..0598691fbd5257
--- /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 00000000000000..55611a77aeb670
--- /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 00000000000000..6d6271e37dffea
--- /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 00000000000000..4872deb5ee0db2
--- /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 00000000000000..d1c7bc92b5cbfb
--- /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 00000000000000..18ae2ca9bee3d5
--- /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 00000000000000..6ac14455d281fe
--- /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 00000000000000..f2205d2cee4240
--- /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 6fabfb7a321aea..cebebbaf94fe68 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 e9bc19e9c92a98..89330d2a86f76e 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 c7f30b0533d049..a2255613e0f6c4 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 dffef4392c85cc..ef42053e386260 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 94d1c378899dfb..5aefc55736cd11 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 00000000000000..95bcad7ce8b1bd
--- /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 5ccad134248f64..019d30570ab36b 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 00000000000000..c182a47891f62a
--- /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 00000000000000..2b7cd5cc486a8c
--- /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 00000000000000..c327cc4a205516
--- /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 00000000000000..82f89536e41893
--- /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 00000000000000..80bd61d8906e31
--- /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 00000000000000..499398586e7dd8
--- /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 00000000000000..5cffb0c498b0b5
--- /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 7038c0c07012fb..7c1273e63d24bd 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 c5201efd0608d6..d936829443753f 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 00000000000000..14333079f7440b
--- /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 67e931f0cb3b37..15a9d99b3d062e 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 00000000000000..204342c45f64e8
--- /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 00000000000000..445979dd740d3e
--- /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 00000000000000..d2c0a397ebe8a8
--- /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 00000000000000..ca98682873033c
--- /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 00000000000000..858f171223472b
--- /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 a3e946eccb9847..153cd55c9199e1 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 a5d33de32d5946..6fc0c86b2fafc4 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 473812fcbfd72f..713e23edef081a 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 00000000000000..8d88bf1e375d4f
--- /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 00000000000000..f706f921cf052c
--- /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 bfa20bb963acbf..3d787cbe20bb42 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 7ab5662003d8f7..00000000000000
--- 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 b489b1bec26c30..01557eff549f64 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 00000000000000..23c6fe00517466
--- /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 f9da9956772bbf..6578b01ffa6094 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 e42d04c5a91808..1e9192c47679df 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 999cb73cbdfba9..00000000000000
--- 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 00000000000000..89c49471d24efa
--- /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 641934d43eddf6..52d39d981d0c23 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 00000000000000..63951d3a0b25fc
--- /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 00000000000000..e9cc92c55ded13
--- /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 00000000000000..9a3ccf4442db74
--- /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 00000000000000..a23bec3c5341f8
--- /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 64d8164a1c4a59..70693e6f43a391 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 00000000000000..66b7a268f2ed53
--- /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 00000000000000..c5acc51c3ec997
--- /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 00000000000000..5b95f7f64bfac4
--- /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 00000000000000..18a226f636b1db
--- /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 00000000000000..de6057b4729ece
--- /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 00000000000000..80cb659ef2cd2e
--- /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 00000000000000..e6aa894cd0af9a
--- /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 173b9e19321d04..9075a780bd2c79 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 00000000000000..6e44bd704d6a7d
--- /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 6c41441302c0b9..1b562263145daf 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 6b02cd910cdb18..f3a2ee38cbdbd7 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 5b02707a3c0f4d..14d3741425987f 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 00000000000000..82831eae37d7bb
--- /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 c701b0a6d9bf78..f97bf284375d17 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 f5b7c3692b0171..f06d3eb08c0ac8 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 84f6f30f064f9e..1bf6e8b977af88 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 3e4e70fb99508e..9176a277b3f434 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 17626418cbeebd..6f25f46c76fb91 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 13b4a128936664..ef7b23448ad6fd 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 209f489e291399..351020004b0e70 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 5c91d5a8c73ed6..5422cbc2180ef7 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 27c0a5205ae38b..85b3a281aef7f6 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 6cfe6f1be56698..94f727e238ecf3 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 a571f62e3d1c14..1d5ce5625bf48e 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 00000000000000..e2c48ee483ce49
--- /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 00000000000000..0d58970eee2cce
--- /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 00000000000000..88ef1bf0e02365
--- /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 00000000000000..ba5576bd05b739
--- /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 00000000000000..433574fbdbf4c0
--- /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 9cccc3942f6551..f54130be326ad5 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 1b787c7d9dc10d..f55e6bf0d2af4c 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 00000000000000..6c396e58e1a287
--- /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 00000000000000..9930e9c69358a9
--- /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 f97cc661c0bca2..047c4ae36266f0 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 5728ce8b7b59f6..6a7e5d4d9dfa40 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 00000000000000..a66fa437142d30
--- /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 00000000000000..468bf73d9b2db2
--- /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 e204cd7bddfc70..77f49e336a7b92 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 4956491a79aa91..4530c7ff427da7 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 e268e970b94acc..ab69e4fc441973 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 00000000000000..1bbc2693e4f491
--- /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 00000000000000..647386ed164696
--- /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 54ebecc7dca707..51a48dc511e2a0 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 dce044a31a577a..2182d9252cd51b 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 be55e049a2bfc9..03ae6b96e78237 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 067579f54edac9..a242ffdf5b50f1 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 a9dce65b97d72c..6efd1b28b199d6 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 2a30dcc96c08aa..89fe8ec8c09010 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 00000000000000..fd3c1e9795f9f6
--- /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 00000000000000..f625436edb6362
--- /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 bc9a66926e8801..f8ef47cae89442 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 4561f4d30e104f..2f4427b27b6bfd 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 b0669774207dd9..df89137a1d798b 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 3453f3fc803103..9311292a6a0ede 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 8fce6f49fb850c..4fac8fede0cd9c 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 61f32a420d92bc..0bc03fbcf80381 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 6a6976b513ca17..a933838cc92e34 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 3458e601e0fe62..93fcb6dbda0ac6 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 1a7dfdd2d130e7..e5f0e8abd3b715 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 c0c09b6375bdf0..145dd286c1ca8d 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 acd2c7b5284aa2..8b3eebceb2c5a8 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 ced99361f1ea00..356ffff3983435 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 33bca49e3fc58f..63d8f184ed2f2e 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 afef378b7307b2..c5fd260b78a9f3 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 6d85223d1fc880..39433981dfd596 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 28d409f7b65bb8..dd25989725f3ea 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 f916638c5251b2..85c47029e36d58 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 164756f9796a5a..ad1a08187dc32e 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 08ad72397e4a21..62e629ad33cc88 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 6de868c3202401..ddf20606800c8e 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 c7a4b7df065472..a44b21aef5706d 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 f850954e843233..ccf5ccd50bb75c 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 b209c9ca54f638..3b0789970cc6b0 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 53bb31369adbfa..47011414cbc7f7 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 812669ee108a20..347c760f841bcf 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 f9301d6598b1d7..edbdbe4d167848 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 6186906bc3a42b..49c97d837579d3 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 04aaacc3cf31ab..9abc093c74fb36 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 be52d8e6486e26..1f9f26b0ddb98d 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 6663409c259d5b..c85d66c0ac38bf 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 5a77d3ae2f663b..530dcc4648d8c3 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 96263452253ba2..84177bda3eb43d 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 7021744095651b..9ed5b1907cecb7 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 c1a153b800550e..4d7e74c2649cdb 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 4725000aa9d55d..bb7492bb9b3dec 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 86eebad7ae787b..9aa9e3e664413d 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 ea29cc4884d007..3084d40b63be64 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 4339c2fa13c0f8..09e9ac29d664bc 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 7d43158ad8878e..139f9f2e8703d6 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 9f43ecdf0673af..9ad82723c11618 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 56fddc075a50c9..67bbb46cfb607d 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 e3bb53f9e48df5..32462e1e2184dd 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 aac799da6ea67e..eddca18f9e2833 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 00000000000000..467347d95d1d7b
--- /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 00000000000000..ac8099893d00e4
--- /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 00000000000000..4b46c1244e246e
--- /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 00000000000000..ed65131b0fc6b4
--- /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 00000000000000..7949f7d18d3501
--- /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 00000000000000..c93bc9e5038df2
--- /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 00000000000000..dbe95161cbeae1
--- /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 2e545b372f781b..ead27389730746 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 cc654f9717bd64..194733433ce295 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 0c7bf64ca011d4..7733a587ca9a79 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 719729cee26025..0ce7e6e38962a7 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 3719dac24e6e70..1bc3dc80665202 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 340c0e3237f91f..d879a71cc22699 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 dbbea4012aba9d..d788a25eb7d6fa 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 1de3de8e853022..3bd5a70884d854 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 ac30c634097600..907352f52699e6 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 00000000000000..977b2099771baa
--- /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 00000000000000..367422b0bbe117
--- /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 00000000000000..5006d9df813cf2
--- /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 a59ad9012c4029..f3379a3e29702b 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 c2f807f63b1b9a..2ead55d1f43383 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 00000000000000..79ee4d649177f4
--- /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 00000000000000..667ba8a683d8d1
--- /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 00000000000000..9e00935e674ad7
--- /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 0c0f9d8feb506c..11e685bd198e4d 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 615caffd3b60b1..54cad2d54e60ae 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 00000000000000..a2c12a39705236
--- /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 237760444f04eb..b39262f0c8b3c8 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 0929de56b215e4..e074a0d5cbee2e 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 2099cc0f77bcc7..85c2d3e4b08d97 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 3625a3f9134448..7ddde312767ded 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 7aee974182497a..499f37990c346f 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 fbacfe458d9766..1666df2c83e5a3 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 aacfcd4382fac9..5380e9c3d11d8a 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 08c4327d7c0c46..c1c78570d8fe16 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 00000000000000..8eb4cd7ab9a430
--- /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 9f13e4fc5975db..a5db29a6200f33 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 a1ea65645c13fb..8b7837f80ee44c 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 ad82ea9b6fbc14..e165341dbd63dc 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 5d4ea5a6370e4a..f8d66b8ecac27d 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 3246457179f68e..a2725cbc6a2740 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 bfbc8b68c3d2cc..e4014cf49778cf 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 9df042b45a32e3..e37c7491de5dcc 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 ff1a91b00d84f6..201003629e5ea3 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 ca191602dcf446..7f7f969e8b4801 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 9fd8a732c4eaba..68fe65d204d6de 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 30004c739ee7a5..aad77f2bbcef9e 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 00000000000000..4e49a2da3e5343
--- /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 00000000000000..42fbf8954396ee
--- /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 62f9503443951b..158d7a9a43ef62 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 00000000000000..d1c3cbbd2b6af1
--- /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 9d73c216c73cec..4bc7e5cfaf31ae 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 99b4e184c071a6..dfc908d81887a7 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 47fc603ee46e82..f9b81be2d6b4b1 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 d7ded819771fc4..524361bf6ef1d0 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 0df2a7720e587f..fdc8d8c73e324f 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 255268d388eb8d..ceaa1dc9f5e21e 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 00000000000000..ce019d17ceaf75
--- /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 00000000000000..7da265d8f9958b
--- /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 00000000000000..a4ded022debe8b
--- /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 9db045f4f068af..2a8b5e660f38c0 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 f1a8f64a614491..eefd9f8ea2467d 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 77029872202825..bca07da9eae421 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 ef7931260e6436..776ed99c411206 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 28b48044a17837..9bbde31ff6feab 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 a8ecd7c7b9d9f5..b8fc89f47a3e08 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 518e89df579a64..0c07d1a5da7eb5 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 9fcc5a89736cc3..2310f6c96937ce 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 8589993a97e024..cd31a4aa17fc38 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 00000000000000..cf143dcc07975f
--- /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 00000000000000..8f135b1bced283
--- /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 00000000000000..82a30dabe5beb8
--- /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 00000000000000..c17a2dcb1a831d
--- /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 00000000000000..10cc5777cdcfff
--- /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 87af5d83629a9c..41a9c907de745c 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 00000000000000..24402fec8d7715
--- /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 00000000000000..037fcb684b47d7
--- /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 00000000000000..ba9a6473999df3
--- /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 00000000000000..e8649faa120be3
--- /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 00000000000000..0f0fa7d22214f2
--- /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 00000000000000..9f6e57c355380b
--- /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 00000000000000..fe41f4a5fadc8b
--- /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 6186ac7fd93be6..f666c823bd3654 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 ac5cb56084cfce..2daf9ab420efc5 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 9679dd8c52523e..d49dfa2015dc6d 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 dca6f2a6206ab9..5575052d7bbb80 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 e5f2c5b18bd00f..00000000000000
--- 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 00000000000000..91d4cb13b98ebb
--- /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 7bb4c61ed51a0d..6a77bf7397cb58 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 a355d19b305a34..d433712bb9412f 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 1bbe5aa6625b0a..8d4169f9727954 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 c2df94a0a2936e..9544d7e8bb4817 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 61b1985c5a0b9f..90ce2b01bfd203 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 dd2e0d40f31ed7..b1d6e3200ab3a4 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 034d212a33035d..ce93591f492f16 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 b604554cbc59ac..bec3a5dcb0b71e 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 87c2fee4ea9bf1..fef1646067fde3 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 ec841808f771d2..a9b701a8ea395e 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 cd1e03eb10b0a7..088409471fa55b 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 51c59212bef165..c9c17d091cd55c 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 7e2b302d7cff56..4e830d6149537c 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 92cc35e9e78ca3..70e2b34d06ce6d 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 59d0e63ef2d4aa..e682a12859c472 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 05d497c235dadf..2ee6b903cc3a98 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 629a86520389dd..6b8680271635be 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 d2c14189e2529a..4c0447c29c8f9c 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 7b5b1d86f6bcc8..73f0e536b92957 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 0c15ab4bd2f804..45880635586a72 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 5d08421038d3f5..595986c08efc1d 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 bc356927cc0af8..e3163ef77d4279 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 ff22cdaeafd061..4a8eff1fb380c0 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 882451c28bfe46..bab4a4d88534a8 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 ed57c6eb16b9a7..5036d7b2008810 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 822214cd6dc6aa..6d294aed9b4de7 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 d83f3449460ce1..0cc5969e2b7ab0 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 f85cd3a36c0920..c581a1757565e7 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 6b4dfe1d05f721..0b531a3dccc1ab 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 8c16e298c7df98..792fe63e5932d7 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 464a5a1e760163..725120687c2313 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 61ff6eeb4bd80f..99babf683ccfa2 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 beec276b3bd73c..34be3b7408432a 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 a0abe4b0483f82..91134dd14bd8a3 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 f9edc56b8ffea4..74fade39bf7a58 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 45a76a2f39e371..a36249528540b8 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 a6ef902e2e9ebb..1431a61b1cbe07 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 9a8a0a1fdda141..7e528c23c20a05 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 508de68c32f706..a2f8088ce04360 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 ee03fa6b648af8..0e63e1bc19954a 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 67f5d737ba010b..3b0f5f8570aa32 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 2dd4484ffcde82..26c736034501f7 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 15a90092f55177..69b5697d8a9a8a 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 b6fb449e7b087d..d41d73bba90bc1 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 6d80688b7a7038..cb9219b1ba2ed8 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 08450f48567c8e..0f1c27098af92b 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 e64f7218250895..bf1d90bfc35565 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 472ec1a9271267..b81f2965eba22c 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 f3e6580e439bb5..ddd029c8d7d687 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 d83020a9598f19..4b120a71213b75 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 75b35fecd5d83c..cc5bb9cf8c739b 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 1e56a583eca1fa..14c98aff262fea 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 ef2735de3d3dbb..5c84475d328508 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 5cdebf9edfcfd5..25ba986a12fd88 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 8bcd294b38f3fa..2c4506b7235339 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 046/216] [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 39162844167073..2e9bced21fe714 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 09e0a75d215730..1452003d8f8b80 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 047/216] 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 962f993633e6fd..3b9efbee22ba6c 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 70e2b34d06ce6d..d6e611e65154b7 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 e682a12859c472..54c69d849e3a9f 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 048/216] [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 79e1efc425b4e2..2d31be65dd30ea 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 52e468b741a071..008afb234a3764 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 fd8fa6daf81acd..bc4e39b0788d9d 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 00000000000000..bc31b7df5d971d
--- /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 00000000000000..b7116f02663c16
--- /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 a0d9352ee9f82a..39280ad6f4be4a 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 8582a003c6fa88..c0a51d5670a147 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 c26ada77f504fa..323f79e63bc6f0 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 1dbec76806ba8e..c9cbec15169d9a 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 049/216] 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 e704532ee4cdfb..7353f5d3eb760c 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 ea462291059a51..b4cfc3c1efe8b4 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 683f58b1a80ce9..83e7bb19e57baa 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 eb502e97fb77c7..599886788604bb 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 0331153cdf6152..00000000000000
--- 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 b1a106d2aae5dc..00000000000000
--- 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 4c03c0c0105ee7..00000000000000
--- 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 ccab1a3b830b61..00000000000000
--- 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 d76b2a2aa9364c..00000000000000
--- 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 e337a469f17e6e..e44ce0de403d94 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 050/216] 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 aabc1e75b90255..3351170c29e01a 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 72ec73ad810e6d..5757d72f995827 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 051/216] [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 2a0d1ef8b9dfde..64f2f223a3073c 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 a85ea58b26478b..5b1c837db9f745 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 153130fc16d603..a70258c2684b6c 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 2eb34529d044c5..0a899562d61c2d 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 4636618cc5ac03..06fcba36642caa 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 59c64fbf8fce1d..26febb0999ac70 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 db32f7f4485b16..c162caa1278e6e 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 d3350bcb0d7621..a406de593652be 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 9c5df89a52bed5..ec5a2be255a2cf 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 46fe773e1a88df..fd077c18b7983e 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 b29d15f5e5c727..a7213c30eb3fb2 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 b5cbf80b084f79..c5124edcaf187a 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 3c41f29625a51e..a2e2fec3309c31 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 9519720d0bbecd..92cc9be69839f3 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 e0b60ae1fbeebb..108ca365bc14ff 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 052/216] [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 ac435932136879..b9bdea5522f321 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 02186ecf09b4bc..87ac2d1710b19b 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 20b267caa9074a..b8b43c3ed248b1 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 5d85ac3bbd56ab..067b0bb4906df7 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 20f2ce6c567740..729daed7223fe3 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 632f6fc8861a4f..79e4ed69581934 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 387d56c03e31a7..75dd5a7a579b81 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 053/216] [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 03051ead357c96..21f82c6ab4c986 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 6ff218ca06059f..c724e6a2c711fd 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 a2c8531def2ba4..41fc6ba57d715f 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 00000000000000..9c86c502a76483
--- /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 00000000000000..a2419ef16df3ab
--- /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 13e9d0df549f8a..484a3d593026e1 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 6611ee2385d108..46923e07d225ad 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 9d45a411b51302..be289b0e85e66b 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 39d88bd8e4724d..f20a58b9ffa36a 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 0d367e03a799f3..944631d4e9fb5f 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 7482068454a97c..c97895cdfe2363 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 00000000000000..6721d89f2799b7
--- /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 00000000000000..dffba3e6e04368
--- /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 054/216] 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 439e553b17a86a..63084d3bfc9e96 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 18dfdcffef363e..1b37d60436ddcc 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 bea2f996141d50..43d9d680e102af 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 664fdb9fba67af..a2090a8c2cc481 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 d78f4da63ab5b4..13b541f75e5bd0 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 055/216] 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 33db56751285ef..1a05560aaf9313 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 c184dca8366be9..548321243d4fb2 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 d6ded9b20b1ad8..7ee48beaabb2ae 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 056713a5dacfab..596d34e7c1df53 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 003d842cc3d6f2..cdc6292ba808a6 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 056/216] =?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 edda2ef984a9e3..e087db9f74685a 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 569a24bb8537e3..965547f1e309a9 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 70a461909a99bd..f50aeed3f4d48d 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 33f7a1d97db139..9ebe3fa14e8425 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 129aff776808ad..c528ba547e6ae3 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 c9a536fd5932de..b93ef6146f1cf5 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 55b5be21fb4a45..5c7a4a476efbab 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 adfcc4cc44d1f7..15711909c4c9be 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 101711475c9381..a710d3ad846b35 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 1be4b4b0552437..e42140feb928bd 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 3579b1b2f69b88..da4cd3c9dacade 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 aa0851916a7b4e..b6c229181e9f7a 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 057/216] [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 7808e2a7f608d1..f73fac22590671 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 f3f06f776260dc..be1f498c2e75dd 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 b9e99a54b3b11a..6eb2a1913b8714 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 5a355dc576c0aa..971a9f51bfae15 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 a0ec92f7d869b7..3621827b294a6e 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 bf81c91bae6339..c622d4f19bade4 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 4a681f6fa60bf1..845b597a8ad18c 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 f4382b37b3d308..7971c4eb583504 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 d204cdf10012a5..949bbadfc9d26a 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 18b43434da24b1..582c60f048bed6 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 4898ec00b38e24..e177f1cf011479 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 00000000000000..486414ab8a0523
--- /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 00000000000000..4f41ea4c0b8958
--- /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 00000000000000..673588688db84f
--- /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 00000000000000..8a5a72891c3e76
--- /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 00000000000000..421072ab603c2c
--- /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 ce4c518d82255c..718e9e99480811 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 42c885dfaf515f..e4450e67ae5b3b 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 0a280ac6b24b8c..c9dd0b26593172 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 502ccd53ef80ca..302137199276bf 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 00000000000000..d869c6d78ec11d
--- /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 bec32ace27f2b2..fd68a487a21e40 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 305455c8ba573f..4b359099bc58c9 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 ee922a9ef803f3..559d4bc6514dff 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 55c66183de946d..52815be86cdcdc 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 2eb434ffbaf40d..687865b32a46e4 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 2b587d23247e22..9a67bf28f33dee 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 68a0d96d491b64..01b66263d3e933 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 00000000000000..60c0807ae89a89
--- /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 00000000000000..b3b38a84e4f22a
--- /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 2de25a44165c6c..f9f3b0b6af9a99 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 5d2565b7210da8..5bbb606b6142fe 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 00000000000000..79854e4f900b8e
--- /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 45ef5787927e19..00000000000000
--- 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 00000000000000..313120639b38b2
--- /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 6af817c82ad950..0ee78f5e4d81a5 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 00000000000000..9c35110e9d8c45
--- /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 a68184dbdff979..3c17d3510bfda0 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 74d6cbf0a5a974..7da570e909425e 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 5e6e9dd05f7225..7452915d94073b 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 483fed28ea6d45..bdbac908684672 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 2df664401621a9..ff621f994bf4e0 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 92787737d579f2..7e800cc1eae95c 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 d7c56a1b8db8d0..7a5f498ced85c5 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 f7012fc5119e9f..d0173d2d962208 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 3b58ea1e5cf841..9594819e385c0f 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 325d82696d47cf..600185e7cc2163 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 83a465af55d9c6..72d52b3497bb17 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 30ea8e71265e04..a48b68db8126da 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 d752c8b3781fc1..8d87ae5d52cb20 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 00000000000000..5273a331025653
--- /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 526abd6b303e57..da86da12a70cae 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 81d2cec7d81f61..ad17b8c79d0655 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 5f71b0bea7b2c1..8aa955b7f58f00 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 b13ba7f1a9107f..a2a5dd58dcf4df 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 00f8a388c689f8..be137e497181a5 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 ed21f315476d4e..d0960497b2afea 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 a2cd844e249640..00000000000000
--- 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 01baf7cf07c929..a1aa8b9fbaf5b9 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 1a93eb43775f3b..1bc0b55a581801 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 0500bc97eb0904..a17e7cba358da9 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 632f3a270e1a1c..a0f89adbdac8f4 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 885296c0928acb..d63ccd36a2ba21 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 15e49e7f6de8bc..104460d1e1394b 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 de8615c7016a73..1a8929990ab55d 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 bf6c9b3666a6a7..6b3b46cc151375 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 ab8d7a068b19dd..76359a3b60a6a7 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 75d9c8aa959b1e..b75c729c2104a2 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 44b95515039d88..149dbb4244c869 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 c522de4284f6e4..06b298aedeb2b5 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 134472ba0693fa..b9dc7945e95795 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 5fa5c331d398e8..4faaed53bebf2f 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 669033fc6524ad..7fe6a42c807ee0 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 3b4aeaf92c5080..c15d245f74cc73 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 cf4ffa339ddfc5..fbcbc37ae0cc28 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 0788880994200e..beed8e8335314f 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 8024aba1980586..2eec9e233f5d27 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 32e6385bc9fa29..cec27401c4dd18 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 6dba36ec0613d6..98e995173d8117 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 69e719efb0719d..bb54effc0d57e8 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 34313211061b08..a4e024e795b46a 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 22e08d9feb1cd5..4008be8d37768f 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 261f685eeb9ccb..9def6c9bd34502 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 744b9120028d7a..c0493dfca8c208 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 8102d8b95680e0..d0b610ec861b89 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 13c9ead89d09d8..dc61776d91f0e9 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 710923c886cbe5..e725cb8914c8b1 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 e96aef859d7465..6fe7be632f08e2 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 50c5c7093f34c9..53dd5f49afceb5 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 3016bd6d68f958..20d035c2e81271 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 00000000000000..b85013ea8438b8
--- /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 058/216] [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 07e33a43d3ff9a..0d94c5ccdfe088 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 4d53e747d48553..0a76211f2e330b 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 059/216] 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 33876ab24414ee..b033fe86cd1c70 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 1bf6e8b977af88..b8cf2e1e27774e 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 618f71daf03399..4ec3bcdfd7c052 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 873252ceb0a1a9..b04b5b32d07461 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 10b607dcd43125..10b1741d984412 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 7ce433f80bed08..768a67794517f0 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 0f830acb284a05..680c789bc9d9d7 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 3e5a3cd2162257..ca133010fe2304 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 89e4251bd78027..1d9637c8279da2 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 9cc34bcda1af4c..ba39528a1f8097 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 1d4c13e605f277..eb2d0d2581a347 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 6b36f14df95e9b..914ca2fd65fa24 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 25e1816b6cc1ed..12d0122f9a4d3d 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 5423bc3fd4ecd7..63ce93ac54f463 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 5593a72ecd965a..63a8fcf30335eb 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 bf1d5ffc1101ee..68b068b0cfe061 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 f945402ec5fc2a..d5412f64f36156 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 5e898697a154c3..12bc4e7daf3e51 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 6f02d9b7c7a0a4..71729a06f590f9 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 6a734941eb70c0..cc9c2607a2b595 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 4afcba14abef48..bbc3f3632bf64f 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 0c3fcbafbe9f93..0f97416f053eed 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 24277993454630..421ea44fa7a24a 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 e10265376f2de4..0d20fdee07df51 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 6a69d52d72134c..7795497dbec8dd 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 b621017677c587..1de62fe5a0348f 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 8cf3d1a15883b5..38975cc220bc26 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 4008daf69f25d4..a873d1cc2ce30c 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 df9d6eb146eab4..6e8b71d675f7ba 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 b3438914d56364..d146adf2ca67f9 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 8dda9f1195a390..9dcfc3d9e8143a 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 04b5e48c65e8ec..cccfb043cf0afa 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 d3cf87c9ef14a8..4afc85ba3b5c27 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 94fd2d9bc91518..101ca3e8ad457b 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 fc676e25ff6d76..b2e6373edfc101 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 ad2011513b171c..1826c0ac4b9e6d 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 11ceb5885dd315..4889e6ca049cac 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 b830b24c92082b..14848bf5e8739c 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 da5c76fa6beabe..b3fb2d54cb2669 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 a1681e0d71bd37..4ba3101d34898a 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 134106bb3d42aa..ecdac06c915fdd 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 0bf5b26e1339fa..6a0bd26a16faa9 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 a6b6d8ca0e8378..ce0f5fe965d7de 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 e1ee1153a28ac5..f2e4039f8c2bdb 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 9ee3527a237d3f..39b56d89a8f0b7 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 1f3e4c0b577f2b..2bcd741d5a5638 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 fea4d4cd9ac653..4cdecda569dbf4 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 c80b5659d01675..8a63854c83e87f 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 370776a2e42bb3..2b4501cb306a90 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 e78f9249fb8759..976ca197a6d51a 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 a9c520338457b0..a198e6ed700185 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 3de8f7845b1a7d..0e944276605fff 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 061b897cd9eea9..ce76df7fdf992f 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 6189ed2e024ab1..e6999fc6fe46c4 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 02c2955f26c863..575363e83f0293 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 eaba6ca624bd86..831f54cf9de8e0 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 b3cef400089b03..0e1a0b550ca150 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 101593e7258e80..65986d7288381b 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 9250a4499662f4..fd1fb0aa1fca98 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 d4919970f06e79..2854e8e3322034 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 5554669758aff3..a53b47c9a1eccc 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 1c5abcf2a65c22..ec3185f8f49f63 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 4c8b2a716d98f4..057a0706b59b60 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 247130f4895bb2..dd8cb589dc2321 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 8287ee944bca99..f69a2fc1d209c4 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 884353e132b9c5..20790d7cf5128f 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 60adde80e883f3..048cc3d5a44402 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 d113b465fdf2f5..56204b5fb9f9d7 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 c6e2c0eff81667..bf1cd75432ff59 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 27662585d01fac..0d25ececd51564 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 b06d1a8af3bc5b..2a1a581c795742 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 12c02679d08597..78c4abd75f2ee7 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 32e1d81451c652..77c1c05667d478 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 e8a6e6f999ca34..c539e9480af2b2 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 c2c6f77fb167c5..0bc6c099106a60 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 a790e81e65e257..fc27e422682e19 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 74f1544403e67a..987e4680317132 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 b6bdafc26b445e..e57c2af5b83cfa 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 44ad3c57f7e24c..0a7be858691afe 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 6baf6747f4bbac..cd76fe29a5dc2f 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 bc74748806beb0..6e748030fe1070 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 36feb3f6203c80..b465afb8b5d9f4 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 d9ed7a0bf51eb9..6cc43042ed4ff0 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 3ca1a1cc83371d..c331f4ccce38f5 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 151b31b5272285..537f4211733588 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 834afefd74712c..f7f7048aedf48b 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 b19a399b0e50d1..1f1af38809a3e3 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 bd889bff8cd0ed..45e4f8576892cd 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 81f52f986cab81..366d31897fe061 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 9cc118d09c7e0a..3fb7fcfd8edf15 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 d1d4b829fefc1f..a32e1e68141b5c 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 1e053d8d4abc32..a3d0c2bafad409 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 9ce1e95aa91d51..dad2eaa1d8e0f3 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 bdd43b8385ae8a..1456d56222b4fa 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 fc3d28c9392ce4..db76c3db9a983a 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 f45b69eaaa79c2..b60903dbd2bd06 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 01788c49ec2f14..50f35becc52ba6 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 e40a80a0d589df..624de2fb30d17b 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 d2ad69d1ee7b65..4a4c3972dc1e35 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 fa3c1ef3b02f54..e881e8dd28adb5 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 65ca2f3f457e93..d099bdcff6710d 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 cd6f4c1b147db2..828544d392a3b4 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 4de77b66610d36..a52824dd8be8e9 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 b148f19da8a867..35852954d5c463 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 dea48df3f17027..7ce0a1c2d80860 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 adec476ea5ad79..a0e790bef6e1e9 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 0b7e92c23f77af..2f234766aff018 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 ecbbb250a88f60..671e38ceb52661 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 a49a5552603fd0..da320a4983de37 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 650cbd439ad2bb..32f114ae34d8e9 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 a59a93b06e34d7..c735e8ebaeb896 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 8c1392109979e4..380a1e3a4cfd55 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 32b55104e4fdf5..58c6ed029a5e88 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 1b5ef08b02d5f2..934ff070561f68 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 5da3accccd9c2d..46fc6556144117 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 d4fa8ee0e3481b..c367cec02d58b4 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 2b072d8f95cd82..4732da0213934c 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 ec4c8d2c2d1ead..47f2e29fcb5efb 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 87e56e5dd95ac4..ab1d17b97c57d5 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 ba07421fe60f46..6b2f70506a81fb 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 457a8708ec3419..7e79b212f69cb8 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 e64d20138cfb8d..52dc89a6bba586 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 826acd41e27a99..b16755e69f92de 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 6df7643c5221fb..42dee46e71fd6c 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 b6b074934cc63b..e20e16bae87f2d 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 9c843af36192eb..8263def2034aac 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 43f4dc3cba7e21..b461e71c006ff0 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 21e178dcc7e769..cc42a545c11e2a 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 20dc95e92a86c7..768ca1f893b68a 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 61af960847f7f0..6ffb0e320982bc 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 5366dcec3fcf02..8b2f14b3ed45ae 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 ae6de7f4c5fbc6..6e68f125f6f71b 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 8e8bae42d4ad82..5eec3a0cfba378 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 50c490d2924baa..444f1eaaaf3643 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 584988d201a22d..cccdde0cc004f2 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 95297124b563a3..137b40eb648baa 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 d335cafdb78853..5c086511e6760e 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 db2e9acc4615f8..0515bee0052d78 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 33a22d9a5f805f..a82a3abc8c0acc 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 d9e16105351bd1..460ea0584cc3d0 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 fc1ab9b87795d1..4db1e081c5610f 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 61d3ede852ee1d..f5c1a51b633cca 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 09cb7148fe90a0..7931f1c7eca51b 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 a169ac3deb9b9e..3541fed7458e20 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 7a2c167bfd8554..d7cda0790bda56 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 733e3db3c25e60..d1263ab13f41b4 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 0bd6100b05df6d..9477299e563a83 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 c3538f0c18ed5b..0d41e22719bba7 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 f49001bd5d7af9..df655bf179f5b8 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 dd6b66350052e7..0efd27c6ecbc66 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 c201d85a270c02..e48f48e5019037 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 4f2055424ca61d..d6dc97fbae1587 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 8a969a4cf098cb..f48dc64966bfc6 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 13855a4b81494f..4033d247c4ecba 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 2b19249dc426fd..ef88c255b1735a 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 4135a4c595d6ac..235f1506371163 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 ff9c40675def80..647204a6dbbe98 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 601bae89f7a4d8..848dc94acff61e 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 55451882d96faf..45bdbd09792764 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 a46f65da580435..672842bd992ad7 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 f6a903ca9a4eee..81c9387c6f39c0 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 d03dd72937b016..06ec22b2f61b4b 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 b17a7358cfa526..c43ff6d203fece 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 fe2e0f2d96fd89..ee83c826371bc1 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 d07fa382e114a7..5c5d8605d7811e 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 aabb18d4190988..dda52e26ca42b8 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 f5fb2f481ca776..a3350a08c7d344 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 bd5a5a26d9019a..7da52fc018338f 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 311aed19e07062..15efa46dfb8915 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 1f9352d8405d2b..c53dc0c105084c 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 95620a5be84745..953a444500084b 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 0acd3ea3e51a70..d79614e47ccd4e 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 d1c6f076d67495..e59c55210c1797 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 9e373949aea12a..61402008363da6 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 302137199276bf..4e8ffc64cfe923 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 60c0807ae89a89..9dc64374f4d633 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 b3b38a84e4f22a..7636d4ede4babb 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 8080ce2696a3cd..000e497b29cff3 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 befa11d74df4af..b1247ad5b89359 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 203d5b84c433a2..d2a7a96a8b6f9d 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 50016592ba1acb..fbc4d8d92203a1 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 84e4783072f312..20afe49fc1f198 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 7796538997de1c..41147ab62d359a 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 fe3b905106ee00..8d7010879b7d70 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 5b486da23c9e49..8b8532af6eecf4 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 a68f8de39d48e5..a9e5d0c832c8ce 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 9fa1554e5312b5..c74aa683d6f320 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 289017d37d634d..f8bafad6022695 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 cff5b3c3ce9c3c..060c4f13e70c72 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 ed31989472134e..c12de16b9b4af3 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 92c5fb5f36cfc7..03bef5b8272ba1 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 f8de67e9c6974b..513443486ad8e5 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 2b174a8cae076e..542c8358114f40 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 7c08f377c9b15c..9a7d17c971dfed 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 845685ff36f7de..d3994337301cf1 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 060/216] 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 c1730e6a154358..d3d863df8617f9 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 2aa994c09a2ad3..1c7ab65ecd2989 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 275aa5a252479f..f25cd310f63531 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 7af33ba11f247a..aa4afda028a291 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 0706ab6be96ea5..6c1699912f76f6 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 e15f0459898392..d0216ebab7771c 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 d27d021465dc93..05f00e12c172e0 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 74881b9d99ae8c..64491d02aa0a3b 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 061/216] [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 3e4ce4a412b3be..25448dff18e8ac 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 4c8e91b13b1b76..3630b902f05649 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 01d9f8a59129a6..9d22e4eb2ee5e5 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 c3f6ecc7f48312..35bac5b9a58c65 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 4b203c3927ffd1..dc495f6eb56b4e 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 f92f46d71e7c79..870b8b7ec5509f 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 0320f2ff51da3e..9b27b930b47c45 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 ae5ffaae3552b2..6575fe1fac7b85 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 95575124b6abdd..6b5a848ce85d32 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 f2ad37cb45818b..3b55c5ac076c29 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 6a70592bc2f70d..9adb3957ea9f45 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 09d0981adf1c29..23425297f34208 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 9ead8171bfef66..c7810af13eb74f 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 a0384ef52a841b..cdeca54bfc39bb 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 a9bde76126b6e1..20c3073789b2af 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 c6ff25f311d9cb..b9097949bd20a1 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 733e701cff2047..70e66af25f69e4 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 cb3fd5e5bec32f..0c834b9fff33af 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 a3db8fe659d848..2264a11341eb85 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 b2c7319b94576e..097166a9c866a9 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 d6e611e65154b7..c99980fe6205cb 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 54c69d849e3a9f..9ffa81a921ba81 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 062/216] [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 81c30579cd4dde..e4227bac520fef 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 66cb4ad9fba32f..2f246f21aaf2ef 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 6cffde577b35ee..c99d01b5466792 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 063/216] [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 9b6fa30271d613..7a244be96cfc45 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 53c6dee61cd1dc..189f8278f1b070 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 3ab3b03dd77252..aae162c23ccb42 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 496b2f254f9a6e..8960d6fa9b67b4 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 00000000000000..f0c003936996e9
--- /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 00000000000000..11152aa651743e
--- /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 a0d3a57eabb7a0..ef8c72f0cbca53 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 00000000000000..682c17aea6d52a
--- /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 00000000000000..d9539692069f0d
--- /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 1ea023ecacdbe3..03edab89d1b991 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 7484e27594df4c..253c9a418d60b6 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 ebd84d3e0e79ab..daf0a1e895a61a 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 f6534b27b5da05..69e8354e8b2f70 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 064/216] [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 4b41862649b55d..57be818c928dce 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 065/216] 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 f8b0d27efcbf4b..0393c94da8d406 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 6465b4a23eb48a..5ea420af202dc2 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 db58f17582c60d..4b39b1bf32d5b4 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 3c211dca2a783c..1f4428e1985390 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 63084d3bfc9e96..7eb1f07d67506d 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 1b37d60436ddcc..0a230ac84d9917 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 43d9d680e102af..e4e194a619a954 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 a2090a8c2cc481..2f6b088ab71905 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 13b541f75e5bd0..501e1e5f2c2037 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 066/216] 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 273611e94ee40a..e26a1e43509c81 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 4752eeba2376aa..0c970fe6635576 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 067/216] [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 c61edfb62b0795..c796aac3d6b271 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 97fdcd3e13de94..01ba084b9e9e7a 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 018cc656362b8e..e1fb1802b2a210 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 068/216] [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 78cabcf3544372..5ac2f407839e40 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 f6119107ac1331..af51db65717535 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 8031f7a03731a4..6b102045fa516f 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 94ad074b72e9c7..065314d31b008e 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 f46a7f3e5a5e4d..d65a33d68a1fd0 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 b2317c558be44f..b898f58e695659 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 3997a7eab44e81..ba56d8b82feeb1 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 70416c0d20ffc3..c0adc60a18a763 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 b56b409717cc6f..95da994c246169 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 3802366fe2ac5a..41d8014b4a5c1b 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 9be6a4b52157c9..2f3593a11f6643 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 db1ff26ee1810d..bdac9dcd1dee8c 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 562f344dbd0601..755c395818f5a7 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 9265e8089e9154..c85685b4cdca8e 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 5aca7f0890940a..0f2afda663da81 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 646ce9f2409af9..2652e362b7eff8 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 5f359b0523d9ff..33d8e738a717ec 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 08ad266a22f9b3..e699de58193310 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 cdfb9d7cc99f30..d6378c2dea2725 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 069/216] 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 772914bb532112..3d6084d37a3846 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 070/216] [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 d8659680dceb95..ca5cb5ca4f0d51 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 30025dce18c0bf..7782576bb5a00c 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 b39613b3dbd1bb..5c41945cb88d85 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 071/216] 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 3b60ac0f48edd2..9f9613a5a68f7c 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 00000000000000..762b4a37bfd289
--- /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 649f8ef077e3f6..c15cb3358f689e 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 5c9f017b571da7..1d77b2a55860e2 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 00000000000000..10ccf8e137627a
--- /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 00000000000000..7a10d058b9c656
--- /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 34bd69230a2e46..d2489a5d1f7e33 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 09b79cae4aac2a..f7e1156170f032 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 e81ef1d6b2482e..5d6ae61a77e00d 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 261f16229460ac..9a2a82e8ed2069 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 072/216] 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 3902b616cf1ee1..9eb560ed42c312 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 9658cb37291343..9793d4b8f03d3c 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 b4ea2b0baf255c..a114826f564bb6 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 22cff6de416c1f..dd9b93c995695b 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 810df8e9950643..277a8a5651453d 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 29c01918165cf1..1def542982dd8e 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 073/216] [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 e1fb1802b2a210..4a931aabd3646d 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 074/216] [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 9b7900d032f5a6..f0f5234e3f9898 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 f480f1f0ae24af..ae9b0f095fc44c 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 075/216] 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 345156b2491a12..c08f3aec64335b 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 076/216] [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 7edf4f8071ed8c..8bd5953e9cb411 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 037337fb2f868e..1add907ae933d4 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 5c7a4a476efbab..19f0aa3fe1d678 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 15711909c4c9be..e86e3e6baf4a4a 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 da4cd3c9dacade..6aacf91c561782 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 077/216] [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 5b8fa0725d96b3..d538519eefcc43 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 078/216] 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 790c6d9c2574e3..dd63827c38c5d2 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 6cc02184fbc163..e7b7d8ed1d7fd5 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 cc42a545c11e2a..206baacd983223 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 079/216] [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 110b031cd1dc07..2b250b96222862 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 00000000000000..5e28a2f7c69757
--- /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 768d8c394fb8f4..9f66fb95b53a83 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 080/216] [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 9f8fda856eed63..826e0482acef73 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 74bcd9aeafb289..c3b47b2b585bd4 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 60e4cedf413f2e..a54295548004a8 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 00000000000000..59bb7ee5b96252
--- /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 00000000000000..5a909a287795cf
--- /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 00000000000000..136912847baa98
--- /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 00000000000000..96c7817832c527
--- /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 00000000000000..bcd7abd6d7ce23
--- /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 00000000000000..584124468a91fc
--- /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 00000000000000..74e233ad6b320b
--- /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 a8e08323c5e3b1..561016d36921d4 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 5588c4fc53b673..05715c648e5dcf 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 3fbf0e60b5b49e..61108d7cb1f2f8 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 057bce1b4056c3..6606e5b55cb33b 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 081/216] 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 e6a97bb02f7386..ce597b27cc2a39 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 d8430dbfc7d9db..b2c284aa974203 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 00000000000000..0ec8285f50ec86
--- /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 7f4543d014def5..0a958057543145 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 cdc6292ba808a6..16e2cd1559fce1 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 082/216] [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 00000000000000..34ce070fcde469
--- /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 00000000000000..70e2ac7ac6f0d0
--- /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 00000000000000..e7f9617fdcd917
--- /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 00000000000000..d3ee618e92b5b1
--- /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 00000000000000..aa8427cd822be8
--- /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 00000000000000..36094e3abe258b
--- /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 00000000000000..701834acfed9dd
--- /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 00000000000000..7785f75b71d341
--- /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 00000000000000..05c60ebced0885
--- /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 00000000000000..e3d2ffb44f01e2
--- /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 00000000000000..4c3e10fc84b841
--- /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 083/216] [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 e86e3e6baf4a4a..1ec56b8aa169a7 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 6aacf91c561782..dfafbae9c9a16b 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 2bb104801866f1..baa8ce1fcdd860 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 32faeec043f2da..aa845e7283ebe6 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 084/216] 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 d994269366ae6c..f4aef62657abc0 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 80e021fc5cb6e1..74aef644d58caa 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 8d7b9dec58cf1c..983f87405a1a64 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 ab3a92d0b3f706..48269cc1c4498f 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 085/216] 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 fa55289e73e0b7..204f355c7a31a9 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 086/216] [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 00000000000000..43282848dcf9a1
--- /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 00000000000000..baddcdfd0cd841
--- /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 df8f32d15a7ab6..aa04221361de05 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 358fcd17b998a5..1e5ac093cac776 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 00000000000000..c357ee18acfebd
--- /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 087/216] [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 10e603a8da8bbc..9b334a55c4203c 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 088/216] [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 706bf6af8ed9b4..7e5b5b79d06e9c 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 768a67794517f0..4f6f995f38f31b 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 00000000000000..e48fe81d0232c6
--- /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 798746d159f60d..2871fe2ffcf4a0 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 00000000000000..83d8c2684d7caa
--- /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 12642bceca15a4..54758b4a7dbf8c 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 e645a3be3fe5d4..6e0ac0b8be0290 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 00000000000000..06096c4bee3a20
--- /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 c7155b2b3c51b2..c56d63edb9ac40 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 976008e879dd3f..6a868f648e78d2 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 a848d779dc9a26..8a3379211927b1 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 00000000000000..ae5201f4e8dbb2
--- /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 18bdcf1be1a6b2..894088c1196516 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 5f30bf04633059..2cd19c904263e1 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 cbd59894ca47c9..ab234b1df2bc50 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 ba39528a1f8097..129c58a4b41744 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 175ff1019fa2dc..62300d5a34e490
--- 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 18ddc62cba8a63..21b6559f636504 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 00000000000000..bd5ad8ab6acc7e
--- /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 2b1a2a63c1074e..93403090568307 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 cf34bdbadf4166..a05bc698bde174 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 00000000000000..62f83cd672f3d0
--- /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 ff384fbd837949..00000000000000
--- 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 501c0bd0619130..00000000000000
--- 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 ce585dd0a02c88..00000000000000
--- 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 1566932b658722..00000000000000
--- 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 0d692aed063051..00000000000000
--- 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 d66e18f5239a90..00000000000000
--- 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 c186bc3275a057..00000000000000
--- 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 be7fa65cc29396..00000000000000
--- 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 a3f5d144602ed5..00000000000000
--- 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 a79ef0a59d19a9..8f48670e49de45 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 bd86bb670ff39d..85029d5ffb25e1 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 2906525c872bee..00000000000000
--- 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 16207f323ff71b..00000000000000
--- 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 1681c7cfdcf904..00000000000000
--- 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 e3a68f82e48b29..00000000000000
--- 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 d22d544a954915..00000000000000
--- 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 b36fc5bc961ac7..00000000000000
--- 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 b553d7b7d5fe86..00000000000000
--- 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 e6a975e75ed2d0..00000000000000
--- 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 c4ed8f69c8eabc..00000000000000
--- 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 b553d7b7d5fe86..00000000000000
--- 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 e6a975e75ed2d0..00000000000000
--- 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 9be527e742953f..00000000000000
--- 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 b553d7b7d5fe86..00000000000000
--- 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 798967e96583d2..00000000000000
--- 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 d9f20129e85f9e..00000000000000
--- 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 6662de24a3e033..00000000000000
--- 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 13de8fa165c291..00000000000000
--- 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 aaecd11ad82af2..00000000000000
--- 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 fb05fd0c5c2ce0..e77cbc3efe6115 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 02c20049003471..7656b6119c85de 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 acc7134308bec3..92bb5b1510ad3d 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 00000000000000..6cfeda8b2d81ba
--- /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 6bddfc5c866967..00000000000000
--- 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 5018fd75981807..00000000000000
--- 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 6f5997a40a23b1..00000000000000
--- 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 74e53062d4f01a..00000000000000
--- 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 00000000000000..64e309822b673e
--- /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 00000000000000..1528e14133444f
--- /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 d0dbe1e44f0fa5..e794b11b14afad 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 e6a975e75ed2d0..a07ba7a9185f80 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 9453b3bd67eb71..71fdfa5ad29ea0 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 f2e4039f8c2bdb..37837747a69dde 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 fd1fb0aa1fca98..ebf0e046eca4c7 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 c73f2ec595a2a9..00000000000000
--- 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 78ed2bff8cb01d..4a11a03f19fc7f 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 dd8cb589dc2321..c2fc16153290e2 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 85bfa7d066e65f..70b9fd5caedb4f 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 8fbfd113428b34..c2169e7440c5bc 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 f79e2c3b34497d..421e709444d0f7 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 d6a460f9858550..8fa23122bfad01 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 76a3aff0eb7f36..f807610fd60dea 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 ce1c9d7c269b72..085f63206507f7 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 c454817158700d..00000000000000
--- 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 4bae8e48173e48..61884f521cfaf1 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 d734c5a6ba422f..89fa07566ecbae 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 d3994337301cf1..496331aba0485b 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 089/216] [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 833688ae579932..6f77d15913d073 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 436386077e7254..ebda64efabf65b 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 e4520dab4626a8..ec56a3a1bd8d3f 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 07e69d850f1732..854565ace9b4bd 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 090/216] [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 3c06af1eecb59e..b7d4413e9455ae 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 9f7dbee10cef00..ebc88918de6d5f 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 c99980fe6205cb..dbbe6072b1fe51 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 9ffa81a921ba81..ed849c1050497d 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 091/216] [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 ad826a446d823e..a1161354e04f45 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 38b6f480ca3d3d..e231f37a170ed9 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 80d5f739bea5a8..27c4a37e09c008 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 4488a962d0ba88..b5a4ca4799afde 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 1490ca42679b93..24ebb6bc8bd5f2 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 b457fb1092bc65..7344839795955e 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 b07672eeaee065..33f61d61f989b3 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 473fd432c166af..ba12b11c9527d3 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 00000000000000..fcbdb900368ea5
--- /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 00000000000000..911c51013a8448
--- /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 b358608701fdff..9e01dde274ff76 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 0d25ececd51564..5d01df2a17bef4 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 4b8e9cf937a2b2..44ca80143bcd9a 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 53843b7f7412b2..61e3dfee420a51 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 a922457b14cea7..ead28c325692d6 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 00000000000000..3abc89c470b21e
--- /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 05f41cdfdffd42..ead0c79a028364 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 5c0a3d17648aad..1c39892c3fd965 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 ed66236726b9f8..c1f346aa30e1fd 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 423b87cb78c3c1..29aaa98169fa5a 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 800f809727eb6f..a319bba1eabe1f 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 87bc8dc9683736..6ff98a9be75f90 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 ddad2eb2d22dc9..a242a0adb6d4c7 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 03716382af8593..ec274d20b60053 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 072099bc9553cc..596c3137ec19f3 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 98f00bf8e6555f..7d3af4caa2ca38 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 deafda67b806d7..71202c62e6f6c1 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 1140af0b764049..603b4fba17adbf 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 dbbe6072b1fe51..dc07044ce8ed72 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 ed849c1050497d..144bc1cac18526 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 092/216] 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 d9cb671282124e..dbdaf494fdf274 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 093/216] 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 5d01df2a17bef4..b950b493c0f196 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 094/216] [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 a07d0830907b6d..ff4ac180c3774b 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 00000000000000..f75d7d7d2480fc
--- /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 415e6172ae81e4..3fec36e7fb24ba 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 e1ecd6ee1185d6..4ee12908b7c792 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 8babc72ef129ce..08588bd03008dd 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 25fc1776947446..dfac607eb72325 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 1c4db9173688a7..0c247d0ef56da8 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 158f4db58e15b8..fec59393726bf6 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 3cd8ab46bc65d8..fc24377ebf3901 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 116b37a395299d..4eb5ff05b45e32 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 37432672c5d89e..986e99f79904a7 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 6ba95163905696..81262f90c4262d 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 4a9aa9e9f4d32f..04e6ef322e9ece 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 b2fe7efeaf9599..99c58a17d396a1 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 5fe9d19ffc8605..f035aa937c3649 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 0c3922b77901f6..9f07c596094259 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 0a15c59ac62ae8..174fc118eb2057 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 b09a270018711e..ca468f2ed96143 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 e85b45f55070b7..481fc42c9a6564 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 0b2ff3a72975ba..5f36189224534a 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 586fa1798b7bce..8c8dbe1a3460a2 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 92ee67de49314c..4cbb9efe012e62 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 175319565b8a13..24e1c1a7f654c5 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 c95719da881ea8..97013273c9bcfa 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 00000000000000..98c1436b2b9b8f
--- /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 579c4fe3bbb909..19afac0c0d2b84 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 095/216] [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 00000000000000..8c21043c268d50
--- /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 29c03215e9ff4f..e03f24d78e2a20 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 b6edf68aa7dc28..466c37d4ad5f1c 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 15a981d4607301..dc478ede727902 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 d0f9701fe944e1..bf62fd0e60df82 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 f50aeed3f4d48d..909a907626f304 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 91a2cbecbc04ce..5315ffb3c5fdb2 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 9ebe3fa14e8425..e8304bf838e2d7 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 c528ba547e6ae3..f81dc174d81284 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 b3c4eefe5fae78..98b737de8fa598 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 b93ef6146f1cf5..4162412861f573 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 1ec56b8aa169a7..01fa912caa866f 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 a710d3ad846b35..5fe33530f05dcf 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 e42140feb928bd..6035255824b1ca 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 dfafbae9c9a16b..4762c615ba7939 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 baa8ce1fcdd860..2aacc5f9176c4d 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 b6c229181e9f7a..6d819337e447df 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 642a054e8c5191..eaba4438bb1fef 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 096/216] [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 3cca5e21ce9c3c..69f37856b6f2d8 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 7a244be96cfc45..b08a14b540e558 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 f0c003936996e9..3f3f1824331447 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 11152aa651743e..8f31bd9063d4a0 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 ef8c72f0cbca53..617210a544262a 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 682c17aea6d52a..000e6d63b5999b 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 d9539692069f0d..432f54c8e5b1c3 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 03edab89d1b991..cd22ff98b01cee 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 7190772fb92bb8..49fc5b100e0d1a 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 daf0a1e895a61a..acddd3539965a7 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 69e8354e8b2f70..a9bd4020e74b7f 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 9e5d94ac1b4fee..8cfd65725a23a6 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 097/216] [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 00000000000000..14075ba1beba09
--- /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 a5453c7c51d5b1..09702df4fdb545 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 eb5703f1c63c1d..27b16c57ffecf2 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 9a2a82e8ed2069..de4ec58dfdab34 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 ed0656a2fc265f..d064dfb1c4a372 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 85a073c8d9aced..2d39a52dfe9745 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 00000000000000..be903ad7d69623
--- /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 76e27338bdcd43..76ce9f1bc79e31 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 00000000000000..ad61a6a129974c
--- /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 768be1558bd696..24d9aec5b77b4c 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 d5cdda3c1c324e..fde07e8c16bc51 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 3b3d82c92fbb76..29df06a64a3f2b 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 fb75cc1e2db69b..abd747c8fa47a8 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 b0ce52b4db7ab7..98267965fd30fb 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 5e2a153b2ccbfb..edd501f2666907 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 c6db9cd96a429e..ff0e1a9e2acd83 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 d91bc8e803ab9e..8547219b42e30d 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 6de936fa4a8f1f..49675ac6a39243 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 84a29db8525391..87d6f8e1d8e716 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 6c420576804084..4cfddf00340392 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 5a38f6039ae4b3..22c374aceedd5d 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 beb1eb0947c50e..bf75c86ac249d8 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 a4f85163512f77..a9dc3f822060cd 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 a06def086b8610..017f0369e0b73d 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 43ff274b1353f3..1cb393bede9565 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 a996910d4787a4..10754d20118e9b 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 198174bccb2863..0f1fd3c09d7065 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 098/216] 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 8421a343d91ca8..1ddde892de0d9b 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 ec42a73f610c02..aa0c25364f2c7d 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 00000000000000..fc9d4f9381151a
--- /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 00000000000000..eba2d1e67b509f
--- /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 00000000000000..588d22eeb818d7
--- /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 00000000000000..fc890dd3c927d6
--- /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 71a4a452d163d5..43b146c51d9a8f 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 6cdba0ac466446..2ee8d264195717 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 2d073a92e507e9..16065d8e19adc5 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 00000000000000..a3b06c223fc125
--- /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 00000000000000..ec70472574be3f
--- /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 00000000000000..14f7952f86f5ac
--- /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 00000000000000..15d302d71bfabf
--- /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 86a3c21cfdb395..268a74c56bd72f 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 099/216] 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 2fcc6b97b1cc6f..bf1136159dfe86 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 0ba2bb66e77581..2ee604c1bf25da 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 d990599586e81c..9c9f36651f4d23 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 846feb9296fca2..32189f07581e6e 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 338ca18209299f..7d4616ffdc6191 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 ef2f937c8547cf..b13ca32601aa95 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 d08bfe3b909139..c88670ee8b7414 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 dc07044ce8ed72..07b646df74b9f5 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 144bc1cac18526..ffd7d0cfb0f87f 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 100/216] [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 38dd49a286b588..39eb54b941ac4b 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 3a19f03547b5b2..fb626e7d7fe769 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 11b743ecc4bb65..5128ba1c881a0c 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 0ce2c0d7ea5663..b4ff62bfb03dcd 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 1da7508049f247..1505532a2b16e7 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 c99d01b5466792..db58c64a8ae8cd 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 fb32752fe24ea6..9df6da7a88b2f8 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 d3c73090f25f2d..eab93777a72bde 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 00000000000000..782906a56a9baf
--- /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 22f0114d16afe4..106e3b9139a9b1 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 8d1ace5950497b..d59f2ff6413fd4 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 f7b8c60a5c71f1..2733d01ac222d3 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 6cc43042ed4ff0..7fa82a004b872e 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 00000000000000..bad43bfcf8a9c0
--- /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 3953521df18179..807a6fe8ec3959 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 545488be2cd5e0..6fdbc4babd3f3f 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 2e2ed5b38bb871..3d4c73cf4a82cf 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 a1eac5264bb6a8..8d01f4a4c200e9 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 2d02802119e47b..9b51164fd4c28e 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 101/216] [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 7e74961e57ea1c..41925d651e3617 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 0e19c63775d311..40caf351559183 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 eaad883d2f9f63..07b7f01194d5c8 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 00000000000000..a476892fa4a3f4
--- /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 00000000000000..f11a33f932553b
--- /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 1f80dbf5f4d95f..d11925dc0303d2 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 00000000000000..f829b5841efa93
--- /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 00000000000000..78ff9a398b2e73
--- /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 00000000000000..8cd8929c899608
--- /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 c4d59beb4b7a2a..ca8a4919dd2165 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 64a9e3b952b987..8381b0afb5f072 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 102/216] [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 00000000000000..e75ba56277c5c7
--- /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 00000000000000..541a6853a99b39
--- /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 00000000000000..fec3259fa019b7
--- /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 00000000000000..339c840bb86f16
--- /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 e9aa5c1d56f734..e26b6a2890fe4d 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 c081f69fd41fe5..c30fdad969b244 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 4a67e27d2ebe63..bf69f817183ab0 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 26ff113b97440b..a58d482022b4d5 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 361e32c77d59bc..6fd1adad54f849 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 e8bb1aa1d357f8..b26c6f536366d5 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 8968416683c3e8..dd12cdab0c9349 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 586fc9e60017ae..926bab6da993c4 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 d0ea226e8db800..abfb86c2afda18 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 9b7c2069fcddd3..a70c0d281cf953 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 9083985b0ff2eb..5229f5eb0bb215 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 103/216] 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 00000000000000..fc369b9cf672a5
--- /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 cf3fe2decfa449..d76ed5c2100b27 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 5e502f58e5f562..3f4f3116152c47 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 4e1af6e0dc2392..5202ca13ed1024 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 a173f4068db6a9..5798deaf19c9cc 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 40522edc21b52a..5183432b4ae0ff 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 4ded8286d85987..24b51e3fba917f 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 2c19356a7fd52d..102a3d91e4a917 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 e7657c63f41bbf..5bf5cea587f93c 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 8caddc94b6907a..56026dcf477eca 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 00000000000000..ad12afe35fa204
--- /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 14c912d0bd5199..d99dc4d5cd37a4 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 9211504a2dffec..c76be19edfe473 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 00000000000000..1187b71dff8256
--- /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 bcc87cbf35819b..c8f586240471f5 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 4146266b179167..f98a7a1b33dd88 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 cb33fb32f3b0d3..55d068cba5935d 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 4a56f75b05de98..f504ac1f68ce19 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 78d78c6909c576..78d75feb72f1f2 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 281acf824b5c3d..6d447887627bfe 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 e2609f893dfa0b..54440559070ad8 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 50eb85715969a0..1c42f146b867a3 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 ce325a57426f56..210b3c3da8d0b0 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 2f41b9fedd1d1b..06d3f883e211a0 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 00000000000000..0e0194cac848ca
--- /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 cb4726244e50c5..9ed3a85fe68b56 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 90bbe0a5a21350..9b4f2175731dca 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 15d0f08ae9933d..48413d6207ee3e 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 7e1dbddf56025e..ec752b5feeb61a 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 7daf1b798749bf..b2301298cbdfec 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 392bd90ffbabc9..0845e2c9b14120 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 28030dd509835e..81fe9e2282667c 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 f6eb131a8a733b..0757ae572152c9 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 653ea73c1fed88..b1bcca84e443e2 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 7a63b9e767fe71..01b1628504b3be 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 35b9525733e99c..549ee228b7afeb 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 24ebb6bc8bd5f2..9a61e773d73bfb 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 6c605886e6e008..a52676ee895906 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 a375df7f0b0b9f..d4b20782a5527f 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 f02bd921f40bf0..630235e54c9fa5 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 1e849e8865d0db..5ff1de304205c0 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 353f476e3f9935..cde2471cc4ce32 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 11ce8fb911a20c..05af4436ac5adb 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 99656b05db4500..3deba69a25df2c 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 54a08e9d45af50..e6d266091ae521 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 50d46844f0adb7..9fe52aab836417 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 8dfb1e0ce960d1..a8990e70150d16 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 e78b7bfc6c3014..0f42d8f9beb460 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 74b8100c0915a4..a2a2a211a48b16 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 bc6c9dcebe7946..055fcc0955c680 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 77d70c626183f7..c7ce83053db5cd 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 0a2cb90fdd5daf..e45df2feff7718 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 30c65e71f80193..77f48283649661 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 e057e9c034615e..048ae9474c4030 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 5ca0285eb4eeb7..4433865b44991e 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 d2e237b086bbca..9d127c06e0c144 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 41f835fbd5b1a5..ebb10f6676c55c 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 7a5d0dd5ce877f..6a5ab344d2ba06 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 03ddc3f6568215..ec9f887916f5ed 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 8c38cdcda958d5..8334efffbd511a 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 37304d292540d6..39d961f6a81647 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 f93b69a877057a..801c1d7e53f2ee 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 45ede7e7f26073..0ed26fe089487e 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 bd2203fe920668..00000000000000
--- 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 a750a9ea7af673..037da01c744647 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 db7fca140be893..19995ed233e8d6 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 4c0147dc3cd513..fa691a7f41ddbf 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 104/216] [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 c2fc16153290e2..d49188b29481be 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 0fb3bb8080d827..3f71759390879a 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 234201a157ec91..6575e44f509ebc 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 961d93ccc12e68..00000000000000
--- 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 5a909a287795cf..d184eb4dcd6449 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 96c7817832c527..3ae48f352b2c18 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 584124468a91fc..a3ceabcf6ac8a4 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 7bf7a19ed451f6..fb2d9b1061723b 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 6febc1869054f9..4c2160195a1af3 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 449ff9d56debf7..db65e80ca25c2e 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 561016d36921d4..3fd1dcad0066ec 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 b7116f02663c16..5bf2b41cfc2640 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 c0a51d5670a147..23e24e343937d4 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 e5169a51ce5227..9e86993a5289de 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 05715c648e5dcf..9ce3021917a21d 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 fa4decccb34b10..5598123f1c286c 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 53549cfcdbce7e..4dc762e29deba6 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 e4531ff03587b0..c7bab66490f442 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 134fc9389694dd..dbc007c2aa97d3 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 61108d7cb1f2f8..6989635064ca99 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 6606e5b55cb33b..2c6846b6db7db0 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 ada89c33be7e29..3c476be8d10e66 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 496331aba0485b..c8b94d122ba7e4 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 105/216] 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 b4cfc3c1efe8b4..04979b69b32b9a 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 9bb091383ab131..1a1f43b93f26ed 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 432c4f02bc3e6f..54da001d20669c 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 23fb6028f84dbb..8cc2cd1321a62d 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 ec3122c4e390ef..00000000000000
--- 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 84a64d3f46f112..00000000000000
--- 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 d2bb3a00ce0ede..00000000000000
--- 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 8190b67732dac5..00000000000000
--- 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 6c3c50d175dc5c..00000000000000
--- 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 057fc64c9ebd74..00000000000000
--- 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 106/216] 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 ce401bec87dbb7..595992dc82b749 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 c15cb3358f689e..37db063e284ec3 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 5d6ae61a77e00d..ea91a9bb14e1f5 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 de4ec58dfdab34..ba40dece25df9b 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 987e8f0dae3a0c..a0eecef66ff939 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 107/216] 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 c3670f648d3093..dabf11fdd0b666 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 129c58a4b41744..f292387c125219 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 62f83cd672f3d0..be23d8dbde6467 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 24655f8e570263..c84b0a93311bbb 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 c8b94d122ba7e4..0d8ae918f27dc0 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 108/216] 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 66fb31cc91d5ac..1d0f6fc50ee9ba 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 69ad9ad33bf72e..7d21f958bb80b4 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 b984782df3986c..074b8e6859dc2b 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 0222f06e7ae91a..00000000000000
--- 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 52f4b866dd7b2b..00000000000000
--- 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 f03e1ebc009f5a..00000000000000
--- 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 b23b4fc8881201..5d8af8d71b7fce 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 8bd43b6be0a8d4..a2520593c436d8 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 501c96b12fde86..f5cbadb523a819 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 a0ef6d3e2d9842..e6a4b174df55d0 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 109/216] [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 d626433de1b63f..c2ef6b9b192c76 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 b0f9507266e528..dabaa381788848 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 86334308558b81..8f18a173f3beda 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 70257c97a6887e..12eab4942128fc 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 42c01da7e23c97..8ef740f7bc1d70 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 e08d52066ebdcc..c6794d125368e7 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 c22acf6ba7cc19..1d2e16b3fe5b8b 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 110/216] [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 f0222de02697db..015d9a4925f3eb 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 7dba71a8126e2c..e61d736e371061 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 0801fc5769363e..f78048100b998a 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 beed8e8335314f..caf505610e991b 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 111/216] [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 00000000000000..5ad6fd547169d7
--- /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 c70467c6d031f4..977bf2dd09cc09 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 edada6012d2e2a..72fdc93de95452 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 00000000000000..908399c414cf51
--- /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 5891895629318f..dfeb537b048656 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 a83fb44e6aa379..7d22b56714f7ec 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 703ade3b049ac4..32180cd90f7830 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 0c60a9aaace07f..a552491297d550 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 07b5ed6868df5c..04c49a60a04369 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 1c5db4e82f0693..c502237235578d 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 86e6b188ef2a95..1bfeb020a2ab5b 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 d268e0e6cee9ea..cd8bf90301836a 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 00000000000000..ed0dd6b42afe1c
--- /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 00000000000000..7e70a5e8495251
--- /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 00000000000000..d81d178abfcb9e
--- /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 00000000000000..7ded2e5263fda1
--- /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 00000000000000..b0ee158be75a26
--- /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 00000000000000..2220a91f25c04f
--- /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 b37146f3b3be5b..b9c4986220fad4 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 8e49d02beb908b..b8eb79aabdcc59 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 05b0eb88da40b3..901b02814371a4 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 f6c4fce76f134c..5c2e391059783b 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 112/216] [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 67e46d22705835..46d4a8fb6cb900 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 14612ab1b2a576..8f14cd1b15e2c2 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 6b4e06fec9ccc3..8c9f1e9cef1944 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 79ecbb238314a2..665b3b8986ef0e 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 04a2ba2f23f4eb..ec9ee943105788 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 7d988d464b52b9..acd02a6dd42f81 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 239a2898a06fcf..c1dfb61e9f3b62 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 e03a085e9bc885..b08135b4e486cb 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 7d091099c1aaa8..6862e7536b07ff 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 be15120cb19e14..867daddfd7b03a 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 113/216] [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 83010c684473e6..3c2ba13a1db26e 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 114/216] [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 b233ff1af30fc4..5993b0b0e752e5 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 7c8d006687a6bb..f05d9ef5b821a5 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 703c46b05f7660..1b3d232f9421c9 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 115/216] 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 d5f68e6642a2d9..df00072edd669e 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 9abc5c6381e45b..4909b73909186e 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 f616ffc1d3aec8..a8017ee6631b0f 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 e9e03d6ff2a164..2ea26547e767b8 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 c034852554a44d..4a941d9bd0d77f 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 6dbecb8d503fdc..b392c18e4e49b4 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 ccea50f7478009..2d6c2f885f8314 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 aa3aff8b5c41ab..98303a4b29d679 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 28c3c0e1b9e87b..3c7511f426e2c1 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 f2a7cca4efd8b0..de13ddf620d776 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 75bb2602f1a15a..76717c0a61bbae 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 7ba6fd939afa82..7e7084698b7889 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 2567ef3949ef98..c8c423463e4771 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 ea61a4b7f325f4..211e253ef83d41 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 ea9313fb87b6ef..f8c55c60c49847 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 a3ddceca893c00..4f388b8834b7bc 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 adbd44d7281b67..03f954f92dd337 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 212391b0384779..ba08a3d9f2460e 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 bd411ee5178e2b..702f8731a31cad 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 0cae1b02ccacac..640b6f07f3470c 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 babf4398a8502e..6e6847a5fe30b7 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 b835ca4fdaf651..115d2fff4a4ac8 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 d1101b9fb46594..f8edb978c0add0 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 ce8427c5cd657d..0715e68298b16e 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 07ba8e2f5b814e..c1552898816b73 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 07ba8e2f5b814e..c1552898816b73 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 7b75f0d15292dc..d709a40befe3e7 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 e1b952ef647d9b..9ad3eef67cbd33 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 116/216] 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 b8cf2e1e27774e..5c95f538a00e1f 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 531513481b1d4c..0067228f1c1f3a 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 fe959e570ab986..79beaf79068ef7 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 f101c30a1241b9..3aabd2a1127dcd 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 5200fee45d6b34..2a521bc01219cb 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 6506b838ff2884..7ded8e2254aa98 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 c337c0dc77a2fe..02c7fd811e583b 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 0afe773266a61f..300af551e50203 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 80ffcaa66c7a0f..1fa88ff4b991fe 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 c979920caac6d9..239f1d4f1838e8 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 ab33524fc5b770..94ec53b887dda9 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 6b5d84dc569815..5f0cc5188b1fd4 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 541265c05057a2..4acb3985320da1 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 b14b84dcd1fe4c..29b1e9f4f20e3c 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 d7e6560a8dc971..8e96037b9947dc 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 0e13fd7ef68f96..030c54fec888ca 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 ab3e273f99c052..ed7ae45eed3a57 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 36f5480e854061..c4142fb487b6a9 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 37837747a69dde..7f3744c16397ad 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 0e1a0b550ca150..acb0cf67ac5c72 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 ebf0e046eca4c7..ff84c25400af0c 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 d49188b29481be..f25fe7e3418ae6 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 1bfeb020a2ab5b..f87cc62d7809d0 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 75e132863e47e6..c4917539cbedac 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 79986986b217dc..4e813494d7d329 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 f0c233b44a2851..79d3528eef4c49 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 31ba1bc83d970c..e80bb22c04a697 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 d64eb9451a50ee..a2488d123e13a1 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 ba1ff6a1df030c..c9c27193c437e1 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 2037a3dbe6623b..31873228fb3948 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 cbeb4e79a38d74..7e180884441297 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 b005e3ca6b17dc..99cad61d6b2b4d 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 c2ee498d7189d9..e35d2ba6108f52 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 a1d51ffda6afd8..b635c2c68b9262 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 aa1dc1640125ef..343611294bc451 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 cfb06af3224c72..5c23c7a065b5e5 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 07e9de137826c3..d2838292b04f05 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 b503d635538353..45c20b89032811 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 cafb0095431f1d..80fc1b45970812 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 3b8ef69892cc02..9724e36f045e4b 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 b9cb5f3c83d030..f7924f37d2c173 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 8d4de5b90fae9e..23732e88ba1f96 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 f6060fc060958b..167866ef3c6067 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 2e48215a894735..90f4444562c5ab 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 6d2f35750d8b16..9c0a9b26f53329 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 cf80d2de38b3f8..261f3a016d4db5 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 0d8ae918f27dc0..bd02196e487969 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 117/216] [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 c7c7b7dd9858be..61893c0c0fd429 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 7f8bf06ecb8a36..99cd14063e86a5 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 07b646df74b9f5..83dac4912d4ac1 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 ffd7d0cfb0f87f..8b3a1941f450a4 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 118/216] [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 00000000000000..cd8a58d03d30c0
--- /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 00000000000000..fb4fd762a86bf3
--- /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 00000000000000..93a5c0582fb968
--- /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 3a0942d2decb82..a27899e4540747 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 00000000000000..bc797e7a03fb87
--- /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 a188eb7619e6be..073b96e400f5c4 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 a2f53be7218162..606b43c6508fb9 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 579c3311cf7322..a1b72fb39069ca 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 65e379b5ba2d82..00000000000000
--- 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 00000000000000..3a93b1ee46e7ba
--- /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 7f1b3d97eb5255..00000000000000
--- 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 00000000000000..1e0a4ad2378970
--- /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 346de9f87313f3..6e1ebbfd1e7bb6 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 00000000000000..f766f068f099fc
--- /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 00000000000000..e3fa319e70cc13
--- /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 5232dcfd88189d..f8dcf9635c053e 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 c7aba6fcc8a5b3..08f3f01bc99f6c 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 00000000000000..5c29d2747f68d0
--- /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 00000000000000..d4c2214b986453
--- /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 443e524d71ca3b..34676fc1932fed 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 00000000000000..56895583c2ae9b
--- /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 b57bbd2960e4fa..2c65f62b258a9f 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 00000000000000..c7b0d8acc8782c
--- /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 00000000000000..8bdda9ef895b23
--- /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 5c5dec92a51001..913bc90df04bed 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 119/216] 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 fefad214736e6f..70f7e0559d0346 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 11557d995218e8..127c7d8889bc4f 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 120/216] 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 972c818d791bf4..93c69b4f9b2077 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 44897184f88f25..277e52a3dc8e91 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 68c1639b834a5e..2049440cd8ff77 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 4ec3bcdfd7c052..a4bb8d5449ee8f 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 05405e7b98374f..c169b5c75e178b 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

From 1e5f5dfe6a31c82634e5be4b0173128b06ee9125 Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Mon, 31 Aug 2020 12:29:16 -0700
Subject: [PATCH 121/216] [canvas] remove unused file (#76295)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 x-pack/plugins/canvas/public/__tests__/setup.js | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 x-pack/plugins/canvas/public/__tests__/setup.js

diff --git a/x-pack/plugins/canvas/public/__tests__/setup.js b/x-pack/plugins/canvas/public/__tests__/setup.js
deleted file mode 100644
index 1792397d0614ee..00000000000000
--- a/x-pack/plugins/canvas/public/__tests__/setup.js
+++ /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 enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
-
-// this will run before any code that's inside a describe block
-// so we can use it to set up whatever we need for our browser tests
-before(() => {
-  // configure enzume
-  enzyme.configure({ adapter: new Adapter() });
-});

From 3fb839ed06b19160ac011688b032ce84aa60e746 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Mon, 31 Aug 2020 21:32:00 +0200
Subject: [PATCH 122/216] [Snapshot & Restore] Decode URIs and fix editing of a
 policy (#76278)

* fix URI decoding and editing of a policy which backs up all indices

* fix type issue

* fix general use of encoding and update decode algo

* fix serialisation of snapshots and added a test

* Fix test description name

* Update attempt_to_uri_decode.ts

* catch errors from decoding in the already throwing code

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../common/lib/snapshot_serialization.test.ts | 203 ++++++++++--------
 .../common/lib/snapshot_serialization.ts      |   4 +-
 .../snapshot_restore/common/lib/utils.ts      |   4 +-
 .../collapsible_lists/use_collapsible_list.ts |   2 +-
 .../policy_form/steps/step_retention.tsx      |  14 +-
 .../indices_and_data_streams_field.tsx        |  16 +-
 .../steps/step_settings/step_settings.tsx     |  14 +-
 .../steps/step_logistics/step_logistics.tsx   |   2 +-
 .../application/lib/attempt_to_uri_decode.ts  |  22 ++
 .../public/application/lib/index.ts           |   7 +
 .../application/lib/use_decoded_params.ts     |  23 ++
 .../public/application/sections/home/home.tsx |   2 +-
 .../policy_details/policy_details.tsx         |   4 +-
 .../sections/home/policy_list/policy_list.tsx |   9 +-
 .../home/repository_list/repository_list.tsx  |  11 +-
 .../home/snapshot_list/snapshot_list.tsx      |   5 +-
 .../sections/policy_add/policy_add.tsx        |   2 +-
 .../sections/policy_edit/policy_edit.tsx      |   9 +-
 .../repository_add/repository_add.tsx         |   6 +-
 .../repository_edit/repository_edit.tsx       |   9 +-
 .../restore_snapshot/restore_snapshot.tsx     |   5 +-
 .../application/services/navigation/links.ts  |  22 +-
 .../application/services/validation/index.ts  |   2 +-
 .../services/validation/validate_policy.ts    |  43 +++-
 24 files changed, 277 insertions(+), 163 deletions(-)
 create mode 100644 x-pack/plugins/snapshot_restore/public/application/lib/attempt_to_uri_decode.ts
 create mode 100644 x-pack/plugins/snapshot_restore/public/application/lib/index.ts
 create mode 100644 x-pack/plugins/snapshot_restore/public/application/lib/use_decoded_params.ts

diff --git a/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.test.ts b/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.test.ts
index 473a3392deb3ee..e5d8e804691a8f 100644
--- a/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.test.ts
+++ b/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.test.ts
@@ -4,55 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { deserializeSnapshotDetails } from './snapshot_serialization';
+import { deserializeSnapshotDetails, serializeSnapshotConfig } from './snapshot_serialization';
 
-describe('deserializeSnapshotDetails', () => {
-  test('deserializes a snapshot', () => {
-    expect(
-      deserializeSnapshotDetails(
-        'repositoryName',
-        {
-          snapshot: 'snapshot name',
-          uuid: 'UUID',
-          version_id: 5,
-          version: 'version',
-          indices: ['index2', 'index3', 'index1'],
-          include_global_state: false,
-          state: 'SUCCESS',
-          start_time: '0',
-          start_time_in_millis: 0,
-          end_time: '1',
-          end_time_in_millis: 1,
-          duration_in_millis: 1,
-          shards: {
-            total: 3,
-            failed: 1,
-            successful: 2,
-          },
-          failures: [
-            {
-              index: 'z',
-              shard: 1,
-            },
-            {
-              index: 'a',
-              shard: 3,
-            },
-            {
-              index: 'a',
-              shard: 1,
-            },
-            {
-              index: 'a',
-              shard: 2,
-            },
-          ],
-        },
-        'found-snapshots',
-        [
+describe('Snapshot serialization and deserialization', () => {
+  describe('deserializeSnapshotDetails', () => {
+    test('deserializes a snapshot', () => {
+      expect(
+        deserializeSnapshotDetails(
+          'repositoryName',
           {
-            snapshot: 'last_successful_snapshot',
-            uuid: 'last_successful_snapshot_UUID',
+            snapshot: 'snapshot name',
+            uuid: 'UUID',
             version_id: 5,
             version: 'version',
             indices: ['index2', 'index3', 'index1'],
@@ -87,56 +49,109 @@ describe('deserializeSnapshotDetails', () => {
               },
             ],
           },
-        ]
-      )
-    ).toEqual({
-      repository: 'repositoryName',
-      snapshot: 'snapshot name',
-      uuid: 'UUID',
-      versionId: 5,
-      version: 'version',
-      // Indices are sorted.
-      indices: ['index1', 'index2', 'index3'],
-      dataStreams: [],
-      includeGlobalState: false,
-      // Failures are grouped and sorted by index, and the failures themselves are sorted by shard.
-      indexFailures: [
-        {
-          index: 'a',
-          failures: [
+          'found-snapshots',
+          [
             {
-              shard: 1,
-            },
-            {
-              shard: 2,
-            },
-            {
-              shard: 3,
-            },
-          ],
-        },
-        {
-          index: 'z',
-          failures: [
-            {
-              shard: 1,
+              snapshot: 'last_successful_snapshot',
+              uuid: 'last_successful_snapshot_UUID',
+              version_id: 5,
+              version: 'version',
+              indices: ['index2', 'index3', 'index1'],
+              include_global_state: false,
+              state: 'SUCCESS',
+              start_time: '0',
+              start_time_in_millis: 0,
+              end_time: '1',
+              end_time_in_millis: 1,
+              duration_in_millis: 1,
+              shards: {
+                total: 3,
+                failed: 1,
+                successful: 2,
+              },
+              failures: [
+                {
+                  index: 'z',
+                  shard: 1,
+                },
+                {
+                  index: 'a',
+                  shard: 3,
+                },
+                {
+                  index: 'a',
+                  shard: 1,
+                },
+                {
+                  index: 'a',
+                  shard: 2,
+                },
+              ],
             },
-          ],
+          ]
+        )
+      ).toEqual({
+        repository: 'repositoryName',
+        snapshot: 'snapshot name',
+        uuid: 'UUID',
+        versionId: 5,
+        version: 'version',
+        // Indices are sorted.
+        indices: ['index1', 'index2', 'index3'],
+        dataStreams: [],
+        includeGlobalState: false,
+        // Failures are grouped and sorted by index, and the failures themselves are sorted by shard.
+        indexFailures: [
+          {
+            index: 'a',
+            failures: [
+              {
+                shard: 1,
+              },
+              {
+                shard: 2,
+              },
+              {
+                shard: 3,
+              },
+            ],
+          },
+          {
+            index: 'z',
+            failures: [
+              {
+                shard: 1,
+              },
+            ],
+          },
+        ],
+        state: 'SUCCESS',
+        startTime: '0',
+        startTimeInMillis: 0,
+        endTime: '1',
+        endTimeInMillis: 1,
+        durationInMillis: 1,
+        shards: {
+          total: 3,
+          failed: 1,
+          successful: 2,
         },
-      ],
-      state: 'SUCCESS',
-      startTime: '0',
-      startTimeInMillis: 0,
-      endTime: '1',
-      endTimeInMillis: 1,
-      durationInMillis: 1,
-      shards: {
-        total: 3,
-        failed: 1,
-        successful: 2,
-      },
-      managedRepository: 'found-snapshots',
-      isLastSuccessfulSnapshot: false,
+        managedRepository: 'found-snapshots',
+        isLastSuccessfulSnapshot: false,
+      });
+    });
+  });
+
+  describe('serializeSnapshotConfig', () => {
+    test('serializes config as expected', () => {
+      const metadata = { test: 'what have you' };
+      expect(serializeSnapshotConfig({ metadata, indices: '.k*' })).toEqual({
+        metadata,
+        indices: ['.k*'],
+      });
+    });
+    test('serializes empty config as expected', () => {
+      expect(serializeSnapshotConfig({})).toEqual({});
     });
   });
 });
diff --git a/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.ts b/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.ts
index a85b49430eecd5..61a57c9288f033 100644
--- a/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.ts
+++ b/x-pack/plugins/snapshot_restore/common/lib/snapshot_serialization.ts
@@ -131,10 +131,10 @@ export function deserializeSnapshotConfig(snapshotConfigEs: SnapshotConfigEs): S
 export function serializeSnapshotConfig(snapshotConfig: SnapshotConfig): SnapshotConfigEs {
   const { indices, ignoreUnavailable, includeGlobalState, partial, metadata } = snapshotConfig;
 
-  const indicesArray = csvToArray(indices);
+  const maybeIndicesArray = csvToArray(indices);
 
   const snapshotConfigEs: SnapshotConfigEs = {
-    indices: indicesArray,
+    indices: maybeIndicesArray,
     ignore_unavailable: ignoreUnavailable,
     include_global_state: includeGlobalState,
     partial,
diff --git a/x-pack/plugins/snapshot_restore/common/lib/utils.ts b/x-pack/plugins/snapshot_restore/common/lib/utils.ts
index 96eb7cb6908d89..3d07aa8de3a558 100644
--- a/x-pack/plugins/snapshot_restore/common/lib/utils.ts
+++ b/x-pack/plugins/snapshot_restore/common/lib/utils.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const csvToArray = (indices?: string | string[]): string[] => {
+export const csvToArray = (indices?: string | string[]): string[] | undefined => {
   return indices && Array.isArray(indices)
     ? indices
     : typeof indices === 'string'
     ? indices.split(',')
-    : [];
+    : undefined;
 };
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/collapsible_lists/use_collapsible_list.ts b/x-pack/plugins/snapshot_restore/public/application/components/collapsible_lists/use_collapsible_list.ts
index 275915c5760afd..7ec34dd7b3984a 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/collapsible_lists/use_collapsible_list.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/components/collapsible_lists/use_collapsible_list.ts
@@ -24,7 +24,7 @@ const maximumItemPreviewCount = 10;
 
 export const useCollapsibleList = ({ items }: Arg): ReturnValue => {
   const [isShowingFullList, setIsShowingFullList] = useState<boolean>(false);
-  const itemsArray = csvToArray(items);
+  const itemsArray = csvToArray(items) ?? [];
   const displayItems: ChildItems =
     items === undefined
       ? 'all'
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
index ae22464c8a52b7..407b9be14e3c1b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_retention.tsx
@@ -35,11 +35,17 @@ export const PolicyStepRetention: React.FunctionComponent<StepProps> = ({
 }) => {
   const { retention = {} } = policy;
 
-  const updatePolicyRetention = (updatedFields: Partial<SlmPolicyPayload['retention']>): void => {
+  const updatePolicyRetention = (
+    updatedFields: Partial<SlmPolicyPayload['retention']>,
+    validationHelperData = {}
+  ): void => {
     const newRetention = { ...retention, ...updatedFields };
-    updatePolicy({
-      retention: newRetention,
-    });
+    updatePolicy(
+      {
+        retention: newRetention,
+      },
+      validationHelperData
+    );
   };
 
   // State for touched inputs
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx
index 94854905e66863..6f89427516453b 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx
@@ -25,7 +25,7 @@ import {
 
 import { SlmPolicyPayload } from '../../../../../../../../common/types';
 import { useServices } from '../../../../../../app_context';
-import { PolicyValidation } from '../../../../../../services/validation';
+import { PolicyValidation, ValidatePolicyHelperData } from '../../../../../../services/validation';
 
 import { orderDataStreamsAndIndices } from '../../../../../lib';
 import { DataStreamBadge } from '../../../../../data_stream_badge';
@@ -34,12 +34,16 @@ import { mapSelectionToIndicesOptions, determineListMode } from './helpers';
 
 import { DataStreamsAndIndicesListHelpText } from './data_streams_and_indices_list_help_text';
 
+interface IndicesConfig {
+  indices?: string[] | string;
+}
+
 interface Props {
   isManagedPolicy: boolean;
   policy: SlmPolicyPayload;
   indices: string[];
   dataStreams: string[];
-  onUpdate: (arg: { indices?: string[] | string }) => void;
+  onUpdate: (arg: IndicesConfig, validateHelperData: ValidatePolicyHelperData) => void;
   errors: PolicyValidation['errors'];
 }
 
@@ -53,7 +57,7 @@ export const IndicesAndDataStreamsField: FunctionComponent<Props> = ({
   dataStreams,
   indices,
   policy,
-  onUpdate,
+  onUpdate: _onUpdate,
   errors,
 }) => {
   const { i18n } = useServices();
@@ -66,6 +70,12 @@ export const IndicesAndDataStreamsField: FunctionComponent<Props> = ({
     !config.indices || (Array.isArray(config.indices) && config.indices.length === 0)
   );
 
+  const onUpdate = (data: IndicesConfig) => {
+    _onUpdate(data, {
+      validateIndicesCount: !isAllIndices,
+    });
+  };
+
   const [indicesAndDataStreamsSelection, setIndicesAndDataStreamsSelection] = useState<string[]>(
     () =>
       Array.isArray(config.indices) && !isAllIndices
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
index 9d43c45d17ea7a..f65156bada2780 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
@@ -31,11 +31,17 @@ export const PolicyStepSettings: React.FunctionComponent<StepProps> = ({
 }) => {
   const { config = {}, isManagedPolicy } = policy;
 
-  const updatePolicyConfig = (updatedFields: Partial<SlmPolicyPayload['config']>): void => {
+  const updatePolicyConfig = (
+    updatedFields: Partial<SlmPolicyPayload['config']>,
+    validationHelperData = {}
+  ): void => {
     const newConfig = { ...config, ...updatedFields };
-    updatePolicy({
-      config: newConfig,
-    });
+    updatePolicy(
+      {
+        config: newConfig,
+      },
+      validationHelperData
+    );
   };
 
   const renderIgnoreUnavailableField = () => (
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
index d9fd4cca0d614f..855abb04b7c2b1 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
@@ -311,7 +311,7 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
                             });
                           }
                         }}
-                        selectedIndicesAndDataStreams={csvToArray(restoreIndices)}
+                        selectedIndicesAndDataStreams={csvToArray(restoreIndices) ?? []}
                         indices={snapshotIndices}
                         dataStreams={snapshotDataStreams}
                       />
diff --git a/x-pack/plugins/snapshot_restore/public/application/lib/attempt_to_uri_decode.ts b/x-pack/plugins/snapshot_restore/public/application/lib/attempt_to_uri_decode.ts
new file mode 100644
index 00000000000000..6f99fae118cd73
--- /dev/null
+++ b/x-pack/plugins/snapshot_restore/public/application/lib/attempt_to_uri_decode.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.
+ */
+
+export const attemptToURIDecode = (value: string) => {
+  let result: string;
+
+  try {
+    result = decodeURI(value);
+    result = decodeURIComponent(result);
+  } catch (e1) {
+    try {
+      result = decodeURIComponent(value);
+    } catch (e2) {
+      result = value;
+    }
+  }
+
+  return result;
+};
diff --git a/x-pack/plugins/snapshot_restore/public/application/lib/index.ts b/x-pack/plugins/snapshot_restore/public/application/lib/index.ts
new file mode 100644
index 00000000000000..c544df4365606d
--- /dev/null
+++ b/x-pack/plugins/snapshot_restore/public/application/lib/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 { useDecodedParams } from './use_decoded_params';
diff --git a/x-pack/plugins/snapshot_restore/public/application/lib/use_decoded_params.ts b/x-pack/plugins/snapshot_restore/public/application/lib/use_decoded_params.ts
new file mode 100644
index 00000000000000..d4582de4084ba8
--- /dev/null
+++ b/x-pack/plugins/snapshot_restore/public/application/lib/use_decoded_params.ts
@@ -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 { useParams } from 'react-router-dom';
+import { attemptToURIDecode } from './attempt_to_uri_decode';
+
+export const useDecodedParams = <
+  Params extends { [K in keyof Params]?: string } = {}
+>(): Params => {
+  const params = useParams<Record<string, string>>();
+  const decodedParams = {} as Params;
+
+  for (const [key, value] of Object.entries(params)) {
+    if (value) {
+      (decodedParams as any)[key] = attemptToURIDecode(value);
+    }
+  }
+
+  return decodedParams;
+};
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/home.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/home.tsx
index 962dfa73e95c71..12e7e2de9383dd 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/home.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/home.tsx
@@ -89,7 +89,7 @@ export const SnapshotRestoreHome: React.FunctionComponent<RouteComponentProps<Ma
   }
 
   const onSectionChange = (newSection: Section) => {
-    history.push(`${BASE_PATH}/${newSection}`);
+    history.push(encodeURI(`${BASE_PATH}/${encodeURIComponent(newSection)}`));
   };
 
   // Set breadcrumb and page title
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
index 5959ad6441f5d9..f67e8eb586238f 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_details/policy_details.tsx
@@ -24,6 +24,8 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
+
 import { SlmPolicy } from '../../../../../../common/types';
 import { useServices } from '../../../../app_context';
 import { SectionError, Error } from '../../../../../shared_imports';
@@ -41,8 +43,6 @@ import {
 } from '../../../../components';
 import { TabSummary, TabHistory } from './tabs';
 
-import { reactRouterNavigate } from '../../../../../../../../../src/plugins/kibana_react/public';
-
 interface Props {
   policyName: SlmPolicy['name'];
   onClose: () => void;
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
index 39ef66eb0658ce..655bd0e9d8bb9d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/policy_list/policy_list.tsx
@@ -9,6 +9,8 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { RouteComponentProps } from 'react-router-dom';
 import { EuiEmptyPrompt, EuiButton, EuiCallOut, EuiSpacer } from '@elastic/eui';
 
+import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+
 import {
   SectionError,
   Error,
@@ -20,6 +22,7 @@ import { SlmPolicy } from '../../../../../common/types';
 import { APP_SLM_CLUSTER_PRIVILEGES } from '../../../../../common';
 import { SectionLoading } from '../../../components';
 import { BASE_PATH, UIM_POLICY_LIST_LOAD } from '../../../constants';
+import { useDecodedParams } from '../../../lib';
 import { useLoadPolicies, useLoadRetentionSettings } from '../../../services/http';
 import { linkToAddPolicy, linkToPolicy } from '../../../services/navigation';
 import { useServices } from '../../../app_context';
@@ -28,18 +31,14 @@ import { PolicyDetails } from './policy_details';
 import { PolicyTable } from './policy_table';
 import { PolicyRetentionSchedule } from './policy_retention_schedule';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
-
 interface MatchParams {
   policyName?: SlmPolicy['name'];
 }
 
 export const PolicyList: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
-  match: {
-    params: { policyName },
-  },
   history,
 }) => {
+  const { policyName } = useDecodedParams<MatchParams>();
   const {
     error,
     isLoading,
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
index f6b9ac08cc0a22..9afdad3806defb 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/repository_list/repository_list.tsx
@@ -7,11 +7,14 @@
 import React, { Fragment, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { RouteComponentProps } from 'react-router-dom';
-
 import { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
+
+import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+
 import { Repository } from '../../../../../common/types';
 import { SectionError, Error } from '../../../../shared_imports';
 import { SectionLoading } from '../../../components';
+import { useDecodedParams } from '../../../lib';
 import { BASE_PATH, UIM_REPOSITORY_LIST_LOAD } from '../../../constants';
 import { useServices } from '../../../app_context';
 import { useLoadRepositories } from '../../../services/http';
@@ -20,18 +23,14 @@ import { linkToAddRepository, linkToRepository } from '../../../services/navigat
 import { RepositoryDetails } from './repository_details';
 import { RepositoryTable } from './repository_table';
 
-import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
-
 interface MatchParams {
   repositoryName?: Repository['name'];
 }
 
 export const RepositoryList: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
-  match: {
-    params: { repositoryName },
-  },
   history,
 }) => {
+  const { repositoryName } = useDecodedParams<MatchParams>();
   const {
     error,
     isLoading,
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_list.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_list.tsx
index 2b8df7294c3749..d13188fc44730e 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_list.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/home/snapshot_list/snapshot_list.tsx
@@ -24,6 +24,7 @@ import {
   linkToSnapshot,
 } from '../../../services/navigation';
 import { useServices } from '../../../app_context';
+import { useDecodedParams } from '../../../lib';
 import { SnapshotDetails } from './snapshot_details';
 import { SnapshotTable } from './snapshot_table';
 
@@ -35,12 +36,10 @@ interface MatchParams {
 }
 
 export const SnapshotList: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
-  match: {
-    params: { repositoryName, snapshotId },
-  },
   location: { search },
   history,
 }) => {
+  const { repositoryName, snapshotId } = useDecodedParams<MatchParams>();
   const {
     error,
     isLoading,
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/policy_add/policy_add.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/policy_add/policy_add.tsx
index 90cd26c821c5e2..dead9abb6ef0c1 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/policy_add/policy_add.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/policy_add/policy_add.tsx
@@ -43,7 +43,7 @@ export const PolicyAdd: React.FunctionComponent<RouteComponentProps> = ({
     if (error) {
       setSaveError(error);
     } else {
-      history.push(`${BASE_PATH}/policies/${name}`);
+      history.push(encodeURI(`${BASE_PATH}/policies/${encodeURIComponent(name)}`));
     }
   };
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/policy_edit/policy_edit.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/policy_edit/policy_edit.tsx
index 915b1cbef1233a..7af663b29957d8 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/policy_edit/policy_edit.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/policy_edit/policy_edit.tsx
@@ -10,6 +10,7 @@ import { RouteComponentProps } from 'react-router-dom';
 import { EuiPageBody, EuiPageContent, EuiSpacer, EuiTitle, EuiCallOut } from '@elastic/eui';
 import { SlmPolicyPayload } from '../../../../common/types';
 import { SectionError, Error } from '../../../shared_imports';
+import { useDecodedParams } from '../../lib';
 import { TIME_UNITS } from '../../../../common/constants';
 import { SectionLoading, PolicyForm } from '../../components';
 import { BASE_PATH } from '../../constants';
@@ -22,12 +23,10 @@ interface MatchParams {
 }
 
 export const PolicyEdit: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
-  match: {
-    params: { name },
-  },
   history,
   location: { pathname },
 }) => {
+  const { name } = useDecodedParams<MatchParams>();
   const { i18n } = useServices();
 
   // Set breadcrumb and page title
@@ -83,12 +82,12 @@ export const PolicyEdit: React.FunctionComponent<RouteComponentProps<MatchParams
     if (error) {
       setSaveError(error);
     } else {
-      history.push(`${BASE_PATH}/policies/${name}`);
+      history.push(encodeURI(`${BASE_PATH}/policies/${encodeURIComponent(name)}`));
     }
   };
 
   const onCancel = () => {
-    history.push(`${BASE_PATH}/policies/${name}`);
+    history.push(encodeURI(`${BASE_PATH}/policies/${encodeURIComponent(name)}`));
   };
 
   const renderLoading = () => {
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/repository_add/repository_add.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/repository_add/repository_add.tsx
index 08bfde833c3688..a66d137471eba5 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/repository_add/repository_add.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/repository_add/repository_add.tsx
@@ -44,7 +44,11 @@ export const RepositoryAdd: React.FunctionComponent<RouteComponentProps> = ({
     } else {
       const { redirect } = parse(search.replace(/^\?/, ''), { sort: false });
 
-      history.push(redirect ? (redirect as string) : `${BASE_PATH}/${section}/${name}`);
+      history.push(
+        redirect
+          ? (redirect as string)
+          : encodeURI(`${BASE_PATH}/${encodeURIComponent(section)}/${encodeURIComponent(name)}`)
+      );
     }
   };
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/repository_edit/repository_edit.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/repository_edit/repository_edit.tsx
index 95f8b9b8bde7d0..3e8cff57935725 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/repository_edit/repository_edit.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/repository_edit/repository_edit.tsx
@@ -16,18 +16,17 @@ import { BASE_PATH, Section } from '../../constants';
 import { useServices } from '../../app_context';
 import { breadcrumbService, docTitleService } from '../../services/navigation';
 import { editRepository, useLoadRepository } from '../../services/http';
+import { useDecodedParams } from '../../lib';
 
 interface MatchParams {
   name: string;
 }
 
 export const RepositoryEdit: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
-  match: {
-    params: { name },
-  },
   history,
 }) => {
   const { i18n } = useServices();
+  const { name } = useDecodedParams<MatchParams>();
   const section = 'repositories' as Section;
 
   // Set breadcrumb and page title
@@ -70,7 +69,9 @@ export const RepositoryEdit: React.FunctionComponent<RouteComponentProps<MatchPa
     if (error) {
       setSaveError(error);
     } else {
-      history.push(`${BASE_PATH}/${section}/${name}`);
+      history.push(
+        encodeURI(`${BASE_PATH}/${encodeURIComponent(section)}/${encodeURIComponent(name)}`)
+      );
     }
   };
 
diff --git a/x-pack/plugins/snapshot_restore/public/application/sections/restore_snapshot/restore_snapshot.tsx b/x-pack/plugins/snapshot_restore/public/application/sections/restore_snapshot/restore_snapshot.tsx
index 9eabed8341ee02..033bdeb902d31e 100644
--- a/x-pack/plugins/snapshot_restore/public/application/sections/restore_snapshot/restore_snapshot.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/sections/restore_snapshot/restore_snapshot.tsx
@@ -15,6 +15,7 @@ import { SectionLoading, RestoreSnapshotForm } from '../../components';
 import { useServices } from '../../app_context';
 import { breadcrumbService, docTitleService } from '../../services/navigation';
 import { useLoadSnapshot, executeRestore } from '../../services/http';
+import { useDecodedParams } from '../../lib';
 
 interface MatchParams {
   repositoryName: string;
@@ -22,12 +23,10 @@ interface MatchParams {
 }
 
 export const RestoreSnapshot: React.FunctionComponent<RouteComponentProps<MatchParams>> = ({
-  match: {
-    params: { repositoryName, snapshotId },
-  },
   history,
 }) => {
   const { i18n } = useServices();
+  const { repositoryName, snapshotId } = useDecodedParams<MatchParams>();
 
   // Set breadcrumb and page title
   useEffect(() => {
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/navigation/links.ts b/x-pack/plugins/snapshot_restore/public/application/services/navigation/links.ts
index 503704c6fe820f..b498dc280d3952 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/navigation/links.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/navigation/links.ts
@@ -13,33 +13,37 @@ export function linkToRepositories() {
 }
 
 export function linkToRepository(repositoryName: string) {
-  return `/repositories/${encodeURIComponent(repositoryName)}`;
+  return encodeURI(`/repositories/${encodeURIComponent(repositoryName)}`);
 }
 
 export function linkToEditRepository(repositoryName: string) {
-  return `/edit_repository/${encodeURIComponent(repositoryName)}`;
+  return encodeURI(`/edit_repository/${encodeURIComponent(repositoryName)}`);
 }
 
 export function linkToAddRepository(redirect?: string) {
-  return `/add_repository${redirect ? `?redirect=${encodeURIComponent(redirect)}` : ''}`;
+  return encodeURI(`/add_repository${redirect ? `?redirect=${encodeURIComponent(redirect)}` : ''}`);
 }
 
 export function linkToSnapshots(repositoryName?: string, policyName?: string) {
   if (repositoryName) {
-    return `/snapshots?repository=${encodeURIComponent(repositoryName)}`;
+    return encodeURI(`/snapshots?repository=${encodeURIComponent(repositoryName)}`);
   }
   if (policyName) {
-    return `/snapshots?policy=${encodeURIComponent(policyName)}`;
+    return encodeURI(`/snapshots?policy=${encodeURIComponent(policyName)}`);
   }
   return `/snapshots`;
 }
 
 export function linkToSnapshot(repositoryName: string, snapshotName: string) {
-  return `/snapshots/${encodeURIComponent(repositoryName)}/${encodeURIComponent(snapshotName)}`;
+  return encodeURI(
+    `/snapshots/${encodeURIComponent(repositoryName)}/${encodeURIComponent(snapshotName)}`
+  );
 }
 
 export function linkToRestoreSnapshot(repositoryName: string, snapshotName: string) {
-  return `/restore/${encodeURIComponent(repositoryName)}/${encodeURIComponent(snapshotName)}`;
+  return encodeURI(
+    `/restore/${encodeURIComponent(repositoryName)}/${encodeURIComponent(snapshotName)}`
+  );
 }
 
 export function linkToPolicies() {
@@ -47,11 +51,11 @@ export function linkToPolicies() {
 }
 
 export function linkToPolicy(policyName: string) {
-  return `/policies/${encodeURIComponent(policyName)}`;
+  return encodeURI(`/policies/${encodeURIComponent(policyName)}`);
 }
 
 export function linkToEditPolicy(policyName: string) {
-  return `/edit_policy/${encodeURIComponent(policyName)}`;
+  return encodeURI(`/edit_policy/${encodeURIComponent(policyName)}`);
 }
 
 export function linkToAddPolicy() {
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/validation/index.ts b/x-pack/plugins/snapshot_restore/public/application/services/validation/index.ts
index 7fd755497eec68..82bf0ef06c400a 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/validation/index.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/validation/index.ts
@@ -12,4 +12,4 @@ export {
 
 export { RestoreValidation, validateRestore } from './validate_restore';
 
-export { PolicyValidation, validatePolicy } from './validate_policy';
+export { PolicyValidation, validatePolicy, ValidatePolicyHelperData } from './validate_policy';
diff --git a/x-pack/plugins/snapshot_restore/public/application/services/validation/validate_policy.ts b/x-pack/plugins/snapshot_restore/public/application/services/validation/validate_policy.ts
index 24960b2533230e..4314b703722f6f 100644
--- a/x-pack/plugins/snapshot_restore/public/application/services/validation/validate_policy.ts
+++ b/x-pack/plugins/snapshot_restore/public/application/services/validation/validate_policy.ts
@@ -25,21 +25,32 @@ const isSnapshotNameNotLowerCase = (str: string): boolean => {
   return strExcludeDate !== strExcludeDate.toLowerCase() ? true : false;
 };
 
+export interface ValidatePolicyHelperData {
+  managedRepository?: {
+    name: string;
+    policy: string;
+  };
+  isEditing?: boolean;
+  policyName?: string;
+  /**
+   * Whether to block on the indices configured for this snapshot.
+   *
+   * By default ES will back up all indices and data streams if this is an empty array or left blank.
+   * However, in the UI, under certain conditions, like when displaying indices to select for backup,
+   * we want to block users from submitting an empty array, but not block the entire form if they
+   * are not configuring this value - like when they are on a previous step.
+   */
+  validateIndicesCount?: boolean;
+}
+
 export const validatePolicy = (
   policy: SlmPolicyPayload,
-  validationHelperData: {
-    managedRepository?: {
-      name: string;
-      policy: string;
-    };
-    isEditing?: boolean;
-    policyName?: string;
-  }
+  validationHelperData: ValidatePolicyHelperData
 ): PolicyValidation => {
   const i18n = textService.i18n;
 
   const { name, snapshotName, schedule, repository, config, retention } = policy;
-  const { managedRepository, isEditing, policyName } = validationHelperData;
+  const { managedRepository, isEditing, policyName, validateIndicesCount } = validationHelperData;
 
   const validation: PolicyValidation = {
     isValid: true,
@@ -96,7 +107,12 @@ export const validatePolicy = (
     );
   }
 
-  if (config && typeof config.indices === 'string' && config.indices.trim().length === 0) {
+  if (
+    validateIndicesCount &&
+    config &&
+    typeof config.indices === 'string' &&
+    config.indices.trim().length === 0
+  ) {
     validation.errors.indices.push(
       i18n.translate('xpack.snapshotRestore.policyValidation.indexPatternRequiredErrorMessage', {
         defaultMessage: 'At least one index pattern is required.',
@@ -104,7 +120,12 @@ export const validatePolicy = (
     );
   }
 
-  if (config && Array.isArray(config.indices) && config.indices.length === 0) {
+  if (
+    validateIndicesCount &&
+    config &&
+    Array.isArray(config.indices) &&
+    config.indices.length === 0
+  ) {
     validation.errors.indices.push(
       i18n.translate('xpack.snapshotRestore.policyValidation.indicesRequiredErrorMessage', {
         defaultMessage: 'You must select at least one data stream or index.',

From ef63dc8c613c979a20a64c28b871d8c272231dd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Mon, 31 Aug 2020 21:46:38 +0200
Subject: [PATCH 123/216] [Security Solution] Refactor Network TLS to use
 Search Strategy (#76241)

---
 .../security_solution/hosts/all/index.ts      |  14 +-
 .../security_solution/hosts/common/index.ts   |   5 +
 .../hosts/first_last_seen/index.ts            |   4 +-
 .../security_solution/hosts/overview/index.ts |   4 +-
 .../security_solution/index.ts                |  21 +-
 .../security_solution/network/index.ts        |  11 +
 .../security_solution/network/tls/index.ts    |  64 ++++
 .../public/network/containers/tls/index.tsx   | 289 ++++++++++--------
 .../network/containers/tls/translations.ts    |  21 ++
 .../pages/ip_details/tls_query_table.tsx      |  62 ++--
 .../pages/navigation/tls_query_tab_body.tsx   |  68 +++--
 .../factory/hosts/all/query.all_hosts.dsl.ts  |  10 +-
 .../security_solution/factory/index.ts        |   2 +
 .../factory/network/index.ts                  |  15 +
 .../factory/network/tls/helpers.ts            |  35 +++
 .../factory/network/tls/index.ts              |  59 ++++
 .../network/tls/query.tls_network.dsl.ts      | 108 +++++++
 17 files changed, 579 insertions(+), 213 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
 create mode 100644 x-pack/plugins/security_solution/public/network/containers/tls/translations.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/query.tls_network.dsl.ts

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
index cd8a58d03d30c0..91a53066b4f4b1 100644
--- 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
@@ -6,15 +6,8 @@
 
 import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
 
-import { HostItem } from '../common';
-import {
-  CursorType,
-  Inspect,
-  Maybe,
-  PageInfoPaginated,
-  RequestOptionsPaginated,
-  SortField,
-} from '../..';
+import { HostItem, HostsFields } from '../common';
+import { CursorType, Inspect, Maybe, PageInfoPaginated, RequestOptionsPaginated } from '../..';
 
 export interface HostsEdges {
   node: HostItem;
@@ -29,7 +22,6 @@ export interface HostsStrategyResponse extends IEsSearchResponse {
   inspect?: Maybe<Inspect>;
 }
 
-export interface HostsRequestOptions extends RequestOptionsPaginated {
-  sort: SortField;
+export interface HostsRequestOptions extends RequestOptionsPaginated<HostsFields> {
   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
index fb4fd762a86bf3..d15da4bf07ae74 100644
--- 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
@@ -14,6 +14,11 @@ export enum HostPolicyResponseActionStatus {
   warning = 'warning',
 }
 
+export enum HostsFields {
+  lastSeen = 'lastSeen',
+  hostName = 'hostName',
+}
+
 export interface EndpointFields {
   endpointPolicy?: Maybe<string>;
   sensorVersion?: Maybe<string>;
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
index 93a5c0582fb968..cbabe9dd111153 100644
--- 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
@@ -6,8 +6,10 @@
 
 import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
 import { Inspect, Maybe, RequestOptionsPaginated } from '../..';
+import { HostsFields } from '../common';
 
-export interface HostFirstLastSeenRequestOptions extends Partial<RequestOptionsPaginated> {
+export interface HostFirstLastSeenRequestOptions
+  extends Partial<RequestOptionsPaginated<HostsFields>> {
   hostName: string;
 }
 export interface HostFirstLastSeenStrategyResponse extends IEsSearchResponse {
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
index bc797e7a03fb87..8d54481f56dbde 100644
--- 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
@@ -6,7 +6,7 @@
 
 import { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
 
-import { HostItem } from '../common';
+import { HostItem, HostsFields } from '../common';
 import { Inspect, Maybe, RequestOptionsPaginated, TimerangeInput } from '../..';
 
 export interface HostOverviewStrategyResponse extends IEsSearchResponse {
@@ -14,7 +14,7 @@ export interface HostOverviewStrategyResponse extends IEsSearchResponse {
   inspect?: Maybe<Inspect>;
 }
 
-export interface HostOverviewRequestOptions extends Partial<RequestOptionsPaginated> {
+export interface HostOverviewRequestOptions extends Partial<RequestOptionsPaginated<HostsFields>> {
   hostName: string;
   skip?: boolean;
   timerange: TimerangeInput;
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 073b96e400f5c4..175784bc5ade57 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
@@ -15,10 +15,13 @@ import {
   HostsRequestOptions,
   HostsStrategyResponse,
 } from './hosts';
+import { NetworkQueries, NetworkTlsStrategyResponse, NetworkTlsRequestOptions } from './network';
+
 export * from './hosts';
+export * from './network';
 export type Maybe<T> = T | null;
 
-export type FactoryQueryTypes = HostsQueries;
+export type FactoryQueryTypes = HostsQueries | NetworkQueries;
 
 export type SearchHit = IEsSearchResponse<object>['rawResponse']['hits']['hits'][0];
 
@@ -48,8 +51,8 @@ export enum Direction {
   desc = 'desc',
 }
 
-export interface SortField {
-  field: 'lastSeen' | 'hostName';
+export interface SortField<Field = string> {
+  field: Field;
   direction: Direction;
 }
 
@@ -95,14 +98,14 @@ export interface RequestBasicOptions extends IEsSearchRequest {
   factoryQueryType?: FactoryQueryTypes;
 }
 
-export interface RequestOptions extends RequestBasicOptions {
+export interface RequestOptions<Field = string> extends RequestBasicOptions {
   pagination: PaginationInput;
-  sortField?: SortField;
+  sort: SortField<Field>;
 }
 
-export interface RequestOptionsPaginated extends RequestBasicOptions {
+export interface RequestOptionsPaginated<Field = string> extends RequestBasicOptions {
   pagination: PaginationInputPaginated;
-  sortField?: SortField;
+  sort: SortField<Field>;
 }
 
 export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQueries.hosts
@@ -111,6 +114,8 @@ export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQ
   ? HostOverviewStrategyResponse
   : T extends HostsQueries.firstLastSeen
   ? HostFirstLastSeenStrategyResponse
+  : T extends NetworkQueries.tls
+  ? NetworkTlsStrategyResponse
   : never;
 
 export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQueries.hosts
@@ -119,4 +124,6 @@ export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQu
   ? HostOverviewRequestOptions
   : T extends HostsQueries.firstLastSeen
   ? HostFirstLastSeenRequestOptions
+  : T extends NetworkQueries.tls
+  ? NetworkTlsRequestOptions
   : never;
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts
new file mode 100644
index 00000000000000..680a3697ef0bd5
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/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 * from './tls';
+
+export enum NetworkQueries {
+  tls = 'tls',
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.ts
new file mode 100644
index 00000000000000..c9e593bb7a7d2d
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/tls/index.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 { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+import { CursorType, Inspect, Maybe, PageInfoPaginated, RequestOptionsPaginated } from '../..';
+
+export interface TlsBuckets {
+  key: string;
+  timestamp?: {
+    value: number;
+    value_as_string: string;
+  };
+  subjects: {
+    buckets: Readonly<Array<{ key: string; doc_count: number }>>;
+  };
+  ja3: {
+    buckets: Readonly<Array<{ key: string; doc_count: number }>>;
+  };
+  issuers: {
+    buckets: Readonly<Array<{ key: string; doc_count: number }>>;
+  };
+  not_after: {
+    buckets: Readonly<Array<{ key: number; key_as_string: string; doc_count: number }>>;
+  };
+}
+
+export interface TlsNode {
+  _id?: Maybe<string>;
+  timestamp?: Maybe<string>;
+  notAfter?: Maybe<string[]>;
+  subjects?: Maybe<string[]>;
+  ja3?: Maybe<string[]>;
+  issuers?: Maybe<string[]>;
+}
+
+export enum FlowTargetSourceDest {
+  destination = 'destination',
+  source = 'source',
+}
+
+export enum TlsFields {
+  _id = '_id',
+}
+
+export interface TlsEdges {
+  node: TlsNode;
+  cursor: CursorType;
+}
+
+export interface NetworkTlsRequestOptions extends RequestOptionsPaginated<TlsFields> {
+  ip: string;
+  flowTarget: FlowTargetSourceDest;
+  defaultIndex: string[];
+}
+
+export interface NetworkTlsStrategyResponse extends IEsSearchResponse {
+  edges: TlsEdges[];
+  totalCount: number;
+  pageInfo: PageInfoPaginated;
+  inspect?: Maybe<Inspect>;
+}
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
index 17506f9a01cb92..77c6446fbb3d05 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -4,38 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getOr } from 'lodash/fp';
-import React from 'react';
-import { Query } from 'react-apollo';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
+import { noop } from 'lodash/fp';
+import { useState, useEffect, useCallback, useRef } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+import deepEqual from 'fast-deep-equal';
 
+import { ESTermQuery } from '../../../../common/typed_json';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
-import {
-  PageInfoPaginated,
-  TlsEdges,
-  TlsSortField,
-  GetTlsQuery,
-  FlowTargetSourceDest,
-} from '../../../graphql/types';
-import { inputsModel, State, inputsSelectors } from '../../../common/store';
-import { withKibana, WithKibanaProps } from '../../../common/lib/kibana';
-import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers';
+import { inputsModel, State } from '../../../common/store';
+import { useKibana } from '../../../common/lib/kibana';
+import { createFilter } from '../../../common/containers/helpers';
+import { TlsEdges, PageInfoPaginated, FlowTargetSourceDest } from '../../../graphql/types';
 import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers';
-import {
-  QueryTemplatePaginated,
-  QueryTemplatePaginatedProps,
-} from '../../../common/containers/query_template_paginated';
 import { networkModel, networkSelectors } from '../../store';
-import { tlsQuery } from './index.gql_query';
+import {
+  NetworkQueries,
+  NetworkTlsRequestOptions,
+  NetworkTlsStrategyResponse,
+} from '../../../../common/search_strategy/security_solution/network';
+import { AbortError } from '../../../../../../../src/plugins/data/common';
+import * as i18n from './translations';
 
-const ID = 'tlsQuery';
+const ID = 'networkTlsQuery';
 
-export interface TlsArgs {
+export interface NetworkTlsArgs {
   id: string;
   inspect: inputsModel.InspectQuery;
   isInspected: boolean;
-  loading: boolean;
   loadPage: (newActivePage: number) => void;
   pageInfo: PageInfoPaginated;
   refetch: inputsModel.Refetch;
@@ -43,121 +38,159 @@ export interface TlsArgs {
   totalCount: number;
 }
 
-export interface OwnProps extends QueryTemplatePaginatedProps {
-  children: (args: TlsArgs) => React.ReactNode;
+interface UseNetworkTls {
   flowTarget: FlowTargetSourceDest;
   ip: string;
   type: networkModel.NetworkType;
+  filterQuery?: ESTermQuery | string;
+  endDate: string;
+  startDate: string;
+  skip: boolean;
+  id?: string;
 }
 
-export interface TlsComponentReduxProps {
-  activePage: number;
-  isInspected: boolean;
-  limit: number;
-  sort: TlsSortField;
-}
+export const useNetworkTls = ({
+  endDate,
+  filterQuery,
+  flowTarget,
+  id = ID,
+  ip,
+  skip,
+  startDate,
+  type,
+}: UseNetworkTls): [boolean, NetworkTlsArgs] => {
+  const getTlsSelector = networkSelectors.tlsSelector();
+  const { activePage, limit, sort } = useSelector(
+    (state: State) => getTlsSelector(state, type, flowTarget),
+    shallowEqual
+  );
+  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 [networkTlsRequest, setHostRequest] = useState<NetworkTlsRequestOptions>({
+    defaultIndex,
+    factoryQueryType: NetworkQueries.tls,
+    filterQuery: createFilter(filterQuery),
+    flowTarget,
+    ip,
+    pagination: generateTablePaginationOptions(activePage, limit),
+    sort,
+    timerange: {
+      interval: '12h',
+      from: startDate ? startDate : '',
+      to: endDate ? endDate : new Date(Date.now()).toISOString(),
+    },
+  });
+
+  const wrappedLoadMore = useCallback(
+    (newActivePage: number) => {
+      setHostRequest((prevRequest) => ({
+        ...prevRequest,
+        pagination: generateTablePaginationOptions(newActivePage, limit),
+      }));
+    },
+    [limit]
+  );
 
-type TlsProps = OwnProps & TlsComponentReduxProps & WithKibanaProps;
+  const [networkTlsResponse, setNetworkTlsResponse] = useState<NetworkTlsArgs>({
+    tls: [],
+    id: ID,
+    inspect: {
+      dsl: [],
+      response: [],
+    },
+    isInspected: false,
+    loadPage: wrappedLoadMore,
+    pageInfo: {
+      activePage: 0,
+      fakeTotalCount: 0,
+      showMorePagesIndicator: false,
+    },
+    refetch: refetch.current,
+    totalCount: -1,
+  });
 
-class TlsComponentQuery extends QueryTemplatePaginated<
-  TlsProps,
-  GetTlsQuery.Query,
-  GetTlsQuery.Variables
-> {
-  public render() {
-    const {
-      activePage,
-      children,
-      endDate,
-      filterQuery,
-      flowTarget,
-      id = ID,
-      ip,
-      isInspected,
-      kibana,
-      limit,
-      skip,
-      sourceId,
-      startDate,
-      sort,
-    } = this.props;
-    const variables: GetTlsQuery.Variables = {
-      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
-      filterQuery: createFilter(filterQuery),
-      flowTarget,
-      inspect: isInspected,
-      ip,
-      pagination: generateTablePaginationOptions(activePage, limit),
-      sort,
-      sourceId,
-      timerange: {
-        interval: '12h',
-        from: startDate ? startDate : '',
-        to: endDate ? endDate : new Date(Date.now()).toISOString(),
-      },
-    };
-    return (
-      <Query<GetTlsQuery.Query, GetTlsQuery.Variables>
-        query={tlsQuery}
-        fetchPolicy={getDefaultFetchPolicy()}
-        notifyOnNetworkStatusChange
-        skip={skip}
-        variables={variables}
-      >
-        {({ data, loading, fetchMore, networkStatus, refetch }) => {
-          const tls = getOr([], 'source.Tls.edges', data);
-          this.setFetchMore(fetchMore);
-          this.setFetchMoreOptions((newActivePage: number) => ({
-            variables: {
-              pagination: generateTablePaginationOptions(newActivePage, limit),
+  const networkTlsSearch = useCallback(
+    (request: NetworkTlsRequestOptions) => {
+      let didCancel = false;
+      const asyncSearch = async () => {
+        abortCtrl.current = new AbortController();
+        setLoading(true);
+
+        const searchSubscription$ = data.search
+          .search<NetworkTlsRequestOptions, NetworkTlsStrategyResponse>(request, {
+            strategy: 'securitySolutionSearchStrategy',
+            signal: abortCtrl.current.signal,
+          })
+          .subscribe({
+            next: (response) => {
+              if (!response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                  setNetworkTlsResponse((prevResponse) => ({
+                    ...prevResponse,
+                    tls: response.edges,
+                    inspect: response.inspect ?? prevResponse.inspect,
+                    pageInfo: response.pageInfo,
+                    refetch: refetch.current,
+                    totalCount: response.totalCount,
+                  }));
+                }
+                searchSubscription$.unsubscribe();
+              } else if (response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                }
+                // TODO: Make response error status clearer
+                notifications.toasts.addWarning(i18n.ERROR_NETWORK_TLS);
+                searchSubscription$.unsubscribe();
+              }
             },
-            updateQuery: (prev, { fetchMoreResult }) => {
-              if (!fetchMoreResult) {
-                return prev;
+            error: (msg) => {
+              if (!(msg instanceof AbortError)) {
+                notifications.toasts.addDanger({ title: i18n.FAIL_NETWORK_TLS, text: msg.message });
               }
-              return {
-                ...fetchMoreResult,
-                source: {
-                  ...fetchMoreResult.source,
-                  Tls: {
-                    ...fetchMoreResult.source.Tls,
-                    edges: [...fetchMoreResult.source.Tls.edges],
-                  },
-                },
-              };
             },
-          }));
-          const isLoading = this.isItAValidLoading(loading, variables, networkStatus);
-          return children({
-            id,
-            inspect: getOr(null, 'source.Tls.inspect', data),
-            isInspected,
-            loading: isLoading,
-            loadPage: this.wrappedLoadMore,
-            pageInfo: getOr({}, 'source.Tls.pageInfo', data),
-            refetch: this.memoizedRefetchQuery(variables, limit, refetch),
-            tls,
-            totalCount: getOr(-1, 'source.Tls.totalCount', data),
           });
-        }}
-      </Query>
-    );
-  }
-}
+      };
+      abortCtrl.current.abort();
+      asyncSearch();
+      refetch.current = asyncSearch;
+      return () => {
+        didCancel = true;
+        abortCtrl.current.abort();
+      };
+    },
+    [data.search, notifications.toasts]
+  );
 
-const makeMapStateToProps = () => {
-  const getTlsSelector = networkSelectors.tlsSelector();
-  const getQuery = inputsSelectors.globalQueryByIdSelector();
-  return (state: State, { flowTarget, id = ID, type }: OwnProps) => {
-    const { isInspected } = getQuery(state, id);
-    return {
-      ...getTlsSelector(state, type, flowTarget),
-      isInspected,
-    };
-  };
-};
+  useEffect(() => {
+    setHostRequest((prevRequest) => {
+      const myRequest = {
+        ...prevRequest,
+        defaultIndex,
+        filterQuery: createFilter(filterQuery),
+        pagination: generateTablePaginationOptions(activePage, limit),
+        timerange: {
+          interval: '12h',
+          from: startDate,
+          to: endDate,
+        },
+        sort,
+      };
+      if (!skip && !deepEqual(prevRequest, myRequest)) {
+        return myRequest;
+      }
+      return prevRequest;
+    });
+  }, [activePage, defaultIndex, endDate, filterQuery, limit, startDate, sort, skip]);
+
+  useEffect(() => {
+    networkTlsSearch(networkTlsRequest);
+  }, [networkTlsRequest, networkTlsSearch]);
 
-export const TlsQuery = compose<React.ComponentClass<OwnProps>>(
-  connect(makeMapStateToProps),
-  withKibana
-)(TlsComponentQuery);
+  return [loading, networkTlsResponse];
+};
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/translations.ts b/x-pack/plugins/security_solution/public/network/containers/tls/translations.ts
new file mode 100644
index 00000000000000..aafa3ff0a98b0a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/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_NETWORK_TLS = i18n.translate(
+  'xpack.securitySolution.networkTls.errorSearchDescription',
+  {
+    defaultMessage: `An error has occurred on network tls search`,
+  }
+);
+
+export const FAIL_NETWORK_TLS = i18n.translate(
+  'xpack.securitySolution.networkTls.failSearchDescription',
+  {
+    defaultMessage: `Failed to run search on network tls`,
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/network/pages/ip_details/tls_query_table.tsx b/x-pack/plugins/security_solution/public/network/pages/ip_details/tls_query_table.tsx
index f0c3628af78d85..5184fccecf07a5 100644
--- a/x-pack/plugins/security_solution/public/network/pages/ip_details/tls_query_table.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/ip_details/tls_query_table.tsx
@@ -8,7 +8,7 @@ import { getOr } from 'lodash/fp';
 import React from 'react';
 import { manageQuery } from '../../../common/components/page/manage_query';
 import { TlsTable } from '../../components/tls_table';
-import { TlsQuery } from '../../containers/tls';
+import { useNetworkTls } from '../../containers/tls';
 import { TlsQueryTableComponentProps } from './types';
 
 const TlsTableManage = manageQuery(TlsTable);
@@ -22,34 +22,36 @@ export const TlsQueryTable = ({
   skip,
   startDate,
   type,
-}: TlsQueryTableComponentProps) => (
-  <TlsQuery
-    endDate={endDate}
-    filterQuery={filterQuery}
-    flowTarget={flowTarget}
-    ip={ip}
-    skip={skip}
-    sourceId="default"
-    startDate={startDate}
-    type={type}
-  >
-    {({ id, inspect, isInspected, tls, totalCount, pageInfo, loading, loadPage, refetch }) => (
-      <TlsTableManage
-        data={tls}
-        id={id}
-        inspect={inspect}
-        isInspect={isInspected}
-        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
-        loading={loading}
-        loadPage={loadPage}
-        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
-        refetch={refetch}
-        setQuery={setQuery}
-        totalCount={totalCount}
-        type={type}
-      />
-    )}
-  </TlsQuery>
-);
+}: TlsQueryTableComponentProps) => {
+  const [
+    loading,
+    { id, inspect, isInspected, tls, totalCount, pageInfo, loadPage, refetch },
+  ] = useNetworkTls({
+    endDate,
+    filterQuery,
+    flowTarget,
+    ip,
+    skip,
+    startDate,
+    type,
+  });
+
+  return (
+    <TlsTableManage
+      data={tls}
+      id={id}
+      inspect={inspect}
+      isInspect={isInspected}
+      fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+      loading={loading}
+      loadPage={loadPage}
+      showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+      refetch={refetch}
+      setQuery={setQuery}
+      totalCount={totalCount}
+      type={type}
+    />
+  );
+};
 
 TlsQueryTable.displayName = 'TlsQueryTable';
diff --git a/x-pack/plugins/security_solution/public/network/pages/navigation/tls_query_tab_body.tsx b/x-pack/plugins/security_solution/public/network/pages/navigation/tls_query_tab_body.tsx
index 00da5496e54405..279891cc181e3d 100644
--- a/x-pack/plugins/security_solution/public/network/pages/navigation/tls_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/navigation/tls_query_tab_body.tsx
@@ -6,13 +6,13 @@
 import React from 'react';
 import { getOr } from 'lodash/fp';
 import { manageQuery } from '../../../common/components/page/manage_query';
-import { TlsQuery } from '../../../network/containers/tls';
+import { useNetworkTls } from '../../../network/containers/tls';
 import { TlsTable } from '../../components/tls_table';
 import { TlsQueryTabBodyProps } from './types';
 
 const TlsTableManage = manageQuery(TlsTable);
 
-export const TlsQueryTabBody = ({
+const TlsQueryTabBodyComponent: React.FC<TlsQueryTabBodyProps> = ({
   endDate,
   filterQuery,
   flowTarget,
@@ -21,32 +21,38 @@ export const TlsQueryTabBody = ({
   skip,
   startDate,
   type,
-}: TlsQueryTabBodyProps) => (
-  <TlsQuery
-    endDate={endDate}
-    filterQuery={filterQuery}
-    flowTarget={flowTarget}
-    ip={ip}
-    skip={skip}
-    sourceId="default"
-    startDate={startDate}
-    type={type}
-  >
-    {({ id, inspect, isInspected, tls, totalCount, pageInfo, loading, loadPage, refetch }) => (
-      <TlsTableManage
-        data={tls}
-        id={id}
-        inspect={inspect}
-        isInspect={isInspected}
-        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
-        loading={loading}
-        loadPage={loadPage}
-        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
-        refetch={refetch}
-        setQuery={setQuery}
-        totalCount={totalCount}
-        type={type}
-      />
-    )}
-  </TlsQuery>
-);
+}) => {
+  const [
+    loading,
+    { id, inspect, isInspected, tls, totalCount, pageInfo, loadPage, refetch },
+  ] = useNetworkTls({
+    endDate,
+    filterQuery,
+    flowTarget,
+    ip,
+    skip,
+    startDate,
+    type,
+  });
+
+  return (
+    <TlsTableManage
+      data={tls}
+      id={id}
+      inspect={inspect}
+      isInspect={isInspected}
+      fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+      loading={loading}
+      loadPage={loadPage}
+      showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+      refetch={refetch}
+      setQuery={setQuery}
+      totalCount={totalCount}
+      type={type}
+    />
+  );
+};
+
+TlsQueryTabBodyComponent.displayName = 'TlsQueryTabBodyComponent';
+
+export const TlsQueryTabBody = React.memo(TlsQueryTabBodyComponent);
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
index a9101f54ada55c..ea1b896452c4e8 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/all/query.all_hosts.dsl.ts
@@ -10,8 +10,10 @@ import {
   Direction,
   HostsRequestOptions,
   SortField,
+  HostsFields,
 } from '../../../../../../common/search_strategy/security_solution';
 import { createQueryFilterClauses } from '../../../../../utils/build_query';
+import { assertUnreachable } from '../../../../../../common/utility_types';
 
 export const buildHostsQuery = ({
   defaultIndex,
@@ -77,11 +79,13 @@ export const buildHostsQuery = ({
 
 type QueryOrder = { lastSeen: Direction } | { _key: Direction };
 
-const getQueryOrder = (sort: SortField): QueryOrder => {
+const getQueryOrder = (sort: SortField<HostsFields>): QueryOrder => {
   switch (sort.field) {
-    case 'lastSeen':
+    case HostsFields.lastSeen:
       return { lastSeen: sort.direction };
-    case 'hostName':
+    case HostsFields.hostName:
       return { _key: sort.direction };
+    default:
+      return assertUnreachable(sort.field as never);
   }
 };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/index.ts
index 53433dfc208cbc..a50c9e40048562 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/index.ts
@@ -7,6 +7,7 @@
 import { FactoryQueryTypes } from '../../../../common/search_strategy/security_solution';
 
 import { hostsFactory } from './hosts';
+import { networkFactory } from './network';
 import { SecuritySolutionFactory } from './types';
 
 export const securitySolutionFactory: Record<
@@ -14,4 +15,5 @@ export const securitySolutionFactory: Record<
   SecuritySolutionFactory<FactoryQueryTypes>
 > = {
   ...hostsFactory,
+  ...networkFactory,
 };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts
new file mode 100644
index 00000000000000..2c21d9741d648f
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.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 { FactoryQueryTypes } from '../../../../../common/search_strategy/security_solution';
+import { NetworkQueries } from '../../../../../common/search_strategy/security_solution/network';
+
+import { SecuritySolutionFactory } from '../types';
+import { networkTls } from './tls';
+
+export const networkFactory: Record<NetworkQueries, SecuritySolutionFactory<FactoryQueryTypes>> = {
+  [NetworkQueries.tls]: networkTls,
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.ts
new file mode 100644
index 00000000000000..59359fd35a34eb
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/helpers.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 { getOr } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import {
+  TlsBuckets,
+  TlsEdges,
+} from '../../../../../../common/search_strategy/security_solution/network';
+
+export const getTlsEdges = (response: IEsSearchResponse<unknown>): TlsEdges[] =>
+  formatTlsEdges(getOr([], 'aggregations.sha1.buckets', response.rawResponse));
+
+export const formatTlsEdges = (buckets: TlsBuckets[]): TlsEdges[] =>
+  buckets.map((bucket: TlsBuckets) => {
+    const edge: TlsEdges = {
+      node: {
+        _id: bucket.key,
+        subjects: bucket.subjects.buckets.map(({ key }) => key),
+        ja3: bucket.ja3.buckets.map(({ key }) => key),
+        issuers: bucket.issuers.buckets.map(({ key }) => key),
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        notAfter: bucket.not_after.buckets.map(({ key_as_string }) => key_as_string),
+      },
+      cursor: {
+        value: bucket.key,
+        tiebreaker: null,
+      },
+    };
+    return edge;
+  });
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
new file mode 100644
index 00000000000000..32836c0ef6869e
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/index.ts
@@ -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 { getOr } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+
+import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
+import {
+  NetworkTlsStrategyResponse,
+  NetworkQueries,
+  NetworkTlsRequestOptions,
+  TlsEdges,
+} from '../../../../../../common/search_strategy/security_solution/network';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import { SecuritySolutionFactory } from '../../types';
+
+import { getTlsEdges } from './helpers';
+import { buildTlsQuery } from './query.tls_network.dsl';
+
+export const networkTls: SecuritySolutionFactory<NetworkQueries.tls> = {
+  buildDsl: (options: NetworkTlsRequestOptions) => {
+    if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
+      throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
+    }
+    return buildTlsQuery(options);
+  },
+  parse: async (
+    options: NetworkTlsRequestOptions,
+    response: IEsSearchResponse<unknown>
+  ): Promise<NetworkTlsStrategyResponse> => {
+    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
+    const totalCount = getOr(0, 'aggregations.count.value', response.rawResponse);
+    const tlsEdges: TlsEdges[] = getTlsEdges(response);
+    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
+    const edges = tlsEdges.splice(cursorStart, querySize - cursorStart);
+    const inspect = {
+      dsl: [inspectStringifyObject(buildTlsQuery(options))],
+      response: [inspectStringifyObject(response)],
+    };
+    const showMorePagesIndicator = totalCount > fakeTotalCount;
+
+    return {
+      ...response,
+      edges,
+      inspect,
+      pageInfo: {
+        activePage: activePage ? activePage : 0,
+        fakeTotalCount,
+        showMorePagesIndicator,
+      },
+      totalCount,
+    };
+  },
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/query.tls_network.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/query.tls_network.dsl.ts
new file mode 100644
index 00000000000000..eb4e25c29e3a13
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/tls/query.tls_network.dsl.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 { assertUnreachable } from '../../../../../../common/utility_types';
+import { createQueryFilterClauses } from '../../../../../utils/build_query';
+
+import {
+  NetworkTlsRequestOptions,
+  SortField,
+  Direction,
+  TlsFields,
+} from '../../../../../../common/search_strategy/security_solution';
+
+const getAggs = (querySize: number, sort: SortField<TlsFields>) => ({
+  count: {
+    cardinality: {
+      field: 'tls.server.hash.sha1',
+    },
+  },
+  sha1: {
+    terms: {
+      field: 'tls.server.hash.sha1',
+      size: querySize,
+      order: {
+        ...getQueryOrder(sort),
+      },
+    },
+    aggs: {
+      issuers: {
+        terms: {
+          field: 'tls.server.issuer',
+        },
+      },
+      subjects: {
+        terms: {
+          field: 'tls.server.subject',
+        },
+      },
+      not_after: {
+        terms: {
+          field: 'tls.server.not_after',
+        },
+      },
+      ja3: {
+        terms: {
+          field: 'tls.server.ja3s',
+        },
+      },
+    },
+  },
+});
+
+export const buildTlsQuery = ({
+  ip,
+  sort,
+  filterQuery,
+  flowTarget,
+  pagination: { querySize },
+  defaultIndex,
+  timerange: { from, to },
+}: NetworkTlsRequestOptions) => {
+  const defaultFilter = [
+    ...createQueryFilterClauses(filterQuery),
+    {
+      range: {
+        '@timestamp': { gte: from, lte: to, format: 'strict_date_optional_time' },
+      },
+    },
+  ];
+
+  const filter = ip ? [...defaultFilter, { term: { [`${flowTarget}.ip`]: ip } }] : defaultFilter;
+
+  const dslQuery = {
+    allowNoIndices: true,
+    index: defaultIndex,
+    ignoreUnavailable: true,
+    body: {
+      aggs: {
+        ...getAggs(querySize, sort),
+      },
+      query: {
+        bool: {
+          filter,
+        },
+      },
+      size: 0,
+      track_total_hits: false,
+    },
+  };
+
+  return dslQuery;
+};
+
+interface QueryOrder {
+  _key: Direction;
+}
+
+const getQueryOrder = (sort: SortField<TlsFields>): QueryOrder => {
+  switch (sort.field) {
+    case TlsFields._id:
+      return { _key: sort.direction };
+    default:
+      return assertUnreachable(sort.field);
+  }
+};

From 325b82b09c5f91b1d49b43430990bf0a7a2daa48 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Mon, 31 Aug 2020 21:49:22 +0200
Subject: [PATCH 124/216] replace /elasticsearch/_msearch usages with custom
 endpoint (#76259)

---
 .../components/tutorial/tutorial.js           | 28 ++++-----
 src/plugins/home/server/plugin.test.ts        | 29 +++++++--
 src/plugins/home/server/plugin.ts             |  5 ++
 .../server/routes/fetch_es_hits_status.ts     | 60 +++++++++++++++++++
 src/plugins/home/server/routes/index.ts       | 25 ++++++++
 5 files changed, 123 insertions(+), 24 deletions(-)
 create mode 100644 src/plugins/home/server/routes/fetch_es_hits_status.ts
 create mode 100644 src/plugins/home/server/routes/index.ts

diff --git a/src/plugins/home/public/application/components/tutorial/tutorial.js b/src/plugins/home/public/application/components/tutorial/tutorial.js
index 8139bc6d38ab1d..f55462bdc9e288 100644
--- a/src/plugins/home/public/application/components/tutorial/tutorial.js
+++ b/src/plugins/home/public/application/components/tutorial/tutorial.js
@@ -201,26 +201,18 @@ class TutorialUi extends React.Component {
    * @return {Promise<string>}
    */
   fetchEsHitsStatus = async (esHitsCheckConfig) => {
-    const searchHeader = JSON.stringify({ index: esHitsCheckConfig.index });
-    const searchBody = JSON.stringify({ query: esHitsCheckConfig.query, size: 1 });
-    const response = await fetch(this.props.addBasePath('/elasticsearch/_msearch'), {
-      method: 'post',
-      body: `${searchHeader}\n${searchBody}\n`,
-      headers: {
-        accept: 'application/json',
-        'content-type': 'application/x-ndjson',
-        'kbn-xsrf': 'kibana',
-      },
-      credentials: 'same-origin',
-    });
-
-    if (response.status > 300) {
+    const { http } = getServices();
+    try {
+      const response = await http.post('/api/home/hits_status', {
+        body: JSON.stringify({
+          index: esHitsCheckConfig.index,
+          query: esHitsCheckConfig.query,
+        }),
+      });
+      return response.count > 0 ? StatusCheckStates.HAS_DATA : StatusCheckStates.NO_DATA;
+    } catch (e) {
       return StatusCheckStates.ERROR;
     }
-
-    const results = await response.json();
-    const numHits = _.get(results, 'responses.[0].hits.hits.length', 0);
-    return numHits === 0 ? StatusCheckStates.NO_DATA : StatusCheckStates.HAS_DATA;
   };
 
   renderInstructionSetsToggle = () => {
diff --git a/src/plugins/home/server/plugin.test.ts b/src/plugins/home/server/plugin.test.ts
index 33d907315e5124..58103430b4d7c0 100644
--- a/src/plugins/home/server/plugin.test.ts
+++ b/src/plugins/home/server/plugin.test.ts
@@ -19,10 +19,7 @@
 
 import { registryForTutorialsMock, registryForSampleDataMock } from './plugin.test.mocks';
 import { HomeServerPlugin } from './plugin';
-import { coreMock } from '../../../core/server/mocks';
-import { CoreSetup } from '../../../core/server';
-
-type MockedKeys<T> = { [P in keyof T]: jest.Mocked<T[P]> };
+import { coreMock, httpServiceMock } from '../../../core/server/mocks';
 
 describe('HomeServerPlugin', () => {
   beforeEach(() => {
@@ -33,8 +30,16 @@ describe('HomeServerPlugin', () => {
   });
 
   describe('setup', () => {
-    const mockCoreSetup: MockedKeys<CoreSetup> = coreMock.createSetup();
-    const initContext = coreMock.createPluginInitializerContext();
+    let mockCoreSetup: ReturnType<typeof coreMock.createSetup>;
+    let initContext: ReturnType<typeof coreMock.createPluginInitializerContext>;
+    let routerMock: ReturnType<typeof httpServiceMock.createRouter>;
+
+    beforeEach(() => {
+      mockCoreSetup = coreMock.createSetup();
+      routerMock = httpServiceMock.createRouter();
+      mockCoreSetup.http.createRouter.mockReturnValue(routerMock);
+      initContext = coreMock.createPluginInitializerContext();
+    });
 
     test('wires up tutorials provider service and returns registerTutorial and addScopedTutorialContextFactory', () => {
       const setup = new HomeServerPlugin(initContext).setup(mockCoreSetup, {});
@@ -52,6 +57,18 @@ describe('HomeServerPlugin', () => {
       expect(setup.sampleData).toHaveProperty('addAppLinksToSampleDataset');
       expect(setup.sampleData).toHaveProperty('replacePanelInSampleDatasetDashboard');
     });
+
+    test('registers the `/api/home/hits_status` route', () => {
+      new HomeServerPlugin(initContext).setup(mockCoreSetup, {});
+
+      expect(routerMock.post).toHaveBeenCalledTimes(1);
+      expect(routerMock.post).toHaveBeenCalledWith(
+        expect.objectContaining({
+          path: '/api/home/hits_status',
+        }),
+        expect.any(Function)
+      );
+    });
   });
 
   describe('start', () => {
diff --git a/src/plugins/home/server/plugin.ts b/src/plugins/home/server/plugin.ts
index 1050c19362ae17..a2f8eec686b211 100644
--- a/src/plugins/home/server/plugin.ts
+++ b/src/plugins/home/server/plugin.ts
@@ -28,6 +28,7 @@ import {
 import { UsageCollectionSetup } from '../../usage_collection/server';
 import { capabilitiesProvider } from './capabilities_provider';
 import { sampleDataTelemetry } from './saved_objects';
+import { registerRoutes } from './routes';
 
 interface HomeServerPluginSetupDependencies {
   usageCollection?: UsageCollectionSetup;
@@ -41,6 +42,10 @@ export class HomeServerPlugin implements Plugin<HomeServerPluginSetup, HomeServe
   public setup(core: CoreSetup, plugins: HomeServerPluginSetupDependencies): HomeServerPluginSetup {
     core.capabilities.registerProvider(capabilitiesProvider);
     core.savedObjects.registerType(sampleDataTelemetry);
+
+    const router = core.http.createRouter();
+    registerRoutes(router);
+
     return {
       tutorials: { ...this.tutorialsRegistry.setup(core) },
       sampleData: { ...this.sampleDataRegistry.setup(core, plugins.usageCollection) },
diff --git a/src/plugins/home/server/routes/fetch_es_hits_status.ts b/src/plugins/home/server/routes/fetch_es_hits_status.ts
new file mode 100644
index 00000000000000..5fd0cd334edc62
--- /dev/null
+++ b/src/plugins/home/server/routes/fetch_es_hits_status.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 { schema } from '@kbn/config-schema';
+import { IRouter } from 'src/core/server';
+
+export const registerHitsStatusRoute = (router: IRouter) => {
+  router.post(
+    {
+      path: '/api/home/hits_status',
+      validate: {
+        body: schema.object({
+          index: schema.string(),
+          query: schema.recordOf(schema.string(), schema.any()),
+        }),
+      },
+    },
+    router.handleLegacyErrors(async (context, req, res) => {
+      const { index, query } = req.body;
+      const client = context.core.elasticsearch.client;
+
+      try {
+        const { body } = await client.asCurrentUser.search({
+          index,
+          size: 1,
+          body: {
+            query,
+          },
+        });
+        const count = body.hits.hits.length;
+
+        return res.ok({
+          body: {
+            count,
+          },
+        });
+      } catch (e) {
+        return res.badRequest({
+          body: e,
+        });
+      }
+    })
+  );
+};
diff --git a/src/plugins/home/server/routes/index.ts b/src/plugins/home/server/routes/index.ts
new file mode 100644
index 00000000000000..bf492051cdedfa
--- /dev/null
+++ b/src/plugins/home/server/routes/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.
+ */
+
+import { IRouter } from 'src/core/server';
+import { registerHitsStatusRoute } from './fetch_es_hits_status';
+
+export const registerRoutes = (router: IRouter) => {
+  registerHitsStatusRoute(router);
+};

From e13d8dcfb7268b7c1c8ac286bf881039ed8b385e Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Mon, 31 Aug 2020 12:55:39 -0700
Subject: [PATCH 125/216] Fix es_ui_shared eslint violations for useRequest
 hook (#72947)

* Reconcile request helpers with eslint rules for React hooks.
  - Add clearer cleanup logic for unmounted components.
  - Align logic and comments in np_ready_request.ts and original request.ts.
* Reorganize modules and convert tests to TS.
  - Split request.ts into send_request.ts and use_request.ts.
  - Convert test files into TS.
  - Relax SendRequestResponse type definition to type error as any instead of expecting an Error, since we weren't actually fulfilling this expectation.
* Convert everything to hooks and add test coverage for request behavior.
* Fix Watcher memoization bugs.
---
 .eslintrc.js                                  |  19 -
 .../global_flyout/global_flyout.tsx           |   2 +
 .../components/json_editor/json_editor.tsx    |   3 +
 .../public/components/json_editor/use_json.ts |   2 +
 src/plugins/es_ui_shared/public/index.ts      |   2 +-
 .../es_ui_shared/public/request/index.ts      |  10 +-
 .../public/request/np_ready_request.ts        | 184 ---------
 .../public/request/request.test.js            | 262 -------------
 .../es_ui_shared/public/request/request.ts    | 165 --------
 .../request/send_request.test.helpers.ts      |  83 ++++
 .../public/request/send_request.test.ts       |  47 +++
 .../public/request/send_request.ts            |  52 +++
 .../request/use_request.test.helpers.tsx      | 184 +++++++++
 .../public/request/use_request.test.ts        | 353 ++++++++++++++++++
 .../public/request/use_request.ts             | 161 ++++++++
 .../forms/components/fields/range_field.tsx   |   2 +
 .../index_management/public/shared_imports.ts |   2 +-
 .../watcher/public/application/lib/api.ts     |  51 ++-
 .../watch_visualization.tsx                   |   6 +-
 .../public/application/shared_imports.ts      |   2 +-
 20 files changed, 930 insertions(+), 662 deletions(-)
 delete mode 100644 src/plugins/es_ui_shared/public/request/np_ready_request.ts
 delete mode 100644 src/plugins/es_ui_shared/public/request/request.test.js
 delete mode 100644 src/plugins/es_ui_shared/public/request/request.ts
 create mode 100644 src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
 create mode 100644 src/plugins/es_ui_shared/public/request/send_request.test.ts
 create mode 100644 src/plugins/es_ui_shared/public/request/send_request.ts
 create mode 100644 src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
 create mode 100644 src/plugins/es_ui_shared/public/request/use_request.test.ts
 create mode 100644 src/plugins/es_ui_shared/public/request/use_request.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index ff4ac180c3774b..9b75c36c95abdb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -94,12 +94,6 @@ module.exports = {
         'jsx-a11y/no-onchange': 'off',
       },
     },
-    {
-      files: ['src/plugins/es_ui_shared/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
     {
       files: ['src/plugins/kibana_react/**/*.{js,mjs,ts,tsx}'],
       rules: {
@@ -125,25 +119,12 @@ module.exports = {
         'jsx-a11y/click-events-have-key-events': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/index_management/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-        'react-hooks/rules-of-hooks': 'off',
-      },
-    },
     {
       files: ['x-pack/plugins/ml/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: ['x-pack/legacy/plugins/snapshot_restore/**/*.{js,mjs,ts,tsx}'],
-      rules: {
-        'react-hooks/exhaustive-deps': 'off',
-      },
-    },
 
     /**
      * Files that require Apache 2.0 headers, settings
diff --git a/src/plugins/es_ui_shared/__packages_do_not_import__/global_flyout/global_flyout.tsx b/src/plugins/es_ui_shared/__packages_do_not_import__/global_flyout/global_flyout.tsx
index aa575cd64944cd..548e477c7c411e 100644
--- a/src/plugins/es_ui_shared/__packages_do_not_import__/global_flyout/global_flyout.tsx
+++ b/src/plugins/es_ui_shared/__packages_do_not_import__/global_flyout/global_flyout.tsx
@@ -160,6 +160,8 @@ export const useGlobalFlyout = () => {
         Array.from(getContents()).forEach(removeContent);
       }
     };
+    // https://github.com/elastic/kibana/issues/73970
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
   }, [removeContent]);
 
   return { ...ctx, addContent };
diff --git a/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx b/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx
index 8c63cc8494a8b6..7d21722781d607 100644
--- a/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx
+++ b/src/plugins/es_ui_shared/public/components/json_editor/json_editor.tsx
@@ -52,6 +52,8 @@ export const JsonEditor = React.memo(
       isControlled,
     });
 
+    // https://github.com/elastic/kibana/issues/73971
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
     const debouncedSetContent = useCallback(debounce(setContent, 300), [setContent]);
 
     // We let the consumer control the validation and the error message.
@@ -76,6 +78,7 @@ export const JsonEditor = React.memo(
           debouncedSetContent(updated);
         }
       },
+      /* eslint-disable-next-line react-hooks/exhaustive-deps */
       [isControlled]
     );
 
diff --git a/src/plugins/es_ui_shared/public/components/json_editor/use_json.ts b/src/plugins/es_ui_shared/public/components/json_editor/use_json.ts
index 1b5ca5d7f43849..0ba39f5f05fe62 100644
--- a/src/plugins/es_ui_shared/public/components/json_editor/use_json.ts
+++ b/src/plugins/es_ui_shared/public/components/json_editor/use_json.ts
@@ -84,6 +84,8 @@ export const useJson = <T extends object = { [key: string]: any }>({
     } else {
       didMount.current = true;
     }
+    // https://github.com/elastic/kibana/issues/73971
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
   }, [content]);
 
   return {
diff --git a/src/plugins/es_ui_shared/public/index.ts b/src/plugins/es_ui_shared/public/index.ts
index bdea5ccf5fe26f..995ae0ba428374 100644
--- a/src/plugins/es_ui_shared/public/index.ts
+++ b/src/plugins/es_ui_shared/public/index.ts
@@ -39,7 +39,7 @@ export {
   UseRequestResponse,
   sendRequest,
   useRequest,
-} from './request/np_ready_request';
+} from './request';
 
 export { indices } from './indices';
 
diff --git a/src/plugins/es_ui_shared/public/request/index.ts b/src/plugins/es_ui_shared/public/request/index.ts
index f942a9cc3932bb..9e38bfe5ee16b3 100644
--- a/src/plugins/es_ui_shared/public/request/index.ts
+++ b/src/plugins/es_ui_shared/public/request/index.ts
@@ -17,11 +17,5 @@
  * under the License.
  */
 
-export {
-  SendRequestConfig,
-  SendRequestResponse,
-  UseRequestConfig,
-  UseRequestResponse,
-  sendRequest,
-  useRequest,
-} from './request';
+export { SendRequestConfig, SendRequestResponse, sendRequest } from './send_request';
+export { UseRequestConfig, UseRequestResponse, useRequest } from './use_request';
diff --git a/src/plugins/es_ui_shared/public/request/np_ready_request.ts b/src/plugins/es_ui_shared/public/request/np_ready_request.ts
deleted file mode 100644
index 06af698f2ce023..00000000000000
--- a/src/plugins/es_ui_shared/public/request/np_ready_request.ts
+++ /dev/null
@@ -1,184 +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 { useEffect, useState, useRef, useMemo } from 'react';
-
-import { HttpSetup, HttpFetchQuery } from '../../../../../src/core/public';
-
-export interface SendRequestConfig {
-  path: string;
-  method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head';
-  query?: HttpFetchQuery;
-  body?: any;
-}
-
-export interface SendRequestResponse<D = any, E = Error> {
-  data: D | null;
-  error: E | null;
-}
-
-export interface UseRequestConfig extends SendRequestConfig {
-  pollIntervalMs?: number;
-  initialData?: any;
-  deserializer?: (data: any) => any;
-}
-
-export interface UseRequestResponse<D = any, E = Error> {
-  isInitialRequest: boolean;
-  isLoading: boolean;
-  error: E | null;
-  data?: D | null;
-  sendRequest: (...args: any[]) => Promise<SendRequestResponse<D, E>>;
-}
-
-export const sendRequest = async <D = any, E = Error>(
-  httpClient: HttpSetup,
-  { path, method, body, query }: SendRequestConfig
-): Promise<SendRequestResponse<D, E>> => {
-  try {
-    const stringifiedBody = typeof body === 'string' ? body : JSON.stringify(body);
-    const response = await httpClient[method](path, { body: stringifiedBody, query });
-
-    return {
-      data: response.data ? response.data : response,
-      error: null,
-    };
-  } catch (e) {
-    return {
-      data: null,
-      error: e.response && e.response.data ? e.response.data : e.body,
-    };
-  }
-};
-
-export const useRequest = <D = any, E = Error>(
-  httpClient: HttpSetup,
-  {
-    path,
-    method,
-    query,
-    body,
-    pollIntervalMs,
-    initialData,
-    deserializer = (data: any): any => data,
-  }: UseRequestConfig
-): UseRequestResponse<D, E> => {
-  const sendRequestRef = useRef<() => Promise<SendRequestResponse<D, E>>>();
-  // Main states for tracking request status and data
-  const [error, setError] = useState<null | any>(null);
-  const [isLoading, setIsLoading] = useState<boolean>(true);
-  const [data, setData] = useState<any>(initialData);
-
-  // Consumers can use isInitialRequest to implement a polling UX.
-  const [isInitialRequest, setIsInitialRequest] = useState<boolean>(true);
-  const pollInterval = useRef<any>(null);
-  const pollIntervalId = useRef<any>(null);
-
-  // We always want to use the most recently-set interval in scheduleRequest.
-  pollInterval.current = pollIntervalMs;
-
-  // Tied to every render and bound to each request.
-  let isOutdatedRequest = false;
-
-  const scheduleRequest = () => {
-    // Clear current interval
-    if (pollIntervalId.current) {
-      clearTimeout(pollIntervalId.current);
-    }
-
-    // Set new interval
-    if (pollInterval.current) {
-      pollIntervalId.current = setTimeout(
-        () => (sendRequestRef.current ?? _sendRequest)(),
-        pollInterval.current
-      );
-    }
-  };
-
-  const _sendRequest = async () => {
-    // We don't clear error or data, so it's up to the consumer to decide whether to display the
-    // "old" error/data or loading state when a new request is in-flight.
-    setIsLoading(true);
-
-    const requestBody = {
-      path,
-      method,
-      query,
-      body,
-    };
-
-    const response = await sendRequest<D, E>(httpClient, requestBody);
-    const { data: serializedResponseData, error: responseError } = response;
-
-    // If an outdated request has resolved, DON'T update state, but DO allow the processData handler
-    // to execute side effects like update telemetry.
-    if (isOutdatedRequest) {
-      return { data: null, error: null };
-    }
-
-    setError(responseError);
-
-    if (!responseError) {
-      const responseData = deserializer(serializedResponseData);
-      setData(responseData);
-    }
-
-    setIsLoading(false);
-    setIsInitialRequest(false);
-
-    // If we're on an interval, we need to schedule the next request. This also allows us to reset
-    // the interval if the user has manually requested the data, to avoid doubled-up requests.
-    scheduleRequest();
-
-    return { data: serializedResponseData, error: responseError };
-  };
-
-  useEffect(() => {
-    sendRequestRef.current = _sendRequest;
-  }, [_sendRequest]);
-
-  const stringifiedQuery = useMemo(() => JSON.stringify(query), [query]);
-
-  useEffect(() => {
-    (sendRequestRef.current ?? _sendRequest)();
-    // To be functionally correct we'd send a new request if the method, path, query or body changes.
-    // But it doesn't seem likely that the method will change and body is likely to be a new
-    // object even if its shape hasn't changed, so for now we're just watching the path and the query.
-  }, [path, stringifiedQuery]);
-
-  useEffect(() => {
-    scheduleRequest();
-
-    // Clean up intervals and inflight requests and corresponding state changes
-    return () => {
-      isOutdatedRequest = true;
-      if (pollIntervalId.current) {
-        clearTimeout(pollIntervalId.current);
-      }
-    };
-  }, [pollIntervalMs]);
-
-  return {
-    isInitialRequest,
-    isLoading,
-    error,
-    data,
-    sendRequest: sendRequestRef.current ?? _sendRequest, // Gives the user the ability to manually request data
-  };
-};
diff --git a/src/plugins/es_ui_shared/public/request/request.test.js b/src/plugins/es_ui_shared/public/request/request.test.js
deleted file mode 100644
index 190c32517eefed..00000000000000
--- a/src/plugins/es_ui_shared/public/request/request.test.js
+++ /dev/null
@@ -1,262 +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 { sendRequest as sendRequestUnbound, useRequest as useRequestUnbound } from './request';
-
-import React from 'react';
-import { act } from 'react-dom/test-utils';
-import { mount } from 'enzyme';
-
-const TestHook = ({ callback }) => {
-  callback();
-  return null;
-};
-
-let element;
-
-const testHook = (callback) => {
-  element = mount(<TestHook callback={callback} />);
-};
-
-const wait = async (wait) => new Promise((resolve) => setTimeout(resolve, wait || 1));
-
-// FLAKY:
-// - https://github.com/elastic/kibana/issues/42561
-// - https://github.com/elastic/kibana/issues/42562
-// - https://github.com/elastic/kibana/issues/42563
-// - https://github.com/elastic/kibana/issues/42225
-describe.skip('request lib', () => {
-  const successRequest = { path: '/success', method: 'post', body: {} };
-  const errorRequest = { path: '/error', method: 'post', body: {} };
-  const successResponse = { statusCode: 200, data: { message: 'Success message' } };
-  const errorResponse = { statusCode: 400, statusText: 'Error message' };
-
-  let sendPost;
-  let sendRequest;
-  let useRequest;
-
-  /**
-   *
-   * commented out due to hooks being called regardless of skip
-   * https://github.com/facebook/jest/issues/8379
-
-  beforeEach(() => {
-    sendPost = sinon.stub();
-    sendPost.withArgs(successRequest.path, successRequest.body).returns(successResponse);
-    sendPost.withArgs(errorRequest.path, errorRequest.body).throws(errorResponse);
-
-    const httpClient = {
-      post: (...args) => {
-        return sendPost(...args);
-      },
-    };
-
-    sendRequest = sendRequestUnbound.bind(null, httpClient);
-    useRequest = useRequestUnbound.bind(null, httpClient);
-  });
-
-  */
-
-  describe('sendRequest function', () => {
-    it('uses the provided path, method, and body to send the request', async () => {
-      const response = await sendRequest({ ...successRequest });
-      sinon.assert.calledOnce(sendPost);
-      expect(response).toEqual({ data: successResponse.data, error: null });
-    });
-
-    it('surfaces errors', async () => {
-      try {
-        await sendRequest({ ...errorRequest });
-      } catch (e) {
-        sinon.assert.calledOnce(sendPost);
-        expect(e).toBe(errorResponse.error);
-      }
-    });
-  });
-
-  describe('useRequest hook', () => {
-    let hook;
-
-    function initUseRequest(config) {
-      act(() => {
-        testHook(() => {
-          hook = useRequest(config);
-        });
-      });
-    }
-
-    describe('parameters', () => {
-      describe('path, method, body', () => {
-        it('is used to send the request', async () => {
-          initUseRequest({ ...successRequest });
-          await wait(50);
-          expect(hook.data).toBe(successResponse.data);
-        });
-      });
-
-      describe('pollIntervalMs', () => {
-        it('sends another request after the specified time has elapsed', async () => {
-          initUseRequest({ ...successRequest, pollIntervalMs: 10 });
-          await wait(50);
-          // We just care that multiple requests have been sent out. We don't check the specific
-          // timing because that risks introducing flakiness into the tests, and it's unlikely
-          // we could break the implementation by getting the exact timing wrong.
-          expect(sendPost.callCount).toBeGreaterThan(1);
-
-          // We have to manually clean up or else the interval will continue to fire requests,
-          // interfering with other tests.
-          element.unmount();
-        });
-      });
-
-      describe('initialData', () => {
-        it('sets the initial data value', () => {
-          initUseRequest({ ...successRequest, initialData: 'initialData' });
-          expect(hook.data).toBe('initialData');
-        });
-      });
-
-      describe('deserializer', () => {
-        it('is called once the request resolves', async () => {
-          const deserializer = sinon.stub();
-          initUseRequest({ ...successRequest, deserializer });
-          sinon.assert.notCalled(deserializer);
-
-          await wait(50);
-          sinon.assert.calledOnce(deserializer);
-          sinon.assert.calledWith(deserializer, successResponse.data);
-        });
-
-        it('processes data', async () => {
-          initUseRequest({ ...successRequest, deserializer: () => 'intercepted' });
-          await wait(50);
-          expect(hook.data).toBe('intercepted');
-        });
-      });
-    });
-
-    describe('state', () => {
-      describe('isInitialRequest', () => {
-        it('is true for the first request and false for subsequent requests', async () => {
-          initUseRequest({ ...successRequest });
-          expect(hook.isInitialRequest).toBe(true);
-
-          hook.sendRequest();
-          await wait(50);
-          expect(hook.isInitialRequest).toBe(false);
-        });
-      });
-
-      describe('isLoading', () => {
-        it('represents in-flight request status', async () => {
-          initUseRequest({ ...successRequest });
-          expect(hook.isLoading).toBe(true);
-
-          await wait(50);
-          expect(hook.isLoading).toBe(false);
-        });
-      });
-
-      describe('error', () => {
-        it('surfaces errors from requests', async () => {
-          initUseRequest({ ...errorRequest });
-          await wait(50);
-          expect(hook.error).toBe(errorResponse);
-        });
-
-        it('persists while a request is in-flight', async () => {
-          initUseRequest({ ...errorRequest });
-          await wait(50);
-          hook.sendRequest();
-          expect(hook.isLoading).toBe(true);
-          expect(hook.error).toBe(errorResponse);
-        });
-
-        it('is null when the request is successful', async () => {
-          initUseRequest({ ...successRequest });
-          await wait(50);
-          expect(hook.isLoading).toBe(false);
-          expect(hook.error).toBeNull();
-        });
-      });
-
-      describe('data', () => {
-        it('surfaces payloads from requests', async () => {
-          initUseRequest({ ...successRequest });
-          await wait(50);
-          expect(hook.data).toBe(successResponse.data);
-        });
-
-        it('persists while a request is in-flight', async () => {
-          initUseRequest({ ...successRequest });
-          await wait(50);
-          hook.sendRequest();
-          expect(hook.isLoading).toBe(true);
-          expect(hook.data).toBe(successResponse.data);
-        });
-
-        it('is null when the request fails', async () => {
-          initUseRequest({ ...errorRequest });
-          await wait(50);
-          expect(hook.isLoading).toBe(false);
-          expect(hook.data).toBeNull();
-        });
-      });
-    });
-
-    describe('callbacks', () => {
-      describe('sendRequest', () => {
-        it('sends the request', () => {
-          initUseRequest({ ...successRequest });
-          sinon.assert.calledOnce(sendPost);
-          hook.sendRequest();
-          sinon.assert.calledTwice(sendPost);
-        });
-
-        it('resets the pollIntervalMs', async () => {
-          initUseRequest({ ...successRequest, pollIntervalMs: 800 });
-          await wait(200); // 200ms
-          hook.sendRequest();
-          expect(sendPost.callCount).toBe(2);
-
-          await wait(200); // 400ms
-          hook.sendRequest();
-
-          await wait(200); // 600ms
-          hook.sendRequest();
-
-          await wait(200); // 800ms
-          hook.sendRequest();
-
-          await wait(200); // 1000ms
-          hook.sendRequest();
-
-          // If sendRequest didn't reset the interval, the interval would have triggered another
-          // request by now, and the callCount would be 7.
-          expect(sendPost.callCount).toBe(6);
-
-          // We have to manually clean up or else the interval will continue to fire requests,
-          // interfering with other tests.
-          element.unmount();
-        });
-      });
-    });
-  });
-});
diff --git a/src/plugins/es_ui_shared/public/request/request.ts b/src/plugins/es_ui_shared/public/request/request.ts
deleted file mode 100644
index fd6980367136eb..00000000000000
--- a/src/plugins/es_ui_shared/public/request/request.ts
+++ /dev/null
@@ -1,165 +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 { useEffect, useState, useRef } from 'react';
-
-export interface SendRequestConfig {
-  path: string;
-  method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head';
-  body?: any;
-}
-
-export interface SendRequestResponse {
-  data: any;
-  error: Error | null;
-}
-
-export interface UseRequestConfig extends SendRequestConfig {
-  pollIntervalMs?: number;
-  initialData?: any;
-  deserializer?: (data: any) => any;
-}
-
-export interface UseRequestResponse {
-  isInitialRequest: boolean;
-  isLoading: boolean;
-  error: null | unknown;
-  data: any;
-  sendRequest: (...args: any[]) => Promise<SendRequestResponse>;
-}
-
-export const sendRequest = async (
-  httpClient: ng.IHttpService,
-  { path, method, body }: SendRequestConfig
-): Promise<SendRequestResponse> => {
-  try {
-    const response = await (httpClient as any)[method](path, body);
-
-    if (typeof response.data === 'undefined') {
-      throw new Error(response.statusText);
-    }
-
-    return { data: response.data, error: null };
-  } catch (e) {
-    return {
-      data: null,
-      error: e.response ? e.response : e,
-    };
-  }
-};
-
-export const useRequest = (
-  httpClient: ng.IHttpService,
-  {
-    path,
-    method,
-    body,
-    pollIntervalMs,
-    initialData,
-    deserializer = (data: any): any => data,
-  }: UseRequestConfig
-): UseRequestResponse => {
-  // Main states for tracking request status and data
-  const [error, setError] = useState<null | any>(null);
-  const [isLoading, setIsLoading] = useState<boolean>(true);
-  const [data, setData] = useState<any>(initialData);
-
-  // Consumers can use isInitialRequest to implement a polling UX.
-  const [isInitialRequest, setIsInitialRequest] = useState<boolean>(true);
-  const pollInterval = useRef<any>(null);
-  const pollIntervalId = useRef<any>(null);
-
-  // We always want to use the most recently-set interval in scheduleRequest.
-  pollInterval.current = pollIntervalMs;
-
-  // Tied to every render and bound to each request.
-  let isOutdatedRequest = false;
-
-  const scheduleRequest = () => {
-    // Clear current interval
-    if (pollIntervalId.current) {
-      clearTimeout(pollIntervalId.current);
-    }
-
-    // Set new interval
-    if (pollInterval.current) {
-      pollIntervalId.current = setTimeout(_sendRequest, pollInterval.current);
-    }
-  };
-
-  const _sendRequest = async () => {
-    // We don't clear error or data, so it's up to the consumer to decide whether to display the
-    // "old" error/data or loading state when a new request is in-flight.
-    setIsLoading(true);
-
-    const requestBody = {
-      path,
-      method,
-      body,
-    };
-
-    const response = await sendRequest(httpClient, requestBody);
-    const { data: serializedResponseData, error: responseError } = response;
-    const responseData = deserializer(serializedResponseData);
-
-    // If an outdated request has resolved, DON'T update state, but DO allow the processData handler
-    // to execute side effects like update telemetry.
-    if (isOutdatedRequest) {
-      return { data: null, error: null };
-    }
-
-    setError(responseError);
-    setData(responseData);
-    setIsLoading(false);
-    setIsInitialRequest(false);
-
-    // If we're on an interval, we need to schedule the next request. This also allows us to reset
-    // the interval if the user has manually requested the data, to avoid doubled-up requests.
-    scheduleRequest();
-
-    return { data: serializedResponseData, error: responseError };
-  };
-
-  useEffect(() => {
-    _sendRequest();
-    // To be functionally correct we'd send a new request if the method, path, or body changes.
-    // But it doesn't seem likely that the method will change and body is likely to be a new
-    // object even if its shape hasn't changed, so for now we're just watching the path.
-  }, [path]);
-
-  useEffect(() => {
-    scheduleRequest();
-
-    // Clean up intervals and inflight requests and corresponding state changes
-    return () => {
-      isOutdatedRequest = true;
-      if (pollIntervalId.current) {
-        clearTimeout(pollIntervalId.current);
-      }
-    };
-  }, [pollIntervalMs]);
-
-  return {
-    isInitialRequest,
-    isLoading,
-    error,
-    data,
-    sendRequest: _sendRequest, // Gives the user the ability to manually request data
-  };
-};
diff --git a/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts b/src/plugins/es_ui_shared/public/request/send_request.test.helpers.ts
new file mode 100644
index 00000000000000..4312780e74c0f3
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/request/send_request.test.helpers.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 sinon from 'sinon';
+
+import { HttpSetup, HttpFetchOptions } from '../../../../../src/core/public';
+import {
+  SendRequestConfig,
+  SendRequestResponse,
+  sendRequest as originalSendRequest,
+} from './send_request';
+
+export interface SendRequestHelpers {
+  getSendRequestSpy: () => sinon.SinonStub;
+  sendSuccessRequest: () => Promise<SendRequestResponse>;
+  getSuccessResponse: () => SendRequestResponse;
+  sendErrorRequest: () => Promise<SendRequestResponse>;
+  getErrorResponse: () => SendRequestResponse;
+}
+
+const successRequest: SendRequestConfig = { method: 'post', path: '/success', body: {} };
+const successResponse = { statusCode: 200, data: { message: 'Success message' } };
+
+const errorValue = { statusCode: 400, statusText: 'Error message' };
+const errorRequest: SendRequestConfig = { method: 'post', path: '/error', body: {} };
+const errorResponse = { response: { data: errorValue } };
+
+export const createSendRequestHelpers = (): SendRequestHelpers => {
+  const sendRequestSpy = sinon.stub();
+  const httpClient = {
+    post: (path: string, options: HttpFetchOptions) => sendRequestSpy(path, options),
+  };
+  const sendRequest = originalSendRequest.bind(null, httpClient as HttpSetup) as <D = any, E = any>(
+    config: SendRequestConfig
+  ) => Promise<SendRequestResponse<D, E>>;
+
+  // Set up successful request helpers.
+  sendRequestSpy
+    .withArgs(successRequest.path, {
+      body: JSON.stringify(successRequest.body),
+      query: undefined,
+    })
+    .resolves(successResponse);
+  const sendSuccessRequest = () => sendRequest({ ...successRequest });
+  const getSuccessResponse = () => ({ data: successResponse.data, error: null });
+
+  // Set up failed request helpers.
+  sendRequestSpy
+    .withArgs(errorRequest.path, {
+      body: JSON.stringify(errorRequest.body),
+      query: undefined,
+    })
+    .rejects(errorResponse);
+  const sendErrorRequest = () => sendRequest({ ...errorRequest });
+  const getErrorResponse = () => ({
+    data: null,
+    error: errorResponse.response.data,
+  });
+
+  return {
+    getSendRequestSpy: () => sendRequestSpy,
+    sendSuccessRequest,
+    getSuccessResponse,
+    sendErrorRequest,
+    getErrorResponse,
+  };
+};
diff --git a/src/plugins/es_ui_shared/public/request/send_request.test.ts b/src/plugins/es_ui_shared/public/request/send_request.test.ts
new file mode 100644
index 00000000000000..e4deaeaba817e7
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/request/send_request.test.ts
@@ -0,0 +1,47 @@
+/*
+ * 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 { SendRequestHelpers, createSendRequestHelpers } from './send_request.test.helpers';
+
+describe('sendRequest function', () => {
+  let helpers: SendRequestHelpers;
+
+  beforeEach(() => {
+    helpers = createSendRequestHelpers();
+  });
+
+  it('uses the provided path, method, and body to send the request', async () => {
+    const { sendSuccessRequest, getSendRequestSpy, getSuccessResponse } = helpers;
+
+    const response = await sendSuccessRequest();
+    sinon.assert.calledOnce(getSendRequestSpy());
+    expect(response).toEqual(getSuccessResponse());
+  });
+
+  it('surfaces errors', async () => {
+    const { sendErrorRequest, getSendRequestSpy, getErrorResponse } = helpers;
+
+    // For some reason sinon isn't throwing an error on rejection, as an awaited Promise normally would.
+    const error = await sendErrorRequest();
+    sinon.assert.calledOnce(getSendRequestSpy());
+    expect(error).toEqual(getErrorResponse());
+  });
+});
diff --git a/src/plugins/es_ui_shared/public/request/send_request.ts b/src/plugins/es_ui_shared/public/request/send_request.ts
new file mode 100644
index 00000000000000..453e91570cd856
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/request/send_request.ts
@@ -0,0 +1,52 @@
+/*
+ * 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 { HttpSetup, HttpFetchQuery } from '../../../../../src/core/public';
+
+export interface SendRequestConfig {
+  path: string;
+  method: 'get' | 'post' | 'put' | 'delete' | 'patch' | 'head';
+  query?: HttpFetchQuery;
+  body?: any;
+}
+
+export interface SendRequestResponse<D = any, E = any> {
+  data: D | null;
+  error: E | null;
+}
+
+export const sendRequest = async <D = any, E = any>(
+  httpClient: HttpSetup,
+  { path, method, body, query }: SendRequestConfig
+): Promise<SendRequestResponse<D, E>> => {
+  try {
+    const stringifiedBody = typeof body === 'string' ? body : JSON.stringify(body);
+    const response = await httpClient[method](path, { body: stringifiedBody, query });
+
+    return {
+      data: response.data ? response.data : response,
+      error: null,
+    };
+  } catch (e) {
+    return {
+      data: null,
+      error: e.response?.data ?? e.body,
+    };
+  }
+};
diff --git a/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx b/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
new file mode 100644
index 00000000000000..0d6fd122ad22ce
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/request/use_request.test.helpers.tsx
@@ -0,0 +1,184 @@
+/*
+ * 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 { act } from 'react-dom/test-utils';
+import { mount, ReactWrapper } from 'enzyme';
+import sinon from 'sinon';
+
+import { HttpSetup, HttpFetchOptions } from '../../../../../src/core/public';
+import { SendRequestConfig, SendRequestResponse } from './send_request';
+import { useRequest, UseRequestResponse, UseRequestConfig } from './use_request';
+
+export interface UseRequestHelpers {
+  advanceTime: (ms: number) => Promise<void>;
+  completeRequest: () => Promise<void>;
+  hookResult: UseRequestResponse;
+  getSendRequestSpy: () => sinon.SinonStub;
+  setupSuccessRequest: (overrides?: {}, requestTimings?: number[]) => void;
+  getSuccessResponse: () => SendRequestResponse;
+  setupErrorRequest: (overrides?: {}, requestTimings?: number[]) => void;
+  getErrorResponse: () => SendRequestResponse;
+  setErrorResponse: (overrides?: {}) => void;
+  setupErrorWithBodyRequest: (overrides?: {}) => void;
+  getErrorWithBodyResponse: () => SendRequestResponse;
+}
+
+// Each request will take 1s to resolve.
+export const REQUEST_TIME = 1000;
+
+const successRequest: SendRequestConfig = { method: 'post', path: '/success', body: {} };
+const successResponse = { statusCode: 200, data: { message: 'Success message' } };
+
+const errorValue = { statusCode: 400, statusText: 'Error message' };
+const errorRequest: SendRequestConfig = { method: 'post', path: '/error', body: {} };
+const errorResponse = { response: { data: errorValue } };
+
+const errorWithBodyRequest: SendRequestConfig = {
+  method: 'post',
+  path: '/errorWithBody',
+  body: {},
+};
+const errorWithBodyResponse = { body: errorValue };
+
+export const createUseRequestHelpers = (): UseRequestHelpers => {
+  // The behavior we're testing involves state changes over time, so we need finer control over
+  // timing.
+  jest.useFakeTimers();
+
+  const flushPromiseJobQueue = async () => {
+    // See https://stackoverflow.com/questions/52177631/jest-timer-and-promise-dont-work-well-settimeout-and-async-function
+    await Promise.resolve();
+  };
+
+  const completeRequest = async () => {
+    await act(async () => {
+      jest.runAllTimers();
+      await flushPromiseJobQueue();
+    });
+  };
+
+  const advanceTime = async (ms: number) => {
+    await act(async () => {
+      jest.advanceTimersByTime(ms);
+      await flushPromiseJobQueue();
+    });
+  };
+
+  let element: ReactWrapper;
+  // We'll use this object to observe the state of the hook and access its callback(s).
+  const hookResult = {} as UseRequestResponse;
+  const sendRequestSpy = sinon.stub();
+
+  const setupUseRequest = (config: UseRequestConfig, requestTimings?: number[]) => {
+    let requestCount = 0;
+
+    const httpClient = {
+      post: (path: string, options: HttpFetchOptions) => {
+        return new Promise((resolve, reject) => {
+          // Increase the time it takes to resolve a request so we have time to inspect the hook
+          // as it goes through various states.
+          setTimeout(() => {
+            try {
+              resolve(sendRequestSpy(path, options));
+            } catch (e) {
+              reject(e);
+            }
+          }, (requestTimings && requestTimings[requestCount++]) || REQUEST_TIME);
+        });
+      },
+    };
+
+    const TestComponent = ({ requestConfig }: { requestConfig: UseRequestConfig }) => {
+      const { isInitialRequest, isLoading, error, data, sendRequest } = useRequest(
+        httpClient as HttpSetup,
+        requestConfig
+      );
+
+      hookResult.isInitialRequest = isInitialRequest;
+      hookResult.isLoading = isLoading;
+      hookResult.error = error;
+      hookResult.data = data;
+      hookResult.sendRequest = sendRequest;
+
+      return null;
+    };
+
+    act(() => {
+      element = mount(<TestComponent requestConfig={config} />);
+    });
+  };
+
+  // Set up successful request helpers.
+  sendRequestSpy
+    .withArgs(successRequest.path, {
+      body: JSON.stringify(successRequest.body),
+      query: undefined,
+    })
+    .resolves(successResponse);
+  const setupSuccessRequest = (overrides = {}, requestTimings?: number[]) =>
+    setupUseRequest({ ...successRequest, ...overrides }, requestTimings);
+  const getSuccessResponse = () => ({ data: successResponse.data, error: null });
+
+  // Set up failed request helpers.
+  sendRequestSpy
+    .withArgs(errorRequest.path, {
+      body: JSON.stringify(errorRequest.body),
+      query: undefined,
+    })
+    .rejects(errorResponse);
+  const setupErrorRequest = (overrides = {}, requestTimings?: number[]) =>
+    setupUseRequest({ ...errorRequest, ...overrides }, requestTimings);
+  const getErrorResponse = () => ({
+    data: null,
+    error: errorResponse.response.data,
+  });
+  // We'll use this to change a success response to an error response, to test how the state changes.
+  const setErrorResponse = (overrides = {}) => {
+    element.setProps({ requestConfig: { ...errorRequest, ...overrides } });
+  };
+
+  // Set up failed request helpers with the alternative error shape.
+  sendRequestSpy
+    .withArgs(errorWithBodyRequest.path, {
+      body: JSON.stringify(errorWithBodyRequest.body),
+      query: undefined,
+    })
+    .rejects(errorWithBodyResponse);
+  const setupErrorWithBodyRequest = (overrides = {}) =>
+    setupUseRequest({ ...errorWithBodyRequest, ...overrides });
+  const getErrorWithBodyResponse = () => ({
+    data: null,
+    error: errorWithBodyResponse.body,
+  });
+
+  return {
+    advanceTime,
+    completeRequest,
+    hookResult,
+    getSendRequestSpy: () => sendRequestSpy,
+    setupSuccessRequest,
+    getSuccessResponse,
+    setupErrorRequest,
+    getErrorResponse,
+    setErrorResponse,
+    setupErrorWithBodyRequest,
+    getErrorWithBodyResponse,
+  };
+};
diff --git a/src/plugins/es_ui_shared/public/request/use_request.test.ts b/src/plugins/es_ui_shared/public/request/use_request.test.ts
new file mode 100644
index 00000000000000..f7902218d93140
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/request/use_request.test.ts
@@ -0,0 +1,353 @@
+/*
+ * 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 { act } from 'react-dom/test-utils';
+import sinon from 'sinon';
+
+import {
+  UseRequestHelpers,
+  REQUEST_TIME,
+  createUseRequestHelpers,
+} from './use_request.test.helpers';
+
+describe('useRequest hook', () => {
+  let helpers: UseRequestHelpers;
+
+  beforeEach(() => {
+    helpers = createUseRequestHelpers();
+  });
+
+  describe('parameters', () => {
+    describe('path, method, body', () => {
+      it('is used to send the request', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult, getSuccessResponse } = helpers;
+        setupSuccessRequest();
+        await completeRequest();
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+      });
+    });
+
+    describe('pollIntervalMs', () => {
+      it('sends another request after the specified time has elapsed', async () => {
+        const { setupSuccessRequest, advanceTime, getSendRequestSpy } = helpers;
+        setupSuccessRequest({ pollIntervalMs: REQUEST_TIME });
+
+        await advanceTime(REQUEST_TIME);
+        expect(getSendRequestSpy().callCount).toBe(1);
+
+        // We need to advance (1) the pollIntervalMs and (2) the request time.
+        await advanceTime(REQUEST_TIME * 2);
+        expect(getSendRequestSpy().callCount).toBe(2);
+
+        // We need to advance (1) the pollIntervalMs and (2) the request time.
+        await advanceTime(REQUEST_TIME * 2);
+        expect(getSendRequestSpy().callCount).toBe(3);
+      });
+    });
+
+    describe('initialData', () => {
+      it('sets the initial data value', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult, getSuccessResponse } = helpers;
+        setupSuccessRequest({ initialData: 'initialData' });
+        expect(hookResult.data).toBe('initialData');
+
+        // The initial data value will be overwritten once the request resolves.
+        await completeRequest();
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+      });
+    });
+
+    describe('deserializer', () => {
+      it('is called with the response once the request resolves', async () => {
+        const { setupSuccessRequest, completeRequest, getSuccessResponse } = helpers;
+
+        const deserializer = sinon.stub();
+        setupSuccessRequest({ deserializer });
+        sinon.assert.notCalled(deserializer);
+        await completeRequest();
+
+        sinon.assert.calledOnce(deserializer);
+        sinon.assert.calledWith(deserializer, getSuccessResponse().data);
+      });
+
+      it('provides the data return value', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult } = helpers;
+        setupSuccessRequest({ deserializer: () => 'intercepted' });
+        await completeRequest();
+        expect(hookResult.data).toBe('intercepted');
+      });
+    });
+  });
+
+  describe('state', () => {
+    describe('isInitialRequest', () => {
+      it('is true for the first request and false for subsequent requests', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult } = helpers;
+        setupSuccessRequest();
+        expect(hookResult.isInitialRequest).toBe(true);
+
+        hookResult.sendRequest();
+        await completeRequest();
+        expect(hookResult.isInitialRequest).toBe(false);
+      });
+    });
+
+    describe('isLoading', () => {
+      it('represents in-flight request status', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult } = helpers;
+        setupSuccessRequest();
+        expect(hookResult.isLoading).toBe(true);
+
+        await completeRequest();
+        expect(hookResult.isLoading).toBe(false);
+      });
+    });
+
+    describe('error', () => {
+      it('surfaces errors from requests', async () => {
+        const { setupErrorRequest, completeRequest, hookResult, getErrorResponse } = helpers;
+        setupErrorRequest();
+        await completeRequest();
+        expect(hookResult.error).toBe(getErrorResponse().error);
+      });
+
+      it('surfaces body-shaped errors from requests', async () => {
+        const {
+          setupErrorWithBodyRequest,
+          completeRequest,
+          hookResult,
+          getErrorWithBodyResponse,
+        } = helpers;
+
+        setupErrorWithBodyRequest();
+        await completeRequest();
+        expect(hookResult.error).toBe(getErrorWithBodyResponse().error);
+      });
+
+      it('persists while a request is in-flight', async () => {
+        const { setupErrorRequest, completeRequest, hookResult, getErrorResponse } = helpers;
+        setupErrorRequest();
+        await completeRequest();
+        expect(hookResult.isLoading).toBe(false);
+        expect(hookResult.error).toBe(getErrorResponse().error);
+
+        act(() => {
+          hookResult.sendRequest();
+        });
+        expect(hookResult.isLoading).toBe(true);
+        expect(hookResult.error).toBe(getErrorResponse().error);
+      });
+
+      it('is null when the request is successful', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult } = helpers;
+        setupSuccessRequest();
+        expect(hookResult.error).toBeNull();
+
+        await completeRequest();
+        expect(hookResult.isLoading).toBe(false);
+        expect(hookResult.error).toBeNull();
+      });
+    });
+
+    describe('data', () => {
+      it('surfaces payloads from requests', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult, getSuccessResponse } = helpers;
+        setupSuccessRequest();
+        expect(hookResult.data).toBeUndefined();
+
+        await completeRequest();
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+      });
+
+      it('persists while a request is in-flight', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult, getSuccessResponse } = helpers;
+        setupSuccessRequest();
+        await completeRequest();
+        expect(hookResult.isLoading).toBe(false);
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+
+        act(() => {
+          hookResult.sendRequest();
+        });
+        expect(hookResult.isLoading).toBe(true);
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+      });
+
+      it('persists from last successful request when the next request fails', async () => {
+        const {
+          setupSuccessRequest,
+          completeRequest,
+          hookResult,
+          getErrorResponse,
+          setErrorResponse,
+          getSuccessResponse,
+        } = helpers;
+
+        setupSuccessRequest();
+        await completeRequest();
+        expect(hookResult.isLoading).toBe(false);
+        expect(hookResult.error).toBeNull();
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+
+        setErrorResponse();
+        await completeRequest();
+        expect(hookResult.isLoading).toBe(false);
+        expect(hookResult.error).toBe(getErrorResponse().error);
+        expect(hookResult.data).toBe(getSuccessResponse().data);
+      });
+    });
+  });
+
+  describe('callbacks', () => {
+    describe('sendRequest', () => {
+      it('sends the request', async () => {
+        const { setupSuccessRequest, completeRequest, hookResult, getSendRequestSpy } = helpers;
+        setupSuccessRequest();
+
+        await completeRequest();
+        expect(getSendRequestSpy().callCount).toBe(1);
+
+        await act(async () => {
+          hookResult.sendRequest();
+          await completeRequest();
+        });
+        expect(getSendRequestSpy().callCount).toBe(2);
+      });
+
+      it('resets the pollIntervalMs', async () => {
+        const { setupSuccessRequest, advanceTime, hookResult, getSendRequestSpy } = helpers;
+        const DOUBLE_REQUEST_TIME = REQUEST_TIME * 2;
+        setupSuccessRequest({ pollIntervalMs: DOUBLE_REQUEST_TIME });
+
+        // The initial request resolves, and then we'll immediately send a new one manually...
+        await advanceTime(REQUEST_TIME);
+        expect(getSendRequestSpy().callCount).toBe(1);
+        act(() => {
+          hookResult.sendRequest();
+        });
+
+        // The manual request resolves, and we'll send yet another one...
+        await advanceTime(REQUEST_TIME);
+        expect(getSendRequestSpy().callCount).toBe(2);
+        act(() => {
+          hookResult.sendRequest();
+        });
+
+        // At this point, we've moved forward 3s. The poll is set at 2s. If sendRequest didn't
+        // reset the poll, the request call count would be 4, not 3.
+        await advanceTime(REQUEST_TIME);
+        expect(getSendRequestSpy().callCount).toBe(3);
+      });
+    });
+  });
+
+  describe('request behavior', () => {
+    it('outdated responses are ignored by poll requests', async () => {
+      const {
+        setupSuccessRequest,
+        setErrorResponse,
+        completeRequest,
+        hookResult,
+        getErrorResponse,
+        getSendRequestSpy,
+      } = helpers;
+      const DOUBLE_REQUEST_TIME = REQUEST_TIME * 2;
+      // Send initial request, which will have a longer round-trip time.
+      setupSuccessRequest({}, [DOUBLE_REQUEST_TIME]);
+
+      // Send a new request, which will have a shorter round-trip time.
+      setErrorResponse();
+
+      // Complete both requests.
+      await completeRequest();
+
+      // Two requests were sent...
+      expect(getSendRequestSpy().callCount).toBe(2);
+      // ...but the error response is the one that takes precedence because it was *sent* more
+      // recently, despite the success response *returning* more recently.
+      expect(hookResult.error).toBe(getErrorResponse().error);
+      expect(hookResult.data).toBeUndefined();
+    });
+
+    it(`outdated responses are ignored if there's a more recently-sent manual request`, async () => {
+      const { setupSuccessRequest, advanceTime, hookResult, getSendRequestSpy } = helpers;
+
+      const HALF_REQUEST_TIME = REQUEST_TIME * 0.5;
+      setupSuccessRequest({ pollIntervalMs: REQUEST_TIME });
+
+      // Before the original request resolves, we make a manual sendRequest call.
+      await advanceTime(HALF_REQUEST_TIME);
+      expect(getSendRequestSpy().callCount).toBe(0);
+      act(() => {
+        hookResult.sendRequest();
+      });
+
+      // The original quest resolves but it's been marked as outdated by the the manual sendRequest
+      // call "interrupts", so data is left undefined.
+      await advanceTime(HALF_REQUEST_TIME);
+      expect(getSendRequestSpy().callCount).toBe(1);
+      expect(hookResult.data).toBeUndefined();
+    });
+
+    it(`changing pollIntervalMs doesn't trigger a new request`, async () => {
+      const { setupErrorRequest, setErrorResponse, completeRequest, getSendRequestSpy } = helpers;
+      const DOUBLE_REQUEST_TIME = REQUEST_TIME * 2;
+      // Send initial request.
+      setupErrorRequest({ pollIntervalMs: REQUEST_TIME });
+
+      // Setting a new poll will schedule a second request, but not send one immediately.
+      setErrorResponse({ pollIntervalMs: DOUBLE_REQUEST_TIME });
+
+      // Complete initial request.
+      await completeRequest();
+
+      // Complete scheduled poll request.
+      await completeRequest();
+      expect(getSendRequestSpy().callCount).toBe(2);
+    });
+
+    it('when the path changes after a request is scheduled, the scheduled request is sent with that path', async () => {
+      const {
+        setupSuccessRequest,
+        completeRequest,
+        hookResult,
+        getErrorResponse,
+        setErrorResponse,
+        getSendRequestSpy,
+      } = helpers;
+      const DOUBLE_REQUEST_TIME = REQUEST_TIME * 2;
+
+      // Sned first request and schedule a request, both with the success path.
+      setupSuccessRequest({ pollIntervalMs: DOUBLE_REQUEST_TIME });
+
+      // Change the path to the error path, sending a second request. pollIntervalMs is the same
+      // so the originally scheduled poll remains cheduled.
+      setErrorResponse({ pollIntervalMs: DOUBLE_REQUEST_TIME });
+
+      // Complete the initial request, the requests by the path change, and the scheduled poll request.
+      await completeRequest();
+      await completeRequest();
+
+      // If the scheduled poll request was sent to the success path, we wouldn't have an error result.
+      // But we do, because it was sent to the error path.
+      expect(getSendRequestSpy().callCount).toBe(3);
+      expect(hookResult.error).toBe(getErrorResponse().error);
+    });
+  });
+});
diff --git a/src/plugins/es_ui_shared/public/request/use_request.ts b/src/plugins/es_ui_shared/public/request/use_request.ts
new file mode 100644
index 00000000000000..481843bf40e88c
--- /dev/null
+++ b/src/plugins/es_ui_shared/public/request/use_request.ts
@@ -0,0 +1,161 @@
+/*
+ * 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 { useEffect, useCallback, useState, useRef, useMemo } from 'react';
+
+import { HttpSetup } from '../../../../../src/core/public';
+import {
+  sendRequest as sendStatelessRequest,
+  SendRequestConfig,
+  SendRequestResponse,
+} from './send_request';
+
+export interface UseRequestConfig extends SendRequestConfig {
+  pollIntervalMs?: number;
+  initialData?: any;
+  deserializer?: (data: any) => any;
+}
+
+export interface UseRequestResponse<D = any, E = Error> {
+  isInitialRequest: boolean;
+  isLoading: boolean;
+  error: E | null;
+  data?: D | null;
+  sendRequest: () => Promise<SendRequestResponse<D, E>>;
+}
+
+export const useRequest = <D = any, E = Error>(
+  httpClient: HttpSetup,
+  { path, method, query, body, pollIntervalMs, initialData, deserializer }: UseRequestConfig
+): UseRequestResponse<D, E> => {
+  const isMounted = useRef(false);
+
+  // Main states for tracking request status and data
+  const [error, setError] = useState<null | any>(null);
+  const [isLoading, setIsLoading] = useState<boolean>(true);
+  const [data, setData] = useState<any>(initialData);
+
+  // Consumers can use isInitialRequest to implement a polling UX.
+  const requestCountRef = useRef<number>(0);
+  const isInitialRequest = requestCountRef.current === 0;
+  const pollIntervalIdRef = useRef<any>(null);
+
+  const clearPollInterval = useCallback(() => {
+    if (pollIntervalIdRef.current) {
+      clearTimeout(pollIntervalIdRef.current);
+      pollIntervalIdRef.current = null;
+    }
+  }, []);
+
+  // Convert our object to string to be able to compare them in our useMemo,
+  // allowing the consumer to freely passed new objects to the hook on each
+  // render without requiring them to be memoized.
+  const queryStringified = query ? JSON.stringify(query) : undefined;
+  const bodyStringified = body ? JSON.stringify(body) : undefined;
+
+  const requestBody = useMemo(() => {
+    return {
+      path,
+      method,
+      query: queryStringified ? query : undefined,
+      body: bodyStringified ? body : undefined,
+    };
+    // queryStringified and bodyStringified stand in for query and body as dependencies.
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
+  }, [path, method, queryStringified, bodyStringified]);
+
+  const sendRequest = useCallback(async () => {
+    // If we're on an interval, this allows us to reset it if the user has manually requested the
+    // data, to avoid doubled-up requests.
+    clearPollInterval();
+
+    const requestId = ++requestCountRef.current;
+
+    // We don't clear error or data, so it's up to the consumer to decide whether to display the
+    // "old" error/data or loading state when a new request is in-flight.
+    setIsLoading(true);
+
+    const response = await sendStatelessRequest<D, E>(httpClient, requestBody);
+    const { data: serializedResponseData, error: responseError } = response;
+
+    const isOutdatedRequest = requestId !== requestCountRef.current;
+    const isUnmounted = isMounted.current === false;
+
+    // Ignore outdated or irrelevant data.
+    if (isOutdatedRequest || isUnmounted) {
+      return { data: null, error: null };
+    }
+
+    setError(responseError);
+    // If there's an error, keep the data from the last request in case it's still useful to the user.
+    if (!responseError) {
+      const responseData = deserializer
+        ? deserializer(serializedResponseData)
+        : serializedResponseData;
+      setData(responseData);
+    }
+    // Setting isLoading to false also acts as a signal for scheduling the next poll request.
+    setIsLoading(false);
+
+    return { data: serializedResponseData, error: responseError };
+  }, [requestBody, httpClient, deserializer, clearPollInterval]);
+
+  const scheduleRequest = useCallback(() => {
+    // If there's a scheduled poll request, this new one will supersede it.
+    clearPollInterval();
+
+    if (pollIntervalMs) {
+      pollIntervalIdRef.current = setTimeout(sendRequest, pollIntervalMs);
+    }
+  }, [pollIntervalMs, sendRequest, clearPollInterval]);
+
+  // Send the request on component mount and whenever the dependencies of sendRequest() change.
+  useEffect(() => {
+    sendRequest();
+  }, [sendRequest]);
+
+  // Schedule the next poll request when the previous one completes.
+  useEffect(() => {
+    // When a request completes, attempt to schedule the next one. Note that we aren't re-scheduling
+    // a request whenever sendRequest's dependencies change. isLoading isn't set to false until the
+    // initial request has completed, so we won't schedule a request on mount.
+    if (!isLoading) {
+      scheduleRequest();
+    }
+  }, [isLoading, scheduleRequest]);
+
+  useEffect(() => {
+    isMounted.current = true;
+
+    return () => {
+      isMounted.current = false;
+
+      // Clean up on unmount.
+      clearPollInterval();
+    };
+  }, [clearPollInterval]);
+
+  return {
+    isInitialRequest,
+    isLoading,
+    error,
+    data,
+    sendRequest, // Gives the user the ability to manually request data
+  };
+};
diff --git a/src/plugins/es_ui_shared/static/forms/components/fields/range_field.tsx b/src/plugins/es_ui_shared/static/forms/components/fields/range_field.tsx
index e02c9b6c186154..b83b0af5f97c63 100644
--- a/src/plugins/es_ui_shared/static/forms/components/fields/range_field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/components/fields/range_field.tsx
@@ -39,6 +39,8 @@ export const RangeField = ({ field, euiFieldProps = {}, ...rest }: Props) => {
       }>;
       field.onChange(event);
     },
+    // https://github.com/elastic/kibana/issues/73972
+    /* eslint-disable-next-line react-hooks/exhaustive-deps */
     [field.onChange]
   );
 
diff --git a/x-pack/plugins/index_management/public/shared_imports.ts b/x-pack/plugins/index_management/public/shared_imports.ts
index 16dcab18c3caf4..2ba2a5c493c493 100644
--- a/x-pack/plugins/index_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/shared_imports.ts
@@ -13,7 +13,7 @@ export {
   Forms,
   extractQueryParams,
   GlobalFlyout,
-} from '../../../../src/plugins/es_ui_shared/public/';
+} from '../../../../src/plugins/es_ui_shared/public';
 
 export {
   FormSchema,
diff --git a/x-pack/plugins/watcher/public/application/lib/api.ts b/x-pack/plugins/watcher/public/application/lib/api.ts
index 82ec2925ba6dca..4f42b26d51c46d 100644
--- a/x-pack/plugins/watcher/public/application/lib/api.ts
+++ b/x-pack/plugins/watcher/public/application/lib/api.ts
@@ -35,44 +35,53 @@ export const getSavedObjectsClient = () => savedObjectsClient;
 
 const basePath = ROUTES.API_ROOT;
 
+const loadWatchesDeserializer = ({ watches = [] }: { watches: any[] }) => {
+  return watches.map((watch: any) => Watch.fromUpstreamJson(watch));
+};
+
 export const useLoadWatches = (pollIntervalMs: number) => {
   return useRequest({
     path: `${basePath}/watches`,
     method: 'get',
     pollIntervalMs,
-    deserializer: ({ watches = [] }: { watches: any[] }) => {
-      return watches.map((watch: any) => Watch.fromUpstreamJson(watch));
-    },
+    deserializer: loadWatchesDeserializer,
   });
 };
 
+const loadWatchDetailDeserializer = ({ watch = {} }: { watch: any }) =>
+  Watch.fromUpstreamJson(watch);
+
 export const useLoadWatchDetail = (id: string) => {
   return useRequest({
     path: `${basePath}/watch/${id}`,
     method: 'get',
-    deserializer: ({ watch = {} }: { watch: any }) => Watch.fromUpstreamJson(watch),
+    deserializer: loadWatchDetailDeserializer,
   });
 };
 
+const loadWatchHistoryDeserializer = ({ watchHistoryItems = [] }: { watchHistoryItems: any }) => {
+  return watchHistoryItems.map((historyItem: any) =>
+    WatchHistoryItem.fromUpstreamJson(historyItem)
+  );
+};
+
 export const useLoadWatchHistory = (id: string, startTime: string) => {
   return useRequest({
     query: startTime ? { startTime } : undefined,
     path: `${basePath}/watch/${id}/history`,
     method: 'get',
-    deserializer: ({ watchHistoryItems = [] }: { watchHistoryItems: any }) => {
-      return watchHistoryItems.map((historyItem: any) =>
-        WatchHistoryItem.fromUpstreamJson(historyItem)
-      );
-    },
+    deserializer: loadWatchHistoryDeserializer,
   });
 };
 
+const loadWatchHistoryDetailDeserializer = ({ watchHistoryItem }: { watchHistoryItem: any }) =>
+  WatchHistoryItem.fromUpstreamJson(watchHistoryItem);
+
 export const useLoadWatchHistoryDetail = (id: string | undefined) => {
   return useRequest({
     path: !id ? '' : `${basePath}/history/${id}`,
     method: 'get',
-    deserializer: ({ watchHistoryItem }: { watchHistoryItem: any }) =>
-      WatchHistoryItem.fromUpstreamJson(watchHistoryItem),
+    deserializer: loadWatchHistoryDetailDeserializer,
   });
 };
 
@@ -148,6 +157,8 @@ export const loadIndexPatterns = async () => {
   return savedObjects;
 };
 
+const getWatchVisualizationDataDeserializer = (data: { visualizeData: any }) => data?.visualizeData;
+
 export const useGetWatchVisualizationData = (watchModel: BaseWatch, visualizeOptions: any) => {
   return useRequest({
     path: `${basePath}/watch/visualize`,
@@ -156,21 +167,23 @@ export const useGetWatchVisualizationData = (watchModel: BaseWatch, visualizeOpt
       watch: watchModel.upstreamJson,
       options: visualizeOptions.upstreamJson,
     }),
-    deserializer: (data: { visualizeData: any }) => data?.visualizeData,
+    deserializer: getWatchVisualizationDataDeserializer,
   });
 };
 
+const loadSettingsDeserializer = (data: {
+  action_types: {
+    [key: string]: {
+      enabled: boolean;
+    };
+  };
+}) => Settings.fromUpstreamJson(data);
+
 export const useLoadSettings = () => {
   return useRequest({
     path: `${basePath}/settings`,
     method: 'get',
-    deserializer: (data: {
-      action_types: {
-        [key: string]: {
-          enabled: boolean;
-        };
-      };
-    }) => Settings.fromUpstreamJson(data),
+    deserializer: loadSettingsDeserializer,
   });
 };
 
diff --git a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
index c0d906114277e5..2ff0f53d07e916 100644
--- a/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
+++ b/x-pack/plugins/watcher/public/application/sections/watch_edit/components/threshold_watch_edit/watch_visualization.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, useContext, useEffect } from 'react';
+import React, { Fragment, useContext, useEffect, useMemo } from 'react';
 import {
   AnnotationDomainTypes,
   Axis,
@@ -105,7 +105,9 @@ export const WatchVisualization = () => {
     threshold,
   } = watch;
 
-  const domain = getDomain(watch);
+  // Only recalculate the domain if the watch configuration changes. This prevents the visualization
+  // request's resolution from re-triggering itself in an infinite loop.
+  const domain = useMemo(() => getDomain(watch), [watch]);
   const timeBuckets = createTimeBuckets();
   timeBuckets.setBounds(domain);
   const interval = timeBuckets.getInterval().expression;
diff --git a/x-pack/plugins/watcher/public/application/shared_imports.ts b/x-pack/plugins/watcher/public/application/shared_imports.ts
index a9e07b80a9b221..766e8e659c8aeb 100644
--- a/x-pack/plugins/watcher/public/application/shared_imports.ts
+++ b/x-pack/plugins/watcher/public/application/shared_imports.ts
@@ -10,6 +10,6 @@ export {
   UseRequestConfig,
   sendRequest,
   useRequest,
-} from '../../../../../src/plugins/es_ui_shared/public/';
+} from '../../../../../src/plugins/es_ui_shared/public';
 
 export { useXJsonMode } from '../../../../../src/plugins/es_ui_shared/static/ace_x_json/hooks';

From 3dc2c70c34404635e06de7413976a5ffb441307f Mon Sep 17 00:00:00 2001
From: Nathan Reese <reese.nathan@gmail.com>
Date: Mon, 31 Aug 2020 14:19:20 -0600
Subject: [PATCH 126/216] [Maps] fix duplicate EuiPopover id's (#76202)

* [Maps] fix duplicate ID's

* tslint cleanup

* use layer id instead of layer name for popover id

* tslint fixes

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../maps/public/actions/map_actions.ts        |  2 +-
 ...st.js.snap => tools_control.test.tsx.snap} |  4 +-
 .../tools_control/{index.js => index.ts}      | 13 +++--
 ...control.test.js => tools_control.test.tsx} |  1 +
 .../{tools_control.js => tools_control.tsx}   | 50 ++++++++++++++++---
 .../toc_entry_actions_popover.test.tsx.snap   |  8 +--
 .../toc_entry_actions_popover.tsx             |  2 +-
 7 files changed, 60 insertions(+), 20 deletions(-)
 rename x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/{tools_control.test.js.snap => tools_control.test.tsx.snap} (99%)
 rename x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/{index.js => index.ts} (63%)
 rename x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/{tools_control.test.js => tools_control.test.tsx} (97%)
 rename x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/{tools_control.js => tools_control.tsx} (81%)

diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index f4088968531558..b00594cb7fb23f 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -271,7 +271,7 @@ export function triggerRefreshTimer() {
   };
 }
 
-export function updateDrawState(drawState: DrawState) {
+export function updateDrawState(drawState: DrawState | null) {
   return (dispatch: Dispatch) => {
     if (drawState !== null) {
       dispatch({ type: SET_OPEN_TOOLTIPS, openTooltips: [] }); // tooltips just get in the way
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
similarity index 99%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
index d7fa099fe9dbe9..afeee04358e157 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.js.snap
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`Should render cancel button when drawing 1`] = `
       closePopover={[Function]}
       display="inlineBlock"
       hasArrow={true}
-      id="contextMenu"
+      id="toolsControlPopover"
       isOpen={false}
       ownFocus={false}
       panelPaddingSize="none"
@@ -146,7 +146,7 @@ exports[`renders 1`] = `
   closePopover={[Function]}
   display="inlineBlock"
   hasArrow={true}
-  id="contextMenu"
+  id="toolsControlPopover"
   isOpen={false}
   ownFocus={false}
   panelPaddingSize="none"
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/index.js b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/index.ts
similarity index 63%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/index.js
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/index.ts
index 5812604a91b87f..70101f1ce6eba2 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/index.js
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/index.ts
@@ -4,24 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { AnyAction, Dispatch } from 'redux';
 import { connect } from 'react-redux';
 import { ToolsControl } from './tools_control';
 import { isDrawingFilter } from '../../../selectors/map_selectors';
 import { updateDrawState } from '../../../actions';
+import { MapStoreState } from '../../../reducers/store';
+import { DrawState } from '../../../../common/descriptor_types';
 
-function mapStateToProps(state = {}) {
+function mapStateToProps(state: MapStoreState) {
   return {
     isDrawingFilter: isDrawingFilter(state),
   };
 }
 
-function mapDispatchToProps(dispatch) {
+function mapDispatchToProps(dispatch: Dispatch<AnyAction>) {
   return {
-    initiateDraw: (options) => {
-      dispatch(updateDrawState(options));
+    initiateDraw: (drawState: DrawState) => {
+      dispatch<any>(updateDrawState(drawState));
     },
     cancelDraw: () => {
-      dispatch(updateDrawState(null));
+      dispatch<any>(updateDrawState(null));
     },
   };
 }
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.test.js b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.test.tsx
similarity index 97%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.test.js
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.test.tsx
index f0e6dd43e68a10..544d789468e896 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.test.js
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.test.tsx
@@ -19,6 +19,7 @@ const defaultProps = {
       indexPatternId: '1',
     },
   ],
+  isDrawingFilter: false,
 };
 
 test('renders', async () => {
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.tsx
similarity index 81%
rename from x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.js
rename to x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/tools_control.tsx
index 017f0369e0b73d..fa0864ce680a24 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.tsx
@@ -14,10 +14,14 @@ import {
   EuiButton,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DRAW_TYPE, ES_GEO_FIELD_TYPE } from '../../../../common/constants';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
+import { DRAW_TYPE, ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../../../../common/constants';
+// @ts-expect-error
 import { GeometryFilterForm } from '../../../components/geometry_filter_form';
 import { DistanceFilterForm } from '../../../components/distance_filter_form';
+import { GeoFieldWithIndex } from '../../../components/geo_field_with_index';
+import { DrawState } from '../../../../common/descriptor_types';
 
 const DRAW_SHAPE_LABEL = i18n.translate('xpack.maps.toolbarOverlay.drawShapeLabel', {
   defaultMessage: 'Draw shape to filter data',
@@ -46,8 +50,21 @@ const DRAW_DISTANCE_LABEL_SHORT = i18n.translate(
   }
 );
 
-export class ToolsControl extends Component {
-  state = {
+interface Props {
+  cancelDraw: () => void;
+  geoFields: GeoFieldWithIndex[];
+  initiateDraw: (drawState: DrawState) => void;
+  isDrawingFilter: boolean;
+  getFilterActions?: () => Promise<Action[]>;
+  getActionContext?: () => ActionExecutionContext;
+}
+
+interface State {
+  isPopoverOpen: boolean;
+}
+
+export class ToolsControl extends Component<Props, State> {
+  state: State = {
     isPopoverOpen: false,
   };
 
@@ -61,7 +78,14 @@ export class ToolsControl extends Component {
     this.setState({ isPopoverOpen: false });
   };
 
-  _initiateShapeDraw = (options) => {
+  _initiateShapeDraw = (options: {
+    actionId: string;
+    geometryLabel: string;
+    indexPatternId: string;
+    geoFieldName: string;
+    geoFieldType: ES_GEO_FIELD_TYPE;
+    relation: ES_SPATIAL_RELATIONS;
+  }) => {
     this.props.initiateDraw({
       drawType: DRAW_TYPE.POLYGON,
       ...options,
@@ -69,7 +93,14 @@ export class ToolsControl extends Component {
     this._closePopover();
   };
 
-  _initiateBoundsDraw = (options) => {
+  _initiateBoundsDraw = (options: {
+    actionId: string;
+    geometryLabel: string;
+    indexPatternId: string;
+    geoFieldName: string;
+    geoFieldType: ES_GEO_FIELD_TYPE;
+    relation: ES_SPATIAL_RELATIONS;
+  }) => {
     this.props.initiateDraw({
       drawType: DRAW_TYPE.BOUNDS,
       ...options,
@@ -77,7 +108,12 @@ export class ToolsControl extends Component {
     this._closePopover();
   };
 
-  _initiateDistanceDraw = (options) => {
+  _initiateDistanceDraw = (options: {
+    actionId: string;
+    filterLabel: string;
+    indexPatternId: string;
+    geoFieldName: string;
+  }) => {
     this.props.initiateDraw({
       drawType: DRAW_TYPE.DISTANCE,
       ...options,
@@ -194,7 +230,7 @@ export class ToolsControl extends Component {
   render() {
     const toolsPopoverButton = (
       <EuiPopover
-        id="contextMenu"
+        id="toolsControlPopover"
         button={this._renderToolsButton()}
         isOpen={this.state.isPopoverOpen}
         closePopover={this._closePopover}
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
index 8a5b7cf9186a8a..0f620bdeb1c0e1 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
@@ -53,7 +53,7 @@ exports[`TOCEntryActionsPopover is rendered 1`] = `
   closePopover={[Function]}
   display="inlineBlock"
   hasArrow={true}
-  id="contextMenu"
+  id="testLayer"
   isOpen={false}
   ownFocus={false}
   panelPaddingSize="none"
@@ -181,7 +181,7 @@ exports[`TOCEntryActionsPopover should disable fit to data when supportsFitToBou
   closePopover={[Function]}
   display="inlineBlock"
   hasArrow={true}
-  id="contextMenu"
+  id="testLayer"
   isOpen={false}
   ownFocus={false}
   panelPaddingSize="none"
@@ -309,7 +309,7 @@ exports[`TOCEntryActionsPopover should have "show layer" action when layer is no
   closePopover={[Function]}
   display="inlineBlock"
   hasArrow={true}
-  id="contextMenu"
+  id="testLayer"
   isOpen={false}
   ownFocus={false}
   panelPaddingSize="none"
@@ -437,7 +437,7 @@ exports[`TOCEntryActionsPopover should not show edit actions in read only mode 1
   closePopover={[Function]}
   display="inlineBlock"
   hasArrow={true}
-  id="contextMenu"
+  id="testLayer"
   isOpen={false}
   ownFocus={false}
   panelPaddingSize="none"
diff --git a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
index a1b9026fc57da7..8e021461880ed4 100644
--- a/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
+++ b/x-pack/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
@@ -220,7 +220,7 @@ export class TOCEntryActionsPopover extends Component<Props, State> {
   render() {
     return (
       <EuiPopover
-        id="contextMenu"
+        id={this.props.layer.getId()}
         className="mapLayTocActions"
         button={this._renderPopoverToggleButton()}
         isOpen={this.state.isPopoverOpen}

From de9b7a492466df85fa20f210a3bd93fb98f301d2 Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Mon, 31 Aug 2020 16:37:39 -0400
Subject: [PATCH 127/216] Add cacheClear & cacheDelete methods (#76306)

---
 .../ingest_manager/server/services/epm/registry/cache.ts        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts
index d2a14fcf04dff7..af11bc7f6c8311 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts
@@ -8,4 +8,6 @@ const cache: Map<string, Buffer> = new Map();
 export const cacheGet = (key: string) => cache.get(key);
 export const cacheSet = (key: string, value: Buffer) => cache.set(key, value);
 export const cacheHas = (key: string) => cache.has(key);
+export const cacheClear = () => cache.clear();
+export const cacheDelete = (key: string) => cache.delete(key);
 export const getCacheKey = (key: string) => key + '.tar.gz';

From a8b2810629e0b4650af886e9e8c6ccaa746e456a Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Mon, 31 Aug 2020 13:55:16 -0700
Subject: [PATCH 128/216] Added validation to display an error when creating
 index action in alert with invalid document. (#75929)

---
 .../es_index/es_index.test.tsx                | 20 ++++++++++++++++---
 .../es_index/es_index.tsx                     | 19 ++++++++++++++++--
 .../es_index/es_index_params.tsx              | 18 ++++++++++++++---
 .../webhook/webhook_params.tsx                |  7 ++++++-
 .../json_editor_with_message_variables.tsx    |  5 ++++-
 5 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
index 417a9e09086a2c..b56ae35df5d06a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.test.tsx
@@ -72,17 +72,31 @@ describe('index connector validation with minimal config', () => {
 describe('action params validation', () => {
   test('action params validation succeeds when action params is valid', () => {
     const actionParams = {
-      documents: ['test'],
+      documents: [{ test: 1234 }],
     };
 
     expect(actionTypeModel.validateParams(actionParams)).toEqual({
-      errors: {},
+      errors: {
+        documents: [],
+      },
     });
 
     const emptyActionParams = {};
 
     expect(actionTypeModel.validateParams(emptyActionParams)).toEqual({
-      errors: {},
+      errors: {
+        documents: ['Document is required and should be a valid JSON object.'],
+      },
+    });
+
+    const invalidDocumentActionParams = {
+      documents: [{}],
+    };
+
+    expect(actionTypeModel.validateParams(invalidDocumentActionParams)).toEqual({
+      errors: {
+        documents: ['Document is required and should be a valid JSON object.'],
+      },
     });
   });
 });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
index 3ee663a5fc8a06..c0255650e0f37e 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
@@ -44,8 +44,23 @@ export function getActionType(): ActionTypeModel<EsIndexActionConnector, IndexAc
     },
     actionConnectorFields: lazy(() => import('./es_index_connector')),
     actionParamsFields: lazy(() => import('./es_index_params')),
-    validateParams: (): ValidationResult => {
-      return { errors: {} };
+    validateParams: (actionParams: IndexActionParams): ValidationResult => {
+      const validationResult = { errors: {} };
+      const errors = {
+        documents: new Array<string>(),
+      };
+      validationResult.errors = errors;
+      if (!actionParams.documents?.length || Object.keys(actionParams.documents[0]).length === 0) {
+        errors.documents.push(
+          i18n.translate(
+            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredDocumentJson',
+            {
+              defaultMessage: 'Document is required and should be a valid JSON object.',
+            }
+          )
+        );
+      }
+      return validationResult;
     },
   };
 }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
index e8e8cc582512e5..495707db4975cf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index_params.tsx
@@ -17,6 +17,7 @@ export const IndexParamsFields = ({
   editAction,
   messageVariables,
   docLinks,
+  errors,
 }: ActionParamsProps<IndexActionParams>) => {
   const { documents } = actionParams;
 
@@ -24,8 +25,10 @@ export const IndexParamsFields = ({
     try {
       const documentsJSON = JSON.parse(updatedDocuments);
       editAction('documents', [documentsJSON], index);
-      // eslint-disable-next-line no-empty
-    } catch (e) {}
+    } catch (e) {
+      // set document as empty to turn on the validation for non empty valid JSON object
+      editAction('documents', [{}], index);
+    }
   };
 
   return (
@@ -34,7 +37,7 @@ export const IndexParamsFields = ({
         messageVariables={messageVariables}
         paramsProperty={'documents'}
         inputTargetValue={
-          documents && documents.length > 0 ? ((documents[0] as unknown) as string) : ''
+          documents && documents.length > 0 ? ((documents[0] as unknown) as string) : undefined
         }
         label={i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.documentsFieldLabel',
@@ -48,6 +51,7 @@ export const IndexParamsFields = ({
             defaultMessage: 'Code editor',
           }
         )}
+        errors={errors.documents as string[]}
         onDocumentsChange={onDocumentsChange}
         helpText={
           <EuiLink
@@ -60,6 +64,14 @@ export const IndexParamsFields = ({
             />
           </EuiLink>
         }
+        onBlur={() => {
+          if (
+            !(documents && documents.length > 0 ? ((documents[0] as unknown) as string) : undefined)
+          ) {
+            // set document as empty to turn on the validation for non empty valid JSON object
+            onDocumentsChange('{}');
+          }
+        }}
       />
     </>
   );
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_params.tsx
index 1dfd9e3edc2c5a..ff9ad936f224ff 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_params.tsx
@@ -21,7 +21,7 @@ const WebhookParamsFields: React.FunctionComponent<ActionParamsProps<WebhookActi
     <JsonEditorWithMessageVariables
       messageVariables={messageVariables}
       paramsProperty={'body'}
-      inputTargetValue={body || ''}
+      inputTargetValue={body}
       label={i18n.translate(
         'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.bodyFieldLabel',
         {
@@ -38,6 +38,11 @@ const WebhookParamsFields: React.FunctionComponent<ActionParamsProps<WebhookActi
       onDocumentsChange={(json: string) => {
         editAction('body', json, index);
       }}
+      onBlur={() => {
+        if (!body) {
+          editAction('body', '', index);
+        }
+      }}
     />
   );
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
index 0b8184fc441fdc..5ea15deb53161d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/json_editor_with_message_variables.tsx
@@ -14,12 +14,13 @@ import { ActionVariable } from '../../types';
 interface Props {
   messageVariables?: ActionVariable[];
   paramsProperty: string;
-  inputTargetValue: string;
+  inputTargetValue?: string;
   label: string;
   errors?: string[];
   areaLabel?: string;
   onDocumentsChange: (data: string) => void;
   helpText?: JSX.Element;
+  onBlur?: () => void;
 }
 
 export const JsonEditorWithMessageVariables: React.FunctionComponent<Props> = ({
@@ -31,6 +32,7 @@ export const JsonEditorWithMessageVariables: React.FunctionComponent<Props> = ({
   areaLabel,
   onDocumentsChange,
   helpText,
+  onBlur,
 }) => {
   const [cursorPosition, setCursorPosition] = useState<any>(null);
 
@@ -84,6 +86,7 @@ export const JsonEditorWithMessageVariables: React.FunctionComponent<Props> = ({
           onDocumentsChange(convertToJson(xjson));
         }}
         onCursorChange={(_value: any) => onClickWithMessageVariable(_value)}
+        onBlur={onBlur}
       />
     </EuiFormRow>
   );

From 08f9dccb1c7138f5ec701f78352c91499fb658cf Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Mon, 31 Aug 2020 14:39:12 -0700
Subject: [PATCH 129/216] Added deprecation for renaming config option
 'xpack.actions.whitelistedHosts' to 'xpack.actions.allowedHosts' (#76325)

---
 x-pack/plugins/actions/server/index.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index fef70c3a484552..31c4d26d1793e7 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -4,11 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { PluginInitializerContext } from '../../../../src/core/server';
+import { PluginInitializerContext, PluginConfigDescriptor } from '../../../../src/core/server';
 import { ActionsPlugin } from './plugin';
 import { configSchema } from './config';
 import { ActionsClient as ActionsClientClass } from './actions_client';
 import { ActionsAuthorization as ActionsAuthorizationClass } from './authorization/actions_authorization';
+import { ActionsConfigType } from './types';
 
 export type ActionsClient = PublicMethodsOf<ActionsClientClass>;
 export type ActionsAuthorization = PublicMethodsOf<ActionsAuthorizationClass>;
@@ -24,6 +25,9 @@ export { PluginSetupContract, PluginStartContract } from './plugin';
 
 export const plugin = (initContext: PluginInitializerContext) => new ActionsPlugin(initContext);
 
-export const config = {
+export const config: PluginConfigDescriptor<ActionsConfigType> = {
   schema: configSchema,
+  deprecations: ({ renameFromRoot }) => [
+    renameFromRoot('xpack.actions.whitelistedHosts', 'xpack.actions.allowedHosts'),
+  ],
 };

From 7b807b788887652bb71f945a96924310e23fb1c8 Mon Sep 17 00:00:00 2001
From: Poff Poffenberger <poffdeluxe@gmail.com>
Date: Mon, 31 Aug 2020 16:53:51 -0500
Subject: [PATCH 130/216] [Canvas] Add telemetry around workpad variable usage
 (#75683)

* Add telemetry around workpad variable usage

* Fix typecheck

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../canvas/__tests__/fixtures/workpads.ts     | 39 ++++++++++++++++-
 .../collectors/workpad_collector.test.ts      | 42 +++++++++++++++++++
 .../server/collectors/workpad_collector.ts    | 39 +++++++++++++++--
 3 files changed, 116 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/canvas/__tests__/fixtures/workpads.ts b/x-pack/plugins/canvas/__tests__/fixtures/workpads.ts
index 4b1f31cb14687a..0d2939ed0e8a5e 100644
--- a/x-pack/plugins/canvas/__tests__/fixtures/workpads.ts
+++ b/x-pack/plugins/canvas/__tests__/fixtures/workpads.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 { CanvasWorkpad, CanvasElement, CanvasPage } from '../../types';
+import { CanvasWorkpad, CanvasElement, CanvasPage, CanvasVariable } from '../../types';
 
 const BaseWorkpad: CanvasWorkpad = {
   '@created': '2019-02-08T18:35:23.029Z',
@@ -50,6 +50,12 @@ const BaseElement: CanvasElement = {
   filter: '',
 };
 
+const BaseVariable: CanvasVariable = {
+  name: 'my-var',
+  value: 'Hello World',
+  type: 'string',
+};
+
 export const workpads: CanvasWorkpad[] = [
   {
     ...BaseWorkpad,
@@ -71,6 +77,11 @@ export const workpads: CanvasWorkpad[] = [
         ],
       },
     ],
+    variables: [
+      {
+        ...BaseVariable,
+      },
+    ],
   },
   {
     ...BaseWorkpad,
@@ -82,6 +93,11 @@ export const workpads: CanvasWorkpad[] = [
         ],
       },
     ],
+    variables: [
+      {
+        ...BaseVariable,
+      },
+    ],
   },
   {
     ...BaseWorkpad,
@@ -103,6 +119,11 @@ export const workpads: CanvasWorkpad[] = [
       { ...BasePage, elements: [{ ...BaseElement, expression: 'image | render' }] },
       { ...BasePage, elements: [{ ...BaseElement, expression: 'image | render' }] },
     ],
+    variables: [
+      {
+        ...BaseVariable,
+      },
+    ],
   },
   {
     ...BaseWorkpad,
@@ -136,6 +157,11 @@ export const workpads: CanvasWorkpad[] = [
         ],
       },
     ],
+    variables: [
+      {
+        ...BaseVariable,
+      },
+    ],
   },
   {
     ...BaseWorkpad,
@@ -166,6 +192,17 @@ export const workpads: CanvasWorkpad[] = [
         ],
       },
     ],
+    variables: [
+      {
+        ...BaseVariable,
+      },
+      {
+        ...BaseVariable,
+      },
+      {
+        ...BaseVariable,
+      },
+    ],
   },
   {
     ...BaseWorkpad,
diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts
index 9f71edcc05bf26..32665cc42dc4e7 100644
--- a/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts
+++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts
@@ -49,6 +49,14 @@ describe('usage collector handle es response data', () => {
           'shape',
         ],
       },
+      variables: {
+        total: 7,
+        per_workpad: {
+          avg: 1.1666666666666667,
+          min: 0,
+          max: 3,
+        },
+      },
     });
   });
 
@@ -63,6 +71,7 @@ describe('usage collector handle es response data', () => {
       pages: { total: 1, per_workpad: { avg: 1, min: 1, max: 1 } },
       elements: { total: 1, per_page: { avg: 1, min: 1, max: 1 } },
       functions: { total: 1, in_use: ['toast'], per_element: { avg: 1, min: 1, max: 1 } },
+      variables: { total: 1, per_workpad: { avg: 1, min: 1, max: 1 } },
     });
   });
 
@@ -76,6 +85,39 @@ describe('usage collector handle es response data', () => {
       pages: { total: 0, per_workpad: { avg: 0, min: 0, max: 0 } },
       elements: undefined,
       functions: undefined,
+      variables: { total: 1, per_workpad: { avg: 1, min: 1, max: 1 } }, // Variables still possible even with no pages
+    });
+  });
+
+  it('should handle cases where the version workpad might not have variables', () => {
+    const workpad = cloneDeep(workpads[0]);
+    // @ts-ignore
+    workpad.variables = undefined;
+
+    const mockWorkpadsOld = [workpad];
+    const usage = summarizeWorkpads(mockWorkpadsOld);
+    expect(usage).toEqual({
+      workpads: { total: 1 },
+      pages: { total: 1, per_workpad: { avg: 1, min: 1, max: 1 } },
+      elements: { total: 1, per_page: { avg: 1, min: 1, max: 1 } },
+      functions: {
+        total: 7,
+        in_use: [
+          'demodata',
+          'ply',
+          'rowCount',
+          'as',
+          'staticColumn',
+          'math',
+          'mapColumn',
+          'sort',
+          'pointseries',
+          'plot',
+          'seriesStyle',
+        ],
+        per_element: { avg: 7, min: 7, max: 7 },
+      },
+      variables: { total: 0, per_workpad: { avg: 0, min: 0, max: 0 } }, // Variables still possible even with no pages
     });
   });
 
diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
index 4b00d061c17ce2..9fa39c580962de 100644
--- a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
+++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts
@@ -44,6 +44,14 @@ interface WorkpadTelemetry {
       max: number;
     };
   };
+  variables?: {
+    total: number;
+    per_workpad: {
+      avg: number;
+      min: number;
+      max: number;
+    };
+  };
 }
 
 /**
@@ -81,7 +89,10 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr
       });
     }, []);
 
-    return { pages, elementCounts, functionCounts };
+    const variableCount =
+      workpad.variables && workpad.variables.length ? workpad.variables.length : 0;
+
+    return { pages, elementCounts, functionCounts, variableCount };
   });
 
   // combine together info from across the workpads
@@ -91,9 +102,10 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr
     pageCounts: number[];
     elementCounts: number[];
     functionCounts: number[];
+    variableCounts: number[];
   }>(
     (accum, pageInfo) => {
-      const { pages, elementCounts, functionCounts } = pageInfo;
+      const { pages, elementCounts, functionCounts, variableCount } = pageInfo;
 
       return {
         pageMin: pages.count < accum.pageMin ? pages.count : accum.pageMin,
@@ -101,6 +113,7 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr
         pageCounts: accum.pageCounts.concat(pages.count),
         elementCounts: accum.elementCounts.concat(elementCounts),
         functionCounts: accum.functionCounts.concat(functionCounts),
+        variableCounts: accum.variableCounts.concat([variableCount]),
       };
     },
     {
@@ -109,13 +122,23 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr
       pageCounts: [],
       elementCounts: [],
       functionCounts: [],
+      variableCounts: [],
     }
   );
-  const { pageCounts, pageMin, pageMax, elementCounts, functionCounts } = combinedWorkpadsInfo;
+  const {
+    pageCounts,
+    pageMin,
+    pageMax,
+    elementCounts,
+    functionCounts,
+    variableCounts,
+  } = combinedWorkpadsInfo;
 
   const pageTotal = arraySum(pageCounts);
   const elementsTotal = arraySum(elementCounts);
   const functionsTotal = arraySum(functionCounts);
+  const variableTotal = arraySum(variableCounts);
+
   const pagesInfo =
     workpadsInfo.length > 0
       ? {
@@ -151,11 +174,21 @@ export function summarizeWorkpads(workpadDocs: CanvasWorkpad[]): WorkpadTelemetr
         }
       : undefined;
 
+  const variableInfo = {
+    total: variableTotal,
+    per_workpad: {
+      avg: variableTotal / variableCounts.length,
+      min: arrayMin(variableCounts) || 0,
+      max: arrayMax(variableCounts) || 0,
+    },
+  };
+
   return {
     workpads: { total: workpadsInfo.length },
     pages: pagesInfo,
     elements: elementsInfo,
     functions: functionsInfo,
+    variables: variableInfo,
   };
 }
 

From 630d2d5fad9e08df4c8898efbd47f1a5f09575bf Mon Sep 17 00:00:00 2001
From: Yuliia Naumenko <jo.naumenko@gmail.com>
Date: Mon, 31 Aug 2020 18:11:57 -0700
Subject: [PATCH 131/216] Exposed separate from ProxySettings
 rejectUnauthorized configuration option. (#76061)

* Exposed separate from ProxySettings rejectUnauthorized configuration option.

* Fixed type checks

* fixed tests
---
 .../builtin_action_types/lib/axios_utils.test.ts   |  2 +-
 .../lib/get_proxy_agent.test.ts                    |  4 ++--
 .../builtin_action_types/lib/get_proxy_agent.ts    |  2 +-
 .../builtin_action_types/lib/send_email.test.ts    |  5 ++++-
 .../server/builtin_action_types/lib/send_email.ts  | 14 +++++++++-----
 .../server/builtin_action_types/slack.test.ts      |  4 ++--
 x-pack/plugins/actions/server/config.test.ts       |  9 ++++++---
 x-pack/plugins/actions/server/config.ts            |  3 ++-
 x-pack/plugins/actions/server/plugin.test.ts       |  6 ++++--
 x-pack/plugins/actions/server/plugin.ts            |  3 ++-
 x-pack/plugins/actions/server/types.ts             |  2 +-
 .../test/alerting_api_integration/common/config.ts |  2 +-
 12 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
index 844aa6d2de7ed4..7e938e766657c0 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/axios_utils.test.ts
@@ -65,7 +65,7 @@ describe('request', () => {
       logger,
       proxySettings: {
         proxyUrl: 'http://localhost:1212',
-        rejectUnauthorizedCertificates: false,
+        proxyRejectUnauthorizedCertificates: false,
       },
     });
 
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.test.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.test.ts
index 2468fab8c6ac5b..8623a67e8a68ee 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.test.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.test.ts
@@ -14,7 +14,7 @@ const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 describe('getProxyAgent', () => {
   test('return HttpsProxyAgent for https proxy url', () => {
     const agent = getProxyAgent(
-      { proxyUrl: 'https://someproxyhost', rejectUnauthorizedCertificates: false },
+      { proxyUrl: 'https://someproxyhost', proxyRejectUnauthorizedCertificates: false },
       logger
     );
     expect(agent instanceof HttpsProxyAgent).toBeTruthy();
@@ -22,7 +22,7 @@ describe('getProxyAgent', () => {
 
   test('return HttpProxyAgent for http proxy url', () => {
     const agent = getProxyAgent(
-      { proxyUrl: 'http://someproxyhost', rejectUnauthorizedCertificates: false },
+      { proxyUrl: 'http://someproxyhost', proxyRejectUnauthorizedCertificates: false },
       logger
     );
     expect(agent instanceof HttpProxyAgent).toBeTruthy();
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.ts
index bb4dadd3a46987..957d31546b019d 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/get_proxy_agent.ts
@@ -23,7 +23,7 @@ export function getProxyAgent(
       protocol: proxyUrl.protocol,
       headers: proxySettings.proxyHeaders,
       // do not fail on invalid certs if value is false
-      rejectUnauthorized: proxySettings.rejectUnauthorizedCertificates,
+      rejectUnauthorized: proxySettings.proxyRejectUnauthorizedCertificates,
     });
   } else {
     return new HttpProxyAgent(proxySettings.proxyUrl);
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 f69a2fc1d209c4..b6c4a4ea882e5a 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
@@ -73,7 +73,7 @@ describe('send_email module', () => {
       },
       {
         proxyUrl: 'https://example.com',
-        rejectUnauthorizedCertificates: false,
+        proxyRejectUnauthorizedCertificates: false,
       }
     );
     // @ts-expect-error
@@ -140,6 +140,9 @@ describe('send_email module', () => {
           "host": "example.com",
           "port": 1025,
           "secure": false,
+          "tls": Object {
+            "rejectUnauthorized": undefined,
+          },
         },
       ]
     `);
diff --git a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
index a4f32f1880cb5d..dead8fee63d4ff 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/lib/send_email.ts
@@ -19,6 +19,7 @@ export interface SendEmailOptions {
   routing: Routing;
   content: Content;
   proxySettings?: ProxySettings;
+  rejectUnauthorized?: boolean;
 }
 
 // config validation ensures either service is set or host/port are set
@@ -45,7 +46,7 @@ export interface Content {
 
 // send an email
 export async function sendEmail(logger: Logger, options: SendEmailOptions): Promise<unknown> {
-  const { transport, routing, content, proxySettings } = options;
+  const { transport, routing, content, proxySettings, rejectUnauthorized } = options;
   const { service, host, port, secure, user, password } = transport;
   const { from, to, cc, bcc } = routing;
   const { subject, message } = content;
@@ -68,15 +69,18 @@ export async function sendEmail(logger: Logger, options: SendEmailOptions): Prom
     transportConfig.host = host;
     transportConfig.port = port;
     transportConfig.secure = !!secure;
-    if (proxySettings && !transportConfig.secure) {
+
+    if (proxySettings) {
       transportConfig.tls = {
         // do not fail on invalid certs if value is false
-        rejectUnauthorized: proxySettings?.rejectUnauthorizedCertificates,
+        rejectUnauthorized: proxySettings?.proxyRejectUnauthorizedCertificates,
       };
-    }
-    if (proxySettings) {
       transportConfig.proxy = proxySettings.proxyUrl;
       transportConfig.headers = proxySettings.proxyHeaders;
+    } else if (!transportConfig.secure) {
+      transportConfig.tls = {
+        rejectUnauthorized,
+      };
     }
   }
 
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 b15d92cecba622..d98a41ed1f3556 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
@@ -167,7 +167,7 @@ describe('execute()', () => {
       params: { message: 'this invocation should succeed' },
       proxySettings: {
         proxyUrl: 'https://someproxyhost',
-        rejectUnauthorizedCertificates: false,
+        proxyRejectUnauthorizedCertificates: false,
       },
     });
     expect(response).toMatchInlineSnapshot(`
@@ -206,7 +206,7 @@ describe('execute()', () => {
       params: { message: 'this invocation should succeed' },
       proxySettings: {
         proxyUrl: 'https://someproxyhost',
-        rejectUnauthorizedCertificates: false,
+        proxyRejectUnauthorizedCertificates: false,
       },
     });
     expect(mockedLogger.debug).toHaveBeenCalledWith(
diff --git a/x-pack/plugins/actions/server/config.test.ts b/x-pack/plugins/actions/server/config.test.ts
index ac815a425a2b7d..1d7edd5f6b38fa 100644
--- a/x-pack/plugins/actions/server/config.test.ts
+++ b/x-pack/plugins/actions/server/config.test.ts
@@ -18,7 +18,8 @@ describe('config validation', () => {
           "*",
         ],
         "preconfigured": Object {},
-        "rejectUnauthorizedCertificates": true,
+        "proxyRejectUnauthorizedCertificates": true,
+        "rejectUnauthorized": true,
       }
     `);
   });
@@ -34,7 +35,8 @@ describe('config validation', () => {
           },
         },
       },
-      rejectUnauthorizedCertificates: false,
+      proxyRejectUnauthorizedCertificates: false,
+      rejectUnauthorized: false,
     };
     expect(configSchema.validate(config)).toMatchInlineSnapshot(`
       Object {
@@ -55,7 +57,8 @@ describe('config validation', () => {
             "secrets": Object {},
           },
         },
-        "rejectUnauthorizedCertificates": false,
+        "proxyRejectUnauthorizedCertificates": false,
+        "rejectUnauthorized": false,
       }
     `);
   });
diff --git a/x-pack/plugins/actions/server/config.ts b/x-pack/plugins/actions/server/config.ts
index 087a08f572c65e..8823cea9f44525 100644
--- a/x-pack/plugins/actions/server/config.ts
+++ b/x-pack/plugins/actions/server/config.ts
@@ -34,7 +34,8 @@ export const configSchema = schema.object({
   }),
   proxyUrl: schema.maybe(schema.string()),
   proxyHeaders: schema.maybe(schema.recordOf(schema.string(), schema.string())),
-  rejectUnauthorizedCertificates: schema.boolean({ defaultValue: true }),
+  proxyRejectUnauthorizedCertificates: schema.boolean({ defaultValue: true }),
+  rejectUnauthorized: schema.boolean({ defaultValue: true }),
 });
 
 export type ActionsConfig = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/actions/server/plugin.test.ts b/x-pack/plugins/actions/server/plugin.test.ts
index 4fdf9f25235686..9d545600e61ee0 100644
--- a/x-pack/plugins/actions/server/plugin.test.ts
+++ b/x-pack/plugins/actions/server/plugin.test.ts
@@ -34,7 +34,8 @@ describe('Actions Plugin', () => {
         enabledActionTypes: ['*'],
         allowedHosts: ['*'],
         preconfigured: {},
-        rejectUnauthorizedCertificates: true,
+        proxyRejectUnauthorizedCertificates: true,
+        rejectUnauthorized: true,
       });
       plugin = new ActionsPlugin(context);
       coreSetup = coreMock.createSetup();
@@ -195,7 +196,8 @@ describe('Actions Plugin', () => {
             secrets: {},
           },
         },
-        rejectUnauthorizedCertificates: true,
+        proxyRejectUnauthorizedCertificates: true,
+        rejectUnauthorized: true,
       });
       plugin = new ActionsPlugin(context);
       coreSetup = coreMock.createSetup();
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
index 413e6663105b82..a6c58992816582 100644
--- a/x-pack/plugins/actions/server/plugin.ts
+++ b/x-pack/plugins/actions/server/plugin.ts
@@ -323,7 +323,8 @@ export class ActionsPlugin implements Plugin<Promise<PluginSetupContract>, Plugi
           ? {
               proxyUrl: this.actionsConfig.proxyUrl,
               proxyHeaders: this.actionsConfig.proxyHeaders,
-              rejectUnauthorizedCertificates: this.actionsConfig.rejectUnauthorizedCertificates,
+              proxyRejectUnauthorizedCertificates: this.actionsConfig
+                .proxyRejectUnauthorizedCertificates,
             }
           : undefined,
     });
diff --git a/x-pack/plugins/actions/server/types.ts b/x-pack/plugins/actions/server/types.ts
index 0a7d6bf01b7ecb..3e92ca331bb93e 100644
--- a/x-pack/plugins/actions/server/types.ts
+++ b/x-pack/plugins/actions/server/types.ts
@@ -145,5 +145,5 @@ export interface ActionTaskExecutorParams {
 export interface ProxySettings {
   proxyUrl: string;
   proxyHeaders?: Record<string, string>;
-  rejectUnauthorizedCertificates: boolean;
+  proxyRejectUnauthorizedCertificates: boolean;
 }
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index 67dd8c877e378f..f9fdfaed1c79b9 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -63,7 +63,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     const actionsProxyUrl = options.enableActionsProxy
       ? [
           `--xpack.actions.proxyUrl=http://localhost:${proxyPort}`,
-          '--xpack.actions.rejectUnauthorizedCertificates=false',
+          '--xpack.actions.proxyRejectUnauthorizedCertificates=false',
         ]
       : [];
 

From 086e48839293004cd61f356d6fcee2c6aa375b73 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 1 Sep 2020 07:49:45 +0200
Subject: [PATCH 132/216] allow multiple registration of the same feature
 (#76272)

---
 .../services/feature_usage_service.test.ts    | 14 +++++++++++--
 .../server/services/feature_usage_service.ts  | 20 ++++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/licensing/server/services/feature_usage_service.test.ts b/x-pack/plugins/licensing/server/services/feature_usage_service.test.ts
index 39f7aa6503b35e..943516dc0409a0 100644
--- a/x-pack/plugins/licensing/server/services/feature_usage_service.test.ts
+++ b/x-pack/plugins/licensing/server/services/feature_usage_service.test.ts
@@ -19,12 +19,22 @@ describe('FeatureUsageService', () => {
 
   describe('#setup', () => {
     describe('#register', () => {
-      it('throws when registering the same feature twice', () => {
+      it('does not throw when registering the same feature twice with the same license', () => {
         const setup = service.setup();
         setup.register('foo', 'basic');
         expect(() => {
           setup.register('foo', 'basic');
-        }).toThrowErrorMatchingInlineSnapshot(`"Feature 'foo' has already been registered."`);
+        }).not.toThrow();
+      });
+
+      it('throws when registering the same feature again with a different license', () => {
+        const setup = service.setup();
+        setup.register('foo', 'basic');
+        expect(() => {
+          setup.register('foo', 'enterprise');
+        }).toThrowErrorMatchingInlineSnapshot(
+          `"Feature 'foo' has already been registered with another license type. (current: basic, new: enterprise)"`
+        );
       });
     });
   });
diff --git a/x-pack/plugins/licensing/server/services/feature_usage_service.ts b/x-pack/plugins/licensing/server/services/feature_usage_service.ts
index 9bfcb28f36b2a9..75a0c7fa781087 100644
--- a/x-pack/plugins/licensing/server/services/feature_usage_service.ts
+++ b/x-pack/plugins/licensing/server/services/feature_usage_service.ts
@@ -43,14 +43,20 @@ export class FeatureUsageService {
   public setup(): FeatureUsageServiceSetup {
     return {
       register: (featureName, licenseType) => {
-        if (this.lastUsages.has(featureName)) {
-          throw new Error(`Feature '${featureName}' has already been registered.`);
+        const registered = this.lastUsages.get(featureName);
+        if (registered) {
+          if (registered.licenseType !== licenseType) {
+            throw new Error(
+              `Feature '${featureName}' has already been registered with another license type. (current: ${registered.licenseType}, new: ${licenseType})`
+            );
+          }
+        } else {
+          this.lastUsages.set(featureName, {
+            name: featureName,
+            lastUsed: null,
+            licenseType,
+          });
         }
-        this.lastUsages.set(featureName, {
-          name: featureName,
-          lastUsed: null,
-          licenseType,
-        });
       },
     };
   }

From e70ef657d4e17ec9304d93cb8683e84c228dcc50 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 1 Sep 2020 09:23:22 +0200
Subject: [PATCH 133/216] Delete src/legacy/ui/public folder (#76085)

* delete src/legacy/ui/public folder

* remove jest.mock('ui/XXX'); from tests

* adapt stubbedLogstashIndexPatternService

* remove delete keys from translation files

* fix types import with Capabilities

* remove legacy test utils

* remove dead file referencing ui/newPlatform

* move saved-object-finder styles to timelion plugin
---
 .../recently_accessed/persisted_log.test.ts   |    6 -
 src/dev/jest/config.js                        |    1 -
 src/dev/jest/setup/mocks.js                   |    4 -
 .../stubbed_logstash_index_pattern.js         |   17 +-
 src/legacy/ui/public/.eslintrc                |    3 -
 src/legacy/ui/public/__mocks__/metadata.ts    |   25 -
 src/legacy/ui/public/__tests__/events.js      |  244 --
 src/legacy/ui/public/__tests__/metadata.js    |   29 -
 src/legacy/ui/public/_index.scss              |    9 -
 .../__tests__/kbn_accessible_click.js         |  127 -
 .../__tests__/kbn_ui_ace_keyboard_mode.js     |  129 -
 .../__tests__/scrollto_activedescendant.js    |   56 -
 .../ui/public/accessibility/_index.scss       |    1 -
 .../_kbn_ui_ace_keyboard_mode.scss            |   24 -
 .../ui/public/accessibility/angular_aria.js   |   39 -
 src/legacy/ui/public/accessibility/index.js   |   22 -
 .../accessibility/kbn_accessible_click.js     |   43 -
 .../accessibility/kbn_ui_ace_keyboard_mode.js |  129 -
 .../scrollto_activedescendant.js              |   43 -
 src/legacy/ui/public/angular_ui_select.js     |   28 -
 .../ui/public/autoload/accessibility.js       |   20 -
 src/legacy/ui/public/autoload/all.js          |   22 -
 src/legacy/ui/public/autoload/modules.js      |   35 -
 src/legacy/ui/public/autoload/settings.js     |   20 -
 .../ui/public/binder/__tests__/binder.js      |   88 -
 src/legacy/ui/public/binder/binder.js         |   53 -
 src/legacy/ui/public/binder/index.js          |   20 -
 src/legacy/ui/public/bound_to_config_obj.js   |   55 -
 src/legacy/ui/public/capabilities/index.ts    |   29 -
 .../ui/public/capabilities/react/index.ts     |   21 -
 .../react/inject_ui_capabilities.test.tsx     |  116 -
 .../react/inject_ui_capabilities.tsx          |   53 -
 .../public/capabilities/react/legacy/index.ts |   21 -
 .../legacy/inject_ui_capabilities.test.tsx    |  116 -
 .../react/legacy/inject_ui_capabilities.tsx   |   57 -
 .../react/legacy/ui_capabilities_provider.tsx |   48 -
 .../react/ui_capabilities_context.ts          |   27 -
 .../react/ui_capabilities_provider.tsx        |   30 -
 .../ui/public/chrome/__mocks__/index.js       |   83 -
 .../ui/public/chrome/api/__tests__/angular.js |   36 -
 .../ui/public/chrome/api/__tests__/apps.js    |  121 -
 .../ui/public/chrome/api/__tests__/nav.js     |  143 -
 .../api/__tests__/sub_url_route_filter.js     |  130 -
 .../ui/public/chrome/api/__tests__/xsrf.js    |   41 -
 src/legacy/ui/public/chrome/api/angular.js    |   40 -
 src/legacy/ui/public/chrome/api/apps.js       |   83 -
 .../ui/public/chrome/api/badge.test.mocks.ts  |   27 -
 src/legacy/ui/public/chrome/api/badge.test.ts |   61 -
 src/legacy/ui/public/chrome/api/badge.ts      |   53 -
 .../public/chrome/api/base_path.test.mocks.ts |   27 -
 .../ui/public/chrome/api/base_path.test.ts    |   51 -
 src/legacy/ui/public/chrome/api/base_path.ts  |   28 -
 .../ui/public/chrome/api/breadcrumbs.ts       |   86 -
 .../public/chrome/api/controls.test.mocks.ts  |   27 -
 .../ui/public/chrome/api/controls.test.ts     |   68 -
 src/legacy/ui/public/chrome/api/controls.ts   |   47 -
 .../ui/public/chrome/api/help_extension.ts    |   53 -
 .../chrome/api/injected_vars.test.mocks.ts    |   28 -
 .../public/chrome/api/injected_vars.test.ts   |   78 -
 .../ui/public/chrome/api/injected_vars.ts     |   32 -
 .../ui/public/chrome/api/loading_count.js     |   65 -
 src/legacy/ui/public/chrome/api/nav.ts        |  157 -
 .../public/chrome/api/saved_object_client.ts  |   29 -
 .../ui/public/chrome/api/sub_url_hooks.js     |   88 -
 .../chrome/api/sub_url_hooks_utils.test.ts    |   58 -
 .../public/chrome/api/sub_url_hooks_utils.ts  |   29 -
 src/legacy/ui/public/chrome/api/template.js   |   75 -
 .../ui/public/chrome/api/theme.test.mocks.ts  |   27 -
 src/legacy/ui/public/chrome/api/theme.test.ts |  144 -
 src/legacy/ui/public/chrome/api/theme.ts      |   69 -
 .../ui/public/chrome/api/ui_settings.js       |   28 -
 src/legacy/ui/public/chrome/api/xsrf.js       |   24 -
 src/legacy/ui/public/chrome/chrome.js         |  118 -
 .../ui/public/chrome/directives/index.js      |   24 -
 .../public/chrome/directives/kbn_chrome.html  |    9 -
 .../ui/public/chrome/directives/kbn_chrome.js |  106 -
 src/legacy/ui/public/chrome/index.d.ts        |   64 -
 src/legacy/ui/public/chrome/index.js          |   23 -
 .../ui/public/config/__tests__/config.js      |  208 --
 src/legacy/ui/public/config/config.js         |  110 -
 src/legacy/ui/public/config/index.js          |   20 -
 .../directives/__tests__/input_focus.js       |   89 -
 src/legacy/ui/public/directives/_index.scss   |    2 -
 .../ui/public/directives/_input_datetime.scss |    5 -
 .../_saved_object_paginated_selectable.scss   |   70 -
 .../public/directives/bind/__tests__/bind.js  |   87 -
 src/legacy/ui/public/directives/bind/bind.js  |  116 -
 src/legacy/ui/public/directives/bind/index.js |   20 -
 .../ui/public/directives/input_focus.js       |   36 -
 src/legacy/ui/public/directives/kbn_href.js   |   38 -
 .../directives/listen/__tests__/listen.js     |   96 -
 .../ui/public/directives/listen/index.js      |   20 -
 .../ui/public/directives/listen/listen.js     |   23 -
 .../__tests__/render_directive.js             |  123 -
 .../render_directive/apply_scope_bindings.js  |   61 -
 .../directives/render_directive/index.js      |   20 -
 .../render_directive/render_directive.js      |   90 -
 .../ui/public/directives/storage/index.js     |   32 -
 .../watch_multi/__tests__/watch_multi.js      |  216 --
 .../ui/public/directives/watch_multi/index.js |   22 -
 .../public/doc_title/__tests__/doc_title.js   |   91 -
 src/legacy/ui/public/doc_title/doc_title.d.ts |   24 -
 src/legacy/ui/public/doc_title/doc_title.js   |   42 -
 src/legacy/ui/public/doc_title/index.js       |   22 -
 .../__mocks__/documentation_links.ts          |   25 -
 .../__tests__/documentation_links.js          |   30 -
 .../documentation_links.ts                    |   30 -
 .../documentation_links/get_doc_link.ts       |   23 -
 .../ui/public/documentation_links/index.ts    |   22 -
 src/legacy/ui/public/dom_location.js          |   34 -
 src/legacy/ui/public/elastic_charts/index.ts  |   26 -
 src/legacy/ui/public/events.js                |  138 -
 .../exit_full_screen_button.test.js.snap      |   53 -
 .../ui/public/exit_full_screen/_index.scss    |    1 -
 .../exit_full_screen_button.test.js           |   88 -
 .../exit_full_screen_button.tsx               |   45 -
 .../ui/public/exit_full_screen/index.ts       |   20 -
 src/legacy/ui/public/flot-charts/API.md       | 1498 --------
 src/legacy/ui/public/flot-charts/index.js     |   42 -
 .../public/flot-charts/jquery.colorhelpers.js |  180 -
 .../public/flot-charts/jquery.flot.canvas.js  |  345 --
 .../flot-charts/jquery.flot.categories.js     |  190 -
 .../flot-charts/jquery.flot.crosshair.js      |  176 -
 .../flot-charts/jquery.flot.errorbars.js      |  353 --
 .../flot-charts/jquery.flot.fillbetween.js    |  226 --
 .../public/flot-charts/jquery.flot.image.js   |  241 --
 .../ui/public/flot-charts/jquery.flot.js      | 3168 -----------------
 .../ui/public/flot-charts/jquery.flot.log.js  |  163 -
 .../flot-charts/jquery.flot.navigate.js       |  346 --
 .../ui/public/flot-charts/jquery.flot.pie.js  |  824 -----
 .../public/flot-charts/jquery.flot.resize.js  |   59 -
 .../flot-charts/jquery.flot.selection.js      |  360 --
 .../public/flot-charts/jquery.flot.stack.js   |  188 -
 .../public/flot-charts/jquery.flot.symbol.js  |   71 -
 .../flot-charts/jquery.flot.threshold.js      |  142 -
 .../ui/public/flot-charts/jquery.flot.time.js |  473 ---
 .../i18n/__snapshots__/index.test.tsx.snap    |   10 -
 src/legacy/ui/public/i18n/index.test.tsx      |   61 -
 src/legacy/ui/public/i18n/index.tsx           |   52 -
 .../indexed_array/__tests__/indexed_array.js  |  208 --
 .../indexed_array/__tests__/inflector.js      |   63 -
 .../indexed_array/helpers/organize_by.test.ts |   63 -
 .../indexed_array/helpers/organize_by.ts      |   61 -
 src/legacy/ui/public/indexed_array/index.d.ts |   44 -
 src/legacy/ui/public/indexed_array/index.js   |   20 -
 .../ui/public/indexed_array/indexed_array.js  |  235 --
 .../ui/public/indexed_array/inflector.js      |   60 -
 .../ui/public/kfetch/__mocks__/index.ts       |   20 -
 .../ui/public/kfetch/_import_objects.ndjson   |    1 -
 src/legacy/ui/public/kfetch/index.ts          |   28 -
 .../ui/public/kfetch/kfetch.test.mocks.ts     |   26 -
 src/legacy/ui/public/kfetch/kfetch.test.ts    |  487 ---
 src/legacy/ui/public/kfetch/kfetch.ts         |  110 -
 src/legacy/ui/public/kfetch/kfetch_error.ts   |   30 -
 .../ui/public/legacy_compat/__tests__/xsrf.js |  149 -
 src/legacy/ui/public/legacy_compat/index.ts   |   20 -
 src/legacy/ui/public/metadata.ts              |   25 -
 src/legacy/ui/public/modules.js               |  142 -
 .../public/new_platform/__mocks__/helpers.ts  |   81 -
 .../ui/public/new_platform/__mocks__/index.ts |   23 -
 src/legacy/ui/public/new_platform/index.ts    |   19 -
 .../new_platform/new_platform.karma_mock.js   |  550 ---
 .../new_platform/new_platform.test.mocks.ts   |   31 -
 .../public/new_platform/new_platform.test.ts  |  124 -
 .../ui/public/new_platform/new_platform.ts    |  208 --
 .../public/new_platform/set_services.test.ts  |   51 -
 .../ui/public/new_platform/set_services.ts    |   87 -
 .../ui/public/notify/banners/BANNERS.md       |  360 --
 .../ui/public/notify/banners/banners.tsx      |   85 -
 src/legacy/ui/public/notify/banners/index.ts  |   20 -
 src/legacy/ui/public/notify/fatal_error.ts    |   25 -
 src/legacy/ui/public/notify/index.d.ts        |   21 -
 src/legacy/ui/public/notify/index.js          |   22 -
 src/legacy/ui/public/notify/toasts/index.ts   |   20 -
 .../notify/toasts/toast_notifications.ts      |   22 -
 src/legacy/ui/public/notify/toasts/toasts.ts  |   22 -
 .../ui/public/private/__tests__/private.js    |  144 -
 src/legacy/ui/public/private/index.d.ts       |   20 -
 src/legacy/ui/public/private/index.js         |   20 -
 src/legacy/ui/public/private/private.js       |   23 -
 .../ui/public/promises/__tests__/promises.js  |  277 --
 src/legacy/ui/public/promises/defer.ts        |   33 -
 src/legacy/ui/public/promises/index.ts        |   28 -
 src/legacy/ui/public/react_components.js      |   32 -
 .../ui/public/registry/__tests__/registry.js  |  168 -
 src/legacy/ui/public/registry/_registry.d.ts  |   40 -
 src/legacy/ui/public/registry/_registry.js    |  141 -
 .../registry/chrome_header_nav_controls.ts    |   49 -
 .../public/registry/field_format_editors.ts   |   25 -
 .../public/routes/__tests__/_route_manager.js |  218 --
 .../ui/public/routes/__tests__/_work_queue.js |  116 -
 .../routes/__tests__/_wrap_route_with_prep.js |  106 -
 .../ui/public/routes/__tests__/index.js       |   23 -
 src/legacy/ui/public/routes/breadcrumbs.js    |   44 -
 src/legacy/ui/public/routes/index.d.ts        |   24 -
 src/legacy/ui/public/routes/index.js          |   23 -
 .../ui/public/routes/route_manager.d.ts       |   47 -
 src/legacy/ui/public/routes/route_manager.js  |  115 -
 .../ui/public/routes/route_setup_manager.js   |  112 -
 src/legacy/ui/public/routes/routes.d.ts       |   28 -
 src/legacy/ui/public/routes/routes.js         |   39 -
 src/legacy/ui/public/routes/work_queue.js     |   65 -
 .../ui/public/routes/wrap_route_with_prep.js  |   52 -
 .../state_management/__tests__/app_state.js   |   76 -
 .../__tests__/config_provider.js              |   57 -
 .../__tests__/global_state.js                 |   52 -
 .../state_management/__tests__/state.js       |  393 --
 .../__tests__/state_monitor_factory.js        |  265 --
 .../ui/public/state_management/app_state.d.ts |   26 -
 .../ui/public/state_management/app_state.js   |  137 -
 .../state_management/config_provider.js       |   48 -
 .../public/state_management/global_state.d.ts |   22 -
 .../public/state_management/global_state.js   |   42 -
 .../ui/public/state_management/state.d.ts     |   24 -
 .../ui/public/state_management/state.js       |  359 --
 .../state_management/state_monitor_factory.ts |  157 -
 .../public/system_api/__tests__/system_api.js |   68 -
 src/legacy/ui/public/system_api/index.js      |   20 -
 src/legacy/ui/public/timefilter/index.ts      |   39 -
 .../ui/public/timefilter/setup_router.test.js |   54 -
 .../ui/public/timefilter/setup_router.ts      |  118 -
 .../url/__tests__/extract_app_path_and_id.js  |  122 -
 .../public/url/__tests__/kibana_parsed_url.js |  217 --
 .../ui/public/url/__tests__/prepend_path.js   |   80 -
 src/legacy/ui/public/url/__tests__/url.js     |  562 ---
 .../ui/public/url/absolute_to_parsed_url.ts   |   44 -
 .../ui/public/url/extract_app_path_and_id.ts  |   41 -
 src/legacy/ui/public/url/index.js             |   23 -
 src/legacy/ui/public/url/kbn_url.ts           |   23 -
 src/legacy/ui/public/url/kibana_parsed_url.ts |  148 -
 src/legacy/ui/public/url/prepend_path.ts      |   50 -
 .../ui/public/url/redirect_when_missing.js    |   71 -
 .../ui/public/url/relative_to_absolute.ts     |   34 -
 src/legacy/ui/public/url/url.js               |  247 --
 src/legacy/ui/public/utils/collection.test.ts |  141 -
 src/legacy/ui/public/utils/collection.ts      |   76 -
 src/legacy/ui/public/utils/legacy_class.js    |   56 -
 .../management_app/advanced_settings.test.tsx |    4 -
 .../index_patterns_api_client.test.mock.ts    |    2 -
 .../components/field_name/field_name.test.tsx |    2 -
 .../indices/validate/validate_index.test.ts   |    2 -
 .../scripted_field_table.test.tsx             |    8 -
 .../directives/_saved_object_finder.scss      |   71 +
 .../lib/get_axis_label_string.test.js         |    2 -
 src/test_utils/public/no_digest_promises.js   |   60 -
 .../public/stub_get_active_injector.js        |   65 -
 .../self_changing_vis/self_changing_vis.js    |   47 -
 tsconfig.json                                 |    3 -
 x-pack/dev-tools/jest/create_jest_config.js   |    1 -
 .../functions/external/saved_lens.test.ts     |    2 +-
 .../functions/external/saved_map.test.ts      |    2 +-
 .../functions/external/saved_search.test.ts   |    2 +-
 .../external/saved_visualization.test.ts      |    2 +-
 .../canvas/common/lib/autocomplete.test.ts    |    1 -
 .../workpad_app/workpad_telemetry.test.tsx    |    1 -
 .../__tests__/workpad_refresh.test.ts         |    1 -
 .../public/state/reducers/embeddables.test.ts |    2 +-
 .../auto_follow_pattern_form.test.js          |    2 -
 .../follower_index_form.test.js               |    2 -
 .../auto_follow_pattern_validators.test.js    |    2 -
 .../public/app/store/reducers/api.test.js     |    1 -
 .../public/components/search_bar.test.tsx     |    1 -
 .../graph/public/state_management/mocks.ts    |    2 -
 .../application/services/ui_metric.test.ts    |    1 -
 .../component_template_details.test.ts        |    5 -
 .../component_template_list.test.ts           |    5 -
 .../ingest_pipelines_list.test.ts             |    5 -
 .../ems_file_source/ems_file_source.test.tsx  |    1 -
 .../es_agg_source/es_agg_source.test.ts       |    2 -
 .../es_geo_grid_source.test.ts                |    1 -
 .../es_term_source/es_term_source.test.js     |    1 -
 .../components/heatmap_style_editor.test.tsx  |    2 -
 .../dynamic_color_property.test.tsx           |    1 -
 .../properties/dynamic_icon_property.test.tsx |    1 -
 .../properties/dynamic_size_property.test.tsx |    1 -
 .../styles/vector/vector_style.test.js        |    1 -
 .../authorization/authorization_service.ts    |    2 +-
 .../authorization/disable_ui_capabilities.ts  |    2 +-
 .../__jest__/client_integration/home.test.ts  |    7 -
 .../client_integration/policy_add.test.ts     |    5 -
 .../client_integration/policy_edit.test.ts    |    5 -
 .../client_integration/repository_add.test.ts |    7 -
 .../repository_edit.test.ts                   |    7 -
 .../translations/translations/ja-JP.json      |   25 -
 .../translations/translations/zh-CN.json      |   25 -
 .../public/can_inherit_time_range.test.ts     |    2 -
 .../public/custom_time_range_action.test.ts   |    2 -
 .../common/services/ui_capabilities.ts        |    2 +-
 x-pack/test_utils/jest/config.js              |    1 -
 x-pack/tsconfig.json                          |    3 -
 290 files changed, 88 insertions(+), 25467 deletions(-)
 delete mode 100644 src/legacy/ui/public/.eslintrc
 delete mode 100644 src/legacy/ui/public/__mocks__/metadata.ts
 delete mode 100644 src/legacy/ui/public/__tests__/events.js
 delete mode 100644 src/legacy/ui/public/__tests__/metadata.js
 delete mode 100644 src/legacy/ui/public/_index.scss
 delete mode 100644 src/legacy/ui/public/accessibility/__tests__/kbn_accessible_click.js
 delete mode 100644 src/legacy/ui/public/accessibility/__tests__/kbn_ui_ace_keyboard_mode.js
 delete mode 100644 src/legacy/ui/public/accessibility/__tests__/scrollto_activedescendant.js
 delete mode 100644 src/legacy/ui/public/accessibility/_index.scss
 delete mode 100644 src/legacy/ui/public/accessibility/_kbn_ui_ace_keyboard_mode.scss
 delete mode 100644 src/legacy/ui/public/accessibility/angular_aria.js
 delete mode 100644 src/legacy/ui/public/accessibility/index.js
 delete mode 100644 src/legacy/ui/public/accessibility/kbn_accessible_click.js
 delete mode 100644 src/legacy/ui/public/accessibility/kbn_ui_ace_keyboard_mode.js
 delete mode 100644 src/legacy/ui/public/accessibility/scrollto_activedescendant.js
 delete mode 100644 src/legacy/ui/public/angular_ui_select.js
 delete mode 100644 src/legacy/ui/public/autoload/accessibility.js
 delete mode 100644 src/legacy/ui/public/autoload/all.js
 delete mode 100644 src/legacy/ui/public/autoload/modules.js
 delete mode 100644 src/legacy/ui/public/autoload/settings.js
 delete mode 100644 src/legacy/ui/public/binder/__tests__/binder.js
 delete mode 100644 src/legacy/ui/public/binder/binder.js
 delete mode 100644 src/legacy/ui/public/binder/index.js
 delete mode 100644 src/legacy/ui/public/bound_to_config_obj.js
 delete mode 100644 src/legacy/ui/public/capabilities/index.ts
 delete mode 100644 src/legacy/ui/public/capabilities/react/index.ts
 delete mode 100644 src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx
 delete mode 100644 src/legacy/ui/public/capabilities/react/inject_ui_capabilities.tsx
 delete mode 100644 src/legacy/ui/public/capabilities/react/legacy/index.ts
 delete mode 100644 src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx
 delete mode 100644 src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.tsx
 delete mode 100644 src/legacy/ui/public/capabilities/react/legacy/ui_capabilities_provider.tsx
 delete mode 100644 src/legacy/ui/public/capabilities/react/ui_capabilities_context.ts
 delete mode 100644 src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx
 delete mode 100644 src/legacy/ui/public/chrome/__mocks__/index.js
 delete mode 100644 src/legacy/ui/public/chrome/api/__tests__/angular.js
 delete mode 100644 src/legacy/ui/public/chrome/api/__tests__/apps.js
 delete mode 100644 src/legacy/ui/public/chrome/api/__tests__/nav.js
 delete mode 100644 src/legacy/ui/public/chrome/api/__tests__/sub_url_route_filter.js
 delete mode 100644 src/legacy/ui/public/chrome/api/__tests__/xsrf.js
 delete mode 100644 src/legacy/ui/public/chrome/api/angular.js
 delete mode 100644 src/legacy/ui/public/chrome/api/apps.js
 delete mode 100644 src/legacy/ui/public/chrome/api/badge.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/badge.test.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/badge.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/base_path.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/base_path.test.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/base_path.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/breadcrumbs.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/controls.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/controls.test.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/controls.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/help_extension.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/injected_vars.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/injected_vars.test.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/injected_vars.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/loading_count.js
 delete mode 100644 src/legacy/ui/public/chrome/api/nav.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/saved_object_client.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/sub_url_hooks.js
 delete mode 100644 src/legacy/ui/public/chrome/api/sub_url_hooks_utils.test.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/sub_url_hooks_utils.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/template.js
 delete mode 100644 src/legacy/ui/public/chrome/api/theme.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/theme.test.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/theme.ts
 delete mode 100644 src/legacy/ui/public/chrome/api/ui_settings.js
 delete mode 100644 src/legacy/ui/public/chrome/api/xsrf.js
 delete mode 100644 src/legacy/ui/public/chrome/chrome.js
 delete mode 100644 src/legacy/ui/public/chrome/directives/index.js
 delete mode 100644 src/legacy/ui/public/chrome/directives/kbn_chrome.html
 delete mode 100644 src/legacy/ui/public/chrome/directives/kbn_chrome.js
 delete mode 100644 src/legacy/ui/public/chrome/index.d.ts
 delete mode 100644 src/legacy/ui/public/chrome/index.js
 delete mode 100644 src/legacy/ui/public/config/__tests__/config.js
 delete mode 100644 src/legacy/ui/public/config/config.js
 delete mode 100644 src/legacy/ui/public/config/index.js
 delete mode 100644 src/legacy/ui/public/directives/__tests__/input_focus.js
 delete mode 100644 src/legacy/ui/public/directives/_index.scss
 delete mode 100644 src/legacy/ui/public/directives/_input_datetime.scss
 delete mode 100644 src/legacy/ui/public/directives/_saved_object_paginated_selectable.scss
 delete mode 100644 src/legacy/ui/public/directives/bind/__tests__/bind.js
 delete mode 100644 src/legacy/ui/public/directives/bind/bind.js
 delete mode 100644 src/legacy/ui/public/directives/bind/index.js
 delete mode 100644 src/legacy/ui/public/directives/input_focus.js
 delete mode 100644 src/legacy/ui/public/directives/kbn_href.js
 delete mode 100644 src/legacy/ui/public/directives/listen/__tests__/listen.js
 delete mode 100644 src/legacy/ui/public/directives/listen/index.js
 delete mode 100644 src/legacy/ui/public/directives/listen/listen.js
 delete mode 100644 src/legacy/ui/public/directives/render_directive/__tests__/render_directive.js
 delete mode 100644 src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js
 delete mode 100644 src/legacy/ui/public/directives/render_directive/index.js
 delete mode 100644 src/legacy/ui/public/directives/render_directive/render_directive.js
 delete mode 100644 src/legacy/ui/public/directives/storage/index.js
 delete mode 100644 src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js
 delete mode 100644 src/legacy/ui/public/directives/watch_multi/index.js
 delete mode 100644 src/legacy/ui/public/doc_title/__tests__/doc_title.js
 delete mode 100644 src/legacy/ui/public/doc_title/doc_title.d.ts
 delete mode 100644 src/legacy/ui/public/doc_title/doc_title.js
 delete mode 100644 src/legacy/ui/public/doc_title/index.js
 delete mode 100644 src/legacy/ui/public/documentation_links/__mocks__/documentation_links.ts
 delete mode 100644 src/legacy/ui/public/documentation_links/__tests__/documentation_links.js
 delete mode 100644 src/legacy/ui/public/documentation_links/documentation_links.ts
 delete mode 100644 src/legacy/ui/public/documentation_links/get_doc_link.ts
 delete mode 100644 src/legacy/ui/public/documentation_links/index.ts
 delete mode 100644 src/legacy/ui/public/dom_location.js
 delete mode 100644 src/legacy/ui/public/elastic_charts/index.ts
 delete mode 100644 src/legacy/ui/public/events.js
 delete mode 100644 src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap
 delete mode 100644 src/legacy/ui/public/exit_full_screen/_index.scss
 delete mode 100644 src/legacy/ui/public/exit_full_screen/exit_full_screen_button.test.js
 delete mode 100644 src/legacy/ui/public/exit_full_screen/exit_full_screen_button.tsx
 delete mode 100644 src/legacy/ui/public/exit_full_screen/index.ts
 delete mode 100644 src/legacy/ui/public/flot-charts/API.md
 delete mode 100644 src/legacy/ui/public/flot-charts/index.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.colorhelpers.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.canvas.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.categories.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.crosshair.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.errorbars.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.fillbetween.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.image.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.log.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.navigate.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.pie.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.resize.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.selection.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.stack.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.symbol.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.threshold.js
 delete mode 100644 src/legacy/ui/public/flot-charts/jquery.flot.time.js
 delete mode 100644 src/legacy/ui/public/i18n/__snapshots__/index.test.tsx.snap
 delete mode 100644 src/legacy/ui/public/i18n/index.test.tsx
 delete mode 100644 src/legacy/ui/public/i18n/index.tsx
 delete mode 100644 src/legacy/ui/public/indexed_array/__tests__/indexed_array.js
 delete mode 100644 src/legacy/ui/public/indexed_array/__tests__/inflector.js
 delete mode 100644 src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts
 delete mode 100644 src/legacy/ui/public/indexed_array/helpers/organize_by.ts
 delete mode 100644 src/legacy/ui/public/indexed_array/index.d.ts
 delete mode 100644 src/legacy/ui/public/indexed_array/index.js
 delete mode 100644 src/legacy/ui/public/indexed_array/indexed_array.js
 delete mode 100644 src/legacy/ui/public/indexed_array/inflector.js
 delete mode 100644 src/legacy/ui/public/kfetch/__mocks__/index.ts
 delete mode 100644 src/legacy/ui/public/kfetch/_import_objects.ndjson
 delete mode 100644 src/legacy/ui/public/kfetch/index.ts
 delete mode 100644 src/legacy/ui/public/kfetch/kfetch.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/kfetch/kfetch.test.ts
 delete mode 100644 src/legacy/ui/public/kfetch/kfetch.ts
 delete mode 100644 src/legacy/ui/public/kfetch/kfetch_error.ts
 delete mode 100644 src/legacy/ui/public/legacy_compat/__tests__/xsrf.js
 delete mode 100644 src/legacy/ui/public/legacy_compat/index.ts
 delete mode 100644 src/legacy/ui/public/metadata.ts
 delete mode 100644 src/legacy/ui/public/modules.js
 delete mode 100644 src/legacy/ui/public/new_platform/__mocks__/helpers.ts
 delete mode 100644 src/legacy/ui/public/new_platform/__mocks__/index.ts
 delete mode 100644 src/legacy/ui/public/new_platform/index.ts
 delete mode 100644 src/legacy/ui/public/new_platform/new_platform.karma_mock.js
 delete mode 100644 src/legacy/ui/public/new_platform/new_platform.test.mocks.ts
 delete mode 100644 src/legacy/ui/public/new_platform/new_platform.test.ts
 delete mode 100644 src/legacy/ui/public/new_platform/new_platform.ts
 delete mode 100644 src/legacy/ui/public/new_platform/set_services.test.ts
 delete mode 100644 src/legacy/ui/public/new_platform/set_services.ts
 delete mode 100644 src/legacy/ui/public/notify/banners/BANNERS.md
 delete mode 100644 src/legacy/ui/public/notify/banners/banners.tsx
 delete mode 100644 src/legacy/ui/public/notify/banners/index.ts
 delete mode 100644 src/legacy/ui/public/notify/fatal_error.ts
 delete mode 100644 src/legacy/ui/public/notify/index.d.ts
 delete mode 100644 src/legacy/ui/public/notify/index.js
 delete mode 100644 src/legacy/ui/public/notify/toasts/index.ts
 delete mode 100644 src/legacy/ui/public/notify/toasts/toast_notifications.ts
 delete mode 100644 src/legacy/ui/public/notify/toasts/toasts.ts
 delete mode 100644 src/legacy/ui/public/private/__tests__/private.js
 delete mode 100644 src/legacy/ui/public/private/index.d.ts
 delete mode 100644 src/legacy/ui/public/private/index.js
 delete mode 100644 src/legacy/ui/public/private/private.js
 delete mode 100644 src/legacy/ui/public/promises/__tests__/promises.js
 delete mode 100644 src/legacy/ui/public/promises/defer.ts
 delete mode 100644 src/legacy/ui/public/promises/index.ts
 delete mode 100644 src/legacy/ui/public/react_components.js
 delete mode 100644 src/legacy/ui/public/registry/__tests__/registry.js
 delete mode 100644 src/legacy/ui/public/registry/_registry.d.ts
 delete mode 100644 src/legacy/ui/public/registry/_registry.js
 delete mode 100644 src/legacy/ui/public/registry/chrome_header_nav_controls.ts
 delete mode 100644 src/legacy/ui/public/registry/field_format_editors.ts
 delete mode 100644 src/legacy/ui/public/routes/__tests__/_route_manager.js
 delete mode 100644 src/legacy/ui/public/routes/__tests__/_work_queue.js
 delete mode 100644 src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js
 delete mode 100644 src/legacy/ui/public/routes/__tests__/index.js
 delete mode 100644 src/legacy/ui/public/routes/breadcrumbs.js
 delete mode 100644 src/legacy/ui/public/routes/index.d.ts
 delete mode 100644 src/legacy/ui/public/routes/index.js
 delete mode 100644 src/legacy/ui/public/routes/route_manager.d.ts
 delete mode 100644 src/legacy/ui/public/routes/route_manager.js
 delete mode 100644 src/legacy/ui/public/routes/route_setup_manager.js
 delete mode 100644 src/legacy/ui/public/routes/routes.d.ts
 delete mode 100644 src/legacy/ui/public/routes/routes.js
 delete mode 100644 src/legacy/ui/public/routes/work_queue.js
 delete mode 100644 src/legacy/ui/public/routes/wrap_route_with_prep.js
 delete mode 100644 src/legacy/ui/public/state_management/__tests__/app_state.js
 delete mode 100644 src/legacy/ui/public/state_management/__tests__/config_provider.js
 delete mode 100644 src/legacy/ui/public/state_management/__tests__/global_state.js
 delete mode 100644 src/legacy/ui/public/state_management/__tests__/state.js
 delete mode 100644 src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js
 delete mode 100644 src/legacy/ui/public/state_management/app_state.d.ts
 delete mode 100644 src/legacy/ui/public/state_management/app_state.js
 delete mode 100644 src/legacy/ui/public/state_management/config_provider.js
 delete mode 100644 src/legacy/ui/public/state_management/global_state.d.ts
 delete mode 100644 src/legacy/ui/public/state_management/global_state.js
 delete mode 100644 src/legacy/ui/public/state_management/state.d.ts
 delete mode 100644 src/legacy/ui/public/state_management/state.js
 delete mode 100644 src/legacy/ui/public/state_management/state_monitor_factory.ts
 delete mode 100644 src/legacy/ui/public/system_api/__tests__/system_api.js
 delete mode 100644 src/legacy/ui/public/system_api/index.js
 delete mode 100644 src/legacy/ui/public/timefilter/index.ts
 delete mode 100644 src/legacy/ui/public/timefilter/setup_router.test.js
 delete mode 100644 src/legacy/ui/public/timefilter/setup_router.ts
 delete mode 100644 src/legacy/ui/public/url/__tests__/extract_app_path_and_id.js
 delete mode 100644 src/legacy/ui/public/url/__tests__/kibana_parsed_url.js
 delete mode 100644 src/legacy/ui/public/url/__tests__/prepend_path.js
 delete mode 100644 src/legacy/ui/public/url/__tests__/url.js
 delete mode 100644 src/legacy/ui/public/url/absolute_to_parsed_url.ts
 delete mode 100644 src/legacy/ui/public/url/extract_app_path_and_id.ts
 delete mode 100644 src/legacy/ui/public/url/index.js
 delete mode 100644 src/legacy/ui/public/url/kbn_url.ts
 delete mode 100644 src/legacy/ui/public/url/kibana_parsed_url.ts
 delete mode 100644 src/legacy/ui/public/url/prepend_path.ts
 delete mode 100644 src/legacy/ui/public/url/redirect_when_missing.js
 delete mode 100644 src/legacy/ui/public/url/relative_to_absolute.ts
 delete mode 100644 src/legacy/ui/public/url/url.js
 delete mode 100644 src/legacy/ui/public/utils/collection.test.ts
 delete mode 100644 src/legacy/ui/public/utils/collection.ts
 delete mode 100644 src/legacy/ui/public/utils/legacy_class.js
 delete mode 100644 src/test_utils/public/no_digest_promises.js
 delete mode 100644 src/test_utils/public/stub_get_active_injector.js
 delete mode 100644 test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js

diff --git a/src/core/public/chrome/recently_accessed/persisted_log.test.ts b/src/core/public/chrome/recently_accessed/persisted_log.test.ts
index 4229efdf7ca9dc..345ad8f3a1f5a8 100644
--- a/src/core/public/chrome/recently_accessed/persisted_log.test.ts
+++ b/src/core/public/chrome/recently_accessed/persisted_log.test.ts
@@ -28,12 +28,6 @@ const createMockStorage = () => ({
   length: 0,
 });
 
-jest.mock('ui/chrome', () => {
-  return {
-    getBasePath: () => `/some/base/path`,
-  };
-});
-
 const historyName = 'testHistory';
 const historyLimit = 10;
 const payload = [
diff --git a/src/dev/jest/config.js b/src/dev/jest/config.js
index 74e1ec5e2b4edb..486c8563c54562 100644
--- a/src/dev/jest/config.js
+++ b/src/dev/jest/config.js
@@ -59,7 +59,6 @@ export default {
     '@elastic/eui/lib/(.*)?': '<rootDir>/node_modules/@elastic/eui/test-env/$1',
     '^src/plugins/(.*)': '<rootDir>/src/plugins/$1',
     '^plugins/([^/.]*)(.*)': '<rootDir>/src/legacy/core_plugins/$1/public$2',
-    '^ui/(.*)': '<rootDir>/src/legacy/ui/public/$1',
     '^uiExports/(.*)': '<rootDir>/src/dev/jest/mocks/file_mock.js',
     '^test_utils/(.*)': '<rootDir>/src/test_utils/public/$1',
     '^fixtures/(.*)': '<rootDir>/src/fixtures/$1',
diff --git a/src/dev/jest/setup/mocks.js b/src/dev/jest/setup/mocks.js
index 6e7160e858cd7f..cea28d8abdbd13 100644
--- a/src/dev/jest/setup/mocks.js
+++ b/src/dev/jest/setup/mocks.js
@@ -34,10 +34,6 @@
  * The mocks that are enabled that way live inside the `__mocks__` folders beside their implementation files.
  */
 
-jest.mock('ui/metadata');
-jest.mock('ui/documentation_links/documentation_links');
-jest.mock('ui/chrome');
-
 jest.mock('moment-timezone', () => {
   // We always want to mock the timezone moment-timezone guesses, since otherwise
   // test results might be depending on which time zone you are running them.
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
index 5bb926799fcf6d..5735b01eb3db42 100644
--- a/src/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -21,7 +21,12 @@ import StubIndexPattern from 'test_utils/stub_index_pattern';
 import stubbedLogstashFields from 'fixtures/logstash_fields';
 
 import { getKbnFieldType } from '../plugins/data/common';
-import { npSetup } from '../legacy/ui/public/new_platform/new_platform.karma_mock';
+import { uiSettingsServiceMock } from '../core/public/ui_settings/ui_settings_service.mock';
+
+const uiSettingSetupMock = uiSettingsServiceMock.createSetupContract();
+uiSettingSetupMock.get.mockImplementation((item, defaultValue) => {
+  return defaultValue;
+});
 
 export default function stubbedLogstashIndexPatternService() {
   const mockLogstashFields = stubbedLogstashFields();
@@ -41,13 +46,9 @@ export default function stubbedLogstashIndexPatternService() {
     };
   });
 
-  const indexPattern = new StubIndexPattern(
-    'logstash-*',
-    (cfg) => cfg,
-    'time',
-    fields,
-    npSetup.core
-  );
+  const indexPattern = new StubIndexPattern('logstash-*', (cfg) => cfg, 'time', fields, {
+    uiSettings: uiSettingSetupMock,
+  });
 
   indexPattern.id = 'logstash-*';
   indexPattern.isTimeNanosBased = () => false;
diff --git a/src/legacy/ui/public/.eslintrc b/src/legacy/ui/public/.eslintrc
deleted file mode 100644
index cc44af915ba258..00000000000000
--- a/src/legacy/ui/public/.eslintrc
+++ /dev/null
@@ -1,3 +0,0 @@
-rules:
-  no-console: 2
-  'import/no-default-export': error
diff --git a/src/legacy/ui/public/__mocks__/metadata.ts b/src/legacy/ui/public/__mocks__/metadata.ts
deleted file mode 100644
index b7f944de27463c..00000000000000
--- a/src/legacy/ui/public/__mocks__/metadata.ts
+++ /dev/null
@@ -1,25 +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 { metadata as metadataImpl } from '../metadata';
-
-export const metadata: typeof metadataImpl = {
-  branch: 'jest-metadata-mock-branch',
-  version: '42.23.26',
-};
diff --git a/src/legacy/ui/public/__tests__/events.js b/src/legacy/ui/public/__tests__/events.js
deleted file mode 100644
index c225c2a8ac1c0c..00000000000000
--- a/src/legacy/ui/public/__tests__/events.js
+++ /dev/null
@@ -1,244 +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 _ from 'lodash';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-import { EventsProvider } from '../events';
-import expect from '@kbn/expect';
-import '../private';
-import { createDefer } from 'ui/promises';
-import { createLegacyClass } from '../utils/legacy_class';
-
-describe('Events', function () {
-  require('test_utils/no_digest_promises').activateForSuite();
-
-  let Events;
-  let Promise;
-  let eventsInstance;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector, Private) {
-      Promise = $injector.get('Promise');
-      Events = Private(EventsProvider);
-      eventsInstance = new Events();
-    })
-  );
-
-  it('should handle on events', function () {
-    const obj = new Events();
-    const prom = obj.on('test', function (message) {
-      expect(message).to.equal('Hello World');
-    });
-
-    obj.emit('test', 'Hello World');
-
-    return prom;
-  });
-
-  it('should work with inherited objects', function () {
-    createLegacyClass(MyEventedObject).inherits(Events);
-    function MyEventedObject() {
-      MyEventedObject.Super.call(this);
-    }
-    const obj = new MyEventedObject();
-
-    const prom = obj.on('test', function (message) {
-      expect(message).to.equal('Hello World');
-    });
-
-    obj.emit('test', 'Hello World');
-
-    return prom;
-  });
-
-  it('should clear events when off is called', function () {
-    const obj = new Events();
-    obj.on('test', _.noop);
-    expect(obj._listeners).to.have.property('test');
-    expect(obj._listeners.test).to.have.length(1);
-    obj.off();
-    expect(obj._listeners).to.not.have.property('test');
-  });
-
-  it('should clear a specific handler when off is called for an event', function () {
-    const obj = new Events();
-    const handler1 = sinon.stub();
-    const handler2 = sinon.stub();
-    obj.on('test', handler1);
-    obj.on('test', handler2);
-    expect(obj._listeners).to.have.property('test');
-    obj.off('test', handler1);
-
-    return obj.emit('test', 'Hello World').then(function () {
-      sinon.assert.calledOnce(handler2);
-      sinon.assert.notCalled(handler1);
-    });
-  });
-
-  it('should clear a all handlers when off is called for an event', function () {
-    const obj = new Events();
-    const handler1 = sinon.stub();
-    obj.on('test', handler1);
-    expect(obj._listeners).to.have.property('test');
-    obj.off('test');
-    expect(obj._listeners).to.not.have.property('test');
-
-    return obj.emit('test', 'Hello World').then(function () {
-      sinon.assert.notCalled(handler1);
-    });
-  });
-
-  it('should handle multiple identical emits in the same tick', function () {
-    const obj = new Events();
-    const handler1 = sinon.stub();
-
-    obj.on('test', handler1);
-    const emits = [obj.emit('test', 'one'), obj.emit('test', 'two'), obj.emit('test', 'three')];
-
-    return Promise.all(emits).then(function () {
-      expect(handler1.callCount).to.be(emits.length);
-      expect(handler1.getCall(0).calledWith('one')).to.be(true);
-      expect(handler1.getCall(1).calledWith('two')).to.be(true);
-      expect(handler1.getCall(2).calledWith('three')).to.be(true);
-    });
-  });
-
-  it('should handle emits from the handler', function () {
-    const obj = new Events();
-    const secondEmit = createDefer(Promise);
-
-    const handler1 = sinon.spy(function () {
-      if (handler1.calledTwice) {
-        return;
-      }
-      obj.emit('test').then(_.bindKey(secondEmit, 'resolve'));
-    });
-
-    obj.on('test', handler1);
-
-    return Promise.all([obj.emit('test'), secondEmit.promise]).then(function () {
-      expect(handler1.callCount).to.be(2);
-    });
-  });
-
-  it('should only emit to handlers registered before emit is called', function () {
-    const obj = new Events();
-    const handler1 = sinon.stub();
-    const handler2 = sinon.stub();
-
-    obj.on('test', handler1);
-    const emits = [obj.emit('test', 'one'), obj.emit('test', 'two'), obj.emit('test', 'three')];
-
-    return Promise.all(emits).then(function () {
-      expect(handler1.callCount).to.be(emits.length);
-
-      obj.on('test', handler2);
-
-      const emits2 = [obj.emit('test', 'four'), obj.emit('test', 'five'), obj.emit('test', 'six')];
-
-      return Promise.all(emits2).then(function () {
-        expect(handler1.callCount).to.be(emits.length + emits2.length);
-        expect(handler2.callCount).to.be(emits2.length);
-      });
-    });
-  });
-
-  it('should pass multiple arguments from the emitter', function () {
-    const obj = new Events();
-    const handler = sinon.stub();
-    const payload = ['one', { hello: 'tests' }, null];
-
-    obj.on('test', handler);
-
-    return obj.emit('test', payload[0], payload[1], payload[2]).then(function () {
-      expect(handler.callCount).to.be(1);
-      expect(handler.calledWithExactly(payload[0], payload[1], payload[2])).to.be(true);
-    });
-  });
-
-  it('should preserve the scope of the handler', function () {
-    const obj = new Events();
-    const expected = 'some value';
-    let testValue;
-
-    function handler() {
-      testValue = this.getVal();
-    }
-    handler.getVal = _.constant(expected);
-
-    obj.on('test', handler);
-    return obj.emit('test').then(function () {
-      expect(testValue).to.equal(expected);
-    });
-  });
-
-  it('should always emit in the same order', function () {
-    const handler = sinon.stub();
-
-    const obj = new Events();
-    obj.on('block', _.partial(handler, 'block'));
-    obj.on('last', _.partial(handler, 'last'));
-
-    return Promise.all([
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('block'),
-      obj.emit('last'),
-    ]).then(function () {
-      expect(handler.callCount).to.be(10);
-      handler.args.forEach(function (args, i) {
-        expect(args[0]).to.be(i < 9 ? 'block' : 'last');
-      });
-    });
-  });
-
-  it('calls emitted handlers asynchronously', (done) => {
-    const listenerStub = sinon.stub();
-    eventsInstance.on('test', listenerStub);
-    eventsInstance.emit('test');
-    sinon.assert.notCalled(listenerStub);
-
-    setTimeout(() => {
-      sinon.assert.calledOnce(listenerStub);
-      done();
-    }, 100);
-  });
-
-  it('calling off after an emit that has not yet triggered the handler, will not call the handler', (done) => {
-    const listenerStub = sinon.stub();
-    eventsInstance.on('test', listenerStub);
-    eventsInstance.emit('test');
-    // It's called asynchronously so it shouldn't be called yet.
-    sinon.assert.notCalled(listenerStub);
-    eventsInstance.off('test', listenerStub);
-
-    setTimeout(() => {
-      sinon.assert.notCalled(listenerStub);
-      done();
-    }, 100);
-  });
-});
diff --git a/src/legacy/ui/public/__tests__/metadata.js b/src/legacy/ui/public/__tests__/metadata.js
deleted file mode 100644
index c5051d70849cda..00000000000000
--- a/src/legacy/ui/public/__tests__/metadata.js
+++ /dev/null
@@ -1,29 +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 { metadata } from '../metadata';
-describe('ui/metadata', () => {
-  it('is immutable', () => {
-    expect(() => (metadata.foo = 'something')).to.throw;
-    expect(() => (metadata.version = 'something')).to.throw;
-    expect(() => (metadata.vars = {})).to.throw;
-    expect(() => (metadata.vars.kbnIndex = 'something')).to.throw;
-  });
-});
diff --git a/src/legacy/ui/public/_index.scss b/src/legacy/ui/public/_index.scss
deleted file mode 100644
index a441b773d4a4ed..00000000000000
--- a/src/legacy/ui/public/_index.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-// Prefix all styles with "kbn" to avoid conflicts.
-// Examples
-//   kbnChart
-//   kbnChart__legend
-//   kbnChart__legend--small
-//   kbnChart__legend-isLoading
-
-@import './accessibility/index';
-@import './directives/index';
diff --git a/src/legacy/ui/public/accessibility/__tests__/kbn_accessible_click.js b/src/legacy/ui/public/accessibility/__tests__/kbn_accessible_click.js
deleted file mode 100644
index f3b7ab29d8a148..00000000000000
--- a/src/legacy/ui/public/accessibility/__tests__/kbn_accessible_click.js
+++ /dev/null
@@ -1,127 +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 angular from 'angular';
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import '../kbn_accessible_click';
-import { keys } from '@elastic/eui';
-
-describe('kbnAccessibleClick directive', () => {
-  let $compile;
-  let $rootScope;
-
-  beforeEach(ngMock.module('kibana'));
-
-  beforeEach(
-    ngMock.inject(function (_$compile_, _$rootScope_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    })
-  );
-
-  describe('throws an error', () => {
-    it('when the element is a button', () => {
-      const html = `<button kbn-accessible-click></button>`;
-      expect(() => {
-        $compile(html)($rootScope);
-      }).to.throwError(/kbnAccessibleClick doesn't need to be used on a button./);
-    });
-
-    it('when the element is a link with an href', () => {
-      const html = `<a href="#" kbn-accessible-click></a>`;
-      expect(() => {
-        $compile(html)($rootScope);
-      }).to.throwError(
-        /kbnAccessibleClick doesn't need to be used on a link if it has a href attribute./
-      );
-    });
-
-    it(`when the element doesn't have an ng-click`, () => {
-      const html = `<div kbn-accessible-click></div>`;
-      expect(() => {
-        $compile(html)($rootScope);
-      }).to.throwError(/kbnAccessibleClick requires ng-click to be defined on its element./);
-    });
-  });
-
-  describe(`doesn't throw an error`, () => {
-    it('when the element is a link without an href', () => {
-      const html = `<a ng-click="noop" kbn-accessible-click></a>`;
-      expect(() => {
-        $compile(html)($rootScope);
-      }).not.to.throwError();
-    });
-  });
-
-  describe('adds accessibility attributes', () => {
-    it('tabindex', () => {
-      const html = `<div ng-click="noop" kbn-accessible-click></div>`;
-      const element = $compile(html)($rootScope);
-      expect(element.attr('tabindex')).to.be('0');
-    });
-
-    it('role', () => {
-      const html = `<div ng-click="noop" kbn-accessible-click></div>`;
-      const element = $compile(html)($rootScope);
-      expect(element.attr('role')).to.be('button');
-    });
-  });
-
-  describe(`doesn't override pre-existing accessibility attributes`, () => {
-    it('tabindex', () => {
-      const html = `<div ng-click="noop" kbn-accessible-click tabindex="1"></div>`;
-      const element = $compile(html)($rootScope);
-      expect(element.attr('tabindex')).to.be('1');
-    });
-
-    it('role', () => {
-      const html = `<div ng-click="noop" kbn-accessible-click role="submit"></div>`;
-      const element = $compile(html)($rootScope);
-      expect(element.attr('role')).to.be('submit');
-    });
-  });
-
-  describe(`calls ng-click`, () => {
-    let scope;
-    let element;
-
-    beforeEach(function () {
-      scope = $rootScope.$new();
-      scope.handleClick = sinon.stub();
-      const html = `<div ng-click="handleClick()" kbn-accessible-click></div>`;
-      element = $compile(html)(scope);
-    });
-
-    it(`on ENTER keyup`, () => {
-      const e = angular.element.Event('keyup'); // eslint-disable-line new-cap
-      e.key = keys.ENTER;
-      element.trigger(e);
-      sinon.assert.calledOnce(scope.handleClick);
-    });
-
-    it(`on SPACE keyup`, () => {
-      const e = angular.element.Event('keyup'); // eslint-disable-line new-cap
-      e.key = keys.SPACE;
-      element.trigger(e);
-      sinon.assert.calledOnce(scope.handleClick);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/accessibility/__tests__/kbn_ui_ace_keyboard_mode.js b/src/legacy/ui/public/accessibility/__tests__/kbn_ui_ace_keyboard_mode.js
deleted file mode 100644
index ce1bf95bf0fb78..00000000000000
--- a/src/legacy/ui/public/accessibility/__tests__/kbn_ui_ace_keyboard_mode.js
+++ /dev/null
@@ -1,129 +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 angular from 'angular';
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import '../kbn_ui_ace_keyboard_mode';
-import { keys } from '@elastic/eui';
-
-describe('kbnUiAceKeyboardMode directive', () => {
-  let element;
-
-  beforeEach(ngMock.module('kibana'));
-
-  beforeEach(
-    ngMock.inject(($compile, $rootScope) => {
-      element = $compile(`<div ui-ace kbn-ui-ace-keyboard-mode></div>`)($rootScope.$new());
-    })
-  );
-
-  it('should add the hint element', () => {
-    expect(element.find('.kbnUiAceKeyboardHint').length).to.be(1);
-  });
-
-  describe('hint element', () => {
-    it('should be tabable', () => {
-      expect(element.find('.kbnUiAceKeyboardHint').attr('tabindex')).to.be('0');
-    });
-
-    it('should move focus to textbox and be inactive if pressed enter on it', () => {
-      const textarea = element.find('textarea');
-      sinon.spy(textarea[0], 'focus');
-      const ev = angular.element.Event('keydown'); // eslint-disable-line new-cap
-      ev.key = keys.ENTER;
-      element.find('.kbnUiAceKeyboardHint').trigger(ev);
-      expect(textarea[0].focus.called).to.be(true);
-      expect(
-        element.find('.kbnUiAceKeyboardHint').hasClass('kbnUiAceKeyboardHint-isInactive')
-      ).to.be(true);
-    });
-
-    it('should be shown again, when pressing Escape in ace editor', () => {
-      const textarea = element.find('textarea');
-      const hint = element.find('.kbnUiAceKeyboardHint');
-      sinon.spy(hint[0], 'focus');
-      const ev = angular.element.Event('keydown'); // eslint-disable-line new-cap
-      ev.key = keys.ESCAPE;
-      textarea.trigger(ev);
-      expect(hint[0].focus.called).to.be(true);
-      expect(hint.hasClass('kbnUiAceKeyboardHint-isInactive')).to.be(false);
-    });
-  });
-
-  describe('ui-ace textarea', () => {
-    it('should not be tabable anymore', () => {
-      expect(element.find('textarea').attr('tabindex')).to.be('-1');
-    });
-  });
-});
-
-describe('kbnUiAceKeyboardModeService', () => {
-  let element;
-
-  beforeEach(ngMock.module('kibana'));
-
-  beforeEach(
-    ngMock.inject(($compile, $rootScope, kbnUiAceKeyboardModeService) => {
-      const scope = $rootScope.$new();
-      element = $compile(`<div ui-ace></div>`)(scope);
-      kbnUiAceKeyboardModeService.initialize(scope, element);
-    })
-  );
-
-  it('should add the hint element', () => {
-    expect(element.find('.kbnUiAceKeyboardHint').length).to.be(1);
-  });
-
-  describe('hint element', () => {
-    it('should be tabable', () => {
-      expect(element.find('.kbnUiAceKeyboardHint').attr('tabindex')).to.be('0');
-    });
-
-    it('should move focus to textbox and be inactive if pressed enter on it', () => {
-      const textarea = element.find('textarea');
-      sinon.spy(textarea[0], 'focus');
-      const ev = angular.element.Event('keydown'); // eslint-disable-line new-cap
-      ev.key = keys.ENTER;
-      element.find('.kbnUiAceKeyboardHint').trigger(ev);
-      expect(textarea[0].focus.called).to.be(true);
-      expect(
-        element.find('.kbnUiAceKeyboardHint').hasClass('kbnUiAceKeyboardHint-isInactive')
-      ).to.be(true);
-    });
-
-    it('should be shown again, when pressing Escape in ace editor', () => {
-      const textarea = element.find('textarea');
-      const hint = element.find('.kbnUiAceKeyboardHint');
-      sinon.spy(hint[0], 'focus');
-      const ev = angular.element.Event('keydown'); // eslint-disable-line new-cap
-      ev.key = keys.ESCAPE;
-      textarea.trigger(ev);
-      expect(hint[0].focus.called).to.be(true);
-      expect(hint.hasClass('kbnUiAceKeyboardHint-isInactive')).to.be(false);
-    });
-  });
-
-  describe('ui-ace textarea', () => {
-    it('should not be tabable anymore', () => {
-      expect(element.find('textarea').attr('tabindex')).to.be('-1');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/accessibility/__tests__/scrollto_activedescendant.js b/src/legacy/ui/public/accessibility/__tests__/scrollto_activedescendant.js
deleted file mode 100644
index d5ccbf887e79b9..00000000000000
--- a/src/legacy/ui/public/accessibility/__tests__/scrollto_activedescendant.js
+++ /dev/null
@@ -1,56 +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 ngMock from 'ng_mock';
-import '../scrollto_activedescendant';
-
-describe('scrolltoActivedescendant directive', () => {
-  let $compile;
-  let $rootScope;
-
-  beforeEach(ngMock.module('kibana'));
-
-  beforeEach(
-    ngMock.inject((_$compile_, _$rootScope_) => {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-    })
-  );
-
-  it('should call scrollIntoView on aria-activedescendant changes', () => {
-    const scope = $rootScope.$new();
-    scope.ad = '';
-    const element = $compile(`<div aria-activedescendant="{{ad}}" scrollto-activedescendant>
-      <span id="child1"></span>
-      <span id="child2"></span>
-    </div>`)(scope);
-    const child1 = element.find('#child1');
-    const child2 = element.find('#child2');
-    sinon.spy(child1[0], 'scrollIntoView');
-    sinon.spy(child2[0], 'scrollIntoView');
-    scope.ad = 'child1';
-    scope.$digest();
-    expect(child1[0].scrollIntoView.calledOnce).to.be.eql(true);
-    scope.ad = 'child2';
-    scope.$digest();
-    expect(child2[0].scrollIntoView.calledOnce).to.be.eql(true);
-  });
-});
diff --git a/src/legacy/ui/public/accessibility/_index.scss b/src/legacy/ui/public/accessibility/_index.scss
deleted file mode 100644
index 95062449e4b13c..00000000000000
--- a/src/legacy/ui/public/accessibility/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './kbn_ui_ace_keyboard_mode';
diff --git a/src/legacy/ui/public/accessibility/_kbn_ui_ace_keyboard_mode.scss b/src/legacy/ui/public/accessibility/_kbn_ui_ace_keyboard_mode.scss
deleted file mode 100644
index 9ace600db4197d..00000000000000
--- a/src/legacy/ui/public/accessibility/_kbn_ui_ace_keyboard_mode.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-.kbnUiAceKeyboardHint {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  background: transparentize($euiColorEmptyShade, 0.3);
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  text-align: center;
-  opacity: 0;
-
-  &:focus {
-    opacity: 1;
-    border: 2px solid $euiColorPrimary;
-    z-index: 1000;
-  }
-
-  &.kbnUiAceKeyboardHint-isInactive {
-    display: none;
-  }
-}
diff --git a/src/legacy/ui/public/accessibility/angular_aria.js b/src/legacy/ui/public/accessibility/angular_aria.js
deleted file mode 100644
index 4335eddf0d8cdf..00000000000000
--- a/src/legacy/ui/public/accessibility/angular_aria.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.
- */
-
-import 'angular-aria';
-import { uiModules } from '../modules';
-
-/**
- * This module will take care of attaching appropriate aria tags related to some angular stuff,
- * e.g. it will attach aria-invalid if the model state is set to invalid.
- *
- * You can find more infos in the official documentation: https://docs.angularjs.org/api/ngAria.
- *
- * Three settings are disabled: it won't automatically attach `tabindex`, `role=button` or
- * handling keyboard events for `ngClick` directives. Kibana uses `kbnAccessibleClick` to handle
- * those cases where you need an `ngClick` non button element to have keyboard access.
- */
-uiModules.get('kibana', ['ngAria']).config(($ariaProvider) => {
-  $ariaProvider.config({
-    bindKeydown: false,
-    bindRoleForClick: false,
-    tabindex: false,
-  });
-});
diff --git a/src/legacy/ui/public/accessibility/index.js b/src/legacy/ui/public/accessibility/index.js
deleted file mode 100644
index 5ff25214218664..00000000000000
--- a/src/legacy/ui/public/accessibility/index.js
+++ /dev/null
@@ -1,22 +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 './angular_aria';
-import './kbn_accessible_click';
-import './scrollto_activedescendant';
diff --git a/src/legacy/ui/public/accessibility/kbn_accessible_click.js b/src/legacy/ui/public/accessibility/kbn_accessible_click.js
deleted file mode 100644
index a57fbc6be82fd7..00000000000000
--- a/src/legacy/ui/public/accessibility/kbn_accessible_click.js
+++ /dev/null
@@ -1,43 +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.
- */
-
-/**
- * Interactive elements must be able to receive focus.
- *
- * Ideally, this means using elements that are natively keyboard accessible (<a href="">,
- * <input type="button">, or <button>). Note that links should be used when navigating and buttons
- * should be used when performing an action on the page.
- *
- * If you need to use a <div>, <p>, or <a> without the href attribute, then you need to allow
- * them to receive focus and to respond to keyboard input. The workaround is to:
- *
- *   - Give the element tabindex="0" so that it can receive keyboard focus.
- *   - Add a JavaScript onkeyup event handler that triggers element functionality if the Enter key
- *     is pressed while the element is focused. This is necessary because some browsers do not trigger
- *    onclick events for such elements when activated via the keyboard.
- *   - If the item is meant to function as a button, the onkeyup event handler should also detect the
- *     Spacebar in addition to the Enter key, and the element should be given role="button".
- *
- * Apply this directive to any of these elements to automatically do the above.
- */
-
-import { uiModules } from '../modules';
-import { KbnAccessibleClickProvider } from '../../../../plugins/kibana_legacy/public';
-
-uiModules.get('kibana').directive('kbnAccessibleClick', KbnAccessibleClickProvider);
diff --git a/src/legacy/ui/public/accessibility/kbn_ui_ace_keyboard_mode.js b/src/legacy/ui/public/accessibility/kbn_ui_ace_keyboard_mode.js
deleted file mode 100644
index 88b08beb5b3d06..00000000000000
--- a/src/legacy/ui/public/accessibility/kbn_ui_ace_keyboard_mode.js
+++ /dev/null
@@ -1,129 +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 `kbn-ui-ace-keyboard-mode` directive should be used on any element, that
- * `ui-ace` is used on. It will prevent the keyboard trap, that ui-ace usually
- * has, i.e. tabbing into the box won't give you any possibilities to leave
- * it via keyboard again, since tab inside the textbox works like a tab character.
- *
- * This directive won't change anything, if the user uses the mouse. But if she
- * tabs to the ace editor, an overlay will be shown, that you have to press Enter
- * to enter editing mode, and that it can be left by pressing Escape again.
- *
- * That way the ui-ace editor won't trap keyboard focus, and won't cause that
- * accessibility issue anymore.
- */
-
-import angular from 'angular';
-import { uiModules } from '../modules';
-import { keys } from '@elastic/eui';
-
-let aceKeyboardModeId = 0;
-
-uiModules
-  .get('kibana')
-  .factory('kbnUiAceKeyboardModeService', () => ({
-    initialize(scope, element) {
-      const uniqueId = `kbnUiAceKeyboardHint-${scope.$id}-${aceKeyboardModeId++}`;
-
-      const hint = angular.element(
-        `<div
-          class="kbnUiAceKeyboardHint"
-          id="${uniqueId}"
-          tabindex="0"
-          role="application"
-        >
-          <p class="kuiText kuiVerticalRhythmSmall">
-            Press Enter to start editing.
-          </p>
-          <p class="kuiText kuiVerticalRhythmSmall">
-            When you&rsquo;re done, press Escape to stop editing.
-          </p>
-        </div>`
-      );
-
-      const uiAceTextbox = element.find('textarea');
-
-      function startEditing() {
-        // We are not using ng-class in the element, so that we won't need to $compile it
-        hint.addClass('kbnUiAceKeyboardHint-isInactive');
-        uiAceTextbox.focus();
-      }
-
-      function enableOverlay() {
-        hint.removeClass('kbnUiAceKeyboardHint-isInactive');
-      }
-
-      hint.keydown((ev) => {
-        if (ev.key === keys.ENTER) {
-          ev.preventDefault();
-          startEditing();
-        }
-      });
-
-      uiAceTextbox.blur(() => {
-        enableOverlay();
-      });
-
-      let isAutoCompleterOpen;
-
-      // We have to capture this event on the 'capture' phase, otherwise Ace will have already
-      // dismissed the autocompleter when the user hits ESC.
-      document.addEventListener(
-        'keydown',
-        () => {
-          const autoCompleter = document.querySelector('.ace_autocomplete');
-
-          if (!autoCompleter) {
-            isAutoCompleterOpen = false;
-            return;
-          }
-
-          // The autoComplete is just hidden when it's closed, not removed from the DOM.
-          isAutoCompleterOpen = autoCompleter.style.display !== 'none';
-        },
-        { capture: true }
-      );
-
-      uiAceTextbox.keydown((ev) => {
-        if (ev.key === keys.ESCAPE) {
-          // If the autocompletion context menu is open then we want to let ESC close it but
-          // **not** exit out of editing mode.
-          if (!isAutoCompleterOpen) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            enableOverlay();
-            hint.focus();
-          }
-        }
-      });
-
-      hint.click(startEditing);
-      // Prevent tabbing into the ACE textarea, we now handle all focusing for it
-      uiAceTextbox.attr('tabindex', '-1');
-      element.prepend(hint);
-    },
-  }))
-  .directive('kbnUiAceKeyboardMode', (kbnUiAceKeyboardModeService) => ({
-    restrict: 'A',
-    link(scope, element) {
-      kbnUiAceKeyboardModeService.initialize(scope, element);
-    },
-  }));
diff --git a/src/legacy/ui/public/accessibility/scrollto_activedescendant.js b/src/legacy/ui/public/accessibility/scrollto_activedescendant.js
deleted file mode 100644
index 1034cb1df3ddaa..00000000000000
--- a/src/legacy/ui/public/accessibility/scrollto_activedescendant.js
+++ /dev/null
@@ -1,43 +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.
- */
-
-/**
- * This directive can be applied to an element, that has also aria-activedescendant applied.
- * It will make sure, that whenever aria-activedescendant changes, the new element
- * referenced by it, will be scrolled into visible view, by calling its `scrollIntoView`
- * method.
- */
-
-import { uiModules } from '../modules';
-
-uiModules.get('kibana').directive('scrolltoActivedescendant', () => ({
-  link(scope, element, attrs) {
-    scope.$watch(
-      () => attrs.ariaActivedescendant,
-      (val) => {
-        if (val) {
-          const activeDescendant = element.find(`#${val}`);
-          if (activeDescendant.length) {
-            activeDescendant[0].scrollIntoView();
-          }
-        }
-      }
-    );
-  },
-}));
diff --git a/src/legacy/ui/public/angular_ui_select.js b/src/legacy/ui/public/angular_ui_select.js
deleted file mode 100644
index 99f92587507c92..00000000000000
--- a/src/legacy/ui/public/angular_ui_select.js
+++ /dev/null
@@ -1,28 +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 'jquery';
-import 'angular';
-// required for `ngSanitize` angular module
-import 'angular-sanitize';
-import 'ui-select/dist/select';
-
-import { uiModules } from 'ui/modules';
-
-uiModules.get('kibana', ['ui.select', 'ngSanitize']);
diff --git a/src/legacy/ui/public/autoload/accessibility.js b/src/legacy/ui/public/autoload/accessibility.js
deleted file mode 100644
index 1c846177eca872..00000000000000
--- a/src/legacy/ui/public/autoload/accessibility.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.
- */
-
-import '../accessibility';
diff --git a/src/legacy/ui/public/autoload/all.js b/src/legacy/ui/public/autoload/all.js
deleted file mode 100644
index be9b29aa944c95..00000000000000
--- a/src/legacy/ui/public/autoload/all.js
+++ /dev/null
@@ -1,22 +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 './accessibility';
-import './modules';
-import './settings';
diff --git a/src/legacy/ui/public/autoload/modules.js b/src/legacy/ui/public/autoload/modules.js
deleted file mode 100644
index 94929c8ca26d34..00000000000000
--- a/src/legacy/ui/public/autoload/modules.js
+++ /dev/null
@@ -1,35 +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 'angular';
-import '../chrome';
-import '../config';
-import '../notify';
-import '../private';
-import '../promises';
-import '../state_management/app_state';
-import '../state_management/global_state';
-import '../url';
-import '../directives/watch_multi';
-import '../react_components';
-import '../i18n';
-
-import '@elastic/ui-ace';
-import { uiModules } from 'ui/modules';
-uiModules.get('kibana', ['ui.ace']);
diff --git a/src/legacy/ui/public/autoload/settings.js b/src/legacy/ui/public/autoload/settings.js
deleted file mode 100644
index 50ae67c052b938..00000000000000
--- a/src/legacy/ui/public/autoload/settings.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.
- */
-
-/** Left intentionally empty to avoid breaking plugins that import this file during the NP migration */
diff --git a/src/legacy/ui/public/binder/__tests__/binder.js b/src/legacy/ui/public/binder/__tests__/binder.js
deleted file mode 100644
index de30df36f6b2b3..00000000000000
--- a/src/legacy/ui/public/binder/__tests__/binder.js
+++ /dev/null
@@ -1,88 +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 ngMock from 'ng_mock';
-
-import { Binder } from '..';
-import $ from 'jquery';
-
-describe('Binder class', function () {
-  let $scope;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($rootScope) {
-      $scope = $rootScope.$new();
-    })
-  );
-
-  describe('Constructing with a $scope', function () {
-    it('accepts a $scope and listens for $destroy', function () {
-      sinon.stub($scope, '$on');
-      new Binder($scope);
-      expect($scope.$on.callCount).to.be(1);
-      expect($scope.$on.args[0][0]).to.be('$destroy');
-    });
-
-    it('unbinds when the $scope is destroyed', function () {
-      const binder = new Binder($scope);
-      sinon.stub(binder, 'destroy');
-      $scope.$destroy();
-      expect(binder.destroy.callCount).to.be(1);
-    });
-  });
-
-  describe('Binder#on', function () {
-    it('binds to normal event emitters', function () {
-      const binder = new Binder();
-      const emitter = {
-        on: sinon.stub(),
-        removeListener: sinon.stub(),
-      };
-      const handler = sinon.stub();
-
-      binder.on(emitter, 'click', handler);
-      expect(emitter.on.callCount).to.be(1);
-      expect(emitter.on.args[0][0]).to.be('click');
-      expect(emitter.on.args[0][1]).to.be(handler);
-
-      binder.destroy();
-      expect(emitter.removeListener.callCount).to.be(1);
-      expect(emitter.removeListener.args[0][0]).to.be('click');
-      expect(emitter.removeListener.args[0][1]).to.be(handler);
-    });
-  });
-
-  describe('Binder#jqOn', function () {
-    it('binds jquery event handlers', function () {
-      const binder = new Binder();
-      const el = document.createElement('div');
-      const handler = sinon.stub();
-
-      binder.jqOn(el, 'click', handler);
-      $(el).click();
-      expect(handler.callCount).to.be(1);
-      binder.destroy();
-      $(el).click();
-      expect(handler.callCount).to.be(1);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/binder/binder.js b/src/legacy/ui/public/binder/binder.js
deleted file mode 100644
index 0d535d3bdcb0ea..00000000000000
--- a/src/legacy/ui/public/binder/binder.js
+++ /dev/null
@@ -1,53 +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 d3 from 'd3';
-import $ from 'jquery';
-
-import { BinderBase } from '../../../utils/binder';
-
-export class Binder extends BinderBase {
-  constructor($scope) {
-    super();
-
-    // support auto-binding to $scope objects
-    if ($scope) {
-      $scope.$on('$destroy', () => this.destroy());
-    }
-  }
-
-  jqOn(el, ...args) {
-    const $el = $(el);
-    $el.on(...args);
-    this.disposal.push(() => $el.off(...args));
-  }
-
-  fakeD3Bind(el, event, handler) {
-    this.jqOn(el, event, (e) => {
-      // mimic https://github.com/mbostock/d3/blob/3abb00113662463e5c19eb87cd33f6d0ddc23bc0/src/selection/on.js#L87-L94
-      const o = d3.event; // Events can be reentrant (e.g., focus).
-      d3.event = e;
-      try {
-        handler.apply(this, [this.__data__]);
-      } finally {
-        d3.event = o;
-      }
-    });
-  }
-}
diff --git a/src/legacy/ui/public/binder/index.js b/src/legacy/ui/public/binder/index.js
deleted file mode 100644
index ce91a987fa570a..00000000000000
--- a/src/legacy/ui/public/binder/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 { Binder } from './binder';
diff --git a/src/legacy/ui/public/bound_to_config_obj.js b/src/legacy/ui/public/bound_to_config_obj.js
deleted file mode 100644
index dc1eedebe2b777..00000000000000
--- a/src/legacy/ui/public/bound_to_config_obj.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 _ from 'lodash';
-
-export function BoundToConfigObjProvider(config) {
-  /**
-   * Create an object with properties that may be bound to config values.
-   * The input object is basically cloned unless one of it's own properties
-   * resolved to a string value that starts with an equal sign. When that is
-   * found, that property is forever bound to the corresponding config key.
-   *
-   * example:
-   *
-   * // name is cloned, height is bound to the defaultHeight config key
-   * { name: 'john', height: '=defaultHeight' };
-   *
-   * @param  {Object} input
-   * @return {Object}
-   */
-  function BoundToConfigObj(input) {
-    const self = this;
-
-    _.forOwn(input, function (value, prop) {
-      if (!_.isString(value) || value.charAt(0) !== '=') {
-        self[prop] = value;
-        return;
-      }
-
-      const configKey = value.substr(1);
-
-      config.watch(configKey, function update(value) {
-        self[prop] = value;
-      });
-    });
-  }
-
-  return BoundToConfigObj;
-}
diff --git a/src/legacy/ui/public/capabilities/index.ts b/src/legacy/ui/public/capabilities/index.ts
deleted file mode 100644
index e16116f024a0f5..00000000000000
--- a/src/legacy/ui/public/capabilities/index.ts
+++ /dev/null
@@ -1,29 +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 { npStart } from 'ui/new_platform';
-import { Capabilities as UICapabilities } from '../../../../core/public';
-
-export { UICapabilities };
-
-export const capabilities = {
-  get() {
-    return npStart.core.application.capabilities;
-  },
-};
diff --git a/src/legacy/ui/public/capabilities/react/index.ts b/src/legacy/ui/public/capabilities/react/index.ts
deleted file mode 100644
index 78d95a2603290a..00000000000000
--- a/src/legacy/ui/public/capabilities/react/index.ts
+++ /dev/null
@@ -1,21 +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 { UICapabilitiesProvider } from './ui_capabilities_provider';
-export { injectUICapabilities } from './inject_ui_capabilities';
diff --git a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx b/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx
deleted file mode 100644
index 10fb58783481dc..00000000000000
--- a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.test.tsx
+++ /dev/null
@@ -1,116 +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.
- */
-
-jest.mock('ui/capabilities', () => ({
-  capabilities: {
-    get: () => ({
-      uiCapability1: true,
-      uiCapability2: {
-        nestedProp: 'nestedValue',
-      },
-    }),
-  },
-}));
-
-import { mount } from 'enzyme';
-import React from 'react';
-import { UICapabilities } from '..';
-import { injectUICapabilities } from './inject_ui_capabilities';
-import { UICapabilitiesProvider } from './ui_capabilities_provider';
-
-describe('injectUICapabilities', () => {
-  it('provides UICapabilities to FCs', () => {
-    interface FCProps {
-      uiCapabilities: UICapabilities;
-    }
-
-    const MyFC = injectUICapabilities(({ uiCapabilities }: FCProps) => {
-      return <span>{uiCapabilities.uiCapability2.nestedProp}</span>;
-    });
-
-    const wrapper = mount(
-      <UICapabilitiesProvider>
-        <MyFC />
-      </UICapabilitiesProvider>
-    );
-
-    expect(wrapper).toMatchInlineSnapshot(`
-<UICapabilitiesProvider>
-  <InjectUICapabilities(Component)>
-    <Component
-      uiCapabilities={
-        Object {
-          "uiCapability1": true,
-          "uiCapability2": Object {
-            "nestedProp": "nestedValue",
-          },
-        }
-      }
-    >
-      <span>
-        nestedValue
-      </span>
-    </Component>
-  </InjectUICapabilities(Component)>
-</UICapabilitiesProvider>
-`);
-  });
-
-  it('provides UICapabilities to class components', () => {
-    interface ClassProps {
-      uiCapabilities: UICapabilities;
-    }
-
-    // eslint-disable-next-line react/prefer-stateless-function
-    class MyClassComponent extends React.Component<ClassProps, {}> {
-      public render() {
-        return <span>{this.props.uiCapabilities.uiCapability2.nestedProp}</span>;
-      }
-    }
-
-    const WrappedComponent = injectUICapabilities(MyClassComponent);
-
-    const wrapper = mount(
-      <UICapabilitiesProvider>
-        <WrappedComponent />
-      </UICapabilitiesProvider>
-    );
-
-    expect(wrapper).toMatchInlineSnapshot(`
-<UICapabilitiesProvider>
-  <InjectUICapabilities(MyClassComponent)>
-    <MyClassComponent
-      uiCapabilities={
-        Object {
-          "uiCapability1": true,
-          "uiCapability2": Object {
-            "nestedProp": "nestedValue",
-          },
-        }
-      }
-    >
-      <span>
-        nestedValue
-      </span>
-    </MyClassComponent>
-  </InjectUICapabilities(MyClassComponent)>
-</UICapabilitiesProvider>
-`);
-  });
-});
diff --git a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.tsx b/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.tsx
deleted file mode 100644
index 2841b99263b6f0..00000000000000
--- a/src/legacy/ui/public/capabilities/react/inject_ui_capabilities.tsx
+++ /dev/null
@@ -1,53 +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, { Component, ComponentClass, ComponentType } from 'react';
-import { UICapabilitiesContext } from './ui_capabilities_context';
-import { UICapabilities } from '..';
-
-function getDisplayName(component: ComponentType<any>) {
-  return component.displayName || component.name || 'Component';
-}
-
-interface InjectedProps {
-  uiCapabilities: UICapabilities;
-}
-
-export function injectUICapabilities<P>(
-  WrappedComponent: ComponentType<P & InjectedProps>
-): ComponentClass<Pick<P, Exclude<keyof P, keyof InjectedProps>>> & {
-  WrappedComponent: ComponentType<P & InjectedProps>;
-} {
-  class InjectUICapabilities extends Component<P, any> {
-    public static displayName = `InjectUICapabilities(${getDisplayName(WrappedComponent)})`;
-
-    public static WrappedComponent: ComponentType<P & InjectedProps> = WrappedComponent;
-
-    public static contextType = UICapabilitiesContext;
-
-    constructor(props: any, context: any) {
-      super(props, context);
-    }
-
-    public render() {
-      return <WrappedComponent {...this.props} {...{ uiCapabilities: this.context }} />;
-    }
-  }
-  return InjectUICapabilities;
-}
diff --git a/src/legacy/ui/public/capabilities/react/legacy/index.ts b/src/legacy/ui/public/capabilities/react/legacy/index.ts
deleted file mode 100644
index 78d95a2603290a..00000000000000
--- a/src/legacy/ui/public/capabilities/react/legacy/index.ts
+++ /dev/null
@@ -1,21 +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 { UICapabilitiesProvider } from './ui_capabilities_provider';
-export { injectUICapabilities } from './inject_ui_capabilities';
diff --git a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx b/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx
deleted file mode 100644
index dbc7cd03e27a3f..00000000000000
--- a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.test.tsx
+++ /dev/null
@@ -1,116 +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.
- */
-
-jest.mock('ui/capabilities', () => ({
-  capabilities: {
-    get: () => ({
-      uiCapability1: true,
-      uiCapability2: {
-        nestedProp: 'nestedValue',
-      },
-    }),
-  },
-}));
-
-import { mount } from 'enzyme';
-import React from 'react';
-import { UICapabilities } from '../..';
-import { injectUICapabilities } from './inject_ui_capabilities';
-import { UICapabilitiesProvider } from './ui_capabilities_provider';
-
-describe('injectUICapabilities', () => {
-  it('provides UICapabilities to FCs', () => {
-    interface FCProps {
-      uiCapabilities: UICapabilities;
-    }
-
-    const MyFC = injectUICapabilities(({ uiCapabilities }: FCProps) => {
-      return <span>{uiCapabilities.uiCapability2.nestedProp}</span>;
-    });
-
-    const wrapper = mount(
-      <UICapabilitiesProvider>
-        <MyFC />
-      </UICapabilitiesProvider>
-    );
-
-    expect(wrapper).toMatchInlineSnapshot(`
-<UICapabilitiesProvider>
-  <InjectUICapabilities(Component)>
-    <Component
-      uiCapabilities={
-        Object {
-          "uiCapability1": true,
-          "uiCapability2": Object {
-            "nestedProp": "nestedValue",
-          },
-        }
-      }
-    >
-      <span>
-        nestedValue
-      </span>
-    </Component>
-  </InjectUICapabilities(Component)>
-</UICapabilitiesProvider>
-`);
-  });
-
-  it('provides UICapabilities to class components', () => {
-    interface ClassProps {
-      uiCapabilities: UICapabilities;
-    }
-
-    // eslint-disable-next-line react/prefer-stateless-function
-    class MyClassComponent extends React.Component<ClassProps, {}> {
-      public render() {
-        return <span>{this.props.uiCapabilities.uiCapability2.nestedProp}</span>;
-      }
-    }
-
-    const WrappedComponent = injectUICapabilities(MyClassComponent);
-
-    const wrapper = mount(
-      <UICapabilitiesProvider>
-        <WrappedComponent />
-      </UICapabilitiesProvider>
-    );
-
-    expect(wrapper).toMatchInlineSnapshot(`
-<UICapabilitiesProvider>
-  <InjectUICapabilities(MyClassComponent)>
-    <MyClassComponent
-      uiCapabilities={
-        Object {
-          "uiCapability1": true,
-          "uiCapability2": Object {
-            "nestedProp": "nestedValue",
-          },
-        }
-      }
-    >
-      <span>
-        nestedValue
-      </span>
-    </MyClassComponent>
-  </InjectUICapabilities(MyClassComponent)>
-</UICapabilitiesProvider>
-`);
-  });
-});
diff --git a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.tsx b/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.tsx
deleted file mode 100644
index 0253326809721c..00000000000000
--- a/src/legacy/ui/public/capabilities/react/legacy/inject_ui_capabilities.tsx
+++ /dev/null
@@ -1,57 +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 PropTypes from 'prop-types';
-import React, { Component, ComponentClass, ComponentType } from 'react';
-import { UICapabilities } from '../..';
-
-function getDisplayName(component: ComponentType<any>) {
-  return component.displayName || component.name || 'Component';
-}
-
-interface InjectedProps {
-  uiCapabilities: UICapabilities;
-}
-
-export function injectUICapabilities<P>(
-  WrappedComponent: ComponentType<P & InjectedProps>
-): ComponentClass<Pick<P, Exclude<keyof P, keyof InjectedProps>>> & {
-  WrappedComponent: ComponentType<P & InjectedProps>;
-} {
-  class InjectUICapabilities extends Component<P, any> {
-    public static displayName = `InjectUICapabilities(${getDisplayName(WrappedComponent)})`;
-
-    public static WrappedComponent: ComponentType<P & InjectedProps> = WrappedComponent;
-
-    public static contextTypes = {
-      uiCapabilities: PropTypes.object.isRequired,
-    };
-
-    constructor(props: any, context: any) {
-      super(props, context);
-    }
-
-    public render() {
-      return (
-        <WrappedComponent {...this.props} {...{ uiCapabilities: this.context.uiCapabilities }} />
-      );
-    }
-  }
-  return InjectUICapabilities;
-}
diff --git a/src/legacy/ui/public/capabilities/react/legacy/ui_capabilities_provider.tsx b/src/legacy/ui/public/capabilities/react/legacy/ui_capabilities_provider.tsx
deleted file mode 100644
index 2e1f6add20d091..00000000000000
--- a/src/legacy/ui/public/capabilities/react/legacy/ui_capabilities_provider.tsx
+++ /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 PropTypes from 'prop-types';
-import React, { ReactNode } from 'react';
-import { capabilities, UICapabilities } from '../..';
-
-interface Props {
-  children: ReactNode;
-}
-
-interface ProviderContext {
-  uiCapabilities: UICapabilities;
-}
-
-export class UICapabilitiesProvider extends React.Component<Props, {}> {
-  public static displayName: string = 'UICapabilitiesProvider';
-
-  public static childContextTypes = {
-    uiCapabilities: PropTypes.object.isRequired,
-  };
-
-  public getChildContext(): ProviderContext {
-    return {
-      uiCapabilities: capabilities.get(),
-    };
-  }
-
-  public render() {
-    return React.Children.only(this.props.children);
-  }
-}
diff --git a/src/legacy/ui/public/capabilities/react/ui_capabilities_context.ts b/src/legacy/ui/public/capabilities/react/ui_capabilities_context.ts
deleted file mode 100644
index ed299662899bb5..00000000000000
--- a/src/legacy/ui/public/capabilities/react/ui_capabilities_context.ts
+++ /dev/null
@@ -1,27 +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 { UICapabilities } from '..';
-
-export const UICapabilitiesContext = React.createContext<UICapabilities>({
-  navLinks: {},
-  catalogue: {},
-  management: {},
-});
diff --git a/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx b/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx
deleted file mode 100644
index 90da657cc93e05..00000000000000
--- a/src/legacy/ui/public/capabilities/react/ui_capabilities_provider.tsx
+++ /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 React from 'react';
-import { UICapabilitiesContext } from './ui_capabilities_context';
-import { capabilities } from '..';
-
-export const UICapabilitiesProvider: React.FC = (props) => (
-  <UICapabilitiesContext.Provider value={capabilities.get()}>
-    {props.children}
-  </UICapabilitiesContext.Provider>
-);
-
-UICapabilitiesProvider.displayName = 'UICapabilitiesProvider';
diff --git a/src/legacy/ui/public/chrome/__mocks__/index.js b/src/legacy/ui/public/chrome/__mocks__/index.js
deleted file mode 100644
index cf977cd2c9f816..00000000000000
--- a/src/legacy/ui/public/chrome/__mocks__/index.js
+++ /dev/null
@@ -1,83 +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 { uiSettingsServiceMock } from '../../../../../core/public/mocks';
-
-const uiSettingsClient = {
-  ...uiSettingsServiceMock.createSetupContract(),
-  getUpdate$: () => ({
-    subscribe: jest.fn(),
-  }),
-};
-
-const chrome = {
-  addBasePath: (path) => (path ? path : 'test/base/path'),
-  breadcrumbs: {
-    set: () => ({}),
-  },
-  getBasePath: () => '/test/base/path',
-  getInjected: jest.fn(),
-  getUiSettingsClient: () => uiSettingsClient,
-  getSavedObjectsClient: () => '',
-  getXsrfToken: () => 'kbn-xsrf-token',
-};
-
-// eslint-disable-next-line import/no-default-export
-export default chrome;
-
-// Copied from `src/legacy/ui/public/chrome/chrome.js`
-import _ from 'lodash';
-import angular from 'angular';
-import { metadata } from '../../metadata';
-
-const internals = _.defaults(_.cloneDeep(metadata), {
-  basePath: '',
-  rootController: null,
-  rootTemplate: null,
-  showAppsLink: null,
-  xsrfToken: null,
-  devMode: true,
-  brand: null,
-  nav: [],
-  applicationClasses: [],
-});
-
-const waitForBootstrap = new Promise((resolve) => {
-  chrome.bootstrap = function (targetDomElement) {
-    // sets attribute on body for stylesheet sandboxing
-    document.body.setAttribute('id', `${internals.app.id}-app`);
-
-    chrome.setupAngular();
-    targetDomElement.setAttribute('kbn-chrome', 'true');
-    targetDomElement.setAttribute('ng-class', "{ 'hidden-chrome': !chrome.getVisible() }");
-    targetDomElement.className = 'app-wrapper';
-    angular.bootstrap(targetDomElement, ['kibana']);
-    resolve(targetDomElement);
-  };
-});
-
-chrome.dangerouslyGetActiveInjector = () => {
-  return waitForBootstrap.then((targetDomElement) => {
-    const $injector = angular.element(targetDomElement).injector();
-    if (!$injector) {
-      return Promise.reject('targetDomElement had no angular context after bootstrapping');
-    }
-    return $injector;
-  });
-};
diff --git a/src/legacy/ui/public/chrome/api/__tests__/angular.js b/src/legacy/ui/public/chrome/api/__tests__/angular.js
deleted file mode 100644
index 797498a24265e7..00000000000000
--- a/src/legacy/ui/public/chrome/api/__tests__/angular.js
+++ /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 { initAngularApi } from '../angular';
-import { noop } from 'lodash';
-
-describe('Chrome API :: Angular', () => {
-  describe('location helper methods', () => {
-    it('should return the sub app based on the url', () => {
-      const chrome = {
-        getInjected: noop,
-        addBasePath: noop,
-      };
-      initAngularApi(chrome, {
-        devMode: true,
-      });
-    });
-    it('should return breadcrumbs based on the url', () => {});
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/__tests__/apps.js b/src/legacy/ui/public/chrome/api/__tests__/apps.js
deleted file mode 100644
index 98da8db52bad17..00000000000000
--- a/src/legacy/ui/public/chrome/api/__tests__/apps.js
+++ /dev/null
@@ -1,121 +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 setup from '../apps';
-
-describe('Chrome API :: apps', function () {
-  describe('#get/setShowAppsLink()', function () {
-    describe('defaults to false if there are less than two apps', function () {
-      it('appCount = 0', function () {
-        const chrome = {};
-        setup(chrome, { nav: [] });
-        expect(chrome.getShowAppsLink()).to.equal(false);
-      });
-
-      it('appCount = 1', function () {
-        const chrome = {};
-        setup(chrome, { nav: [{ url: '/' }] });
-        expect(chrome.getShowAppsLink()).to.equal(false);
-      });
-    });
-
-    describe('defaults to true if there are two or more apps', function () {
-      it('appCount = 2', function () {
-        const chrome = {};
-        setup(chrome, { nav: [{ url: '/' }, { url: '/2' }] });
-        expect(chrome.getShowAppsLink()).to.equal(true);
-      });
-
-      it('appCount = 3', function () {
-        const chrome = {};
-        setup(chrome, { nav: [{ url: '/' }, { url: '/2' }, { url: '/3' }] });
-        expect(chrome.getShowAppsLink()).to.equal(true);
-      });
-    });
-
-    it('is chainable', function () {
-      const chrome = {};
-      setup(chrome, { nav: [{ url: '/' }] });
-      expect(chrome.setShowAppsLink(true)).to.equal(chrome);
-    });
-
-    it('can be changed', function () {
-      const chrome = {};
-      setup(chrome, { nav: [{ url: '/' }] });
-
-      expect(chrome.setShowAppsLink(true).getShowAppsLink()).to.equal(true);
-      expect(chrome.getShowAppsLink()).to.equal(true);
-
-      expect(chrome.setShowAppsLink(false).getShowAppsLink()).to.equal(false);
-      expect(chrome.getShowAppsLink()).to.equal(false);
-    });
-  });
-
-  describe('#getApp()', function () {
-    it('returns a clone of the current app', function () {
-      const chrome = {};
-      const app = { url: '/' };
-      setup(chrome, { app });
-
-      expect(chrome.getApp()).to.eql(app);
-      expect(chrome.getApp()).to.not.equal(app);
-    });
-
-    it('returns undefined if no active app', function () {
-      const chrome = {};
-      setup(chrome, {});
-      expect(chrome.getApp()).to.equal(undefined);
-    });
-  });
-
-  describe('#getAppTitle()', function () {
-    it('returns the title property of the current app', function () {
-      const chrome = {};
-      const app = { url: '/', title: 'foo' };
-      setup(chrome, { app });
-      expect(chrome.getAppTitle()).to.eql('foo');
-    });
-
-    it('returns undefined if no active app', function () {
-      const chrome = {};
-      setup(chrome, {});
-      expect(chrome.getAppTitle()).to.equal(undefined);
-    });
-  });
-
-  describe('#getAppUrl()', function () {
-    it('returns the resolved url of the current app', function () {
-      const chrome = {};
-      const app = { navLink: { url: '/foo' } };
-      setup(chrome, { app });
-
-      const a = document.createElement('a');
-      a.setAttribute('href', app.navLink.url);
-      expect(chrome.getAppUrl()).to.equal(a.href);
-    });
-
-    it('returns undefined if no active app', function () {
-      const chrome = {};
-      setup(chrome, {});
-      expect(chrome.getAppUrl()).to.equal(undefined);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/__tests__/nav.js b/src/legacy/ui/public/chrome/api/__tests__/nav.js
deleted file mode 100644
index accb56dd42aa3f..00000000000000
--- a/src/legacy/ui/public/chrome/api/__tests__/nav.js
+++ /dev/null
@@ -1,143 +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 sinon from 'sinon';
-
-import { initChromeNavApi } from '../nav';
-import { StubBrowserStorage } from 'test_utils/stub_browser_storage';
-import { npStart } from 'ui/new_platform';
-import { absoluteToParsedUrl } from '../../../url/absolute_to_parsed_url';
-
-const basePath = '/someBasePath';
-
-function init(customInternals = { basePath }) {
-  const chrome = {
-    addBasePath: (path) => path,
-    getBasePath: () => customInternals.basePath || '',
-  };
-  const internals = {
-    nav: [],
-    ...customInternals,
-  };
-  initChromeNavApi(chrome, internals);
-  return { chrome, internals };
-}
-
-describe('chrome nav apis', function () {
-  let coreNavLinks;
-  let fakedLinks = [];
-
-  const baseUrl = (function () {
-    const a = document.createElement('a');
-    a.setAttribute('href', '/');
-    return a.href.slice(0, a.href.length - 1);
-  })();
-
-  beforeEach(() => {
-    coreNavLinks = npStart.core.chrome.navLinks;
-    sinon.stub(coreNavLinks, 'update').callsFake((linkId, updateAttrs) => {
-      const link = fakedLinks.find(({ id }) => id === linkId);
-      for (const key of Object.keys(updateAttrs)) {
-        link[key] = updateAttrs[key];
-      }
-      return link;
-    });
-    sinon.stub(coreNavLinks, 'getAll').callsFake(() => fakedLinks);
-    sinon
-      .stub(coreNavLinks, 'get')
-      .callsFake((linkId) => fakedLinks.find(({ id }) => id === linkId));
-  });
-
-  afterEach(() => {
-    coreNavLinks.update.restore();
-    coreNavLinks.getAll.restore();
-    coreNavLinks.get.restore();
-  });
-
-  describe('#untrackNavLinksForDeletedSavedObjects', function () {
-    const appId = 'appId';
-    const appUrl = `${baseUrl}/app/kibana#test`;
-    const deletedId = 'IAMDELETED';
-
-    it('should clear last url when last url contains link to deleted saved object', function () {
-      const appUrlStore = new StubBrowserStorage();
-      fakedLinks = [
-        {
-          id: appId,
-          title: 'Discover',
-          url: `${appUrl}?id=${deletedId}`,
-          baseUrl: appUrl,
-          linkToLastSubUrl: true,
-          legacy: true,
-        },
-      ];
-
-      const { chrome } = init({ appUrlStore });
-      chrome.untrackNavLinksForDeletedSavedObjects([deletedId]);
-      expect(coreNavLinks.update.calledWith(appId, { url: appUrl })).to.be(true);
-    });
-
-    it('should not clear last url when last url does not contains link to deleted saved object', function () {
-      const lastUrl = `${appUrl}?id=anotherSavedObjectId`;
-      const appUrlStore = new StubBrowserStorage();
-      fakedLinks = [
-        {
-          id: appId,
-          title: 'Discover',
-          url: lastUrl,
-          baseUrl: appUrl,
-          linkToLastSubUrl: true,
-          legacy: true,
-        },
-      ];
-
-      const { chrome } = init({ appUrlStore });
-      chrome.untrackNavLinksForDeletedSavedObjects([deletedId]);
-      expect(coreNavLinks.update.calledWith(appId, { url: appUrl })).to.be(false);
-    });
-  });
-
-  describe('chrome.trackSubUrlForApp()', function () {
-    it('injects a manual app url', function () {
-      const appUrlStore = new StubBrowserStorage();
-      fakedLinks = [
-        {
-          id: 'visualize',
-          baseUrl: `${baseUrl}/app/visualize#`,
-          url: `${baseUrl}/app/visualize#`,
-          subUrlBase: '/app/visualize#',
-          legacy: true,
-        },
-      ];
-
-      const { chrome } = init({ appUrlStore });
-      const kibanaParsedUrl = absoluteToParsedUrl(
-        `${baseUrl}/xyz/app/visualize#/1234?_g=globalstate`,
-        '/xyz'
-      );
-      chrome.trackSubUrlForApp('visualize', kibanaParsedUrl);
-      expect(
-        coreNavLinks.update.calledWith('visualize', {
-          url: `${baseUrl}/xyz/app/visualize#/1234?_g=globalstate`,
-        })
-      ).to.be(true);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/__tests__/sub_url_route_filter.js b/src/legacy/ui/public/chrome/api/__tests__/sub_url_route_filter.js
deleted file mode 100644
index 901fbd1d0edf69..00000000000000
--- a/src/legacy/ui/public/chrome/api/__tests__/sub_url_route_filter.js
+++ /dev/null
@@ -1,130 +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 ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-
-import { SubUrlRouteFilterProvider } from '../sub_url_hooks';
-
-describe('kbn-chrome subUrlRouteFilter()', () => {
-  describe('no ngRoute', () => {
-    beforeEach(ngMock.module('kibana/private'));
-    beforeEach(
-      ngMock.inject(($injector) => {
-        expect($injector.has('$route')).to.be(false);
-      })
-    );
-
-    it(
-      'always returns true when there is no $route service',
-      ngMock.inject((Private) => {
-        const subUrlRouteFilter = Private(SubUrlRouteFilterProvider);
-        expect(subUrlRouteFilter()).to.be(true);
-      })
-    );
-  });
-
-  describe('with ngRoute', () => {
-    beforeEach(
-      ngMock.module('kibana/private', 'ngRoute', ($routeProvider) => {
-        $routeProvider.when('/foo', {
-          redirectTo: '/bar',
-        });
-
-        $routeProvider.when('/bar', {
-          template: '<div>foo => bar</div>',
-        });
-      })
-    );
-
-    let test;
-    beforeEach(
-      ngMock.inject((Private, $location, $rootScope, $route) => {
-        test = ({ path, assert }) => {
-          const subUrlRouteFilter = Private(SubUrlRouteFilterProvider);
-          $location.path(path);
-
-          let result;
-          function runAssert() {
-            if (result) {
-              // only run once
-              return;
-            }
-
-            try {
-              assert($route, subUrlRouteFilter);
-              result = {};
-            } catch (error) {
-              result = { error };
-            }
-          }
-
-          $rootScope.$on('$routeUpdate', runAssert);
-          $rootScope.$on('$routeChangeSuccess', runAssert);
-          $rootScope.$apply();
-
-          // when no route matches there is no event so we run manually
-          if (!result) {
-            runAssert();
-          }
-
-          if (result.error) {
-            throw result.error;
-          }
-        };
-      })
-    );
-
-    describe('no current route', () => {
-      it('returns false', () => {
-        test({
-          path: '/baz',
-          assert($route, subUrlRouteFilter) {
-            expect($route.current).to.not.be.ok();
-            expect(subUrlRouteFilter()).to.eql(false);
-          },
-        });
-      });
-    });
-
-    describe('redirectTo route', () => {
-      it('is called on target route', () => {
-        test({
-          path: '/foo',
-          assert($route) {
-            expect($route.current.$$route.originalPath).to.be('/bar');
-          },
-        });
-      });
-    });
-
-    describe('standard route', () => {
-      it('returns true', () => {
-        test({
-          path: '/bar',
-          assert($route, subUrlRouteFilter) {
-            expect($route.current).to.be.ok();
-            expect($route.current.template).to.be.ok();
-            expect(subUrlRouteFilter()).to.eql(true);
-          },
-        });
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/__tests__/xsrf.js b/src/legacy/ui/public/chrome/api/__tests__/xsrf.js
deleted file mode 100644
index 3197b79f407dad..00000000000000
--- a/src/legacy/ui/public/chrome/api/__tests__/xsrf.js
+++ /dev/null
@@ -1,41 +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 sinon from 'sinon';
-
-import { initChromeXsrfApi } from '../xsrf';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { version } from '../../../../../../core/server/utils/package_json';
-
-describe('chrome xsrf apis', function () {
-  const sandbox = sinon.createSandbox();
-
-  afterEach(function () {
-    sandbox.restore();
-  });
-
-  describe('#getXsrfToken()', function () {
-    it('exposes the token', function () {
-      const chrome = {};
-      initChromeXsrfApi(chrome, { version });
-      expect(chrome.getXsrfToken()).to.be(version);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/angular.js b/src/legacy/ui/public/chrome/api/angular.js
deleted file mode 100644
index a9113b2df2ed79..00000000000000
--- a/src/legacy/ui/public/chrome/api/angular.js
+++ /dev/null
@@ -1,40 +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 { uiModules } from '../../modules';
-
-import { directivesProvider } from '../directives';
-import { registerSubUrlHooks } from './sub_url_hooks';
-import { configureAppAngularModule } from 'ui/legacy_compat';
-import { npStart } from '../../new_platform/new_platform';
-
-export function initAngularApi(chrome, internals) {
-  chrome.setupAngular = function () {
-    const kibana = uiModules.get('kibana');
-
-    configureAppAngularModule(kibana, npStart.core, false);
-
-    kibana.value('chrome', chrome);
-
-    registerSubUrlHooks(kibana, internals);
-    directivesProvider(chrome, internals);
-
-    uiModules.link(kibana);
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/apps.js b/src/legacy/ui/public/chrome/api/apps.js
deleted file mode 100644
index c4cbe7be6f1c38..00000000000000
--- a/src/legacy/ui/public/chrome/api/apps.js
+++ /dev/null
@@ -1,83 +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 { clone, get } from 'lodash';
-import { resolve } from 'url';
-
-// eslint-disable-next-line import/no-default-export
-export default function (chrome, internals) {
-  if (get(internals, 'app.navLink.url')) {
-    internals.app.navLink.url = resolve(window.location.href, internals.app.navLink.url);
-  }
-
-  internals.appUrlStore = internals.appUrlStore || window.sessionStorage;
-  try {
-    const verifySessionStorage = 'verify sessionStorage';
-    internals.appUrlStore.setItem(verifySessionStorage, 1);
-    internals.appUrlStore.removeItem(verifySessionStorage);
-  } catch (error) {
-    throw new Error(
-      'Kibana requires access to sessionStorage, and it looks like ' +
-        "your browser is restricting it. If you're " +
-        'using Safari with private browsing enabled, you can solve this ' +
-        'problem by disabling private browsing, or by using another browser.'
-    );
-  }
-
-  /**
-   * ui/chrome apps API
-   *
-   *   ui/chrome has some metadata about the current app, and enables the
-   *   navbar link, a small grid to the left of the tabs, when there is more
-   *   than one app installed.
-   */
-
-  chrome.setShowAppsLink = function (val) {
-    internals.showAppsLink = !!val;
-    return chrome;
-  };
-
-  chrome.getShowAppsLink = function () {
-    return internals.showAppsLink == null ? internals.nav.length > 1 : internals.showAppsLink;
-  };
-
-  chrome.getKibanaVersion = function () {
-    return internals.version;
-  };
-
-  chrome.getApp = function () {
-    return clone(internals.app);
-  };
-
-  chrome.getAppTitle = function () {
-    return get(internals, ['app', 'title']);
-  };
-
-  chrome.getAppUrl = function () {
-    return get(internals, ['app', 'navLink', 'url']);
-  };
-
-  chrome.getLastUrlFor = function (appId) {
-    return internals.appUrlStore.getItem(`appLastUrl:${appId}`);
-  };
-
-  chrome.setLastUrlFor = function (appId, url) {
-    internals.appUrlStore.setItem(`appLastUrl:${appId}`, url);
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/badge.test.mocks.ts b/src/legacy/ui/public/chrome/api/badge.test.mocks.ts
deleted file mode 100644
index 9e78805272b2d0..00000000000000
--- a/src/legacy/ui/public/chrome/api/badge.test.mocks.ts
+++ /dev/null
@@ -1,27 +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 { chromeServiceMock } from '../../../../../core/public/mocks';
-
-export const newPlatformChrome = chromeServiceMock.createStartContract();
-jest.doMock('ui/new_platform', () => ({
-  npStart: {
-    core: { chrome: newPlatformChrome },
-  },
-}));
diff --git a/src/legacy/ui/public/chrome/api/badge.test.ts b/src/legacy/ui/public/chrome/api/badge.test.ts
deleted file mode 100644
index 6a19afb609f8ac..00000000000000
--- a/src/legacy/ui/public/chrome/api/badge.test.ts
+++ /dev/null
@@ -1,61 +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 * as Rx from 'rxjs';
-
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { ChromeBadge } from 'src/core/public/chrome';
-import { newPlatformChrome } from './badge.test.mocks';
-import { initChromeBadgeApi } from './badge';
-
-function setup() {
-  const getBadge$ = new Rx.BehaviorSubject<ChromeBadge | undefined>(undefined);
-  newPlatformChrome.getBadge$.mockReturnValue(getBadge$);
-
-  const chrome: any = {};
-  initChromeBadgeApi(chrome);
-  return { chrome, getBadge$ };
-}
-
-afterEach(() => {
-  jest.resetAllMocks();
-});
-
-describe('badge', () => {
-  describe('#get$()', () => {
-    it('returns newPlatformChrome.getBadge$()', () => {
-      const { chrome } = setup();
-      expect(chrome.badge.get$()).toBe(newPlatformChrome.getBadge$());
-    });
-  });
-
-  describe('#set()', () => {
-    it('calls newPlatformChrome.setBadge', () => {
-      const { chrome } = setup();
-      const badge = {
-        text: 'foo',
-        tooltip: `foo's tooltip`,
-        iconType: 'alert',
-      };
-      chrome.badge.set(badge);
-      expect(newPlatformChrome.setBadge).toHaveBeenCalledTimes(1);
-      expect(newPlatformChrome.setBadge).toHaveBeenCalledWith(badge);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/badge.ts b/src/legacy/ui/public/chrome/api/badge.ts
deleted file mode 100644
index e607e6c47dc390..00000000000000
--- a/src/legacy/ui/public/chrome/api/badge.ts
+++ /dev/null
@@ -1,53 +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 { Chrome } from 'ui/chrome';
-import { npStart } from 'ui/new_platform';
-import { ChromeBadge } from '../../../../../core/public';
-export type Badge = ChromeBadge;
-
-export type BadgeApi = ReturnType<typeof createBadgeApi>['badge'];
-
-const newPlatformChrome = npStart.core.chrome;
-
-function createBadgeApi() {
-  return {
-    badge: {
-      /**
-       * Get an observable that emits the current badge
-       * and emits each update to the badge
-       */
-      get$() {
-        return newPlatformChrome.getBadge$();
-      },
-
-      /**
-       * Replace the badge with a new one
-       */
-      set(newBadge?: Badge) {
-        newPlatformChrome.setBadge(newBadge);
-      },
-    },
-  };
-}
-
-export function initChromeBadgeApi(chrome: Chrome) {
-  const { badge } = createBadgeApi();
-  chrome.badge = badge;
-}
diff --git a/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts b/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts
deleted file mode 100644
index f2c5fd5734b10f..00000000000000
--- a/src/legacy/ui/public/chrome/api/base_path.test.mocks.ts
+++ /dev/null
@@ -1,27 +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 { httpServiceMock } from '../../../../../core/public/mocks';
-
-const newPlatformHttp = httpServiceMock.createSetupContract({ basePath: 'npBasePath' });
-jest.doMock('ui/new_platform', () => ({
-  npSetup: {
-    core: { http: newPlatformHttp },
-  },
-}));
diff --git a/src/legacy/ui/public/chrome/api/base_path.test.ts b/src/legacy/ui/public/chrome/api/base_path.test.ts
deleted file mode 100644
index d3cfc6a3168a83..00000000000000
--- a/src/legacy/ui/public/chrome/api/base_path.test.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 './base_path.test.mocks';
-import { initChromeBasePathApi } from './base_path';
-
-function initChrome() {
-  const chrome: any = {};
-  initChromeBasePathApi(chrome);
-  return chrome;
-}
-
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
-describe('#getBasePath()', () => {
-  it('proxies to newPlatformHttp.basePath.get()', () => {
-    const chrome = initChrome();
-    expect(chrome.getBasePath()).toBe('npBasePath');
-  });
-});
-
-describe('#addBasePath()', () => {
-  it('proxies to newPlatformHttp.basePath.prepend(path)', () => {
-    const chrome = initChrome();
-    expect(chrome.addBasePath('/foo/bar')).toBe('npBasePath/foo/bar');
-  });
-});
-
-describe('#removeBasePath', () => {
-  it('proxies to newPlatformBasePath.basePath.remove(path)', () => {
-    const chrome = initChrome();
-    expect(chrome.removeBasePath('npBasePath/foo/bar')).toBe('/foo/bar');
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/base_path.ts b/src/legacy/ui/public/chrome/api/base_path.ts
deleted file mode 100644
index da823425b7c226..00000000000000
--- a/src/legacy/ui/public/chrome/api/base_path.ts
+++ /dev/null
@@ -1,28 +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 { npSetup } from 'ui/new_platform';
-
-const newPlatformHttp = npSetup.core.http;
-
-export function initChromeBasePathApi(chrome: { [key: string]: any }) {
-  chrome.getBasePath = newPlatformHttp.basePath.get;
-  chrome.addBasePath = newPlatformHttp.basePath.prepend;
-  chrome.removeBasePath = newPlatformHttp.basePath.remove;
-}
diff --git a/src/legacy/ui/public/chrome/api/breadcrumbs.ts b/src/legacy/ui/public/chrome/api/breadcrumbs.ts
deleted file mode 100644
index df1b7e1736bb42..00000000000000
--- a/src/legacy/ui/public/chrome/api/breadcrumbs.ts
+++ /dev/null
@@ -1,86 +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 { npStart } from 'ui/new_platform';
-import { ChromeBreadcrumb } from '../../../../../core/public';
-export type Breadcrumb = ChromeBreadcrumb;
-
-export type BreadcrumbsApi = ReturnType<typeof createBreadcrumbsApi>['breadcrumbs'];
-
-const newPlatformChrome = npStart.core.chrome;
-
-function createBreadcrumbsApi(chrome: { [key: string]: any }) {
-  let currentBreadcrumbs: Breadcrumb[] = [];
-
-  // reset breadcrumbSetSinceRouteChange any time the breadcrumbs change, even
-  // if it was done directly through the new platform
-  newPlatformChrome.getBreadcrumbs$().subscribe({
-    next(nextBreadcrumbs) {
-      currentBreadcrumbs = nextBreadcrumbs;
-    },
-  });
-
-  return {
-    breadcrumbs: {
-      /**
-       * Get an observerable that emits the current list of breadcrumbs
-       * and emits each update to the breadcrumbs
-       */
-      get$() {
-        return newPlatformChrome.getBreadcrumbs$();
-      },
-
-      /**
-       * Replace the set of breadcrumbs with a new set
-       */
-      set(newBreadcrumbs: Breadcrumb[]) {
-        newPlatformChrome.setBreadcrumbs(newBreadcrumbs);
-      },
-
-      /**
-       * Add a breadcrumb to the end of the list of breadcrumbs
-       */
-      push(breadcrumb: Breadcrumb) {
-        newPlatformChrome.setBreadcrumbs([...currentBreadcrumbs, breadcrumb]);
-      },
-
-      /**
-       * Filter the current set of breadcrumbs with a function. Works like Array#filter()
-       */
-      filter(fn: (breadcrumb: Breadcrumb, i: number, all: Breadcrumb[]) => boolean) {
-        newPlatformChrome.setBreadcrumbs(currentBreadcrumbs.filter(fn));
-      },
-
-      /**
-       * Remove last element of the breadcrumb
-       */
-      pop() {
-        newPlatformChrome.setBreadcrumbs(currentBreadcrumbs.slice(0, -1));
-      },
-    },
-  };
-}
-
-export function initBreadcrumbsApi(
-  chrome: { [key: string]: any },
-  internals: { [key: string]: any }
-) {
-  const { breadcrumbs } = createBreadcrumbsApi(chrome);
-  chrome.breadcrumbs = breadcrumbs;
-}
diff --git a/src/legacy/ui/public/chrome/api/controls.test.mocks.ts b/src/legacy/ui/public/chrome/api/controls.test.mocks.ts
deleted file mode 100644
index 9e78805272b2d0..00000000000000
--- a/src/legacy/ui/public/chrome/api/controls.test.mocks.ts
+++ /dev/null
@@ -1,27 +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 { chromeServiceMock } from '../../../../../core/public/mocks';
-
-export const newPlatformChrome = chromeServiceMock.createStartContract();
-jest.doMock('ui/new_platform', () => ({
-  npStart: {
-    core: { chrome: newPlatformChrome },
-  },
-}));
diff --git a/src/legacy/ui/public/chrome/api/controls.test.ts b/src/legacy/ui/public/chrome/api/controls.test.ts
deleted file mode 100644
index f41f2041993a3a..00000000000000
--- a/src/legacy/ui/public/chrome/api/controls.test.ts
+++ /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 * as Rx from 'rxjs';
-
-import { newPlatformChrome } from './controls.test.mocks';
-import { initChromeControlsApi } from './controls';
-
-function setup() {
-  const isVisible$ = new Rx.BehaviorSubject(true);
-  newPlatformChrome.getIsVisible$.mockReturnValue(isVisible$);
-
-  const chrome: any = {};
-  initChromeControlsApi(chrome);
-  return { chrome, isVisible$ };
-}
-
-afterEach(() => {
-  jest.resetAllMocks();
-});
-
-describe('setVisible', () => {
-  it('passes the visibility to the newPlatform', () => {
-    const { chrome } = setup();
-    chrome.setVisible(true);
-    chrome.setVisible(false);
-    chrome.setVisible(false);
-    expect(newPlatformChrome.setIsVisible.mock.calls).toMatchInlineSnapshot(`
-Array [
-  Array [
-    true,
-  ],
-  Array [
-    false,
-  ],
-  Array [
-    false,
-  ],
-]
-`);
-  });
-});
-
-describe('getVisible', () => {
-  it('returns a the cached value emitted by the newPlatformChrome', () => {
-    const { chrome, isVisible$ } = setup();
-    isVisible$.next(true);
-    expect(chrome.getVisible()).toBe(true);
-    isVisible$.next(false);
-    expect(chrome.getVisible()).toBe(false);
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/controls.ts b/src/legacy/ui/public/chrome/api/controls.ts
deleted file mode 100644
index a95d53ec2eab69..00000000000000
--- a/src/legacy/ui/public/chrome/api/controls.ts
+++ /dev/null
@@ -1,47 +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 * as Rx from 'rxjs';
-import { npStart } from 'ui/new_platform';
-
-const newPlatformChrome = npStart.core.chrome;
-
-export function initChromeControlsApi(chrome: { [key: string]: any }) {
-  // cache of chrome visibility state
-  const visible$ = new Rx.BehaviorSubject(false);
-  newPlatformChrome.getIsVisible$().subscribe(visible$);
-
-  /**
-   * Set the temporary visibility for the chrome. This does nothing if the chrome is hidden
-   * by default and should be used to hide the chrome for things like full-screen modes
-   * with an exit button.
-   */
-  chrome.setVisible = (visibility: boolean) => {
-    newPlatformChrome.setIsVisible(visibility);
-    return chrome;
-  };
-
-  /**
-   * Get the current visibility state of the chrome. Note that this drives the UI so it
-   * might be incorrect in the moments just before the UI is updated.
-   */
-  chrome.getVisible = () => visible$.getValue();
-
-  chrome.visible$ = visible$.asObservable();
-}
diff --git a/src/legacy/ui/public/chrome/api/help_extension.ts b/src/legacy/ui/public/chrome/api/help_extension.ts
deleted file mode 100644
index b59f27e37512c7..00000000000000
--- a/src/legacy/ui/public/chrome/api/help_extension.ts
+++ /dev/null
@@ -1,53 +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 { npStart } from 'ui/new_platform';
-import { ChromeHelpExtension } from '../../../../../core/public';
-
-const newPlatformChrome = npStart.core.chrome;
-
-export type HelpExtensionApi = ReturnType<typeof createHelpExtensionApi>['helpExtension'];
-export type HelpExtension = ChromeHelpExtension;
-
-function createHelpExtensionApi() {
-  return {
-    helpExtension: {
-      /**
-       * Set the custom help extension, or clear it by passing undefined. This
-       * will be rendered within the help popover in the header
-       */
-      set: (helpExtension: HelpExtension | undefined) => {
-        newPlatformChrome.setHelpExtension(helpExtension);
-      },
-
-      /**
-       * Get the current help extension that should be rendered in the header
-       */
-      get$: () => newPlatformChrome.getHelpExtension$(),
-    },
-  };
-}
-
-export function initHelpExtensionApi(
-  chrome: { [key: string]: any },
-  internal: { [key: string]: any }
-) {
-  const { helpExtension } = createHelpExtensionApi();
-  chrome.helpExtension = helpExtension;
-}
diff --git a/src/legacy/ui/public/chrome/api/injected_vars.test.mocks.ts b/src/legacy/ui/public/chrome/api/injected_vars.test.mocks.ts
deleted file mode 100644
index 3ad713ccce9a44..00000000000000
--- a/src/legacy/ui/public/chrome/api/injected_vars.test.mocks.ts
+++ /dev/null
@@ -1,28 +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 newPlatformInjectedMetadata: any = {
-  getInjectedVars: jest.fn(),
-  getInjectedVar: jest.fn(),
-};
-jest.doMock('ui/new_platform', () => ({
-  npSetup: {
-    core: { injectedMetadata: newPlatformInjectedMetadata },
-  },
-}));
diff --git a/src/legacy/ui/public/chrome/api/injected_vars.test.ts b/src/legacy/ui/public/chrome/api/injected_vars.test.ts
deleted file mode 100644
index 2147aed06320ef..00000000000000
--- a/src/legacy/ui/public/chrome/api/injected_vars.test.ts
+++ /dev/null
@@ -1,78 +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 { newPlatformInjectedMetadata } from './injected_vars.test.mocks';
-import { initChromeInjectedVarsApi } from './injected_vars';
-
-function initChrome() {
-  const chrome: any = {};
-  initChromeInjectedVarsApi(chrome);
-  return chrome;
-}
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-describe('#getInjected()', () => {
-  it('proxies to newPlatformInjectedMetadata service', () => {
-    const chrome = initChrome();
-
-    chrome.getInjected();
-    chrome.getInjected('foo');
-    chrome.getInjected('foo', 'bar');
-    expect(newPlatformInjectedMetadata.getInjectedVars.mock.calls).toMatchInlineSnapshot(`
-Array [
-  Array [],
-]
-`);
-    expect(newPlatformInjectedMetadata.getInjectedVar.mock.calls).toMatchInlineSnapshot(`
-Array [
-  Array [
-    "foo",
-    undefined,
-  ],
-  Array [
-    "foo",
-    "bar",
-  ],
-]
-`);
-  });
-
-  it('returns mutable values, but does not persist changes internally', () => {
-    const chrome = initChrome();
-
-    newPlatformInjectedMetadata.getInjectedVars.mockReturnValue(
-      Object.freeze({
-        foo: Object.freeze({
-          bar: Object.freeze({
-            baz: 1,
-          }),
-        }),
-      })
-    );
-
-    const vars = chrome.getInjected();
-    expect(() => {
-      vars.newProperty = true;
-    }).not.toThrowError();
-    expect(chrome.getInjected()).not.toHaveProperty('newProperty');
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/injected_vars.ts b/src/legacy/ui/public/chrome/api/injected_vars.ts
deleted file mode 100644
index a827c1bf65f514..00000000000000
--- a/src/legacy/ui/public/chrome/api/injected_vars.ts
+++ /dev/null
@@ -1,32 +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 { cloneDeep } from 'lodash';
-import { npSetup } from 'ui/new_platform';
-
-const newPlatformInjectedVars = npSetup.core.injectedMetadata;
-
-export function initChromeInjectedVarsApi(chrome: { [key: string]: any }) {
-  chrome.getInjected = (name?: string, defaultValue?: any) =>
-    cloneDeep(
-      name
-        ? newPlatformInjectedVars.getInjectedVar(name, defaultValue)
-        : newPlatformInjectedVars.getInjectedVars()
-    );
-}
diff --git a/src/legacy/ui/public/chrome/api/loading_count.js b/src/legacy/ui/public/chrome/api/loading_count.js
deleted file mode 100644
index 71d1e354773d5b..00000000000000
--- a/src/legacy/ui/public/chrome/api/loading_count.js
+++ /dev/null
@@ -1,65 +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 * as Rx from 'rxjs';
-import { npSetup } from 'ui/new_platform';
-
-const newPlatformHttp = npSetup.core.http;
-
-export function initLoadingCountApi(chrome) {
-  const manualCount$ = new Rx.BehaviorSubject(0);
-  newPlatformHttp.addLoadingCountSource(manualCount$);
-
-  chrome.loadingCount = new (class ChromeLoadingCountApi {
-    /**
-     * Call to add a subscriber to for the loading count that
-     * will be called every time the loading count changes.
-     *
-     * @type {Observable<number>}
-     * @return {Function} unsubscribe
-     */
-    subscribe(handler) {
-      const subscription = newPlatformHttp.getLoadingCount$().subscribe({
-        next(count) {
-          handler(count);
-        },
-      });
-
-      return () => {
-        subscription.unsubscribe();
-      };
-    }
-
-    /**
-     * Increment the loading count by one
-     * @return {undefined}
-     */
-    increment() {
-      manualCount$.next(manualCount$.getValue() + 1);
-    }
-
-    /**
-     * Decrement the loading count by one
-     * @return {undefined}
-     */
-    decrement() {
-      manualCount$.next(manualCount$.getValue() - 1);
-    }
-  })();
-}
diff --git a/src/legacy/ui/public/chrome/api/nav.ts b/src/legacy/ui/public/chrome/api/nav.ts
deleted file mode 100644
index 2b655419d98aa2..00000000000000
--- a/src/legacy/ui/public/chrome/api/nav.ts
+++ /dev/null
@@ -1,157 +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 { KibanaParsedUrl } from 'ui/url/kibana_parsed_url';
-import { absoluteToParsedUrl } from '../../url/absolute_to_parsed_url';
-import { npStart } from '../../new_platform';
-import { ChromeNavLink } from '../../../../../core/public';
-import { relativeToAbsolute } from '../../url/relative_to_absolute';
-
-export interface ChromeNavLinks {
-  untrackNavLinksForDeletedSavedObjects(deletedIds: string[]): void;
-  trackSubUrlForApp(linkId: string, parsedKibanaUrl: KibanaParsedUrl): void;
-}
-
-interface NavInternals {
-  appUrlStore: Storage;
-  trackPossibleSubUrl(url: string): void;
-}
-
-export function initChromeNavApi(chrome: any, internals: NavInternals) {
-  const coreNavLinks = npStart.core.chrome.navLinks;
-
-  /**
-   * Clear last url for deleted saved objects to avoid loading pages with "Could not locate..."
-   */
-  chrome.untrackNavLinksForDeletedSavedObjects = (deletedIds: string[]) => {
-    function urlContainsDeletedId(url: string) {
-      const includedId = deletedIds.find((deletedId) => {
-        return url.includes(deletedId);
-      });
-      return includedId !== undefined;
-    }
-
-    coreNavLinks.getAll().forEach((link) => {
-      if (link.linkToLastSubUrl && urlContainsDeletedId(link.url!)) {
-        setLastUrl(link, link.baseUrl);
-      }
-    });
-  };
-
-  /**
-   * Manually sets the last url for the given app. The last url for a given app is updated automatically during
-   * normal page navigation, so this should only need to be called to insert a last url that was not actually
-   * navigated to. For instance, when saving an object and redirecting to another page, the last url of the app
-   * should be the saved instance, but because of the redirect to a different page (e.g. `Save and Add to Dashboard`
-   * on visualize tab), it won't be tracked automatically and will need to be inserted manually. See
-   * https://github.com/elastic/kibana/pull/11932 for more background on why this was added.
-   *
-   * @param id {String} - an id that represents the navigation link.
-   * @param kibanaParsedUrl {KibanaParsedUrl} the url to track
-   */
-  chrome.trackSubUrlForApp = (id: string, kibanaParsedUrl: KibanaParsedUrl) => {
-    const navLink = coreNavLinks.get(id);
-    if (navLink) {
-      setLastUrl(navLink, kibanaParsedUrl.getAbsoluteUrl());
-    }
-  };
-
-  internals.trackPossibleSubUrl = async function (url: string) {
-    const kibanaParsedUrl = absoluteToParsedUrl(url, chrome.getBasePath());
-
-    coreNavLinks
-      .getAll()
-      // Filter only legacy links
-      .filter((link) => link.legacy && !link.disableSubUrlTracking)
-      .forEach((link) => {
-        const active = url.startsWith(link.subUrlBase!);
-        link = coreNavLinks.update(link.id, { active })!;
-
-        if (active) {
-          setLastUrl(link, url);
-          return;
-        }
-
-        link = refreshLastUrl(link);
-
-        const newGlobalState = kibanaParsedUrl.getGlobalState();
-        if (newGlobalState) {
-          injectNewGlobalState(link, kibanaParsedUrl.appId, newGlobalState);
-        }
-      });
-  };
-
-  function lastSubUrlKey(link: ChromeNavLink) {
-    return `lastSubUrl:${link.baseUrl}`;
-  }
-
-  function getLastUrl(link: ChromeNavLink) {
-    return internals.appUrlStore.getItem(lastSubUrlKey(link));
-  }
-
-  function setLastUrl(link: ChromeNavLink, url: string) {
-    if (link.linkToLastSubUrl === false) {
-      return;
-    }
-
-    internals.appUrlStore.setItem(lastSubUrlKey(link), url);
-    refreshLastUrl(link);
-  }
-
-  function refreshLastUrl(link: ChromeNavLink) {
-    const lastSubUrl = getLastUrl(link);
-
-    return coreNavLinks.update(link.id, {
-      url: lastSubUrl || link.url || link.baseUrl,
-    })!;
-  }
-
-  function injectNewGlobalState(
-    link: ChromeNavLink,
-    fromAppId: string,
-    newGlobalState: string | string[]
-  ) {
-    const kibanaParsedUrl = absoluteToParsedUrl(
-      getLastUrl(link) || link.url || link.baseUrl,
-      chrome.getBasePath()
-    );
-
-    // don't copy global state if links are for different apps
-    if (fromAppId !== kibanaParsedUrl.appId) return;
-
-    kibanaParsedUrl.setGlobalState(newGlobalState);
-
-    coreNavLinks.update(link.id, {
-      url: kibanaParsedUrl.getAbsoluteUrl(),
-    });
-  }
-
-  // simulate a possible change in url to initialize the
-  // link.active and link.lastUrl properties
-  coreNavLinks
-    .getAll()
-    .filter((link) => link.subUrlBase && !link.disableSubUrlTracking)
-    .forEach((link) => {
-      coreNavLinks.update(link.id, {
-        subUrlBase: relativeToAbsolute(chrome.addBasePath(link.subUrlBase)),
-      });
-    });
-
-  internals.trackPossibleSubUrl(document.location.href);
-}
diff --git a/src/legacy/ui/public/chrome/api/saved_object_client.ts b/src/legacy/ui/public/chrome/api/saved_object_client.ts
deleted file mode 100644
index 76d4e301e3c773..00000000000000
--- a/src/legacy/ui/public/chrome/api/saved_object_client.ts
+++ /dev/null
@@ -1,29 +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 { npStart } from 'ui/new_platform';
-import { Chrome } from '..';
-
-const savedObjectsClient = npStart.core.savedObjects.client;
-
-export function initSavedObjectClient(chrome: Chrome) {
-  chrome.getSavedObjectsClient = function () {
-    return savedObjectsClient;
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/sub_url_hooks.js b/src/legacy/ui/public/chrome/api/sub_url_hooks.js
deleted file mode 100644
index f147aef7b4b7d2..00000000000000
--- a/src/legacy/ui/public/chrome/api/sub_url_hooks.js
+++ /dev/null
@@ -1,88 +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 { unhashUrl } from '../../../../../plugins/kibana_utils/public';
-import { toastNotifications } from '../../notify/toasts';
-import { npSetup } from '../../new_platform';
-import { areHashesDifferentButDecodedHashesEquals } from './sub_url_hooks_utils';
-
-export function registerSubUrlHooks(angularModule, internals) {
-  angularModule.run(($rootScope, Private, $location) => {
-    const subUrlRouteFilter = Private(SubUrlRouteFilterProvider);
-
-    function updateSubUrls() {
-      const urlWithHashes = window.location.href;
-      let urlWithStates;
-      try {
-        urlWithStates = unhashUrl(urlWithHashes);
-      } catch (e) {
-        toastNotifications.addDanger(e.message);
-      }
-
-      internals.trackPossibleSubUrl(urlWithStates || urlWithHashes);
-    }
-
-    function onRouteChange($event) {
-      if (subUrlRouteFilter($event)) {
-        updateUsage($event);
-        updateSubUrls();
-      }
-    }
-
-    $rootScope.$on('$locationChangeStart', (e, newUrl) => {
-      // This handler fixes issue #31238 where browser back navigation
-      // fails due to angular 1.6 parsing url encoded params wrong.
-      if (areHashesDifferentButDecodedHashesEquals($location.absUrl(), newUrl)) {
-        // replace the urlencoded hash with the version that angular sees.
-        const newHash = newUrl.split('#')[1] || '';
-        $location.url(newHash).replace();
-      }
-    });
-
-    $rootScope.$on('$routeChangeSuccess', onRouteChange);
-    $rootScope.$on('$routeUpdate', onRouteChange);
-    updateSubUrls();
-  });
-}
-
-function updateUsage($event) {
-  const scope = $event.targetScope;
-  const app = scope.chrome.getApp();
-  const appId = app.id === 'kibana' ? scope.getFirstPathSegment() : app.id;
-  if (npSetup.plugins.usageCollection) npSetup.plugins.usageCollection.__LEGACY.appChanged(appId);
-}
-
-/**
- *  Creates a function that will be called on each route change
- *  to determine if the event should be used to update the last
- *  subUrl of chrome links/tabs
- *  @injected
- */
-export function SubUrlRouteFilterProvider($injector) {
-  if (!$injector.has('$route')) {
-    return function alwaysUpdate() {
-      return true;
-    };
-  }
-
-  const $route = $injector.get('$route');
-  return function ignoreRedirectToRoutes() {
-    return Boolean($route.current && !$route.current.redirectTo);
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/sub_url_hooks_utils.test.ts b/src/legacy/ui/public/chrome/api/sub_url_hooks_utils.test.ts
deleted file mode 100644
index 4dec5263023447..00000000000000
--- a/src/legacy/ui/public/chrome/api/sub_url_hooks_utils.test.ts
+++ /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 { areHashesDifferentButDecodedHashesEquals } from './sub_url_hooks_utils';
-
-test('false for different hashes', () => {
-  const url1 = `https://localhost/kibana/#/dashboard/id`;
-  const url2 = `https://localhost/kibana/#/dashboard/DIFFERENT`;
-  expect(areHashesDifferentButDecodedHashesEquals(url1, url2)).toBeFalsy();
-});
-
-test('false for same hashes', () => {
-  const hash = `/dashboard/id?_a=(filters:!(),query:(language:kuery,query:''))&_g=(filters:!(),time:(from:now-120m,to:now))`;
-  const url1 = `https://localhost/kibana/#/${hash}`;
-  expect(areHashesDifferentButDecodedHashesEquals(url1, url1)).toBeFalsy();
-});
-
-test('true for same hashes, but one is encoded', () => {
-  const hash = `/dashboard/id?_a=(filters:!(),query:(language:kuery,query:''))&_g=(filters:!(),time:(from:now-120m,to:now))`;
-  const url1 = `https://localhost/kibana/#/${hash}`;
-  const url2 = `https://localhost/kibana/#/${encodeURIComponent(hash)}`;
-  expect(areHashesDifferentButDecodedHashesEquals(url1, url2)).toBeTruthy();
-});
-
-/**
- * This edge case occurs when trying to navigate within kibana app using core's `navigateToApp` api
- * and there is reserved characters in hash (see: query:'' part)
- * For example:
- * ```ts
- * navigateToApp('kibana', {
- *    path: '#/dashboard/f8bc19f0-6918-11ea-9258-a74c2ded064d?_a=(filters:!(),query:(language:kuery,query:''))&_g=(filters:!(),time:(from:now-120m,to:now))'
- *  })
- * ```
- * Core internally is using url.parse which parses ' -> %27 and performs the navigation
- * Then angular decodes it back and causes redundant history record if not the fix which is covered by the test below
- */
-test("true for same hashes, but one has reserved character (') encoded", () => {
-  const hash = `/dashboard/id?_a=(filters:!(),query:(language:kuery,query:''))&_g=(filters:!(),time:(from:now-120m,to:now))`;
-  const url1 = `https://localhost/kibana/#/${hash}`;
-  const url2 = `https://localhost/kibana/#/${hash.replace(/\'/g, '%27')}`;
-  expect(areHashesDifferentButDecodedHashesEquals(url1, url2)).toBeTruthy();
-});
diff --git a/src/legacy/ui/public/chrome/api/sub_url_hooks_utils.ts b/src/legacy/ui/public/chrome/api/sub_url_hooks_utils.ts
deleted file mode 100644
index 8517877acd3877..00000000000000
--- a/src/legacy/ui/public/chrome/api/sub_url_hooks_utils.ts
+++ /dev/null
@@ -1,29 +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 function areHashesDifferentButDecodedHashesEquals(urlA: string, urlB: string): boolean {
-  const getHash = (url: string) => url.split('#')[1] ?? '';
-  const hashA = getHash(urlA);
-  const decodedHashA = decodeURIComponent(hashA);
-
-  const hashB = getHash(urlB);
-  const decodedHashB = decodeURIComponent(hashB);
-
-  return hashA !== hashB && decodedHashA === decodedHashB;
-}
diff --git a/src/legacy/ui/public/chrome/api/template.js b/src/legacy/ui/public/chrome/api/template.js
deleted file mode 100644
index d29a7eba7316f2..00000000000000
--- a/src/legacy/ui/public/chrome/api/template.js
+++ /dev/null
@@ -1,75 +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.
- */
-
-// eslint-disable-next-line import/no-default-export
-export default function (chrome, internals) {
-  /**
-   * ui/chrome Template API
-   *
-   *   Root Template
-   *     The root template is rendered within the primary chrome ui and should
-   *     be used when building an app that is more of a page, or to override the
-   *     placement of ng-view. When including a root template, the mark-up will
-   *     look something like this:
-   *
-   *     body
-   *       notifs
-   *       div.content
-   *         nav
-   *         config
-   *         div.application
-   *           <-- your template here -->
-   *
-   *   Root Controller
-   *     To attach a controller to the root of ui/chrome's content area, outside of
-   *     where it attaches the ng-view directive (assuming no rootTemplate is used)
-   *     which will allow cause the controller to persist across views or make for
-   *     a simple place to define some quick global functionality for a very simple
-   *     app (like the status page).
-   */
-
-  /**
-   * @param {string} template
-   * @return {chrome}
-   */
-  chrome.setRootTemplate = function (template) {
-    internals.rootTemplate = template;
-    return chrome;
-  };
-
-  /**
-   * @param {string} as - the name that the controller should bind to
-   * @param {Function} controller - the controller initializer function
-   * @return {chrome}
-   */
-  chrome.setRootController = function (as, controllerName) {
-    if (controllerName === undefined) {
-      controllerName = as;
-      as = null;
-    }
-
-    if (typeof controllerName === 'function') {
-      chrome.$$rootControllerConstruct = controllerName;
-      controllerName = 'chrome.$$rootControllerConstruct';
-    }
-
-    internals.rootController = controllerName + (as ? ' as ' + as : '');
-    return chrome;
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/theme.test.mocks.ts b/src/legacy/ui/public/chrome/api/theme.test.mocks.ts
deleted file mode 100644
index 9e78805272b2d0..00000000000000
--- a/src/legacy/ui/public/chrome/api/theme.test.mocks.ts
+++ /dev/null
@@ -1,27 +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 { chromeServiceMock } from '../../../../../core/public/mocks';
-
-export const newPlatformChrome = chromeServiceMock.createStartContract();
-jest.doMock('ui/new_platform', () => ({
-  npStart: {
-    core: { chrome: newPlatformChrome },
-  },
-}));
diff --git a/src/legacy/ui/public/chrome/api/theme.test.ts b/src/legacy/ui/public/chrome/api/theme.test.ts
deleted file mode 100644
index 1e829329f96803..00000000000000
--- a/src/legacy/ui/public/chrome/api/theme.test.ts
+++ /dev/null
@@ -1,144 +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 * as Rx from 'rxjs';
-
-import { newPlatformChrome } from './theme.test.mocks';
-import { initChromeThemeApi } from './theme';
-
-function setup() {
-  const brand$ = new Rx.BehaviorSubject({ logo: 'foo', smallLogo: 'foo' });
-  newPlatformChrome.getBrand$.mockReturnValue(brand$);
-
-  const applicationClasses$ = new Rx.BehaviorSubject([] as string[]);
-  newPlatformChrome.getApplicationClasses$.mockReturnValue(applicationClasses$);
-
-  const chrome: any = {};
-  initChromeThemeApi(chrome);
-  return { chrome, brand$, applicationClasses$ };
-}
-
-afterEach(() => {
-  jest.resetAllMocks();
-});
-
-describe('setBrand', () => {
-  it('proxies to newPlatformChrome', () => {
-    const { chrome } = setup();
-
-    chrome.setBrand({
-      logo: 'foo.svg',
-      smallLogo: 'smallFoo.svg',
-    });
-
-    chrome.setBrand({
-      logo: 'baz',
-    });
-
-    expect(newPlatformChrome.setBrand.mock.calls).toMatchInlineSnapshot(`
-Array [
-  Array [
-    Object {
-      "logo": "foo.svg",
-      "smallLogo": "smallFoo.svg",
-    },
-  ],
-  Array [
-    Object {
-      "logo": "baz",
-    },
-  ],
-]
-`);
-  });
-});
-
-describe('getBrand', () => {
-  it('returns named properties from cached values emitted from newPlatformChrome', () => {
-    const { chrome, brand$ } = setup();
-    expect(chrome.getBrand('logo')).toBe('foo');
-    expect(chrome.getBrand('smallLogo')).toBe('foo');
-    expect(chrome.getBrand()).toBe(undefined);
-
-    brand$.next({
-      logo: 'bar.svg',
-      smallLogo: 'smallBar.svg',
-    });
-
-    expect(chrome.getBrand('logo')).toBe('bar.svg');
-    expect(chrome.getBrand('smallLogo')).toBe('smallBar.svg');
-    expect(chrome.getBrand()).toBe(undefined);
-  });
-});
-
-describe('addApplicationClass', () => {
-  it('proxies each class as a separate argument to newPlatformChrome', () => {
-    const { chrome } = setup();
-    chrome.addApplicationClass('foo');
-    chrome.addApplicationClass(['bar', 'baz']);
-    chrome.addApplicationClass([]);
-    expect(newPlatformChrome.addApplicationClass.mock.calls).toMatchInlineSnapshot(`
-Array [
-  Array [
-    "foo",
-  ],
-  Array [
-    "bar",
-  ],
-  Array [
-    "baz",
-  ],
-]
-`);
-  });
-});
-
-describe('removeApplicationClass', () => {
-  it('proxies each class as a separate argument to newPlatformChrome', () => {
-    const { chrome } = setup();
-    chrome.removeApplicationClass('foo');
-    chrome.removeApplicationClass(['bar', 'baz']);
-    chrome.removeApplicationClass([]);
-    expect(newPlatformChrome.removeApplicationClass.mock.calls).toMatchInlineSnapshot(`
-Array [
-  Array [
-    "foo",
-  ],
-  Array [
-    "bar",
-  ],
-  Array [
-    "baz",
-  ],
-]
-`);
-  });
-});
-
-describe('getApplicationClasses', () => {
-  it('returns cached values emitted from newPlatformChrome as a single string', () => {
-    const { chrome, applicationClasses$ } = setup();
-
-    expect(chrome.getApplicationClasses()).toBe('');
-    applicationClasses$.next(['foo', 'bar']);
-    expect(chrome.getApplicationClasses()).toBe('foo bar');
-    applicationClasses$.next(['bar']);
-    expect(chrome.getApplicationClasses()).toBe('bar');
-  });
-});
diff --git a/src/legacy/ui/public/chrome/api/theme.ts b/src/legacy/ui/public/chrome/api/theme.ts
deleted file mode 100644
index c01344bf56fe3f..00000000000000
--- a/src/legacy/ui/public/chrome/api/theme.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 * as Rx from 'rxjs';
-
-import { npStart } from 'ui/new_platform';
-import { ChromeBrand } from '../../../../../core/public';
-
-const newPlatformChrome = npStart.core.chrome;
-
-export function initChromeThemeApi(chrome: { [key: string]: any }) {
-  const brandCache$ = new Rx.BehaviorSubject<ChromeBrand>({});
-  newPlatformChrome.getBrand$().subscribe(brandCache$);
-
-  const applicationClassesCache$ = new Rx.BehaviorSubject<string[]>([]);
-  newPlatformChrome.getApplicationClasses$().subscribe(applicationClassesCache$);
-
-  chrome.setBrand = (brand: ChromeBrand) => {
-    newPlatformChrome.setBrand(brand);
-    return chrome;
-  };
-
-  chrome.getBrand = (key: keyof ChromeBrand) => {
-    return brandCache$.getValue()[key];
-  };
-
-  chrome.addApplicationClass = (classNames: string | string[] = []) => {
-    if (typeof classNames === 'string') {
-      classNames = [classNames];
-    }
-
-    for (const className of classNames) {
-      newPlatformChrome.addApplicationClass(className);
-    }
-
-    return chrome;
-  };
-
-  chrome.removeApplicationClass = (classNames: string | string[]) => {
-    if (typeof classNames === 'string') {
-      classNames = [classNames];
-    }
-
-    for (const className of classNames) {
-      newPlatformChrome.removeApplicationClass(className);
-    }
-    return chrome;
-  };
-
-  chrome.getApplicationClasses = () => {
-    return applicationClassesCache$.getValue().join(' ');
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/ui_settings.js b/src/legacy/ui/public/chrome/api/ui_settings.js
deleted file mode 100644
index dbdd6a9c126534..00000000000000
--- a/src/legacy/ui/public/chrome/api/ui_settings.js
+++ /dev/null
@@ -1,28 +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 { npSetup } from 'ui/new_platform';
-
-const newPlatformUiSettingsClient = npSetup.core.uiSettings;
-
-export function initUiSettingsApi(chrome) {
-  chrome.getUiSettingsClient = function () {
-    return newPlatformUiSettingsClient;
-  };
-}
diff --git a/src/legacy/ui/public/chrome/api/xsrf.js b/src/legacy/ui/public/chrome/api/xsrf.js
deleted file mode 100644
index 5086903604667d..00000000000000
--- a/src/legacy/ui/public/chrome/api/xsrf.js
+++ /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.
- */
-
-export function initChromeXsrfApi(chrome, internals) {
-  chrome.getXsrfToken = function () {
-    return internals.version;
-  };
-}
diff --git a/src/legacy/ui/public/chrome/chrome.js b/src/legacy/ui/public/chrome/chrome.js
deleted file mode 100644
index cdb0734f61622c..00000000000000
--- a/src/legacy/ui/public/chrome/chrome.js
+++ /dev/null
@@ -1,118 +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 _ from 'lodash';
-import angular from 'angular';
-
-import { metadata } from '../metadata';
-import '../state_management/global_state';
-import '../config';
-import '../notify';
-import '../private';
-import '../promises';
-import '../directives/storage';
-import '../directives/watch_multi';
-import '../react_components';
-import '../i18n';
-
-import { initAngularApi } from './api/angular';
-import appsApi from './api/apps';
-import { initChromeControlsApi } from './api/controls';
-import { initChromeNavApi } from './api/nav';
-import { initChromeBadgeApi } from './api/badge';
-import { initBreadcrumbsApi } from './api/breadcrumbs';
-import templateApi from './api/template';
-import { initChromeThemeApi } from './api/theme';
-import { initChromeXsrfApi } from './api/xsrf';
-import { initUiSettingsApi } from './api/ui_settings';
-import { initLoadingCountApi } from './api/loading_count';
-import { initSavedObjectClient } from './api/saved_object_client';
-import { initChromeBasePathApi } from './api/base_path';
-import { initChromeInjectedVarsApi } from './api/injected_vars';
-import { initHelpExtensionApi } from './api/help_extension';
-import { npStart } from '../new_platform';
-
-export const chrome = {};
-const internals = _.defaults(_.cloneDeep(metadata), {
-  basePath: '',
-  rootController: null,
-  rootTemplate: null,
-  showAppsLink: null,
-  xsrfToken: null,
-  devMode: true,
-  brand: null,
-  nav: [],
-  applicationClasses: [],
-});
-
-initUiSettingsApi(chrome);
-initSavedObjectClient(chrome);
-appsApi(chrome, internals);
-initChromeXsrfApi(chrome, internals);
-initChromeBasePathApi(chrome);
-initChromeInjectedVarsApi(chrome);
-initChromeNavApi(chrome, internals);
-initChromeBadgeApi(chrome);
-initBreadcrumbsApi(chrome, internals);
-initLoadingCountApi(chrome, internals);
-initHelpExtensionApi(chrome, internals);
-initAngularApi(chrome, internals);
-initChromeControlsApi(chrome);
-templateApi(chrome, internals);
-initChromeThemeApi(chrome);
-
-npStart.core.chrome.setAppTitle(chrome.getAppTitle());
-
-const waitForBootstrap = new Promise((resolve) => {
-  chrome.bootstrap = function (targetDomElement) {
-    // sets attribute on body for stylesheet sandboxing
-    document.body.setAttribute('id', `${internals.app.id}-app`);
-
-    chrome.setupAngular();
-    targetDomElement.setAttribute('kbn-chrome', 'true');
-    targetDomElement.setAttribute('ng-class', "{ 'hidden-chrome': !chrome.getVisible() }");
-    targetDomElement.className = 'app-wrapper';
-    angular.bootstrap(targetDomElement, ['kibana']);
-    resolve(targetDomElement);
-  };
-});
-
-/**
- * ---- ATTENTION: Read documentation carefully before using this! ----
- *
- * Returns a promise, that resolves with an instance of the currently used Angular
- * $injector service for usage outside of Angular.
- * You can use this injector to get access to any other injectable component (service,
- * constant, etc.) by using its get method.
- *
- * If you ever use Angular outside of an Angular context via this method, you should
- * be really sure you know what you are doing!
- *
- * When using this method inside your code, you will need to stub it while running
- * tests. Look into 'src/test_utils/public/stub_get_active_injector' for more information.
- */
-chrome.dangerouslyGetActiveInjector = () => {
-  return waitForBootstrap.then((targetDomElement) => {
-    const $injector = angular.element(targetDomElement).injector();
-    if (!$injector) {
-      return Promise.reject('targetDomElement had no angular context after bootstrapping');
-    }
-    return $injector;
-  });
-};
diff --git a/src/legacy/ui/public/chrome/directives/index.js b/src/legacy/ui/public/chrome/directives/index.js
deleted file mode 100644
index 51d63f086e196a..00000000000000
--- a/src/legacy/ui/public/chrome/directives/index.js
+++ /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 { kbnChromeProvider } from './kbn_chrome';
-
-export function directivesProvider(chrome, internals) {
-  kbnChromeProvider(chrome, internals);
-}
diff --git a/src/legacy/ui/public/chrome/directives/kbn_chrome.html b/src/legacy/ui/public/chrome/directives/kbn_chrome.html
deleted file mode 100644
index 7738093fe9dea7..00000000000000
--- a/src/legacy/ui/public/chrome/directives/kbn_chrome.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="app-wrapper-panel" data-test-subj="appA11yRoot">
-  <div id="globalBannerList"></div>
-
-  <div
-    class="application"
-    ng-class="'tab-' + getFirstPathSegment() + ' ' + chrome.getApplicationClasses()"
-    ng-view
-  ></div>
-</div>
diff --git a/src/legacy/ui/public/chrome/directives/kbn_chrome.js b/src/legacy/ui/public/chrome/directives/kbn_chrome.js
deleted file mode 100644
index 5ba34e553201eb..00000000000000
--- a/src/legacy/ui/public/chrome/directives/kbn_chrome.js
+++ /dev/null
@@ -1,106 +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 ReactDOM from 'react-dom';
-import $ from 'jquery';
-import { fatalError } from 'ui/notify/fatal_error';
-
-import { uiModules } from '../../modules';
-import template from './kbn_chrome.html';
-
-import { I18nContext } from '../../i18n';
-import { npStart } from '../../new_platform';
-import {
-  chromeHeaderNavControlsRegistry,
-  NavControlSide,
-} from '../../registry/chrome_header_nav_controls';
-import { subscribeWithScope } from '../../../../../plugins/kibana_legacy/public';
-
-export function kbnChromeProvider(chrome, internals) {
-  uiModules.get('kibana').directive('kbnChrome', () => {
-    return {
-      template() {
-        const $content = $(template);
-        const $app = $content.find('.application');
-
-        if (internals.rootController) {
-          $app.attr('ng-controller', internals.rootController);
-        }
-
-        if (internals.rootTemplate) {
-          $app.removeAttr('ng-view');
-          $app.html(internals.rootTemplate);
-        }
-
-        return $content;
-      },
-
-      controllerAs: 'chrome',
-      controller($scope, $location, Private) {
-        $scope.getFirstPathSegment = () => {
-          return $location.path().split('/')[1];
-        };
-
-        // Continue to support legacy nav controls not registered with the NP.
-        const navControls = Private(chromeHeaderNavControlsRegistry);
-        (navControls.bySide[NavControlSide.Left] || []).forEach((navControl) =>
-          npStart.core.chrome.navControls.registerLeft({
-            order: navControl.order,
-            mount: navControl.render,
-          })
-        );
-        (navControls.bySide[NavControlSide.Right] || []).forEach((navControl) =>
-          npStart.core.chrome.navControls.registerRight({
-            order: navControl.order,
-            mount: navControl.render,
-          })
-        );
-
-        // Non-scope based code (e.g., React)
-
-        // Banners
-        const bannerListContainer = document.getElementById('globalBannerList');
-        if (bannerListContainer) {
-          // This gets rendered manually by the legacy platform because this component must be inside the .app-wrapper
-          ReactDOM.render(
-            <I18nContext>{npStart.core.overlays.banners.getComponent()}</I18nContext>,
-            bannerListContainer
-          );
-        }
-
-        const chromeVisibility = subscribeWithScope(
-          $scope,
-          chrome.visible$,
-          {
-            next: () => {
-              // just makes sure change detection is triggered when chrome visibility changes
-            },
-          },
-          fatalError
-        );
-        $scope.$on('$destroy', () => {
-          chromeVisibility.unsubscribe();
-        });
-
-        return chrome;
-      },
-    };
-  });
-}
diff --git a/src/legacy/ui/public/chrome/index.d.ts b/src/legacy/ui/public/chrome/index.d.ts
deleted file mode 100644
index b295746d920545..00000000000000
--- a/src/legacy/ui/public/chrome/index.d.ts
+++ /dev/null
@@ -1,64 +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 { SavedObjectsClientContract } from 'src/core/public';
-import { ChromeBrand } from '../../../../core/public';
-import { BadgeApi } from './api/badge';
-import { BreadcrumbsApi } from './api/breadcrumbs';
-import { HelpExtensionApi } from './api/help_extension';
-import { ChromeNavLinks } from './api/nav';
-
-export interface IInjector {
-  get<T>(injectable: string): T;
-  invoke<T, T2>(
-    injectable: (this: T2, ...args: any[]) => T,
-    self?: T2,
-    locals?: { [key: string]: any }
-  ): T;
-  instantiate(constructor: Function, locals?: { [key: string]: any }): any;
-}
-
-declare interface Chrome extends ChromeNavLinks {
-  badge: BadgeApi;
-  breadcrumbs: BreadcrumbsApi;
-  helpExtension: HelpExtensionApi;
-  addBasePath<T = string>(path: T): T;
-  dangerouslyGetActiveInjector(): Promise<IInjector>;
-  getBasePath(): string;
-  getXsrfToken(): string;
-  getKibanaVersion(): string;
-  getSavedObjectsClient(): SavedObjectsClientContract;
-  getUiSettingsClient(): any;
-  setVisible(visible: boolean): any;
-  getInjected(key: string, defaultValue?: any): any;
-  setRootController(name: string, Controller: any): any;
-  setBrand(brand: ChromeBrand): this;
-  getBrand(key: keyof ChromeBrand): ChromeBrand[keyof ChromeBrand];
-  addApplicationClass(classNames: string | string[]): this;
-  removeApplicationClass(classNames: string | string[]): this;
-  getApplicationClasses(): string;
-}
-
-declare const chrome: Chrome;
-
-// eslint-disable-next-line import/no-default-export
-export default chrome;
-export { Chrome };
-export { Breadcrumb } from './api/breadcrumbs';
-export { HelpExtension } from './api/help_extension';
diff --git a/src/legacy/ui/public/chrome/index.js b/src/legacy/ui/public/chrome/index.js
deleted file mode 100644
index 3c6c3d2e74143b..00000000000000
--- a/src/legacy/ui/public/chrome/index.js
+++ /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 { chrome } from './chrome';
-
-// eslint-disable-next-line import/no-default-export
-export default chrome;
diff --git a/src/legacy/ui/public/config/__tests__/config.js b/src/legacy/ui/public/config/__tests__/config.js
deleted file mode 100644
index 90dbdaf264a296..00000000000000
--- a/src/legacy/ui/public/config/__tests__/config.js
+++ /dev/null
@@ -1,208 +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 sinon from 'sinon';
-
-import ngMock from 'ng_mock';
-import chrome from '../../chrome';
-
-describe('Config service', () => {
-  let config;
-  let uiSettings;
-  let $q;
-  let $rootScope;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(($injector) => {
-      config = $injector.get('config');
-      uiSettings = chrome.getUiSettingsClient();
-      $q = $injector.get('$q');
-      $rootScope = $injector.get('$rootScope');
-    })
-  );
-
-  describe('#getAll', () => {
-    it('calls uiSettings.getAll()', () => {
-      sinon.stub(uiSettings, 'getAll');
-      config.getAll();
-      sinon.assert.calledOnce(uiSettings.getAll);
-      sinon.assert.calledWithExactly(uiSettings.getAll);
-      uiSettings.getAll.restore();
-    });
-  });
-
-  describe('#get', () => {
-    it('calls uiSettings.get(key, default)', () => {
-      sinon.stub(uiSettings, 'get');
-      config.get('key', 'default');
-      sinon.assert.calledOnce(uiSettings.get);
-      sinon.assert.calledWithExactly(uiSettings.get, 'key', 'default');
-      uiSettings.get.restore();
-    });
-  });
-
-  describe('#isDeclared', () => {
-    it('calls uiSettings.isDeclared(key)', () => {
-      sinon.stub(uiSettings, 'isDeclared');
-      config.isDeclared('key');
-      sinon.assert.calledOnce(uiSettings.isDeclared);
-      sinon.assert.calledWithExactly(uiSettings.isDeclared, 'key');
-      uiSettings.isDeclared.restore();
-    });
-  });
-
-  describe('#isDefault', () => {
-    it('calls uiSettings.isDefault(key)', () => {
-      sinon.stub(uiSettings, 'isDefault');
-      config.isDefault('key');
-      sinon.assert.calledOnce(uiSettings.isDefault);
-      sinon.assert.calledWithExactly(uiSettings.isDefault, 'key');
-      uiSettings.isDefault.restore();
-    });
-  });
-
-  describe('#isCustom', () => {
-    it('calls uiSettings.isCustom(key)', () => {
-      sinon.stub(uiSettings, 'isCustom');
-      config.isCustom('key');
-      sinon.assert.calledOnce(uiSettings.isCustom);
-      sinon.assert.calledWithExactly(uiSettings.isCustom, 'key');
-    });
-  });
-
-  describe('#remove', () => {
-    it('calls uiSettings.remove(key)', () => {
-      sinon.stub(uiSettings, 'remove');
-      config.remove('foobar');
-      sinon.assert.calledOnce(uiSettings.remove);
-      sinon.assert.calledWithExactly(uiSettings.remove, 'foobar');
-      uiSettings.remove.restore();
-    });
-
-    it('returns an angular promise', () => {
-      const promise = config.remove('dateFormat:tz');
-      expect(promise).to.be.a($q);
-    });
-  });
-
-  describe('#set', () => {
-    it('returns an angular promise', () => {
-      const promise = config.set('dateFormat:tz', 'foo');
-      expect(promise).to.be.a($q);
-    });
-
-    it('strips $$-prefixed properties from plain objects', () => {
-      config.set('dateFormat:scaled', {
-        foo: 'bar',
-        $$bax: 'box',
-      });
-
-      expect(config.get('dateFormat:scaled')).to.eql({
-        foo: 'bar',
-      });
-    });
-  });
-
-  describe('$scope events', () => {
-    it('synchronously emits change:config on $rootScope when config changes', () => {
-      const stub = sinon.stub();
-      $rootScope.$on('change:config', stub);
-      config.set('foobar', 'baz');
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits change:config.${key} on $rootScope when config changes', () => {
-      const stub = sinon.stub();
-      $rootScope.$on('change:config.foobar', stub);
-      config.set('foobar', 'baz');
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits change:config on child scope when config changes', () => {
-      const stub = sinon.stub();
-      const $parent = $rootScope.$new(false);
-      const $scope = $rootScope.$new(false, $parent);
-      $scope.$on('change:config', stub);
-      config.set('foobar', 'baz');
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits change:config.${key} on child scope when config changes', () => {
-      const stub = sinon.stub();
-      const $parent = $rootScope.$new(false);
-      const $scope = $rootScope.$new(false, $parent);
-      $scope.$on('change:config.foobar', stub);
-      config.set('foobar', 'baz');
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits change:config on isolate scope when config changes', () => {
-      const stub = sinon.stub();
-      const $scope = $rootScope.$new(true);
-      $scope.$on('change:config', stub);
-      config.set('foobar', 'baz');
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits change:config.${key} on isolate scope when config changes', () => {
-      const stub = sinon.stub();
-      const $scope = $rootScope.$new(true);
-      $scope.$on('change:config.foobar', stub);
-      config.set('foobar', 'baz');
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits events when changes are inside a digest cycle', async () => {
-      const stub = sinon.stub();
-
-      $rootScope.$apply(() => {
-        $rootScope.$on('change:config.foobar', stub);
-        config.set('foobar', 'baz');
-      });
-
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-
-    it('synchronously emits events when changes are outside a digest cycle', async () => {
-      const stub = sinon.stub();
-
-      await new Promise((resolve) => {
-        setTimeout(function () {
-          const off = $rootScope.$on('change:config.foobar', stub);
-          config.set('foobar', 'baz');
-          // we unlisten to make sure that stub is not called before our assertions below
-          off();
-          resolve();
-        }, 0);
-      });
-
-      sinon.assert.calledOnce(stub);
-      sinon.assert.calledWithExactly(stub, sinon.match({}), 'baz', undefined, 'foobar', config);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/config/config.js b/src/legacy/ui/public/config/config.js
deleted file mode 100644
index a8f24c126caff6..00000000000000
--- a/src/legacy/ui/public/config/config.js
+++ /dev/null
@@ -1,110 +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 angular from 'angular';
-import { fatalError } from 'ui/notify/fatal_error';
-import chrome from '../chrome';
-import { isPlainObject } from 'lodash';
-import { uiModules } from '../modules';
-import { subscribeWithScope } from '../../../../plugins/kibana_legacy/public';
-
-const module = uiModules.get('kibana/config');
-
-/**
- * Angular tie-in to UiSettingsClient, which is implemented in vanilla JS. Designed
- * to expose the exact same API as the config service that has existed since forever.
- * @name config
- */
-module.service(`config`, function ($rootScope, Promise) {
-  const uiSettings = chrome.getUiSettingsClient();
-
-  // direct bind sync methods
-  this.getAll = (...args) => uiSettings.getAll(...args);
-  this.get = (...args) => uiSettings.get(...args);
-  this.isDeclared = (...args) => uiSettings.isDeclared(...args);
-  this.isDefault = (...args) => uiSettings.isDefault(...args);
-  this.isCustom = (...args) => uiSettings.isCustom(...args);
-  this.isOverridden = (...args) => uiSettings.isOverridden(...args);
-
-  // modify remove() to use angular Promises
-  this.remove = (key) => Promise.resolve(uiSettings.remove(key));
-
-  // modify set() to use angular Promises and angular.toJson()
-  this.set = (key, value) =>
-    Promise.resolve(uiSettings.set(key, isPlainObject(value) ? angular.toJson(value) : value));
-
-  //////////////////////////////
-  //* angular specific methods *
-  //////////////////////////////
-
-  const subscription = subscribeWithScope(
-    $rootScope,
-    uiSettings.getUpdate$(),
-    {
-      next: ({ key, newValue, oldValue }) => {
-        $rootScope.$broadcast('change:config', newValue, oldValue, key, this);
-        $rootScope.$broadcast(`change:config.${key}`, newValue, oldValue, key, this);
-      },
-    },
-    fatalError
-  );
-  $rootScope.$on('$destroy', () => subscription.unsubscribe());
-
-  this.watchAll = function (handler, scope = $rootScope) {
-    // call handler immediately to initialize
-    handler(null, null, null, this);
-
-    return scope.$on('change:config', (event, ...args) => {
-      handler(...args);
-    });
-  };
-
-  this.watch = function (key, handler, scope = $rootScope) {
-    if (!this.isDeclared(key)) {
-      throw new Error(`Unexpected \`config.watch("${key}", fn)\` call on unrecognized configuration setting "${key}".
-Setting an initial value via \`config.set("${key}", value)\` before binding
-any custom setting configuration watchers for "${key}" may fix this issue.`);
-    }
-
-    // call handler immediately with current value
-    handler(this.get(key), null, key, uiSettings);
-
-    // call handler again on each change for this key
-    return scope.$on(`change:config.${key}`, (event, ...args) => {
-      handler(...args);
-    });
-  };
-
-  /**
-   * A little helper for binding config variables to $scopes
-   *
-   * @param  {Scope} $scope - an angular $scope object
-   * @param  {string} key - the config key to bind to
-   * @param  {string} [property] - optional property name where the value should
-   *                             be stored. Defaults to the config key
-   * @return {function} - an unbind function
-   */
-  this.bindToScope = function (scope, key, property = key) {
-    const onUpdate = (newVal) => {
-      scope[property] = newVal;
-    };
-
-    return this.watch(key, onUpdate, scope);
-  };
-});
diff --git a/src/legacy/ui/public/config/index.js b/src/legacy/ui/public/config/index.js
deleted file mode 100644
index 54602df57d65cf..00000000000000
--- a/src/legacy/ui/public/config/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.
- */
-
-import './config';
diff --git a/src/legacy/ui/public/directives/__tests__/input_focus.js b/src/legacy/ui/public/directives/__tests__/input_focus.js
deleted file mode 100644
index a9cd9b3c87974c..00000000000000
--- a/src/legacy/ui/public/directives/__tests__/input_focus.js
+++ /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 expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import $ from 'jquery';
-import '../input_focus';
-import uiRoutes from 'ui/routes';
-
-describe('Input focus directive', function () {
-  let $compile;
-  let $rootScope;
-  let $timeout;
-  let element;
-  let $el;
-  let selectedEl;
-  let selectedText;
-  const inputValue = 'Input Text Value';
-
-  uiRoutes.enable();
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {
-      $compile = _$compile_;
-      $rootScope = _$rootScope_;
-      $timeout = _$timeout_;
-
-      $el = $('<div>');
-      $el.appendTo('body');
-    })
-  );
-
-  afterEach(function () {
-    $el.remove();
-    $el = null;
-  });
-
-  function renderEl(html) {
-    $rootScope.value = inputValue;
-    element = $compile(html)($rootScope);
-    element.appendTo($el);
-    $rootScope.$digest();
-    $timeout.flush();
-    selectedEl = document.activeElement;
-    if (selectedEl.value) {
-      selectedText = selectedEl.value.slice(selectedEl.selectionStart, selectedEl.selectionEnd);
-    }
-  }
-
-  it('should focus the input', function () {
-    renderEl('<input type="text" ng-model="value" input-focus />');
-    expect(selectedEl).to.equal(element[0]);
-    expect(selectedText.length).to.equal(0);
-  });
-
-  it('should select the text in the input', function () {
-    renderEl('<input type="text" ng-model="value" input-focus="select" />');
-    expect(selectedEl).to.equal(element[0]);
-    expect(selectedText.length).to.equal(inputValue.length);
-    expect(selectedText).to.equal(inputValue);
-  });
-
-  it('should not focus the input if disable-input-focus is set to true on the same element', function () {
-    renderEl('<input type="text" ng-model="value" input-focus disable-input-focus="true">');
-    expect(selectedEl).not.to.be(element[0]);
-  });
-
-  it('should still focus the input if disable-input-focus is falsy', function () {
-    renderEl('<input type="text" ng-model="value" input-focus disable-input-focus="false">');
-    expect(selectedEl).to.be(element[0]);
-  });
-});
diff --git a/src/legacy/ui/public/directives/_index.scss b/src/legacy/ui/public/directives/_index.scss
deleted file mode 100644
index 7ff5c9b9c540c1..00000000000000
--- a/src/legacy/ui/public/directives/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import './input_datetime';
-@import './saved_object_paginated_selectable'
diff --git a/src/legacy/ui/public/directives/_input_datetime.scss b/src/legacy/ui/public/directives/_input_datetime.scss
deleted file mode 100644
index 0704d70e9df1b0..00000000000000
--- a/src/legacy/ui/public/directives/_input_datetime.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.input-datetime-format {
-  font-size: $euiFontSizeXS;
-  color: $euiColorMediumShade;
-  padding: $euiSizeXS $euiSize;
-}
diff --git a/src/legacy/ui/public/directives/_saved_object_paginated_selectable.scss b/src/legacy/ui/public/directives/_saved_object_paginated_selectable.scss
deleted file mode 100644
index f8b5cdb440997a..00000000000000
--- a/src/legacy/ui/public/directives/_saved_object_paginated_selectable.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-saved-object-finder,
-paginated-selectable-list {
-
-  .list-sort-button {
-    border-top-left-radius: 0 !important;
-    border-top-right-radius: 0 !important;
-    border: none;
-    padding: $euiSizeS $euiSize;
-    font-weight: $euiFontWeightRegular;
-    background-color: $euiColorLightestShade;
-  }
-
-  ul.li-striped {
-    li {
-      border: none;
-    }
-
-    li:nth-child(even) {
-      background-color: $euiColorLightestShade;
-    }
-
-    li:nth-child(odd) {
-      background-color: $euiColorEmptyShade;
-    }
-
-    .paginate-heading {
-      font-weight: $euiFontWeightRegular;
-      color: $euiColorDarkestShade;
-    }
-
-    .list-group-item {
-      padding: $euiSizeS $euiSize;
-
-      ul {
-        padding: 0;
-        display: flex;
-        flex-direction: row;
-
-        .finder-type {
-          margin-right: $euiSizeS;
-        }
-      }
-
-      a {
-        display: block;
-        color: $euiColorPrimary !important;
-
-        i {
-          color: shade($euiColorPrimary, 10%) !important;
-          margin-right: $euiSizeS;
-        }
-      }
-
-      &:first-child {
-        border-top-left-radius: 0 !important;
-        border-top-right-radius: 0 !important;
-      }
-
-      &.list-group-no-results p {
-        margin-bottom: 0 !important;
-      }
-    }
-  }
-
-  paginate {
-    paginate-controls {
-      margin: $euiSize;
-    }
-  }
-}
diff --git a/src/legacy/ui/public/directives/bind/__tests__/bind.js b/src/legacy/ui/public/directives/bind/__tests__/bind.js
deleted file mode 100644
index 658a726e8c4cf6..00000000000000
--- a/src/legacy/ui/public/directives/bind/__tests__/bind.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 expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-describe('$scope.$bind', function () {
-  let $rootScope;
-  let $scope;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $scope = $rootScope.$new();
-    })
-  );
-
-  it('exposes $bind on all scopes', function () {
-    expect($rootScope.$bind).to.be.a('function');
-    expect($scope).to.have.property('$bind', $rootScope.$bind);
-
-    const $isoScope = $scope.$new(true);
-    expect($isoScope).to.have.property('$bind', $rootScope.$bind);
-  });
-
-  it("sets up binding from a parent scope to it's child", function () {
-    $rootScope.val = 'foo';
-    $scope.$bind('localVal', 'val');
-    expect($scope.localVal).to.be('foo');
-
-    $rootScope.val = 'bar';
-    expect($scope.localVal).to.be('foo'); // shouldn't have changed yet
-
-    $rootScope.$apply();
-    expect($scope.localVal).to.be('bar');
-  });
-
-  it('sets up a binding from the child to the parent scope', function () {
-    $rootScope.val = 'foo';
-    $scope.$bind('localVal', 'val');
-    expect($scope.localVal).to.be('foo');
-
-    $scope.localVal = 'bar';
-    expect($rootScope.val).to.be('foo'); // shouldn't have changed yet
-
-    $scope.$apply();
-    expect($rootScope.val).to.be('bar');
-  });
-
-  it('pulls from the scopes $parent by default', function () {
-    const $parent = $rootScope.$new();
-    const $self = $parent.$new();
-
-    $parent.val = 'foo';
-    $self.val = 'bar';
-
-    $self.$bind('localVal', 'val');
-    expect($self.localVal).to.be('foo');
-  });
-
-  it('accepts an alternate scope to read from', function () {
-    const $parent = $rootScope.$new();
-    const $self = $parent.$new();
-
-    $parent.val = 'foo';
-    $self.val = 'bar';
-
-    $self.$bind('localVal', 'val', $self);
-    expect($self.localVal).to.be('bar');
-  });
-});
diff --git a/src/legacy/ui/public/directives/bind/bind.js b/src/legacy/ui/public/directives/bind/bind.js
deleted file mode 100644
index a9210cace5cea6..00000000000000
--- a/src/legacy/ui/public/directives/bind/bind.js
+++ /dev/null
@@ -1,116 +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 angular from 'angular';
-import { uiModules } from '../../modules';
-
-uiModules.get('kibana').config(function ($provide) {
-  function strictEquality(a, b) {
-    // are the values equal? or, are they both NaN?
-    return a === b || (a !== a && b !== b);
-  }
-
-  function errorNotAssignable(source, target) {
-    throw Error(
-      'Unable to accept change to bound $scope property "' +
-        source +
-        '"' +
-        ' because source expression "' +
-        target +
-        '" is not assignable!'
-    );
-  }
-
-  $provide.decorator('$rootScope', function ($delegate, $parse) {
-    /**
-     * Two-way bind a value from scope to another property on scope. This
-     * allow values on scope that work like they do in an isolate scope, but
-     * without requiring one.
-     *
-     * @param  {expression} to - the location on scope to bind to
-     * @param  {expression} from - the location on scope to bind from
-     * @param  {Scope} $sourceScope - the scope to read "from" expression from
-     * @return {undefined}
-     */
-    $delegate.constructor.prototype.$bind = function (to, from, $sourceScope) {
-      const $source = $sourceScope || this.$parent;
-      const $target = this;
-
-      // parse expressions
-      const $to = $parse(to);
-      if (!$to.assign) errorNotAssignable(to, from);
-      const $from = $parse(from);
-
-      // bind scopes to expressions
-      const getTarget = function () {
-        return $to($target);
-      };
-      const setTarget = function (v) {
-        return $to.assign($target, v);
-      };
-      const getSource = function () {
-        return $from($source);
-      };
-      const setSource = function (v) {
-        return $from.assignOrFail($source, v);
-      };
-
-      // to support writing from the child to the parent we need to know
-      // which source has changed. Track the source value and anytime it
-      // changes (even if the target value changed too) push from source
-      // to target. If the source hasn't changed then the change is from
-      // the target and push accordingly
-      let lastSourceVal = getSource();
-
-      $from.assignOrFail =
-        $from.assign ||
-        function () {
-          // revert the change and throw an error, child writes aren't supported
-          $to($target, (lastSourceVal = $from($source)));
-          errorNotAssignable(from, to);
-        };
-
-      // if we are syncing down a literal, then we use loose equality check
-      const strict = !$from.literal;
-      const compare = strict ? strictEquality : angular.equals;
-
-      // push the initial value down, start off in sync
-      setTarget(lastSourceVal);
-
-      $target.$watch(
-        function () {
-          const sourceVal = getSource();
-          const targetVal = getTarget();
-
-          const outOfSync = !compare(sourceVal, targetVal);
-          const sourceChanged = outOfSync && !compare(sourceVal, lastSourceVal);
-
-          if (sourceChanged) setTarget(sourceVal);
-          else if (outOfSync) setSource(targetVal);
-
-          return (lastSourceVal = sourceVal);
-        },
-        null,
-        !strict
-      );
-    };
-
-    return $delegate;
-  });
-});
diff --git a/src/legacy/ui/public/directives/bind/index.js b/src/legacy/ui/public/directives/bind/index.js
deleted file mode 100644
index d542452d1a80f5..00000000000000
--- a/src/legacy/ui/public/directives/bind/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.
- */
-
-import './bind';
diff --git a/src/legacy/ui/public/directives/input_focus.js b/src/legacy/ui/public/directives/input_focus.js
deleted file mode 100644
index f047ff2547ba25..00000000000000
--- a/src/legacy/ui/public/directives/input_focus.js
+++ /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 { uiModules } from '../modules';
-const module = uiModules.get('kibana');
-
-module.directive('inputFocus', function ($parse, $timeout) {
-  return {
-    restrict: 'A',
-    link: function ($scope, $elem, attrs) {
-      const isDisabled = attrs.disableInputFocus && $parse(attrs.disableInputFocus)($scope);
-      if (!isDisabled) {
-        $timeout(function () {
-          $elem.focus();
-          if (attrs.inputFocus === 'select') $elem.select();
-        });
-      }
-    },
-  };
-});
diff --git a/src/legacy/ui/public/directives/kbn_href.js b/src/legacy/ui/public/directives/kbn_href.js
deleted file mode 100644
index 5c71396e6c4dea..00000000000000
--- a/src/legacy/ui/public/directives/kbn_href.js
+++ /dev/null
@@ -1,38 +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 { uiModules } from '../modules';
-import { words, kebabCase } from 'lodash';
-
-export function kbnUrlDirective(name) {
-  const attr = kebabCase(words(name).slice(1));
-
-  uiModules.get('kibana').directive(name, function (chrome) {
-    return {
-      restrict: 'A',
-      link: function ($scope, $el, $attr) {
-        $attr.$observe(name, function (val) {
-          $attr.$set(attr, chrome.addBasePath(val));
-        });
-      },
-    };
-  });
-}
-
-kbnUrlDirective('kbnHref');
diff --git a/src/legacy/ui/public/directives/listen/__tests__/listen.js b/src/legacy/ui/public/directives/listen/__tests__/listen.js
deleted file mode 100644
index 9a1d4829561546..00000000000000
--- a/src/legacy/ui/public/directives/listen/__tests__/listen.js
+++ /dev/null
@@ -1,96 +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 ngMock from 'ng_mock';
-import '..';
-import { EventsProvider } from '../../../events';
-
-describe('listen component', function () {
-  let $rootScope;
-  let Events;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector, Private) {
-      $rootScope = $injector.get('$rootScope');
-      Events = Private(EventsProvider);
-    })
-  );
-
-  it('exposes the $listen method on all scopes', function () {
-    expect($rootScope.$listen).to.be.a('function');
-    expect($rootScope.$new().$listen).to.be.a('function');
-  });
-
-  it('binds to an event emitter', function () {
-    const emitter = new Events();
-    const $scope = $rootScope.$new();
-
-    function handler() {}
-    $scope.$listen(emitter, 'hello', handler);
-
-    expect(emitter._listeners.hello).to.have.length(1);
-    expect(emitter._listeners.hello[0].handler).to.be(handler);
-  });
-
-  it('binds to $scope, waiting for the destroy event', function () {
-    const emitter = new Events();
-    const $scope = $rootScope.$new();
-
-    sinon.stub($scope, '$on');
-    sinon.stub($rootScope, '$on');
-
-    function handler() {}
-    $scope.$listen(emitter, 'hello', handler);
-
-    expect($rootScope.$on).to.have.property('callCount', 0);
-    expect($scope.$on).to.have.property('callCount', 1);
-
-    const call = $scope.$on.firstCall;
-    expect(call.args[0]).to.be('$destroy');
-    expect(call.args[1]).to.be.a('function');
-  });
-
-  it('unbinds the event handler when $destroy is triggered', function () {
-    const emitter = new Events();
-    const $scope = $rootScope.$new();
-
-    sinon.stub($scope, '$on');
-    sinon.stub(emitter, 'off');
-
-    // set the listener
-    function handler() {}
-    $scope.$listen(emitter, 'hello', handler);
-
-    // get the unbinder that was registered to $scope
-    const unbinder = $scope.$on.firstCall.args[1];
-
-    // call the unbinder
-    expect(emitter.off).to.have.property('callCount', 0);
-    unbinder();
-    expect(emitter.off).to.have.property('callCount', 1);
-
-    // check that the off args were as expected
-    const call = emitter.off.firstCall;
-    expect(call.args[0]).to.be('hello');
-    expect(call.args[1]).to.be(handler);
-  });
-});
diff --git a/src/legacy/ui/public/directives/listen/index.js b/src/legacy/ui/public/directives/listen/index.js
deleted file mode 100644
index 6efc1b71431a2e..00000000000000
--- a/src/legacy/ui/public/directives/listen/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.
- */
-
-import './listen';
diff --git a/src/legacy/ui/public/directives/listen/listen.js b/src/legacy/ui/public/directives/listen/listen.js
deleted file mode 100644
index db19471fdb6405..00000000000000
--- a/src/legacy/ui/public/directives/listen/listen.js
+++ /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 { uiModules } from '../../modules';
-import { registerListenEventListener } from '../../../../../plugins/kibana_legacy/public';
-
-uiModules.get('kibana').run(registerListenEventListener);
diff --git a/src/legacy/ui/public/directives/render_directive/__tests__/render_directive.js b/src/legacy/ui/public/directives/render_directive/__tests__/render_directive.js
deleted file mode 100644
index a604eca52affe0..00000000000000
--- a/src/legacy/ui/public/directives/render_directive/__tests__/render_directive.js
+++ /dev/null
@@ -1,123 +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 angular from 'angular';
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import '..';
-
-let init;
-let $rootScope;
-let $compile;
-
-describe('render_directive', function () {
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $compile = $injector.get('$compile');
-      init = function init(markup = '', definition = {}) {
-        const $parentScope = $rootScope;
-
-        // create the markup
-        const $elem = angular.element('<render-directive>');
-        $elem.html(markup);
-        if (definition !== null) {
-          $parentScope.definition = definition;
-          $elem.attr('definition', 'definition');
-        }
-
-        // compile the directive
-        $compile($elem)($parentScope);
-        $parentScope.$apply();
-
-        const $directiveScope = $elem.isolateScope();
-
-        return { $parentScope, $directiveScope, $elem };
-      };
-    })
-  );
-
-  describe('directive requirements', function () {
-    it('should throw if not given a definition', function () {
-      expect(() => init('', null)).to.throwException(/must have a definition/);
-    });
-  });
-
-  describe('rendering with definition', function () {
-    it('should call link method', function () {
-      const markup = '<p>hello world</p>';
-      const definition = {
-        link: sinon.stub(),
-      };
-
-      init(markup, definition);
-
-      sinon.assert.callCount(definition.link, 1);
-    });
-
-    it('should call controller method', function () {
-      const markup = '<p>hello world</p>';
-      const definition = {
-        controller: sinon.stub(),
-      };
-
-      init(markup, definition);
-
-      sinon.assert.callCount(definition.controller, 1);
-    });
-  });
-
-  describe('definition scope binding', function () {
-    it('should accept two-way, attribute, and expression binding directives', function () {
-      const $el = angular.element(`
-        <render-directive
-          definition="definition"
-          two-way-prop="parentTwoWay"
-          attr="Simple Attribute"
-          expr="parentExpression()"
-          >
-          {{two}},{{attr}},{{expr()}}
-        </render-directive>
-      `);
-
-      const $parentScope = $rootScope.$new();
-      $parentScope.definition = {
-        scope: {
-          two: '=twoWayProp',
-          attr: '@',
-          expr: '&expr',
-        },
-      };
-      $parentScope.parentTwoWay = true;
-      $parentScope.parentExpression = function () {
-        return !$parentScope.parentTwoWay;
-      };
-
-      $compile($el)($parentScope);
-      $parentScope.$apply();
-
-      expect($el.text().trim()).to.eql('true,Simple Attribute,false');
-      $parentScope.parentTwoWay = false;
-      $parentScope.$apply();
-      expect($el.text().trim()).to.eql('false,Simple Attribute,true');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js b/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js
deleted file mode 100644
index 09948bda96b9f8..00000000000000
--- a/src/legacy/ui/public/directives/render_directive/apply_scope_bindings.js
+++ /dev/null
@@ -1,61 +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 { forOwn, noop } from 'lodash';
-
-import '../../directives/bind';
-
-const bindingRE = /^(=|=\?|&|@)([a-zA-Z0-9_$]+)?$/;
-
-export function ApplyScopeBindingsProvider($parse) {
-  return function (bindings, $scope, $attrs) {
-    forOwn(bindings, (binding, local) => {
-      if (!bindingRE.test(binding)) {
-        throw new Error(`Invalid scope binding "${binding}". Expected it to match ${bindingRE}`);
-      }
-
-      const [, type, attribute = local] = binding.match(bindingRE);
-      const attr = $attrs[attribute];
-      switch (type) {
-        case '=':
-          $scope.$bind(local, attr);
-          break;
-        case '=?':
-          throw new Error(
-            '<render-directive> does not currently support optional two-way bindings.'
-          );
-          break;
-        case '&':
-          if (attr) {
-            const getter = $parse(attr);
-            $scope[local] = function () {
-              return getter($scope.$parent);
-            };
-          } else {
-            $scope[local] = noop;
-          }
-          break;
-        case '@':
-          $scope[local] = attr;
-          $attrs.$observe(attribute, (v) => ($scope[local] = v));
-          break;
-      }
-    });
-  };
-}
diff --git a/src/legacy/ui/public/directives/render_directive/index.js b/src/legacy/ui/public/directives/render_directive/index.js
deleted file mode 100644
index 8c1f126dc48f07..00000000000000
--- a/src/legacy/ui/public/directives/render_directive/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.
- */
-
-import './render_directive';
diff --git a/src/legacy/ui/public/directives/render_directive/render_directive.js b/src/legacy/ui/public/directives/render_directive/render_directive.js
deleted file mode 100644
index a5232f39b82c39..00000000000000
--- a/src/legacy/ui/public/directives/render_directive/render_directive.js
+++ /dev/null
@@ -1,90 +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 { isPlainObject } from 'lodash';
-import { uiModules } from '../../modules';
-import { ApplyScopeBindingsProvider } from './apply_scope_bindings';
-
-/**
- * The <render-directive> directive is useful for programmatically modifying or
- * extending a view. It allows defining the majority of the directives behavior
- * using a "definition" object, which the implementer can obtain from plugins (for instance).
- *
- * The definition object supports the parts of a directive definition that are
- * easy enough to implement without having to hack angular, and does it's best to
- * make sure standard directive life-cycle timing is respected.
- *
- * @param [Object] definition - the external configuration for this directive to assume
- * @param [Function] definition.controller - a constructor used to create the controller for this directive
- * @param [String] definition.controllerAs - a name where the controller should be stored on scope
- * @param [Object] definition.scope - an object defining the binding properties for values read from
- *                                  attributes and bound to $scope. The keys of this object are the
- *                                  local names of $scope properties, and the values are a combination
- *                                  of the binding style (=, @, or &) and the external attribute name.
- *                                  See [the Angular docs]
- *                                  (https://code.angularjs.org/1.4.9/docs/api/ng/service/$compile#-scope-)
- *                                  for more info
- * @param [Object|Function] definition.link - either a post link function or an object with pre and/or
- *                                          post link functions.
- */
-uiModules.get('kibana').directive('renderDirective', function (Private) {
-  const applyScopeBindings = Private(ApplyScopeBindingsProvider);
-
-  return {
-    restrict: 'E',
-    scope: {
-      definition: '=',
-    },
-    template: function ($el) {
-      return $el.html();
-    },
-    controller: function ($scope, $element, $attrs, $transclude, $injector) {
-      if (!$scope.definition) throw new Error('render-directive must have a definition attribute');
-
-      const { controller, controllerAs, scope } = $scope.definition;
-
-      applyScopeBindings(scope, $scope, $attrs);
-
-      if (controller) {
-        if (controllerAs) {
-          $scope[controllerAs] = this;
-        }
-
-        const locals = { $scope, $element, $attrs, $transclude };
-        const controllerInstance = $injector.invoke(controller, this, locals) || this;
-
-        if (controllerAs) {
-          $scope[controllerAs] = controllerInstance;
-        }
-      }
-    },
-    link: {
-      pre($scope, $el, $attrs, controller) {
-        const { link } = $scope.definition;
-        const preLink = isPlainObject(link) ? link.pre : null;
-        if (preLink) preLink($scope, $el, $attrs, controller);
-      },
-      post($scope, $el, $attrs, controller) {
-        const { link } = $scope.definition;
-        const postLink = isPlainObject(link) ? link.post : link;
-        if (postLink) postLink($scope, $el, $attrs, controller);
-      },
-    },
-  };
-});
diff --git a/src/legacy/ui/public/directives/storage/index.js b/src/legacy/ui/public/directives/storage/index.js
deleted file mode 100644
index 7c195ecc85d2f9..00000000000000
--- a/src/legacy/ui/public/directives/storage/index.js
+++ /dev/null
@@ -1,32 +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 { uiModules } from '../../modules';
-import { Storage } from '../../../../../plugins/kibana_utils/public';
-
-const createService = function (type) {
-  return function ($window) {
-    return new Storage($window[type]);
-  };
-};
-
-uiModules
-  .get('kibana/storage')
-  .service('localStorage', createService('localStorage'))
-  .service('sessionStorage', createService('sessionStorage'));
diff --git a/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js b/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js
deleted file mode 100644
index 0de41a5ae57cb7..00000000000000
--- a/src/legacy/ui/public/directives/watch_multi/__tests__/watch_multi.js
+++ /dev/null
@@ -1,216 +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 _ from 'lodash';
-import ngMock from 'ng_mock';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-
-describe('$scope.$watchMulti', function () {
-  let $rootScope;
-  let $scope;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-      $scope = $rootScope.$new();
-    })
-  );
-
-  describe('basic functionality', function () {
-    it('exposes $watchMulti on all scopes', function () {
-      expect($rootScope.$watchMulti).to.be.a('function');
-      expect($scope).to.have.property('$watchMulti', $rootScope.$watchMulti);
-
-      const $isoScope = $scope.$new(true);
-      expect($isoScope).to.have.property('$watchMulti', $rootScope.$watchMulti);
-    });
-
-    it('returns a working unwatch function', function () {
-      $scope.a = 0;
-      $scope.b = 0;
-      let triggers = 0;
-      const unwatch = $scope.$watchMulti(['a', 'b'], function () {
-        triggers++;
-      });
-
-      // initial watch
-      $scope.$apply();
-      expect(triggers).to.be(1);
-
-      // prove that it triggers on change
-      $scope.a++;
-      $scope.$apply();
-      expect(triggers).to.be(2);
-
-      // remove watchers
-      expect($scope.$$watchers).to.not.have.length(0);
-      unwatch();
-      expect($scope.$$watchers).to.have.length(0);
-
-      // prove that it doesn't trigger anymore
-      $scope.a++;
-      $scope.$apply();
-      expect(triggers).to.be(2);
-    });
-  });
-
-  describe('simple scope watchers', function () {
-    it('only triggers a single watch on initialization', function () {
-      const stub = sinon.stub();
-
-      $scope.$watchMulti(['one', 'two', 'three'], stub);
-      $rootScope.$apply();
-
-      expect(stub.callCount).to.be(1);
-    });
-
-    it('only triggers a single watch when multiple values change', function () {
-      const stub = sinon.spy(function () {});
-
-      $scope.$watchMulti(['one', 'two', 'three'], stub);
-
-      $rootScope.$apply();
-      expect(stub.callCount).to.be(1);
-
-      $scope.one = 'a';
-      $scope.two = 'b';
-      $scope.three = 'c';
-      $rootScope.$apply();
-
-      expect(stub.callCount).to.be(2);
-    });
-
-    it('passes an array of the current and previous values, in order', function () {
-      const stub = sinon.spy(function () {});
-
-      $scope.one = 'a';
-      $scope.two = 'b';
-      $scope.three = 'c';
-      $scope.$watchMulti(['one', 'two', 'three'], stub);
-
-      $rootScope.$apply();
-      expect(stub.firstCall.args).to.eql([
-        ['a', 'b', 'c'],
-        ['a', 'b', 'c'],
-      ]);
-
-      $scope.one = 'do';
-      $scope.two = 're';
-      $scope.three = 'mi';
-      $rootScope.$apply();
-
-      expect(stub.secondCall.args).to.eql([
-        ['do', 're', 'mi'],
-        ['a', 'b', 'c'],
-      ]);
-    });
-
-    it('always has an up to date value', function () {
-      let count = 0;
-
-      $scope.vals = [1, 0];
-      $scope.$watchMulti(['vals[0]', 'vals[1]'], function (cur) {
-        expect(cur).to.eql($scope.vals);
-        count++;
-      });
-
-      const $child = $scope.$new();
-      $child.$watch('vals[0]', function (cur) {
-        $child.vals[1] = cur;
-      });
-
-      $rootScope.$apply();
-      expect(count).to.be(2);
-    });
-  });
-
-  describe('complex watch expressions', function () {
-    let stateWatchers;
-    let firstValue;
-    let secondValue;
-
-    beforeEach(function () {
-      const firstGetter = function () {
-        return firstValue;
-      };
-
-      const secondGetter = function () {
-        return secondValue;
-      };
-
-      stateWatchers = [
-        {
-          fn: $rootScope.$watch,
-          get: firstGetter,
-        },
-        {
-          fn: $rootScope.$watch,
-          get: secondGetter,
-        },
-      ];
-    });
-
-    it('should trigger the watcher on initialization', function () {
-      const stub = sinon.stub();
-      firstValue = 'first';
-      secondValue = 'second';
-
-      $scope.$watchMulti(stateWatchers, stub);
-      $rootScope.$apply();
-
-      expect(stub.callCount).to.be(1);
-
-      expect(stub.firstCall.args[0]).to.eql([firstValue, secondValue]);
-      expect(stub.firstCall.args[1]).to.eql([firstValue, secondValue]);
-    });
-  });
-
-  describe('nested watchers', function () {
-    it('should trigger the handler at least once', function () {
-      const $scope = $rootScope.$new();
-      $scope.$$watchers = [
-        {
-          get: _.noop,
-          fn: _.noop,
-          eq: false,
-          last: false,
-        },
-        {
-          get: _.noop,
-          fn: registerWatchers,
-          eq: false,
-          last: false,
-        },
-      ];
-
-      const first = sinon.stub();
-      const second = sinon.stub();
-
-      function registerWatchers() {
-        $scope.$watchMulti([first, second], function () {
-          expect(first.callCount).to.be.greaterThan(0);
-          expect(second.callCount).to.be.greaterThan(0);
-        });
-      }
-      $scope.$digest();
-    });
-  });
-});
diff --git a/src/legacy/ui/public/directives/watch_multi/index.js b/src/legacy/ui/public/directives/watch_multi/index.js
deleted file mode 100644
index 800bb503088d4f..00000000000000
--- a/src/legacy/ui/public/directives/watch_multi/index.js
+++ /dev/null
@@ -1,22 +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 { uiModules } from '../../modules';
-import { watchMultiDecorator } from '../../../../../plugins/kibana_legacy/public';
-uiModules.get('kibana').config(watchMultiDecorator);
diff --git a/src/legacy/ui/public/doc_title/__tests__/doc_title.js b/src/legacy/ui/public/doc_title/__tests__/doc_title.js
deleted file mode 100644
index fa8b83f755957f..00000000000000
--- a/src/legacy/ui/public/doc_title/__tests__/doc_title.js
+++ /dev/null
@@ -1,91 +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 ngMock from 'ng_mock';
-import { docTitle } from '../doc_title';
-import { npStart } from '../../new_platform';
-
-describe('docTitle Service', function () {
-  let initialDocTitle;
-  const MAIN_TITLE = 'Kibana 4';
-  let $rootScope;
-
-  beforeEach(function () {
-    initialDocTitle = document.title;
-    document.title = MAIN_TITLE;
-    npStart.core.chrome.docTitle.__legacy.setBaseTitle(MAIN_TITLE);
-  });
-  afterEach(function () {
-    document.title = initialDocTitle;
-    npStart.core.chrome.docTitle.__legacy.setBaseTitle(initialDocTitle);
-  });
-
-  beforeEach(
-    ngMock.module('kibana', function ($provide) {
-      $provide.decorator('$rootScope', decorateWithSpy('$on'));
-    })
-  );
-
-  beforeEach(
-    ngMock.inject(function ($injector) {
-      $rootScope = $injector.get('$rootScope');
-    })
-  );
-
-  describe('setup', function () {
-    it('resets the title when a route change begins', function () {
-      const spy = $rootScope.$on;
-
-      const found = spy.args.some(function (args) {
-        return args[0] === '$routeChangeStart' && args[1] === docTitle.reset;
-      });
-
-      if (!found) {
-        throw new Error('$rootScope.$on not called');
-      }
-    });
-  });
-
-  describe('#reset', function () {
-    it('clears the internal state', function () {
-      docTitle.change('some title');
-      expect(document.title).to.be('some title - ' + MAIN_TITLE);
-
-      docTitle.reset();
-      expect(document.title).to.be(MAIN_TITLE);
-    });
-  });
-
-  describe('#change', function () {
-    it('writes the first param to as the first part of the doc name', function () {
-      expect(document.title).to.be(MAIN_TITLE);
-      docTitle.change('some secondary title');
-      expect(document.title).to.be('some secondary title - ' + MAIN_TITLE);
-    });
-  });
-
-  function decorateWithSpy(prop) {
-    return function ($delegate) {
-      sinon.spy($delegate, prop);
-      return $delegate;
-    };
-  }
-});
diff --git a/src/legacy/ui/public/doc_title/doc_title.d.ts b/src/legacy/ui/public/doc_title/doc_title.d.ts
deleted file mode 100644
index 8253a45850e191..00000000000000
--- a/src/legacy/ui/public/doc_title/doc_title.d.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.
- */
-
-export interface DocTitle {
-  change: (title: string) => void;
-}
-
-export const docTitle: DocTitle;
diff --git a/src/legacy/ui/public/doc_title/doc_title.js b/src/legacy/ui/public/doc_title/doc_title.js
deleted file mode 100644
index 096e49e7a6de86..00000000000000
--- a/src/legacy/ui/public/doc_title/doc_title.js
+++ /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 { isArray } from 'lodash';
-import { uiModules } from '../modules';
-import { npStart } from '../new_platform';
-
-const npDocTitle = () => npStart.core.chrome.docTitle;
-
-function change(title) {
-  npDocTitle().change(isArray(title) ? title : [title]);
-}
-
-function reset() {
-  npDocTitle().reset();
-}
-
-export const docTitle = {
-  change,
-  reset,
-};
-
-uiModules.get('kibana').run(function ($rootScope) {
-  // always bind to the route events
-  $rootScope.$on('$routeChangeStart', docTitle.reset);
-});
diff --git a/src/legacy/ui/public/doc_title/index.js b/src/legacy/ui/public/doc_title/index.js
deleted file mode 100644
index 1507797cc749ca..00000000000000
--- a/src/legacy/ui/public/doc_title/index.js
+++ /dev/null
@@ -1,22 +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 './doc_title';
-
-export { docTitle } from './doc_title';
diff --git a/src/legacy/ui/public/documentation_links/__mocks__/documentation_links.ts b/src/legacy/ui/public/documentation_links/__mocks__/documentation_links.ts
deleted file mode 100644
index 3fe123c3ccb805..00000000000000
--- a/src/legacy/ui/public/documentation_links/__mocks__/documentation_links.ts
+++ /dev/null
@@ -1,25 +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 { docLinksServiceMock } from '../../../../../core/public/mocks';
-
-const { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL, links } = docLinksServiceMock.createStartContract();
-
-export { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL };
-export const documentationLinks = links;
diff --git a/src/legacy/ui/public/documentation_links/__tests__/documentation_links.js b/src/legacy/ui/public/documentation_links/__tests__/documentation_links.js
deleted file mode 100644
index 6c9cdd12422cfb..00000000000000
--- a/src/legacy/ui/public/documentation_links/__tests__/documentation_links.js
+++ /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 expect from '@kbn/expect';
-import { documentationLinks } from '../documentation_links';
-import { metadata } from '../../metadata';
-
-const urlVersion = metadata.branch;
-
-describe('documentation link service', function () {
-  it("should inject Kibana's major.minor version into doc links", function () {
-    expect(documentationLinks.filebeat.configuration).to.contain(urlVersion);
-  });
-});
diff --git a/src/legacy/ui/public/documentation_links/documentation_links.ts b/src/legacy/ui/public/documentation_links/documentation_links.ts
deleted file mode 100644
index 45aba1a5121fb6..00000000000000
--- a/src/legacy/ui/public/documentation_links/documentation_links.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 { npStart } from 'ui/new_platform';
-
-/*
-  WARNING: The links in this file are validated during the docs build. This is accomplished with some regex magic that
-  looks for these particular constants. As a result, we should not add new constants or change the existing ones.
-  If you absolutely must make a change, talk to Clinton Gormley first so he can update his Perl scripts.
- */
-export const DOC_LINK_VERSION = npStart.core.docLinks.DOC_LINK_VERSION;
-export const ELASTIC_WEBSITE_URL = npStart.core.docLinks.ELASTIC_WEBSITE_URL;
-
-export const documentationLinks = npStart.core.docLinks.links;
diff --git a/src/legacy/ui/public/documentation_links/get_doc_link.ts b/src/legacy/ui/public/documentation_links/get_doc_link.ts
deleted file mode 100644
index 7d0d8033e3a5fc..00000000000000
--- a/src/legacy/ui/public/documentation_links/get_doc_link.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 { get } from 'lodash';
-import { documentationLinks } from './documentation_links';
-
-export const getDocLink = (id: string): string | undefined => get(documentationLinks, id);
diff --git a/src/legacy/ui/public/documentation_links/index.ts b/src/legacy/ui/public/documentation_links/index.ts
deleted file mode 100644
index 59499d3b8d9aa8..00000000000000
--- a/src/legacy/ui/public/documentation_links/index.ts
+++ /dev/null
@@ -1,22 +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 { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION, documentationLinks } from './documentation_links';
-
-export { getDocLink } from './get_doc_link';
diff --git a/src/legacy/ui/public/dom_location.js b/src/legacy/ui/public/dom_location.js
deleted file mode 100644
index baf03ba4c4b1c7..00000000000000
--- a/src/legacy/ui/public/dom_location.js
+++ /dev/null
@@ -1,34 +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 function DomLocationProvider($window) {
-  return {
-    reload: function (forceFetch) {
-      $window.location.reload(forceFetch);
-    },
-
-    get href() {
-      return $window.location.href;
-    },
-
-    set href(val) {
-      return ($window.location.href = val);
-    },
-  };
-}
diff --git a/src/legacy/ui/public/elastic_charts/index.ts b/src/legacy/ui/public/elastic_charts/index.ts
deleted file mode 100644
index 661ea693102a73..00000000000000
--- a/src/legacy/ui/public/elastic_charts/index.ts
+++ /dev/null
@@ -1,26 +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 chrome from 'ui/chrome';
-import { Theme, LIGHT_THEME, DARK_THEME } from '@elastic/charts';
-
-export function getChartTheme(): Theme {
-  const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode');
-  return isDarkMode ? DARK_THEME : LIGHT_THEME;
-}
diff --git a/src/legacy/ui/public/events.js b/src/legacy/ui/public/events.js
deleted file mode 100644
index 464c03d98b83f0..00000000000000
--- a/src/legacy/ui/public/events.js
+++ /dev/null
@@ -1,138 +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.
- */
-
-/**
- * @name Events
- *
- * @extends EventEmitter
- */
-
-import _ from 'lodash';
-import { EventEmitter } from 'events';
-import { fatalError } from './notify';
-import { createLegacyClass } from './utils/legacy_class';
-import { createDefer } from 'ui/promises';
-
-const location = 'EventEmitter';
-
-export function EventsProvider(Promise) {
-  createLegacyClass(Events).inherits(EventEmitter);
-  function Events() {
-    Events.Super.call(this);
-    this._listeners = {};
-    this._emitChain = Promise.resolve();
-  }
-
-  /**
-   * Listens for events
-   * @param {string} name - The name of the event
-   * @param {function} handler - The function to call when the event is triggered
-   * @return {Events} - this, for chaining
-   */
-  Events.prototype.on = function (name, handler) {
-    if (!Array.isArray(this._listeners[name])) {
-      this._listeners[name] = [];
-    }
-
-    const listener = {
-      handler: handler,
-    };
-    this._listeners[name].push(listener);
-
-    (function rebuildDefer() {
-      listener.defer = createDefer(Promise);
-      listener.resolved = listener.defer.promise.then(function (args) {
-        rebuildDefer();
-
-        // we ignore the completion of handlers, just watch for unhandled errors
-        Promise.resolve(handler.apply(handler, args)).catch((error) => fatalError(error, location));
-
-        // indicate to bluebird not to worry about this promise being a "runaway"
-        return null;
-      });
-    })();
-
-    return this;
-  };
-
-  /**
-   * Removes an event listener
-   * @param {string} [name] - The name of the event
-   * @param {function} [handler] - The handler to remove
-   * @return {Events} - this, for chaining
-   */
-  Events.prototype.off = function (name, handler) {
-    if (!name && !handler) {
-      this._listeners = {};
-      return this.removeAllListeners();
-    }
-
-    // exit early if there is not an event that matches
-    if (!this._listeners[name]) return this;
-
-    // If no hander remove all the events
-    if (!handler) {
-      delete this._listeners[name];
-    } else {
-      this._listeners[name] = _.filter(this._listeners[name], function (listener) {
-        return handler !== listener.handler;
-      });
-    }
-
-    return this;
-  };
-
-  /**
-   * Emits the event to all listeners
-   *
-   * @param {string} name - The name of the event.
-   * @param {any} [value] - The value that will be passed to all event handlers.
-   * @returns {Promise}
-   */
-  Events.prototype.emit = function (name) {
-    const self = this;
-    const args = _.tail(arguments);
-
-    if (!self._listeners[name]) {
-      return self._emitChain;
-    }
-
-    return Promise.map(self._listeners[name], function (listener) {
-      return (self._emitChain = self._emitChain.then(function () {
-        // Double check that off wasn't called after an emit, but before this is fired.
-        if (!self._listeners[name] || self._listeners[name].indexOf(listener) < 0) return;
-
-        listener.defer.resolve(args);
-        return listener.resolved;
-      }));
-    });
-  };
-
-  /**
-   * Get a list of the handler functions for a specific event
-   *
-   * @param  {string} name
-   * @return {array[function]}
-   */
-  Events.prototype.listeners = function (name) {
-    return _.map(this._listeners[name], 'handler');
-  };
-
-  return Events;
-}
diff --git a/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap b/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap
deleted file mode 100644
index ad13256c8245ad..00000000000000
--- a/src/legacy/ui/public/exit_full_screen/__snapshots__/exit_full_screen_button.test.js.snap
+++ /dev/null
@@ -1,53 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`is rendered 1`] = `
-<div>
-  <p
-    aria-live="polite"
-    class="euiScreenReaderOnly"
-  >
-    In full screen mode, press ESC to exit.
-  </p>
-  <div>
-    <button
-      aria-label="Exit full screen mode"
-      class="dshExitFullScreenButton"
-      data-test-subj="exitFullScreenModeLogo"
-    >
-      <span
-        class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
-      >
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            data-euiicon-type="logoElastic"
-          />
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-          data-test-subj="exitFullScreenModeText"
-        >
-          <div>
-            <div
-              class="euiText euiText--small dshExitFullScreenButton__text"
-            >
-              <p>
-                Exit full screen
-              </p>
-            </div>
-          </div>
-        </div>
-        <div
-          class="euiFlexItem euiFlexItem--flexGrowZero"
-        >
-          <div
-            class="dshExitFullScreenButton__icon"
-            data-euiicon-type="fullScreen"
-          />
-        </div>
-      </span>
-    </button>
-  </div>
-</div>
-`;
diff --git a/src/legacy/ui/public/exit_full_screen/_index.scss b/src/legacy/ui/public/exit_full_screen/_index.scss
deleted file mode 100644
index 33dff05e2a6878..00000000000000
--- a/src/legacy/ui/public/exit_full_screen/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import '../../../../plugins/kibana_react/public/exit_full_screen_button/index';
diff --git a/src/legacy/ui/public/exit_full_screen/exit_full_screen_button.test.js b/src/legacy/ui/public/exit_full_screen/exit_full_screen_button.test.js
deleted file mode 100644
index d4273c0fdb207a..00000000000000
--- a/src/legacy/ui/public/exit_full_screen/exit_full_screen_button.test.js
+++ /dev/null
@@ -1,88 +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.
- */
-
-jest.mock(
-  'ui/chrome',
-  () => ({
-    getKibanaVersion: () => '6.0.0',
-    setVisible: () => {},
-  }),
-  { virtual: true }
-);
-
-import React from 'react';
-import { mountWithIntl, renderWithIntl } from 'test_utils/enzyme_helpers';
-import sinon from 'sinon';
-import chrome from 'ui/chrome';
-
-import { ExitFullScreenButton } from './exit_full_screen_button';
-
-import { keys } from '@elastic/eui';
-
-test('is rendered', () => {
-  const component = renderWithIntl(<ExitFullScreenButton onExitFullScreenMode={() => {}} />);
-
-  expect(component).toMatchSnapshot();
-});
-
-describe('onExitFullScreenMode', () => {
-  test('is called when the button is pressed', () => {
-    const onExitHandler = sinon.stub();
-
-    const component = mountWithIntl(<ExitFullScreenButton onExitFullScreenMode={onExitHandler} />);
-
-    component.find('button').simulate('click');
-
-    sinon.assert.calledOnce(onExitHandler);
-  });
-
-  test('is called when the ESC key is pressed', () => {
-    const onExitHandler = sinon.stub();
-
-    mountWithIntl(<ExitFullScreenButton onExitFullScreenMode={onExitHandler} />);
-
-    const escapeKeyEvent = new KeyboardEvent('keydown', { key: keys.ESCAPE });
-    document.dispatchEvent(escapeKeyEvent);
-
-    sinon.assert.calledOnce(onExitHandler);
-  });
-});
-
-describe('chrome.setVisible', () => {
-  test('is called with false when the component is rendered', () => {
-    chrome.setVisible = sinon.stub();
-
-    const component = mountWithIntl(<ExitFullScreenButton onExitFullScreenMode={() => {}} />);
-
-    component.find('button').simulate('click');
-
-    sinon.assert.calledOnce(chrome.setVisible);
-    sinon.assert.calledWith(chrome.setVisible, false);
-  });
-
-  test('is called with true the component is unmounted', () => {
-    const component = mountWithIntl(<ExitFullScreenButton onExitFullScreenMode={() => {}} />);
-
-    chrome.setVisible = sinon.stub();
-    component.unmount();
-
-    sinon.assert.calledOnce(chrome.setVisible);
-    sinon.assert.calledWith(chrome.setVisible, true);
-  });
-});
diff --git a/src/legacy/ui/public/exit_full_screen/exit_full_screen_button.tsx b/src/legacy/ui/public/exit_full_screen/exit_full_screen_button.tsx
deleted file mode 100644
index db4101010f6d67..00000000000000
--- a/src/legacy/ui/public/exit_full_screen/exit_full_screen_button.tsx
+++ /dev/null
@@ -1,45 +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, { PureComponent } from 'react';
-import chrome from 'ui/chrome';
-import { ExitFullScreenButton as ExitFullScreenButtonUi } from '../../../../plugins/kibana_react/public';
-
-/**
- * DO NOT USE THIS COMPONENT, IT IS DEPRECATED.
- * Use the one in `src/plugins/kibana_react`.
- */
-
-interface Props {
-  onExitFullScreenMode: () => void;
-}
-
-export class ExitFullScreenButton extends PureComponent<Props> {
-  public UNSAFE_componentWillMount() {
-    chrome.setVisible(false);
-  }
-
-  public componentWillUnmount() {
-    chrome.setVisible(true);
-  }
-
-  public render() {
-    return <ExitFullScreenButtonUi onExitFullScreenMode={this.props.onExitFullScreenMode} />;
-  }
-}
diff --git a/src/legacy/ui/public/exit_full_screen/index.ts b/src/legacy/ui/public/exit_full_screen/index.ts
deleted file mode 100644
index a965fd776e0c29..00000000000000
--- a/src/legacy/ui/public/exit_full_screen/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 { ExitFullScreenButton } from './exit_full_screen_button';
diff --git a/src/legacy/ui/public/flot-charts/API.md b/src/legacy/ui/public/flot-charts/API.md
deleted file mode 100644
index 699e2500f49420..00000000000000
--- a/src/legacy/ui/public/flot-charts/API.md
+++ /dev/null
@@ -1,1498 +0,0 @@
-# Flot Reference #
-
-**Table of Contents**
-
-[Introduction](#introduction)
-| [Data Format](#data-format)
-| [Plot Options](#plot-options)
-| [Customizing the legend](#customizing-the-legend)
-| [Customizing the axes](#customizing-the-axes)
-| [Multiple axes](#multiple-axes)
-| [Time series data](#time-series-data)
-| [Customizing the data series](#customizing-the-data-series)
-| [Customizing the grid](#customizing-the-grid)
-| [Specifying gradients](#specifying-gradients)
-| [Plot Methods](#plot-methods)
-| [Hooks](#hooks)
-| [Plugins](#plugins)
-| [Version number](#version-number)
-
----
-
-## Introduction ##
-
-Consider a call to the plot function:
-
-```js
-var plot = $.plot(placeholder, data, options)
-```
-
-The placeholder is a jQuery object or DOM element or jQuery expression
-that the plot will be put into. This placeholder needs to have its
-width and height set as explained in the [README](README.md) (go read that now if
-you haven't, it's short). The plot will modify some properties of the
-placeholder so it's recommended you simply pass in a div that you
-don't use for anything else. Make sure you check any fancy styling
-you apply to the div, e.g. background images have been reported to be a
-problem on IE 7.
-
-The plot function can also be used as a jQuery chainable property.  This form
-naturally can't return the plot object directly, but you can still access it
-via the 'plot' data key, like this:
-
-```js
-var plot = $("#placeholder").plot(data, options).data("plot");
-```
-
-The format of the data is documented below, as is the available
-options. The plot object returned from the call has some methods you
-can call. These are documented separately below.
-
-Note that in general Flot gives no guarantees if you change any of the
-objects you pass in to the plot function or get out of it since
-they're not necessarily deep-copied.
-
-
-## Data Format ##
-
-The data is an array of data series:
-
-```js
-[ series1, series2, ... ]
-```
-
-A series can either be raw data or an object with properties. The raw
-data format is an array of points:
-
-```js
-[ [x1, y1], [x2, y2], ... ]
-```
-
-E.g.
-
-```js
-[ [1, 3], [2, 14.01], [3.5, 3.14] ]
-```
-
-Note that to simplify the internal logic in Flot both the x and y
-values must be numbers (even if specifying time series, see below for
-how to do this). This is a common problem because you might retrieve
-data from the database and serialize them directly to JSON without
-noticing the wrong type. If you're getting mysterious errors, double
-check that you're inputting numbers and not strings.
-
-If a null is specified as a point or if one of the coordinates is null
-or couldn't be converted to a number, the point is ignored when
-drawing. As a special case, a null value for lines is interpreted as a
-line segment end, i.e. the points before and after the null value are
-not connected.
-
-Lines and points take two coordinates. For filled lines and bars, you
-can specify a third coordinate which is the bottom of the filled
-area/bar (defaults to 0).
-
-The format of a single series object is as follows:
-
-```js
-{
-    color: color or number
-    data: rawdata
-    label: string
-    lines: specific lines options
-    bars: specific bars options
-    points: specific points options
-    xaxis: number
-    yaxis: number
-    clickable: boolean
-    hoverable: boolean
-    shadowSize: number
-    highlightColor: color or number
-}
-```
-
-You don't have to specify any of them except the data, the rest are
-options that will get default values. Typically you'd only specify
-label and data, like this:
-
-```js
-{
-    label: "y = 3",
-    data: [[0, 3], [10, 3]]
-}
-```
-
-The label is used for the legend, if you don't specify one, the series
-will not show up in the legend.
-
-If you don't specify color, the series will get a color from the
-auto-generated colors. The color is either a CSS color specification
-(like "rgb(255, 100, 123)") or an integer that specifies which of
-auto-generated colors to select, e.g. 0 will get color no. 0, etc.
-
-The latter is mostly useful if you let the user add and remove series,
-in which case you can hard-code the color index to prevent the colors
-from jumping around between the series.
-
-The "xaxis" and "yaxis" options specify which axis to use. The axes
-are numbered from 1 (default), so { yaxis: 2} means that the series
-should be plotted against the second y axis.
-
-"clickable" and "hoverable" can be set to false to disable
-interactivity for specific series if interactivity is turned on in
-the plot, see below.
-
-The rest of the options are all documented below as they are the same
-as the default options passed in via the options parameter in the plot
-command. When you specify them for a specific data series, they will
-override the default options for the plot for that data series.
-
-Here's a complete example of a simple data specification:
-
-```js
-[ { label: "Foo", data: [ [10, 1], [17, -14], [30, 5] ] },
-  { label: "Bar", data: [ [11, 13], [19, 11], [30, -7] ] }
-]
-```
-
-
-## Plot Options ##
-
-All options are completely optional. They are documented individually
-below, to change them you just specify them in an object, e.g.
-
-```js
-var options = {
-    series: {
-        lines: { show: true },
-        points: { show: true }
-    }
-};
-	
-$.plot(placeholder, data, options);
-```
-
-
-## Customizing the legend ##
-
-```js
-legend: {
-    show: boolean
-    labelFormatter: null or (fn: string, series object -> string)
-    labelBoxBorderColor: color
-    noColumns: number
-    position: "ne" or "nw" or "se" or "sw"
-    margin: number of pixels or [x margin, y margin]
-    backgroundColor: null or color
-    backgroundOpacity: number between 0 and 1
-    container: null or jQuery object/DOM element/jQuery expression
-    sorted: null/false, true, "ascending", "descending", "reverse", or a comparator
-}
-```
-
-The legend is generated as a table with the data series labels and
-small label boxes with the color of the series. If you want to format
-the labels in some way, e.g. make them to links, you can pass in a
-function for "labelFormatter". Here's an example that makes them
-clickable:
-
-```js
-labelFormatter: function(label, series) {
-    // series is the series object for the label
-    return '<a href="#' + label + '">' + label + '</a>';
-}
-```
-
-To prevent a series from showing up in the legend, simply have the function
-return null.
-
-"noColumns" is the number of columns to divide the legend table into.
-"position" specifies the overall placement of the legend within the
-plot (top-right, top-left, etc.) and margin the distance to the plot
-edge (this can be either a number or an array of two numbers like [x,
-y]). "backgroundColor" and "backgroundOpacity" specifies the
-background. The default is a partly transparent auto-detected
-background.
-
-If you want the legend to appear somewhere else in the DOM, you can
-specify "container" as a jQuery object/expression to put the legend
-table into. The "position" and "margin" etc. options will then be
-ignored. Note that Flot will overwrite the contents of the container.
-
-Legend entries appear in the same order as their series by default. If "sorted"
-is "reverse" then they appear in the opposite order from their series. To sort
-them alphabetically, you can specify true, "ascending" or "descending", where
-true and "ascending" are equivalent.
-
-You can also provide your own comparator function that accepts two
-objects with "label" and "color" properties, and returns zero if they
-are equal, a positive value if the first is greater than the second,
-and a negative value if the first is less than the second.
-
-```js
-sorted: function(a, b) {
-    // sort alphabetically in ascending order
-    return a.label == b.label ? 0 : (
-        a.label > b.label ? 1 : -1
-    )
-}
-```
-
-
-## Customizing the axes ##
-
-```js
-xaxis, yaxis: {
-    show: null or true/false
-    position: "bottom" or "top" or "left" or "right"
-    mode: null or "time" ("time" requires jquery.flot.time.js plugin)
-    timezone: null, "browser" or timezone (only makes sense for mode: "time")
-
-    color: null or color spec
-    tickColor: null or color spec
-    font: null or font spec object
-
-    min: null or number
-    max: null or number
-    autoscaleMargin: null or number
-    
-    transform: null or fn: number -> number
-    inverseTransform: null or fn: number -> number
-    
-    ticks: null or number or ticks array or (fn: axis -> ticks array)
-    tickSize: number or array
-    minTickSize: number or array
-    tickFormatter: (fn: number, object -> string) or string
-    tickDecimals: null or number
-
-    labelWidth: null or number
-    labelHeight: null or number
-    reserveSpace: null or true
-    
-    tickLength: null or number
-
-    alignTicksWithAxis: null or number
-}
-```
-
-All axes have the same kind of options. The following describes how to
-configure one axis, see below for what to do if you've got more than
-one x axis or y axis.
-
-If you don't set the "show" option (i.e. it is null), visibility is
-auto-detected, i.e. the axis will show up if there's data associated
-with it. You can override this by setting the "show" option to true or
-false.
-
-The "position" option specifies where the axis is placed, bottom or
-top for x axes, left or right for y axes. The "mode" option determines
-how the data is interpreted, the default of null means as decimal
-numbers. Use "time" for time series data; see the time series data
-section. The time plugin (jquery.flot.time.js) is required for time
-series support.
-
-The "color" option determines the color of the line and ticks for the axis, and
-defaults to the grid color with transparency. For more fine-grained control you
-can also set the color of the ticks separately with "tickColor".
-
-You can customize the font and color used to draw the axis tick labels with CSS
-or directly via the "font" option. When "font" is null - the default - each
-tick label is given the 'flot-tick-label' class. For compatibility with Flot
-0.7 and earlier the labels are also given the 'tickLabel' class, but this is
-deprecated and scheduled to be removed with the release of version 1.0.0.
-
-To enable more granular control over styles, labels are divided between a set
-of text containers, with each holding the labels for one axis. These containers
-are given the classes 'flot-[x|y]-axis', and 'flot-[x|y]#-axis', where '#' is
-the number of the axis when there are multiple axes.  For example, the x-axis
-labels for a simple plot with only a single x-axis might look like this:
-
-```html
-<div class='flot-x-axis flot-x1-axis'>
-    <div class='flot-tick-label'>January 2013</div>
-    ...
-</div>
-```
-
-For direct control over label styles you can also provide "font" as an object
-with this format:
-
-```js
-{
-    size: 11,
-    lineHeight: 13,
-    style: "italic",
-    weight: "bold",
-    family: "sans-serif",
-    variant: "small-caps",
-    color: "#545454"
-}
-```
-
-The size and lineHeight must be expressed in pixels; CSS units such as 'em'
-or 'smaller' are not allowed.
-
-The options "min"/"max" are the precise minimum/maximum value on the
-scale. If you don't specify either of them, a value will automatically
-be chosen based on the minimum/maximum data values. Note that Flot
-always examines all the data values you feed to it, even if a
-restriction on another axis may make some of them invisible (this
-makes interactive use more stable).
-
-The "autoscaleMargin" is a bit esoteric: it's the fraction of margin
-that the scaling algorithm will add to avoid that the outermost points
-ends up on the grid border. Note that this margin is only applied when
-a min or max value is not explicitly set. If a margin is specified,
-the plot will furthermore extend the axis end-point to the nearest
-whole tick. The default value is "null" for the x axes and 0.02 for y
-axes which seems appropriate for most cases.
-
-"transform" and "inverseTransform" are callbacks you can put in to
-change the way the data is drawn. You can design a function to
-compress or expand certain parts of the axis non-linearly, e.g.
-suppress weekends or compress far away points with a logarithm or some
-other means. When Flot draws the plot, each value is first put through
-the transform function. Here's an example, the x axis can be turned
-into a natural logarithm axis with the following code:
-
-```js
-xaxis: {
-    transform: function (v) { return Math.log(v); },
-    inverseTransform: function (v) { return Math.exp(v); }
-}
-```
-
-Similarly, for reversing the y axis so the values appear in inverse
-order:
-
-```js
-yaxis: {
-    transform: function (v) { return -v; },
-    inverseTransform: function (v) { return -v; }
-}
-```
-
-Note that for finding extrema, Flot assumes that the transform
-function does not reorder values (it should be monotone).
-
-The inverseTransform is simply the inverse of the transform function
-(so v == inverseTransform(transform(v)) for all relevant v). It is
-required for converting from canvas coordinates to data coordinates,
-e.g. for a mouse interaction where a certain pixel is clicked. If you
-don't use any interactive features of Flot, you may not need it.
-
-
-The rest of the options deal with the ticks.
-
-If you don't specify any ticks, a tick generator algorithm will make
-some for you. The algorithm has two passes. It first estimates how
-many ticks would be reasonable and uses this number to compute a nice
-round tick interval size. Then it generates the ticks.
-
-You can specify how many ticks the algorithm aims for by setting
-"ticks" to a number. The algorithm always tries to generate reasonably
-round tick values so even if you ask for three ticks, you might get
-five if that fits better with the rounding. If you don't want any
-ticks at all, set "ticks" to 0 or an empty array.
-
-Another option is to skip the rounding part and directly set the tick
-interval size with "tickSize". If you set it to 2, you'll get ticks at
-2, 4, 6, etc. Alternatively, you can specify that you just don't want
-ticks at a size less than a specific tick size with "minTickSize".
-Note that for time series, the format is an array like [2, "month"],
-see the next section.
-
-If you want to completely override the tick algorithm, you can specify
-an array for "ticks", either like this:
-
-```js
-ticks: [0, 1.2, 2.4]
-```
-
-Or like this where the labels are also customized:
-
-```js
-ticks: [[0, "zero"], [1.2, "one mark"], [2.4, "two marks"]]
-```
-
-You can mix the two if you like.
-  
-For extra flexibility you can specify a function as the "ticks"
-parameter. The function will be called with an object with the axis
-min and max and should return a ticks array. Here's a simplistic tick
-generator that spits out intervals of pi, suitable for use on the x
-axis for trigonometric functions:
-
-```js
-function piTickGenerator(axis) {
-    var res = [], i = Math.floor(axis.min / Math.PI);
-    do {
-        var v = i * Math.PI;
-        res.push([v, i + "\u03c0"]);
-        ++i;
-    } while (v < axis.max);
-    return res;
-}
-```
-
-You can control how the ticks look like with "tickDecimals", the
-number of decimals to display (default is auto-detected).
-
-Alternatively, for ultimate control over how ticks are formatted you can
-provide a function to "tickFormatter". The function is passed two
-parameters, the tick value and an axis object with information, and
-should return a string. The default formatter looks like this:
-
-```js
-function formatter(val, axis) {
-    return val.toFixed(axis.tickDecimals);
-}
-```
-
-The axis object has "min" and "max" with the range of the axis,
-"tickDecimals" with the number of decimals to round the value to and
-"tickSize" with the size of the interval between ticks as calculated
-by the automatic axis scaling algorithm (or specified by you). Here's
-an example of a custom formatter:
-
-```js
-function suffixFormatter(val, axis) {
-    if (val > 1000000)
-        return (val / 1000000).toFixed(axis.tickDecimals) + " MB";
-    else if (val > 1000)
-        return (val / 1000).toFixed(axis.tickDecimals) + " kB";
-    else
-        return val.toFixed(axis.tickDecimals) + " B";
-}
-```
-
-"labelWidth" and "labelHeight" specifies a fixed size of the tick
-labels in pixels. They're useful in case you need to align several
-plots. "reserveSpace" means that even if an axis isn't shown, Flot
-should reserve space for it - it is useful in combination with
-labelWidth and labelHeight for aligning multi-axis charts.
-
-"tickLength" is the length of the tick lines in pixels. By default, the
-innermost axes will have ticks that extend all across the plot, while
-any extra axes use small ticks. A value of null means use the default,
-while a number means small ticks of that length - set it to 0 to hide
-the lines completely.
-
-If you set "alignTicksWithAxis" to the number of another axis, e.g.
-alignTicksWithAxis: 1, Flot will ensure that the autogenerated ticks
-of this axis are aligned with the ticks of the other axis. This may
-improve the looks, e.g. if you have one y axis to the left and one to
-the right, because the grid lines will then match the ticks in both
-ends. The trade-off is that the forced ticks won't necessarily be at
-natural places.
-
-
-## Multiple axes ##
-
-If you need more than one x axis or y axis, you need to specify for
-each data series which axis they are to use, as described under the
-format of the data series, e.g. { data: [...], yaxis: 2 } specifies
-that a series should be plotted against the second y axis.
-
-To actually configure that axis, you can't use the xaxis/yaxis options
-directly - instead there are two arrays in the options:
-
-```js
-xaxes: []
-yaxes: []
-```
-
-Here's an example of configuring a single x axis and two y axes (we
-can leave options of the first y axis empty as the defaults are fine):
-
-```js
-{
-    xaxes: [ { position: "top" } ],
-    yaxes: [ { }, { position: "right", min: 20 } ]
-}
-```
-
-The arrays get their default values from the xaxis/yaxis settings, so
-say you want to have all y axes start at zero, you can simply specify
-yaxis: { min: 0 } instead of adding a min parameter to all the axes.
-
-Generally, the various interfaces in Flot dealing with data points
-either accept an xaxis/yaxis parameter to specify which axis number to
-use (starting from 1), or lets you specify the coordinate directly as
-x2/x3/... or x2axis/x3axis/... instead of "x" or "xaxis".
-
-
-## Time series data ##
-
-Please note that it is now required to include the time plugin,
-jquery.flot.time.js, for time series support.
-
-Time series are a bit more difficult than scalar data because
-calendars don't follow a simple base 10 system. For many cases, Flot
-abstracts most of this away, but it can still be a bit difficult to
-get the data into Flot. So we'll first discuss the data format.
-
-The time series support in Flot is based on JavaScript timestamps,
-i.e. everywhere a time value is expected or handed over, a JavaScript
-timestamp number is used. This is a number, not a Date object. A
-JavaScript timestamp is the number of milliseconds since January 1,
-1970 00:00:00 UTC. This is almost the same as Unix timestamps, except it's
-in milliseconds, so remember to multiply by 1000!
-
-You can see a timestamp like this
-
-```js
-alert((new Date()).getTime())
-```
-
-There are different schools of thought when it comes to display of
-timestamps. Many will want the timestamps to be displayed according to
-a certain time zone, usually the time zone in which the data has been
-produced. Some want the localized experience, where the timestamps are
-displayed according to the local time of the visitor. Flot supports
-both. Optionally you can include a third-party library to get
-additional timezone support.
-
-Default behavior is that Flot always displays timestamps according to
-UTC. The reason being that the core JavaScript Date object does not
-support other fixed time zones. Often your data is at another time
-zone, so it may take a little bit of tweaking to work around this
-limitation.
-
-The easiest way to think about it is to pretend that the data
-production time zone is UTC, even if it isn't. So if you have a
-datapoint at 2002-02-20 08:00, you can generate a timestamp for eight
-o'clock UTC even if it really happened eight o'clock UTC+0200.
-
-In PHP you can get an appropriate timestamp with:
-
-```php
-strtotime("2002-02-20 UTC") * 1000
-```
-
-In Python you can get it with something like:
-
-```python
-calendar.timegm(datetime_object.timetuple()) * 1000
-```
-In Ruby you can get it using the `#to_i` method on the
-[`Time`](http://apidock.com/ruby/Time/to_i) object. If you're using the
-`active_support` gem (default for Ruby on Rails applications) `#to_i` is also
-available on the `DateTime` and `ActiveSupport::TimeWithZone` objects. You
-simply need to multiply the result by 1000:
-
-```ruby
-Time.now.to_i * 1000     # => 1383582043000
-# ActiveSupport examples:
-DateTime.now.to_i * 1000 # => 1383582043000
-ActiveSupport::TimeZone.new('Asia/Shanghai').now.to_i * 1000
-# => 1383582043000
-```
-
-In .NET you can get it with something like:
-
-```aspx
-public static int GetJavaScriptTimestamp(System.DateTime input)
-{
-    System.TimeSpan span = new System.TimeSpan(System.DateTime.Parse("1/1/1970").Ticks);
-    System.DateTime time = input.Subtract(span);
-    return (long)(time.Ticks / 10000);
-}
-```
-
-JavaScript also has some support for parsing date strings, so it is
-possible to generate the timestamps manually client-side.
-
-If you've already got the real UTC timestamp, it's too late to use the
-pretend trick described above. But you can fix up the timestamps by
-adding the time zone offset, e.g. for UTC+0200 you would add 2 hours
-to the UTC timestamp you got. Then it'll look right on the plot. Most
-programming environments have some means of getting the timezone
-offset for a specific date (note that you need to get the offset for
-each individual timestamp to account for daylight savings).
-
-The alternative with core JavaScript is to interpret the timestamps
-according to the time zone that the visitor is in, which means that
-the ticks will shift with the time zone and daylight savings of each
-visitor. This behavior is enabled by setting the axis option
-"timezone" to the value "browser".
-
-If you need more time zone functionality than this, there is still
-another option. If you include the "timezone-js" library
-<https://github.com/mde/timezone-js> in the page and set axis.timezone
-to a value recognized by said library, Flot will use timezone-js to
-interpret the timestamps according to that time zone.
-
-Once you've gotten the timestamps into the data and specified "time"
-as the axis mode, Flot will automatically generate relevant ticks and
-format them. As always, you can tweak the ticks via the "ticks" option
-- just remember that the values should be timestamps (numbers), not
-Date objects.
-
-Tick generation and formatting can also be controlled separately
-through the following axis options:
-
-```js
-minTickSize: array
-timeformat: null or format string
-monthNames: null or array of size 12 of strings
-dayNames: null or array of size 7 of strings
-twelveHourClock: boolean
-```
-
-Here "timeformat" is a format string to use. You might use it like
-this:
-
-```js
-xaxis: {
-    mode: "time",
-    timeformat: "%Y/%m/%d"
-}
-```
-
-This will result in tick labels like "2000/12/24". A subset of the
-standard strftime specifiers are supported (plus the nonstandard %q):
-
-```js
-%a: weekday name (customizable)
-%b: month name (customizable)
-%d: day of month, zero-padded (01-31)
-%e: day of month, space-padded ( 1-31)
-%H: hours, 24-hour time, zero-padded (00-23)
-%I: hours, 12-hour time, zero-padded (01-12)
-%m: month, zero-padded (01-12)
-%M: minutes, zero-padded (00-59)
-%q: quarter (1-4)
-%S: seconds, zero-padded (00-59)
-%y: year (two digits)
-%Y: year (four digits)
-%p: am/pm
-%P: AM/PM (uppercase version of %p)
-%w: weekday as number (0-6, 0 being Sunday)
-```
-
-Flot 0.8 switched from %h to the standard %H hours specifier. The %h specifier
-is still available, for backwards-compatibility, but is deprecated and
-scheduled to be removed permanently with the release of version 1.0.
-
-You can customize the month names with the "monthNames" option. For
-instance, for Danish you might specify:
-
-```js
-monthNames: ["jan", "feb", "mar", "apr", "maj", "jun", "jul", "aug", "sep", "okt", "nov", "dec"]
-```
-
-Similarly you can customize the weekday names with the "dayNames"
-option. An example in French:
-
-```js
-dayNames: ["dim", "lun", "mar", "mer", "jeu", "ven", "sam"]
-```
-
-If you set "twelveHourClock" to true, the autogenerated timestamps
-will use 12 hour AM/PM timestamps instead of 24 hour. This only
-applies if you have not set "timeformat". Use the "%I" and "%p" or
-"%P" options if you want to build your own format string with 12-hour
-times.
-
-If the Date object has a strftime property (and it is a function), it
-will be used instead of the built-in formatter. Thus you can include
-a strftime library such as http://hacks.bluesmoon.info/strftime/ for
-more powerful date/time formatting.
-
-If everything else fails, you can control the formatting by specifying
-a custom tick formatter function as usual. Here's a simple example
-which will format December 24 as 24/12:
-
-```js
-tickFormatter: function (val, axis) {
-    var d = new Date(val);
-    return d.getUTCDate() + "/" + (d.getUTCMonth() + 1);
-}
-```
-
-Note that for the time mode "tickSize" and "minTickSize" are a bit
-special in that they are arrays on the form "[value, unit]" where unit
-is one of "second", "minute", "hour", "day", "month" and "year". So
-you can specify
-
-```js
-minTickSize: [1, "month"]
-```
-
-to get a tick interval size of at least 1 month and correspondingly,
-if axis.tickSize is [2, "day"] in the tick formatter, the ticks have
-been produced with two days in-between.
-
-
-## Customizing the data series ##
-
-```js
-series: {
-    lines, points, bars: {
-        show: boolean
-        lineWidth: number
-        fill: boolean or number
-        fillColor: null or color/gradient
-    }
-
-    lines, bars: {
-        zero: boolean
-    }
-
-    points: {
-        radius: number
-        symbol: "circle" or function
-    }
-
-    bars: {
-        barWidth: number
-        align: "left", "right" or "center"
-        horizontal: boolean
-    }
-
-    lines: {
-        steps: boolean
-    }
-
-    shadowSize: number
-    highlightColor: color or number
-}
-
-colors: [ color1, color2, ... ]
-```
-
-The options inside "series: {}" are copied to each of the series. So
-you can specify that all series should have bars by putting it in the
-global options, or override it for individual series by specifying
-bars in a particular the series object in the array of data.
-  
-The most important options are "lines", "points" and "bars" that
-specify whether and how lines, points and bars should be shown for
-each data series. In case you don't specify anything at all, Flot will
-default to showing lines (you can turn this off with
-lines: { show: false }). You can specify the various types
-independently of each other, and Flot will happily draw each of them
-in turn (this is probably only useful for lines and points), e.g.
-
-```js
-var options = {
-    series: {
-        lines: { show: true, fill: true, fillColor: "rgba(255, 255, 255, 0.8)" },
-        points: { show: true, fill: false }
-    }
-};
-```
-
-"lineWidth" is the thickness of the line or outline in pixels. You can
-set it to 0 to prevent a line or outline from being drawn; this will
-also hide the shadow.
-
-"fill" is whether the shape should be filled. For lines, this produces
-area graphs. You can use "fillColor" to specify the color of the fill.
-If "fillColor" evaluates to false (default for everything except
-points which are filled with white), the fill color is auto-set to the
-color of the data series. You can adjust the opacity of the fill by
-setting fill to a number between 0 (fully transparent) and 1 (fully
-opaque).
-
-For bars, fillColor can be a gradient, see the gradient documentation
-below. "barWidth" is the width of the bars in units of the x axis (or
-the y axis if "horizontal" is true), contrary to most other measures
-that are specified in pixels. For instance, for time series the unit
-is milliseconds so 24 * 60 * 60 * 1000 produces bars with the width of
-a day. "align" specifies whether a bar should be left-aligned
-(default), right-aligned or centered on top of the value it represents. 
-When "horizontal" is on, the bars are drawn horizontally, i.e. from the 
-y axis instead of the x axis; note that the bar end points are still
-defined in the same way so you'll probably want to swap the
-coordinates if you've been plotting vertical bars first.
-
-Area and bar charts normally start from zero, regardless of the data's range.
-This is because they convey information through size, and starting from a
-different value would distort their meaning. In cases where the fill is purely
-for decorative purposes, however, "zero" allows you to override this behavior.
-It defaults to true for filled lines and bars; setting it to false tells the
-series to use the same automatic scaling as an un-filled line.
-
-For lines, "steps" specifies whether two adjacent data points are
-connected with a straight (possibly diagonal) line or with first a
-horizontal and then a vertical line. Note that this transforms the
-data by adding extra points.
-
-For points, you can specify the radius and the symbol. The only
-built-in symbol type is circles, for other types you can use a plugin
-or define them yourself by specifying a callback:
-
-```js
-function cross(ctx, x, y, radius, shadow) {
-    var size = radius * Math.sqrt(Math.PI) / 2;
-    ctx.moveTo(x - size, y - size);
-    ctx.lineTo(x + size, y + size);
-    ctx.moveTo(x - size, y + size);
-    ctx.lineTo(x + size, y - size);
-}
-```
-
-The parameters are the drawing context, x and y coordinates of the
-center of the point, a radius which corresponds to what the circle
-would have used and whether the call is to draw a shadow (due to
-limited canvas support, shadows are currently faked through extra
-draws). It's good practice to ensure that the area covered by the
-symbol is the same as for the circle with the given radius, this
-ensures that all symbols have approximately the same visual weight.
-
-"shadowSize" is the default size of shadows in pixels. Set it to 0 to
-remove shadows.
-
-"highlightColor" is the default color of the translucent overlay used
-to highlight the series when the mouse hovers over it.
-
-The "colors" array specifies a default color theme to get colors for
-the data series from. You can specify as many colors as you like, like
-this:
-
-```js
-colors: ["#d18b2c", "#dba255", "#919733"]
-```
-
-If there are more data series than colors, Flot will try to generate
-extra colors by lightening and darkening colors in the theme.
-
-
-## Customizing the grid ##
-
-```js
-grid: {
-    show: boolean
-    aboveData: boolean
-    color: color
-    backgroundColor: color/gradient or null
-    margin: number or margin object
-    labelMargin: number
-    axisMargin: number
-    markings: array of markings or (fn: axes -> array of markings)
-    borderWidth: number or object with "top", "right", "bottom" and "left" properties with different widths
-    borderColor: color or null or object with "top", "right", "bottom" and "left" properties with different colors
-    minBorderMargin: number or null
-    clickable: boolean
-    hoverable: boolean
-    autoHighlight: boolean
-    mouseActiveRadius: number
-}
-
-interaction: {
-    redrawOverlayInterval: number or -1
-}
-```
-
-The grid is the thing with the axes and a number of ticks. Many of the
-things in the grid are configured under the individual axes, but not
-all. "color" is the color of the grid itself whereas "backgroundColor"
-specifies the background color inside the grid area, here null means
-that the background is transparent. You can also set a gradient, see
-the gradient documentation below.
-
-You can turn off the whole grid including tick labels by setting
-"show" to false. "aboveData" determines whether the grid is drawn
-above the data or below (below is default).
-
-"margin" is the space in pixels between the canvas edge and the grid,
-which can be either a number or an object with individual margins for
-each side, in the form:
-
-```js
-margin: {
-    top: top margin in pixels
-    left: left margin in pixels
-    bottom: bottom margin in pixels
-    right: right margin in pixels
-}
-```
-
-"labelMargin" is the space in pixels between tick labels and axis
-line, and "axisMargin" is the space in pixels between axes when there
-are two next to each other.
-
-"borderWidth" is the width of the border around the plot. Set it to 0
-to disable the border. Set it to an object with "top", "right",
-"bottom" and "left" properties to use different widths. You can
-also set "borderColor" if you want the border to have a different color
-than the grid lines. Set it to an object with "top", "right", "bottom"
-and "left" properties to use different colors. "minBorderMargin" controls
-the default minimum margin around the border - it's used to make sure
-that points aren't accidentally clipped by the canvas edge so by default
-the value is computed from the point radius.
-
-"markings" is used to draw simple lines and rectangular areas in the
-background of the plot. You can either specify an array of ranges on
-the form { xaxis: { from, to }, yaxis: { from, to } } (with multiple
-axes, you can specify coordinates for other axes instead, e.g. as
-x2axis/x3axis/...) or with a function that returns such an array given
-the axes for the plot in an object as the first parameter.
-
-You can set the color of markings by specifying "color" in the ranges
-object. Here's an example array:
-
-```js
-markings: [ { xaxis: { from: 0, to: 2 }, yaxis: { from: 10, to: 10 }, color: "#bb0000" }, ... ]
-```
-
-If you leave out one of the values, that value is assumed to go to the
-border of the plot. So for example if you only specify { xaxis: {
-from: 0, to: 2 } } it means an area that extends from the top to the
-bottom of the plot in the x range 0-2.
-
-A line is drawn if from and to are the same, e.g.
-
-```js
-markings: [ { yaxis: { from: 1, to: 1 } }, ... ]
-```
-
-would draw a line parallel to the x axis at y = 1. You can control the
-line width with "lineWidth" in the range object.
-
-An example function that makes vertical stripes might look like this:
-
-```js
-markings: function (axes) {
-    var markings = [];
-    for (var x = Math.floor(axes.xaxis.min); x < axes.xaxis.max; x += 2)
-        markings.push({ xaxis: { from: x, to: x + 1 } });
-    return markings;
-}
-```
-
-If you set "clickable" to true, the plot will listen for click events
-on the plot area and fire a "plotclick" event on the placeholder with
-a position and a nearby data item object as parameters. The coordinates
-are available both in the unit of the axes (not in pixels) and in
-global screen coordinates.
-
-Likewise, if you set "hoverable" to true, the plot will listen for
-mouse move events on the plot area and fire a "plothover" event with
-the same parameters as the "plotclick" event. If "autoHighlight" is
-true (the default), nearby data items are highlighted automatically.
-If needed, you can disable highlighting and control it yourself with
-the highlight/unhighlight plot methods described elsewhere.
-
-You can use "plotclick" and "plothover" events like this:
-
-```js
-$.plot($("#placeholder"), [ d ], { grid: { clickable: true } });
-
-$("#placeholder").bind("plotclick", function (event, pos, item) {
-    alert("You clicked at " + pos.x + ", " + pos.y);
-    // axis coordinates for other axes, if present, are in pos.x2, pos.x3, ...
-    // if you need global screen coordinates, they are pos.pageX, pos.pageY
-
-    if (item) {
-        highlight(item.series, item.datapoint);
-        alert("You clicked a point!");
-    }
-});
-```
-
-The item object in this example is either null or a nearby object on the form:
-
-```js
-item: {
-    datapoint: the point, e.g. [0, 2]
-    dataIndex: the index of the point in the data array
-    series: the series object
-    seriesIndex: the index of the series
-    pageX, pageY: the global screen coordinates of the point
-}
-```
-
-For instance, if you have specified the data like this 
-
-```js
-$.plot($("#placeholder"), [ { label: "Foo", data: [[0, 10], [7, 3]] } ], ...);
-```
-
-and the mouse is near the point (7, 3), "datapoint" is [7, 3],
-"dataIndex" will be 1, "series" is a normalized series object with
-among other things the "Foo" label in series.label and the color in
-series.color, and "seriesIndex" is 0. Note that plugins and options
-that transform the data can shift the indexes from what you specified
-in the original data array.
-
-If you use the above events to update some other information and want
-to clear out that info in case the mouse goes away, you'll probably
-also need to listen to "mouseout" events on the placeholder div.
-
-"mouseActiveRadius" specifies how far the mouse can be from an item
-and still activate it. If there are two or more points within this
-radius, Flot chooses the closest item. For bars, the top-most bar
-(from the latest specified data series) is chosen.
-
-If you want to disable interactivity for a specific data series, you
-can set "hoverable" and "clickable" to false in the options for that
-series, like this:
-
-```js
-{ data: [...], label: "Foo", clickable: false }
-```
-
-"redrawOverlayInterval" specifies the maximum time to delay a redraw
-of interactive things (this works as a rate limiting device). The
-default is capped to 60 frames per second. You can set it to -1 to
-disable the rate limiting.
-
-
-## Specifying gradients ##
-
-A gradient is specified like this:
-
-```js
-{ colors: [ color1, color2, ... ] }
-```
-
-For instance, you might specify a background on the grid going from
-black to gray like this:
-
-```js
-grid: {
-    backgroundColor: { colors: ["#000", "#999"] }
-}
-```
-
-For the series you can specify the gradient as an object that
-specifies the scaling of the brightness and the opacity of the series
-color, e.g.
-
-```js
-{ colors: [{ opacity: 0.8 }, { brightness: 0.6, opacity: 0.8 } ] }
-```
-
-where the first color simply has its alpha scaled, whereas the second
-is also darkened. For instance, for bars the following makes the bars
-gradually disappear, without outline:
-
-```js
-bars: {
-    show: true,
-    lineWidth: 0,
-    fill: true,
-    fillColor: { colors: [ { opacity: 0.8 }, { opacity: 0.1 } ] }
-}
-```
-
-Flot currently only supports vertical gradients drawn from top to
-bottom because that's what works with IE.
-
-
-## Plot Methods ##
-
-The Plot object returned from the plot function has some methods you
-can call:
-
- - highlight(series, datapoint)
-
-    Highlight a specific datapoint in the data series. You can either
-    specify the actual objects, e.g. if you got them from a
-    "plotclick" event, or you can specify the indices, e.g.
-    highlight(1, 3) to highlight the fourth point in the second series
-    (remember, zero-based indexing).
-
- - unhighlight(series, datapoint) or unhighlight()
-
-    Remove the highlighting of the point, same parameters as
-    highlight.
-
-    If you call unhighlight with no parameters, e.g. as
-    plot.unhighlight(), all current highlights are removed.
-
- - setData(data)
-
-    You can use this to reset the data used. Note that axis scaling,
-    ticks, legend etc. will not be recomputed (use setupGrid() to do
-    that). You'll probably want to call draw() afterwards.
-
-    You can use this function to speed up redrawing a small plot if
-    you know that the axes won't change. Put in the new data with
-    setData(newdata), call draw(), and you're good to go. Note that
-    for large datasets, almost all the time is consumed in draw()
-    plotting the data so in this case don't bother.
-
- - setupGrid()
-
-    Recalculate and set axis scaling, ticks, legend etc.
-
-    Note that because of the drawing model of the canvas, this
-    function will immediately redraw (actually reinsert in the DOM)
-    the labels and the legend, but not the actual tick lines because
-    they're drawn on the canvas. You need to call draw() to get the
-    canvas redrawn.
-
- - draw()
-
-    Redraws the plot canvas.
-
- - triggerRedrawOverlay()
-
-    Schedules an update of an overlay canvas used for drawing
-    interactive things like a selection and point highlights. This
-    is mostly useful for writing plugins. The redraw doesn't happen
-    immediately, instead a timer is set to catch multiple successive
-    redraws (e.g. from a mousemove). You can get to the overlay by
-    setting up a drawOverlay hook.
-
- - width()/height()
-
-    Gets the width and height of the plotting area inside the grid.
-    This is smaller than the canvas or placeholder dimensions as some
-    extra space is needed (e.g. for labels).
-
- - offset()
-
-    Returns the offset of the plotting area inside the grid relative
-    to the document, useful for instance for calculating mouse
-    positions (event.pageX/Y minus this offset is the pixel position
-    inside the plot).
-
- - pointOffset({ x: xpos, y: ypos })
-
-    Returns the calculated offset of the data point at (x, y) in data
-    space within the placeholder div. If you are working with multiple
-    axes, you can specify the x and y axis references, e.g. 
-
-    ```js
-      o = pointOffset({ x: xpos, y: ypos, xaxis: 2, yaxis: 3 })
-      // o.left and o.top now contains the offset within the div
-    ````
-
- - resize()
-
-    Tells Flot to resize the drawing canvas to the size of the
-    placeholder. You need to run setupGrid() and draw() afterwards as
-    canvas resizing is a destructive operation. This is used
-    internally by the resize plugin.
-
- - shutdown()
-
-    Cleans up any event handlers Flot has currently registered. This
-    is used internally.
-
-There are also some members that let you peek inside the internal
-workings of Flot which is useful in some cases. Note that if you change
-something in the objects returned, you're changing the objects used by
-Flot to keep track of its state, so be careful.
-
-  - getData()
-
-    Returns an array of the data series currently used in normalized
-    form with missing settings filled in according to the global
-    options. So for instance to find out what color Flot has assigned
-    to the data series, you could do this:
-
-    ```js
-    var series = plot.getData();
-    for (var i = 0; i < series.length; ++i)
-        alert(series[i].color);
-    ```
-
-    A notable other interesting field besides color is datapoints
-    which has a field "points" with the normalized data points in a
-    flat array (the field "pointsize" is the increment in the flat
-    array to get to the next point so for a dataset consisting only of
-    (x,y) pairs it would be 2).
-
-  - getAxes()
-
-    Gets an object with the axes. The axes are returned as the
-    attributes of the object, so for instance getAxes().xaxis is the
-    x axis.
-
-    Various things are stuffed inside an axis object, e.g. you could
-    use getAxes().xaxis.ticks to find out what the ticks are for the
-    xaxis. Two other useful attributes are p2c and c2p, functions for
-    transforming from data point space to the canvas plot space and
-    back. Both returns values that are offset with the plot offset.
-    Check the Flot source code for the complete set of attributes (or
-    output an axis with console.log() and inspect it).
-
-    With multiple axes, the extra axes are returned as x2axis, x3axis,
-    etc., e.g. getAxes().y2axis is the second y axis. You can check
-    y2axis.used to see whether the axis is associated with any data
-    points and y2axis.show to see if it is currently shown. 
- 
-  - getPlaceholder()
-
-    Returns placeholder that the plot was put into. This can be useful
-    for plugins for adding DOM elements or firing events.
-
-  - getCanvas()
-
-    Returns the canvas used for drawing in case you need to hack on it
-    yourself. You'll probably need to get the plot offset too.
-  
-  - getPlotOffset()
-
-    Gets the offset that the grid has within the canvas as an object
-    with distances from the canvas edges as "left", "right", "top",
-    "bottom". I.e., if you draw a circle on the canvas with the center
-    placed at (left, top), its center will be at the top-most, left
-    corner of the grid.
-
-  - getOptions()
-
-    Gets the options for the plot, normalized, with default values
-    filled in. You get a reference to actual values used by Flot, so
-    if you modify the values in here, Flot will use the new values.
-    If you change something, you probably have to call draw() or
-    setupGrid() or triggerRedrawOverlay() to see the change.
-    
-
-## Hooks ##
-
-In addition to the public methods, the Plot object also has some hooks
-that can be used to modify the plotting process. You can install a
-callback function at various points in the process, the function then
-gets access to the internal data structures in Flot.
-
-Here's an overview of the phases Flot goes through:
-
-  1. Plugin initialization, parsing options
-  
-  2. Constructing the canvases used for drawing
-
-  3. Set data: parsing data specification, calculating colors,
-     copying raw data points into internal format,
-     normalizing them, finding max/min for axis auto-scaling
-
-  4. Grid setup: calculating axis spacing, ticks, inserting tick
-     labels, the legend
-
-  5. Draw: drawing the grid, drawing each of the series in turn
-
-  6. Setting up event handling for interactive features
-
-  7. Responding to events, if any
-
-  8. Shutdown: this mostly happens in case a plot is overwritten 
-
-Each hook is simply a function which is put in the appropriate array.
-You can add them through the "hooks" option, and they are also available
-after the plot is constructed as the "hooks" attribute on the returned
-plot object, e.g.
-
-```js
-  // define a simple draw hook
-  function hellohook(plot, canvascontext) { alert("hello!"); };
-
-  // pass it in, in an array since we might want to specify several
-  var plot = $.plot(placeholder, data, { hooks: { draw: [hellohook] } });
-
-  // we can now find it again in plot.hooks.draw[0] unless a plugin
-  // has added other hooks
-```
-
-The available hooks are described below. All hook callbacks get the
-plot object as first parameter. You can find some examples of defined
-hooks in the plugins bundled with Flot.
-
- - processOptions  [phase 1]
-
-    ```function(plot, options)```
-   
-    Called after Flot has parsed and merged options. Useful in the
-    instance where customizations beyond simple merging of default
-    values is needed. A plugin might use it to detect that it has been
-    enabled and then turn on or off other options.
-
- 
- - processRawData  [phase 3]
-
-    ```function(plot, series, data, datapoints)```
- 
-    Called before Flot copies and normalizes the raw data for the given
-    series. If the function fills in datapoints.points with normalized
-    points and sets datapoints.pointsize to the size of the points,
-    Flot will skip the copying/normalization step for this series.
-   
-    In any case, you might be interested in setting datapoints.format,
-    an array of objects for specifying how a point is normalized and
-    how it interferes with axis scaling. It accepts the following options:
-
-    ```js
-    {
-        x, y: boolean,
-        number: boolean,
-        required: boolean,
-        defaultValue: value,
-        autoscale: boolean
-    }
-    ```
-
-    "x" and "y" specify whether the value is plotted against the x or y axis,
-    and is currently used only to calculate axis min-max ranges. The default
-    format array, for example, looks like this:
-
-    ```js
-    [
-        { x: true, number: true, required: true },
-        { y: true, number: true, required: true }
-    ]
-    ```
-
-    This indicates that a point, i.e. [0, 25], consists of two values, with the
-    first being plotted on the x axis and the second on the y axis.
-
-    If "number" is true, then the value must be numeric, and is set to null if
-    it cannot be converted to a number.
-
-    "defaultValue" provides a fallback in case the original value is null. This
-    is for instance handy for bars, where one can omit the third coordinate
-    (the bottom of the bar), which then defaults to zero.
-
-    If "required" is true, then the value must exist (be non-null) for the
-    point as a whole to be valid. If no value is provided, then the entire
-    point is cleared out with nulls, turning it into a gap in the series.
-
-    "autoscale" determines whether the value is considered when calculating an
-    automatic min-max range for the axes that the value is plotted against.
-
- - processDatapoints  [phase 3]
-
-    ```function(plot, series, datapoints)```
-
-    Called after normalization of the given series but before finding
-    min/max of the data points. This hook is useful for implementing data
-    transformations. "datapoints" contains the normalized data points in
-    a flat array as datapoints.points with the size of a single point
-    given in datapoints.pointsize. Here's a simple transform that
-    multiplies all y coordinates by 2:
-
-    ```js
-    function multiply(plot, series, datapoints) {
-        var points = datapoints.points, ps = datapoints.pointsize;
-        for (var i = 0; i < points.length; i += ps)
-            points[i + 1] *= 2;
-    }
-    ```
-
-    Note that you must leave datapoints in a good condition as Flot
-    doesn't check it or do any normalization on it afterwards.
-
- - processOffset  [phase 4]
-
-    ```function(plot, offset)```
-
-    Called after Flot has initialized the plot's offset, but before it
-    draws any axes or plot elements. This hook is useful for customizing
-    the margins between the grid and the edge of the canvas. "offset" is
-    an object with attributes "top", "bottom", "left" and "right",
-    corresponding to the margins on the four sides of the plot.
-
- - drawBackground [phase 5]
-
-    ```function(plot, canvascontext)```
-
-    Called before all other drawing operations. Used to draw backgrounds
-    or other custom elements before the plot or axes have been drawn.
-
- - drawSeries  [phase 5]
-
-    ```function(plot, canvascontext, series)```
-
-    Hook for custom drawing of a single series. Called just before the
-    standard drawing routine has been called in the loop that draws
-    each series.
-
- - draw  [phase 5]
-
-    ```function(plot, canvascontext)```
-
-    Hook for drawing on the canvas. Called after the grid is drawn
-    (unless it's disabled or grid.aboveData is set) and the series have
-    been plotted (in case any points, lines or bars have been turned
-    on). For examples of how to draw things, look at the source code.
-
- - bindEvents  [phase 6]
-
-    ```function(plot, eventHolder)```
-
-    Called after Flot has setup its event handlers. Should set any
-    necessary event handlers on eventHolder, a jQuery object with the
-    canvas, e.g.
-
-    ```js
-    function (plot, eventHolder) {
-        eventHolder.mousedown(function (e) {
-            alert("You pressed the mouse at " + e.pageX + " " + e.pageY);
-        });
-    }
-    ```
-
-    Interesting events include click, mousemove, mouseup/down. You can
-    use all jQuery events. Usually, the event handlers will update the
-    state by drawing something (add a drawOverlay hook and call
-    triggerRedrawOverlay) or firing an externally visible event for
-    user code. See the crosshair plugin for an example.
-     
-    Currently, eventHolder actually contains both the static canvas
-    used for the plot itself and the overlay canvas used for
-    interactive features because some versions of IE get the stacking
-    order wrong. The hook only gets one event, though (either for the
-    overlay or for the static canvas).
-
-    Note that custom plot events generated by Flot are not generated on
-    eventHolder, but on the div placeholder supplied as the first
-    argument to the plot call. You can get that with
-    plot.getPlaceholder() - that's probably also the one you should use
-    if you need to fire a custom event.
-
- - drawOverlay  [phase 7]
-
-    ```function (plot, canvascontext)```
-
-    The drawOverlay hook is used for interactive things that need a
-    canvas to draw on. The model currently used by Flot works the way
-    that an extra overlay canvas is positioned on top of the static
-    canvas. This overlay is cleared and then completely redrawn
-    whenever something interesting happens. This hook is called when
-    the overlay canvas is to be redrawn.
-
-    "canvascontext" is the 2D context of the overlay canvas. You can
-    use this to draw things. You'll most likely need some of the
-    metrics computed by Flot, e.g. plot.width()/plot.height(). See the
-    crosshair plugin for an example.
-
- - shutdown  [phase 8]
-
-    ```function (plot, eventHolder)```
-
-    Run when plot.shutdown() is called, which usually only happens in
-    case a plot is overwritten by a new plot. If you're writing a
-    plugin that adds extra DOM elements or event handlers, you should
-    add a callback to clean up after you. Take a look at the section in
-    the [PLUGINS](PLUGINS.md) document for more info.
-
-   
-## Plugins ##
-
-Plugins extend the functionality of Flot. To use a plugin, simply
-include its JavaScript file after Flot in the HTML page.
-
-If you're worried about download size/latency, you can concatenate all
-the plugins you use, and Flot itself for that matter, into one big file
-(make sure you get the order right), then optionally run it through a
-JavaScript minifier such as YUI Compressor.
-
-Here's a brief explanation of how the plugin plumbings work:
-
-Each plugin registers itself in the global array $.plot.plugins. When
-you make a new plot object with $.plot, Flot goes through this array
-calling the "init" function of each plugin and merging default options
-from the "option" attribute of the plugin. The init function gets a
-reference to the plot object created and uses this to register hooks
-and add new public methods if needed.
-
-See the [PLUGINS](PLUGINS.md) document for details on how to write a plugin. As the
-above description hints, it's actually pretty easy.
-
-
-## Version number ##
-
-The version number of Flot is available in ```$.plot.version```.
diff --git a/src/legacy/ui/public/flot-charts/index.js b/src/legacy/ui/public/flot-charts/index.js
deleted file mode 100644
index f98aca30d2decf..00000000000000
--- a/src/legacy/ui/public/flot-charts/index.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/* @notice
- *
- * This product includes code that is based on flot-charts, which was available
- * under a "MIT" license.
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2007-2014 IOLA and Ole Laursen
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-import $ from 'jquery';
-if (window) window.jQuery = $;
-require('ui/flot-charts/jquery.flot');
-require('ui/flot-charts/jquery.flot.time');
-require('ui/flot-charts/jquery.flot.canvas');
-require('ui/flot-charts/jquery.flot.symbol');
-require('ui/flot-charts/jquery.flot.crosshair');
-require('ui/flot-charts/jquery.flot.selection');
-require('ui/flot-charts/jquery.flot.pie');
-require('ui/flot-charts/jquery.flot.stack');
-require('ui/flot-charts/jquery.flot.threshold');
-require('ui/flot-charts/jquery.flot.fillbetween');
-require('ui/flot-charts/jquery.flot.log');
-module.exports = $;
diff --git a/src/legacy/ui/public/flot-charts/jquery.colorhelpers.js b/src/legacy/ui/public/flot-charts/jquery.colorhelpers.js
deleted file mode 100644
index b2f6dc4e433a31..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.colorhelpers.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/* Plugin for jQuery for working with colors.
- * 
- * Version 1.1.
- * 
- * Inspiration from jQuery color animation plugin by John Resig.
- *
- * Released under the MIT license by Ole Laursen, October 2009.
- *
- * Examples:
- *
- *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
- *   var c = $.color.extract($("#mydiv"), 'background-color');
- *   console.log(c.r, c.g, c.b, c.a);
- *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
- *
- * Note that .scale() and .add() return the same modified object
- * instead of making a new one.
- *
- * V. 1.1: Fix error handling so e.g. parsing an empty string does
- * produce a color rather than just crashing.
- */ 
-
-(function($) {
-    $.color = {};
-
-    // construct color object with some convenient chainable helpers
-    $.color.make = function (r, g, b, a) {
-        var o = {};
-        o.r = r || 0;
-        o.g = g || 0;
-        o.b = b || 0;
-        o.a = a != null ? a : 1;
-
-        o.add = function (c, d) {
-            for (var i = 0; i < c.length; ++i)
-                o[c.charAt(i)] += d;
-            return o.normalize();
-        };
-        
-        o.scale = function (c, f) {
-            for (var i = 0; i < c.length; ++i)
-                o[c.charAt(i)] *= f;
-            return o.normalize();
-        };
-        
-        o.toString = function () {
-            if (o.a >= 1.0) {
-                return "rgb("+[o.r, o.g, o.b].join(",")+")";
-            } else {
-                return "rgba("+[o.r, o.g, o.b, o.a].join(",")+")";
-            }
-        };
-
-        o.normalize = function () {
-            function clamp(min, value, max) {
-                return value < min ? min: (value > max ? max: value);
-            }
-            
-            o.r = clamp(0, parseInt(o.r), 255);
-            o.g = clamp(0, parseInt(o.g), 255);
-            o.b = clamp(0, parseInt(o.b), 255);
-            o.a = clamp(0, o.a, 1);
-            return o;
-        };
-
-        o.clone = function () {
-            return $.color.make(o.r, o.b, o.g, o.a);
-        };
-
-        return o.normalize();
-    }
-
-    // extract CSS color property from element, going up in the DOM
-    // if it's "transparent"
-    $.color.extract = function (elem, css) {
-        var c;
-
-        do {
-            c = elem.css(css).toLowerCase();
-            // keep going until we find an element that has color, or
-            // we hit the body or root (have no parent)
-            if (c != '' && c != 'transparent')
-                break;
-            elem = elem.parent();
-        } while (elem.length && !$.nodeName(elem.get(0), "body"));
-
-        // catch Safari's way of signalling transparent
-        if (c == "rgba(0, 0, 0, 0)")
-            c = "transparent";
-        
-        return $.color.parse(c);
-    }
-    
-    // parse CSS color string (like "rgb(10, 32, 43)" or "#fff"),
-    // returns color object, if parsing failed, you get black (0, 0,
-    // 0) out
-    $.color.parse = function (str) {
-        var res, m = $.color.make;
-
-        // Look for rgb(num,num,num)
-        if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))
-            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10));
-        
-        // Look for rgba(num,num,num,num)
-        if (res = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
-            return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4]));
-            
-        // Look for rgb(num%,num%,num%)
-        if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))
-            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55);
-
-        // Look for rgba(num%,num%,num%,num)
-        if (res = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))
-            return m(parseFloat(res[1])*2.55, parseFloat(res[2])*2.55, parseFloat(res[3])*2.55, parseFloat(res[4]));
-        
-        // Look for #a0b1c2
-        if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))
-            return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16));
-
-        // Look for #fff
-        if (res = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))
-            return m(parseInt(res[1]+res[1], 16), parseInt(res[2]+res[2], 16), parseInt(res[3]+res[3], 16));
-
-        // Otherwise, we're most likely dealing with a named color
-        var name = $.trim(str).toLowerCase();
-        if (name == "transparent")
-            return m(255, 255, 255, 0);
-        else {
-            // default to black
-            res = lookupColors[name] || [0, 0, 0];
-            return m(res[0], res[1], res[2]);
-        }
-    }
-    
-    var lookupColors = {
-        aqua:[0,255,255],
-        azure:[240,255,255],
-        beige:[245,245,220],
-        black:[0,0,0],
-        blue:[0,0,255],
-        brown:[165,42,42],
-        cyan:[0,255,255],
-        darkblue:[0,0,139],
-        darkcyan:[0,139,139],
-        darkgrey:[169,169,169],
-        darkgreen:[0,100,0],
-        darkkhaki:[189,183,107],
-        darkmagenta:[139,0,139],
-        darkolivegreen:[85,107,47],
-        darkorange:[255,140,0],
-        darkorchid:[153,50,204],
-        darkred:[139,0,0],
-        darksalmon:[233,150,122],
-        darkviolet:[148,0,211],
-        fuchsia:[255,0,255],
-        gold:[255,215,0],
-        green:[0,128,0],
-        indigo:[75,0,130],
-        khaki:[240,230,140],
-        lightblue:[173,216,230],
-        lightcyan:[224,255,255],
-        lightgreen:[144,238,144],
-        lightgrey:[211,211,211],
-        lightpink:[255,182,193],
-        lightyellow:[255,255,224],
-        lime:[0,255,0],
-        magenta:[255,0,255],
-        maroon:[128,0,0],
-        navy:[0,0,128],
-        olive:[128,128,0],
-        orange:[255,165,0],
-        pink:[255,192,203],
-        purple:[128,0,128],
-        violet:[128,0,128],
-        red:[255,0,0],
-        silver:[192,192,192],
-        white:[255,255,255],
-        yellow:[255,255,0]
-    };
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.canvas.js b/src/legacy/ui/public/flot-charts/jquery.flot.canvas.js
deleted file mode 100644
index 29328d58121277..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.canvas.js
+++ /dev/null
@@ -1,345 +0,0 @@
-/* Flot plugin for drawing all elements of a plot on the canvas.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-Flot normally produces certain elements, like axis labels and the legend, using
-HTML elements. This permits greater interactivity and customization, and often
-looks better, due to cross-browser canvas text inconsistencies and limitations.
-
-It can also be desirable to render the plot entirely in canvas, particularly
-if the goal is to save it as an image, or if Flot is being used in a context
-where the HTML DOM does not exist, as is the case within Node.js. This plugin
-switches out Flot's standard drawing operations for canvas-only replacements.
-
-Currently the plugin supports only axis labels, but it will eventually allow
-every element of the plot to be rendered directly to canvas.
-
-The plugin supports these options:
-
-{
-    canvas: boolean
-}
-
-The "canvas" option controls whether full canvas drawing is enabled, making it
-possible to toggle on and off. This is useful when a plot uses HTML text in the
-browser, but needs to redraw with canvas text when exporting as an image.
-
-*/
-
-(function($) {
-
-	var options = {
-		canvas: true
-	};
-
-	var render, getTextInfo, addText;
-
-	// Cache the prototype hasOwnProperty for faster access
-
-	var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-	function init(plot, classes) {
-
-		var Canvas = classes.Canvas;
-
-		// We only want to replace the functions once; the second time around
-		// we would just get our new function back.  This whole replacing of
-		// prototype functions is a disaster, and needs to be changed ASAP.
-
-		if (render == null) {
-			getTextInfo = Canvas.prototype.getTextInfo,
-			addText = Canvas.prototype.addText,
-			render = Canvas.prototype.render;
-		}
-
-		// Finishes rendering the canvas, including overlaid text
-
-		Canvas.prototype.render = function() {
-
-			if (!plot.getOptions().canvas) {
-				return render.call(this);
-			}
-
-			var context = this.context,
-				cache = this._textCache;
-
-			// For each text layer, render elements marked as active
-
-			context.save();
-			context.textBaseline = "middle";
-
-			for (var layerKey in cache) {
-				if (hasOwnProperty.call(cache, layerKey)) {
-					var layerCache = cache[layerKey];
-					for (var styleKey in layerCache) {
-						if (hasOwnProperty.call(layerCache, styleKey)) {
-							var styleCache = layerCache[styleKey],
-								updateStyles = true;
-							for (var key in styleCache) {
-								if (hasOwnProperty.call(styleCache, key)) {
-
-									var info = styleCache[key],
-										positions = info.positions,
-										lines = info.lines;
-
-									// Since every element at this level of the cache have the
-									// same font and fill styles, we can just change them once
-									// using the values from the first element.
-
-									if (updateStyles) {
-										context.fillStyle = info.font.color;
-										context.font = info.font.definition;
-										updateStyles = false;
-									}
-
-									for (var i = 0, position; position = positions[i]; i++) {
-										if (position.active) {
-											for (var j = 0, line; line = position.lines[j]; j++) {
-												context.fillText(lines[j].text, line[0], line[1]);
-											}
-										} else {
-											positions.splice(i--, 1);
-										}
-									}
-
-									if (positions.length == 0) {
-										delete styleCache[key];
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-
-			context.restore();
-		};
-
-		// Creates (if necessary) and returns a text info object.
-		//
-		// When the canvas option is set, the object looks like this:
-		//
-		// {
-		//     width: Width of the text's bounding box.
-		//     height: Height of the text's bounding box.
-		//     positions: Array of positions at which this text is drawn.
-		//     lines: [{
-		//         height: Height of this line.
-		//         widths: Width of this line.
-		//         text: Text on this line.
-		//     }],
-		//     font: {
-		//         definition: Canvas font property string.
-		//         color: Color of the text.
-		//     },
-		// }
-		//
-		// The positions array contains objects that look like this:
-		//
-		// {
-		//     active: Flag indicating whether the text should be visible.
-		//     lines: Array of [x, y] coordinates at which to draw the line.
-		//     x: X coordinate at which to draw the text.
-		//     y: Y coordinate at which to draw the text.
-		// }
-
-		Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
-
-			if (!plot.getOptions().canvas) {
-				return getTextInfo.call(this, layer, text, font, angle, width);
-			}
-
-			var textStyle, layerCache, styleCache, info;
-
-			// Cast the value to a string, in case we were given a number
-
-			text = "" + text;
-
-			// If the font is a font-spec object, generate a CSS definition
-
-			if (typeof font === "object") {
-				textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family;
-			} else {
-				textStyle = font;
-			}
-
-			// Retrieve (or create) the cache for the text's layer and styles
-
-			layerCache = this._textCache[layer];
-
-			if (layerCache == null) {
-				layerCache = this._textCache[layer] = {};
-			}
-
-			styleCache = layerCache[textStyle];
-
-			if (styleCache == null) {
-				styleCache = layerCache[textStyle] = {};
-			}
-
-			info = styleCache[text];
-
-			if (info == null) {
-
-				var context = this.context;
-
-				// If the font was provided as CSS, create a div with those
-				// classes and examine it to generate a canvas font spec.
-
-				if (typeof font !== "object") {
-
-					var element = $("<div>&nbsp;</div>")
-						.css("position", "absolute")
-						.addClass(typeof font === "string" ? font : null)
-						.appendTo(this.getTextLayer(layer));
-
-					font = {
-						lineHeight: element.height(),
-						style: element.css("font-style"),
-						variant: element.css("font-variant"),
-						weight: element.css("font-weight"),
-						family: element.css("font-family"),
-						color: element.css("color")
-					};
-
-					// Setting line-height to 1, without units, sets it equal
-					// to the font-size, even if the font-size is abstract,
-					// like 'smaller'.  This enables us to read the real size
-					// via the element's height, working around browsers that
-					// return the literal 'smaller' value.
-
-					font.size = element.css("line-height", 1).height();
-
-					element.remove();
-				}
-
-				textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px " + font.family;
-
-				// Create a new info object, initializing the dimensions to
-				// zero so we can count them up line-by-line.
-
-				info = styleCache[text] = {
-					width: 0,
-					height: 0,
-					positions: [],
-					lines: [],
-					font: {
-						definition: textStyle,
-						color: font.color
-					}
-				};
-
-				context.save();
-				context.font = textStyle;
-
-				// Canvas can't handle multi-line strings; break on various
-				// newlines, including HTML brs, to build a list of lines.
-				// Note that we could split directly on regexps, but IE < 9 is
-				// broken; revisit when we drop IE 7/8 support.
-
-				var lines = (text + "").replace(/<br ?\/?>|\r\n|\r/g, "\n").split("\n");
-
-				for (var i = 0; i < lines.length; ++i) {
-
-					var lineText = lines[i],
-						measured = context.measureText(lineText);
-
-					info.width = Math.max(measured.width, info.width);
-					info.height += font.lineHeight;
-
-					info.lines.push({
-						text: lineText,
-						width: measured.width,
-						height: font.lineHeight
-					});
-				}
-
-				context.restore();
-			}
-
-			return info;
-		};
-
-		// Adds a text string to the canvas text overlay.
-
-		Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
-
-			if (!plot.getOptions().canvas) {
-				return addText.call(this, layer, x, y, text, font, angle, width, halign, valign);
-			}
-
-			var info = this.getTextInfo(layer, text, font, angle, width),
-				positions = info.positions,
-				lines = info.lines;
-
-			// Text is drawn with baseline 'middle', which we need to account
-			// for by adding half a line's height to the y position.
-
-			y += info.height / lines.length / 2;
-
-			// Tweak the initial y-position to match vertical alignment
-
-			if (valign == "middle") {
-				y = Math.round(y - info.height / 2);
-			} else if (valign == "bottom") {
-				y = Math.round(y - info.height);
-			} else {
-				y = Math.round(y);
-			}
-
-			// FIXME: LEGACY BROWSER FIX
-			// AFFECTS: Opera < 12.00
-
-			// Offset the y coordinate, since Opera is off pretty
-			// consistently compared to the other browsers.
-
-			if (!!(window.opera && window.opera.version().split(".")[0] < 12)) {
-				y -= 2;
-			}
-
-			// Determine whether this text already exists at this position.
-			// If so, mark it for inclusion in the next render pass.
-
-			for (var i = 0, position; position = positions[i]; i++) {
-				if (position.x == x && position.y == y) {
-					position.active = true;
-					return;
-				}
-			}
-
-			// If the text doesn't exist at this position, create a new entry
-
-			position = {
-				active: true,
-				lines: [],
-				x: x,
-				y: y
-			};
-
-			positions.push(position);
-
-			// Fill in the x & y positions of each line, adjusting them
-			// individually for horizontal alignment.
-
-			for (var i = 0, line; line = lines[i]; i++) {
-				if (halign == "center") {
-					position.lines.push([Math.round(x - line.width / 2), y]);
-				} else if (halign == "right") {
-					position.lines.push([Math.round(x - line.width), y]);
-				} else {
-					position.lines.push([Math.round(x), y]);
-				}
-				y += line.height;
-			}
-		};
-	}
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "canvas",
-		version: "1.0"
-	});
-
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.categories.js b/src/legacy/ui/public/flot-charts/jquery.flot.categories.js
deleted file mode 100644
index 2f9b2579714997..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.categories.js
+++ /dev/null
@@ -1,190 +0,0 @@
-/* Flot plugin for plotting textual data or categories.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-Consider a dataset like [["February", 34], ["March", 20], ...]. This plugin
-allows you to plot such a dataset directly.
-
-To enable it, you must specify mode: "categories" on the axis with the textual
-labels, e.g.
-
-	$.plot("#placeholder", data, { xaxis: { mode: "categories" } });
-
-By default, the labels are ordered as they are met in the data series. If you
-need a different ordering, you can specify "categories" on the axis options
-and list the categories there:
-
-	xaxis: {
-		mode: "categories",
-		categories: ["February", "March", "April"]
-	}
-
-If you need to customize the distances between the categories, you can specify
-"categories" as an object mapping labels to values
-
-	xaxis: {
-		mode: "categories",
-		categories: { "February": 1, "March": 3, "April": 4 }
-	}
-
-If you don't specify all categories, the remaining categories will be numbered
-from the max value plus 1 (with a spacing of 1 between each).
-
-Internally, the plugin works by transforming the input data through an auto-
-generated mapping where the first category becomes 0, the second 1, etc.
-Hence, a point like ["February", 34] becomes [0, 34] internally in Flot (this
-is visible in hover and click events that return numbers rather than the
-category labels). The plugin also overrides the tick generator to spit out the
-categories as ticks instead of the values.
-
-If you need to map a value back to its label, the mapping is always accessible
-as "categories" on the axis object, e.g. plot.getAxes().xaxis.categories.
-
-*/
-
-(function ($) {
-    var options = {
-        xaxis: {
-            categories: null
-        },
-        yaxis: {
-            categories: null
-        }
-    };
-    
-    function processRawData(plot, series, data, datapoints) {
-        // if categories are enabled, we need to disable
-        // auto-transformation to numbers so the strings are intact
-        // for later processing
-
-        var xCategories = series.xaxis.options.mode == "categories",
-            yCategories = series.yaxis.options.mode == "categories";
-        
-        if (!(xCategories || yCategories))
-            return;
-
-        var format = datapoints.format;
-
-        if (!format) {
-            // FIXME: auto-detection should really not be defined here
-            var s = series;
-            format = [];
-            format.push({ x: true, number: true, required: true });
-            format.push({ y: true, number: true, required: true });
-
-            if (s.bars.show || (s.lines.show && s.lines.fill)) {
-                var autoscale = !!((s.bars.show && s.bars.zero) || (s.lines.show && s.lines.zero));
-                format.push({ y: true, number: true, required: false, defaultValue: 0, autoscale: autoscale });
-                if (s.bars.horizontal) {
-                    delete format[format.length - 1].y;
-                    format[format.length - 1].x = true;
-                }
-            }
-            
-            datapoints.format = format;
-        }
-
-        for (var m = 0; m < format.length; ++m) {
-            if (format[m].x && xCategories)
-                format[m].number = false;
-            
-            if (format[m].y && yCategories)
-                format[m].number = false;
-        }
-    }
-
-    function getNextIndex(categories) {
-        var index = -1;
-        
-        for (var v in categories)
-            if (categories[v] > index)
-                index = categories[v];
-
-        return index + 1;
-    }
-
-    function categoriesTickGenerator(axis) {
-        var res = [];
-        for (var label in axis.categories) {
-            var v = axis.categories[label];
-            if (v >= axis.min && v <= axis.max)
-                res.push([v, label]);
-        }
-
-        res.sort(function (a, b) { return a[0] - b[0]; });
-
-        return res;
-    }
-    
-    function setupCategoriesForAxis(series, axis, datapoints) {
-        if (series[axis].options.mode != "categories")
-            return;
-        
-        if (!series[axis].categories) {
-            // parse options
-            var c = {}, o = series[axis].options.categories || {};
-            if ($.isArray(o)) {
-                for (var i = 0; i < o.length; ++i)
-                    c[o[i]] = i;
-            }
-            else {
-                for (var v in o)
-                    c[v] = o[v];
-            }
-            
-            series[axis].categories = c;
-        }
-
-        // fix ticks
-        if (!series[axis].options.ticks)
-            series[axis].options.ticks = categoriesTickGenerator;
-
-        transformPointsOnAxis(datapoints, axis, series[axis].categories);
-    }
-    
-    function transformPointsOnAxis(datapoints, axis, categories) {
-        // go through the points, transforming them
-        var points = datapoints.points,
-            ps = datapoints.pointsize,
-            format = datapoints.format,
-            formatColumn = axis.charAt(0),
-            index = getNextIndex(categories);
-
-        for (var i = 0; i < points.length; i += ps) {
-            if (points[i] == null)
-                continue;
-            
-            for (var m = 0; m < ps; ++m) {
-                var val = points[i + m];
-
-                if (val == null || !format[m][formatColumn])
-                    continue;
-
-                if (!(val in categories)) {
-                    categories[val] = index;
-                    ++index;
-                }
-                
-                points[i + m] = categories[val];
-            }
-        }
-    }
-
-    function processDatapoints(plot, series, datapoints) {
-        setupCategoriesForAxis(series, "xaxis", datapoints);
-        setupCategoriesForAxis(series, "yaxis", datapoints);
-    }
-
-    function init(plot) {
-        plot.hooks.processRawData.push(processRawData);
-        plot.hooks.processDatapoints.push(processDatapoints);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'categories',
-        version: '1.0'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.crosshair.js b/src/legacy/ui/public/flot-charts/jquery.flot.crosshair.js
deleted file mode 100644
index 5111695e3d12ce..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.crosshair.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Flot plugin for showing crosshairs when the mouse hovers over the plot.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin supports these options:
-
-	crosshair: {
-		mode: null or "x" or "y" or "xy"
-		color: color
-		lineWidth: number
-	}
-
-Set the mode to one of "x", "y" or "xy". The "x" mode enables a vertical
-crosshair that lets you trace the values on the x axis, "y" enables a
-horizontal crosshair and "xy" enables them both. "color" is the color of the
-crosshair (default is "rgba(170, 0, 0, 0.80)"), "lineWidth" is the width of
-the drawn lines (default is 1).
-
-The plugin also adds four public methods:
-
-  - setCrosshair( pos )
-
-    Set the position of the crosshair. Note that this is cleared if the user
-    moves the mouse. "pos" is in coordinates of the plot and should be on the
-    form { x: xpos, y: ypos } (you can use x2/x3/... if you're using multiple
-    axes), which is coincidentally the same format as what you get from a
-    "plothover" event. If "pos" is null, the crosshair is cleared.
-
-  - clearCrosshair()
-
-    Clear the crosshair.
-
-  - lockCrosshair(pos)
-
-    Cause the crosshair to lock to the current location, no longer updating if
-    the user moves the mouse. Optionally supply a position (passed on to
-    setCrosshair()) to move it to.
-
-    Example usage:
-
-	var myFlot = $.plot( $("#graph"), ..., { crosshair: { mode: "x" } } };
-	$("#graph").bind( "plothover", function ( evt, position, item ) {
-		if ( item ) {
-			// Lock the crosshair to the data point being hovered
-			myFlot.lockCrosshair({
-				x: item.datapoint[ 0 ],
-				y: item.datapoint[ 1 ]
-			});
-		} else {
-			// Return normal crosshair operation
-			myFlot.unlockCrosshair();
-		}
-	});
-
-  - unlockCrosshair()
-
-    Free the crosshair to move again after locking it.
-*/
-
-(function ($) {
-    var options = {
-        crosshair: {
-            mode: null, // one of null, "x", "y" or "xy",
-            color: "rgba(170, 0, 0, 0.80)",
-            lineWidth: 1
-        }
-    };
-    
-    function init(plot) {
-        // position of crosshair in pixels
-        var crosshair = { x: -1, y: -1, locked: false };
-
-        plot.setCrosshair = function setCrosshair(pos) {
-            if (!pos)
-                crosshair.x = -1;
-            else {
-                var o = plot.p2c(pos);
-                crosshair.x = Math.max(0, Math.min(o.left, plot.width()));
-                crosshair.y = Math.max(0, Math.min(o.top, plot.height()));
-            }
-            
-            plot.triggerRedrawOverlay();
-        };
-        
-        plot.clearCrosshair = plot.setCrosshair; // passes null for pos
-        
-        plot.lockCrosshair = function lockCrosshair(pos) {
-            if (pos)
-                plot.setCrosshair(pos);
-            crosshair.locked = true;
-        };
-
-        plot.unlockCrosshair = function unlockCrosshair() {
-            crosshair.locked = false;
-        };
-
-        function onMouseOut(e) {
-            if (crosshair.locked)
-                return;
-
-            if (crosshair.x != -1) {
-                crosshair.x = -1;
-                plot.triggerRedrawOverlay();
-            }
-        }
-
-        function onMouseMove(e) {
-            if (crosshair.locked)
-                return;
-                
-            if (plot.getSelection && plot.getSelection()) {
-                crosshair.x = -1; // hide the crosshair while selecting
-                return;
-            }
-                
-            var offset = plot.offset();
-            crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
-            crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
-            plot.triggerRedrawOverlay();
-        }
-        
-        plot.hooks.bindEvents.push(function (plot, eventHolder) {
-            if (!plot.getOptions().crosshair.mode)
-                return;
-
-            eventHolder.mouseout(onMouseOut);
-            eventHolder.mousemove(onMouseMove);
-        });
-
-        plot.hooks.drawOverlay.push(function (plot, ctx) {
-            var c = plot.getOptions().crosshair;
-            if (!c.mode)
-                return;
-
-            var plotOffset = plot.getPlotOffset();
-            
-            ctx.save();
-            ctx.translate(plotOffset.left, plotOffset.top);
-
-            if (crosshair.x != -1) {
-                var adj = plot.getOptions().crosshair.lineWidth % 2 ? 0.5 : 0;
-
-                ctx.strokeStyle = c.color;
-                ctx.lineWidth = c.lineWidth;
-                ctx.lineJoin = "round";
-
-                ctx.beginPath();
-                if (c.mode.indexOf("x") != -1) {
-                    var drawX = Math.floor(crosshair.x) + adj;
-                    ctx.moveTo(drawX, 0);
-                    ctx.lineTo(drawX, plot.height());
-                }
-                if (c.mode.indexOf("y") != -1) {
-                    var drawY = Math.floor(crosshair.y) + adj;
-                    ctx.moveTo(0, drawY);
-                    ctx.lineTo(plot.width(), drawY);
-                }
-                ctx.stroke();
-            }
-            ctx.restore();
-        });
-
-        plot.hooks.shutdown.push(function (plot, eventHolder) {
-            eventHolder.unbind("mouseout", onMouseOut);
-            eventHolder.unbind("mousemove", onMouseMove);
-        });
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'crosshair',
-        version: '1.0'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.errorbars.js b/src/legacy/ui/public/flot-charts/jquery.flot.errorbars.js
deleted file mode 100644
index 655036e0db846f..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.errorbars.js
+++ /dev/null
@@ -1,353 +0,0 @@
-/* Flot plugin for plotting error bars.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-Error bars are used to show standard deviation and other statistical
-properties in a plot.
-
-* Created by Rui Pereira  -  rui (dot) pereira (at) gmail (dot) com
-
-This plugin allows you to plot error-bars over points. Set "errorbars" inside
-the points series to the axis name over which there will be error values in
-your data array (*even* if you do not intend to plot them later, by setting
-"show: null" on xerr/yerr).
-
-The plugin supports these options:
-
-	series: {
-		points: {
-			errorbars: "x" or "y" or "xy",
-			xerr: {
-				show: null/false or true,
-				asymmetric: null/false or true,
-				upperCap: null or "-" or function,
-				lowerCap: null or "-" or function,
-				color: null or color,
-				radius: null or number
-			},
-			yerr: { same options as xerr }
-		}
-	}
-
-Each data point array is expected to be of the type:
-
-	"x"  [ x, y, xerr ]
-	"y"  [ x, y, yerr ]
-	"xy" [ x, y, xerr, yerr ]
-
-Where xerr becomes xerr_lower,xerr_upper for the asymmetric error case, and
-equivalently for yerr. E.g., a datapoint for the "xy" case with symmetric
-error-bars on X and asymmetric on Y would be:
-
-	[ x, y, xerr, yerr_lower, yerr_upper ]
-
-By default no end caps are drawn. Setting upperCap and/or lowerCap to "-" will
-draw a small cap perpendicular to the error bar. They can also be set to a
-user-defined drawing function, with (ctx, x, y, radius) as parameters, as e.g.:
-
-	function drawSemiCircle( ctx, x, y, radius ) {
-		ctx.beginPath();
-		ctx.arc( x, y, radius, 0, Math.PI, false );
-		ctx.moveTo( x - radius, y );
-		ctx.lineTo( x + radius, y );
-		ctx.stroke();
-	}
-
-Color and radius both default to the same ones of the points series if not
-set. The independent radius parameter on xerr/yerr is useful for the case when
-we may want to add error-bars to a line, without showing the interconnecting
-points (with radius: 0), and still showing end caps on the error-bars.
-shadowSize and lineWidth are derived as well from the points series.
-
-*/
-
-(function ($) {
-    var options = {
-        series: {
-            points: {
-                errorbars: null, //should be 'x', 'y' or 'xy'
-                xerr: { err: 'x', show: null, asymmetric: null, upperCap: null, lowerCap: null, color: null, radius: null},
-                yerr: { err: 'y', show: null, asymmetric: null, upperCap: null, lowerCap: null, color: null, radius: null}
-            }
-        }
-    };
-
-    function processRawData(plot, series, data, datapoints){
-        if (!series.points.errorbars)
-            return;
-
-        // x,y values
-        var format = [
-            { x: true, number: true, required: true },
-            { y: true, number: true, required: true }
-        ];
-
-        var errors = series.points.errorbars;
-        // error bars - first X then Y
-        if (errors == 'x' || errors == 'xy') {
-            // lower / upper error
-            if (series.points.xerr.asymmetric) {
-                format.push({ x: true, number: true, required: true });
-                format.push({ x: true, number: true, required: true });
-            } else
-                format.push({ x: true, number: true, required: true });
-        }
-        if (errors == 'y' || errors == 'xy') {
-            // lower / upper error
-            if (series.points.yerr.asymmetric) {
-                format.push({ y: true, number: true, required: true });
-                format.push({ y: true, number: true, required: true });
-            } else
-                format.push({ y: true, number: true, required: true });
-        }
-        datapoints.format = format;
-    }
-
-    function parseErrors(series, i){
-
-        var points = series.datapoints.points;
-
-        // read errors from points array
-        var exl = null,
-                exu = null,
-                eyl = null,
-                eyu = null;
-        var xerr = series.points.xerr,
-                yerr = series.points.yerr;
-
-        var eb = series.points.errorbars;
-        // error bars - first X
-        if (eb == 'x' || eb == 'xy') {
-            if (xerr.asymmetric) {
-                exl = points[i + 2];
-                exu = points[i + 3];
-                if (eb == 'xy')
-                    if (yerr.asymmetric){
-                        eyl = points[i + 4];
-                        eyu = points[i + 5];
-                    } else eyl = points[i + 4];
-            } else {
-                exl = points[i + 2];
-                if (eb == 'xy')
-                    if (yerr.asymmetric) {
-                        eyl = points[i + 3];
-                        eyu = points[i + 4];
-                    } else eyl = points[i + 3];
-            }
-        // only Y
-        } else if (eb == 'y')
-            if (yerr.asymmetric) {
-                eyl = points[i + 2];
-                eyu = points[i + 3];
-            } else eyl = points[i + 2];
-
-        // symmetric errors?
-        if (exu == null) exu = exl;
-        if (eyu == null) eyu = eyl;
-
-        var errRanges = [exl, exu, eyl, eyu];
-        // nullify if not showing
-        if (!xerr.show){
-            errRanges[0] = null;
-            errRanges[1] = null;
-        }
-        if (!yerr.show){
-            errRanges[2] = null;
-            errRanges[3] = null;
-        }
-        return errRanges;
-    }
-
-    function drawSeriesErrors(plot, ctx, s){
-
-        var points = s.datapoints.points,
-                ps = s.datapoints.pointsize,
-                ax = [s.xaxis, s.yaxis],
-                radius = s.points.radius,
-                err = [s.points.xerr, s.points.yerr];
-
-        //sanity check, in case some inverted axis hack is applied to flot
-        var invertX = false;
-        if (ax[0].p2c(ax[0].max) < ax[0].p2c(ax[0].min)) {
-            invertX = true;
-            var tmp = err[0].lowerCap;
-            err[0].lowerCap = err[0].upperCap;
-            err[0].upperCap = tmp;
-        }
-
-        var invertY = false;
-        if (ax[1].p2c(ax[1].min) < ax[1].p2c(ax[1].max)) {
-            invertY = true;
-            var tmp = err[1].lowerCap;
-            err[1].lowerCap = err[1].upperCap;
-            err[1].upperCap = tmp;
-        }
-
-        for (var i = 0; i < s.datapoints.points.length; i += ps) {
-
-            //parse
-            var errRanges = parseErrors(s, i);
-
-            //cycle xerr & yerr
-            for (var e = 0; e < err.length; e++){
-
-                var minmax = [ax[e].min, ax[e].max];
-
-                //draw this error?
-                if (errRanges[e * err.length]){
-
-                    //data coordinates
-                    var x = points[i],
-                        y = points[i + 1];
-
-                    //errorbar ranges
-                    var upper = [x, y][e] + errRanges[e * err.length + 1],
-                        lower = [x, y][e] - errRanges[e * err.length];
-
-                    //points outside of the canvas
-                    if (err[e].err == 'x')
-                        if (y > ax[1].max || y < ax[1].min || upper < ax[0].min || lower > ax[0].max)
-                            continue;
-                    if (err[e].err == 'y')
-                        if (x > ax[0].max || x < ax[0].min || upper < ax[1].min || lower > ax[1].max)
-                            continue;
-
-                    // prevent errorbars getting out of the canvas
-                    var drawUpper = true,
-                        drawLower = true;
-
-                    if (upper > minmax[1]) {
-                        drawUpper = false;
-                        upper = minmax[1];
-                    }
-                    if (lower < minmax[0]) {
-                        drawLower = false;
-                        lower = minmax[0];
-                    }
-
-                    //sanity check, in case some inverted axis hack is applied to flot
-                    if ((err[e].err == 'x' && invertX) || (err[e].err == 'y' && invertY)) {
-                        //swap coordinates
-                        var tmp = lower;
-                        lower = upper;
-                        upper = tmp;
-                        tmp = drawLower;
-                        drawLower = drawUpper;
-                        drawUpper = tmp;
-                        tmp = minmax[0];
-                        minmax[0] = minmax[1];
-                        minmax[1] = tmp;
-                    }
-
-                    // convert to pixels
-                    x = ax[0].p2c(x),
-                        y = ax[1].p2c(y),
-                        upper = ax[e].p2c(upper);
-                    lower = ax[e].p2c(lower);
-                    minmax[0] = ax[e].p2c(minmax[0]);
-                    minmax[1] = ax[e].p2c(minmax[1]);
-
-                    //same style as points by default
-                    var lw = err[e].lineWidth ? err[e].lineWidth : s.points.lineWidth,
-                        sw = s.points.shadowSize != null ? s.points.shadowSize : s.shadowSize;
-
-                    //shadow as for points
-                    if (lw > 0 && sw > 0) {
-                        var w = sw / 2;
-                        ctx.lineWidth = w;
-                        ctx.strokeStyle = "rgba(0,0,0,0.1)";
-                        drawError(ctx, err[e], x, y, upper, lower, drawUpper, drawLower, radius, w + w/2, minmax);
-
-                        ctx.strokeStyle = "rgba(0,0,0,0.2)";
-                        drawError(ctx, err[e], x, y, upper, lower, drawUpper, drawLower, radius, w/2, minmax);
-                    }
-
-                    ctx.strokeStyle = err[e].color? err[e].color: s.color;
-                    ctx.lineWidth = lw;
-                    //draw it
-                    drawError(ctx, err[e], x, y, upper, lower, drawUpper, drawLower, radius, 0, minmax);
-                }
-            }
-        }
-    }
-
-    function drawError(ctx,err,x,y,upper,lower,drawUpper,drawLower,radius,offset,minmax){
-
-        //shadow offset
-        y += offset;
-        upper += offset;
-        lower += offset;
-
-        // error bar - avoid plotting over circles
-        if (err.err == 'x'){
-            if (upper > x + radius) drawPath(ctx, [[upper,y],[Math.max(x + radius,minmax[0]),y]]);
-            else drawUpper = false;
-            if (lower < x - radius) drawPath(ctx, [[Math.min(x - radius,minmax[1]),y],[lower,y]] );
-            else drawLower = false;
-        }
-        else {
-            if (upper < y - radius) drawPath(ctx, [[x,upper],[x,Math.min(y - radius,minmax[0])]] );
-            else drawUpper = false;
-            if (lower > y + radius) drawPath(ctx, [[x,Math.max(y + radius,minmax[1])],[x,lower]] );
-            else drawLower = false;
-        }
-
-        //internal radius value in errorbar, allows to plot radius 0 points and still keep proper sized caps
-        //this is a way to get errorbars on lines without visible connecting dots
-        radius = err.radius != null? err.radius: radius;
-
-        // upper cap
-        if (drawUpper) {
-            if (err.upperCap == '-'){
-                if (err.err=='x') drawPath(ctx, [[upper,y - radius],[upper,y + radius]] );
-                else drawPath(ctx, [[x - radius,upper],[x + radius,upper]] );
-            } else if ($.isFunction(err.upperCap)){
-                if (err.err=='x') err.upperCap(ctx, upper, y, radius);
-                else err.upperCap(ctx, x, upper, radius);
-            }
-        }
-        // lower cap
-        if (drawLower) {
-            if (err.lowerCap == '-'){
-                if (err.err=='x') drawPath(ctx, [[lower,y - radius],[lower,y + radius]] );
-                else drawPath(ctx, [[x - radius,lower],[x + radius,lower]] );
-            } else if ($.isFunction(err.lowerCap)){
-                if (err.err=='x') err.lowerCap(ctx, lower, y, radius);
-                else err.lowerCap(ctx, x, lower, radius);
-            }
-        }
-    }
-
-    function drawPath(ctx, pts){
-        ctx.beginPath();
-        ctx.moveTo(pts[0][0], pts[0][1]);
-        for (var p=1; p < pts.length; p++)
-            ctx.lineTo(pts[p][0], pts[p][1]);
-        ctx.stroke();
-    }
-
-    function draw(plot, ctx){
-        var plotOffset = plot.getPlotOffset();
-
-        ctx.save();
-        ctx.translate(plotOffset.left, plotOffset.top);
-        $.each(plot.getData(), function (i, s) {
-            if (s.points.errorbars && (s.points.xerr.show || s.points.yerr.show))
-                drawSeriesErrors(plot, ctx, s);
-        });
-        ctx.restore();
-    }
-
-    function init(plot) {
-        plot.hooks.processRawData.push(processRawData);
-        plot.hooks.draw.push(draw);
-    }
-
-    $.plot.plugins.push({
-                init: init,
-                options: options,
-                name: 'errorbars',
-                version: '1.0'
-            });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.fillbetween.js b/src/legacy/ui/public/flot-charts/jquery.flot.fillbetween.js
deleted file mode 100644
index 18b15d26db8c91..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.fillbetween.js
+++ /dev/null
@@ -1,226 +0,0 @@
-/* Flot plugin for computing bottoms for filled line and bar charts.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The case: you've got two series that you want to fill the area between. In Flot
-terms, you need to use one as the fill bottom of the other. You can specify the
-bottom of each data point as the third coordinate manually, or you can use this
-plugin to compute it for you.
-
-In order to name the other series, you need to give it an id, like this:
-
-	var dataset = [
-		{ data: [ ... ], id: "foo" } ,         // use default bottom
-		{ data: [ ... ], fillBetween: "foo" }, // use first dataset as bottom
-	];
-
-	$.plot($("#placeholder"), dataset, { lines: { show: true, fill: true }});
-
-As a convenience, if the id given is a number that doesn't appear as an id in
-the series, it is interpreted as the index in the array instead (so fillBetween:
-0 can also mean the first series).
-
-Internally, the plugin modifies the datapoints in each series. For line series,
-extra data points might be inserted through interpolation. Note that at points
-where the bottom line is not defined (due to a null point or start/end of line),
-the current line will show a gap too. The algorithm comes from the
-jquery.flot.stack.js plugin, possibly some code could be shared.
-
-*/
-
-(function ( $ ) {
-
-	var options = {
-		series: {
-			fillBetween: null	// or number
-		}
-	};
-
-	function init( plot ) {
-
-		function findBottomSeries( s, allseries ) {
-
-			var i;
-
-			for ( i = 0; i < allseries.length; ++i ) {
-				if ( allseries[ i ].id === s.fillBetween ) {
-					return allseries[ i ];
-				}
-			}
-
-			if ( typeof s.fillBetween === "number" ) {
-				if ( s.fillBetween < 0 || s.fillBetween >= allseries.length ) {
-					return null;
-				}
-				return allseries[ s.fillBetween ];
-			}
-
-			return null;
-		}
-
-		function computeFillBottoms( plot, s, datapoints ) {
-
-			if ( s.fillBetween == null ) {
-				return;
-			}
-
-			var other = findBottomSeries( s, plot.getData() );
-
-			if ( !other ) {
-				return;
-			}
-
-			var ps = datapoints.pointsize,
-				points = datapoints.points,
-				otherps = other.datapoints.pointsize,
-				otherpoints = other.datapoints.points,
-				newpoints = [],
-				px, py, intery, qx, qy, bottom,
-				withlines = s.lines.show,
-				withbottom = ps > 2 && datapoints.format[2].y,
-				withsteps = withlines && s.lines.steps,
-				fromgap = true,
-				i = 0,
-				j = 0,
-				l, m;
-
-			while ( true ) {
-
-				if ( i >= points.length ) {
-					break;
-				}
-
-				l = newpoints.length;
-
-				if ( points[ i ] == null ) {
-
-					// copy gaps
-
-					for ( m = 0; m < ps; ++m ) {
-						newpoints.push( points[ i + m ] );
-					}
-
-					i += ps;
-
-				} else if ( j >= otherpoints.length ) {
-
-					// for lines, we can't use the rest of the points
-
-					if ( !withlines ) {
-						for ( m = 0; m < ps; ++m ) {
-							newpoints.push( points[ i + m ] );
-						}
-					}
-
-					i += ps;
-
-				} else if ( otherpoints[ j ] == null ) {
-
-					// oops, got a gap
-
-					for ( m = 0; m < ps; ++m ) {
-						newpoints.push( null );
-					}
-
-					fromgap = true;
-					j += otherps;
-
-				} else {
-
-					// cases where we actually got two points
-
-					px = points[ i ];
-					py = points[ i + 1 ];
-					qx = otherpoints[ j ];
-					qy = otherpoints[ j + 1 ];
-					bottom = 0;
-
-					if ( px === qx ) {
-
-						for ( m = 0; m < ps; ++m ) {
-							newpoints.push( points[ i + m ] );
-						}
-
-						//newpoints[ l + 1 ] += qy;
-						bottom = qy;
-
-						i += ps;
-						j += otherps;
-
-					} else if ( px > qx ) {
-
-						// we got past point below, might need to
-						// insert interpolated extra point
-
-						if ( withlines && i > 0 && points[ i - ps ] != null ) {
-							intery = py + ( points[ i - ps + 1 ] - py ) * ( qx - px ) / ( points[ i - ps ] - px );
-							newpoints.push( qx );
-							newpoints.push( intery );
-							for ( m = 2; m < ps; ++m ) {
-								newpoints.push( points[ i + m ] );
-							}
-							bottom = qy;
-						}
-
-						j += otherps;
-
-					} else { // px < qx
-
-						// if we come from a gap, we just skip this point
-
-						if ( fromgap && withlines ) {
-							i += ps;
-							continue;
-						}
-
-						for ( m = 0; m < ps; ++m ) {
-							newpoints.push( points[ i + m ] );
-						}
-
-						// we might be able to interpolate a point below,
-						// this can give us a better y
-
-						if ( withlines && j > 0 && otherpoints[ j - otherps ] != null ) {
-							bottom = qy + ( otherpoints[ j - otherps + 1 ] - qy ) * ( px - qx ) / ( otherpoints[ j - otherps ] - qx );
-						}
-
-						//newpoints[l + 1] += bottom;
-
-						i += ps;
-					}
-
-					fromgap = false;
-
-					if ( l !== newpoints.length && withbottom ) {
-						newpoints[ l + 2 ] = bottom;
-					}
-				}
-
-				// maintain the line steps invariant
-
-				if ( withsteps && l !== newpoints.length && l > 0 &&
-					newpoints[ l ] !== null &&
-					newpoints[ l ] !== newpoints[ l - ps ] &&
-					newpoints[ l + 1 ] !== newpoints[ l - ps + 1 ] ) {
-					for (m = 0; m < ps; ++m) {
-						newpoints[ l + ps + m ] = newpoints[ l + m ];
-					}
-					newpoints[ l + 1 ] = newpoints[ l - ps + 1 ];
-				}
-			}
-
-			datapoints.points = newpoints;
-		}
-
-		plot.hooks.processDatapoints.push( computeFillBottoms );
-	}
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "fillbetween",
-		version: "1.0"
-	});
-
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.image.js b/src/legacy/ui/public/flot-charts/jquery.flot.image.js
deleted file mode 100644
index 178f0e69069eff..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.image.js
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Flot plugin for plotting images.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The data syntax is [ [ image, x1, y1, x2, y2 ], ... ] where (x1, y1) and
-(x2, y2) are where you intend the two opposite corners of the image to end up
-in the plot. Image must be a fully loaded JavaScript image (you can make one
-with new Image()). If the image is not complete, it's skipped when plotting.
-
-There are two helpers included for retrieving images. The easiest work the way
-that you put in URLs instead of images in the data, like this:
-
-	[ "myimage.png", 0, 0, 10, 10 ]
-
-Then call $.plot.image.loadData( data, options, callback ) where data and
-options are the same as you pass in to $.plot. This loads the images, replaces
-the URLs in the data with the corresponding images and calls "callback" when
-all images are loaded (or failed loading). In the callback, you can then call
-$.plot with the data set. See the included example.
-
-A more low-level helper, $.plot.image.load(urls, callback) is also included.
-Given a list of URLs, it calls callback with an object mapping from URL to
-Image object when all images are loaded or have failed loading.
-
-The plugin supports these options:
-
-	series: {
-		images: {
-			show: boolean
-			anchor: "corner" or "center"
-			alpha: [ 0, 1 ]
-		}
-	}
-
-They can be specified for a specific series:
-
-	$.plot( $("#placeholder"), [{
-		data: [ ... ],
-		images: { ... }
-	])
-
-Note that because the data format is different from usual data points, you
-can't use images with anything else in a specific data series.
-
-Setting "anchor" to "center" causes the pixels in the image to be anchored at
-the corner pixel centers inside of at the pixel corners, effectively letting
-half a pixel stick out to each side in the plot.
-
-A possible future direction could be support for tiling for large images (like
-Google Maps).
-
-*/
-
-(function ($) {
-    var options = {
-        series: {
-            images: {
-                show: false,
-                alpha: 1,
-                anchor: "corner" // or "center"
-            }
-        }
-    };
-
-    $.plot.image = {};
-
-    $.plot.image.loadDataImages = function (series, options, callback) {
-        var urls = [], points = [];
-
-        var defaultShow = options.series.images.show;
-        
-        $.each(series, function (i, s) {
-            if (!(defaultShow || s.images.show))
-                return;
-            
-            if (s.data)
-                s = s.data;
-
-            $.each(s, function (i, p) {
-                if (typeof p[0] == "string") {
-                    urls.push(p[0]);
-                    points.push(p);
-                }
-            });
-        });
-
-        $.plot.image.load(urls, function (loadedImages) {
-            $.each(points, function (i, p) {
-                var url = p[0];
-                if (loadedImages[url])
-                    p[0] = loadedImages[url];
-            });
-
-            callback();
-        });
-    }
-    
-    $.plot.image.load = function (urls, callback) {
-        var missing = urls.length, loaded = {};
-        if (missing == 0)
-            callback({});
-
-        $.each(urls, function (i, url) {
-            var handler = function () {
-                --missing;
-                
-                loaded[url] = this;
-                
-                if (missing == 0)
-                    callback(loaded);
-            };
-
-            $('<img />').load(handler).error(handler).attr('src', url);
-        });
-    };
-    
-    function drawSeries(plot, ctx, series) {
-        var plotOffset = plot.getPlotOffset();
-        
-        if (!series.images || !series.images.show)
-            return;
-        
-        var points = series.datapoints.points,
-            ps = series.datapoints.pointsize;
-        
-        for (var i = 0; i < points.length; i += ps) {
-            var img = points[i],
-                x1 = points[i + 1], y1 = points[i + 2],
-                x2 = points[i + 3], y2 = points[i + 4],
-                xaxis = series.xaxis, yaxis = series.yaxis,
-                tmp;
-
-            // actually we should check img.complete, but it
-            // appears to be a somewhat unreliable indicator in
-            // IE6 (false even after load event)
-            if (!img || img.width <= 0 || img.height <= 0)
-                continue;
-
-            if (x1 > x2) {
-                tmp = x2;
-                x2 = x1;
-                x1 = tmp;
-            }
-            if (y1 > y2) {
-                tmp = y2;
-                y2 = y1;
-                y1 = tmp;
-            }
-            
-            // if the anchor is at the center of the pixel, expand the 
-            // image by 1/2 pixel in each direction
-            if (series.images.anchor == "center") {
-                tmp = 0.5 * (x2-x1) / (img.width - 1);
-                x1 -= tmp;
-                x2 += tmp;
-                tmp = 0.5 * (y2-y1) / (img.height - 1);
-                y1 -= tmp;
-                y2 += tmp;
-            }
-            
-            // clip
-            if (x1 == x2 || y1 == y2 ||
-                x1 >= xaxis.max || x2 <= xaxis.min ||
-                y1 >= yaxis.max || y2 <= yaxis.min)
-                continue;
-
-            var sx1 = 0, sy1 = 0, sx2 = img.width, sy2 = img.height;
-            if (x1 < xaxis.min) {
-                sx1 += (sx2 - sx1) * (xaxis.min - x1) / (x2 - x1);
-                x1 = xaxis.min;
-            }
-
-            if (x2 > xaxis.max) {
-                sx2 += (sx2 - sx1) * (xaxis.max - x2) / (x2 - x1);
-                x2 = xaxis.max;
-            }
-
-            if (y1 < yaxis.min) {
-                sy2 += (sy1 - sy2) * (yaxis.min - y1) / (y2 - y1);
-                y1 = yaxis.min;
-            }
-
-            if (y2 > yaxis.max) {
-                sy1 += (sy1 - sy2) * (yaxis.max - y2) / (y2 - y1);
-                y2 = yaxis.max;
-            }
-            
-            x1 = xaxis.p2c(x1);
-            x2 = xaxis.p2c(x2);
-            y1 = yaxis.p2c(y1);
-            y2 = yaxis.p2c(y2);
-            
-            // the transformation may have swapped us
-            if (x1 > x2) {
-                tmp = x2;
-                x2 = x1;
-                x1 = tmp;
-            }
-            if (y1 > y2) {
-                tmp = y2;
-                y2 = y1;
-                y1 = tmp;
-            }
-
-            tmp = ctx.globalAlpha;
-            ctx.globalAlpha *= series.images.alpha;
-            ctx.drawImage(img,
-                          sx1, sy1, sx2 - sx1, sy2 - sy1,
-                          x1 + plotOffset.left, y1 + plotOffset.top,
-                          x2 - x1, y2 - y1);
-            ctx.globalAlpha = tmp;
-        }
-    }
-
-    function processRawData(plot, series, data, datapoints) {
-        if (!series.images.show)
-            return;
-
-        // format is Image, x1, y1, x2, y2 (opposite corners)
-        datapoints.format = [
-            { required: true },
-            { x: true, number: true, required: true },
-            { y: true, number: true, required: true },
-            { x: true, number: true, required: true },
-            { y: true, number: true, required: true }
-        ];
-    }
-    
-    function init(plot) {
-        plot.hooks.processRawData.push(processRawData);
-        plot.hooks.drawSeries.push(drawSeries);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'image',
-        version: '1.1'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.js b/src/legacy/ui/public/flot-charts/jquery.flot.js
deleted file mode 100644
index 43db1cc3d93db1..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.js
+++ /dev/null
@@ -1,3168 +0,0 @@
-/* JavaScript plotting library for jQuery, version 0.8.3.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-*/
-
-// first an inline dependency, jquery.colorhelpers.js, we inline it here
-// for convenience
-
-/* Plugin for jQuery for working with colors.
- *
- * Version 1.1.
- *
- * Inspiration from jQuery color animation plugin by John Resig.
- *
- * Released under the MIT license by Ole Laursen, October 2009.
- *
- * Examples:
- *
- *   $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
- *   var c = $.color.extract($("#mydiv"), 'background-color');
- *   console.log(c.r, c.g, c.b, c.a);
- *   $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
- *
- * Note that .scale() and .add() return the same modified object
- * instead of making a new one.
- *
- * V. 1.1: Fix error handling so e.g. parsing an empty string does
- * produce a color rather than just crashing.
- */
-(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
-
-// the actual Flot code
-(function($) {
-
-	// Cache the prototype hasOwnProperty for faster access
-
-	var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-    // A shim to provide 'detach' to jQuery versions prior to 1.4.  Using a DOM
-    // operation produces the same effect as detach, i.e. removing the element
-    // without touching its jQuery data.
-
-    // Do not merge this into Flot 0.9, since it requires jQuery 1.4.4+.
-
-    if (!$.fn.detach) {
-        $.fn.detach = function() {
-            return this.each(function() {
-                if (this.parentNode) {
-                    this.parentNode.removeChild( this );
-                }
-            });
-        };
-    }
-
-	///////////////////////////////////////////////////////////////////////////
-	// The Canvas object is a wrapper around an HTML5 <canvas> tag.
-	//
-	// @constructor
-	// @param {string} cls List of classes to apply to the canvas.
-	// @param {element} container Element onto which to append the canvas.
-	//
-	// Requiring a container is a little iffy, but unfortunately canvas
-	// operations don't work unless the canvas is attached to the DOM.
-
-	function Canvas(cls, container) {
-
-		var element = container.children("." + cls)[0];
-
-		if (element == null) {
-
-			element = document.createElement("canvas");
-			element.className = cls;
-
-			$(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 })
-				.appendTo(container);
-
-			// If HTML5 Canvas isn't available, fall back to [Ex|Flash]canvas
-
-			if (!element.getContext) {
-				if (window.G_vmlCanvasManager) {
-					element = window.G_vmlCanvasManager.initElement(element);
-				} else {
-					throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");
-				}
-			}
-		}
-
-		this.element = element;
-
-		var context = this.context = element.getContext("2d");
-
-		// Determine the screen's ratio of physical to device-independent
-		// pixels.  This is the ratio between the canvas width that the browser
-		// advertises and the number of pixels actually present in that space.
-
-		// The iPhone 4, for example, has a device-independent width of 320px,
-		// but its screen is actually 640px wide.  It therefore has a pixel
-		// ratio of 2, while most normal devices have a ratio of 1.
-
-		var devicePixelRatio = window.devicePixelRatio || 1,
-			backingStoreRatio =
-				context.webkitBackingStorePixelRatio ||
-				context.mozBackingStorePixelRatio ||
-				context.msBackingStorePixelRatio ||
-				context.oBackingStorePixelRatio ||
-				context.backingStorePixelRatio || 1;
-
-		this.pixelRatio = devicePixelRatio / backingStoreRatio;
-
-		// Size the canvas to match the internal dimensions of its container
-
-		this.resize(container.width(), container.height());
-
-		// Collection of HTML div layers for text overlaid onto the canvas
-
-		this.textContainer = null;
-		this.text = {};
-
-		// Cache of text fragments and metrics, so we can avoid expensively
-		// re-calculating them when the plot is re-rendered in a loop.
-
-		this._textCache = {};
-	}
-
-	// Resizes the canvas to the given dimensions.
-	//
-	// @param {number} width New width of the canvas, in pixels.
-	// @param {number} width New height of the canvas, in pixels.
-
-	Canvas.prototype.resize = function(width, height) {
-
-		if (width <= 0 || height <= 0) {
-			throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height);
-		}
-
-		var element = this.element,
-			context = this.context,
-			pixelRatio = this.pixelRatio;
-
-		// Resize the canvas, increasing its density based on the display's
-		// pixel ratio; basically giving it more pixels without increasing the
-		// size of its element, to take advantage of the fact that retina
-		// displays have that many more pixels in the same advertised space.
-
-		// Resizing should reset the state (excanvas seems to be buggy though)
-
-		if (this.width != width) {
-			element.width = width * pixelRatio;
-			element.style.width = width + "px";
-			this.width = width;
-		}
-
-		if (this.height != height) {
-			element.height = height * pixelRatio;
-			element.style.height = height + "px";
-			this.height = height;
-		}
-
-		// Save the context, so we can reset in case we get replotted.  The
-		// restore ensure that we're really back at the initial state, and
-		// should be safe even if we haven't saved the initial state yet.
-
-		context.restore();
-		context.save();
-
-		// Scale the coordinate space to match the display density; so even though we
-		// may have twice as many pixels, we still want lines and other drawing to
-		// appear at the same size; the extra pixels will just make them crisper.
-
-		context.scale(pixelRatio, pixelRatio);
-	};
-
-	// Clears the entire canvas area, not including any overlaid HTML text
-
-	Canvas.prototype.clear = function() {
-		this.context.clearRect(0, 0, this.width, this.height);
-	};
-
-	// Finishes rendering the canvas, including managing the text overlay.
-
-	Canvas.prototype.render = function() {
-
-		var cache = this._textCache;
-
-		// For each text layer, add elements marked as active that haven't
-		// already been rendered, and remove those that are no longer active.
-
-		for (var layerKey in cache) {
-			if (hasOwnProperty.call(cache, layerKey)) {
-
-				var layer = this.getTextLayer(layerKey),
-					layerCache = cache[layerKey];
-
-				layer.hide();
-
-				for (var styleKey in layerCache) {
-					if (hasOwnProperty.call(layerCache, styleKey)) {
-						var styleCache = layerCache[styleKey];
-						for (var key in styleCache) {
-							if (hasOwnProperty.call(styleCache, key)) {
-
-								var positions = styleCache[key].positions;
-
-								for (var i = 0, position; position = positions[i]; i++) {
-									if (position.active) {
-										if (!position.rendered) {
-											layer.append(position.element);
-											position.rendered = true;
-										}
-									} else {
-										positions.splice(i--, 1);
-										if (position.rendered) {
-											position.element.detach();
-										}
-									}
-								}
-
-								if (positions.length == 0) {
-									delete styleCache[key];
-								}
-							}
-						}
-					}
-				}
-
-				layer.show();
-			}
-		}
-	};
-
-	// Creates (if necessary) and returns the text overlay container.
-	//
-	// @param {string} classes String of space-separated CSS classes used to
-	//     uniquely identify the text layer.
-	// @return {object} The jQuery-wrapped text-layer div.
-
-	Canvas.prototype.getTextLayer = function(classes) {
-
-		var layer = this.text[classes];
-
-		// Create the text layer if it doesn't exist
-
-		if (layer == null) {
-
-			// Create the text layer container, if it doesn't exist
-
-			if (this.textContainer == null) {
-				this.textContainer = $("<div class='flot-text'></div>")
-					.css({
-						position: "absolute",
-						top: 0,
-						left: 0,
-						bottom: 0,
-						right: 0,
-						'font-size': "smaller",
-						color: "#545454"
-					})
-					.insertAfter(this.element);
-			}
-
-			layer = this.text[classes] = $("<div></div>")
-				.addClass(classes)
-				.css({
-					position: "absolute",
-					top: 0,
-					left: 0,
-					bottom: 0,
-					right: 0
-				})
-				.appendTo(this.textContainer);
-		}
-
-		return layer;
-	};
-
-	// Creates (if necessary) and returns a text info object.
-	//
-	// The object looks like this:
-	//
-	// {
-	//     width: Width of the text's wrapper div.
-	//     height: Height of the text's wrapper div.
-	//     element: The jQuery-wrapped HTML div containing the text.
-	//     positions: Array of positions at which this text is drawn.
-	// }
-	//
-	// The positions array contains objects that look like this:
-	//
-	// {
-	//     active: Flag indicating whether the text should be visible.
-	//     rendered: Flag indicating whether the text is currently visible.
-	//     element: The jQuery-wrapped HTML div containing the text.
-	//     x: X coordinate at which to draw the text.
-	//     y: Y coordinate at which to draw the text.
-	// }
-	//
-	// Each position after the first receives a clone of the original element.
-	//
-	// The idea is that that the width, height, and general 'identity' of the
-	// text is constant no matter where it is placed; the placements are a
-	// secondary property.
-	//
-	// Canvas maintains a cache of recently-used text info objects; getTextInfo
-	// either returns the cached element or creates a new entry.
-	//
-	// @param {string} layer A string of space-separated CSS classes uniquely
-	//     identifying the layer containing this text.
-	// @param {string} text Text string to retrieve info for.
-	// @param {(string|object)=} font Either a string of space-separated CSS
-	//     classes or a font-spec object, defining the text's font and style.
-	// @param {number=} angle Angle at which to rotate the text, in degrees.
-	//     Angle is currently unused, it will be implemented in the future.
-	// @param {number=} width Maximum width of the text before it wraps.
-	// @return {object} a text info object.
-
-	Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
-
-		var textStyle, layerCache, styleCache, info;
-
-		// Cast the value to a string, in case we were given a number or such
-
-		text = "" + text;
-
-		// If the font is a font-spec object, generate a CSS font definition
-
-		if (typeof font === "object") {
-			textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family;
-		} else {
-			textStyle = font;
-		}
-
-		// Retrieve (or create) the cache for the text's layer and styles
-
-		layerCache = this._textCache[layer];
-
-		if (layerCache == null) {
-			layerCache = this._textCache[layer] = {};
-		}
-
-		styleCache = layerCache[textStyle];
-
-		if (styleCache == null) {
-			styleCache = layerCache[textStyle] = {};
-		}
-
-		info = styleCache[text];
-
-		// If we can't find a matching element in our cache, create a new one
-
-		if (info == null) {
-
-			var element = $("<div></div>").html(text)
-				.css({
-					position: "absolute",
-					'max-width': width,
-					top: -9999
-				})
-				.appendTo(this.getTextLayer(layer));
-
-			if (typeof font === "object") {
-				element.css({
-					font: textStyle,
-					color: font.color
-				});
-			} else if (typeof font === "string") {
-				element.addClass(font);
-			}
-
-			info = styleCache[text] = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				element: element,
-				positions: []
-			};
-
-			element.detach();
-		}
-
-		return info;
-	};
-
-	// Adds a text string to the canvas text overlay.
-	//
-	// The text isn't drawn immediately; it is marked as rendering, which will
-	// result in its addition to the canvas on the next render pass.
-	//
-	// @param {string} layer A string of space-separated CSS classes uniquely
-	//     identifying the layer containing this text.
-	// @param {number} x X coordinate at which to draw the text.
-	// @param {number} y Y coordinate at which to draw the text.
-	// @param {string} text Text string to draw.
-	// @param {(string|object)=} font Either a string of space-separated CSS
-	//     classes or a font-spec object, defining the text's font and style.
-	// @param {number=} angle Angle at which to rotate the text, in degrees.
-	//     Angle is currently unused, it will be implemented in the future.
-	// @param {number=} width Maximum width of the text before it wraps.
-	// @param {string=} halign Horizontal alignment of the text; either "left",
-	//     "center" or "right".
-	// @param {string=} valign Vertical alignment of the text; either "top",
-	//     "middle" or "bottom".
-
-	Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
-
-		var info = this.getTextInfo(layer, text, font, angle, width),
-			positions = info.positions;
-
-		// Tweak the div's position to match the text's alignment
-
-		if (halign == "center") {
-			x -= info.width / 2;
-		} else if (halign == "right") {
-			x -= info.width;
-		}
-
-		if (valign == "middle") {
-			y -= info.height / 2;
-		} else if (valign == "bottom") {
-			y -= info.height;
-		}
-
-		// Determine whether this text already exists at this position.
-		// If so, mark it for inclusion in the next render pass.
-
-		for (var i = 0, position; position = positions[i]; i++) {
-			if (position.x == x && position.y == y) {
-				position.active = true;
-				return;
-			}
-		}
-
-		// If the text doesn't exist at this position, create a new entry
-
-		// For the very first position we'll re-use the original element,
-		// while for subsequent ones we'll clone it.
-
-		position = {
-			active: true,
-			rendered: false,
-			element: positions.length ? info.element.clone() : info.element,
-			x: x,
-			y: y
-		};
-
-		positions.push(position);
-
-		// Move the element to its final position within the container
-
-		position.element.css({
-			top: Math.round(y),
-			left: Math.round(x),
-			'text-align': halign	// In case the text wraps
-		});
-	};
-
-	// Removes one or more text strings from the canvas text overlay.
-	//
-	// If no parameters are given, all text within the layer is removed.
-	//
-	// Note that the text is not immediately removed; it is simply marked as
-	// inactive, which will result in its removal on the next render pass.
-	// This avoids the performance penalty for 'clear and redraw' behavior,
-	// where we potentially get rid of all text on a layer, but will likely
-	// add back most or all of it later, as when redrawing axes, for example.
-	//
-	// @param {string} layer A string of space-separated CSS classes uniquely
-	//     identifying the layer containing this text.
-	// @param {number=} x X coordinate of the text.
-	// @param {number=} y Y coordinate of the text.
-	// @param {string=} text Text string to remove.
-	// @param {(string|object)=} font Either a string of space-separated CSS
-	//     classes or a font-spec object, defining the text's font and style.
-	// @param {number=} angle Angle at which the text is rotated, in degrees.
-	//     Angle is currently unused, it will be implemented in the future.
-
-	Canvas.prototype.removeText = function(layer, x, y, text, font, angle) {
-		if (text == null) {
-			var layerCache = this._textCache[layer];
-			if (layerCache != null) {
-				for (var styleKey in layerCache) {
-					if (hasOwnProperty.call(layerCache, styleKey)) {
-						var styleCache = layerCache[styleKey];
-						for (var key in styleCache) {
-							if (hasOwnProperty.call(styleCache, key)) {
-								var positions = styleCache[key].positions;
-								for (var i = 0, position; position = positions[i]; i++) {
-									position.active = false;
-								}
-							}
-						}
-					}
-				}
-			}
-		} else {
-			var positions = this.getTextInfo(layer, text, font, angle).positions;
-			for (var i = 0, position; position = positions[i]; i++) {
-				if (position.x == x && position.y == y) {
-					position.active = false;
-				}
-			}
-		}
-	};
-
-	///////////////////////////////////////////////////////////////////////////
-	// The top-level container for the entire plot.
-
-    function Plot(placeholder, data_, options_, plugins) {
-        // data is on the form:
-        //   [ series1, series2 ... ]
-        // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
-        // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
-
-        var series = [],
-            options = {
-                // the color theme used for graphs
-                colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"],
-                legend: {
-                    show: true,
-                    noColumns: 1, // number of columns in legend table
-                    labelFormatter: null, // fn: string -> string
-                    labelBoxBorderColor: "#ccc", // border color for the little label boxes
-                    container: null, // container (as jQuery object) to put legend in, null means default on top of graph
-                    position: "ne", // position of default legend container within plot
-                    margin: 5, // distance from grid edge to default legend container within plot
-                    backgroundColor: null, // null means auto-detect
-                    backgroundOpacity: 0.85, // set to 0 to avoid background
-                    sorted: null    // default to no legend sorting
-                },
-                xaxis: {
-                    show: null, // null = auto-detect, true = always, false = never
-                    position: "bottom", // or "top"
-                    mode: null, // null or "time"
-                    font: null, // null (derived from CSS in placeholder) or object like { size: 11, lineHeight: 13, style: "italic", weight: "bold", family: "sans-serif", variant: "small-caps" }
-                    color: null, // base color, labels, ticks
-                    tickColor: null, // possibly different color of ticks, e.g. "rgba(0,0,0,0.15)"
-                    transform: null, // null or f: number -> number to transform axis
-                    inverseTransform: null, // if transform is set, this should be the inverse function
-                    min: null, // min. value to show, null means set automatically
-                    max: null, // max. value to show, null means set automatically
-                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
-                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
-                    tickFormatter: null, // fn: number -> string
-                    labelWidth: null, // size of tick labels in pixels
-                    labelHeight: null,
-                    reserveSpace: null, // whether to reserve space even if axis isn't shown
-                    tickLength: null, // size in pixels of ticks, or "full" for whole line
-                    alignTicksWithAxis: null, // axis number or null for no sync
-                    tickDecimals: null, // no. of decimals, null means auto
-                    tickSize: null, // number or [number, "unit"]
-                    minTickSize: null // number or [number, "unit"]
-                },
-                yaxis: {
-                    autoscaleMargin: 0.02,
-                    position: "left" // or "right"
-                },
-                xaxes: [],
-                yaxes: [],
-                series: {
-                    points: {
-                        show: false,
-                        radius: 3,
-                        lineWidth: 2, // in pixels
-                        fill: true,
-                        fillColor: "#ffffff",
-                        symbol: "circle" // or callback
-                    },
-                    lines: {
-                        // we don't put in show: false so we can see
-                        // whether lines were actively disabled
-                        lineWidth: 2, // in pixels
-                        fill: false,
-                        fillColor: null,
-                        steps: false
-                        // Omit 'zero', so we can later default its value to
-                        // match that of the 'fill' option.
-                    },
-                    bars: {
-                        show: false,
-                        lineWidth: 2, // in pixels
-                        barWidth: 1, // in units of the x axis
-                        fill: true,
-                        fillColor: null,
-                        align: "left", // "left", "right", or "center"
-                        horizontal: false,
-                        zero: true
-                    },
-                    shadowSize: 3,
-                    highlightColor: null
-                },
-                grid: {
-                    show: true,
-                    aboveData: false,
-                    color: "#545454", // primary color used for outline and labels
-                    backgroundColor: null, // null for transparent, else color
-                    borderColor: null, // set if different from the grid color
-                    tickColor: null, // color for the ticks, e.g. "rgba(0,0,0,0.15)"
-                    margin: 0, // distance from the canvas edge to the grid
-                    labelMargin: 5, // in pixels
-                    axisMargin: 8, // in pixels
-                    borderWidth: 2, // in pixels
-                    minBorderMargin: null, // in pixels, null means taken from points radius
-                    markings: null, // array of ranges or fn: axes -> array of ranges
-                    markingsColor: "#f4f4f4",
-                    markingsLineWidth: 2,
-                    // interactive stuff
-                    clickable: false,
-                    hoverable: false,
-                    autoHighlight: true, // highlight in case mouse is near
-                    mouseActiveRadius: 10 // how far the mouse can be away to activate an item
-                },
-                interaction: {
-                    redrawOverlayInterval: 1000/60 // time between updates, -1 means in same flow
-                },
-                hooks: {}
-            },
-        surface = null,     // the canvas for the plot itself
-        overlay = null,     // canvas for interactive stuff on top of plot
-        eventHolder = null, // jQuery object that events should be bound to
-        ctx = null, octx = null,
-        xaxes = [], yaxes = [],
-        plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
-        plotWidth = 0, plotHeight = 0,
-        hooks = {
-            processOptions: [],
-            processRawData: [],
-            processDatapoints: [],
-            processOffset: [],
-            drawBackground: [],
-            drawSeries: [],
-            draw: [],
-            bindEvents: [],
-            drawOverlay: [],
-            shutdown: []
-        },
-        plot = this;
-
-        // public functions
-        plot.setData = setData;
-        plot.setupGrid = setupGrid;
-        plot.draw = draw;
-        plot.getPlaceholder = function() { return placeholder; };
-        plot.getCanvas = function() { return surface.element; };
-        plot.getPlotOffset = function() { return plotOffset; };
-        plot.width = function () { return plotWidth; };
-        plot.height = function () { return plotHeight; };
-        plot.offset = function () {
-            var o = eventHolder.offset();
-            o.left += plotOffset.left;
-            o.top += plotOffset.top;
-            return o;
-        };
-        plot.getData = function () { return series; };
-        plot.getAxes = function () {
-            var res = {}, i;
-            $.each(xaxes.concat(yaxes), function (_, axis) {
-                if (axis)
-                    res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis;
-            });
-            return res;
-        };
-        plot.getXAxes = function () { return xaxes; };
-        plot.getYAxes = function () { return yaxes; };
-        plot.c2p = canvasToAxisCoords;
-        plot.p2c = axisToCanvasCoords;
-        plot.getOptions = function () { return options; };
-        plot.highlight = highlight;
-        plot.unhighlight = unhighlight;
-        plot.triggerRedrawOverlay = triggerRedrawOverlay;
-        plot.pointOffset = function(point) {
-            return {
-                left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left, 10),
-                top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top, 10)
-            };
-        };
-        plot.shutdown = shutdown;
-        plot.destroy = function () {
-            shutdown();
-            placeholder.removeData("plot").empty();
-
-            series = [];
-            options = null;
-            surface = null;
-            overlay = null;
-            eventHolder = null;
-            ctx = null;
-            octx = null;
-            xaxes = [];
-            yaxes = [];
-            hooks = null;
-            highlights = [];
-            plot = null;
-        };
-        plot.resize = function () {
-        	var width = placeholder.width(),
-        		height = placeholder.height();
-            surface.resize(width, height);
-            overlay.resize(width, height);
-        };
-
-        // public attributes
-        plot.hooks = hooks;
-
-        // initialize
-        initPlugins(plot);
-        parseOptions(options_);
-        setupCanvases();
-        setData(data_);
-        setupGrid();
-        draw();
-        bindEvents();
-
-
-        function executeHooks(hook, args) {
-            args = [plot].concat(args);
-            for (var i = 0; i < hook.length; ++i)
-                hook[i].apply(this, args);
-        }
-
-        function initPlugins() {
-
-            // References to key classes, allowing plugins to modify them
-
-            var classes = {
-                Canvas: Canvas
-            };
-
-            for (var i = 0; i < plugins.length; ++i) {
-                var p = plugins[i];
-                p.init(plot, classes);
-                if (p.options)
-                    $.extend(true, options, p.options);
-            }
-        }
-
-        function parseOptions(opts) {
-
-            $.extend(true, options, opts);
-
-            // $.extend merges arrays, rather than replacing them.  When less
-            // colors are provided than the size of the default palette, we
-            // end up with those colors plus the remaining defaults, which is
-            // not expected behavior; avoid it by replacing them here.
-
-            if (opts && opts.colors) {
-            	options.colors = opts.colors;
-            }
-
-            if (options.xaxis.color == null)
-                options.xaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
-            if (options.yaxis.color == null)
-                options.yaxis.color = $.color.parse(options.grid.color).scale('a', 0.22).toString();
-
-            if (options.xaxis.tickColor == null) // grid.tickColor for back-compatibility
-                options.xaxis.tickColor = options.grid.tickColor || options.xaxis.color;
-            if (options.yaxis.tickColor == null) // grid.tickColor for back-compatibility
-                options.yaxis.tickColor = options.grid.tickColor || options.yaxis.color;
-
-            if (options.grid.borderColor == null)
-                options.grid.borderColor = options.grid.color;
-            if (options.grid.tickColor == null)
-                options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString();
-
-            // Fill in defaults for axis options, including any unspecified
-            // font-spec fields, if a font-spec was provided.
-
-            // If no x/y axis options were provided, create one of each anyway,
-            // since the rest of the code assumes that they exist.
-
-            var i, axisOptions, axisCount,
-                fontSize = placeholder.css("font-size"),
-                fontSizeDefault = fontSize ? +fontSize.replace("px", "") : 13,
-                fontDefaults = {
-                    style: placeholder.css("font-style"),
-                    size: Math.round(0.8 * fontSizeDefault),
-                    variant: placeholder.css("font-variant"),
-                    weight: placeholder.css("font-weight"),
-                    family: placeholder.css("font-family")
-                };
-
-            axisCount = options.xaxes.length || 1;
-            for (i = 0; i < axisCount; ++i) {
-
-                axisOptions = options.xaxes[i];
-                if (axisOptions && !axisOptions.tickColor) {
-                    axisOptions.tickColor = axisOptions.color;
-                }
-
-                axisOptions = $.extend(true, {}, options.xaxis, axisOptions);
-                options.xaxes[i] = axisOptions;
-
-                if (axisOptions.font) {
-                    axisOptions.font = $.extend({}, fontDefaults, axisOptions.font);
-                    if (!axisOptions.font.color) {
-                        axisOptions.font.color = axisOptions.color;
-                    }
-                    if (!axisOptions.font.lineHeight) {
-                        axisOptions.font.lineHeight = Math.round(axisOptions.font.size * 1.15);
-                    }
-                }
-            }
-
-            axisCount = options.yaxes.length || 1;
-            for (i = 0; i < axisCount; ++i) {
-
-                axisOptions = options.yaxes[i];
-                if (axisOptions && !axisOptions.tickColor) {
-                    axisOptions.tickColor = axisOptions.color;
-                }
-
-                axisOptions = $.extend(true, {}, options.yaxis, axisOptions);
-                options.yaxes[i] = axisOptions;
-
-                if (axisOptions.font) {
-                    axisOptions.font = $.extend({}, fontDefaults, axisOptions.font);
-                    if (!axisOptions.font.color) {
-                        axisOptions.font.color = axisOptions.color;
-                    }
-                    if (!axisOptions.font.lineHeight) {
-                        axisOptions.font.lineHeight = Math.round(axisOptions.font.size * 1.15);
-                    }
-                }
-            }
-
-            // backwards compatibility, to be removed in future
-            if (options.xaxis.noTicks && options.xaxis.ticks == null)
-                options.xaxis.ticks = options.xaxis.noTicks;
-            if (options.yaxis.noTicks && options.yaxis.ticks == null)
-                options.yaxis.ticks = options.yaxis.noTicks;
-            if (options.x2axis) {
-                options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis);
-                options.xaxes[1].position = "top";
-                // Override the inherit to allow the axis to auto-scale
-                if (options.x2axis.min == null) {
-                    options.xaxes[1].min = null;
-                }
-                if (options.x2axis.max == null) {
-                    options.xaxes[1].max = null;
-                }
-            }
-            if (options.y2axis) {
-                options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis);
-                options.yaxes[1].position = "right";
-                // Override the inherit to allow the axis to auto-scale
-                if (options.y2axis.min == null) {
-                    options.yaxes[1].min = null;
-                }
-                if (options.y2axis.max == null) {
-                    options.yaxes[1].max = null;
-                }
-            }
-            if (options.grid.coloredAreas)
-                options.grid.markings = options.grid.coloredAreas;
-            if (options.grid.coloredAreasColor)
-                options.grid.markingsColor = options.grid.coloredAreasColor;
-            if (options.lines)
-                $.extend(true, options.series.lines, options.lines);
-            if (options.points)
-                $.extend(true, options.series.points, options.points);
-            if (options.bars)
-                $.extend(true, options.series.bars, options.bars);
-            if (options.shadowSize != null)
-                options.series.shadowSize = options.shadowSize;
-            if (options.highlightColor != null)
-                options.series.highlightColor = options.highlightColor;
-
-            // save options on axes for future reference
-            for (i = 0; i < options.xaxes.length; ++i)
-                getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i];
-            for (i = 0; i < options.yaxes.length; ++i)
-                getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i];
-
-            // add hooks from options
-            for (var n in hooks)
-                if (options.hooks[n] && options.hooks[n].length)
-                    hooks[n] = hooks[n].concat(options.hooks[n]);
-
-            executeHooks(hooks.processOptions, [options]);
-        }
-
-        function setData(d) {
-            series = parseData(d);
-            fillInSeriesOptions();
-            processData();
-        }
-
-        function parseData(d) {
-            var res = [];
-            for (var i = 0; i < d.length; ++i) {
-                var s = $.extend(true, {}, options.series);
-
-                if (d[i].data != null) {
-                    s.data = d[i].data; // move the data instead of deep-copy
-                    delete d[i].data;
-
-                    $.extend(true, s, d[i]);
-
-                    d[i].data = s.data;
-                }
-                else
-                    s.data = d[i];
-                res.push(s);
-            }
-
-            return res;
-        }
-
-        function axisNumber(obj, coord) {
-            var a = obj[coord + "axis"];
-            if (typeof a == "object") // if we got a real axis, extract number
-                a = a.n;
-            if (typeof a != "number")
-                a = 1; // default to first axis
-            return a;
-        }
-
-        function allAxes() {
-            // return flat array without annoying null entries
-            return $.grep(xaxes.concat(yaxes), function (a) { return a; });
-        }
-
-        function canvasToAxisCoords(pos) {
-            // return an object with x/y corresponding to all used axes
-            var res = {}, i, axis;
-            for (i = 0; i < xaxes.length; ++i) {
-                axis = xaxes[i];
-                if (axis && axis.used)
-                    res["x" + axis.n] = axis.c2p(pos.left);
-            }
-
-            for (i = 0; i < yaxes.length; ++i) {
-                axis = yaxes[i];
-                if (axis && axis.used)
-                    res["y" + axis.n] = axis.c2p(pos.top);
-            }
-
-            if (res.x1 !== undefined)
-                res.x = res.x1;
-            if (res.y1 !== undefined)
-                res.y = res.y1;
-
-            return res;
-        }
-
-        function axisToCanvasCoords(pos) {
-            // get canvas coords from the first pair of x/y found in pos
-            var res = {}, i, axis, key;
-
-            for (i = 0; i < xaxes.length; ++i) {
-                axis = xaxes[i];
-                if (axis && axis.used) {
-                    key = "x" + axis.n;
-                    if (pos[key] == null && axis.n == 1)
-                        key = "x";
-
-                    if (pos[key] != null) {
-                        res.left = axis.p2c(pos[key]);
-                        break;
-                    }
-                }
-            }
-
-            for (i = 0; i < yaxes.length; ++i) {
-                axis = yaxes[i];
-                if (axis && axis.used) {
-                    key = "y" + axis.n;
-                    if (pos[key] == null && axis.n == 1)
-                        key = "y";
-
-                    if (pos[key] != null) {
-                        res.top = axis.p2c(pos[key]);
-                        break;
-                    }
-                }
-            }
-
-            return res;
-        }
-
-        function getOrCreateAxis(axes, number) {
-            if (!axes[number - 1])
-                axes[number - 1] = {
-                    n: number, // save the number for future reference
-                    direction: axes == xaxes ? "x" : "y",
-                    options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis)
-                };
-
-            return axes[number - 1];
-        }
-
-        function fillInSeriesOptions() {
-
-            var neededColors = series.length, maxIndex = -1, i;
-
-            // Subtract the number of series that already have fixed colors or
-            // color indexes from the number that we still need to generate.
-
-            for (i = 0; i < series.length; ++i) {
-                var sc = series[i].color;
-                if (sc != null) {
-                    neededColors--;
-                    if (typeof sc == "number" && sc > maxIndex) {
-                        maxIndex = sc;
-                    }
-                }
-            }
-
-            // If any of the series have fixed color indexes, then we need to
-            // generate at least as many colors as the highest index.
-
-            if (neededColors <= maxIndex) {
-                neededColors = maxIndex + 1;
-            }
-
-            // Generate all the colors, using first the option colors and then
-            // variations on those colors once they're exhausted.
-
-            var c, colors = [], colorPool = options.colors,
-                colorPoolSize = colorPool.length, variation = 0;
-
-            for (i = 0; i < neededColors; i++) {
-
-                c = $.color.parse(colorPool[i % colorPoolSize] || "#666");
-
-                // Each time we exhaust the colors in the pool we adjust
-                // a scaling factor used to produce more variations on
-                // those colors. The factor alternates negative/positive
-                // to produce lighter/darker colors.
-
-                // Reset the variation after every few cycles, or else
-                // it will end up producing only white or black colors.
-
-                if (i % colorPoolSize == 0 && i) {
-                    if (variation >= 0) {
-                        if (variation < 0.5) {
-                            variation = -variation - 0.2;
-                        } else variation = 0;
-                    } else variation = -variation;
-                }
-
-                colors[i] = c.scale('rgb', 1 + variation);
-            }
-
-            // Finalize the series options, filling in their colors
-
-            var colori = 0, s;
-            for (i = 0; i < series.length; ++i) {
-                s = series[i];
-
-                // assign colors
-                if (s.color == null) {
-                    s.color = colors[colori].toString();
-                    ++colori;
-                }
-                else if (typeof s.color == "number")
-                    s.color = colors[s.color].toString();
-
-                // turn on lines automatically in case nothing is set
-                if (s.lines.show == null) {
-                    var v, show = true;
-                    for (v in s)
-                        if (s[v] && s[v].show) {
-                            show = false;
-                            break;
-                        }
-                    if (show)
-                        s.lines.show = true;
-                }
-
-                // If nothing was provided for lines.zero, default it to match
-                // lines.fill, since areas by default should extend to zero.
-
-                if (s.lines.zero == null) {
-                    s.lines.zero = !!s.lines.fill;
-                }
-
-                // setup axes
-                s.xaxis = getOrCreateAxis(xaxes, axisNumber(s, "x"));
-                s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y"));
-            }
-        }
-
-        function processData() {
-            var topSentry = Number.POSITIVE_INFINITY,
-                bottomSentry = Number.NEGATIVE_INFINITY,
-                fakeInfinity = Number.MAX_VALUE,
-                i, j, k, m, length,
-                s, points, ps, x, y, axis, val, f, p,
-                data, format;
-
-            function updateAxis(axis, min, max) {
-                if (min < axis.datamin && min != -fakeInfinity)
-                    axis.datamin = min;
-                if (max > axis.datamax && max != fakeInfinity)
-                    axis.datamax = max;
-            }
-
-            $.each(allAxes(), function (_, axis) {
-                // init axis
-                axis.datamin = topSentry;
-                axis.datamax = bottomSentry;
-                axis.used = false;
-            });
-
-            for (i = 0; i < series.length; ++i) {
-                s = series[i];
-                s.datapoints = { points: [] };
-
-                executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
-            }
-
-            // first pass: clean and copy data
-            for (i = 0; i < series.length; ++i) {
-                s = series[i];
-
-                data = s.data;
-                format = s.datapoints.format;
-
-                if (!format) {
-                    format = [];
-                    // find out how to copy
-                    format.push({ x: true, number: true, required: true });
-                    format.push({ y: true, number: true, required: true });
-
-                    if (s.bars.show || (s.lines.show && s.lines.fill)) {
-                        var autoscale = !!((s.bars.show && s.bars.zero) || (s.lines.show && s.lines.zero));
-                        format.push({ y: true, number: true, required: false, defaultValue: 0, autoscale: autoscale });
-                        if (s.bars.horizontal) {
-                            delete format[format.length - 1].y;
-                            format[format.length - 1].x = true;
-                        }
-                    }
-
-                    s.datapoints.format = format;
-                }
-
-                if (s.datapoints.pointsize != null)
-                    continue; // already filled in
-
-                s.datapoints.pointsize = format.length;
-
-                ps = s.datapoints.pointsize;
-                points = s.datapoints.points;
-
-                var insertSteps = s.lines.show && s.lines.steps;
-                s.xaxis.used = s.yaxis.used = true;
-
-                for (j = k = 0; j < data.length; ++j, k += ps) {
-                    p = data[j];
-
-                    var nullify = p == null;
-                    if (!nullify) {
-                        for (m = 0; m < ps; ++m) {
-                            val = p[m];
-                            f = format[m];
-
-                            if (f) {
-                                if (f.number && val != null) {
-                                    val = +val; // convert to number
-                                    if (isNaN(val))
-                                        val = null;
-                                    else if (val == Infinity)
-                                        val = fakeInfinity;
-                                    else if (val == -Infinity)
-                                        val = -fakeInfinity;
-                                }
-
-                                if (val == null) {
-                                    if (f.required)
-                                        nullify = true;
-
-                                    if (f.defaultValue != null)
-                                        val = f.defaultValue;
-                                }
-                            }
-
-                            points[k + m] = val;
-                        }
-                    }
-
-                    if (nullify) {
-                        for (m = 0; m < ps; ++m) {
-                            val = points[k + m];
-                            if (val != null) {
-                                f = format[m];
-                                // extract min/max info
-                                if (f.autoscale !== false) {
-                                    if (f.x) {
-                                        updateAxis(s.xaxis, val, val);
-                                    }
-                                    if (f.y) {
-                                        updateAxis(s.yaxis, val, val);
-                                    }
-                                }
-                            }
-                            points[k + m] = null;
-                        }
-                    }
-                    else {
-                        // a little bit of line specific stuff that
-                        // perhaps shouldn't be here, but lacking
-                        // better means...
-                        if (insertSteps && k > 0
-                            && points[k - ps] != null
-                            && points[k - ps] != points[k]
-                            && points[k - ps + 1] != points[k + 1]) {
-                            // copy the point to make room for a middle point
-                            for (m = 0; m < ps; ++m)
-                                points[k + ps + m] = points[k + m];
-
-                            // middle point has same y
-                            points[k + 1] = points[k - ps + 1];
-
-                            // we've added a point, better reflect that
-                            k += ps;
-                        }
-                    }
-                }
-            }
-
-            // give the hooks a chance to run
-            for (i = 0; i < series.length; ++i) {
-                s = series[i];
-
-                executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
-            }
-
-            // second pass: find datamax/datamin for auto-scaling
-            for (i = 0; i < series.length; ++i) {
-                s = series[i];
-                points = s.datapoints.points;
-                ps = s.datapoints.pointsize;
-                format = s.datapoints.format;
-
-                var xmin = topSentry, ymin = topSentry,
-                    xmax = bottomSentry, ymax = bottomSentry;
-
-                for (j = 0; j < points.length; j += ps) {
-                    if (points[j] == null)
-                        continue;
-
-                    for (m = 0; m < ps; ++m) {
-                        val = points[j + m];
-                        f = format[m];
-                        if (!f || f.autoscale === false || val == fakeInfinity || val == -fakeInfinity)
-                            continue;
-
-                        if (f.x) {
-                            if (val < xmin)
-                                xmin = val;
-                            if (val > xmax)
-                                xmax = val;
-                        }
-                        if (f.y) {
-                            if (val < ymin)
-                                ymin = val;
-                            if (val > ymax)
-                                ymax = val;
-                        }
-                    }
-                }
-
-                if (s.bars.show) {
-                    // make sure we got room for the bar on the dancing floor
-                    var delta;
-
-                    switch (s.bars.align) {
-                        case "left":
-                            delta = 0;
-                            break;
-                        case "right":
-                            delta = -s.bars.barWidth;
-                            break;
-                        default:
-                            delta = -s.bars.barWidth / 2;
-                    }
-
-                    if (s.bars.horizontal) {
-                        ymin += delta;
-                        ymax += delta + s.bars.barWidth;
-                    }
-                    else {
-                        xmin += delta;
-                        xmax += delta + s.bars.barWidth;
-                    }
-                }
-
-                updateAxis(s.xaxis, xmin, xmax);
-                updateAxis(s.yaxis, ymin, ymax);
-            }
-
-            $.each(allAxes(), function (_, axis) {
-                if (axis.datamin == topSentry)
-                    axis.datamin = null;
-                if (axis.datamax == bottomSentry)
-                    axis.datamax = null;
-            });
-        }
-
-        function setupCanvases() {
-
-            // Make sure the placeholder is clear of everything except canvases
-            // from a previous plot in this container that we'll try to re-use.
-
-            placeholder.css("padding", 0) // padding messes up the positioning
-                .children().filter(function(){
-                    return !$(this).hasClass("flot-overlay") && !$(this).hasClass('flot-base');
-                }).remove();
-
-            if (placeholder.css("position") == 'static')
-                placeholder.css("position", "relative"); // for positioning labels and overlay
-
-            surface = new Canvas("flot-base", placeholder);
-            overlay = new Canvas("flot-overlay", placeholder); // overlay canvas for interactive features
-
-            ctx = surface.context;
-            octx = overlay.context;
-
-            // define which element we're listening for events on
-            eventHolder = $(overlay.element).unbind();
-
-            // If we're re-using a plot object, shut down the old one
-
-            var existing = placeholder.data("plot");
-
-            if (existing) {
-                existing.shutdown();
-                overlay.clear();
-            }
-
-            // save in case we get replotted
-            placeholder.data("plot", plot);
-        }
-
-        function bindEvents() {
-            // bind events
-            if (options.grid.hoverable) {
-                eventHolder.mousemove(onMouseMove);
-
-                // Use bind, rather than .mouseleave, because we officially
-                // still support jQuery 1.2.6, which doesn't define a shortcut
-                // for mouseenter or mouseleave.  This was a bug/oversight that
-                // was fixed somewhere around 1.3.x.  We can return to using
-                // .mouseleave when we drop support for 1.2.6.
-
-                eventHolder.bind("mouseleave", onMouseLeave);
-            }
-
-            if (options.grid.clickable)
-                eventHolder.click(onClick);
-
-            executeHooks(hooks.bindEvents, [eventHolder]);
-        }
-
-        function shutdown() {
-            if (redrawTimeout)
-                clearTimeout(redrawTimeout);
-
-            eventHolder.unbind("mousemove", onMouseMove);
-            eventHolder.unbind("mouseleave", onMouseLeave);
-            eventHolder.unbind("click", onClick);
-
-            executeHooks(hooks.shutdown, [eventHolder]);
-        }
-
-        function setTransformationHelpers(axis) {
-            // set helper functions on the axis, assumes plot area
-            // has been computed already
-
-            function identity(x) { return x; }
-
-            var s, m, t = axis.options.transform || identity,
-                it = axis.options.inverseTransform;
-
-            // precompute how much the axis is scaling a point
-            // in canvas space
-            if (axis.direction == "x") {
-                s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min));
-                m = Math.min(t(axis.max), t(axis.min));
-            }
-            else {
-                s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min));
-                s = -s;
-                m = Math.max(t(axis.max), t(axis.min));
-            }
-
-            // data point to canvas coordinate
-            if (t == identity) // slight optimization
-                axis.p2c = function (p) { return (p - m) * s; };
-            else
-                axis.p2c = function (p) { return (t(p) - m) * s; };
-            // canvas coordinate to data point
-            if (!it)
-                axis.c2p = function (c) { return m + c / s; };
-            else
-                axis.c2p = function (c) { return it(m + c / s); };
-        }
-
-        function measureTickLabels(axis) {
-
-            var opts = axis.options,
-                ticks = axis.ticks || [],
-                labelWidth = opts.labelWidth || 0,
-                labelHeight = opts.labelHeight || 0,
-                maxWidth = labelWidth || (axis.direction == "x" ? Math.floor(surface.width / (ticks.length || 1)) : null),
-                legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
-                layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
-                font = opts.font || "flot-tick-label tickLabel";
-
-            for (var i = 0; i < ticks.length; ++i) {
-
-                var t = ticks[i];
-
-                if (!t.label)
-                    continue;
-
-                var info = surface.getTextInfo(layer, t.label, font, null, maxWidth);
-
-                labelWidth = Math.max(labelWidth, info.width);
-                labelHeight = Math.max(labelHeight, info.height);
-            }
-
-            axis.labelWidth = opts.labelWidth || labelWidth;
-            axis.labelHeight = opts.labelHeight || labelHeight;
-        }
-
-        function allocateAxisBoxFirstPhase(axis) {
-            // find the bounding box of the axis by looking at label
-            // widths/heights and ticks, make room by diminishing the
-            // plotOffset; this first phase only looks at one
-            // dimension per axis, the other dimension depends on the
-            // other axes so will have to wait
-
-            var lw = axis.labelWidth,
-                lh = axis.labelHeight,
-                pos = axis.options.position,
-                isXAxis = axis.direction === "x",
-                tickLength = axis.options.tickLength,
-                axisMargin = options.grid.axisMargin,
-                padding = options.grid.labelMargin,
-                innermost = true,
-                outermost = true,
-                first = true,
-                found = false;
-
-            // Determine the axis's position in its direction and on its side
-
-            $.each(isXAxis ? xaxes : yaxes, function(i, a) {
-                if (a && (a.show || a.reserveSpace)) {
-                    if (a === axis) {
-                        found = true;
-                    } else if (a.options.position === pos) {
-                        if (found) {
-                            outermost = false;
-                        } else {
-                            innermost = false;
-                        }
-                    }
-                    if (!found) {
-                        first = false;
-                    }
-                }
-            });
-
-            // The outermost axis on each side has no margin
-
-            if (outermost) {
-                axisMargin = 0;
-            }
-
-            // The ticks for the first axis in each direction stretch across
-
-            if (tickLength == null) {
-                tickLength = first ? "full" : 5;
-            }
-
-            if (!isNaN(+tickLength))
-                padding += +tickLength;
-
-            if (isXAxis) {
-                lh += padding;
-
-                if (pos == "bottom") {
-                    plotOffset.bottom += lh + axisMargin;
-                    axis.box = { top: surface.height - plotOffset.bottom, height: lh };
-                }
-                else {
-                    axis.box = { top: plotOffset.top + axisMargin, height: lh };
-                    plotOffset.top += lh + axisMargin;
-                }
-            }
-            else {
-                lw += padding;
-
-                if (pos == "left") {
-                    axis.box = { left: plotOffset.left + axisMargin, width: lw };
-                    plotOffset.left += lw + axisMargin;
-                }
-                else {
-                    plotOffset.right += lw + axisMargin;
-                    axis.box = { left: surface.width - plotOffset.right, width: lw };
-                }
-            }
-
-             // save for future reference
-            axis.position = pos;
-            axis.tickLength = tickLength;
-            axis.box.padding = padding;
-            axis.innermost = innermost;
-        }
-
-        function allocateAxisBoxSecondPhase(axis) {
-            // now that all axis boxes have been placed in one
-            // dimension, we can set the remaining dimension coordinates
-            if (axis.direction == "x") {
-                axis.box.left = plotOffset.left - axis.labelWidth / 2;
-                axis.box.width = surface.width - plotOffset.left - plotOffset.right + axis.labelWidth;
-            }
-            else {
-                axis.box.top = plotOffset.top - axis.labelHeight / 2;
-                axis.box.height = surface.height - plotOffset.bottom - plotOffset.top + axis.labelHeight;
-            }
-        }
-
-        function adjustLayoutForThingsStickingOut() {
-            // possibly adjust plot offset to ensure everything stays
-            // inside the canvas and isn't clipped off
-
-            var minMargin = options.grid.minBorderMargin,
-                axis, i;
-
-            // check stuff from the plot (FIXME: this should just read
-            // a value from the series, otherwise it's impossible to
-            // customize)
-            if (minMargin == null) {
-                minMargin = 0;
-                for (i = 0; i < series.length; ++i)
-                    minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
-            }
-
-            var margins = {
-                left: minMargin,
-                right: minMargin,
-                top: minMargin,
-                bottom: minMargin
-            };
-
-            // check axis labels, note we don't check the actual
-            // labels but instead use the overall width/height to not
-            // jump as much around with replots
-            $.each(allAxes(), function (_, axis) {
-                if (axis.reserveSpace && axis.ticks && axis.ticks.length) {
-                    if (axis.direction === "x") {
-                        margins.left = Math.max(margins.left, axis.labelWidth / 2);
-                        margins.right = Math.max(margins.right, axis.labelWidth / 2);
-                    } else {
-                        margins.bottom = Math.max(margins.bottom, axis.labelHeight / 2);
-                        margins.top = Math.max(margins.top, axis.labelHeight / 2);
-                    }
-                }
-            });
-
-            plotOffset.left = Math.ceil(Math.max(margins.left, plotOffset.left));
-            plotOffset.right = Math.ceil(Math.max(margins.right, plotOffset.right));
-            plotOffset.top = Math.ceil(Math.max(margins.top, plotOffset.top));
-            plotOffset.bottom = Math.ceil(Math.max(margins.bottom, plotOffset.bottom));
-        }
-
-        function setupGrid() {
-            var i, axes = allAxes(), showGrid = options.grid.show;
-
-            // Initialize the plot's offset from the edge of the canvas
-
-            for (var a in plotOffset) {
-                var margin = options.grid.margin || 0;
-                plotOffset[a] = typeof margin == "number" ? margin : margin[a] || 0;
-            }
-
-            executeHooks(hooks.processOffset, [plotOffset]);
-
-            // If the grid is visible, add its border width to the offset
-
-            for (var a in plotOffset) {
-                if(typeof(options.grid.borderWidth) == "object") {
-                    plotOffset[a] += showGrid ? options.grid.borderWidth[a] : 0;
-                }
-                else {
-                    plotOffset[a] += showGrid ? options.grid.borderWidth : 0;
-                }
-            }
-
-            $.each(axes, function (_, axis) {
-                var axisOpts = axis.options;
-                axis.show = axisOpts.show == null ? axis.used : axisOpts.show;
-                axis.reserveSpace = axisOpts.reserveSpace == null ? axis.show : axisOpts.reserveSpace;
-                setRange(axis);
-            });
-
-            if (showGrid) {
-
-                var allocatedAxes = $.grep(axes, function (axis) {
-                    return axis.show || axis.reserveSpace;
-                });
-
-                $.each(allocatedAxes, function (_, axis) {
-                    // make the ticks
-                    setupTickGeneration(axis);
-                    setTicks(axis);
-                    snapRangeToTicks(axis, axis.ticks);
-                    // find labelWidth/Height for axis
-                    measureTickLabels(axis);
-                });
-
-                // with all dimensions calculated, we can compute the
-                // axis bounding boxes, start from the outside
-                // (reverse order)
-                for (i = allocatedAxes.length - 1; i >= 0; --i)
-                    allocateAxisBoxFirstPhase(allocatedAxes[i]);
-
-                // make sure we've got enough space for things that
-                // might stick out
-                adjustLayoutForThingsStickingOut();
-
-                $.each(allocatedAxes, function (_, axis) {
-                    allocateAxisBoxSecondPhase(axis);
-                });
-            }
-
-            plotWidth = surface.width - plotOffset.left - plotOffset.right;
-            plotHeight = surface.height - plotOffset.bottom - plotOffset.top;
-
-            // now we got the proper plot dimensions, we can compute the scaling
-            $.each(axes, function (_, axis) {
-                setTransformationHelpers(axis);
-            });
-
-            if (showGrid) {
-                drawAxisLabels();
-            }
-
-            insertLegend();
-        }
-
-        function setRange(axis) {
-            var opts = axis.options,
-                min = +(opts.min != null ? opts.min : axis.datamin),
-                max = +(opts.max != null ? opts.max : axis.datamax),
-                delta = max - min;
-
-            if (delta == 0.0) {
-                // degenerate case
-                var widen = max == 0 ? 1 : 0.01;
-
-                if (opts.min == null)
-                    min -= widen;
-                // always widen max if we couldn't widen min to ensure we
-                // don't fall into min == max which doesn't work
-                if (opts.max == null || opts.min != null)
-                    max += widen;
-            }
-            else {
-                // consider autoscaling
-                var margin = opts.autoscaleMargin;
-                if (margin != null) {
-                    if (opts.min == null) {
-                        min -= delta * margin;
-                        // make sure we don't go below zero if all values
-                        // are positive
-                        if (min < 0 && axis.datamin != null && axis.datamin >= 0)
-                            min = 0;
-                    }
-                    if (opts.max == null) {
-                        max += delta * margin;
-                        if (max > 0 && axis.datamax != null && axis.datamax <= 0)
-                            max = 0;
-                    }
-                }
-            }
-            axis.min = min;
-            axis.max = max;
-        }
-
-        function setupTickGeneration(axis) {
-            var opts = axis.options;
-
-            // estimate number of ticks
-            var noTicks;
-            if (typeof opts.ticks == "number" && opts.ticks > 0)
-                noTicks = opts.ticks;
-            else
-                // heuristic based on the model a*sqrt(x) fitted to
-                // some data points that seemed reasonable
-                noTicks = 0.3 * Math.sqrt(axis.direction == "x" ? surface.width : surface.height);
-
-            var delta = (axis.max - axis.min) / noTicks,
-                dec = -Math.floor(Math.log(delta) / Math.LN10),
-                maxDec = opts.tickDecimals;
-
-            if (maxDec != null && dec > maxDec) {
-                dec = maxDec;
-            }
-
-            var magn = Math.pow(10, -dec),
-                norm = delta / magn, // norm is between 1.0 and 10.0
-                size;
-
-            if (norm < 1.5) {
-                size = 1;
-            } else if (norm < 3) {
-                size = 2;
-                // special case for 2.5, requires an extra decimal
-                if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
-                    size = 2.5;
-                    ++dec;
-                }
-            } else if (norm < 7.5) {
-                size = 5;
-            } else {
-                size = 10;
-            }
-
-            size *= magn;
-
-            if (opts.minTickSize != null && size < opts.minTickSize) {
-                size = opts.minTickSize;
-            }
-
-            axis.delta = delta;
-            axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
-            axis.tickSize = opts.tickSize || size;
-
-            // Time mode was moved to a plug-in in 0.8, and since so many people use it
-            // we'll add an especially friendly reminder to make sure they included it.
-
-            if (opts.mode == "time" && !axis.tickGenerator) {
-                throw new Error("Time mode requires the flot.time plugin.");
-            }
-
-            // Flot supports base-10 axes; any other mode else is handled by a plug-in,
-            // like flot.time.js.
-
-            if (!axis.tickGenerator) {
-
-                axis.tickGenerator = function (axis) {
-
-                    var ticks = [],
-                        start = floorInBase(axis.min, axis.tickSize),
-                        i = 0,
-                        v = Number.NaN,
-                        prev;
-
-                    do {
-                        prev = v;
-                        v = start + i * axis.tickSize;
-                        ticks.push(v);
-                        ++i;
-                    } while (v < axis.max && v != prev);
-                    return ticks;
-                };
-
-				axis.tickFormatter = function (value, axis) {
-
-					var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1;
-					var formatted = "" + Math.round(value * factor) / factor;
-
-					// If tickDecimals was specified, ensure that we have exactly that
-					// much precision; otherwise default to the value's own precision.
-
-					if (axis.tickDecimals != null) {
-						var decimal = formatted.indexOf(".");
-						var precision = decimal == -1 ? 0 : formatted.length - decimal - 1;
-						if (precision < axis.tickDecimals) {
-							return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision);
-						}
-					}
-
-                    return formatted;
-                };
-            }
-
-            if ($.isFunction(opts.tickFormatter))
-                axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis); };
-
-            if (opts.alignTicksWithAxis != null) {
-                var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1];
-                if (otherAxis && otherAxis.used && otherAxis != axis) {
-                    // consider snapping min/max to outermost nice ticks
-                    var niceTicks = axis.tickGenerator(axis);
-                    if (niceTicks.length > 0) {
-                        if (opts.min == null)
-                            axis.min = Math.min(axis.min, niceTicks[0]);
-                        if (opts.max == null && niceTicks.length > 1)
-                            axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]);
-                    }
-
-                    axis.tickGenerator = function (axis) {
-                        // copy ticks, scaled to this axis
-                        var ticks = [], v, i;
-                        for (i = 0; i < otherAxis.ticks.length; ++i) {
-                            v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min);
-                            v = axis.min + v * (axis.max - axis.min);
-                            ticks.push(v);
-                        }
-                        return ticks;
-                    };
-
-                    // we might need an extra decimal since forced
-                    // ticks don't necessarily fit naturally
-                    if (!axis.mode && opts.tickDecimals == null) {
-                        var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1),
-                            ts = axis.tickGenerator(axis);
-
-                        // only proceed if the tick interval rounded
-                        // with an extra decimal doesn't give us a
-                        // zero at end
-                        if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec))))
-                            axis.tickDecimals = extraDec;
-                    }
-                }
-            }
-        }
-
-        function setTicks(axis) {
-            var oticks = axis.options.ticks, ticks = [];
-            if (oticks == null || (typeof oticks == "number" && oticks > 0))
-                ticks = axis.tickGenerator(axis);
-            else if (oticks) {
-                if ($.isFunction(oticks))
-                    // generate the ticks
-                    ticks = oticks(axis);
-                else
-                    ticks = oticks;
-            }
-
-            // clean up/labelify the supplied ticks, copy them over
-            var i, v;
-            axis.ticks = [];
-            for (i = 0; i < ticks.length; ++i) {
-                var label = null;
-                var t = ticks[i];
-                if (typeof t == "object") {
-                    v = +t[0];
-                    if (t.length > 1)
-                        label = t[1];
-                }
-                else
-                    v = +t;
-                if (label == null)
-                    label = axis.tickFormatter(v, axis);
-                if (!isNaN(v))
-                    axis.ticks.push({ v: v, label: label });
-            }
-        }
-
-        function snapRangeToTicks(axis, ticks) {
-            if (axis.options.autoscaleMargin && ticks.length > 0) {
-                // snap to ticks
-                if (axis.options.min == null)
-                    axis.min = Math.min(axis.min, ticks[0].v);
-                if (axis.options.max == null && ticks.length > 1)
-                    axis.max = Math.max(axis.max, ticks[ticks.length - 1].v);
-            }
-        }
-
-        function draw() {
-
-            surface.clear();
-
-            executeHooks(hooks.drawBackground, [ctx]);
-
-            var grid = options.grid;
-
-            // draw background, if any
-            if (grid.show && grid.backgroundColor)
-                drawBackground();
-
-            if (grid.show && !grid.aboveData) {
-                drawGrid();
-            }
-
-            for (var i = 0; i < series.length; ++i) {
-                executeHooks(hooks.drawSeries, [ctx, series[i]]);
-                drawSeries(series[i]);
-            }
-
-            executeHooks(hooks.draw, [ctx]);
-
-            if (grid.show && grid.aboveData) {
-                drawGrid();
-            }
-
-            surface.render();
-
-            // A draw implies that either the axes or data have changed, so we
-            // should probably update the overlay highlights as well.
-
-            triggerRedrawOverlay();
-        }
-
-        function extractRange(ranges, coord) {
-            var axis, from, to, key, axes = allAxes();
-
-            for (var i = 0; i < axes.length; ++i) {
-                axis = axes[i];
-                if (axis.direction == coord) {
-                    key = coord + axis.n + "axis";
-                    if (!ranges[key] && axis.n == 1)
-                        key = coord + "axis"; // support x1axis as xaxis
-                    if (ranges[key]) {
-                        from = ranges[key].from;
-                        to = ranges[key].to;
-                        break;
-                    }
-                }
-            }
-
-            // backwards-compat stuff - to be removed in future
-            if (!ranges[key]) {
-                axis = coord == "x" ? xaxes[0] : yaxes[0];
-                from = ranges[coord + "1"];
-                to = ranges[coord + "2"];
-            }
-
-            // auto-reverse as an added bonus
-            if (from != null && to != null && from > to) {
-                var tmp = from;
-                from = to;
-                to = tmp;
-            }
-
-            return { from: from, to: to, axis: axis };
-        }
-
-        function drawBackground() {
-            ctx.save();
-            ctx.translate(plotOffset.left, plotOffset.top);
-
-            ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
-            ctx.fillRect(0, 0, plotWidth, plotHeight);
-            ctx.restore();
-        }
-
-        function drawGrid() {
-            var i, axes, bw, bc;
-
-            ctx.save();
-            ctx.translate(plotOffset.left, plotOffset.top);
-
-            // draw markings
-            var markings = options.grid.markings;
-            if (markings) {
-                if ($.isFunction(markings)) {
-                    axes = plot.getAxes();
-                    // xmin etc. is backwards compatibility, to be
-                    // removed in the future
-                    axes.xmin = axes.xaxis.min;
-                    axes.xmax = axes.xaxis.max;
-                    axes.ymin = axes.yaxis.min;
-                    axes.ymax = axes.yaxis.max;
-
-                    markings = markings(axes);
-                }
-
-                for (i = 0; i < markings.length; ++i) {
-                    var m = markings[i],
-                        xrange = extractRange(m, "x"),
-                        yrange = extractRange(m, "y");
-
-                    // fill in missing
-                    if (xrange.from == null)
-                        xrange.from = xrange.axis.min;
-                    if (xrange.to == null)
-                        xrange.to = xrange.axis.max;
-                    if (yrange.from == null)
-                        yrange.from = yrange.axis.min;
-                    if (yrange.to == null)
-                        yrange.to = yrange.axis.max;
-
-                    // clip
-                    if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max ||
-                        yrange.to < yrange.axis.min || yrange.from > yrange.axis.max)
-                        continue;
-
-                    xrange.from = Math.max(xrange.from, xrange.axis.min);
-                    xrange.to = Math.min(xrange.to, xrange.axis.max);
-                    yrange.from = Math.max(yrange.from, yrange.axis.min);
-                    yrange.to = Math.min(yrange.to, yrange.axis.max);
-
-                    var xequal = xrange.from === xrange.to,
-                        yequal = yrange.from === yrange.to;
-
-                    if (xequal && yequal) {
-                        continue;
-                    }
-
-                    // then draw
-                    xrange.from = Math.floor(xrange.axis.p2c(xrange.from));
-                    xrange.to = Math.floor(xrange.axis.p2c(xrange.to));
-                    yrange.from = Math.floor(yrange.axis.p2c(yrange.from));
-                    yrange.to = Math.floor(yrange.axis.p2c(yrange.to));
-
-                    if (xequal || yequal) {
-                        var lineWidth = m.lineWidth || options.grid.markingsLineWidth,
-                            subPixel = lineWidth % 2 ? 0.5 : 0;
-                        ctx.beginPath();
-                        ctx.strokeStyle = m.color || options.grid.markingsColor;
-                        ctx.lineWidth = lineWidth;
-                        if (xequal) {
-                            ctx.moveTo(xrange.to + subPixel, yrange.from);
-                            ctx.lineTo(xrange.to + subPixel, yrange.to);
-                        } else {
-                            ctx.moveTo(xrange.from, yrange.to + subPixel);
-                            ctx.lineTo(xrange.to, yrange.to + subPixel);
-                        }
-                        ctx.stroke();
-                    } else {
-                        ctx.fillStyle = m.color || options.grid.markingsColor;
-                        ctx.fillRect(xrange.from, yrange.to,
-                                     xrange.to - xrange.from,
-                                     yrange.from - yrange.to);
-                    }
-                }
-            }
-
-            // draw the ticks
-            axes = allAxes();
-            bw = options.grid.borderWidth;
-
-            for (var j = 0; j < axes.length; ++j) {
-                var axis = axes[j], box = axis.box,
-                    t = axis.tickLength, x, y, xoff, yoff;
-                if (!axis.show || axis.ticks.length == 0)
-                    continue;
-
-                ctx.lineWidth = 1;
-
-                // find the edges
-                if (axis.direction == "x") {
-                    x = 0;
-                    if (t == "full")
-                        y = (axis.position == "top" ? 0 : plotHeight);
-                    else
-                        y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0);
-                }
-                else {
-                    y = 0;
-                    if (t == "full")
-                        x = (axis.position == "left" ? 0 : plotWidth);
-                    else
-                        x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0);
-                }
-
-                // draw tick bar
-                if (!axis.innermost) {
-                    ctx.strokeStyle = axis.options.color;
-                    ctx.beginPath();
-                    xoff = yoff = 0;
-                    if (axis.direction == "x")
-                        xoff = plotWidth + 1;
-                    else
-                        yoff = plotHeight + 1;
-
-                    if (ctx.lineWidth == 1) {
-                        if (axis.direction == "x") {
-                            y = Math.floor(y) + 0.5;
-                        } else {
-                            x = Math.floor(x) + 0.5;
-                        }
-                    }
-
-                    ctx.moveTo(x, y);
-                    ctx.lineTo(x + xoff, y + yoff);
-                    ctx.stroke();
-                }
-
-                // draw ticks
-
-                ctx.strokeStyle = axis.options.tickColor;
-
-                ctx.beginPath();
-                for (i = 0; i < axis.ticks.length; ++i) {
-                    var v = axis.ticks[i].v;
-
-                    xoff = yoff = 0;
-
-                    if (isNaN(v) || v < axis.min || v > axis.max
-                        // skip those lying on the axes if we got a border
-                        || (t == "full"
-                            && ((typeof bw == "object" && bw[axis.position] > 0) || bw > 0)
-                            && (v == axis.min || v == axis.max)))
-                        continue;
-
-                    if (axis.direction == "x") {
-                        x = axis.p2c(v);
-                        yoff = t == "full" ? -plotHeight : t;
-
-                        if (axis.position == "top")
-                            yoff = -yoff;
-                    }
-                    else {
-                        y = axis.p2c(v);
-                        xoff = t == "full" ? -plotWidth : t;
-
-                        if (axis.position == "left")
-                            xoff = -xoff;
-                    }
-
-                    if (ctx.lineWidth == 1) {
-                        if (axis.direction == "x")
-                            x = Math.floor(x) + 0.5;
-                        else
-                            y = Math.floor(y) + 0.5;
-                    }
-
-                    ctx.moveTo(x, y);
-                    ctx.lineTo(x + xoff, y + yoff);
-                }
-
-                ctx.stroke();
-            }
-
-
-            // draw border
-            if (bw) {
-                // If either borderWidth or borderColor is an object, then draw the border
-                // line by line instead of as one rectangle
-                bc = options.grid.borderColor;
-                if(typeof bw == "object" || typeof bc == "object") {
-                    if (typeof bw !== "object") {
-                        bw = {top: bw, right: bw, bottom: bw, left: bw};
-                    }
-                    if (typeof bc !== "object") {
-                        bc = {top: bc, right: bc, bottom: bc, left: bc};
-                    }
-
-                    if (bw.top > 0) {
-                        ctx.strokeStyle = bc.top;
-                        ctx.lineWidth = bw.top;
-                        ctx.beginPath();
-                        ctx.moveTo(0 - bw.left, 0 - bw.top/2);
-                        ctx.lineTo(plotWidth, 0 - bw.top/2);
-                        ctx.stroke();
-                    }
-
-                    if (bw.right > 0) {
-                        ctx.strokeStyle = bc.right;
-                        ctx.lineWidth = bw.right;
-                        ctx.beginPath();
-                        ctx.moveTo(plotWidth + bw.right / 2, 0 - bw.top);
-                        ctx.lineTo(plotWidth + bw.right / 2, plotHeight);
-                        ctx.stroke();
-                    }
-
-                    if (bw.bottom > 0) {
-                        ctx.strokeStyle = bc.bottom;
-                        ctx.lineWidth = bw.bottom;
-                        ctx.beginPath();
-                        ctx.moveTo(plotWidth + bw.right, plotHeight + bw.bottom / 2);
-                        ctx.lineTo(0, plotHeight + bw.bottom / 2);
-                        ctx.stroke();
-                    }
-
-                    if (bw.left > 0) {
-                        ctx.strokeStyle = bc.left;
-                        ctx.lineWidth = bw.left;
-                        ctx.beginPath();
-                        ctx.moveTo(0 - bw.left/2, plotHeight + bw.bottom);
-                        ctx.lineTo(0- bw.left/2, 0);
-                        ctx.stroke();
-                    }
-                }
-                else {
-                    ctx.lineWidth = bw;
-                    ctx.strokeStyle = options.grid.borderColor;
-                    ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
-                }
-            }
-
-            ctx.restore();
-        }
-
-        function drawAxisLabels() {
-
-            $.each(allAxes(), function (_, axis) {
-                var box = axis.box,
-                    legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis",
-                    layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles,
-                    font = axis.options.font || "flot-tick-label tickLabel",
-                    tick, x, y, halign, valign;
-
-                // Remove text before checking for axis.show and ticks.length;
-                // otherwise plugins, like flot-tickrotor, that draw their own
-                // tick labels will end up with both theirs and the defaults.
-
-                surface.removeText(layer);
-
-                if (!axis.show || axis.ticks.length == 0)
-                    return;
-
-                for (var i = 0; i < axis.ticks.length; ++i) {
-
-                    tick = axis.ticks[i];
-                    if (!tick.label || tick.v < axis.min || tick.v > axis.max)
-                        continue;
-
-                    if (axis.direction == "x") {
-                        halign = "center";
-                        x = plotOffset.left + axis.p2c(tick.v);
-                        if (axis.position == "bottom") {
-                            y = box.top + box.padding;
-                        } else {
-                            y = box.top + box.height - box.padding;
-                            valign = "bottom";
-                        }
-                    } else {
-                        valign = "middle";
-                        y = plotOffset.top + axis.p2c(tick.v);
-                        if (axis.position == "left") {
-                            x = box.left + box.width - box.padding;
-                            halign = "right";
-                        } else {
-                            x = box.left + box.padding;
-                        }
-                    }
-
-                    surface.addText(layer, x, y, tick.label, font, null, null, halign, valign);
-                }
-            });
-        }
-
-        function drawSeries(series) {
-            if (series.lines.show)
-                drawSeriesLines(series);
-            if (series.bars.show)
-                drawSeriesBars(series);
-            if (series.points.show)
-                drawSeriesPoints(series);
-        }
-
-        function drawSeriesLines(series) {
-            function plotLine(datapoints, xoffset, yoffset, axisx, axisy) {
-                var points = datapoints.points,
-                    ps = datapoints.pointsize,
-                    prevx = null, prevy = null;
-
-                ctx.beginPath();
-                for (var i = ps; i < points.length; i += ps) {
-                    var x1 = points[i - ps], y1 = points[i - ps + 1],
-                        x2 = points[i], y2 = points[i + 1];
-
-                    if (x1 == null || x2 == null)
-                        continue;
-
-                    // clip with ymin
-                    if (y1 <= y2 && y1 < axisy.min) {
-                        if (y2 < axisy.min)
-                            continue;   // line segment is outside
-                        // compute new intersection point
-                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y1 = axisy.min;
-                    }
-                    else if (y2 <= y1 && y2 < axisy.min) {
-                        if (y1 < axisy.min)
-                            continue;
-                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y2 = axisy.min;
-                    }
-
-                    // clip with ymax
-                    if (y1 >= y2 && y1 > axisy.max) {
-                        if (y2 > axisy.max)
-                            continue;
-                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y1 = axisy.max;
-                    }
-                    else if (y2 >= y1 && y2 > axisy.max) {
-                        if (y1 > axisy.max)
-                            continue;
-                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y2 = axisy.max;
-                    }
-
-                    // clip with xmin
-                    if (x1 <= x2 && x1 < axisx.min) {
-                        if (x2 < axisx.min)
-                            continue;
-                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x1 = axisx.min;
-                    }
-                    else if (x2 <= x1 && x2 < axisx.min) {
-                        if (x1 < axisx.min)
-                            continue;
-                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x2 = axisx.min;
-                    }
-
-                    // clip with xmax
-                    if (x1 >= x2 && x1 > axisx.max) {
-                        if (x2 > axisx.max)
-                            continue;
-                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x1 = axisx.max;
-                    }
-                    else if (x2 >= x1 && x2 > axisx.max) {
-                        if (x1 > axisx.max)
-                            continue;
-                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x2 = axisx.max;
-                    }
-
-                    if (x1 != prevx || y1 != prevy)
-                        ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset);
-
-                    prevx = x2;
-                    prevy = y2;
-                    ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset);
-                }
-                ctx.stroke();
-            }
-
-            function plotLineArea(datapoints, axisx, axisy) {
-                var points = datapoints.points,
-                    ps = datapoints.pointsize,
-                    bottom = Math.min(Math.max(0, axisy.min), axisy.max),
-                    i = 0, top, areaOpen = false,
-                    ypos = 1, segmentStart = 0, segmentEnd = 0;
-
-                // we process each segment in two turns, first forward
-                // direction to sketch out top, then once we hit the
-                // end we go backwards to sketch the bottom
-                while (true) {
-                    if (ps > 0 && i > points.length + ps)
-                        break;
-
-                    i += ps; // ps is negative if going backwards
-
-                    var x1 = points[i - ps],
-                        y1 = points[i - ps + ypos],
-                        x2 = points[i], y2 = points[i + ypos];
-
-                    if (areaOpen) {
-                        if (ps > 0 && x1 != null && x2 == null) {
-                            // at turning point
-                            segmentEnd = i;
-                            ps = -ps;
-                            ypos = 2;
-                            continue;
-                        }
-
-                        if (ps < 0 && i == segmentStart + ps) {
-                            // done with the reverse sweep
-                            ctx.fill();
-                            areaOpen = false;
-                            ps = -ps;
-                            ypos = 1;
-                            i = segmentStart = segmentEnd + ps;
-                            continue;
-                        }
-                    }
-
-                    if (x1 == null || x2 == null)
-                        continue;
-
-                    // clip x values
-
-                    // clip with xmin
-                    if (x1 <= x2 && x1 < axisx.min) {
-                        if (x2 < axisx.min)
-                            continue;
-                        y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x1 = axisx.min;
-                    }
-                    else if (x2 <= x1 && x2 < axisx.min) {
-                        if (x1 < axisx.min)
-                            continue;
-                        y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x2 = axisx.min;
-                    }
-
-                    // clip with xmax
-                    if (x1 >= x2 && x1 > axisx.max) {
-                        if (x2 > axisx.max)
-                            continue;
-                        y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x1 = axisx.max;
-                    }
-                    else if (x2 >= x1 && x2 > axisx.max) {
-                        if (x1 > axisx.max)
-                            continue;
-                        y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1;
-                        x2 = axisx.max;
-                    }
-
-                    if (!areaOpen) {
-                        // open area
-                        ctx.beginPath();
-                        ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom));
-                        areaOpen = true;
-                    }
-
-                    // now first check the case where both is outside
-                    if (y1 >= axisy.max && y2 >= axisy.max) {
-                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max));
-                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max));
-                        continue;
-                    }
-                    else if (y1 <= axisy.min && y2 <= axisy.min) {
-                        ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min));
-                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min));
-                        continue;
-                    }
-
-                    // else it's a bit more complicated, there might
-                    // be a flat maxed out rectangle first, then a
-                    // triangular cutout or reverse; to find these
-                    // keep track of the current x values
-                    var x1old = x1, x2old = x2;
-
-                    // clip the y values, without shortcutting, we
-                    // go through all cases in turn
-
-                    // clip with ymin
-                    if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) {
-                        x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y1 = axisy.min;
-                    }
-                    else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) {
-                        x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y2 = axisy.min;
-                    }
-
-                    // clip with ymax
-                    if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) {
-                        x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y1 = axisy.max;
-                    }
-                    else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) {
-                        x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1;
-                        y2 = axisy.max;
-                    }
-
-                    // if the x value was changed we got a rectangle
-                    // to fill
-                    if (x1 != x1old) {
-                        ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1));
-                        // it goes to (x1, y1), but we fill that below
-                    }
-
-                    // fill triangular section, this sometimes result
-                    // in redundant points if (x1, y1) hasn't changed
-                    // from previous line to, but we just ignore that
-                    ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1));
-                    ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
-
-                    // fill the other rectangle if it's there
-                    if (x2 != x2old) {
-                        ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2));
-                        ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2));
-                    }
-                }
-            }
-
-            ctx.save();
-            ctx.translate(plotOffset.left, plotOffset.top);
-            ctx.lineJoin = "round";
-
-            var lw = series.lines.lineWidth,
-                sw = series.shadowSize;
-            // FIXME: consider another form of shadow when filling is turned on
-            if (lw > 0 && sw > 0) {
-                // draw shadow as a thick and thin line with transparency
-                ctx.lineWidth = sw;
-                ctx.strokeStyle = "rgba(0,0,0,0.1)";
-                // position shadow at angle from the mid of line
-                var angle = Math.PI/18;
-                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
-                ctx.lineWidth = sw/2;
-                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
-            }
-
-            ctx.lineWidth = lw;
-            ctx.strokeStyle = series.color;
-            var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight);
-            if (fillStyle) {
-                ctx.fillStyle = fillStyle;
-                plotLineArea(series.datapoints, series.xaxis, series.yaxis);
-            }
-
-            if (lw > 0)
-                plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis);
-            ctx.restore();
-        }
-
-        function drawSeriesPoints(series) {
-            function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) {
-                var points = datapoints.points, ps = datapoints.pointsize;
-
-                for (var i = 0; i < points.length; i += ps) {
-                    var x = points[i], y = points[i + 1];
-                    if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
-                        continue;
-
-                    ctx.beginPath();
-                    x = axisx.p2c(x);
-                    y = axisy.p2c(y) + offset;
-                    if (symbol == "circle")
-                        ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false);
-                    else
-                        symbol(ctx, x, y, radius, shadow);
-                    ctx.closePath();
-
-                    if (fillStyle) {
-                        ctx.fillStyle = fillStyle;
-                        ctx.fill();
-                    }
-                    ctx.stroke();
-                }
-            }
-
-            ctx.save();
-            ctx.translate(plotOffset.left, plotOffset.top);
-
-            var lw = series.points.lineWidth,
-                sw = series.shadowSize,
-                radius = series.points.radius,
-                symbol = series.points.symbol;
-
-            // If the user sets the line width to 0, we change it to a very
-            // small value. A line width of 0 seems to force the default of 1.
-            // Doing the conditional here allows the shadow setting to still be
-            // optional even with a lineWidth of 0.
-
-            if( lw == 0 )
-                lw = 0.0001;
-
-            if (lw > 0 && sw > 0) {
-                // draw shadow in two steps
-                var w = sw / 2;
-                ctx.lineWidth = w;
-                ctx.strokeStyle = "rgba(0,0,0,0.1)";
-                plotPoints(series.datapoints, radius, null, w + w/2, true,
-                           series.xaxis, series.yaxis, symbol);
-
-                ctx.strokeStyle = "rgba(0,0,0,0.2)";
-                plotPoints(series.datapoints, radius, null, w/2, true,
-                           series.xaxis, series.yaxis, symbol);
-            }
-
-            ctx.lineWidth = lw;
-            ctx.strokeStyle = series.color;
-            plotPoints(series.datapoints, radius,
-                       getFillStyle(series.points, series.color), 0, false,
-                       series.xaxis, series.yaxis, symbol);
-            ctx.restore();
-        }
-
-        function drawBar(x, y, b, barLeft, barRight, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) {
-            var left, right, bottom, top,
-                drawLeft, drawRight, drawTop, drawBottom,
-                tmp;
-
-            // in horizontal mode, we start the bar from the left
-            // instead of from the bottom so it appears to be
-            // horizontal rather than vertical
-            if (horizontal) {
-                drawBottom = drawRight = drawTop = true;
-                drawLeft = false;
-                left = b;
-                right = x;
-                top = y + barLeft;
-                bottom = y + barRight;
-
-                // account for negative bars
-                if (right < left) {
-                    tmp = right;
-                    right = left;
-                    left = tmp;
-                    drawLeft = true;
-                    drawRight = false;
-                }
-            }
-            else {
-                drawLeft = drawRight = drawTop = true;
-                drawBottom = false;
-                left = x + barLeft;
-                right = x + barRight;
-                bottom = b;
-                top = y;
-
-                // account for negative bars
-                if (top < bottom) {
-                    tmp = top;
-                    top = bottom;
-                    bottom = tmp;
-                    drawBottom = true;
-                    drawTop = false;
-                }
-            }
-
-            // clip
-            if (right < axisx.min || left > axisx.max ||
-                top < axisy.min || bottom > axisy.max)
-                return;
-
-            if (left < axisx.min) {
-                left = axisx.min;
-                drawLeft = false;
-            }
-
-            if (right > axisx.max) {
-                right = axisx.max;
-                drawRight = false;
-            }
-
-            if (bottom < axisy.min) {
-                bottom = axisy.min;
-                drawBottom = false;
-            }
-
-            if (top > axisy.max) {
-                top = axisy.max;
-                drawTop = false;
-            }
-
-            left = axisx.p2c(left);
-            bottom = axisy.p2c(bottom);
-            right = axisx.p2c(right);
-            top = axisy.p2c(top);
-
-            // fill the bar
-            if (fillStyleCallback) {
-                c.fillStyle = fillStyleCallback(bottom, top);
-                c.fillRect(left, top, right - left, bottom - top)
-            }
-
-            // draw outline
-            if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) {
-                c.beginPath();
-
-                // FIXME: inline moveTo is buggy with excanvas
-                c.moveTo(left, bottom);
-                if (drawLeft)
-                    c.lineTo(left, top);
-                else
-                    c.moveTo(left, top);
-                if (drawTop)
-                    c.lineTo(right, top);
-                else
-                    c.moveTo(right, top);
-                if (drawRight)
-                    c.lineTo(right, bottom);
-                else
-                    c.moveTo(right, bottom);
-                if (drawBottom)
-                    c.lineTo(left, bottom);
-                else
-                    c.moveTo(left, bottom);
-                c.stroke();
-            }
-        }
-
-        function drawSeriesBars(series) {
-            function plotBars(datapoints, barLeft, barRight, fillStyleCallback, axisx, axisy) {
-                var points = datapoints.points, ps = datapoints.pointsize;
-
-                for (var i = 0; i < points.length; i += ps) {
-                    if (points[i] == null)
-                        continue;
-                    drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth);
-                }
-            }
-
-            ctx.save();
-            ctx.translate(plotOffset.left, plotOffset.top);
-
-            // FIXME: figure out a way to add shadows (for instance along the right edge)
-            ctx.lineWidth = series.bars.lineWidth;
-            ctx.strokeStyle = series.color;
-
-            var barLeft;
-
-            switch (series.bars.align) {
-                case "left":
-                    barLeft = 0;
-                    break;
-                case "right":
-                    barLeft = -series.bars.barWidth;
-                    break;
-                default:
-                    barLeft = -series.bars.barWidth / 2;
-            }
-
-            var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top); } : null;
-            plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, fillStyleCallback, series.xaxis, series.yaxis);
-            ctx.restore();
-        }
-
-        function getFillStyle(filloptions, seriesColor, bottom, top) {
-            var fill = filloptions.fill;
-            if (!fill)
-                return null;
-
-            if (filloptions.fillColor)
-                return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor);
-
-            var c = $.color.parse(seriesColor);
-            c.a = typeof fill == "number" ? fill : 0.4;
-            c.normalize();
-            return c.toString();
-        }
-
-        function insertLegend() {
-
-            if (options.legend.container != null) {
-                $(options.legend.container).html("");
-            } else {
-                placeholder.find(".legend").remove();
-            }
-
-            if (!options.legend.show) {
-                return;
-            }
-
-            var fragments = [], entries = [], rowStarted = false,
-                lf = options.legend.labelFormatter, s, label;
-
-            // Build a list of legend entries, with each having a label and a color
-
-            for (var i = 0; i < series.length; ++i) {
-                s = series[i];
-                if (s.label) {
-                    label = lf ? lf(s.label, s) : s.label;
-                    if (label) {
-                        entries.push({
-                            label: label,
-                            color: s.color
-                        });
-                    }
-                }
-            }
-
-            // Sort the legend using either the default or a custom comparator
-
-            if (options.legend.sorted) {
-                if ($.isFunction(options.legend.sorted)) {
-                    entries.sort(options.legend.sorted);
-                } else if (options.legend.sorted == "reverse") {
-                	entries.reverse();
-                } else {
-                    var ascending = options.legend.sorted != "descending";
-                    entries.sort(function(a, b) {
-                        return a.label == b.label ? 0 : (
-                            (a.label < b.label) != ascending ? 1 : -1   // Logical XOR
-                        );
-                    });
-                }
-            }
-
-            // Generate markup for the list of entries, in their final order
-
-            for (var i = 0; i < entries.length; ++i) {
-
-                var entry = entries[i];
-
-                if (i % options.legend.noColumns == 0) {
-                    if (rowStarted)
-                        fragments.push('</tr>');
-                    fragments.push('<tr>');
-                    rowStarted = true;
-                }
-
-                fragments.push(
-                    '<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + entry.color + ';overflow:hidden"></div></div></td>' +
-                    '<td class="legendLabel" data-test-subj="flotLegendLabel">' + entry.label + '</td>'
-                );
-            }
-
-            if (rowStarted)
-                fragments.push('</tr>');
-
-            if (fragments.length == 0)
-                return;
-
-            var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + '</table>';
-            if (options.legend.container != null)
-                $(options.legend.container).html(table);
-            else {
-                var pos = "",
-                    p = options.legend.position,
-                    m = options.legend.margin;
-                if (m[0] == null)
-                    m = [m, m];
-                if (p.charAt(0) == "n")
-                    pos += 'top:' + (m[1] + plotOffset.top) + 'px;';
-                else if (p.charAt(0) == "s")
-                    pos += 'bottom:' + (m[1] + plotOffset.bottom) + 'px;';
-                if (p.charAt(1) == "e")
-                    pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
-                else if (p.charAt(1) == "w")
-                    pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
-                var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder);
-                if (options.legend.backgroundOpacity != 0.0) {
-                    // put in the transparent background
-                    // separately to avoid blended labels and
-                    // label boxes
-                    var c = options.legend.backgroundColor;
-                    if (c == null) {
-                        c = options.grid.backgroundColor;
-                        if (c && typeof c == "string")
-                            c = $.color.parse(c);
-                        else
-                            c = $.color.extract(legend, 'background-color');
-                        c.a = 1;
-                        c = c.toString();
-                    }
-                    var div = legend.children();
-                    $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
-                }
-            }
-        }
-
-
-        // interactive features
-
-        var highlights = [],
-            redrawTimeout = null;
-
-        // returns the data item the mouse is over, or null if none is found
-        function findNearbyItem(mouseX, mouseY, seriesFilter) {
-            var maxDistance = options.grid.mouseActiveRadius,
-                smallestDistance = maxDistance * maxDistance + 1,
-                item = null, foundPoint = false, i, j, ps;
-
-            for (i = series.length - 1; i >= 0; --i) {
-                if (!seriesFilter(series[i]))
-                    continue;
-
-                var s = series[i],
-                    axisx = s.xaxis,
-                    axisy = s.yaxis,
-                    points = s.datapoints.points,
-                    mx = axisx.c2p(mouseX), // precompute some stuff to make the loop faster
-                    my = axisy.c2p(mouseY),
-                    maxx = maxDistance / axisx.scale,
-                    maxy = maxDistance / axisy.scale;
-
-                ps = s.datapoints.pointsize;
-                // with inverse transforms, we can't use the maxx/maxy
-                // optimization, sadly
-                if (axisx.options.inverseTransform)
-                    maxx = Number.MAX_VALUE;
-                if (axisy.options.inverseTransform)
-                    maxy = Number.MAX_VALUE;
-
-                if (s.lines.show || s.points.show) {
-                    for (j = 0; j < points.length; j += ps) {
-                        var x = points[j], y = points[j + 1];
-                        if (x == null)
-                            continue;
-
-                        // For points and lines, the cursor must be within a
-                        // certain distance to the data point
-                        if (x - mx > maxx || x - mx < -maxx ||
-                            y - my > maxy || y - my < -maxy)
-                            continue;
-
-                        // We have to calculate distances in pixels, not in
-                        // data units, because the scales of the axes may be different
-                        var dx = Math.abs(axisx.p2c(x) - mouseX),
-                            dy = Math.abs(axisy.p2c(y) - mouseY),
-                            dist = dx * dx + dy * dy; // we save the sqrt
-
-                        // use <= to ensure last point takes precedence
-                        // (last generally means on top of)
-                        if (dist < smallestDistance) {
-                            smallestDistance = dist;
-                            item = [i, j / ps];
-                        }
-                    }
-                }
-
-                if (s.bars.show && !item) { // no other point can be nearby
-
-                    var barLeft, barRight;
-
-                    switch (s.bars.align) {
-                        case "left":
-                            barLeft = 0;
-                            break;
-                        case "right":
-                            barLeft = -s.bars.barWidth;
-                            break;
-                        default:
-                            barLeft = -s.bars.barWidth / 2;
-                    }
-
-                    barRight = barLeft + s.bars.barWidth;
-
-                    for (j = 0; j < points.length; j += ps) {
-                        var x = points[j], y = points[j + 1], b = points[j + 2];
-                        if (x == null)
-                            continue;
-
-                        // for a bar graph, the cursor must be inside the bar
-                        if (series[i].bars.horizontal ?
-                            (mx <= Math.max(b, x) && mx >= Math.min(b, x) &&
-                             my >= y + barLeft && my <= y + barRight) :
-                            (mx >= x + barLeft && mx <= x + barRight &&
-                             my >= Math.min(b, y) && my <= Math.max(b, y)))
-                                item = [i, j / ps];
-                    }
-                }
-            }
-
-            if (item) {
-                i = item[0];
-                j = item[1];
-                ps = series[i].datapoints.pointsize;
-
-                return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
-                         dataIndex: j,
-                         series: series[i],
-                         seriesIndex: i };
-            }
-
-            return null;
-        }
-
-        function onMouseMove(e) {
-            if (options.grid.hoverable)
-                triggerClickHoverEvent("plothover", e,
-                                       function (s) { return s["hoverable"] != false; });
-        }
-
-        function onMouseLeave(e) {
-            if (options.grid.hoverable)
-                triggerClickHoverEvent("plothover", e,
-                                       function (s) { return false; });
-        }
-
-        function onClick(e) {
-            triggerClickHoverEvent("plotclick", e,
-                                   function (s) { return s["clickable"] != false; });
-        }
-
-        // trigger click or hover event (they send the same parameters
-        // so we share their code)
-        function triggerClickHoverEvent(eventname, event, seriesFilter) {
-            var offset = eventHolder.offset(),
-                canvasX = event.pageX - offset.left - plotOffset.left,
-                canvasY = event.pageY - offset.top - plotOffset.top,
-            pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
-
-            pos.pageX = event.pageX;
-            pos.pageY = event.pageY;
-
-            var item = findNearbyItem(canvasX, canvasY, seriesFilter);
-
-            if (item) {
-                // fill in mouse pos for any listeners out there
-                item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left, 10);
-                item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top, 10);
-            }
-
-            if (options.grid.autoHighlight) {
-                // clear auto-highlights
-                for (var i = 0; i < highlights.length; ++i) {
-                    var h = highlights[i];
-                    if (h.auto == eventname &&
-                        !(item && h.series == item.series &&
-                          h.point[0] == item.datapoint[0] &&
-                          h.point[1] == item.datapoint[1]))
-                        unhighlight(h.series, h.point);
-                }
-
-                if (item)
-                    highlight(item.series, item.datapoint, eventname);
-            }
-
-            placeholder.trigger(eventname, [ pos, item ]);
-        }
-
-        function triggerRedrawOverlay() {
-            var t = options.interaction.redrawOverlayInterval;
-            if (t == -1) {      // skip event queue
-                drawOverlay();
-                return;
-            }
-
-            if (!redrawTimeout)
-                redrawTimeout = setTimeout(drawOverlay, t);
-        }
-
-        function drawOverlay() {
-            redrawTimeout = null;
-
-            // draw highlights
-            octx.save();
-            overlay.clear();
-            octx.translate(plotOffset.left, plotOffset.top);
-
-            var i, hi;
-            for (i = 0; i < highlights.length; ++i) {
-                hi = highlights[i];
-
-                if (hi.series.bars.show)
-                    drawBarHighlight(hi.series, hi.point);
-                else
-                    drawPointHighlight(hi.series, hi.point);
-            }
-            octx.restore();
-
-            executeHooks(hooks.drawOverlay, [octx]);
-        }
-
-        function highlight(s, point, auto) {
-            if (typeof s == "number")
-                s = series[s];
-
-            if (typeof point == "number") {
-                var ps = s.datapoints.pointsize;
-                point = s.datapoints.points.slice(ps * point, ps * (point + 1));
-            }
-
-            var i = indexOfHighlight(s, point);
-            if (i == -1) {
-                highlights.push({ series: s, point: point, auto: auto });
-
-                triggerRedrawOverlay();
-            }
-            else if (!auto)
-                highlights[i].auto = false;
-        }
-
-        function unhighlight(s, point) {
-            if (s == null && point == null) {
-                highlights = [];
-                triggerRedrawOverlay();
-                return;
-            }
-
-            if (typeof s == "number")
-                s = series[s];
-
-            if (typeof point == "number") {
-                var ps = s.datapoints.pointsize;
-                point = s.datapoints.points.slice(ps * point, ps * (point + 1));
-            }
-
-            var i = indexOfHighlight(s, point);
-            if (i != -1) {
-                highlights.splice(i, 1);
-
-                triggerRedrawOverlay();
-            }
-        }
-
-        function indexOfHighlight(s, p) {
-            for (var i = 0; i < highlights.length; ++i) {
-                var h = highlights[i];
-                if (h.series == s && h.point[0] == p[0]
-                    && h.point[1] == p[1])
-                    return i;
-            }
-            return -1;
-        }
-
-        function drawPointHighlight(series, point) {
-            var x = point[0], y = point[1],
-                axisx = series.xaxis, axisy = series.yaxis,
-                highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString();
-
-            if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max)
-                return;
-
-            var pointRadius = series.points.radius + series.points.lineWidth / 2;
-            octx.lineWidth = pointRadius;
-            octx.strokeStyle = highlightColor;
-            var radius = 1.5 * pointRadius;
-            x = axisx.p2c(x);
-            y = axisy.p2c(y);
-
-            octx.beginPath();
-            if (series.points.symbol == "circle")
-                octx.arc(x, y, radius, 0, 2 * Math.PI, false);
-            else
-                series.points.symbol(octx, x, y, radius, false);
-            octx.closePath();
-            octx.stroke();
-        }
-
-        function drawBarHighlight(series, point) {
-            var highlightColor = (typeof series.highlightColor === "string") ? series.highlightColor : $.color.parse(series.color).scale('a', 0.5).toString(),
-                fillStyle = highlightColor,
-                barLeft;
-
-            switch (series.bars.align) {
-                case "left":
-                    barLeft = 0;
-                    break;
-                case "right":
-                    barLeft = -series.bars.barWidth;
-                    break;
-                default:
-                    barLeft = -series.bars.barWidth / 2;
-            }
-
-            octx.lineWidth = series.bars.lineWidth;
-            octx.strokeStyle = highlightColor;
-
-            drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
-                    function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
-        }
-
-        function getColorOrGradient(spec, bottom, top, defaultColor) {
-            if (typeof spec == "string")
-                return spec;
-            else {
-                // assume this is a gradient spec; IE currently only
-                // supports a simple vertical gradient properly, so that's
-                // what we support too
-                var gradient = ctx.createLinearGradient(0, top, 0, bottom);
-
-                for (var i = 0, l = spec.colors.length; i < l; ++i) {
-                    var c = spec.colors[i];
-                    if (typeof c != "string") {
-                        var co = $.color.parse(defaultColor);
-                        if (c.brightness != null)
-                            co = co.scale('rgb', c.brightness);
-                        if (c.opacity != null)
-                            co.a *= c.opacity;
-                        c = co.toString();
-                    }
-                    gradient.addColorStop(i / (l - 1), c);
-                }
-
-                return gradient;
-            }
-        }
-    }
-
-    // Add the plot function to the top level of the jQuery object
-
-    $.plot = function(placeholder, data, options) {
-        //var t0 = new Date();
-        var plot = new Plot($(placeholder), data, options, $.plot.plugins);
-        //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime()));
-        return plot;
-    };
-
-    $.plot.version = "0.8.3";
-
-    $.plot.plugins = [];
-
-    // Also add the plot function as a chainable property
-
-    $.fn.plot = function(data, options) {
-        return this.each(function() {
-            $.plot(this, data, options);
-        });
-    };
-
-    // round to nearby lower multiple of base
-    function floorInBase(n, base) {
-        return base * Math.floor(n / base);
-    }
-
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.log.js b/src/legacy/ui/public/flot-charts/jquery.flot.log.js
deleted file mode 100644
index e32bf5cf7e8173..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.log.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/* @notice
- *
- * Pretty handling of logarithmic axes.
- * Copyright (c) 2007-2014 IOLA and Ole Laursen.
- * Licensed under the MIT license.
- * Created by Arne de Laat
- * Set axis.mode to "log" and make the axis logarithmic using transform:
- *     axis: {
- *         mode: 'log',
- *         transform: function(v) {v <= 0 ? Math.log(v) / Math.LN10 : null},
- *         inverseTransform: function(v) {Math.pow(10, v)}
- *     }
- * The transform filters negative and zero values, because those are
- * invalid on logarithmic scales.
- * This plugin tries to create good looking logarithmic ticks, using
- * unicode superscript characters. If all data to be plotted is between two
- * powers of ten then the default flot tick generator and renderer are
- * used. Logarithmic ticks are places at powers of ten and at half those
- * values if there are not to many ticks already (e.g. [1, 5, 10, 50, 100]).
- * For details,  see https://github.com/flot/flot/pull/1328
-*/
-
-(function($) {
-
-  function log10(value) {
-    /* Get the Log10 of the value
-    */
-    return Math.log(value) / Math.LN10;
-  }
-
-  function floorAsLog10(value) {
-    /* Get power of the first power of 10 below the value
-    */
-    return Math.floor(log10(value));
-  }
-
-  function ceilAsLog10(value) {
-    /* Get power of the first power of 10 above the value
-    */
-    return Math.ceil(log10(value));
-  }
-
-
-  // round to nearby lower multiple of base
-  function floorInBase(n, base) {
-    return base * Math.floor(n / base);
-  }
-
-  function getUnicodePower(power) {
-    var superscripts = ["⁰", "¹", "²", "³", "⁴", "⁵", "⁶", "⁷", "⁸", "⁹"],
-      result = "",
-      str_power = "" + power;
-    for (var i = 0; i < str_power.length; i++) {
-      if (str_power[i] === "+") {
-      }
-      else if (str_power[i] === "-") {
-        result += "⁻";
-      }
-      else {
-        result += superscripts[str_power[i]];
-      }
-    }
-    return result;
-  }
-
-  function init(plot) {
-    plot.hooks.processOptions.push(function (plot) {
-      $.each(plot.getAxes(), function(axisName, axis) {
-
-        var opts = axis.options;
-
-        if (opts.mode === "log") {
-
-          axis.tickGenerator = function (axis) {
-
-            var ticks = [],
-              end = ceilAsLog10(axis.max),
-              start = floorAsLog10(axis.min),
-              tick = Number.NaN,
-              i = 0;
-
-            if (axis.min === null || axis.min <= 0) {
-              // Bad minimum, make ticks from 1 (10**0) to max
-              start = 0;
-              axis.min = 0.6;
-            }
-
-            if (end <= start) {
-              // Start less than end?!
-              ticks = [1e-6, 1e-5, 1e-4, 1e-3, 1e-2, 1e-1,
-                1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6,
-                1e7, 1e8, 1e9];
-            }
-            else if (log10(axis.max) - log10(axis.datamin) < 1) {
-              // Default flot generator incase no powers of 10
-              // are between start and end
-              var prev;
-              start = floorInBase(axis.min, axis.tickSize);
-              do {
-                prev = tick;
-                tick = start + i * axis.tickSize;
-                ticks.push(tick);
-                ++i;
-              } while (tick < axis.max && tick !== prev);
-            }
-            else {
-              // Make ticks at each power of ten
-              for (; i <= (end - start); i++) {
-                tick = Math.pow(10, start + i);
-                ticks.push(tick);
-              }
-
-              var length = ticks.length;
-
-              // If not to many ticks also put a tick between
-              // the powers of ten
-              if (end - start < 6) {
-                for (var j = 1; j < length * 2 - 1; j += 2) {
-                  tick = ticks[j - 1] * 5;
-                  ticks.splice(j, 0, tick);
-                }
-              }
-            }
-            return ticks;
-          };
-
-          axis.tickFormatter = function (value, axis) {
-            var formatted;
-            if (log10(axis.max) - log10(axis.datamin) < 1) {
-              // Default flot formatter
-              var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1;
-              formatted = "" + Math.round(value * factor) / factor;
-              if (axis.tickDecimals !== null) {
-                var decimal = formatted.indexOf(".");
-                var precision = decimal === -1 ? 0 : formatted.length - decimal - 1;
-                if (precision < axis.tickDecimals) {
-                  return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision);
-                }
-              }
-            }
-            else {
-              var multiplier = "",
-                exponential = parseFloat(value).toExponential(0),
-                power = getUnicodePower(exponential.slice(2));
-              if (exponential[0] !== "1") {
-                multiplier = exponential[0] + "x";
-              }
-              formatted = multiplier + "10" + power;
-            }
-            return formatted;
-          };
-        }
-      });
-    });
-  }
-
-  $.plot.plugins.push({
-    init: init,
-    name: "log",
-    version: "0.9"
-  });
-
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.navigate.js b/src/legacy/ui/public/flot-charts/jquery.flot.navigate.js
deleted file mode 100644
index 13fb7f17d04b24..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.navigate.js
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Flot plugin for adding the ability to pan and zoom the plot.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The default behaviour is double click and scrollwheel up/down to zoom in, drag
-to pan. The plugin defines plot.zoom({ center }), plot.zoomOut() and
-plot.pan( offset ) so you easily can add custom controls. It also fires
-"plotpan" and "plotzoom" events, useful for synchronizing plots.
-
-The plugin supports these options:
-
-	zoom: {
-		interactive: false
-		trigger: "dblclick" // or "click" for single click
-		amount: 1.5         // 2 = 200% (zoom in), 0.5 = 50% (zoom out)
-	}
-
-	pan: {
-		interactive: false
-		cursor: "move"      // CSS mouse cursor value used when dragging, e.g. "pointer"
-		frameRate: 20
-	}
-
-	xaxis, yaxis, x2axis, y2axis: {
-		zoomRange: null  // or [ number, number ] (min range, max range) or false
-		panRange: null   // or [ number, number ] (min, max) or false
-	}
-
-"interactive" enables the built-in drag/click behaviour. If you enable
-interactive for pan, then you'll have a basic plot that supports moving
-around; the same for zoom.
-
-"amount" specifies the default amount to zoom in (so 1.5 = 150%) relative to
-the current viewport.
-
-"cursor" is a standard CSS mouse cursor string used for visual feedback to the
-user when dragging.
-
-"frameRate" specifies the maximum number of times per second the plot will
-update itself while the user is panning around on it (set to null to disable
-intermediate pans, the plot will then not update until the mouse button is
-released).
-
-"zoomRange" is the interval in which zooming can happen, e.g. with zoomRange:
-[1, 100] the zoom will never scale the axis so that the difference between min
-and max is smaller than 1 or larger than 100. You can set either end to null
-to ignore, e.g. [1, null]. If you set zoomRange to false, zooming on that axis
-will be disabled.
-
-"panRange" confines the panning to stay within a range, e.g. with panRange:
-[-10, 20] panning stops at -10 in one end and at 20 in the other. Either can
-be null, e.g. [-10, null]. If you set panRange to false, panning on that axis
-will be disabled.
-
-Example API usage:
-
-	plot = $.plot(...);
-
-	// zoom default amount in on the pixel ( 10, 20 )
-	plot.zoom({ center: { left: 10, top: 20 } });
-
-	// zoom out again
-	plot.zoomOut({ center: { left: 10, top: 20 } });
-
-	// zoom 200% in on the pixel (10, 20)
-	plot.zoom({ amount: 2, center: { left: 10, top: 20 } });
-
-	// pan 100 pixels to the left and 20 down
-	plot.pan({ left: -100, top: 20 })
-
-Here, "center" specifies where the center of the zooming should happen. Note
-that this is defined in pixel space, not the space of the data points (you can
-use the p2c helpers on the axes in Flot to help you convert between these).
-
-"amount" is the amount to zoom the viewport relative to the current range, so
-1 is 100% (i.e. no change), 1.5 is 150% (zoom in), 0.7 is 70% (zoom out). You
-can set the default in the options.
-
-*/
-
-// First two dependencies, jquery.event.drag.js and
-// jquery.mousewheel.js, we put them inline here to save people the
-// effort of downloading them.
-
-/*
-jquery.event.drag.js ~ v1.5 ~ Copyright (c) 2008, Three Dub Media (http://threedubmedia.com)
-Licensed under the MIT License ~ http://threedubmedia.googlecode.com/files/MIT-LICENSE.txt
-*/
-(function(a){function e(h){var k,j=this,l=h.data||{};if(l.elem)j=h.dragTarget=l.elem,h.dragProxy=d.proxy||j,h.cursorOffsetX=l.pageX-l.left,h.cursorOffsetY=l.pageY-l.top,h.offsetX=h.pageX-h.cursorOffsetX,h.offsetY=h.pageY-h.cursorOffsetY;else if(d.dragging||l.which>0&&h.which!=l.which||a(h.target).is(l.not))return;switch(h.type){case"mousedown":return a.extend(l,a(j).offset(),{elem:j,target:h.target,pageX:h.pageX,pageY:h.pageY}),b.add(document,"mousemove mouseup",e,l),i(j,!1),d.dragging=null,!1;case!d.dragging&&"mousemove":if(g(h.pageX-l.pageX)+g(h.pageY-l.pageY)<l.distance)break;h.target=l.target,k=f(h,"dragstart",j),k!==!1&&(d.dragging=j,d.proxy=h.dragProxy=a(k||j)[0]);case"mousemove":if(d.dragging){if(k=f(h,"drag",j),c.drop&&(c.drop.allowed=k!==!1,c.drop.handler(h)),k!==!1)break;h.type="mouseup"}case"mouseup":b.remove(document,"mousemove mouseup",e),d.dragging&&(c.drop&&c.drop.handler(h),f(h,"dragend",j)),i(j,!0),d.dragging=d.proxy=l.elem=!1}return!0}function f(b,c,d){b.type=c;var e=a.event.dispatch.call(d,b);return e===!1?!1:e||b.result}function g(a){return Math.pow(a,2)}function h(){return d.dragging===!1}function i(a,b){a&&(a.unselectable=b?"off":"on",a.onselectstart=function(){return b},a.style&&(a.style.MozUserSelect=b?"":"none"))}a.fn.drag=function(a,b,c){return b&&this.bind("dragstart",a),c&&this.bind("dragend",c),a?this.bind("drag",b?b:a):this.trigger("drag")};var b=a.event,c=b.special,d=c.drag={not:":input",distance:0,which:1,dragging:!1,setup:function(c){c=a.extend({distance:d.distance,which:d.which,not:d.not},c||{}),c.distance=g(c.distance),b.add(this,"mousedown",e,c),this.attachEvent&&this.attachEvent("ondragstart",h)},teardown:function(){b.remove(this,"mousedown",e),this===d.dragging&&(d.dragging=d.proxy=!1),i(this,!0),this.detachEvent&&this.detachEvent("ondragstart",h)}};c.dragstart=c.dragend={setup:function(){},teardown:function(){}}})(jQuery);
-
-/* jquery.mousewheel.min.js
- * Copyright (c) 2011 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.6
- *
- * Requires: 1.2.2+
- */
-(function(d){function e(a){var b=a||window.event,c=[].slice.call(arguments,1),f=0,e=0,g=0,a=d.event.fix(b);a.type="mousewheel";b.wheelDelta&&(f=b.wheelDelta/120);b.detail&&(f=-b.detail/3);g=f;void 0!==b.axis&&b.axis===b.HORIZONTAL_AXIS&&(g=0,e=-1*f);void 0!==b.wheelDeltaY&&(g=b.wheelDeltaY/120);void 0!==b.wheelDeltaX&&(e=-1*b.wheelDeltaX/120);c.unshift(a,f,e,g);return(d.event.dispatch||d.event.handle).apply(this,c)}var c=["DOMMouseScroll","mousewheel"];if(d.event.fixHooks)for(var h=c.length;h;)d.event.fixHooks[c[--h]]=d.event.mouseHooks;d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=c.length;a;)this.addEventListener(c[--a],e,!1);else this.onmousewheel=e},teardown:function(){if(this.removeEventListener)for(var a=c.length;a;)this.removeEventListener(c[--a],e,!1);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
-
-
-
-
-(function ($) {
-    var options = {
-        xaxis: {
-            zoomRange: null, // or [number, number] (min range, max range)
-            panRange: null // or [number, number] (min, max)
-        },
-        zoom: {
-            interactive: false,
-            trigger: "dblclick", // or "click" for single click
-            amount: 1.5 // how much to zoom relative to current position, 2 = 200% (zoom in), 0.5 = 50% (zoom out)
-        },
-        pan: {
-            interactive: false,
-            cursor: "move",
-            frameRate: 20
-        }
-    };
-
-    function init(plot) {
-        function onZoomClick(e, zoomOut) {
-            var c = plot.offset();
-            c.left = e.pageX - c.left;
-            c.top = e.pageY - c.top;
-            if (zoomOut)
-                plot.zoomOut({ center: c });
-            else
-                plot.zoom({ center: c });
-        }
-
-        function onMouseWheel(e, delta) {
-            e.preventDefault();
-            onZoomClick(e, delta < 0);
-            return false;
-        }
-        
-        var prevCursor = 'default', prevPageX = 0, prevPageY = 0,
-            panTimeout = null;
-
-        function onDragStart(e) {
-            if (e.which != 1)  // only accept left-click
-                return false;
-            var c = plot.getPlaceholder().css('cursor');
-            if (c)
-                prevCursor = c;
-            plot.getPlaceholder().css('cursor', plot.getOptions().pan.cursor);
-            prevPageX = e.pageX;
-            prevPageY = e.pageY;
-        }
-        
-        function onDrag(e) {
-            var frameRate = plot.getOptions().pan.frameRate;
-            if (panTimeout || !frameRate)
-                return;
-
-            panTimeout = setTimeout(function () {
-                plot.pan({ left: prevPageX - e.pageX,
-                           top: prevPageY - e.pageY });
-                prevPageX = e.pageX;
-                prevPageY = e.pageY;
-                                                    
-                panTimeout = null;
-            }, 1 / frameRate * 1000);
-        }
-
-        function onDragEnd(e) {
-            if (panTimeout) {
-                clearTimeout(panTimeout);
-                panTimeout = null;
-            }
-                    
-            plot.getPlaceholder().css('cursor', prevCursor);
-            plot.pan({ left: prevPageX - e.pageX,
-                       top: prevPageY - e.pageY });
-        }
-        
-        function bindEvents(plot, eventHolder) {
-            var o = plot.getOptions();
-            if (o.zoom.interactive) {
-                eventHolder[o.zoom.trigger](onZoomClick);
-                eventHolder.mousewheel(onMouseWheel);
-            }
-
-            if (o.pan.interactive) {
-                eventHolder.bind("dragstart", { distance: 10 }, onDragStart);
-                eventHolder.bind("drag", onDrag);
-                eventHolder.bind("dragend", onDragEnd);
-            }
-        }
-
-        plot.zoomOut = function (args) {
-            if (!args)
-                args = {};
-            
-            if (!args.amount)
-                args.amount = plot.getOptions().zoom.amount;
-
-            args.amount = 1 / args.amount;
-            plot.zoom(args);
-        };
-        
-        plot.zoom = function (args) {
-            if (!args)
-                args = {};
-            
-            var c = args.center,
-                amount = args.amount || plot.getOptions().zoom.amount,
-                w = plot.width(), h = plot.height();
-
-            if (!c)
-                c = { left: w / 2, top: h / 2 };
-                
-            var xf = c.left / w,
-                yf = c.top / h,
-                minmax = {
-                    x: {
-                        min: c.left - xf * w / amount,
-                        max: c.left + (1 - xf) * w / amount
-                    },
-                    y: {
-                        min: c.top - yf * h / amount,
-                        max: c.top + (1 - yf) * h / amount
-                    }
-                };
-
-            $.each(plot.getAxes(), function(_, axis) {
-                var opts = axis.options,
-                    min = minmax[axis.direction].min,
-                    max = minmax[axis.direction].max,
-                    zr = opts.zoomRange,
-                    pr = opts.panRange;
-
-                if (zr === false) // no zooming on this axis
-                    return;
-                    
-                min = axis.c2p(min);
-                max = axis.c2p(max);
-                if (min > max) {
-                    // make sure min < max
-                    var tmp = min;
-                    min = max;
-                    max = tmp;
-                }
-
-                //Check that we are in panRange
-                if (pr) {
-                    if (pr[0] != null && min < pr[0]) {
-                        min = pr[0];
-                    }
-                    if (pr[1] != null && max > pr[1]) {
-                        max = pr[1];
-                    }
-                }
-
-                var range = max - min;
-                if (zr &&
-                    ((zr[0] != null && range < zr[0] && amount >1) ||
-                     (zr[1] != null && range > zr[1] && amount <1)))
-                    return;
-            
-                opts.min = min;
-                opts.max = max;
-            });
-            
-            plot.setupGrid();
-            plot.draw();
-            
-            if (!args.preventEvent)
-                plot.getPlaceholder().trigger("plotzoom", [ plot, args ]);
-        };
-
-        plot.pan = function (args) {
-            var delta = {
-                x: +args.left,
-                y: +args.top
-            };
-
-            if (isNaN(delta.x))
-                delta.x = 0;
-            if (isNaN(delta.y))
-                delta.y = 0;
-
-            $.each(plot.getAxes(), function (_, axis) {
-                var opts = axis.options,
-                    min, max, d = delta[axis.direction];
-
-                min = axis.c2p(axis.p2c(axis.min) + d),
-                max = axis.c2p(axis.p2c(axis.max) + d);
-
-                var pr = opts.panRange;
-                if (pr === false) // no panning on this axis
-                    return;
-                
-                if (pr) {
-                    // check whether we hit the wall
-                    if (pr[0] != null && pr[0] > min) {
-                        d = pr[0] - min;
-                        min += d;
-                        max += d;
-                    }
-                    
-                    if (pr[1] != null && pr[1] < max) {
-                        d = pr[1] - max;
-                        min += d;
-                        max += d;
-                    }
-                }
-                
-                opts.min = min;
-                opts.max = max;
-            });
-            
-            plot.setupGrid();
-            plot.draw();
-            
-            if (!args.preventEvent)
-                plot.getPlaceholder().trigger("plotpan", [ plot, args ]);
-        };
-
-        function shutdown(plot, eventHolder) {
-            eventHolder.unbind(plot.getOptions().zoom.trigger, onZoomClick);
-            eventHolder.unbind("mousewheel", onMouseWheel);
-            eventHolder.unbind("dragstart", onDragStart);
-            eventHolder.unbind("drag", onDrag);
-            eventHolder.unbind("dragend", onDragEnd);
-            if (panTimeout)
-                clearTimeout(panTimeout);
-        }
-        
-        plot.hooks.bindEvents.push(bindEvents);
-        plot.hooks.shutdown.push(shutdown);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'navigate',
-        version: '1.3'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.pie.js b/src/legacy/ui/public/flot-charts/jquery.flot.pie.js
deleted file mode 100644
index 06f900bdc950fa..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.pie.js
+++ /dev/null
@@ -1,824 +0,0 @@
-/* Flot plugin for rendering pie charts.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin assumes that each series has a single data value, and that each
-value is a positive integer or zero.  Negative numbers don't make sense for a
-pie chart, and have unpredictable results.  The values do NOT need to be
-passed in as percentages; the plugin will calculate the total and per-slice
-percentages internally.
-
-* Created by Brian Medendorp
-
-* Updated with contributions from btburnett3, Anthony Aragues and Xavi Ivars
-
-The plugin supports these options:
-
-	series: {
-		pie: {
-			show: true/false
-			radius: 0-1 for percentage of fullsize, or a specified pixel length, or 'auto'
-			innerRadius: 0-1 for percentage of fullsize or a specified pixel length, for creating a donut effect
-			startAngle: 0-2 factor of PI used for starting angle (in radians) i.e 3/2 starts at the top, 0 and 2 have the same result
-			tilt: 0-1 for percentage to tilt the pie, where 1 is no tilt, and 0 is completely flat (nothing will show)
-			offset: {
-				top: integer value to move the pie up or down
-				left: integer value to move the pie left or right, or 'auto'
-			},
-			stroke: {
-				color: any hexadecimal color value (other formats may or may not work, so best to stick with something like '#FFF')
-				width: integer pixel width of the stroke
-			},
-			label: {
-				show: true/false, or 'auto'
-				formatter:  a user-defined function that modifies the text/style of the label text
-				radius: 0-1 for percentage of fullsize, or a specified pixel length
-				background: {
-					color: any hexadecimal color value (other formats may or may not work, so best to stick with something like '#000')
-					opacity: 0-1
-				},
-				threshold: 0-1 for the percentage value at which to hide labels (if they're too small)
-			},
-			combine: {
-				threshold: 0-1 for the percentage value at which to combine slices (if they're too small)
-				color: any hexadecimal color value (other formats may or may not work, so best to stick with something like '#CCC'), if null, the plugin will automatically use the color of the first slice to be combined
-				label: any text value of what the combined slice should be labeled
-			}
-			highlight: {
-				opacity: 0-1
-			}
-		}
-	}
-
-More detail and specific examples can be found in the included HTML file.
-
-*/
-
-import { i18n } from '@kbn/i18n';
-
-(function($) {
-	// Maximum redraw attempts when fitting labels within the plot
-
-	var REDRAW_ATTEMPTS = 10;
-
-	// Factor by which to shrink the pie when fitting labels within the plot
-
-	var REDRAW_SHRINK = 0.95;
-
-	function init(plot) {
-
-		var canvas = null,
-			target = null,
-			options = null,
-			maxRadius = null,
-			centerLeft = null,
-			centerTop = null,
-			processed = false,
-			ctx = null;
-
-		// interactive variables
-
-		var highlights = [];
-
-		// add hook to determine if pie plugin in enabled, and then perform necessary operations
-
-		plot.hooks.processOptions.push(function(plot, options) {
-			if (options.series.pie.show) {
-
-				options.grid.show = false;
-
-				// set labels.show
-
-				if (options.series.pie.label.show == "auto") {
-					if (options.legend.show) {
-						options.series.pie.label.show = false;
-					} else {
-						options.series.pie.label.show = true;
-					}
-				}
-
-				// set radius
-
-				if (options.series.pie.radius == "auto") {
-					if (options.series.pie.label.show) {
-						options.series.pie.radius = 3/4;
-					} else {
-						options.series.pie.radius = 1;
-					}
-				}
-
-				// ensure sane tilt
-
-				if (options.series.pie.tilt > 1) {
-					options.series.pie.tilt = 1;
-				} else if (options.series.pie.tilt < 0) {
-					options.series.pie.tilt = 0;
-				}
-			}
-		});
-
-		plot.hooks.bindEvents.push(function(plot, eventHolder) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				if (options.grid.hoverable) {
-					eventHolder.unbind("mousemove").mousemove(onMouseMove);
-				}
-				if (options.grid.clickable) {
-					eventHolder.unbind("click").click(onClick);
-				}
-			}
-		});
-
-		plot.hooks.processDatapoints.push(function(plot, series, data, datapoints) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				processDatapoints(plot, series, data, datapoints);
-			}
-		});
-
-		plot.hooks.drawOverlay.push(function(plot, octx) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				drawOverlay(plot, octx);
-			}
-		});
-
-		plot.hooks.draw.push(function(plot, newCtx) {
-			var options = plot.getOptions();
-			if (options.series.pie.show) {
-				draw(plot, newCtx);
-			}
-		});
-
-		function processDatapoints(plot, series, datapoints) {
-			if (!processed)	{
-				processed = true;
-				canvas = plot.getCanvas();
-				target = $(canvas).parent();
-				options = plot.getOptions();
-				plot.setData(combine(plot.getData()));
-			}
-		}
-
-		function combine(data) {
-
-			var total = 0,
-				combined = 0,
-				numCombined = 0,
-				color = options.series.pie.combine.color,
-				newdata = [];
-
-			// Fix up the raw data from Flot, ensuring the data is numeric
-
-			for (var i = 0; i < data.length; ++i) {
-
-				var value = data[i].data;
-
-				// If the data is an array, we'll assume that it's a standard
-				// Flot x-y pair, and are concerned only with the second value.
-
-				// Note how we use the original array, rather than creating a
-				// new one; this is more efficient and preserves any extra data
-				// that the user may have stored in higher indexes.
-
-				if ($.isArray(value) && value.length == 1) {
-    				value = value[0];
-				}
-
-				if ($.isArray(value)) {
-					// Equivalent to $.isNumeric() but compatible with jQuery < 1.7
-					if (!isNaN(parseFloat(value[1])) && isFinite(value[1])) {
-						value[1] = +value[1];
-					} else {
-						value[1] = 0;
-					}
-				} else if (!isNaN(parseFloat(value)) && isFinite(value)) {
-					value = [1, +value];
-				} else {
-					value = [1, 0];
-				}
-
-				data[i].data = [value];
-			}
-
-			// Sum up all the slices, so we can calculate percentages for each
-
-			for (var i = 0; i < data.length; ++i) {
-				total += data[i].data[0][1];
-			}
-
-			// Count the number of slices with percentages below the combine
-			// threshold; if it turns out to be just one, we won't combine.
-
-			for (var i = 0; i < data.length; ++i) {
-				var value = data[i].data[0][1];
-				if (value / total <= options.series.pie.combine.threshold) {
-					combined += value;
-					numCombined++;
-					if (!color) {
-						color = data[i].color;
-					}
-				}
-			}
-
-			for (var i = 0; i < data.length; ++i) {
-				var value = data[i].data[0][1];
-				if (numCombined < 2 || value / total > options.series.pie.combine.threshold) {
-					newdata.push(
-						$.extend(data[i], {     /* extend to allow keeping all other original data values
-						                           and using them e.g. in labelFormatter. */
-							data: [[1, value]],
-							color: data[i].color,
-							label: data[i].label,
-							angle: value * Math.PI * 2 / total,
-							percent: value / (total / 100)
-						})
-					);
-				}
-			}
-
-			if (numCombined > 1) {
-				newdata.push({
-					data: [[1, combined]],
-					color: color,
-					label: options.series.pie.combine.label,
-					angle: combined * Math.PI * 2 / total,
-					percent: combined / (total / 100)
-				});
-			}
-
-			return newdata;
-		}
-
-		function draw(plot, newCtx) {
-
-			if (!target) {
-				return; // if no series were passed
-			}
-
-			var canvasWidth = plot.getPlaceholder().width(),
-				canvasHeight = plot.getPlaceholder().height(),
-				legendWidth = target.children().filter(".legend").children().width() || 0;
-
-			ctx = newCtx;
-
-			// WARNING: HACK! REWRITE THIS CODE AS SOON AS POSSIBLE!
-
-			// When combining smaller slices into an 'other' slice, we need to
-			// add a new series.  Since Flot gives plugins no way to modify the
-			// list of series, the pie plugin uses a hack where the first call
-			// to processDatapoints results in a call to setData with the new
-			// list of series, then subsequent processDatapoints do nothing.
-
-			// The plugin-global 'processed' flag is used to control this hack;
-			// it starts out false, and is set to true after the first call to
-			// processDatapoints.
-
-			// Unfortunately this turns future setData calls into no-ops; they
-			// call processDatapoints, the flag is true, and nothing happens.
-
-			// To fix this we'll set the flag back to false here in draw, when
-			// all series have been processed, so the next sequence of calls to
-			// processDatapoints once again starts out with a slice-combine.
-			// This is really a hack; in 0.9 we need to give plugins a proper
-			// way to modify series before any processing begins.
-
-			processed = false;
-
-			// calculate maximum radius and center point
-
-			maxRadius =  Math.min(canvasWidth, canvasHeight / options.series.pie.tilt) / 2;
-			centerTop = canvasHeight / 2 + options.series.pie.offset.top;
-			centerLeft = canvasWidth / 2;
-
-			if (options.series.pie.offset.left == "auto") {
-				if (options.legend.position.match("w")) {
-					centerLeft += legendWidth / 2;
-				} else {
-					centerLeft -= legendWidth / 2;
-				}
-				if (centerLeft < maxRadius) {
-					centerLeft = maxRadius;
-				} else if (centerLeft > canvasWidth - maxRadius) {
-					centerLeft = canvasWidth - maxRadius;
-				}
-			} else {
-				centerLeft += options.series.pie.offset.left;
-			}
-
-			var slices = plot.getData(),
-				attempts = 0;
-
-			// Keep shrinking the pie's radius until drawPie returns true,
-			// indicating that all the labels fit, or we try too many times.
-
-			do {
-				if (attempts > 0) {
-					maxRadius *= REDRAW_SHRINK;
-				}
-				attempts += 1;
-				clear();
-				if (options.series.pie.tilt <= 0.8) {
-					drawShadow();
-				}
-			} while (!drawPie() && attempts < REDRAW_ATTEMPTS)
-
-			if (attempts >= REDRAW_ATTEMPTS) {
-				clear();
-				const errorMessage = i18n.translate('common.ui.flotCharts.pie.unableToDrawLabelsInsideCanvasErrorMessage', {
-					defaultMessage: 'Could not draw pie with labels contained inside canvas',
-				});
-				target.prepend(`<div class='error'>${errorMessage}</div>`);
-			}
-
-			if (plot.setSeries && plot.insertLegend) {
-				plot.setSeries(slices);
-				plot.insertLegend();
-			}
-
-			// we're actually done at this point, just defining internal functions at this point
-
-			function clear() {
-				ctx.clearRect(0, 0, canvasWidth, canvasHeight);
-				target.children().filter(".pieLabel, .pieLabelBackground").remove();
-			}
-
-			function drawShadow() {
-
-				var shadowLeft = options.series.pie.shadow.left;
-				var shadowTop = options.series.pie.shadow.top;
-				var edge = 10;
-				var alpha = options.series.pie.shadow.alpha;
-				var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-				if (radius >= canvasWidth / 2 - shadowLeft || radius * options.series.pie.tilt >= canvasHeight / 2 - shadowTop || radius <= edge) {
-					return;	// shadow would be outside canvas, so don't draw it
-				}
-
-				ctx.save();
-				ctx.translate(shadowLeft,shadowTop);
-				ctx.globalAlpha = alpha;
-				ctx.fillStyle = "#000";
-
-				// center and rotate to starting position
-
-				ctx.translate(centerLeft,centerTop);
-				ctx.scale(1, options.series.pie.tilt);
-
-				//radius -= edge;
-
-				for (var i = 1; i <= edge; i++) {
-					ctx.beginPath();
-					ctx.arc(0, 0, radius, 0, Math.PI * 2, false);
-					ctx.fill();
-					radius -= i;
-				}
-
-				ctx.restore();
-			}
-
-			function drawPie() {
-
-				var startAngle = Math.PI * options.series.pie.startAngle;
-				var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-				// center and rotate to starting position
-
-				ctx.save();
-				ctx.translate(centerLeft,centerTop);
-				ctx.scale(1, options.series.pie.tilt);
-				//ctx.rotate(startAngle); // start at top; -- This doesn't work properly in Opera
-
-				// draw slices
-
-				ctx.save();
-				var currentAngle = startAngle;
-				for (var i = 0; i < slices.length; ++i) {
-					slices[i].startAngle = currentAngle;
-					drawSlice(slices[i].angle, slices[i].color, true);
-				}
-				ctx.restore();
-
-				// draw slice outlines
-
-				if (options.series.pie.stroke.width > 0) {
-					ctx.save();
-					ctx.lineWidth = options.series.pie.stroke.width;
-					currentAngle = startAngle;
-					for (var i = 0; i < slices.length; ++i) {
-						drawSlice(slices[i].angle, options.series.pie.stroke.color, false);
-					}
-					ctx.restore();
-				}
-
-				// draw donut hole
-
-				drawDonutHole(ctx);
-
-				ctx.restore();
-
-				// Draw the labels, returning true if they fit within the plot
-
-				if (options.series.pie.label.show) {
-					return drawLabels();
-				} else return true;
-
-				function drawSlice(angle, color, fill) {
-
-					if (angle <= 0 || isNaN(angle)) {
-						return;
-					}
-
-					if (fill) {
-						ctx.fillStyle = color;
-					} else {
-						ctx.strokeStyle = color;
-						ctx.lineJoin = "round";
-					}
-
-					ctx.beginPath();
-					if (Math.abs(angle - Math.PI * 2) > 0.000000001) {
-						ctx.moveTo(0, 0); // Center of the pie
-					}
-
-					//ctx.arc(0, 0, radius, 0, angle, false); // This doesn't work properly in Opera
-					ctx.arc(0, 0, radius,currentAngle, currentAngle + angle / 2, false);
-					ctx.arc(0, 0, radius,currentAngle + angle / 2, currentAngle + angle, false);
-					ctx.closePath();
-					//ctx.rotate(angle); // This doesn't work properly in Opera
-					currentAngle += angle;
-
-					if (fill) {
-						ctx.fill();
-					} else {
-						ctx.stroke();
-					}
-				}
-
-				function drawLabels() {
-
-					var currentAngle = startAngle;
-					var radius = options.series.pie.label.radius > 1 ? options.series.pie.label.radius : maxRadius * options.series.pie.label.radius;
-
-					for (var i = 0; i < slices.length; ++i) {
-						if (slices[i].percent >= options.series.pie.label.threshold * 100) {
-							if (!drawLabel(slices[i], currentAngle, i)) {
-								return false;
-							}
-						}
-						currentAngle += slices[i].angle;
-					}
-
-					return true;
-
-					function drawLabel(slice, startAngle, index) {
-
-						if (slice.data[0][1] == 0) {
-							return true;
-						}
-
-						// format label text
-
-						var lf = options.legend.labelFormatter, text, plf = options.series.pie.label.formatter;
-
-						if (lf) {
-							text = lf(slice.label, slice);
-						} else {
-							text = slice.label;
-						}
-
-						if (plf) {
-							text = plf(text, slice);
-						}
-
-						var halfAngle = ((startAngle + slice.angle) + startAngle) / 2;
-						var x = centerLeft + Math.round(Math.cos(halfAngle) * radius);
-						var y = centerTop + Math.round(Math.sin(halfAngle) * radius) * options.series.pie.tilt;
-
-						var html = "<span class='pieLabel' id='pieLabel" + index + "' style='position:absolute;top:" + y + "px;left:" + x + "px;'>" + text + "</span>";
-						target.append(html);
-
-						var label = target.children("#pieLabel" + index);
-						var labelTop = (y - label.height() / 2);
-						var labelLeft = (x - label.width() / 2);
-
-						label.css("top", labelTop);
-						label.css("left", labelLeft);
-
-						// check to make sure that the label is not outside the canvas
-
-						if (0 - labelTop > 0 || 0 - labelLeft > 0 || canvasHeight - (labelTop + label.height()) < 0 || canvasWidth - (labelLeft + label.width()) < 0) {
-							return false;
-						}
-
-						if (options.series.pie.label.background.opacity != 0) {
-
-							// put in the transparent background separately to avoid blended labels and label boxes
-
-							var c = options.series.pie.label.background.color;
-
-							if (c == null) {
-								c = slice.color;
-							}
-
-							var pos = "top:" + labelTop + "px;left:" + labelLeft + "px;";
-							$("<div class='pieLabelBackground' style='position:absolute;width:" + label.width() + "px;height:" + label.height() + "px;" + pos + "background-color:" + c + ";'></div>")
-								.css("opacity", options.series.pie.label.background.opacity)
-								.insertBefore(label);
-						}
-
-						return true;
-					} // end individual label function
-				} // end drawLabels function
-			} // end drawPie function
-		} // end draw function
-
-		// Placed here because it needs to be accessed from multiple locations
-
-		function drawDonutHole(layer) {
-			if (options.series.pie.innerRadius > 0) {
-
-				// subtract the center
-
-				layer.save();
-				var innerRadius = options.series.pie.innerRadius > 1 ? options.series.pie.innerRadius : maxRadius * options.series.pie.innerRadius;
-				layer.globalCompositeOperation = "destination-out"; // this does not work with excanvas, but it will fall back to using the stroke color
-				layer.beginPath();
-				layer.fillStyle = options.series.pie.stroke.color;
-				layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
-				layer.fill();
-				layer.closePath();
-				layer.restore();
-
-				// add inner stroke
-
-				layer.save();
-				layer.beginPath();
-				layer.strokeStyle = options.series.pie.stroke.color;
-				layer.arc(0, 0, innerRadius, 0, Math.PI * 2, false);
-				layer.stroke();
-				layer.closePath();
-				layer.restore();
-
-				// TODO: add extra shadow inside hole (with a mask) if the pie is tilted.
-			}
-		}
-
-		//-- Additional Interactive related functions --
-
-		function isPointInPoly(poly, pt) {
-			for(var c = false, i = -1, l = poly.length, j = l - 1; ++i < l; j = i)
-				((poly[i][1] <= pt[1] && pt[1] < poly[j][1]) || (poly[j][1] <= pt[1] && pt[1]< poly[i][1]))
-				&& (pt[0] < (poly[j][0] - poly[i][0]) * (pt[1] - poly[i][1]) / (poly[j][1] - poly[i][1]) + poly[i][0])
-				&& (c = !c);
-			return c;
-		}
-
-		function findNearbySlice(mouseX, mouseY) {
-
-			var slices = plot.getData(),
-				options = plot.getOptions(),
-				radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius,
-				x, y;
-
-			for (var i = 0; i < slices.length; ++i) {
-
-				var s = slices[i];
-
-				if (s.pie.show) {
-
-					ctx.save();
-					ctx.beginPath();
-					ctx.moveTo(0, 0); // Center of the pie
-					//ctx.scale(1, options.series.pie.tilt);	// this actually seems to break everything when here.
-					ctx.arc(0, 0, radius, s.startAngle, s.startAngle + s.angle / 2, false);
-					ctx.arc(0, 0, radius, s.startAngle + s.angle / 2, s.startAngle + s.angle, false);
-					ctx.closePath();
-					x = mouseX - centerLeft;
-					y = mouseY - centerTop;
-
-					if (ctx.isPointInPath) {
-						if (ctx.isPointInPath(mouseX - centerLeft, mouseY - centerTop)) {
-							ctx.restore();
-							return {
-								datapoint: [s.percent, s.data],
-								dataIndex: 0,
-								series: s,
-								seriesIndex: i
-							};
-						}
-					} else {
-
-						// excanvas for IE doesn;t support isPointInPath, this is a workaround.
-
-						var p1X = radius * Math.cos(s.startAngle),
-							p1Y = radius * Math.sin(s.startAngle),
-							p2X = radius * Math.cos(s.startAngle + s.angle / 4),
-							p2Y = radius * Math.sin(s.startAngle + s.angle / 4),
-							p3X = radius * Math.cos(s.startAngle + s.angle / 2),
-							p3Y = radius * Math.sin(s.startAngle + s.angle / 2),
-							p4X = radius * Math.cos(s.startAngle + s.angle / 1.5),
-							p4Y = radius * Math.sin(s.startAngle + s.angle / 1.5),
-							p5X = radius * Math.cos(s.startAngle + s.angle),
-							p5Y = radius * Math.sin(s.startAngle + s.angle),
-							arrPoly = [[0, 0], [p1X, p1Y], [p2X, p2Y], [p3X, p3Y], [p4X, p4Y], [p5X, p5Y]],
-							arrPoint = [x, y];
-
-						// TODO: perhaps do some mathematical trickery here with the Y-coordinate to compensate for pie tilt?
-
-						if (isPointInPoly(arrPoly, arrPoint)) {
-							ctx.restore();
-							return {
-								datapoint: [s.percent, s.data],
-								dataIndex: 0,
-								series: s,
-								seriesIndex: i
-							};
-						}
-					}
-
-					ctx.restore();
-				}
-			}
-
-			return null;
-		}
-
-		function onMouseMove(e) {
-			triggerClickHoverEvent("plothover", e);
-		}
-
-		function onClick(e) {
-			triggerClickHoverEvent("plotclick", e);
-		}
-
-		// trigger click or hover event (they send the same parameters so we share their code)
-
-		function triggerClickHoverEvent(eventname, e) {
-
-			var offset = plot.offset();
-			var canvasX = parseInt(e.pageX - offset.left);
-			var canvasY =  parseInt(e.pageY - offset.top);
-			var item = findNearbySlice(canvasX, canvasY);
-
-			if (options.grid.autoHighlight) {
-
-				// clear auto-highlights
-
-				for (var i = 0; i < highlights.length; ++i) {
-					var h = highlights[i];
-					if (h.auto == eventname && !(item && h.series == item.series)) {
-						unhighlight(h.series);
-					}
-				}
-			}
-
-			// highlight the slice
-
-			if (item) {
-				highlight(item.series, eventname);
-			}
-
-			// trigger any hover bind events
-
-			var pos = { pageX: e.pageX, pageY: e.pageY };
-			target.trigger(eventname, [pos, item]);
-		}
-
-		function highlight(s, auto) {
-			//if (typeof s == "number") {
-			//	s = series[s];
-			//}
-
-			var i = indexOfHighlight(s);
-
-			if (i == -1) {
-				highlights.push({ series: s, auto: auto });
-				plot.triggerRedrawOverlay();
-			} else if (!auto) {
-				highlights[i].auto = false;
-			}
-		}
-
-		function unhighlight(s) {
-			if (s == null) {
-				highlights = [];
-				plot.triggerRedrawOverlay();
-			}
-
-			//if (typeof s == "number") {
-			//	s = series[s];
-			//}
-
-			var i = indexOfHighlight(s);
-
-			if (i != -1) {
-				highlights.splice(i, 1);
-				plot.triggerRedrawOverlay();
-			}
-		}
-
-		function indexOfHighlight(s) {
-			for (var i = 0; i < highlights.length; ++i) {
-				var h = highlights[i];
-				if (h.series == s)
-					return i;
-			}
-			return -1;
-		}
-
-		function drawOverlay(plot, octx) {
-
-			var options = plot.getOptions();
-
-			var radius = options.series.pie.radius > 1 ? options.series.pie.radius : maxRadius * options.series.pie.radius;
-
-			octx.save();
-			octx.translate(centerLeft, centerTop);
-			octx.scale(1, options.series.pie.tilt);
-
-			for (var i = 0; i < highlights.length; ++i) {
-				drawHighlight(highlights[i].series);
-			}
-
-			drawDonutHole(octx);
-
-			octx.restore();
-
-			function drawHighlight(series) {
-
-				if (series.angle <= 0 || isNaN(series.angle)) {
-					return;
-				}
-
-				//octx.fillStyle = parseColor(options.series.pie.highlight.color).scale(null, null, null, options.series.pie.highlight.opacity).toString();
-				octx.fillStyle = "rgba(255, 255, 255, " + options.series.pie.highlight.opacity + ")"; // this is temporary until we have access to parseColor
-				octx.beginPath();
-				if (Math.abs(series.angle - Math.PI * 2) > 0.000000001) {
-					octx.moveTo(0, 0); // Center of the pie
-				}
-				octx.arc(0, 0, radius, series.startAngle, series.startAngle + series.angle / 2, false);
-				octx.arc(0, 0, radius, series.startAngle + series.angle / 2, series.startAngle + series.angle, false);
-				octx.closePath();
-				octx.fill();
-			}
-		}
-	} // end init (plugin body)
-
-	// define pie specific options and their default values
-
-	var options = {
-		series: {
-			pie: {
-				show: false,
-				radius: "auto",	// actual radius of the visible pie (based on full calculated radius if <=1, or hard pixel value)
-				innerRadius: 0, /* for donut */
-				startAngle: 3/2,
-				tilt: 1,
-				shadow: {
-					left: 5,	// shadow left offset
-					top: 15,	// shadow top offset
-					alpha: 0.02	// shadow alpha
-				},
-				offset: {
-					top: 0,
-					left: "auto"
-				},
-				stroke: {
-					color: "#fff",
-					width: 1
-				},
-				label: {
-					show: "auto",
-					formatter: function(label, slice) {
-						return "<div style='font-size:x-small;text-align:center;padding:2px;color:" + slice.color + ";'>" + label + "<br/>" + Math.round(slice.percent) + "%</div>";
-					},	// formatter function
-					radius: 1,	// radius at which to place the labels (based on full calculated radius if <=1, or hard pixel value)
-					background: {
-						color: null,
-						opacity: 0
-					},
-					threshold: 0	// percentage at which to hide the label (i.e. the slice is too narrow)
-				},
-				combine: {
-					threshold: -1,	// percentage at which to combine little slices into one larger slice
-					color: null,	// color to give the new slice (auto-generated if null)
-					label: "Other"	// label to give the new slice
-				},
-				highlight: {
-					//color: "#fff",		// will add this functionality once parseColor is available
-					opacity: 0.5
-				}
-			}
-		}
-	};
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: "pie",
-		version: "1.1"
-	});
-
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.resize.js b/src/legacy/ui/public/flot-charts/jquery.flot.resize.js
deleted file mode 100644
index 8a626dda0addbc..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.resize.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Flot plugin for automatically redrawing plots as the placeholder resizes.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-It works by listening for changes on the placeholder div (through the jQuery
-resize event plugin) - if the size changes, it will redraw the plot.
-
-There are no options. If you need to disable the plugin for some plots, you
-can just fix the size of their placeholders.
-
-*/
-
-/* Inline dependency:
- * jQuery resize event - v1.1 - 3/14/2010
- * http://benalman.com/projects/jquery-resize-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,e,t){"$:nomunge";var i=[],n=$.resize=$.extend($.resize,{}),a,r=false,s="setTimeout",u="resize",m=u+"-special-event",o="pendingDelay",l="activeDelay",f="throttleWindow";n[o]=200;n[l]=20;n[f]=true;$.event.special[u]={setup:function(){if(!n[f]&&this[s]){return false}var e=$(this);i.push(this);e.data(m,{w:e.width(),h:e.height()});if(i.length===1){a=t;h()}},teardown:function(){if(!n[f]&&this[s]){return false}var e=$(this);for(var t=i.length-1;t>=0;t--){if(i[t]==this){i.splice(t,1);break}}e.removeData(m);if(!i.length){if(r){cancelAnimationFrame(a)}else{clearTimeout(a)}a=null}},add:function(e){if(!n[f]&&this[s]){return false}var i;function a(e,n,a){var r=$(this),s=r.data(m)||{};s.w=n!==t?n:r.width();s.h=a!==t?a:r.height();i.apply(this,arguments)}if($.isFunction(e)){i=e;return a}else{i=e.handler;e.handler=a}}};function h(t){if(r===true){r=t||1}for(var s=i.length-1;s>=0;s--){var l=$(i[s]);if(l[0]==e||l.is(":visible")){var f=l.width(),c=l.height(),d=l.data(m);if(d&&(f!==d.w||c!==d.h)){l.trigger(u,[d.w=f,d.h=c]);r=t||true}}else{d=l.data(m);d.w=0;d.h=0}}if(a!==null){if(r&&(t==null||t-r<1e3)){a=e.requestAnimationFrame(h)}else{a=setTimeout(h,n[o]);r=false}}}if(!e.requestAnimationFrame){e.requestAnimationFrame=function(){return e.webkitRequestAnimationFrame||e.mozRequestAnimationFrame||e.oRequestAnimationFrame||e.msRequestAnimationFrame||function(t,i){return e.setTimeout(function(){t((new Date).getTime())},n[l])}}()}if(!e.cancelAnimationFrame){e.cancelAnimationFrame=function(){return e.webkitCancelRequestAnimationFrame||e.mozCancelRequestAnimationFrame||e.oCancelRequestAnimationFrame||e.msCancelRequestAnimationFrame||clearTimeout}()}})(jQuery,this);
-
-(function ($) {
-    var options = { }; // no options
-
-    function init(plot) {
-        function onResize() {
-            var placeholder = plot.getPlaceholder();
-
-            // somebody might have hidden us and we can't plot
-            // when we don't have the dimensions
-            if (placeholder.width() == 0 || placeholder.height() == 0)
-                return;
-
-            plot.resize();
-            plot.setupGrid();
-            plot.draw();
-        }
-        
-        function bindEvents(plot, eventHolder) {
-            plot.getPlaceholder().resize(onResize);
-        }
-
-        function shutdown(plot, eventHolder) {
-            plot.getPlaceholder().unbind("resize", onResize);
-        }
-        
-        plot.hooks.bindEvents.push(bindEvents);
-        plot.hooks.shutdown.push(shutdown);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'resize',
-        version: '1.0'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.selection.js b/src/legacy/ui/public/flot-charts/jquery.flot.selection.js
deleted file mode 100644
index c8707b30f4e6ff..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.selection.js
+++ /dev/null
@@ -1,360 +0,0 @@
-/* Flot plugin for selecting regions of a plot.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin supports these options:
-
-selection: {
-	mode: null or "x" or "y" or "xy",
-	color: color,
-	shape: "round" or "miter" or "bevel",
-	minSize: number of pixels
-}
-
-Selection support is enabled by setting the mode to one of "x", "y" or "xy".
-In "x" mode, the user will only be able to specify the x range, similarly for
-"y" mode. For "xy", the selection becomes a rectangle where both ranges can be
-specified. "color" is color of the selection (if you need to change the color
-later on, you can get to it with plot.getOptions().selection.color). "shape"
-is the shape of the corners of the selection.
-
-"minSize" is the minimum size a selection can be in pixels. This value can
-be customized to determine the smallest size a selection can be and still
-have the selection rectangle be displayed. When customizing this value, the
-fact that it refers to pixels, not axis units must be taken into account.
-Thus, for example, if there is a bar graph in time mode with BarWidth set to 1
-minute, setting "minSize" to 1 will not make the minimum selection size 1
-minute, but rather 1 pixel. Note also that setting "minSize" to 0 will prevent
-"plotunselected" events from being fired when the user clicks the mouse without
-dragging.
-
-When selection support is enabled, a "plotselected" event will be emitted on
-the DOM element you passed into the plot function. The event handler gets a
-parameter with the ranges selected on the axes, like this:
-
-	placeholder.bind( "plotselected", function( event, ranges ) {
-		alert("You selected " + ranges.xaxis.from + " to " + ranges.xaxis.to)
-		// similar for yaxis - with multiple axes, the extra ones are in
-		// x2axis, x3axis, ...
-	});
-
-The "plotselected" event is only fired when the user has finished making the
-selection. A "plotselecting" event is fired during the process with the same
-parameters as the "plotselected" event, in case you want to know what's
-happening while it's happening,
-
-A "plotunselected" event with no arguments is emitted when the user clicks the
-mouse to remove the selection. As stated above, setting "minSize" to 0 will
-destroy this behavior.
-
-The plugin also adds the following methods to the plot object:
-
-- setSelection( ranges, preventEvent )
-
-  Set the selection rectangle. The passed in ranges is on the same form as
-  returned in the "plotselected" event. If the selection mode is "x", you
-  should put in either an xaxis range, if the mode is "y" you need to put in
-  an yaxis range and both xaxis and yaxis if the selection mode is "xy", like
-  this:
-
-	setSelection({ xaxis: { from: 0, to: 10 }, yaxis: { from: 40, to: 60 } });
-
-  setSelection will trigger the "plotselected" event when called. If you don't
-  want that to happen, e.g. if you're inside a "plotselected" handler, pass
-  true as the second parameter. If you are using multiple axes, you can
-  specify the ranges on any of those, e.g. as x2axis/x3axis/... instead of
-  xaxis, the plugin picks the first one it sees.
-
-- clearSelection( preventEvent )
-
-  Clear the selection rectangle. Pass in true to avoid getting a
-  "plotunselected" event.
-
-- getSelection()
-
-  Returns the current selection in the same format as the "plotselected"
-  event. If there's currently no selection, the function returns null.
-
-*/
-
-(function ($) {
-    function init(plot) {
-        var selection = {
-                first: { x: -1, y: -1}, second: { x: -1, y: -1},
-                show: false,
-                active: false
-            };
-
-        // FIXME: The drag handling implemented here should be
-        // abstracted out, there's some similar code from a library in
-        // the navigation plugin, this should be massaged a bit to fit
-        // the Flot cases here better and reused. Doing this would
-        // make this plugin much slimmer.
-        var savedhandlers = {};
-
-        var mouseUpHandler = null;
-        
-        function onMouseMove(e) {
-            if (selection.active) {
-                updateSelection(e);
-                
-                plot.getPlaceholder().trigger("plotselecting", [ getSelection() ]);
-            }
-        }
-
-        function onMouseDown(e) {
-            if (e.which != 1)  // only accept left-click
-                return;
-            
-            // cancel out any text selections
-            document.body.focus();
-
-            // prevent text selection and drag in old-school browsers
-            if (document.onselectstart !== undefined && savedhandlers.onselectstart == null) {
-                savedhandlers.onselectstart = document.onselectstart;
-                document.onselectstart = function () { return false; };
-            }
-            if (document.ondrag !== undefined && savedhandlers.ondrag == null) {
-                savedhandlers.ondrag = document.ondrag;
-                document.ondrag = function () { return false; };
-            }
-
-            setSelectionPos(selection.first, e);
-
-            selection.active = true;
-
-            // this is a bit silly, but we have to use a closure to be
-            // able to whack the same handler again
-            mouseUpHandler = function (e) { onMouseUp(e); };
-            
-            $(document).one("mouseup", mouseUpHandler);
-        }
-
-        function onMouseUp(e) {
-            mouseUpHandler = null;
-            
-            // revert drag stuff for old-school browsers
-            if (document.onselectstart !== undefined)
-                document.onselectstart = savedhandlers.onselectstart;
-            if (document.ondrag !== undefined)
-                document.ondrag = savedhandlers.ondrag;
-
-            // no more dragging
-            selection.active = false;
-            updateSelection(e);
-
-            if (selectionIsSane())
-                triggerSelectedEvent();
-            else {
-                // this counts as a clear
-                plot.getPlaceholder().trigger("plotunselected", [ ]);
-                plot.getPlaceholder().trigger("plotselecting", [ null ]);
-            }
-
-            return false;
-        }
-
-        function getSelection() {
-            if (!selectionIsSane())
-                return null;
-            
-            if (!selection.show) return null;
-
-            var r = {}, c1 = selection.first, c2 = selection.second;
-            $.each(plot.getAxes(), function (name, axis) {
-                if (axis.used) {
-                    var p1 = axis.c2p(c1[axis.direction]), p2 = axis.c2p(c2[axis.direction]); 
-                    r[name] = { from: Math.min(p1, p2), to: Math.max(p1, p2) };
-                }
-            });
-            return r;
-        }
-
-        function triggerSelectedEvent() {
-            var r = getSelection();
-
-            plot.getPlaceholder().trigger("plotselected", [ r ]);
-
-            // backwards-compat stuff, to be removed in future
-            if (r.xaxis && r.yaxis)
-                plot.getPlaceholder().trigger("selected", [ { x1: r.xaxis.from, y1: r.yaxis.from, x2: r.xaxis.to, y2: r.yaxis.to } ]);
-        }
-
-        function clamp(min, value, max) {
-            return value < min ? min: (value > max ? max: value);
-        }
-
-        function setSelectionPos(pos, e) {
-            var o = plot.getOptions();
-            var offset = plot.getPlaceholder().offset();
-            var plotOffset = plot.getPlotOffset();
-            pos.x = clamp(0, e.pageX - offset.left - plotOffset.left, plot.width());
-            pos.y = clamp(0, e.pageY - offset.top - plotOffset.top, plot.height());
-
-            if (o.selection.mode == "y")
-                pos.x = pos == selection.first ? 0 : plot.width();
-
-            if (o.selection.mode == "x")
-                pos.y = pos == selection.first ? 0 : plot.height();
-        }
-
-        function updateSelection(pos) {
-            if (pos.pageX == null)
-                return;
-
-            setSelectionPos(selection.second, pos);
-            if (selectionIsSane()) {
-                selection.show = true;
-                plot.triggerRedrawOverlay();
-            }
-            else
-                clearSelection(true);
-        }
-
-        function clearSelection(preventEvent) {
-            if (selection.show) {
-                selection.show = false;
-                plot.triggerRedrawOverlay();
-                if (!preventEvent)
-                    plot.getPlaceholder().trigger("plotunselected", [ ]);
-            }
-        }
-
-        // function taken from markings support in Flot
-        function extractRange(ranges, coord) {
-            var axis, from, to, key, axes = plot.getAxes();
-
-            for (var k in axes) {
-                axis = axes[k];
-                if (axis.direction == coord) {
-                    key = coord + axis.n + "axis";
-                    if (!ranges[key] && axis.n == 1)
-                        key = coord + "axis"; // support x1axis as xaxis
-                    if (ranges[key]) {
-                        from = ranges[key].from;
-                        to = ranges[key].to;
-                        break;
-                    }
-                }
-            }
-
-            // backwards-compat stuff - to be removed in future
-            if (!ranges[key]) {
-                axis = coord == "x" ? plot.getXAxes()[0] : plot.getYAxes()[0];
-                from = ranges[coord + "1"];
-                to = ranges[coord + "2"];
-            }
-
-            // auto-reverse as an added bonus
-            if (from != null && to != null && from > to) {
-                var tmp = from;
-                from = to;
-                to = tmp;
-            }
-            
-            return { from: from, to: to, axis: axis };
-        }
-        
-        function setSelection(ranges, preventEvent) {
-            var axis, range, o = plot.getOptions();
-
-            if (o.selection.mode == "y") {
-                selection.first.x = 0;
-                selection.second.x = plot.width();
-            }
-            else {
-                range = extractRange(ranges, "x");
-
-                selection.first.x = range.axis.p2c(range.from);
-                selection.second.x = range.axis.p2c(range.to);
-            }
-
-            if (o.selection.mode == "x") {
-                selection.first.y = 0;
-                selection.second.y = plot.height();
-            }
-            else {
-                range = extractRange(ranges, "y");
-
-                selection.first.y = range.axis.p2c(range.from);
-                selection.second.y = range.axis.p2c(range.to);
-            }
-
-            selection.show = true;
-            plot.triggerRedrawOverlay();
-            if (!preventEvent && selectionIsSane())
-                triggerSelectedEvent();
-        }
-
-        function selectionIsSane() {
-            var minSize = plot.getOptions().selection.minSize;
-            return Math.abs(selection.second.x - selection.first.x) >= minSize &&
-                Math.abs(selection.second.y - selection.first.y) >= minSize;
-        }
-
-        plot.clearSelection = clearSelection;
-        plot.setSelection = setSelection;
-        plot.getSelection = getSelection;
-
-        plot.hooks.bindEvents.push(function(plot, eventHolder) {
-            var o = plot.getOptions();
-            if (o.selection.mode != null) {
-                eventHolder.mousemove(onMouseMove);
-                eventHolder.mousedown(onMouseDown);
-            }
-        });
-
-
-        plot.hooks.drawOverlay.push(function (plot, ctx) {
-            // draw selection
-            if (selection.show && selectionIsSane()) {
-                var plotOffset = plot.getPlotOffset();
-                var o = plot.getOptions();
-
-                ctx.save();
-                ctx.translate(plotOffset.left, plotOffset.top);
-
-                var c = $.color.parse(o.selection.color);
-
-                ctx.strokeStyle = c.scale('a', 0.8).toString();
-                ctx.lineWidth = 1;
-                ctx.lineJoin = o.selection.shape;
-                ctx.fillStyle = c.scale('a', 0.4).toString();
-
-                var x = Math.min(selection.first.x, selection.second.x) + 0.5,
-                    y = Math.min(selection.first.y, selection.second.y) + 0.5,
-                    w = Math.abs(selection.second.x - selection.first.x) - 1,
-                    h = Math.abs(selection.second.y - selection.first.y) - 1;
-
-                ctx.fillRect(x, y, w, h);
-                ctx.strokeRect(x, y, w, h);
-
-                ctx.restore();
-            }
-        });
-        
-        plot.hooks.shutdown.push(function (plot, eventHolder) {
-            eventHolder.unbind("mousemove", onMouseMove);
-            eventHolder.unbind("mousedown", onMouseDown);
-            
-            if (mouseUpHandler)
-                $(document).unbind("mouseup", mouseUpHandler);
-        });
-
-    }
-
-    $.plot.plugins.push({
-        init: init,
-        options: {
-            selection: {
-                mode: null, // one of null, "x", "y" or "xy"
-                color: "#e8cfac",
-                shape: "round", // one of "round", "miter", or "bevel"
-                minSize: 5 // minimum number of pixels
-            }
-        },
-        name: 'selection',
-        version: '1.1'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.stack.js b/src/legacy/ui/public/flot-charts/jquery.flot.stack.js
deleted file mode 100644
index 0d91c0f3c01608..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.stack.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/* Flot plugin for stacking data sets rather than overlaying them.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin assumes the data is sorted on x (or y if stacking horizontally).
-For line charts, it is assumed that if a line has an undefined gap (from a
-null point), then the line above it should have the same gap - insert zeros
-instead of "null" if you want another behaviour. This also holds for the start
-and end of the chart. Note that stacking a mix of positive and negative values
-in most instances doesn't make sense (so it looks weird).
-
-Two or more series are stacked when their "stack" attribute is set to the same
-key (which can be any number or string or just "true"). To specify the default
-stack, you can set the stack option like this:
-
-	series: {
-		stack: null/false, true, or a key (number/string)
-	}
-
-You can also specify it for a single series, like this:
-
-	$.plot( $("#placeholder"), [{
-		data: [ ... ],
-		stack: true
-	}])
-
-The stacking order is determined by the order of the data series in the array
-(later series end up on top of the previous).
-
-Internally, the plugin modifies the datapoints in each series, adding an
-offset to the y value. For line series, extra data points are inserted through
-interpolation. If there's a second y value, it's also adjusted (e.g for bar
-charts or filled areas).
-
-*/
-
-(function ($) {
-    var options = {
-        series: { stack: null } // or number/string
-    };
-    
-    function init(plot) {
-        function findMatchingSeries(s, allseries) {
-            var res = null;
-            for (var i = 0; i < allseries.length; ++i) {
-                if (s == allseries[i])
-                    break;
-                
-                if (allseries[i].stack == s.stack)
-                    res = allseries[i];
-            }
-            
-            return res;
-        }
-        
-        function stackData(plot, s, datapoints) {
-            if (s.stack == null || s.stack === false)
-                return;
-
-            var other = findMatchingSeries(s, plot.getData());
-            if (!other)
-                return;
-
-            var ps = datapoints.pointsize,
-                points = datapoints.points,
-                otherps = other.datapoints.pointsize,
-                otherpoints = other.datapoints.points,
-                newpoints = [],
-                px, py, intery, qx, qy, bottom,
-                withlines = s.lines.show,
-                horizontal = s.bars.horizontal,
-                withbottom = ps > 2 && (horizontal ? datapoints.format[2].x : datapoints.format[2].y),
-                withsteps = withlines && s.lines.steps,
-                fromgap = true,
-                keyOffset = horizontal ? 1 : 0,
-                accumulateOffset = horizontal ? 0 : 1,
-                i = 0, j = 0, l, m;
-
-            while (true) {
-                if (i >= points.length)
-                    break;
-
-                l = newpoints.length;
-
-                if (points[i] == null) {
-                    // copy gaps
-                    for (m = 0; m < ps; ++m)
-                        newpoints.push(points[i + m]);
-                    i += ps;
-                }
-                else if (j >= otherpoints.length) {
-                    // for lines, we can't use the rest of the points
-                    if (!withlines) {
-                        for (m = 0; m < ps; ++m)
-                            newpoints.push(points[i + m]);
-                    }
-                    i += ps;
-                }
-                else if (otherpoints[j] == null) {
-                    // oops, got a gap
-                    for (m = 0; m < ps; ++m)
-                        newpoints.push(null);
-                    fromgap = true;
-                    j += otherps;
-                }
-                else {
-                    // cases where we actually got two points
-                    px = points[i + keyOffset];
-                    py = points[i + accumulateOffset];
-                    qx = otherpoints[j + keyOffset];
-                    qy = otherpoints[j + accumulateOffset];
-                    bottom = 0;
-
-                    if (px == qx) {
-                        for (m = 0; m < ps; ++m)
-                            newpoints.push(points[i + m]);
-
-                        newpoints[l + accumulateOffset] += qy;
-                        bottom = qy;
-                        
-                        i += ps;
-                        j += otherps;
-                    }
-                    else if (px > qx) {
-                        // we got past point below, might need to
-                        // insert interpolated extra point
-                        if (withlines && i > 0 && points[i - ps] != null) {
-                            intery = py + (points[i - ps + accumulateOffset] - py) * (qx - px) / (points[i - ps + keyOffset] - px);
-                            newpoints.push(qx);
-                            newpoints.push(intery + qy);
-                            for (m = 2; m < ps; ++m)
-                                newpoints.push(points[i + m]);
-                            bottom = qy; 
-                        }
-
-                        j += otherps;
-                    }
-                    else { // px < qx
-                        if (fromgap && withlines) {
-                            // if we come from a gap, we just skip this point
-                            i += ps;
-                            continue;
-                        }
-                            
-                        for (m = 0; m < ps; ++m)
-                            newpoints.push(points[i + m]);
-                        
-                        // we might be able to interpolate a point below,
-                        // this can give us a better y
-                        if (withlines && j > 0 && otherpoints[j - otherps] != null)
-                            bottom = qy + (otherpoints[j - otherps + accumulateOffset] - qy) * (px - qx) / (otherpoints[j - otherps + keyOffset] - qx);
-
-                        newpoints[l + accumulateOffset] += bottom;
-                        
-                        i += ps;
-                    }
-
-                    fromgap = false;
-                    
-                    if (l != newpoints.length && withbottom)
-                        newpoints[l + 2] += bottom;
-                }
-
-                // maintain the line steps invariant
-                if (withsteps && l != newpoints.length && l > 0
-                    && newpoints[l] != null
-                    && newpoints[l] != newpoints[l - ps]
-                    && newpoints[l + 1] != newpoints[l - ps + 1]) {
-                    for (m = 0; m < ps; ++m)
-                        newpoints[l + ps + m] = newpoints[l + m];
-                    newpoints[l + 1] = newpoints[l - ps + 1];
-                }
-            }
-
-            datapoints.points = newpoints;
-        }
-        
-        plot.hooks.processDatapoints.push(stackData);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'stack',
-        version: '1.2'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.symbol.js b/src/legacy/ui/public/flot-charts/jquery.flot.symbol.js
deleted file mode 100644
index 79f634971b6fa6..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.symbol.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Flot plugin that adds some extra symbols for plotting points.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The symbols are accessed as strings through the standard symbol options:
-
-	series: {
-		points: {
-			symbol: "square" // or "diamond", "triangle", "cross"
-		}
-	}
-
-*/
-
-(function ($) {
-    function processRawData(plot, series, datapoints) {
-        // we normalize the area of each symbol so it is approximately the
-        // same as a circle of the given radius
-
-        var handlers = {
-            square: function (ctx, x, y, radius, shadow) {
-                // pi * r^2 = (2s)^2  =>  s = r * sqrt(pi)/2
-                var size = radius * Math.sqrt(Math.PI) / 2;
-                ctx.rect(x - size, y - size, size + size, size + size);
-            },
-            diamond: function (ctx, x, y, radius, shadow) {
-                // pi * r^2 = 2s^2  =>  s = r * sqrt(pi/2)
-                var size = radius * Math.sqrt(Math.PI / 2);
-                ctx.moveTo(x - size, y);
-                ctx.lineTo(x, y - size);
-                ctx.lineTo(x + size, y);
-                ctx.lineTo(x, y + size);
-                ctx.lineTo(x - size, y);
-            },
-            triangle: function (ctx, x, y, radius, shadow) {
-                // pi * r^2 = 1/2 * s^2 * sin (pi / 3)  =>  s = r * sqrt(2 * pi / sin(pi / 3))
-                var size = radius * Math.sqrt(2 * Math.PI / Math.sin(Math.PI / 3));
-                var height = size * Math.sin(Math.PI / 3);
-                ctx.moveTo(x - size/2, y + height/2);
-                ctx.lineTo(x + size/2, y + height/2);
-                if (!shadow) {
-                    ctx.lineTo(x, y - height/2);
-                    ctx.lineTo(x - size/2, y + height/2);
-                }
-            },
-            cross: function (ctx, x, y, radius, shadow) {
-                // pi * r^2 = (2s)^2  =>  s = r * sqrt(pi)/2
-                var size = radius * Math.sqrt(Math.PI) / 2;
-                ctx.moveTo(x - size, y - size);
-                ctx.lineTo(x + size, y + size);
-                ctx.moveTo(x - size, y + size);
-                ctx.lineTo(x + size, y - size);
-            }
-        };
-
-        var s = series.points.symbol;
-        if (handlers[s])
-            series.points.symbol = handlers[s];
-    }
-    
-    function init(plot) {
-        plot.hooks.processDatapoints.push(processRawData);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        name: 'symbols',
-        version: '1.0'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.threshold.js b/src/legacy/ui/public/flot-charts/jquery.flot.threshold.js
deleted file mode 100644
index 8c99c401d87e5a..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.threshold.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/* Flot plugin for thresholding data.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-The plugin supports these options:
-
-	series: {
-		threshold: {
-			below: number
-			color: colorspec
-		}
-	}
-
-It can also be applied to a single series, like this:
-
-	$.plot( $("#placeholder"), [{
-		data: [ ... ],
-		threshold: { ... }
-	}])
-
-An array can be passed for multiple thresholding, like this:
-
-	threshold: [{
-		below: number1
-		color: color1
-	},{
-		below: number2
-		color: color2
-	}]
-
-These multiple threshold objects can be passed in any order since they are
-sorted by the processing function.
-
-The data points below "below" are drawn with the specified color. This makes
-it easy to mark points below 0, e.g. for budget data.
-
-Internally, the plugin works by splitting the data into two series, above and
-below the threshold. The extra series below the threshold will have its label
-cleared and the special "originSeries" attribute set to the original series.
-You may need to check for this in hover events.
-
-*/
-
-(function ($) {
-    var options = {
-        series: { threshold: null } // or { below: number, color: color spec}
-    };
-    
-    function init(plot) {
-        function thresholdData(plot, s, datapoints, below, color) {
-            var ps = datapoints.pointsize, i, x, y, p, prevp,
-                thresholded = $.extend({}, s); // note: shallow copy
-
-            thresholded.datapoints = { points: [], pointsize: ps, format: datapoints.format };
-            thresholded.label = null;
-            thresholded.color = color;
-            thresholded.threshold = null;
-            thresholded.originSeries = s;
-            thresholded.data = [];
- 
-            var origpoints = datapoints.points,
-                addCrossingPoints = s.lines.show;
-
-            var threspoints = [];
-            var newpoints = [];
-            var m;
-
-            for (i = 0; i < origpoints.length; i += ps) {
-                x = origpoints[i];
-                y = origpoints[i + 1];
-
-                prevp = p;
-                if (y < below)
-                    p = threspoints;
-                else
-                    p = newpoints;
-
-                if (addCrossingPoints && prevp != p && x != null
-                    && i > 0 && origpoints[i - ps] != null) {
-                    var interx = x + (below - y) * (x - origpoints[i - ps]) / (y - origpoints[i - ps + 1]);
-                    prevp.push(interx);
-                    prevp.push(below);
-                    for (m = 2; m < ps; ++m)
-                        prevp.push(origpoints[i + m]);
-                    
-                    p.push(null); // start new segment
-                    p.push(null);
-                    for (m = 2; m < ps; ++m)
-                        p.push(origpoints[i + m]);
-                    p.push(interx);
-                    p.push(below);
-                    for (m = 2; m < ps; ++m)
-                        p.push(origpoints[i + m]);
-                }
-
-                p.push(x);
-                p.push(y);
-                for (m = 2; m < ps; ++m)
-                    p.push(origpoints[i + m]);
-            }
-
-            datapoints.points = newpoints;
-            thresholded.datapoints.points = threspoints;
-            
-            if (thresholded.datapoints.points.length > 0) {
-                var origIndex = $.inArray(s, plot.getData());
-                // Insert newly-generated series right after original one (to prevent it from becoming top-most)
-                plot.getData().splice(origIndex + 1, 0, thresholded);
-            }
-                
-            // FIXME: there are probably some edge cases left in bars
-        }
-        
-        function processThresholds(plot, s, datapoints) {
-            if (!s.threshold)
-                return;
-            
-            if (s.threshold instanceof Array) {
-                s.threshold.sort(function(a, b) {
-                    return a.below - b.below;
-                });
-                
-                $(s.threshold).each(function(i, th) {
-                    thresholdData(plot, s, datapoints, th.below, th.color);
-                });
-            }
-            else {
-                thresholdData(plot, s, datapoints, s.threshold.below, s.threshold.color);
-            }
-        }
-        
-        plot.hooks.processDatapoints.push(processThresholds);
-    }
-    
-    $.plot.plugins.push({
-        init: init,
-        options: options,
-        name: 'threshold',
-        version: '1.2'
-    });
-})(jQuery);
diff --git a/src/legacy/ui/public/flot-charts/jquery.flot.time.js b/src/legacy/ui/public/flot-charts/jquery.flot.time.js
deleted file mode 100644
index 7612a033027646..00000000000000
--- a/src/legacy/ui/public/flot-charts/jquery.flot.time.js
+++ /dev/null
@@ -1,473 +0,0 @@
-/* Pretty handling of time axes.
-
-Copyright (c) 2007-2014 IOLA and Ole Laursen.
-Licensed under the MIT license.
-
-Set axis.mode to "time" to enable. See the section "Time series data" in
-API.txt for details.
-
-*/
-
-import { i18n } from '@kbn/i18n';
-
-(function($) {
-
-	var options = {
-		xaxis: {
-			timezone: null,		// "browser" for local to the client or timezone for timezone-js
-			timeformat: null,	// format string to use
-			twelveHourClock: false,	// 12 or 24 time in time mode
-			monthNames: null	// list of names of months
-		}
-	};
-
-	// round to nearby lower multiple of base
-
-	function floorInBase(n, base) {
-		return base * Math.floor(n / base);
-	}
-
-	// Returns a string with the date d formatted according to fmt.
-	// A subset of the Open Group's strftime format is supported.
-
-	function formatDate(d, fmt, monthNames, dayNames) {
-
-		if (typeof d.strftime == "function") {
-			return d.strftime(fmt);
-		}
-
-		var leftPad = function(n, pad) {
-			n = "" + n;
-			pad = "" + (pad == null ? "0" : pad);
-			return n.length == 1 ? pad + n : n;
-		};
-
-		var r = [];
-		var escape = false;
-		var hours = d.getHours();
-		var isAM = hours < 12;
-
-		if (monthNames == null) {
-			monthNames = [
-        i18n.translate('common.ui.flotCharts.janLabel', {
-					defaultMessage: 'Jan',
-				}), i18n.translate('common.ui.flotCharts.febLabel', {
-					defaultMessage: 'Feb',
-				}), i18n.translate('common.ui.flotCharts.marLabel', {
-					defaultMessage: 'Mar',
-				}), i18n.translate('common.ui.flotCharts.aprLabel', {
-					defaultMessage: 'Apr',
-				}), i18n.translate('common.ui.flotCharts.mayLabel', {
-					defaultMessage: 'May',
-				}), i18n.translate('common.ui.flotCharts.junLabel', {
-					defaultMessage: 'Jun',
-				}), i18n.translate('common.ui.flotCharts.julLabel', {
-					defaultMessage: 'Jul',
-				}), i18n.translate('common.ui.flotCharts.augLabel', {
-					defaultMessage: 'Aug',
-				}), i18n.translate('common.ui.flotCharts.sepLabel', {
-					defaultMessage: 'Sep',
-				}), i18n.translate('common.ui.flotCharts.octLabel', {
-					defaultMessage: 'Oct',
-				}), i18n.translate('common.ui.flotCharts.novLabel', {
-					defaultMessage: 'Nov',
-				}), i18n.translate('common.ui.flotCharts.decLabel', {
-					defaultMessage: 'Dec',
-				})];
-		}
-
-		if (dayNames == null) {
-			dayNames = [i18n.translate('common.ui.flotCharts.sunLabel', {
-        defaultMessage: 'Sun',
-      }), i18n.translate('common.ui.flotCharts.monLabel', {
-        defaultMessage: 'Mon',
-      }), i18n.translate('common.ui.flotCharts.tueLabel', {
-        defaultMessage: 'Tue',
-      }), i18n.translate('common.ui.flotCharts.wedLabel', {
-        defaultMessage: 'Wed',
-      }), i18n.translate('common.ui.flotCharts.thuLabel', {
-        defaultMessage: 'Thu',
-      }), i18n.translate('common.ui.flotCharts.friLabel', {
-        defaultMessage: 'Fri',
-      }), i18n.translate('common.ui.flotCharts.satLabel', {
-        defaultMessage: 'Sat',
-      })];
-		}
-
-		var hours12;
-
-		if (hours > 12) {
-			hours12 = hours - 12;
-		} else if (hours == 0) {
-			hours12 = 12;
-		} else {
-			hours12 = hours;
-		}
-
-		for (var i = 0; i < fmt.length; ++i) {
-
-			var c = fmt.charAt(i);
-
-			if (escape) {
-				switch (c) {
-					case 'a': c = "" + dayNames[d.getDay()]; break;
-					case 'b': c = "" + monthNames[d.getMonth()]; break;
-					case 'd': c = leftPad(d.getDate()); break;
-					case 'e': c = leftPad(d.getDate(), " "); break;
-					case 'h':	// For back-compat with 0.7; remove in 1.0
-					case 'H': c = leftPad(hours); break;
-					case 'I': c = leftPad(hours12); break;
-					case 'l': c = leftPad(hours12, " "); break;
-					case 'm': c = leftPad(d.getMonth() + 1); break;
-					case 'M': c = leftPad(d.getMinutes()); break;
-					// quarters not in Open Group's strftime specification
-					case 'q':
-						c = "" + (Math.floor(d.getMonth() / 3) + 1); break;
-					case 'S': c = leftPad(d.getSeconds()); break;
-					case 'y': c = leftPad(d.getFullYear() % 100); break;
-					case 'Y': c = "" + d.getFullYear(); break;
-					case 'p': c = (isAM) ? ("" + "am") : ("" + "pm"); break;
-					case 'P': c = (isAM) ? ("" + "AM") : ("" + "PM"); break;
-					case 'w': c = "" + d.getDay(); break;
-				}
-				r.push(c);
-				escape = false;
-			} else {
-				if (c == "%") {
-					escape = true;
-				} else {
-					r.push(c);
-				}
-			}
-		}
-
-		return r.join("");
-	}
-
-	// To have a consistent view of time-based data independent of which time
-	// zone the client happens to be in we need a date-like object independent
-	// of time zones.  This is done through a wrapper that only calls the UTC
-	// versions of the accessor methods.
-
-	function makeUtcWrapper(d) {
-
-		function addProxyMethod(sourceObj, sourceMethod, targetObj, targetMethod) {
-			sourceObj[sourceMethod] = function() {
-				return targetObj[targetMethod].apply(targetObj, arguments);
-			};
-		};
-
-		var utc = {
-			date: d
-		};
-
-		// support strftime, if found
-
-		if (d.strftime != undefined) {
-			addProxyMethod(utc, "strftime", d, "strftime");
-		}
-
-		addProxyMethod(utc, "getTime", d, "getTime");
-		addProxyMethod(utc, "setTime", d, "setTime");
-
-		var props = ["Date", "Day", "FullYear", "Hours", "Milliseconds", "Minutes", "Month", "Seconds"];
-
-		for (var p = 0; p < props.length; p++) {
-			addProxyMethod(utc, "get" + props[p], d, "getUTC" + props[p]);
-			addProxyMethod(utc, "set" + props[p], d, "setUTC" + props[p]);
-		}
-
-		return utc;
-	};
-
-	// select time zone strategy.  This returns a date-like object tied to the
-	// desired timezone
-
-	function dateGenerator(ts, opts) {
-		if (opts.timezone == "browser") {
-			return new Date(ts);
-		} else if (!opts.timezone || opts.timezone == "utc") {
-			return makeUtcWrapper(new Date(ts));
-		} else if (typeof timezoneJS != "undefined" && typeof timezoneJS.Date != "undefined") {
-			var d = new timezoneJS.Date();
-			// timezone-js is fickle, so be sure to set the time zone before
-			// setting the time.
-			d.setTimezone(opts.timezone);
-			d.setTime(ts);
-			return d;
-		} else {
-			return makeUtcWrapper(new Date(ts));
-		}
-	}
-
-	// map of app. size of time units in milliseconds
-
-	var timeUnitSize = {
-		"second": 1000,
-		"minute": 60 * 1000,
-		"hour": 60 * 60 * 1000,
-		"day": 24 * 60 * 60 * 1000,
-		"month": 30 * 24 * 60 * 60 * 1000,
-		"quarter": 3 * 30 * 24 * 60 * 60 * 1000,
-		"year": 365.2425 * 24 * 60 * 60 * 1000
-	};
-
-	// the allowed tick sizes, after 1 year we use
-	// an integer algorithm
-
-	var baseSpec = [
-		[1, "second"], [2, "second"], [5, "second"], [10, "second"],
-		[30, "second"],
-		[1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
-		[30, "minute"],
-		[1, "hour"], [2, "hour"], [4, "hour"],
-		[8, "hour"], [12, "hour"],
-		[1, "day"], [2, "day"], [3, "day"],
-		[0.25, "month"], [0.5, "month"], [1, "month"],
-		[2, "month"]
-	];
-
-	// we don't know which variant(s) we'll need yet, but generating both is
-	// cheap
-
-	var specMonths = baseSpec.concat([[3, "month"], [6, "month"],
-		[1, "year"]]);
-	var specQuarters = baseSpec.concat([[1, "quarter"], [2, "quarter"],
-		[1, "year"]]);
-
-	function init(plot) {
-		plot.hooks.processOptions.push(function (plot, options) {
-			$.each(plot.getAxes(), function(axisName, axis) {
-
-				var opts = axis.options;
-
-				if (opts.mode == "time") {
-					axis.tickGenerator = function(axis) {
-
-						var ticks = [];
-						var d = dateGenerator(axis.min, opts);
-						var minSize = 0;
-
-						// make quarter use a possibility if quarters are
-						// mentioned in either of these options
-
-						var spec = (opts.tickSize && opts.tickSize[1] ===
-							"quarter") ||
-							(opts.minTickSize && opts.minTickSize[1] ===
-							"quarter") ? specQuarters : specMonths;
-
-						if (opts.minTickSize != null) {
-							if (typeof opts.tickSize == "number") {
-								minSize = opts.tickSize;
-							} else {
-								minSize = opts.minTickSize[0] * timeUnitSize[opts.minTickSize[1]];
-							}
-						}
-
-						for (var i = 0; i < spec.length - 1; ++i) {
-							if (axis.delta < (spec[i][0] * timeUnitSize[spec[i][1]]
-											  + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
-								&& spec[i][0] * timeUnitSize[spec[i][1]] >= minSize) {
-								break;
-							}
-						}
-
-						var size = spec[i][0];
-						var unit = spec[i][1];
-
-						// special-case the possibility of several years
-
-						if (unit == "year") {
-
-							// if given a minTickSize in years, just use it,
-							// ensuring that it's an integer
-
-							if (opts.minTickSize != null && opts.minTickSize[1] == "year") {
-								size = Math.floor(opts.minTickSize[0]);
-							} else {
-
-								var magn = Math.pow(10, Math.floor(Math.log(axis.delta / timeUnitSize.year) / Math.LN10));
-								var norm = (axis.delta / timeUnitSize.year) / magn;
-
-								if (norm < 1.5) {
-									size = 1;
-								} else if (norm < 3) {
-									size = 2;
-								} else if (norm < 7.5) {
-									size = 5;
-								} else {
-									size = 10;
-								}
-
-								size *= magn;
-							}
-
-							// minimum size for years is 1
-
-							if (size < 1) {
-								size = 1;
-							}
-						}
-
-						axis.tickSize = opts.tickSize || [size, unit];
-						var tickSize = axis.tickSize[0];
-						unit = axis.tickSize[1];
-
-						var step = tickSize * timeUnitSize[unit];
-
-						if (unit == "second") {
-							d.setSeconds(floorInBase(d.getSeconds(), tickSize));
-						} else if (unit == "minute") {
-							d.setMinutes(floorInBase(d.getMinutes(), tickSize));
-						} else if (unit == "hour") {
-							d.setHours(floorInBase(d.getHours(), tickSize));
-						} else if (unit == "month") {
-							d.setMonth(floorInBase(d.getMonth(), tickSize));
-						} else if (unit == "quarter") {
-							d.setMonth(3 * floorInBase(d.getMonth() / 3,
-								tickSize));
-						} else if (unit == "year") {
-							d.setFullYear(floorInBase(d.getFullYear(), tickSize));
-						}
-
-						// reset smaller components
-
-						d.setMilliseconds(0);
-
-						if (step >= timeUnitSize.minute) {
-							d.setSeconds(0);
-						}
-						if (step >= timeUnitSize.hour) {
-							d.setMinutes(0);
-						}
-						if (step >= timeUnitSize.day) {
-							d.setHours(0);
-						}
-						if (step >= timeUnitSize.day * 4) {
-							d.setDate(1);
-						}
-						if (step >= timeUnitSize.month * 2) {
-							d.setMonth(floorInBase(d.getMonth(), 3));
-						}
-						if (step >= timeUnitSize.quarter * 2) {
-							d.setMonth(floorInBase(d.getMonth(), 6));
-						}
-						if (step >= timeUnitSize.year) {
-							d.setMonth(0);
-						}
-
-						var carry = 0;
-						var v = Number.NaN;
-						var prev;
-
-						do {
-
-							prev = v;
-							v = d.getTime();
-							ticks.push(v);
-
-							if (unit == "month" || unit == "quarter") {
-								if (tickSize < 1) {
-
-									// a bit complicated - we'll divide the
-									// month/quarter up but we need to take
-									// care of fractions so we don't end up in
-									// the middle of a day
-
-									d.setDate(1);
-									var start = d.getTime();
-									d.setMonth(d.getMonth() +
-										(unit == "quarter" ? 3 : 1));
-									var end = d.getTime();
-									d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
-									carry = d.getHours();
-									d.setHours(0);
-								} else {
-									d.setMonth(d.getMonth() +
-										tickSize * (unit == "quarter" ? 3 : 1));
-								}
-							} else if (unit == "year") {
-								d.setFullYear(d.getFullYear() + tickSize);
-							} else {
-								d.setTime(v + step);
-							}
-						} while (v < axis.max && v != prev);
-
-						return ticks;
-					};
-
-					axis.tickFormatter = function (v, axis) {
-
-						var d = dateGenerator(v, axis.options);
-
-						// first check global format
-
-						if (opts.timeformat != null) {
-							return formatDate(d, opts.timeformat, opts.monthNames, opts.dayNames);
-						}
-
-						// possibly use quarters if quarters are mentioned in
-						// any of these places
-
-						var useQuarters = (axis.options.tickSize &&
-								axis.options.tickSize[1] == "quarter") ||
-							(axis.options.minTickSize &&
-								axis.options.minTickSize[1] == "quarter");
-
-						var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
-						var span = axis.max - axis.min;
-						var suffix = (opts.twelveHourClock) ? " %p" : "";
-						var hourCode = (opts.twelveHourClock) ? "%I" : "%H";
-						var fmt;
-
-						if (t < timeUnitSize.minute) {
-							fmt = hourCode + ":%M:%S" + suffix;
-						} else if (t < timeUnitSize.day) {
-							if (span < 2 * timeUnitSize.day) {
-								fmt = hourCode + ":%M" + suffix;
-							} else {
-								fmt = "%b %d " + hourCode + ":%M" + suffix;
-							}
-						} else if (t < timeUnitSize.month) {
-							fmt = "%b %d";
-						} else if ((useQuarters && t < timeUnitSize.quarter) ||
-							(!useQuarters && t < timeUnitSize.year)) {
-							if (span < timeUnitSize.year) {
-								fmt = "%b";
-							} else {
-								fmt = "%b %Y";
-							}
-						} else if (useQuarters && t < timeUnitSize.year) {
-							if (span < timeUnitSize.year) {
-								fmt = "Q%q";
-							} else {
-								fmt = "Q%q %Y";
-							}
-						} else {
-							fmt = "%Y";
-						}
-
-						var rt = formatDate(d, fmt, opts.monthNames, opts.dayNames);
-
-						return rt;
-					};
-				}
-			});
-		});
-	}
-
-	$.plot.plugins.push({
-		init: init,
-		options: options,
-		name: 'time',
-		version: '1.0'
-	});
-
-	// Time-axis support used to be in Flot core, which exposed the
-	// formatDate function on the plot object.  Various plugins depend
-	// on the function, so we need to re-expose it here.
-
-	$.plot.formatDate = formatDate;
-	$.plot.dateGenerator = dateGenerator;
-
-})(jQuery);
diff --git a/src/legacy/ui/public/i18n/__snapshots__/index.test.tsx.snap b/src/legacy/ui/public/i18n/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index fd6a0a07ba39ce..00000000000000
--- a/src/legacy/ui/public/i18n/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,10 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ui/i18n renders children and forwards properties 1`] = `
-<div>
-  Context: 
-  <span>
-    Child: some prop:100500
-  </span>
-</div>
-`;
diff --git a/src/legacy/ui/public/i18n/index.test.tsx b/src/legacy/ui/public/i18n/index.test.tsx
deleted file mode 100644
index be8ab4cf8d6962..00000000000000
--- a/src/legacy/ui/public/i18n/index.test.tsx
+++ /dev/null
@@ -1,61 +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 { render } from 'enzyme';
-import PropTypes from 'prop-types';
-import React from 'react';
-
-jest.mock('angular-sanitize', () => {});
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      i18n: { Context: ({ children }: any) => <div>Context: {children}</div> },
-    },
-  },
-}));
-
-import { wrapInI18nContext } from '.';
-
-describe('ui/i18n', () => {
-  test('renders children and forwards properties', () => {
-    const mockPropTypes = {
-      stringProp: PropTypes.string.isRequired,
-      numberProp: PropTypes.number,
-    };
-
-    const WrappedComponent = wrapInI18nContext(
-      class extends React.PureComponent<{ [P in keyof typeof mockPropTypes]: unknown }> {
-        public static propTypes = mockPropTypes;
-
-        public render() {
-          return (
-            <span>
-              Child: {this.props.stringProp}:{this.props.numberProp}
-            </span>
-          );
-        }
-      }
-    );
-
-    expect(WrappedComponent.propTypes).toBe(mockPropTypes);
-    expect(
-      render(<WrappedComponent stringProp={'some prop'} numberProp={100500} />)
-    ).toMatchSnapshot();
-  });
-});
diff --git a/src/legacy/ui/public/i18n/index.tsx b/src/legacy/ui/public/i18n/index.tsx
deleted file mode 100644
index 290e82a1334b96..00000000000000
--- a/src/legacy/ui/public/i18n/index.tsx
+++ /dev/null
@@ -1,52 +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';
-// required for `ngSanitize` angular module
-import 'angular-sanitize';
-
-import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
-// @ts-ignore
-import { uiModules } from 'ui/modules';
-import { npStart } from 'ui/new_platform';
-
-export const I18nContext = npStart.core.i18n.Context;
-
-export function wrapInI18nContext<P>(ComponentToWrap: React.ComponentType<P>) {
-  const ContextWrapper: React.FC<P> = (props) => {
-    return (
-      <I18nContext>
-        <ComponentToWrap {...props} />
-      </I18nContext>
-    );
-  };
-
-  // Original propTypes from the wrapped component should be re-exposed
-  // since it will be used by reactDirective Angular service
-  // that will rely on propTypes to watch attributes with these names
-  ContextWrapper.propTypes = ComponentToWrap.propTypes;
-
-  return ContextWrapper;
-}
-
-uiModules
-  .get('i18n', ['ngSanitize'])
-  .provider('i18n', I18nProvider)
-  .filter('i18n', i18nFilter)
-  .directive('i18nId', i18nDirective);
diff --git a/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js b/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js
deleted file mode 100644
index df96a58a6e99fa..00000000000000
--- a/src/legacy/ui/public/indexed_array/__tests__/indexed_array.js
+++ /dev/null
@@ -1,208 +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 _ from 'lodash';
-import expect from '@kbn/expect';
-import { IndexedArray } from '..';
-
-// this is generally a data-structure that IndexedArray is good for managing
-const users = [
-  { name: 'John', id: 6, username: 'beast', group: 'admins' },
-  { name: 'Anon', id: 0, username: 'shhhh', group: 'secret' },
-  { name: 'Fern', id: 42, username: 'kitty', group: 'editor' },
-  { name: 'Mary', id: 55, username: 'sheep', group: 'editor' },
-];
-
-// this is how we used to accomplish this, before IndexedArray
-users.byName = _.keyBy(users, 'name');
-users.byUsername = _.keyBy(users, 'username');
-users.byGroup = _.groupBy(users, 'group');
-users.inIdOrder = _.sortBy(users, 'id');
-
-// then things started becoming unruly... so IndexedArray!
-
-describe('IndexedArray', function () {
-  describe('Basics', function () {
-    let reg;
-
-    beforeEach(function () {
-      reg = new IndexedArray();
-    });
-
-    it('Extends Array', function () {
-      expect(reg).to.be.a(Array);
-    });
-
-    it('fails basic lodash check', function () {
-      expect(Array.isArray(reg)).to.be(false);
-    });
-
-    it('clones to an object', function () {
-      expect(_.isObject(_.clone(reg))).to.be(true);
-      expect(Array.isArray(_.clone(reg))).to.be(false);
-    });
-  });
-
-  describe('Indexing', function () {
-    it('provides the initial set', function () {
-      const reg = new IndexedArray({
-        initialSet: [1, 2, 3],
-      });
-
-      expect(reg).to.have.length(3);
-
-      reg.forEach(function (v, i) {
-        expect(v).to.eql(i + 1);
-      });
-    });
-
-    it('indexes the initial set', function () {
-      const reg = new IndexedArray({
-        index: ['username'],
-        initialSet: users,
-      });
-
-      expect(reg).to.have.property('byUsername');
-      expect(reg.byUsername).to.eql(users.byUsername);
-    });
-
-    it('updates indices after values are added', function () {
-      // split up the user list, and add it in chunks
-      const firstUser = users.slice(0, 1).pop();
-      const otherUsers = users.slice(1);
-
-      // start off with all but the first
-      const reg = new IndexedArray({
-        group: ['group'],
-        order: ['id'],
-        initialSet: otherUsers,
-      });
-
-      // add the first
-      reg.push(firstUser);
-
-      // end up with the same structure that is in the users fixture
-      expect(Object.keys(reg.byGroup).length).to.be(Object.keys(users.byGroup).length);
-      for (const group of Object.keys(reg.byGroup)) {
-        expect(reg.byGroup[group].toJSON()).to.eql(users.byGroup[group]);
-      }
-
-      expect(reg.inIdOrder).to.eql(users.inIdOrder);
-    });
-
-    it('updates indices after values are removed', function () {
-      // start off with all
-      const reg = new IndexedArray({
-        group: ['group'],
-        order: ['id'],
-        initialSet: users,
-      });
-
-      // remove the last
-      reg.pop();
-
-      const expectedCount = users.length - 1;
-      // indexed lists should be updated
-      expect(reg).to.have.length(expectedCount);
-
-      const sumOfGroups = _.reduce(
-        reg.byGroup,
-        function (note, group) {
-          return note + group.length;
-        },
-        0
-      );
-      expect(sumOfGroups).to.eql(expectedCount);
-    });
-
-    it('removes items based on a predicate', function () {
-      const reg = new IndexedArray({
-        group: ['group'],
-        order: ['id'],
-        initialSet: users,
-      });
-
-      reg.remove({ name: 'John' });
-
-      expect(_.isEqual(reg.raw, reg.slice(0))).to.be(true);
-      expect(reg.length).to.be(3);
-      expect(reg[0].name).to.be('Anon');
-    });
-
-    it('updates indices after values are re-ordered', function () {
-      const rawUsers = users.slice(0);
-
-      // collect and shuffle the ids available
-      let ids = [];
-      _.times(rawUsers.length, function (i) {
-        ids.push(i);
-      });
-      ids = _.shuffle(ids);
-
-      // move something here
-      const toI = ids.shift();
-      // from here
-      const fromI = ids.shift();
-      // do the move
-      const move = function (arr) {
-        arr.splice(toI, 0, arr.splice(fromI, 1)[0]);
-      };
-
-      const reg = new IndexedArray({
-        index: ['username'],
-        initialSet: rawUsers,
-      });
-
-      const index = reg.byUsername;
-
-      move(reg);
-
-      expect(reg.byUsername).to.eql(index);
-      expect(reg.byUsername).to.not.be(index);
-    });
-  });
-
-  describe('Ordering', function () {
-    it('ordering is case insensitive', function () {
-      const reg = new IndexedArray({
-        index: ['title'],
-        order: ['title'],
-        initialSet: [{ title: 'APM' }, { title: 'Advanced Settings' }],
-      });
-
-      const ordered = reg.inTitleOrder;
-      expect(ordered[0].title).to.be('Advanced Settings');
-      expect(ordered[1].title).to.be('APM');
-    });
-
-    it('ordering handles numbers', function () {
-      const reg = new IndexedArray({
-        index: ['id'],
-        order: ['id'],
-        initialSet: users,
-      });
-
-      const ordered = reg.inIdOrder;
-      expect(ordered[0].id).to.be(0);
-      expect(ordered[1].id).to.be(6);
-      expect(ordered[2].id).to.be(42);
-      expect(ordered[3].id).to.be(55);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/indexed_array/__tests__/inflector.js b/src/legacy/ui/public/indexed_array/__tests__/inflector.js
deleted file mode 100644
index 49ac79094e5018..00000000000000
--- a/src/legacy/ui/public/indexed_array/__tests__/inflector.js
+++ /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 { inflector } from '../inflector';
-import expect from '@kbn/expect';
-
-describe('IndexedArray Inflector', function () {
-  it('returns a function', function () {
-    const getter = inflector();
-    expect(getter).to.be.a('function');
-  });
-
-  describe('fn', function () {
-    it('prepends a prefix', function () {
-      const inflect = inflector('my');
-
-      expect(inflect('Family')).to.be('myFamily');
-      expect(inflect('family')).to.be('myFamily');
-      expect(inflect('fAmIlY')).to.be('myFAmIlY');
-    });
-
-    it('adds both a prefix and suffix', function () {
-      const inflect = inflector('foo', 'Bar');
-
-      expect(inflect('box')).to.be('fooBoxBar');
-      expect(inflect('box.car.MAX')).to.be('fooBoxCarMaxBar');
-      expect(inflect('BaZzY')).to.be('fooBaZzYBar');
-    });
-
-    it('ignores prefix if it is already at the end of the inflected string', function () {
-      const inflect = inflector('foo', 'Bar');
-      expect(inflect('fooBox')).to.be('fooBoxBar');
-      expect(inflect('FooBox')).to.be('FooBoxBar');
-    });
-
-    it('ignores postfix if it is already at the end of the inflected string', function () {
-      const inflect = inflector('foo', 'Bar');
-      expect(inflect('bar')).to.be('fooBar');
-      expect(inflect('showBoxBar')).to.be('fooShowBoxBar');
-    });
-
-    it('works with "name"', function () {
-      const inflect = inflector('in', 'Order');
-      expect(inflect('name')).to.be('inNameOrder');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.test.ts
deleted file mode 100644
index fc4ca8469382ad..00000000000000
--- a/src/legacy/ui/public/indexed_array/helpers/organize_by.test.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 { groupBy } from 'lodash';
-import { organizeBy } from './organize_by';
-
-describe('organizeBy', () => {
-  test('it works', () => {
-    const col = [
-      {
-        name: 'one',
-        roles: ['user', 'admin', 'owner'],
-      },
-      {
-        name: 'two',
-        roles: ['user'],
-      },
-      {
-        name: 'three',
-        roles: ['user'],
-      },
-      {
-        name: 'four',
-        roles: ['user', 'admin'],
-      },
-    ];
-
-    const resp = organizeBy(col, 'roles');
-    expect(resp).toHaveProperty('user');
-    expect(resp.user.length).toBe(4);
-
-    expect(resp).toHaveProperty('admin');
-    expect(resp.admin.length).toBe(2);
-
-    expect(resp).toHaveProperty('owner');
-    expect(resp.owner.length).toBe(1);
-  });
-
-  test('behaves just like groupBy in normal scenarios', () => {
-    const col = [{ name: 'one' }, { name: 'two' }, { name: 'three' }, { name: 'four' }];
-
-    const orgs = organizeBy(col, 'name');
-    const groups = groupBy(col, 'name');
-
-    expect(orgs).toEqual(groups);
-  });
-});
diff --git a/src/legacy/ui/public/indexed_array/helpers/organize_by.ts b/src/legacy/ui/public/indexed_array/helpers/organize_by.ts
deleted file mode 100644
index e923767c892cd5..00000000000000
--- a/src/legacy/ui/public/indexed_array/helpers/organize_by.ts
+++ /dev/null
@@ -1,61 +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 { each, isFunction } from 'lodash';
-
-/**
- * Like _.groupBy, but allows specifying multiple groups for a
- * single object.
- *
- * organizeBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
- * // Object {1: Array[2], 2: Array[1], 3: Array[1], 4: Array[1]}
- *
- * _.groupBy([{ a: [1, 2, 3] }, { b: true, a: [1, 4] }], 'a')
- * // Object {'1,2,3': Array[1], '1,4': Array[1]}
- *
- * @param  {array} collection - the list of values to organize
- * @param  {Function} callback - either a property name, or a callback.
- * @return {object}
- */
-export function organizeBy(collection: object[], callback: ((obj: object) => string) | string) {
-  const buckets: { [key: string]: object[] } = {};
-
-  function add(key: string, obj: object) {
-    if (!buckets[key]) {
-      buckets[key] = [];
-    }
-    buckets[key].push(obj);
-  }
-
-  each(collection, (obj: Record<string, any>) => {
-    const keys = isFunction(callback) ? callback(obj) : obj[callback];
-
-    if (!Array.isArray(keys)) {
-      add(keys, obj);
-      return;
-    }
-
-    let length = keys.length;
-    while (length-- > 0) {
-      add(keys[length], obj);
-    }
-  });
-
-  return buckets;
-}
diff --git a/src/legacy/ui/public/indexed_array/index.d.ts b/src/legacy/ui/public/indexed_array/index.d.ts
deleted file mode 100644
index 21c0a818731ac5..00000000000000
--- a/src/legacy/ui/public/indexed_array/index.d.ts
+++ /dev/null
@@ -1,44 +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 { ListIterator } from 'lodash';
-
-interface IndexedArrayConfig<T> {
-  index?: string[];
-  group?: string[];
-  order?: string[];
-  initialSet?: T[];
-  immutable?: boolean;
-}
-
-declare class IndexedArray<T> extends Array<T> {
-  public immutable: boolean;
-  public raw: T[];
-
-  // These may not actually be present, as they are dynamically defined
-  public inOrder: T[];
-  public byType: Record<string, T[]>;
-  public byName: Record<string, T>;
-
-  constructor(config: IndexedArrayConfig<T>);
-
-  public remove(predicate: ListIterator<T, boolean>): T[];
-
-  public toJSON(): T[];
-}
diff --git a/src/legacy/ui/public/indexed_array/index.js b/src/legacy/ui/public/indexed_array/index.js
deleted file mode 100644
index 6a42961c9e680b..00000000000000
--- a/src/legacy/ui/public/indexed_array/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 { IndexedArray } from './indexed_array';
diff --git a/src/legacy/ui/public/indexed_array/indexed_array.js b/src/legacy/ui/public/indexed_array/indexed_array.js
deleted file mode 100644
index b9a427b8da7adc..00000000000000
--- a/src/legacy/ui/public/indexed_array/indexed_array.js
+++ /dev/null
@@ -1,235 +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 _ from 'lodash';
-import { inflector } from './inflector';
-import { organizeBy } from './helpers/organize_by';
-
-const pathGetter = _(_.get).rearg(1, 0).ary(2);
-const inflectIndex = inflector('by');
-const inflectOrder = inflector('in', 'Order');
-
-const CLEAR_CACHE = {};
-const OPT_NAMES = ['index', 'group', 'order', 'initialSet', 'immutable'];
-
-/**
- *  Generic extension of Array class, which will index (and reindex) the
- *  objects it contains based on their properties.
- *
- *  @param {Object} config describes the properties of this registry object
- *  @param {Array<string>} [config.index] a list of props/paths that should be used to index the docs.
- *  @param {Array<string>} [config.group] a list of keys/paths to group docs by.
- *  @param {Array<string>} [config.order] a list of keys/paths to order the keys by.
- *  @param {Array<any>} [config.initialSet] the initial dataset the IndexedArray should contain.
- *  @param {boolean} [config.immutable] a flag that hints to people reading the implementation that this IndexedArray
- *                                      should not be modified
- */
-
-export class IndexedArray {
-  static OPT_NAMES = OPT_NAMES;
-
-  constructor(config) {
-    config = _.pick(config || {}, OPT_NAMES);
-
-    // use defineProperty so that value can't be changed
-    Object.defineProperty(this, 'raw', { value: [] });
-
-    this._indexNames = _.union(
-      this._setupIndex(config.group, inflectIndex, organizeByIndexedArray(config)),
-      this._setupIndex(config.index, inflectIndex, _.keyBy),
-      this._setupIndex(config.order, inflectOrder, (raw, pluckValue) => {
-        return [...raw].sort((itemA, itemB) => {
-          const a = pluckValue(itemA);
-          const b = pluckValue(itemB);
-          if (typeof a === 'number' && typeof b === 'number') {
-            return a - b;
-          }
-          return String(a).toLowerCase().localeCompare(String(b).toLowerCase());
-        });
-      })
-    );
-
-    if (config.initialSet) {
-      this.push.apply(this, config.initialSet);
-    }
-
-    Object.defineProperty(this, 'immutable', { value: !!config.immutable });
-  }
-
-  /**
-   * Remove items from this based on a predicate
-   * @param {Function|Object|string} predicate - the predicate used to decide what is removed
-   * @return {array} - the removed data
-   */
-  remove(predicate) {
-    this._assertMutable('remove');
-    const out = _.remove(this, predicate);
-    _.remove(this.raw, predicate);
-    this._clearIndices();
-    return out;
-  }
-
-  /**
-   * provide a hook for the JSON serializer
-   * @return {array} - a plain, vanilla array with our same data
-   */
-  toJSON() {
-    return this.raw;
-  }
-
-  // wrappers for mutable Array methods
-  copyWithin(...args) {
-    return this._mutation('copyWithin', args);
-  }
-  fill(...args) {
-    return this._mutation('fill', args);
-  }
-  pop(...args) {
-    return this._mutation('pop', args);
-  }
-  push(...args) {
-    return this._mutation('push', args);
-  }
-  reverse(...args) {
-    return this._mutation('reverse', args);
-  }
-  shift(...args) {
-    return this._mutation('shift', args);
-  }
-  sort(...args) {
-    return this._mutation('sort', args);
-  }
-  splice(...args) {
-    return this._mutation('splice', args);
-  }
-  unshift(...args) {
-    return this._mutation('unshift', args);
-  }
-
-  /**
-   *  If this instance of IndexedArray is not mutable, throw an error
-   *  @private
-   *  @param  {String} methodName - user facing method name, for error message
-   *  @return {undefined}
-   */
-  _assertMutable(methodName) {
-    if (this.immutable) {
-      throw new Error(`${methodName}() is not allowed on immutable IndexedArray instances`);
-    }
-  }
-
-  /**
-   *  Execute some mutable method from the Array prototype
-   *  on the IndexedArray and this.raw
-   *
-   *  @private
-   *  @param  {string} methodName
-   *  @param  {Array<any>} args
-   *  @return {any}
-   */
-  _mutation(methodName, args) {
-    this._assertMutable(methodName);
-    super[methodName].apply(this, args);
-    this._clearIndices();
-    return super[methodName].apply(this.raw, args);
-  }
-
-  /**
-   * Create indices for a group of object properties. getters and setters are used to
-   * read and control the indices.
-   * @private
-   * @param  {string[]} props   - the properties that should be used to index docs
-   * @param  {function} inflect - a function that will be called with a property name, and
-   *                            creates the public property at which the index will be exposed
-   * @param  {function} op      - the function that will be used to create the indices, it is passed
-   *                            the raw representation of the registry, and a getter for reading the
-   *                            right prop
-   *
-   * @returns {string[]}        - the public keys of all indices created
-   */
-  _setupIndex(props, inflect, op) {
-    // shortcut for empty props
-    if (!props || props.length === 0) return;
-
-    return props.map((prop) => {
-      const indexName = inflect(prop);
-      const getIndexValueFromItem = pathGetter.partial(prop).value();
-      let cache;
-
-      Object.defineProperty(this, indexName, {
-        enumerable: false,
-        configurable: false,
-
-        set: (val) => {
-          // can't set any value other than the CLEAR_CACHE constant
-          if (val === CLEAR_CACHE) {
-            cache = false;
-          } else {
-            throw new TypeError(indexName + ' can not be set, it is a computed index of values');
-          }
-        },
-        get: () => {
-          if (!cache) {
-            cache = op(this.raw, getIndexValueFromItem);
-          }
-
-          return cache;
-        },
-      });
-
-      return indexName;
-    });
-  }
-
-  /**
-   * Clear cached index/group/order caches so they will be recreated
-   * on next access
-   * @private
-   * @return {undefined}
-   */
-  _clearIndices() {
-    this._indexNames.forEach((name) => {
-      this[name] = CLEAR_CACHE;
-    });
-  }
-}
-
-// using traditional `extends Array` syntax doesn't work with babel
-// See https://babeljs.io/docs/usage/caveats/
-Object.setPrototypeOf(IndexedArray.prototype, Array.prototype);
-
-// Similar to `organizeBy` but returns IndexedArrays instead of normal Arrays.
-function organizeByIndexedArray(config) {
-  return (...args) => {
-    const grouped = organizeBy(...args);
-
-    return _.reduce(
-      grouped,
-      (acc, value, group) => {
-        acc[group] = new IndexedArray({
-          ...config,
-          initialSet: value,
-        });
-
-        return acc;
-      },
-      {}
-    );
-  };
-}
diff --git a/src/legacy/ui/public/indexed_array/inflector.js b/src/legacy/ui/public/indexed_array/inflector.js
deleted file mode 100644
index e034146f5f62f3..00000000000000
--- a/src/legacy/ui/public/indexed_array/inflector.js
+++ /dev/null
@@ -1,60 +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.
- */
-
-function upFirst(str, total) {
-  return str.charAt(0).toUpperCase() + (total ? str.substr(1).toLowerCase() : str.substr(1));
-}
-
-function startsWith(str, test) {
-  return str.substr(0, test.length).toLowerCase() === test.toLowerCase();
-}
-
-function endsWith(str, test) {
-  const tooShort = str.length < test.length;
-  if (tooShort) return;
-
-  return str.substr(str.length - test.length).toLowerCase() === test.toLowerCase();
-}
-
-export function inflector(prefix, postfix) {
-  return function inflect(key) {
-    let inflected;
-
-    if (key.indexOf('.') !== -1) {
-      inflected = key
-        .split('.')
-        .map(function (step, i) {
-          return i === 0 ? step : upFirst(step, true);
-        })
-        .join('');
-    } else {
-      inflected = key;
-    }
-
-    if (prefix && !startsWith(key, prefix)) {
-      inflected = prefix + upFirst(inflected);
-    }
-
-    if (postfix && !endsWith(key, postfix)) {
-      inflected = inflected + postfix;
-    }
-
-    return inflected;
-  };
-}
diff --git a/src/legacy/ui/public/kfetch/__mocks__/index.ts b/src/legacy/ui/public/kfetch/__mocks__/index.ts
deleted file mode 100644
index 1a128e2b85260f..00000000000000
--- a/src/legacy/ui/public/kfetch/__mocks__/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 const kfetch = () => Promise.resolve();
diff --git a/src/legacy/ui/public/kfetch/_import_objects.ndjson b/src/legacy/ui/public/kfetch/_import_objects.ndjson
deleted file mode 100644
index 3511fb44cdfb24..00000000000000
--- a/src/legacy/ui/public/kfetch/_import_objects.ndjson
+++ /dev/null
@@ -1 +0,0 @@
-{"attributes":{"description":"","kibanaSavedObjectMeta":{"searchSourceJSON":"{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"},"title":"Log Agents","uiStateJSON":"{}","visState":"{\"title\":\"Log Agents\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100},\"title\":{\"text\":\"agent.raw: Descending\"}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"terms\",\"schema\":\"segment\",\"params\":{\"field\":\"agent.raw\",\"size\":5,\"order\":\"desc\",\"orderBy\":\"1\"}}]}"},"id":"082f1d60-a2e7-11e7-bb30-233be9be6a15","migrationVersion":{"visualization":"7.0.0"},"references":[{"id":"f1e4c910-a2e6-11e7-bb30-233be9be6a15","name":"kibanaSavedObjectMeta.searchSourceJSON.index","type":"index-pattern"}],"type":"visualization","version":1}
diff --git a/src/legacy/ui/public/kfetch/index.ts b/src/legacy/ui/public/kfetch/index.ts
deleted file mode 100644
index 105df171ad3702..00000000000000
--- a/src/legacy/ui/public/kfetch/index.ts
+++ /dev/null
@@ -1,28 +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 { npSetup } from 'ui/new_platform';
-import { createKfetch, KFetchKibanaOptions, KFetchOptions } from './kfetch';
-export { addInterceptor, KFetchOptions, KFetchQuery } from './kfetch';
-
-const kfetchInstance = createKfetch(npSetup.core.http);
-
-export const kfetch = (options: KFetchOptions, kfetchOptions?: KFetchKibanaOptions) => {
-  return kfetchInstance(options, kfetchOptions);
-};
diff --git a/src/legacy/ui/public/kfetch/kfetch.test.mocks.ts b/src/legacy/ui/public/kfetch/kfetch.test.mocks.ts
deleted file mode 100644
index ea066b3623f134..00000000000000
--- a/src/legacy/ui/public/kfetch/kfetch.test.mocks.ts
+++ /dev/null
@@ -1,26 +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 { setup } from '../../../../test_utils/public/http_test_setup';
-
-jest.doMock('ui/new_platform', () => ({
-  npSetup: {
-    core: setup(),
-  },
-}));
diff --git a/src/legacy/ui/public/kfetch/kfetch.test.ts b/src/legacy/ui/public/kfetch/kfetch.test.ts
deleted file mode 100644
index c45a142d54e9b5..00000000000000
--- a/src/legacy/ui/public/kfetch/kfetch.test.ts
+++ /dev/null
@@ -1,487 +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.
- */
-
-// @ts-ignore
-import fetchMock from 'fetch-mock/es5/client';
-import './kfetch.test.mocks';
-import { readFileSync } from 'fs';
-import { join } from 'path';
-import { addInterceptor, kfetch, KFetchOptions } from '.';
-import { Interceptor, resetInterceptors, withDefaultOptions } from './kfetch';
-import { KFetchError } from './kfetch_error';
-
-describe('kfetch', () => {
-  afterEach(() => {
-    fetchMock.restore();
-    resetInterceptors();
-  });
-
-  it('should use supplied request method', async () => {
-    fetchMock.post('*', {});
-    await kfetch({ pathname: '/my/path', method: 'POST' });
-    expect(fetchMock.lastOptions()!.method).toBe('POST');
-  });
-
-  it('should use supplied Content-Type', async () => {
-    fetchMock.get('*', {});
-    await kfetch({ pathname: '/my/path', headers: { 'Content-Type': 'CustomContentType' } });
-    expect(fetchMock.lastOptions()!.headers).toMatchObject({
-      'content-type': 'CustomContentType',
-    });
-  });
-
-  it('should use supplied pathname and querystring', async () => {
-    fetchMock.get('*', {});
-    await kfetch({ pathname: '/my/path', query: { a: 'b' } });
-    expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path?a=b');
-  });
-
-  it('should use supplied headers', async () => {
-    fetchMock.get('*', {});
-    await kfetch({
-      pathname: '/my/path',
-      headers: { myHeader: 'foo' },
-    });
-
-    expect(fetchMock.lastOptions()!.headers).toEqual({
-      'content-type': 'application/json',
-      'kbn-version': 'kibanaVersion',
-      myheader: 'foo',
-    });
-  });
-
-  it('should return response', async () => {
-    fetchMock.get('*', { foo: 'bar' });
-    const res = await kfetch({ pathname: '/my/path' });
-    expect(res).toEqual({ foo: 'bar' });
-  });
-
-  it('should prepend url with basepath by default', async () => {
-    fetchMock.get('*', {});
-    await kfetch({ pathname: '/my/path' });
-    expect(fetchMock.lastUrl()).toBe('http://localhost/myBase/my/path');
-  });
-
-  it('should not prepend url with basepath when disabled', async () => {
-    fetchMock.get('*', {});
-    await kfetch({ pathname: '/my/path' }, { prependBasePath: false });
-    expect(fetchMock.lastUrl()).toBe('/my/path');
-  });
-
-  it('should make request with defaults', async () => {
-    fetchMock.get('*', {});
-    await kfetch({ pathname: '/my/path' });
-
-    expect(fetchMock.lastCall()!.request.credentials).toBe('same-origin');
-    expect(fetchMock.lastOptions()!).toMatchObject({
-      method: 'GET',
-      headers: {
-        'content-type': 'application/json',
-        'kbn-version': 'kibanaVersion',
-      },
-    });
-  });
-
-  it('should make requests for NDJSON content', async () => {
-    const content = readFileSync(join(__dirname, '_import_objects.ndjson'), { encoding: 'utf-8' });
-
-    fetchMock.post('*', {
-      body: content,
-      headers: { 'Content-Type': 'application/ndjson' },
-    });
-
-    const data = await kfetch({
-      method: 'POST',
-      pathname: '/my/path',
-      body: content,
-      headers: {
-        'Content-Type': 'multipart/form-data',
-      },
-    });
-
-    expect(data).toBeInstanceOf(Blob);
-
-    const ndjson = await new Response(data).text();
-
-    expect(ndjson).toEqual(content);
-  });
-
-  it('should reject on network error', async () => {
-    expect.assertions(1);
-    fetchMock.get('*', { status: 500 });
-
-    try {
-      await kfetch({ pathname: '/my/path' });
-    } catch (e) {
-      expect(e.message).toBe('Internal Server Error');
-    }
-  });
-
-  describe('when throwing response error (KFetchError)', () => {
-    let error: KFetchError;
-    beforeEach(async () => {
-      fetchMock.get('*', { status: 404, body: { foo: 'bar' } });
-      try {
-        await kfetch({ pathname: '/my/path' });
-      } catch (e) {
-        error = e;
-      }
-    });
-
-    it('should contain error message', () => {
-      expect(error.message).toBe('Not Found');
-    });
-
-    it('should return response body', () => {
-      expect(error.body).toEqual({ foo: 'bar' });
-    });
-
-    it('should contain response properties', () => {
-      expect(error.res.status).toBe(404);
-      expect(error.res.url).toBe('http://localhost/myBase/my/path');
-    });
-  });
-
-  describe('when all interceptor resolves', () => {
-    let resp: any;
-    let interceptorCalls: string[];
-
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-
-      interceptorCalls = mockInterceptorCalls([{}, {}, {}]);
-      resp = await kfetch({ pathname: '/my/path' });
-    });
-
-    it('should call interceptors in correct order', () => {
-      expect(interceptorCalls).toEqual([
-        'Request #3',
-        'Request #2',
-        'Request #1',
-        'Response #1',
-        'Response #2',
-        'Response #3',
-      ]);
-    });
-
-    it('should make request', () => {
-      expect(fetchMock.called()).toBe(true);
-    });
-
-    it('should return response', () => {
-      expect(resp).toEqual({ foo: 'bar' });
-    });
-  });
-
-  describe('when a request interceptor throws; and the next requestError interceptor resolves', () => {
-    let resp: any;
-    let interceptorCalls: string[];
-
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-
-      interceptorCalls = mockInterceptorCalls([
-        { requestError: () => ({ pathname: '/my/path' } as KFetchOptions) },
-        { request: () => Promise.reject(new Error('Error in request')) },
-        {},
-      ]);
-
-      resp = await kfetch({ pathname: '/my/path' });
-    });
-
-    it('should call interceptors in correct order', () => {
-      expect(interceptorCalls).toEqual([
-        'Request #3',
-        'Request #2',
-        'RequestError #1',
-        'Response #1',
-        'Response #2',
-        'Response #3',
-      ]);
-    });
-
-    it('should make request', () => {
-      expect(fetchMock.called()).toBe(true);
-    });
-
-    it('should return response', () => {
-      expect(resp).toEqual({ foo: 'bar' });
-    });
-  });
-
-  describe('when a request interceptor throws', () => {
-    let error: Error;
-    let interceptorCalls: string[];
-
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-
-      interceptorCalls = mockInterceptorCalls([
-        {},
-        { request: () => Promise.reject(new Error('Error in request')) },
-        {},
-      ]);
-
-      try {
-        await kfetch({ pathname: '/my/path' });
-      } catch (e) {
-        error = e;
-      }
-    });
-
-    it('should call interceptors in correct order', () => {
-      expect(interceptorCalls).toEqual([
-        'Request #3',
-        'Request #2',
-        'RequestError #1',
-        'ResponseError #1',
-        'ResponseError #2',
-        'ResponseError #3',
-      ]);
-    });
-
-    it('should not make request', () => {
-      expect(fetchMock.called()).toBe(false);
-    });
-
-    it('should throw error', () => {
-      expect(error.message).toEqual('Error in request');
-    });
-  });
-
-  describe('when a response interceptor throws', () => {
-    let error: Error;
-    let interceptorCalls: string[];
-
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-
-      interceptorCalls = mockInterceptorCalls([
-        { response: () => Promise.reject(new Error('Error in response')) },
-        {},
-        {},
-      ]);
-
-      try {
-        await kfetch({ pathname: '/my/path' });
-      } catch (e) {
-        error = e;
-      }
-    });
-
-    it('should call in correct order', () => {
-      expect(interceptorCalls).toEqual([
-        'Request #3',
-        'Request #2',
-        'Request #1',
-        'Response #1',
-        'ResponseError #2',
-        'ResponseError #3',
-      ]);
-    });
-
-    it('should make request', () => {
-      expect(fetchMock.called()).toBe(true);
-    });
-
-    it('should throw error', () => {
-      expect(error.message).toEqual('Error in response');
-    });
-  });
-
-  describe('when request interceptor throws; and a responseError interceptor resolves', () => {
-    let resp: any;
-    let interceptorCalls: string[];
-
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-
-      interceptorCalls = mockInterceptorCalls([
-        {},
-        {
-          request: () => {
-            throw new Error('My request error');
-          },
-          responseError: () => {
-            return { custom: 'response' };
-          },
-        },
-        {},
-      ]);
-
-      resp = await kfetch({ pathname: '/my/path' });
-    });
-
-    it('should call in correct order', () => {
-      expect(interceptorCalls).toEqual([
-        'Request #3',
-        'Request #2',
-        'RequestError #1',
-        'ResponseError #1',
-        'ResponseError #2',
-        'Response #3',
-      ]);
-    });
-
-    it('should not make request', () => {
-      expect(fetchMock.called()).toBe(false);
-    });
-
-    it('should resolve', () => {
-      expect(resp).toEqual({ custom: 'response' });
-    });
-  });
-
-  describe('when interceptors return synchronously', () => {
-    let resp: any;
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-      addInterceptor({
-        request: (config) => ({
-          ...config,
-          pathname: '/my/intercepted-route',
-        }),
-        response: (res) => ({
-          ...res,
-          addedByResponseInterceptor: true,
-        }),
-      });
-
-      resp = await kfetch({ pathname: '/my/path' });
-    });
-
-    it('should modify request', () => {
-      expect(fetchMock.lastUrl()).toContain('/my/intercepted-route');
-      expect(fetchMock.lastOptions()!).toMatchObject({
-        method: 'GET',
-      });
-    });
-
-    it('should modify response', () => {
-      expect(resp).toEqual({
-        addedByResponseInterceptor: true,
-        foo: 'bar',
-      });
-    });
-  });
-
-  describe('when interceptors return promise', () => {
-    let resp: any;
-    beforeEach(async () => {
-      fetchMock.get('*', { foo: 'bar' });
-      addInterceptor({
-        request: (config) =>
-          Promise.resolve({
-            ...config,
-            pathname: '/my/intercepted-route',
-          }),
-        response: (res) =>
-          Promise.resolve({
-            ...res,
-            addedByResponseInterceptor: true,
-          }),
-      });
-
-      resp = await kfetch({ pathname: '/my/path' });
-    });
-
-    it('should modify request', () => {
-      expect(fetchMock.lastUrl()).toContain('/my/intercepted-route');
-      expect(fetchMock.lastOptions()!).toMatchObject({
-        method: 'GET',
-      });
-    });
-
-    it('should modify response', () => {
-      expect(resp).toEqual({
-        addedByResponseInterceptor: true,
-        foo: 'bar',
-      });
-    });
-  });
-});
-
-function mockInterceptorCalls(interceptors: Interceptor[]) {
-  const interceptorCalls: string[] = [];
-  interceptors.forEach((interceptor, i) => {
-    addInterceptor({
-      request: (config) => {
-        interceptorCalls.push(`Request #${i + 1}`);
-
-        if (interceptor.request) {
-          return interceptor.request(config);
-        }
-
-        return config;
-      },
-      requestError: (e) => {
-        interceptorCalls.push(`RequestError #${i + 1}`);
-        if (interceptor.requestError) {
-          return interceptor.requestError(e);
-        }
-
-        throw e;
-      },
-      response: (res) => {
-        interceptorCalls.push(`Response #${i + 1}`);
-
-        if (interceptor.response) {
-          return interceptor.response(res);
-        }
-
-        return res;
-      },
-      responseError: (e) => {
-        interceptorCalls.push(`ResponseError #${i + 1}`);
-
-        if (interceptor.responseError) {
-          return interceptor.responseError(e);
-        }
-
-        throw e;
-      },
-    });
-  });
-
-  return interceptorCalls;
-}
-
-describe('withDefaultOptions', () => {
-  it('should remove undefined query params', () => {
-    const { query } = withDefaultOptions({
-      pathname: '/withDefaultOptions',
-      query: {
-        foo: 'bar',
-        param1: (undefined as any) as string,
-        param2: (null as any) as string,
-        param3: '',
-      },
-    });
-    expect(query).toEqual({ foo: 'bar', param2: null, param3: '' });
-  });
-
-  it('should add default options', () => {
-    expect(withDefaultOptions({ pathname: '/addDefaultOptions' })).toEqual({
-      pathname: '/addDefaultOptions',
-      credentials: 'same-origin',
-      headers: { 'Content-Type': 'application/json' },
-      method: 'GET',
-    });
-  });
-});
diff --git a/src/legacy/ui/public/kfetch/kfetch.ts b/src/legacy/ui/public/kfetch/kfetch.ts
deleted file mode 100644
index 4eb71499315757..00000000000000
--- a/src/legacy/ui/public/kfetch/kfetch.ts
+++ /dev/null
@@ -1,110 +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 { merge } from 'lodash';
-// @ts-ignore not really worth typing
-import { KFetchError } from './kfetch_error';
-
-import { HttpSetup } from '../../../../core/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { HttpRequestInit } from '../../../../core/public/http/types';
-
-export interface KFetchQuery {
-  [key: string]: string | number | boolean | undefined;
-}
-
-export interface KFetchOptions extends HttpRequestInit {
-  pathname: string;
-  query?: KFetchQuery;
-  asSystemRequest?: boolean;
-}
-
-export interface KFetchKibanaOptions {
-  prependBasePath?: boolean;
-}
-
-export interface Interceptor {
-  request?: (config: KFetchOptions) => Promise<KFetchOptions> | KFetchOptions;
-  requestError?: (e: any) => Promise<KFetchOptions> | KFetchOptions;
-  response?: (res: any) => any;
-  responseError?: (e: any) => any;
-}
-
-const interceptors: Interceptor[] = [];
-export const resetInterceptors = () => (interceptors.length = 0);
-export const addInterceptor = (interceptor: Interceptor) => interceptors.push(interceptor);
-
-export function createKfetch(http: HttpSetup) {
-  return function kfetch(
-    options: KFetchOptions,
-    { prependBasePath = true }: KFetchKibanaOptions = {}
-  ) {
-    return responseInterceptors(
-      requestInterceptors(withDefaultOptions(options))
-        .then(({ pathname, ...restOptions }) =>
-          http.fetch(pathname, { ...restOptions, prependBasePath })
-        )
-        .catch((err) => {
-          throw new KFetchError(err.response || { statusText: err.message }, err.body);
-        })
-    );
-  };
-}
-
-// Request/response interceptors are called in opposite orders.
-// Request hooks start from the newest interceptor and end with the oldest.
-function requestInterceptors(config: KFetchOptions): Promise<KFetchOptions> {
-  return interceptors.reduceRight((acc, interceptor) => {
-    return acc.then(interceptor.request, interceptor.requestError);
-  }, Promise.resolve(config));
-}
-
-// Response hooks start from the oldest interceptor and end with the newest.
-function responseInterceptors(responsePromise: Promise<any>) {
-  return interceptors.reduce((acc, interceptor) => {
-    return acc.then(interceptor.response, interceptor.responseError);
-  }, responsePromise);
-}
-
-export function withDefaultOptions(options?: KFetchOptions): KFetchOptions {
-  const withDefaults = merge(
-    {
-      method: 'GET',
-      credentials: 'same-origin',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    },
-    options
-  ) as KFetchOptions;
-
-  if (
-    options &&
-    options.headers &&
-    'Content-Type' in options.headers &&
-    options.headers['Content-Type'] === undefined
-  ) {
-    // TS thinks headers could be undefined here, but that isn't possible because
-    // of the merge above.
-    // @ts-ignore
-    withDefaults.headers['Content-Type'] = undefined;
-  }
-
-  return withDefaults;
-}
diff --git a/src/legacy/ui/public/kfetch/kfetch_error.ts b/src/legacy/ui/public/kfetch/kfetch_error.ts
deleted file mode 100644
index f351959e624b85..00000000000000
--- a/src/legacy/ui/public/kfetch/kfetch_error.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.
- */
-
-export class KFetchError extends Error {
-  constructor(public readonly res: Response, public readonly body?: any) {
-    super(res.statusText);
-
-    // captureStackTrace is only available in the V8 engine, so any browser using
-    // a different JS engine won't have access to this method.
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, KFetchError);
-    }
-  }
-}
diff --git a/src/legacy/ui/public/legacy_compat/__tests__/xsrf.js b/src/legacy/ui/public/legacy_compat/__tests__/xsrf.js
deleted file mode 100644
index efcfb779972655..00000000000000
--- a/src/legacy/ui/public/legacy_compat/__tests__/xsrf.js
+++ /dev/null
@@ -1,149 +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 $ from 'jquery';
-import expect from '@kbn/expect';
-import sinon from 'sinon';
-import ngMock from 'ng_mock';
-
-import { $setupXsrfRequestInterceptor } from '../../../../../plugins/kibana_legacy/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { version } from '../../../../../core/server/utils/package_json';
-
-const xsrfHeader = 'kbn-version';
-
-describe('chrome xsrf apis', function () {
-  const sandbox = sinon.createSandbox();
-
-  afterEach(function () {
-    sandbox.restore();
-  });
-
-  describe('jQuery support', function () {
-    it('adds a global jQuery prefilter', function () {
-      sandbox.stub($, 'ajaxPrefilter');
-      $setupXsrfRequestInterceptor(version);
-      expect($.ajaxPrefilter.callCount).to.be(1);
-    });
-
-    describe('jQuery prefilter', function () {
-      let prefilter;
-
-      beforeEach(function () {
-        sandbox.stub($, 'ajaxPrefilter');
-        $setupXsrfRequestInterceptor(version);
-        prefilter = $.ajaxPrefilter.args[0][0];
-      });
-
-      it(`sets the ${xsrfHeader} header`, function () {
-        const setHeader = sinon.stub();
-        prefilter({}, {}, { setRequestHeader: setHeader });
-
-        expect(setHeader.callCount).to.be(1);
-        expect(setHeader.args[0]).to.eql([xsrfHeader, version]);
-      });
-
-      it('can be canceled by setting the kbnXsrfToken option', function () {
-        const setHeader = sinon.stub();
-        prefilter({ kbnXsrfToken: false }, {}, { setRequestHeader: setHeader });
-        expect(setHeader.callCount).to.be(0);
-      });
-    });
-
-    describe('Angular support', function () {
-      let $http;
-      let $httpBackend;
-
-      beforeEach(function () {
-        sandbox.stub($, 'ajaxPrefilter');
-        ngMock.module($setupXsrfRequestInterceptor(version));
-      });
-
-      beforeEach(
-        ngMock.inject(function ($injector) {
-          $http = $injector.get('$http');
-          $httpBackend = $injector.get('$httpBackend');
-
-          $httpBackend.when('POST', '/api/test').respond('ok');
-        })
-      );
-
-      afterEach(function () {
-        $httpBackend.verifyNoOutstandingExpectation();
-        $httpBackend.verifyNoOutstandingRequest();
-      });
-
-      it(`injects a ${xsrfHeader} header on every request`, function () {
-        $httpBackend
-          .expectPOST('/api/test', undefined, function (headers) {
-            return headers[xsrfHeader] === version;
-          })
-          .respond(200, '');
-
-        $http.post('/api/test');
-        $httpBackend.flush();
-      });
-
-      it('skips requests with the kbnXsrfToken set falsy', function () {
-        $httpBackend
-          .expectPOST('/api/test', undefined, function (headers) {
-            return !(xsrfHeader in headers);
-          })
-          .respond(200, '');
-
-        $http({
-          method: 'POST',
-          url: '/api/test',
-          kbnXsrfToken: 0,
-        });
-
-        $http({
-          method: 'POST',
-          url: '/api/test',
-          kbnXsrfToken: '',
-        });
-
-        $http({
-          method: 'POST',
-          url: '/api/test',
-          kbnXsrfToken: false,
-        });
-
-        $httpBackend.flush();
-      });
-
-      it('treats the kbnXsrfToken option as boolean-y', function () {
-        const customToken = `custom:${version}`;
-        $httpBackend
-          .expectPOST('/api/test', undefined, function (headers) {
-            return headers[xsrfHeader] === version;
-          })
-          .respond(200, '');
-
-        $http({
-          method: 'POST',
-          url: '/api/test',
-          kbnXsrfToken: customToken,
-        });
-
-        $httpBackend.flush();
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/legacy_compat/index.ts b/src/legacy/ui/public/legacy_compat/index.ts
deleted file mode 100644
index 2067fa6489304f..00000000000000
--- a/src/legacy/ui/public/legacy_compat/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 { configureAppAngularModule } from '../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/ui/public/metadata.ts b/src/legacy/ui/public/metadata.ts
deleted file mode 100644
index fade0f0d8629a0..00000000000000
--- a/src/legacy/ui/public/metadata.ts
+++ /dev/null
@@ -1,25 +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 { npSetup } from 'ui/new_platform';
-
-export const metadata: {
-  branch: string;
-  version: string;
-} = npSetup.core.injectedMetadata.getLegacyMetadata();
diff --git a/src/legacy/ui/public/modules.js b/src/legacy/ui/public/modules.js
deleted file mode 100644
index bb1c8aead1c34e..00000000000000
--- a/src/legacy/ui/public/modules.js
+++ /dev/null
@@ -1,142 +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 angular from 'angular';
-import _ from 'lodash';
-/**
- * This module is used by Kibana to create and reuse angular modules. Angular modules
- * can only be created once and need to have their dependencies at creation. This is
- * hard/impossible to do in require.js since all of the dependencies for a module are
- * loaded before it is.
- *
- * Here is an example:
- *
- * 	In the scenario below, require.js would load directive.js first because it is a
- * 	dependency of app.js. This would cause the call to `angular.module('app')` to
- * 	execute before the module is actually created. This causes angular to throw an
- * 	error. This effect is magnified when app.js links off to many different modules.
- *
- * 	This is normally solved by creating unique modules per file, listed as the 1st
- * 	alternate solution below. Unfortunately this solution would have required that
- * 	we replicate our require statements.
- *
- *  	app.js
- *      ```
- *      angular.module('app', ['ui.bootstrap'])
- *      .controller('AppController', function () { ... });
- *
- *      require('./directive');
- *      ```
- *
- *    directive.js
- *      ```
- *      angular.module('app')
- *      .directive('someDirective', function () { ... });
- *      ```
- *
- * Before taking this approach we saw three possible solutions:
- *   1. replicate our js modules in angular modules/use a different module per file
- *   2. create a single module outside of our js modules and share it
- *   3. use a helper lib to dynamically create modules as needed.
- *
- * We decided to go with #3
- *
- * This ends up working by creating a list of modules that the code base creates by
- * calling `modules.get(name)` with different names, and then before bootstrapping
- * the application kibana uses `modules.link()` to set the dependencies of the "kibana"
- * module to include every defined module. This guarantees that kibana can always find
- * any angular dependency defined in the kibana code base. This **also** means that
- * Private modules are able to find any dependency, since they are injected using the
- * "kibana" module's injector.
- *
- */
-const existingModules = {};
-const links = [];
-
-/**
- * Take an angular module and extends the dependencies for that module to include all of the modules
- * created using `ui/modules`
- *
- * @param  {AngularModule} module - the module to extend
- * @return {undefined}
- */
-export function link(module) {
-  // as modules are defined they will be set as requirements for this app
-  links.push(module);
-
-  // merge in the existing modules
-  module.requires = _.union(module.requires, _.keys(existingModules));
-}
-
-/**
- * The primary means of interacting with `ui/modules`. Returns an angular module. If the module already
- * exists the existing version will be returned. `dependencies` are either set as or merged into the
- * modules total dependencies.
- *
- * This is in contrast to the `angular.module(name, [dependencies])` function which will only
- * create a module if the `dependencies` list is passed and get an existing module if no dependencies
- * are passed. This requires knowing the order that your files will load, which we can't guarantee.
- *
- * @param  {string} moduleName - the unique name for this module
- * @param  {array[string]} [requires=[]] - the other modules this module requires
- * @return {AngularModule}
- */
-export function get(moduleName, requires) {
-  let module = existingModules[moduleName];
-
-  if (module === void 0) {
-    // create the module
-    module = existingModules[moduleName] = angular.module(moduleName, []);
-
-    module.close = _.partial(close, moduleName);
-
-    // ensure that it is required by linked modules
-    _.each(links, function (app) {
-      if (!~app.requires.indexOf(moduleName)) app.requires.push(moduleName);
-    });
-  }
-
-  if (requires) {
-    // update requires list with possibly new requirements
-    module.requires = _.union(module.requires, requires);
-  }
-
-  return module;
-}
-
-export function close(moduleName) {
-  const module = existingModules[moduleName];
-
-  // already closed
-  if (!module) return;
-
-  // if the module is currently linked, unlink it
-  const i = links.indexOf(module);
-  if (i > -1) links.splice(i, 1);
-
-  // remove from linked modules list of required modules
-  _.each(links, function (app) {
-    _.pull(app.requires, moduleName);
-  });
-
-  // remove module from existingModules
-  delete existingModules[moduleName];
-}
-
-export const uiModules = { link, get, close };
diff --git a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts b/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
deleted file mode 100644
index 35aa8e48304289..00000000000000
--- a/src/legacy/ui/public/new_platform/__mocks__/helpers.ts
+++ /dev/null
@@ -1,81 +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 { coreMock } from '../../../../../core/public/mocks';
-import { dataPluginMock } from '../../../../../plugins/data/public/mocks';
-import { embeddablePluginMock } from '../../../../../plugins/embeddable/public/mocks';
-import { navigationPluginMock } from '../../../../../plugins/navigation/public/mocks';
-import { expressionsPluginMock } from '../../../../../plugins/expressions/public/mocks';
-import { inspectorPluginMock } from '../../../../../plugins/inspector/public/mocks';
-import { uiActionsPluginMock } from '../../../../../plugins/ui_actions/public/mocks';
-import { managementPluginMock } from '../../../../../plugins/management/public/mocks';
-import { usageCollectionPluginMock } from '../../../../../plugins/usage_collection/public/mocks';
-import { kibanaLegacyPluginMock } from '../../../../../plugins/kibana_legacy/public/mocks';
-import { chartPluginMock } from '../../../../../plugins/charts/public/mocks';
-import { advancedSettingsMock } from '../../../../../plugins/advanced_settings/public/mocks';
-import { savedObjectsManagementPluginMock } from '../../../../../plugins/saved_objects_management/public/mocks';
-import { visualizationsPluginMock } from '../../../../../plugins/visualizations/public/mocks';
-import { discoverPluginMock } from '../../../../../plugins/discover/public/mocks';
-
-export const pluginsMock = {
-  createSetup: () => ({
-    data: dataPluginMock.createSetupContract(),
-    charts: chartPluginMock.createSetupContract(),
-    navigation: navigationPluginMock.createSetupContract(),
-    embeddable: embeddablePluginMock.createSetupContract(),
-    inspector: inspectorPluginMock.createSetupContract(),
-    expressions: expressionsPluginMock.createSetupContract(),
-    uiActions: uiActionsPluginMock.createSetupContract(),
-    usageCollection: usageCollectionPluginMock.createSetupContract(),
-    advancedSettings: advancedSettingsMock.createSetupContract(),
-    visualizations: visualizationsPluginMock.createSetupContract(),
-    kibanaLegacy: kibanaLegacyPluginMock.createSetupContract(),
-    savedObjectsManagement: savedObjectsManagementPluginMock.createSetupContract(),
-    discover: discoverPluginMock.createSetupContract(),
-  }),
-  createStart: () => ({
-    data: dataPluginMock.createStartContract(),
-    charts: chartPluginMock.createStartContract(),
-    navigation: navigationPluginMock.createStartContract(),
-    embeddable: embeddablePluginMock.createStartContract(),
-    inspector: inspectorPluginMock.createStartContract(),
-    expressions: expressionsPluginMock.createStartContract(),
-    uiActions: uiActionsPluginMock.createStartContract(),
-    management: managementPluginMock.createStartContract(),
-    advancedSettings: advancedSettingsMock.createStartContract(),
-    visualizations: visualizationsPluginMock.createStartContract(),
-    kibanaLegacy: kibanaLegacyPluginMock.createStartContract(),
-    savedObjectsManagement: savedObjectsManagementPluginMock.createStartContract(),
-    discover: discoverPluginMock.createStartContract(),
-  }),
-};
-
-export const createUiNewPlatformMock = () => {
-  const mock = {
-    npSetup: {
-      core: coreMock.createSetup(),
-      plugins: pluginsMock.createSetup(),
-    },
-    npStart: {
-      core: coreMock.createStart(),
-      plugins: pluginsMock.createStart(),
-    },
-  };
-  return mock;
-};
diff --git a/src/legacy/ui/public/new_platform/__mocks__/index.ts b/src/legacy/ui/public/new_platform/__mocks__/index.ts
deleted file mode 100644
index d469960ddd7b7a..00000000000000
--- a/src/legacy/ui/public/new_platform/__mocks__/index.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 { createUiNewPlatformMock } from './helpers';
-
-const { npSetup, npStart } = createUiNewPlatformMock();
-export { npSetup, npStart };
diff --git a/src/legacy/ui/public/new_platform/index.ts b/src/legacy/ui/public/new_platform/index.ts
deleted file mode 100644
index ca5890854f3aa1..00000000000000
--- a/src/legacy/ui/public/new_platform/index.ts
+++ /dev/null
@@ -1,19 +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 { __setup__, __start__, npSetup, npStart } from './new_platform';
diff --git a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js b/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
deleted file mode 100644
index b8d48b784dba71..00000000000000
--- a/src/legacy/ui/public/new_platform/new_platform.karma_mock.js
+++ /dev/null
@@ -1,550 +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 { getFieldFormatsRegistry } from '../../../../test_utils/public/stub_field_formats';
-import { METRIC_TYPE } from '@kbn/analytics';
-import { setSetupServices, setStartServices } from './set_services';
-import {
-  AggTypesRegistry,
-  getAggTypes,
-  AggConfigs,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../src/plugins/data/common/search/aggs';
-import { ComponentRegistry } from '../../../../../src/plugins/advanced_settings/public/';
-import { UI_SETTINGS } from '../../../../../src/plugins/data/public/';
-import {
-  CSV_SEPARATOR_SETTING,
-  CSV_QUOTE_VALUES_SETTING,
-} from '../../../../../src/plugins/share/public';
-
-const mockObservable = () => {
-  return {
-    subscribe: () => {},
-    pipe: () => {
-      return {
-        subscribe: () => {},
-      };
-    },
-  };
-};
-
-const mockComponent = () => {
-  return null;
-};
-
-let refreshInterval = undefined;
-let isTimeRangeSelectorEnabled = true;
-let isAutoRefreshSelectorEnabled = true;
-
-export const mockUiSettings = {
-  get: (item, defaultValue) => {
-    const defaultValues = {
-      dateFormat: 'MMM D, YYYY @ HH:mm:ss.SSS',
-      'dateFormat:tz': 'UTC',
-      [UI_SETTINGS.SHORT_DOTS_ENABLE]: true,
-      [UI_SETTINGS.COURIER_IGNORE_FILTER_IF_FIELD_NOT_IN_INDEX]: true,
-      [UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS]: true,
-      [UI_SETTINGS.QUERY_STRING_OPTIONS]: {},
-      [UI_SETTINGS.FORMAT_CURRENCY_DEFAULT_PATTERN]: '($0,0.[00])',
-      [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_PATTERN]: '0,0.[000]',
-      [UI_SETTINGS.FORMAT_PERCENT_DEFAULT_PATTERN]: '0,0.[000]%',
-      [UI_SETTINGS.FORMAT_NUMBER_DEFAULT_LOCALE]: 'en',
-      [UI_SETTINGS.FORMAT_DEFAULT_TYPE_MAP]: {},
-      [CSV_SEPARATOR_SETTING]: ',',
-      [CSV_QUOTE_VALUES_SETTING]: true,
-      [UI_SETTINGS.SEARCH_QUERY_LANGUAGE]: 'kuery',
-      'state:storeInSessionStorage': false,
-    };
-
-    return defaultValues[item] || defaultValue;
-  },
-  getUpdate$: () => ({
-    subscribe: sinon.fake(),
-  }),
-  isDefault: sinon.fake(),
-};
-
-const mockCoreSetup = {
-  chrome: {},
-  http: {
-    basePath: {
-      get: sinon.fake.returns(''),
-    },
-  },
-  injectedMetadata: {},
-  uiSettings: mockUiSettings,
-};
-
-const mockCoreStart = {
-  application: {
-    capabilities: {},
-  },
-  chrome: {
-    overlays: {
-      openModal: sinon.fake(),
-    },
-  },
-  http: {
-    basePath: {
-      get: sinon.fake.returns(''),
-    },
-  },
-  notifications: {
-    toasts: {},
-  },
-  i18n: {},
-  overlays: {},
-  savedObjects: {
-    client: {},
-  },
-  uiSettings: mockUiSettings,
-};
-
-const querySetup = {
-  state$: mockObservable(),
-  filterManager: {
-    getFetches$: sinon.fake(),
-    getFilters: sinon.fake(),
-    getAppFilters: sinon.fake(),
-    getGlobalFilters: sinon.fake(),
-    removeFilter: sinon.fake(),
-    addFilters: sinon.fake(),
-    setFilters: sinon.fake(),
-    removeAll: sinon.fake(),
-    getUpdates$: mockObservable,
-  },
-  timefilter: {
-    timefilter: {
-      getFetch$: mockObservable,
-      getAutoRefreshFetch$: mockObservable,
-      getEnabledUpdated$: mockObservable,
-      getTimeUpdate$: mockObservable,
-      getRefreshIntervalUpdate$: mockObservable,
-      isTimeRangeSelectorEnabled: () => {
-        return isTimeRangeSelectorEnabled;
-      },
-      isAutoRefreshSelectorEnabled: () => {
-        return isAutoRefreshSelectorEnabled;
-      },
-      disableAutoRefreshSelector: () => {
-        isAutoRefreshSelectorEnabled = false;
-      },
-      enableAutoRefreshSelector: () => {
-        isAutoRefreshSelectorEnabled = true;
-      },
-      getRefreshInterval: () => {
-        return refreshInterval;
-      },
-      setRefreshInterval: (interval) => {
-        refreshInterval = interval;
-      },
-      enableTimeRangeSelector: () => {
-        isTimeRangeSelectorEnabled = true;
-      },
-      disableTimeRangeSelector: () => {
-        isTimeRangeSelectorEnabled = false;
-      },
-      getTime: sinon.fake(),
-      setTime: sinon.fake(),
-      getActiveBounds: sinon.fake(),
-      getBounds: sinon.fake(),
-      calculateBounds: sinon.fake(),
-      createFilter: sinon.fake(),
-    },
-    history: sinon.fake(),
-  },
-  savedQueries: {
-    saveQuery: sinon.fake(),
-    getAllSavedQueries: sinon.fake(),
-    findSavedQueries: sinon.fake(),
-    getSavedQuery: sinon.fake(),
-    deleteSavedQuery: sinon.fake(),
-    getSavedQueryCount: sinon.fake(),
-  },
-};
-
-const mockAggTypesRegistry = () => {
-  const registry = new AggTypesRegistry();
-  const registrySetup = registry.setup();
-  const aggTypes = getAggTypes({
-    calculateBounds: sinon.fake(),
-    getConfig: sinon.fake(),
-    getFieldFormatsStart: () => ({
-      deserialize: sinon.fake(),
-      getDefaultInstance: sinon.fake(),
-    }),
-    isDefaultTimezone: () => true,
-  });
-  aggTypes.buckets.forEach((type) => registrySetup.registerBucket(type));
-  aggTypes.metrics.forEach((type) => registrySetup.registerMetric(type));
-
-  return registry;
-};
-
-const aggTypesRegistry = mockAggTypesRegistry();
-
-export const npSetup = {
-  core: mockCoreSetup,
-  plugins: {
-    advancedSettings: {
-      component: {
-        register: sinon.fake(),
-        componentType: ComponentRegistry.componentType,
-      },
-    },
-    usageCollection: {
-      allowTrackUserAgent: sinon.fake(),
-      reportUiStats: sinon.fake(),
-      METRIC_TYPE,
-    },
-    embeddable: {
-      registerEmbeddableFactory: sinon.fake(),
-    },
-    expressions: {
-      registerFunction: sinon.fake(),
-      registerRenderer: sinon.fake(),
-      registerType: sinon.fake(),
-    },
-    data: {
-      autocomplete: {
-        addProvider: sinon.fake(),
-        getProvider: sinon.fake(),
-      },
-      query: querySetup,
-      search: {
-        aggs: {
-          types: aggTypesRegistry.setup(),
-        },
-        __LEGACY: {
-          esClient: {
-            search: sinon.fake(),
-            msearch: sinon.fake(),
-          },
-        },
-      },
-      fieldFormats: getFieldFormatsRegistry(mockCoreSetup),
-    },
-    share: {
-      register: () => {},
-      urlGenerators: {
-        registerUrlGenerator: () => {},
-      },
-    },
-    devTools: {
-      register: () => {},
-    },
-    kibanaLegacy: {
-      registerLegacyApp: () => {},
-      forwardApp: () => {},
-      config: {
-        defaultAppId: 'home',
-      },
-    },
-    inspector: {
-      registerView: () => undefined,
-      __LEGACY: {
-        views: {
-          register: () => undefined,
-        },
-      },
-    },
-    uiActions: {
-      attachAction: sinon.fake(),
-      registerAction: sinon.fake(),
-      registerTrigger: sinon.fake(),
-    },
-    home: {
-      featureCatalogue: {
-        register: sinon.fake(),
-      },
-      environment: {
-        update: sinon.fake(),
-      },
-      config: {
-        disableWelcomeScreen: false,
-      },
-      tutorials: {
-        setVariable: sinon.fake(),
-      },
-    },
-    charts: {
-      theme: {
-        chartsTheme$: mockObservable,
-        useChartsTheme: sinon.fake(),
-      },
-      colors: {
-        seedColors: ['white', 'black'],
-      },
-    },
-    management: {
-      sections: {
-        getSection: () => ({
-          registerApp: sinon.fake(),
-        }),
-      },
-    },
-    indexPatternManagement: {
-      list: { addListConfig: sinon.fake() },
-      creation: { addCreationConfig: sinon.fake() },
-    },
-    discover: {
-      docViews: {
-        addDocView: sinon.fake(),
-        setAngularInjectorGetter: sinon.fake(),
-      },
-    },
-    visTypeVega: {
-      config: sinon.fake(),
-    },
-    visualizations: {
-      createBaseVisualization: sinon.fake(),
-      createReactVisualization: sinon.fake(),
-      registerAlias: sinon.fake(),
-      hideTypes: sinon.fake(),
-    },
-
-    mapsLegacy: {
-      serviceSettings: sinon.fake(),
-      getPrecision: sinon.fake(),
-      getZoomPrecision: sinon.fake(),
-    },
-  },
-};
-
-export const npStart = {
-  core: mockCoreStart,
-  plugins: {
-    management: {
-      legacy: {
-        getSection: () => ({
-          register: sinon.fake(),
-          deregister: sinon.fake(),
-          hasItem: sinon.fake(),
-        }),
-      },
-      sections: {
-        getSection: () => ({
-          registerApp: sinon.fake(),
-        }),
-      },
-    },
-    indexPatternManagement: {
-      list: {
-        getType: sinon.fake(),
-        getIndexPatternCreationOptions: sinon.fake(),
-      },
-      creation: {
-        getIndexPatternTags: sinon.fake(),
-        getFieldInfo: sinon.fake(),
-        areScriptedFieldsEnabled: sinon.fake(),
-      },
-    },
-    embeddable: {
-      getEmbeddableFactory: sinon.fake(),
-      getEmbeddableFactories: sinon.fake(),
-      registerEmbeddableFactory: sinon.fake(),
-    },
-    expressions: {
-      registerFunction: sinon.fake(),
-      registerRenderer: sinon.fake(),
-      registerType: sinon.fake(),
-    },
-    kibanaLegacy: {
-      getForwards: () => [],
-      loadFontAwesome: () => {},
-      config: {
-        defaultAppId: 'home',
-      },
-      dashboardConfig: {
-        turnHideWriteControlsOn: sinon.fake(),
-        getHideWriteControls: sinon.fake(),
-      },
-    },
-    dashboard: {
-      getSavedDashboardLoader: sinon.fake(),
-    },
-    data: {
-      actions: {
-        createFiltersFromValueClickAction: Promise.resolve(['yes']),
-        createFiltersFromRangeSelectAction: sinon.fake(),
-      },
-      autocomplete: {
-        getProvider: sinon.fake(),
-      },
-      getSuggestions: sinon.fake(),
-      indexPatterns: {
-        get: sinon.spy((indexPatternId) =>
-          Promise.resolve({
-            id: indexPatternId,
-            isTimeNanosBased: () => false,
-            popularizeField: () => {},
-          })
-        ),
-      },
-      ui: {
-        IndexPatternSelect: mockComponent,
-        SearchBar: mockComponent,
-      },
-      query: {
-        filterManager: {
-          getFetches$: sinon.fake(),
-          getFilters: sinon.fake(),
-          getAppFilters: sinon.fake(),
-          getGlobalFilters: sinon.fake(),
-          removeFilter: sinon.fake(),
-          addFilters: sinon.fake(),
-          setFilters: sinon.fake(),
-          removeAll: sinon.fake(),
-          getUpdates$: mockObservable,
-        },
-        timefilter: {
-          timefilter: {
-            getFetch$: mockObservable,
-            getAutoRefreshFetch$: mockObservable,
-            getEnabledUpdated$: mockObservable,
-            getTimeUpdate$: mockObservable,
-            getRefreshIntervalUpdate$: mockObservable,
-            isTimeRangeSelectorEnabled: () => {
-              return isTimeRangeSelectorEnabled;
-            },
-            isAutoRefreshSelectorEnabled: () => {
-              return isAutoRefreshSelectorEnabled;
-            },
-            disableAutoRefreshSelector: () => {
-              isAutoRefreshSelectorEnabled = false;
-            },
-            enableAutoRefreshSelector: () => {
-              isAutoRefreshSelectorEnabled = true;
-            },
-            getRefreshInterval: () => {
-              return refreshInterval;
-            },
-            setRefreshInterval: (interval) => {
-              refreshInterval = interval;
-            },
-            enableTimeRangeSelector: () => {
-              isTimeRangeSelectorEnabled = true;
-            },
-            disableTimeRangeSelector: () => {
-              isTimeRangeSelectorEnabled = false;
-            },
-            getTime: sinon.fake(),
-            setTime: sinon.fake(),
-            getActiveBounds: sinon.fake(),
-            getBounds: sinon.fake(),
-            calculateBounds: sinon.fake(),
-            createFilter: sinon.fake(),
-          },
-          history: sinon.fake(),
-        },
-      },
-      search: {
-        aggs: {
-          calculateAutoTimeExpression: sinon.fake(),
-          createAggConfigs: (indexPattern, configStates = []) => {
-            return new AggConfigs(indexPattern, configStates, {
-              typesRegistry: aggTypesRegistry.start(),
-              fieldFormats: getFieldFormatsRegistry(mockCoreStart),
-            });
-          },
-          types: aggTypesRegistry.start(),
-        },
-        __LEGACY: {
-          esClient: {
-            search: sinon.fake(),
-            msearch: sinon.fake(),
-          },
-        },
-      },
-      fieldFormats: getFieldFormatsRegistry(mockCoreStart),
-    },
-    share: {
-      toggleShareContextMenu: () => {},
-    },
-    inspector: {
-      isAvailable: () => false,
-      open: () => ({
-        onClose: Promise.resolve(undefined),
-        close: () => Promise.resolve(undefined),
-      }),
-    },
-    uiActions: {
-      attachAction: sinon.fake(),
-      registerAction: sinon.fake(),
-      registerTrigger: sinon.fake(),
-      detachAction: sinon.fake(),
-      executeTriggerActions: sinon.fake(),
-      getTrigger: sinon.fake(),
-      getTriggerActions: sinon.fake(),
-      getTriggerCompatibleActions: sinon.fake(),
-    },
-    visualizations: {
-      get: sinon.fake(),
-      all: sinon.fake(),
-      getAliases: sinon.fake(),
-      savedVisualizationsLoader: {},
-      showNewVisModal: sinon.fake(),
-      createVis: sinon.fake(),
-      convertFromSerializedVis: sinon.fake(),
-      convertToSerializedVis: sinon.fake(),
-    },
-    navigation: {
-      ui: {
-        TopNavMenu: mockComponent,
-      },
-    },
-    charts: {
-      theme: {
-        chartsTheme$: mockObservable,
-        useChartsTheme: sinon.fake(),
-      },
-    },
-    discover: {
-      docViews: {
-        DocViewer: () => null,
-      },
-      savedSearchLoader: {},
-    },
-  },
-};
-
-export function __setup__(coreSetup) {
-  npSetup.core = coreSetup;
-
-  // no-op application register calls (this is overwritten to
-  // bootstrap an LP plugin outside of tests)
-  npSetup.core.application.register = () => {};
-
-  npSetup.core.uiSettings.get = mockUiSettings.get;
-
-  // Services that need to be set in the legacy platform since the legacy data
-  // & vis plugins which previously provided them have been removed.
-  setSetupServices(npSetup);
-}
-
-export function __start__(coreStart) {
-  npStart.core = coreStart;
-
-  npStart.core.uiSettings.get = mockUiSettings.get;
-
-  // Services that need to be set in the legacy platform since the legacy data
-  // & vis plugins which previously provided them have been removed.
-  setStartServices(npStart);
-}
diff --git a/src/legacy/ui/public/new_platform/new_platform.test.mocks.ts b/src/legacy/ui/public/new_platform/new_platform.test.mocks.ts
deleted file mode 100644
index f44efe17ef8eee..00000000000000
--- a/src/legacy/ui/public/new_platform/new_platform.test.mocks.ts
+++ /dev/null
@@ -1,31 +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 { scopedHistoryMock } from '../../../../core/public/mocks';
-
-export const setRootControllerMock = jest.fn();
-
-jest.doMock('ui/chrome', () => ({
-  setRootController: setRootControllerMock,
-}));
-
-export const historyMock = scopedHistoryMock.create();
-jest.doMock('../../../../core/public', () => ({
-  ScopedHistory: jest.fn(() => historyMock),
-}));
diff --git a/src/legacy/ui/public/new_platform/new_platform.test.ts b/src/legacy/ui/public/new_platform/new_platform.test.ts
deleted file mode 100644
index d515c348ca440b..00000000000000
--- a/src/legacy/ui/public/new_platform/new_platform.test.ts
+++ /dev/null
@@ -1,124 +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.
- */
-
-jest.mock('history');
-
-import { setRootControllerMock, historyMock } from './new_platform.test.mocks';
-import { legacyAppRegister, __reset__, __setup__, __start__ } from './new_platform';
-import { coreMock } from '../../../../core/public/mocks';
-import { AppMount } from '../../../../core/public';
-
-describe('ui/new_platform', () => {
-  describe('legacyAppRegister', () => {
-    beforeEach(() => {
-      setRootControllerMock.mockReset();
-      __reset__();
-      __setup__(coreMock.createSetup({ basePath: '/test/base/path' }) as any, {} as any);
-    });
-
-    const registerApp = () => {
-      const unmountMock = jest.fn();
-      const mountMock = jest.fn<ReturnType<AppMount>, Parameters<AppMount>>(() => unmountMock);
-      legacyAppRegister({
-        id: 'test',
-        title: 'Test',
-        mount: mountMock,
-      });
-      return { mountMock, unmountMock };
-    };
-
-    test('sets ui/chrome root controller', () => {
-      registerApp();
-      expect(setRootControllerMock).toHaveBeenCalledWith('test', expect.any(Function));
-    });
-
-    test('throws if called more than once', () => {
-      registerApp();
-      expect(registerApp).toThrowErrorMatchingInlineSnapshot(
-        `"core.application.register may only be called once for legacy plugins."`
-      );
-    });
-
-    test('controller calls app.mount when invoked', () => {
-      const { mountMock } = registerApp();
-      const controller = setRootControllerMock.mock.calls[0][1];
-      const scopeMock = { $on: jest.fn() };
-      const elementMock = [document.createElement('div')];
-
-      controller(scopeMock, elementMock);
-      expect(mountMock).toHaveBeenCalledWith({
-        element: expect.any(HTMLElement),
-        appBasePath: '/test/base/path/app/test',
-        onAppLeave: expect.any(Function),
-        history: historyMock,
-      });
-    });
-
-    test('app is mounted in new div inside containing element', () => {
-      const { mountMock } = registerApp();
-      const controller = setRootControllerMock.mock.calls[0][1];
-      const scopeMock = { $on: jest.fn() };
-      const elementMock = [document.createElement('div')];
-
-      controller(scopeMock, elementMock);
-
-      const { element } = mountMock.mock.calls[0][0];
-      expect(element.parentElement).toEqual(elementMock[0]);
-    });
-
-    test('controller calls deprecated context app.mount when invoked', () => {
-      const unmountMock = jest.fn();
-      // Two arguments changes how this is called.
-      const mountMock = jest.fn((context, params) => unmountMock);
-      legacyAppRegister({
-        id: 'test',
-        title: 'Test',
-        mount: mountMock,
-      });
-      const controller = setRootControllerMock.mock.calls[0][1];
-      const scopeMock = { $on: jest.fn() };
-      const elementMock = [document.createElement('div')];
-
-      controller(scopeMock, elementMock);
-      expect(mountMock).toHaveBeenCalledWith(expect.any(Object), {
-        element: expect.any(HTMLElement),
-        appBasePath: '/test/base/path/app/test',
-        onAppLeave: expect.any(Function),
-        history: historyMock,
-      });
-    });
-
-    test('controller calls unmount when $scope.$destroy', async () => {
-      const { unmountMock } = registerApp();
-      const controller = setRootControllerMock.mock.calls[0][1];
-      const scopeMock = { $on: jest.fn() };
-      const elementMock = [document.createElement('div')];
-
-      controller(scopeMock, elementMock);
-      // Flush promise queue. Must be done this way because the controller cannot return a Promise without breaking
-      // angular.
-      await new Promise((resolve) => setTimeout(resolve, 1));
-
-      const [event, eventHandler] = scopeMock.$on.mock.calls[0];
-      expect(event).toEqual('$destroy');
-      eventHandler();
-      expect(unmountMock).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
deleted file mode 100644
index 37787ffbde4fc4..00000000000000
--- a/src/legacy/ui/public/new_platform/new_platform.ts
+++ /dev/null
@@ -1,208 +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 { IScope } from 'angular';
-
-import { UiActionsStart, UiActionsSetup } from 'src/plugins/ui_actions/public';
-import { EmbeddableStart, EmbeddableSetup } from 'src/plugins/embeddable/public';
-import { createBrowserHistory } from 'history';
-import { VisTypeXyPluginSetup } from 'src/plugins/vis_type_xy/public';
-import { DashboardStart } from '../../../../plugins/dashboard/public';
-import { setSetupServices, setStartServices } from './set_services';
-import {
-  LegacyCoreSetup,
-  LegacyCoreStart,
-  App,
-  AppMountDeprecated,
-  ScopedHistory,
-} from '../../../../core/public';
-import { Plugin as DataPlugin } from '../../../../plugins/data/public';
-import { Plugin as ExpressionsPlugin } from '../../../../plugins/expressions/public';
-import {
-  Setup as InspectorSetup,
-  Start as InspectorStart,
-} from '../../../../plugins/inspector/public';
-import { ChartsPluginSetup, ChartsPluginStart } from '../../../../plugins/charts/public';
-import { DevToolsSetup } from '../../../../plugins/dev_tools/public';
-import { KibanaLegacySetup, KibanaLegacyStart } from '../../../../plugins/kibana_legacy/public';
-import { HomePublicPluginSetup } from '../../../../plugins/home/public';
-import { SharePluginSetup, SharePluginStart } from '../../../../plugins/share/public';
-import {
-  AdvancedSettingsSetup,
-  AdvancedSettingsStart,
-} from '../../../../plugins/advanced_settings/public';
-import { ManagementSetup, ManagementStart } from '../../../../plugins/management/public';
-import {
-  IndexPatternManagementSetup,
-  IndexPatternManagementStart,
-} from '../../../../plugins/index_pattern_management/public';
-import { BfetchPublicSetup, BfetchPublicStart } from '../../../../plugins/bfetch/public';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
-import { TelemetryPluginSetup, TelemetryPluginStart } from '../../../../plugins/telemetry/public';
-import {
-  NavigationPublicPluginSetup,
-  NavigationPublicPluginStart,
-} from '../../../../plugins/navigation/public';
-import { DiscoverSetup, DiscoverStart } from '../../../../plugins/discover/public';
-import {
-  SavedObjectsManagementPluginSetup,
-  SavedObjectsManagementPluginStart,
-} from '../../../../plugins/saved_objects_management/public';
-import {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../plugins/visualizations/public';
-import { VisTypeTimelionPluginStart } from '../../../../plugins/vis_type_timelion/public';
-import { MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
-
-export interface PluginsSetup {
-  bfetch: BfetchPublicSetup;
-  charts: ChartsPluginSetup;
-  data: ReturnType<DataPlugin['setup']>;
-  embeddable: EmbeddableSetup;
-  expressions: ReturnType<ExpressionsPlugin['setup']>;
-  home: HomePublicPluginSetup;
-  inspector: InspectorSetup;
-  uiActions: UiActionsSetup;
-  navigation: NavigationPublicPluginSetup;
-  devTools: DevToolsSetup;
-  kibanaLegacy: KibanaLegacySetup;
-  share: SharePluginSetup;
-  usageCollection: UsageCollectionSetup;
-  advancedSettings: AdvancedSettingsSetup;
-  management: ManagementSetup;
-  discover: DiscoverSetup;
-  visualizations: VisualizationsSetup;
-  telemetry?: TelemetryPluginSetup;
-  savedObjectsManagement: SavedObjectsManagementPluginSetup;
-  mapsLegacy: MapsLegacyPluginSetup;
-  indexPatternManagement: IndexPatternManagementSetup;
-  visTypeXy?: VisTypeXyPluginSetup;
-}
-
-export interface PluginsStart {
-  bfetch: BfetchPublicStart;
-  charts: ChartsPluginStart;
-  data: ReturnType<DataPlugin['start']>;
-  embeddable: EmbeddableStart;
-  expressions: ReturnType<ExpressionsPlugin['start']>;
-  inspector: InspectorStart;
-  uiActions: UiActionsStart;
-  navigation: NavigationPublicPluginStart;
-  kibanaLegacy: KibanaLegacyStart;
-  share: SharePluginStart;
-  management: ManagementStart;
-  advancedSettings: AdvancedSettingsStart;
-  discover: DiscoverStart;
-  visualizations: VisualizationsStart;
-  telemetry?: TelemetryPluginStart;
-  dashboard: DashboardStart;
-  savedObjectsManagement: SavedObjectsManagementPluginStart;
-  visTypeTimelion: VisTypeTimelionPluginStart;
-  indexPatternManagement: IndexPatternManagementStart;
-}
-
-export const npSetup = {
-  core: (null as unknown) as LegacyCoreSetup,
-  plugins: {} as PluginsSetup,
-};
-
-export const npStart = {
-  core: (null as unknown) as LegacyCoreStart,
-  plugins: {} as PluginsStart,
-};
-
-/**
- * Only used by unit tests
- * @internal
- */
-export function __reset__() {
-  npSetup.core = (null as unknown) as LegacyCoreSetup;
-  npSetup.plugins = {} as any;
-  npStart.core = (null as unknown) as LegacyCoreStart;
-  npStart.plugins = {} as any;
-  legacyAppRegistered = false;
-}
-
-export function __setup__(coreSetup: LegacyCoreSetup, plugins: PluginsSetup) {
-  npSetup.core = coreSetup;
-  npSetup.plugins = plugins;
-
-  // Setup compatibility layer for AppService in legacy platform
-  npSetup.core.application.register = legacyAppRegister;
-
-  // Services that need to be set in the legacy platform since the legacy data
-  // & vis plugins which previously provided them have been removed.
-  setSetupServices(npSetup);
-}
-
-export function __start__(coreStart: LegacyCoreStart, plugins: PluginsStart) {
-  npStart.core = coreStart;
-  npStart.plugins = plugins;
-
-  // Services that need to be set in the legacy platform since the legacy data
-  // & vis plugins which previously provided them have been removed.
-  setStartServices(npStart);
-}
-
-/** Flag used to ensure `legacyAppRegister` is only called once. */
-let legacyAppRegistered = false;
-
-/**
- * Exported for testing only. Use `npSetup.core.application.register` in legacy apps.
- * @internal
- */
-export const legacyAppRegister = (app: App<any>) => {
-  if (legacyAppRegistered) {
-    throw new Error(`core.application.register may only be called once for legacy plugins.`);
-  }
-  legacyAppRegistered = true;
-
-  // eslint-disable-next-line @typescript-eslint/no-var-requires
-  require('ui/chrome').setRootController(app.id, ($scope: IScope, $element: JQLite) => {
-    const element = document.createElement('div');
-    $element[0].appendChild(element);
-
-    // Root controller cannot return a Promise so use an internal async function and call it immediately
-    (async () => {
-      const appRoute = app.appRoute || `/app/${app.id}`;
-      const appBasePath = npSetup.core.http.basePath.prepend(appRoute);
-      const params = {
-        element,
-        appBasePath,
-        history: new ScopedHistory(
-          createBrowserHistory({ basename: npSetup.core.http.basePath.get() }),
-          appRoute
-        ),
-        onAppLeave: () => undefined,
-      };
-      const unmount = isAppMountDeprecated(app.mount)
-        ? await app.mount({ core: npStart.core }, params)
-        : await app.mount(params);
-      $scope.$on('$destroy', () => {
-        unmount();
-      });
-    })();
-  });
-};
-
-function isAppMountDeprecated(mount: (...args: any[]) => any): mount is AppMountDeprecated {
-  // Mount functions with two arguments are assumed to expect deprecated `context` object.
-  return mount.length === 2;
-}
diff --git a/src/legacy/ui/public/new_platform/set_services.test.ts b/src/legacy/ui/public/new_platform/set_services.test.ts
deleted file mode 100644
index 74e789ec220b1b..00000000000000
--- a/src/legacy/ui/public/new_platform/set_services.test.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 { __reset__, __setup__, __start__, PluginsSetup, PluginsStart } from './new_platform';
-import * as dataServices from '../../../../plugins/data/public/services';
-import * as visualizationsServices from '../../../../plugins/visualizations/public/services';
-import { LegacyCoreSetup, LegacyCoreStart } from '../../../../core/public';
-import { coreMock } from '../../../../core/public/mocks';
-import { npSetup, npStart } from './__mocks__';
-
-describe('ui/new_platform', () => {
-  describe('set service getters', () => {
-    const testServiceGetters = (name: string, services: Record<string, Function>) => {
-      const getters = Object.keys(services).filter((k) => k.substring(0, 3) === 'get');
-      getters.forEach((g) => {
-        it(`ui/new_platform sets a value for ${name} getter ${g}`, () => {
-          __reset__();
-          __setup__(
-            (coreMock.createSetup() as unknown) as LegacyCoreSetup,
-            (npSetup.plugins as unknown) as PluginsSetup
-          );
-          __start__(
-            (coreMock.createStart() as unknown) as LegacyCoreStart,
-            (npStart.plugins as unknown) as PluginsStart
-          );
-
-          expect(services[g]()).toBeDefined();
-        });
-      });
-    };
-
-    testServiceGetters('data', dataServices);
-    testServiceGetters('visualizations', visualizationsServices);
-  });
-});
diff --git a/src/legacy/ui/public/new_platform/set_services.ts b/src/legacy/ui/public/new_platform/set_services.ts
deleted file mode 100644
index 036157a9f3fbc4..00000000000000
--- a/src/legacy/ui/public/new_platform/set_services.ts
+++ /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 { pick } from 'lodash';
-
-import { PluginsSetup, PluginsStart } from './new_platform';
-import { LegacyCoreSetup, LegacyCoreStart } from '../../../../core/public';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import * as dataServices from '../../../../plugins/data/public/services';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import * as visualizationsServices from '../../../../plugins/visualizations/public/services';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { createSavedVisLoader } from '../../../../plugins/visualizations/public/saved_visualizations/saved_visualizations';
-
-interface NpSetup {
-  core: LegacyCoreSetup;
-  plugins: PluginsSetup;
-}
-
-interface NpStart {
-  core: LegacyCoreStart;
-  plugins: PluginsStart;
-}
-
-export function setSetupServices(npSetup: NpSetup) {
-  // Services that need to be set in the legacy platform since the legacy data plugin
-  // which previously provided them has been removed.
-  visualizationsServices.setUISettings(npSetup.core.uiSettings);
-  visualizationsServices.setUsageCollector(npSetup.plugins.usageCollection);
-}
-
-export function setStartServices(npStart: NpStart) {
-  // Services that need to be set in the legacy platform since the legacy data plugin
-  // which previously provided them has been removed.
-  dataServices.setNotifications(npStart.core.notifications);
-  dataServices.setOverlays(npStart.core.overlays);
-  dataServices.setUiSettings(npStart.core.uiSettings);
-  dataServices.setFieldFormats(npStart.plugins.data.fieldFormats);
-  dataServices.setIndexPatterns(npStart.plugins.data.indexPatterns);
-  dataServices.setQueryService(npStart.plugins.data.query);
-  dataServices.setSearchService(npStart.plugins.data.search);
-
-  visualizationsServices.setI18n(npStart.core.i18n);
-  visualizationsServices.setTypes(
-    pick(npStart.plugins.visualizations, ['get', 'all', 'getAliases'])
-  );
-  visualizationsServices.setCapabilities(npStart.core.application.capabilities);
-  visualizationsServices.setHttp(npStart.core.http);
-  visualizationsServices.setApplication(npStart.core.application);
-  visualizationsServices.setEmbeddable(npStart.plugins.embeddable);
-  visualizationsServices.setSavedObjects(npStart.core.savedObjects);
-  visualizationsServices.setIndexPatterns(npStart.plugins.data.indexPatterns);
-  visualizationsServices.setFilterManager(npStart.plugins.data.query.filterManager);
-  visualizationsServices.setExpressions(npStart.plugins.expressions);
-  visualizationsServices.setUiActions(npStart.plugins.uiActions);
-  visualizationsServices.setTimeFilter(npStart.plugins.data.query.timefilter.timefilter);
-  visualizationsServices.setAggs(npStart.plugins.data.search.aggs);
-  visualizationsServices.setOverlays(npStart.core.overlays);
-  visualizationsServices.setChrome(npStart.core.chrome);
-  visualizationsServices.setSearch(npStart.plugins.data.search);
-  const savedVisualizationsLoader = createSavedVisLoader({
-    savedObjectsClient: npStart.core.savedObjects.client,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    search: npStart.plugins.data.search,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
-    visualizationTypes: visualizationsServices.getTypes(),
-  });
-  visualizationsServices.setSavedVisualizationsLoader(savedVisualizationsLoader);
-  visualizationsServices.setSavedSearchLoader(npStart.plugins.discover.savedSearchLoader);
-}
diff --git a/src/legacy/ui/public/notify/banners/BANNERS.md b/src/legacy/ui/public/notify/banners/BANNERS.md
deleted file mode 100644
index fc6bddc3aa4edd..00000000000000
--- a/src/legacy/ui/public/notify/banners/BANNERS.md
+++ /dev/null
@@ -1,360 +0,0 @@
-# Banners
-
-Use this service to surface banners at the top of the screen. The expectation is that the banner will used an
-`<EuiCallOut />` to render, but that is not a requirement. See [the EUI docs](https://elastic.github.io/eui/) for
-more information on banners and their role within the UI.
-
-Banners should be considered with respect to their lifecycle. Most banners are best served by using the `add` and
-`remove` functions.
-
-## Importing the module
-
-```js
-import { banners } from 'ui/notify';
-```
-
-## Interface
-
-There are three methods defined to manipulate the list of banners: `add`, `set`, and `remove`. A fourth method,
-`onChange` exists to listen to changes made via `add`, `set`, and `remove`.
-
-### `add()`
-
-This is the preferred way to add banners because it implies the best usage of the banner: added once during a page's
-lifecycle. For other usages, consider *not* using a banner.
-
-#### Syntax
-
-```js
-const bannerId = banners.add({
-  // required:
-  component,
-  // optional:
-  priority,
-});
-```
-
-##### Parameters
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `component` | Any | The value displayed as the banner. |
-| `priority` | Number | Optional priority, which defaults to `0` used to place the banner. |
-
-To add a banner, you only need to define the `component` field.
-
-The `priority` sorts in descending order. Items sharing the same priority are sorted from oldest to newest. For example:
-
-```js
-const banner1 = banners.add({ component: <EuiCallOut title="fake1" /> });
-const banner2 = banners.add({ component: <EuiCallOut title="fake2" />, priority: 0 });
-const banner3 = banners.add({ component: <EuiCallOut title="fake3" />, priority: 1 });
-```
-
-That would be displayed as:
-
-```
-[ fake3 ]
-[ fake1 ]
-[ fake2 ]
-```
-
-##### Returns
-
-| Type | Description |
-|------|-------------|
-| String | A newly generated ID. |
-
-#### Example
-
-This example includes buttons that allow the user to remove the banner. In some cases, you may not want any buttons
-and in other cases you will want an action to proceed the banner's removal (e.g., apply an Advanced Setting).
-
-This makes the most sense to use when a banner is added at the beginning of the page life cycle and not expected to
-be touched, except by its own buttons triggering an action or navigating away.
-
-```js
-const bannerId = banners.add({
-  component: (
-    <EuiCallOut
-      iconType="iInCircle"
-      title="In order to visualize and explore data in Kibana, you'll need to create an index pattern to retrieve data from Elasticsearch."
-    >
-      <EuiFlexGroup
-        gutterSize="s"
-        alignItems="center"
-      >
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiButton
-            size="s"
-            fill
-            onClick={() => banners.remove(bannerId)}
-          >
-            Dismiss
-          </EuiButton>
-        </EuiFlexItem>
-        <EuiFlexItem
-          grow={false}
-        >
-          <EuiButton
-            size="s"
-            onClick={() => window.alert('Do Something Else')}
-          >
-            Do Something Else
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiCallOut>
-  ),
-});
-```
-
-### `remove()`
-
-Unlike toast notifications, banners stick around until they are explicitly removed. Using the `add` example above,you can remove it by calling `remove`.
-
-Note: They will stick around as long as the scope is remembered by whatever set it; navigating away won't remove it
-unless the scope is forgotten (e.g., when the "app" changes)!
-
-#### Syntax
-
-```js
-const removed = banners.remove(bannerId);
-```
-
-##### Parameters
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `id`  | String | ID of a banner. |
-
-##### Returns
-
-| Type | Description |
-|------|-------------|
-| Boolean | `true` if the ID was recognized and the banner was removed. `false` otherwise. |
-
-#### Example
-
-To remove a banner, you need to pass the `id` of the banner.
-
-```js
-if (banners.remove(bannerId)) {
-  // removed; otherwise it didn't exist (maybe it was already removed)
-}
-```
-
-#### Scheduled removal
-
-Like toast notifications do automatically, you can have a banner automatically removed after a set of time, by
-setting a timer:
-
-```js
-setTimeout(() => banners.remove(bannerId), 15000);
-```
-
-Note: It is safe to remove a banner more than once as unknown IDs will be ignored.
-
-### `set()`
-
-Banners can be replaced once added by supplying their `id`. If one is supplied, then the ID will be used to replace
-any banner with the same ID and a **new** `id` will be returned.
-
-You should only consider using `set` when the banner is manipulated frequently in the lifecycle of the page, where
-maintaining the banner's `id` can be a burden. It is easier to allow `banners` to create the ID for you in most
-situations where a banner is useful (e.g., set once), which safely avoids any chance to have an ID-based collision,
-which happens automatically with `add`.
-
-Usage of `set` can imply that your use case is abusing the banner system.
-
-Note: `set` will only trigger the callback once for both the implicit remove and add operation.
-
-#### Syntax
-
-```js
-const id = banners.set({
-  // required:
-  component,
-  // optional:
-  id,
-  priority,
-});
-```
-
-##### Parameters
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `component` | Any | The value displayed as the banner. |
-| `id`  | String | Optional ID used to remove an existing banner. |
-| `priority` | Number | Optional priority, which defaults to `0` used to place the banner. |
-
-The `id` is optional because it follows the same semantics as the `remove` method: unknown IDs are ignored. This
-is useful when first creating a banner so that you do not have to call `add` instead.
-
-##### Returns
-
-| Type | Description |
-|------|-------------|
-| String | A newly generated ID. |
-
-#### Example
-
-This example does not include any way for the user to clear the banner directly. Instead, it is cleared based on
-time. Related to it being cleared by time, it can also reappear within the same page life cycle by navigating between
-different paths that need it displayed. Instead of adding a new banner for every navigation, you should replace any
-existing banner.
-
-```js
-let bannerId;
-let timeoutId;
-
-function displayBanner() {
-  clearTimeout(timeoutId);
-
-  bannerId = banners.set({
-    id: bannerId, // the first time it will be undefined, but reused as long as this is in the same lifecycle
-    component: (
-      <EuiCallOut
-        color="warning"
-        iconType="iInCircle"
-        title={
-          `In order to visualize and explore data in Kibana,
-          you'll need to create an index pattern to retrieve data from Elasticsearch.`
-        }
-      />
-    )
-  });
-
-  // hide the message after the user has had a chance to acknowledge it -- so it doesn't permanently stick around
-  banner.timeoutId = setTimeout(() => {
-    banners.remove(bannerId);
-    timeoutId = undefined;
-  }, 6000);
-}
-```
-
-### `onChange()`
-
-For React components that intend to display the banners, it is not enough to simply `render` the `banners.list`
-values. Because they can change after being rendered, the React component that renders the list must be alerted
-to changes to the list.
-
-#### Syntax
-
-```js
-// inside your React component
-banners.onChange(() => this.forceUpdate());
-```
-
-##### Parameters
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `callback` | Function | The function to invoke whenever the internal banner list is changed. |
-
-Every new `callback` replaces the previous callback. So calling this with `null` or `undefined` will unset the
-callback.
-
-##### Returns
-
-Nothing.
-
-#### Example
-
-This can be used inside of a React component to trigger a re-`render` of the banners.
-
-```js
-import { GlobalBannerList } from 'ui/notify';
-
-<GlobalBannerList
-  banners={banners.list}
-  subscribe={banners.onChange}
-/>
-```
-
-### `list`
-
-For React components that intend to display the banners, it is not enough to simply `render` the `banners.list`
-values. Because they can change after being rendered, the React component that renders the list must be alerted
-to changes to the list.
-
-#### Syntax
-
-```js
-<GlobalBannerList
-  banners={banners.list}
-  subscribe={banners.onChange}
-/>
-```
-
-##### Returns
-
-| Type | Description |
-|------|-------------|
-| Array | The array of banner objects. |
-
-Banner objects are sorted in descending order based on their `priority`, in the form:
-
-```js
-{
-  id: 'banner-123',
-  component: <EuiCallOut />,
-  priority: 12,
-}
-```
-
-| Field | Type | Description |
-|-------|------|-------------|
-| `component` | Any | The value displayed as the banner. |
-| `id`  | String | The ID of the banner, which can be used as a React "key". |
-| `priority` | Number | The priority of the banner. |
-
-#### Example
-
-This can be used to supply the banners to the `GlobalBannerList` React component (which is done for you).
-
-```js
-import { GlobalBannerList } from 'ui/notify';
-
-<GlobalBannerList
-  banners={banners.list}
-  subscribe={banners.onChange}
-/>
-```
-
-## Use in functional tests
-
-Functional tests are commonly used to verify that an action yielded a successful outcome. You can place a
-`data-test-subj` attribute on the banner and use it to check if the banner exists inside of your functional test.
-This acts as a proxy for verifying the successful outcome. Any unrecognized field will be added as a property of the
-containing element.
-
-```js
-banners.add({
-  component: (
-    <EuiCallOut
-      title="Look at me!"
-    />
-  ),
-  data-test-subj: 'my-tested-banner',
-});
-```
-
-This will apply the `data-test-subj` to the element containing the `component`, so the inner HTML of that element
-will exclusively be the specified `component`.
-
-Given that `component` is expected to be a React component, you could also add the `data-test-subj` directly to it:
-
-```js
-banners.add({
-  component: (
-    <EuiCallOut
-      title="Look at me!"
-      data-test-subj="my-tested-banner"
-    />
-  ),
-});
-```
\ No newline at end of file
diff --git a/src/legacy/ui/public/notify/banners/banners.tsx b/src/legacy/ui/public/notify/banners/banners.tsx
deleted file mode 100644
index 777e408b8dfc40..00000000000000
--- a/src/legacy/ui/public/notify/banners/banners.tsx
+++ /dev/null
@@ -1,85 +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 ReactDOM from 'react-dom';
-import { npStart } from 'ui/new_platform';
-import { I18nProvider } from '@kbn/i18n/react';
-
-const npBanners = npStart.core.overlays.banners;
-
-/** compatibility layer for new platform */
-const mountForComponent = (component: React.ReactElement) => (element: HTMLElement) => {
-  ReactDOM.render(<I18nProvider>{component}</I18nProvider>, element);
-  return () => ReactDOM.unmountComponentAtNode(element);
-};
-
-/**
- * Banners represents a prioritized list of displayed components.
- */
-export class Banners {
-  /**
-   * Add a new banner.
-   *
-   * @param {Object} component The React component to display.
-   * @param {Number} priority The optional priority order to display this banner. Higher priority values are shown first.
-   * @return {String} A newly generated ID. This value can be used to remove/replace the banner.
-   */
-  add = ({ component, priority }: { component: React.ReactElement; priority?: number }) => {
-    return npBanners.add(mountForComponent(component), priority);
-  };
-
-  /**
-   * Remove an existing banner.
-   *
-   * @param {String} id The ID of the banner to remove.
-   * @return {Boolean} {@code true} if the ID is recognized and the banner is removed. {@code false} otherwise.
-   */
-  remove = (id: string): boolean => {
-    return npBanners.remove(id);
-  };
-
-  /**
-   * Replace an existing banner by removing it, if it exists, and adding a new one in its place.
-   *
-   * This is similar to calling banners.remove, followed by banners.add, except that it only notifies the listener
-   * after adding.
-   *
-   * @param {Object} component The React component to display.
-   * @param {String} id The ID of the Banner to remove.
-   * @param {Number} priority The optional priority order to display this banner. Higher priority values are shown first.
-   * @return {String} A newly generated ID. This value can be used to remove/replace the banner.
-   */
-  set = ({
-    component,
-    id,
-    priority = 0,
-  }: {
-    component: React.ReactElement;
-    id: string;
-    priority?: number;
-  }): string => {
-    return npBanners.replace(id, mountForComponent(component), priority);
-  };
-}
-
-/**
- * A singleton instance meant to represent all Kibana banners.
- */
-export const banners = new Banners();
diff --git a/src/legacy/ui/public/notify/banners/index.ts b/src/legacy/ui/public/notify/banners/index.ts
deleted file mode 100644
index 9221f95074cd96..00000000000000
--- a/src/legacy/ui/public/notify/banners/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 { banners } from './banners';
diff --git a/src/legacy/ui/public/notify/fatal_error.ts b/src/legacy/ui/public/notify/fatal_error.ts
deleted file mode 100644
index 5614ffea7913e7..00000000000000
--- a/src/legacy/ui/public/notify/fatal_error.ts
+++ /dev/null
@@ -1,25 +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 { npSetup } from 'ui/new_platform';
-import { AngularHttpError, addFatalError } from '../../../../plugins/kibana_legacy/public';
-
-export function fatalError(error: AngularHttpError | Error | string, location?: string) {
-  addFatalError(npSetup.core.fatalErrors, error, location);
-}
diff --git a/src/legacy/ui/public/notify/index.d.ts b/src/legacy/ui/public/notify/index.d.ts
deleted file mode 100644
index 3c1a7ba02db72b..00000000000000
--- a/src/legacy/ui/public/notify/index.d.ts
+++ /dev/null
@@ -1,21 +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 { toastNotifications } from './toasts';
-export { fatalError } from './fatal_error';
diff --git a/src/legacy/ui/public/notify/index.js b/src/legacy/ui/public/notify/index.js
deleted file mode 100644
index 51394033e4d2e0..00000000000000
--- a/src/legacy/ui/public/notify/index.js
+++ /dev/null
@@ -1,22 +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 { fatalError } from './fatal_error';
-export { toastNotifications } from './toasts';
-export { banners } from './banners';
diff --git a/src/legacy/ui/public/notify/toasts/index.ts b/src/legacy/ui/public/notify/toasts/index.ts
deleted file mode 100644
index c5e8e3b7ca7a3a..00000000000000
--- a/src/legacy/ui/public/notify/toasts/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 { ToastNotifications } from './toast_notifications';
-export { toastNotifications } from './toasts';
diff --git a/src/legacy/ui/public/notify/toasts/toast_notifications.ts b/src/legacy/ui/public/notify/toasts/toast_notifications.ts
deleted file mode 100644
index d3ec8edb5d73a0..00000000000000
--- a/src/legacy/ui/public/notify/toasts/toast_notifications.ts
+++ /dev/null
@@ -1,22 +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.
- */
-/**
- * ToastNotifications is deprecated! Please use npSetup.core.notifications.toasts instead
- */
-export { ToastNotifications } from '../../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/ui/public/notify/toasts/toasts.ts b/src/legacy/ui/public/notify/toasts/toasts.ts
deleted file mode 100644
index 15be7a7891553a..00000000000000
--- a/src/legacy/ui/public/notify/toasts/toasts.ts
+++ /dev/null
@@ -1,22 +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 { npSetup } from 'ui/new_platform';
-import { ToastNotifications } from './toast_notifications';
-export const toastNotifications = new ToastNotifications(npSetup.core.notifications.toasts);
diff --git a/src/legacy/ui/public/private/__tests__/private.js b/src/legacy/ui/public/private/__tests__/private.js
deleted file mode 100644
index 1f9d696bb440f3..00000000000000
--- a/src/legacy/ui/public/private/__tests__/private.js
+++ /dev/null
@@ -1,144 +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 ngMock from 'ng_mock';
-
-describe('Private module loader', function () {
-  let Private;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector) {
-      Private = $injector.get('Private');
-    })
-  );
-
-  it('accepts a provider that will be called to init a module', function () {
-    const football = {};
-    function Provider() {
-      return football;
-    }
-
-    const instance = Private(Provider);
-    expect(instance).to.be(football);
-  });
-
-  it('injects angular dependencies into the Provider', function () {
-    function Provider(Private) {
-      return Private;
-    }
-
-    const instance = Private(Provider);
-    expect(instance).to.be(Private);
-  });
-
-  it('detects circular dependencies', function () {
-    expect(function () {
-      function Provider1() {
-        Private(Provider2);
-      }
-
-      function Provider2() {
-        Private(Provider1);
-      }
-
-      Private(Provider1);
-    }).to.throwException(/circular/i);
-  });
-
-  it('always provides the same instance form the Provider', function () {
-    function Provider() {
-      return {};
-    }
-
-    expect(Private(Provider)).to.be(Private(Provider));
-  });
-
-  describe('#stub', function () {
-    it('accepts a replacement instance for a Provider', function () {
-      const replaced = {};
-      const replacement = {};
-
-      function Provider() {
-        return replaced;
-      }
-
-      const instance = Private(Provider);
-      expect(instance).to.be(replaced);
-
-      Private.stub(Provider, replacement);
-
-      const instance2 = Private(Provider);
-      expect(instance2).to.be(replacement);
-
-      Private.stub(Provider, replaced);
-
-      const instance3 = Private(Provider);
-      expect(instance3).to.be(replaced);
-    });
-  });
-
-  describe('#swap', function () {
-    it('accepts a new Provider that should replace an existing Provider', function () {
-      function Provider1() {
-        return {};
-      }
-
-      function Provider2() {
-        return {};
-      }
-
-      const instance1 = Private(Provider1);
-      expect(instance1).to.be.an('object');
-
-      Private.swap(Provider1, Provider2);
-
-      const instance2 = Private(Provider1);
-      expect(instance2).to.be.an('object');
-      expect(instance2).to.not.be(instance1);
-
-      Private.swap(Provider1, Provider1);
-
-      const instance3 = Private(Provider1);
-      expect(instance3).to.be(instance1);
-    });
-
-    it('gives the new Provider access to the Provider it replaced via an injectable dependency called $decorate', function () {
-      function Provider1() {
-        return {};
-      }
-
-      function Provider2($decorate) {
-        return {
-          instance1: $decorate(),
-        };
-      }
-
-      const instance1 = Private(Provider1);
-      expect(instance1).to.be.an('object');
-
-      Private.swap(Provider1, Provider2);
-
-      const instance2 = Private(Provider1);
-      expect(instance2).to.have.property('instance1');
-      expect(instance2.instance1).to.be(instance1);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/private/index.d.ts b/src/legacy/ui/public/private/index.d.ts
deleted file mode 100644
index 3b692ba58cbe1f..00000000000000
--- a/src/legacy/ui/public/private/index.d.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 { IPrivate } from '../../../../plugins/kibana_legacy/public/';
diff --git a/src/legacy/ui/public/private/index.js b/src/legacy/ui/public/private/index.js
deleted file mode 100644
index 3815f230df4664..00000000000000
--- a/src/legacy/ui/public/private/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.
- */
-
-import './private';
diff --git a/src/legacy/ui/public/private/private.js b/src/legacy/ui/public/private/private.js
deleted file mode 100644
index 7a0751959417ee..00000000000000
--- a/src/legacy/ui/public/private/private.js
+++ /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 { uiModules } from '../modules';
-import { PrivateProvider } from '../../../../plugins/kibana_legacy/public';
-
-uiModules.get('kibana/private').provider('Private', PrivateProvider);
diff --git a/src/legacy/ui/public/promises/__tests__/promises.js b/src/legacy/ui/public/promises/__tests__/promises.js
deleted file mode 100644
index 7041aa2993376e..00000000000000
--- a/src/legacy/ui/public/promises/__tests__/promises.js
+++ /dev/null
@@ -1,277 +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 ngMock from 'ng_mock';
-import sinon from 'sinon';
-
-describe('Promise service', () => {
-  let Promise;
-  let $rootScope;
-
-  const sandbox = sinon.createSandbox();
-  function tick(ms = 0) {
-    sandbox.clock.tick(ms);
-
-    // Ugly, but necessary for promises to resolve: https://github.com/angular/angular.js/issues/12555
-    $rootScope.$apply();
-  }
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(($injector) => {
-      sandbox.useFakeTimers();
-
-      Promise = $injector.get('Promise');
-      $rootScope = $injector.get('$rootScope');
-    })
-  );
-
-  afterEach(() => sandbox.restore());
-
-  describe('Constructor', () => {
-    it('provides resolve and reject function', () => {
-      const executor = sinon.stub();
-      new Promise(executor);
-
-      sinon.assert.calledOnce(executor);
-      sinon.assert.calledWithExactly(executor, sinon.match.func, sinon.match.func);
-    });
-  });
-
-  it('Promise.resolve', () => {
-    const onResolve = sinon.stub();
-    Promise.resolve(true).then(onResolve);
-
-    tick();
-
-    sinon.assert.calledOnce(onResolve);
-    sinon.assert.calledWithExactly(onResolve, true);
-  });
-
-  describe('Promise.fromNode', () => {
-    it('creates a callback that controls a promise', () => {
-      const callback = sinon.stub();
-      Promise.fromNode(callback);
-
-      tick();
-
-      sinon.assert.calledOnce(callback);
-      sinon.assert.calledWithExactly(callback, sinon.match.func);
-    });
-
-    it('rejects if the callback receives an error', () => {
-      const err = new Error();
-      const onReject = sinon.stub();
-      Promise.fromNode(sinon.stub().yields(err)).catch(onReject);
-
-      tick();
-
-      sinon.assert.calledOnce(onReject);
-      sinon.assert.calledWithExactly(onReject, sinon.match.same(err));
-    });
-
-    it('resolves with the second argument', () => {
-      const result = {};
-      const onResolve = sinon.stub();
-      Promise.fromNode(sinon.stub().yields(null, result)).then(onResolve);
-
-      tick();
-
-      sinon.assert.calledOnce(onResolve);
-      sinon.assert.calledWithExactly(onResolve, sinon.match.same(result));
-    });
-
-    it('resolves with an array if multiple arguments are received', () => {
-      const result1 = {};
-      const result2 = {};
-      const onResolve = sinon.stub();
-      Promise.fromNode(sinon.stub().yields(null, result1, result2)).then(onResolve);
-
-      tick();
-
-      sinon.assert.calledOnce(onResolve);
-      sinon.assert.calledWithExactly(onResolve, [
-        sinon.match.same(result1),
-        sinon.match.same(result2),
-      ]);
-    });
-
-    it('resolves with an array if multiple undefined are received', () => {
-      const onResolve = sinon.stub();
-      Promise.fromNode(sinon.stub().yields(null, undefined, undefined)).then(onResolve);
-
-      tick();
-
-      sinon.assert.calledOnce(onResolve);
-      sinon.assert.calledWithExactly(onResolve, [undefined, undefined]);
-    });
-  });
-
-  describe('Promise.race()', () => {
-    it(`resolves with the first resolved promise's value`, () => {
-      const p1 = new Promise((resolve) => setTimeout(resolve, 100, 1));
-      const p2 = new Promise((resolve) => setTimeout(resolve, 200, 2));
-      const onResolve = sinon.stub();
-      Promise.race([p1, p2]).then(onResolve);
-
-      tick(200);
-
-      sinon.assert.calledOnce(onResolve);
-      sinon.assert.calledWithExactly(onResolve, 1);
-    });
-
-    it(`rejects with the first rejected promise's rejection reason`, () => {
-      const p1Error = new Error('1');
-      const p1 = new Promise((r, reject) => setTimeout(reject, 200, p1Error));
-
-      const p2Error = new Error('2');
-      const p2 = new Promise((r, reject) => setTimeout(reject, 100, p2Error));
-
-      const onReject = sinon.stub();
-      Promise.race([p1, p2]).catch(onReject);
-
-      tick(200);
-
-      sinon.assert.calledOnce(onReject);
-      sinon.assert.calledWithExactly(onReject, sinon.match.same(p2Error));
-    });
-
-    it('does not wait for subsequent promises to resolve/reject', () => {
-      const onP1Resolve = sinon.stub();
-      const p1 = new Promise((resolve) => setTimeout(resolve, 100)).then(onP1Resolve);
-
-      const onP2Resolve = sinon.stub();
-      const p2 = new Promise((resolve) => setTimeout(resolve, 101)).then(onP2Resolve);
-
-      const onResolve = sinon.stub();
-      Promise.race([p1, p2]).then(onResolve);
-
-      tick(100);
-
-      sinon.assert.calledOnce(onResolve);
-      sinon.assert.calledOnce(onP1Resolve);
-      sinon.assert.callOrder(onP1Resolve, onResolve);
-      sinon.assert.notCalled(onP2Resolve);
-    });
-
-    it('allows non-promises in the array', () => {
-      const onResolve = sinon.stub();
-      Promise.race([1, 2, 3]).then(onResolve);
-
-      tick();
-
-      sinon.assert.calledOnce(onResolve);
-      sinon.assert.calledWithExactly(onResolve, 1);
-    });
-
-    describe('argument is undefined', () => {
-      it('rejects the promise', () => {
-        const football = {};
-        const onReject = sinon.stub();
-        Promise.race()
-          .catch(() => football)
-          .then(onReject);
-
-        tick();
-
-        sinon.assert.calledOnce(onReject);
-        sinon.assert.calledWithExactly(onReject, sinon.match.same(football));
-      });
-    });
-
-    describe('argument is a string', () => {
-      it(`resolves with the first character`, () => {
-        const onResolve = sinon.stub();
-        Promise.race('abc').then(onResolve);
-
-        tick();
-
-        sinon.assert.calledOnce(onResolve);
-        sinon.assert.calledWithExactly(onResolve, 'a');
-      });
-    });
-
-    describe('argument is a non-iterable object', () => {
-      it('reject the promise', () => {
-        const football = {};
-        const onReject = sinon.stub();
-        Promise.race({})
-          .catch(() => football)
-          .then(onReject);
-
-        tick();
-
-        sinon.assert.calledOnce(onReject);
-        sinon.assert.calledWithExactly(onReject, sinon.match.same(football));
-      });
-    });
-
-    describe('argument is a generator', () => {
-      it('resolves with the first resolved value', () => {
-        function* gen() {
-          yield new Promise((resolve) => setTimeout(resolve, 100, 1));
-          yield new Promise((resolve) => setTimeout(resolve, 200, 2));
-        }
-
-        const onResolve = sinon.stub();
-        Promise.race(gen()).then(onResolve);
-
-        tick(200);
-
-        sinon.assert.calledOnce(onResolve);
-        sinon.assert.calledWithExactly(onResolve, 1);
-      });
-
-      it('resolves with the first non-promise value', () => {
-        function* gen() {
-          yield 1;
-          yield new Promise((resolve) => setTimeout(resolve, 200, 2));
-        }
-
-        const onResolve = sinon.stub();
-        Promise.race(gen()).then(onResolve);
-
-        tick(200);
-
-        sinon.assert.calledOnce(onResolve);
-        sinon.assert.calledWithExactly(onResolve, 1);
-      });
-
-      it('iterates all values from the generator, even if one is already "resolved"', () => {
-        let yieldCount = 0;
-        function* gen() {
-          yieldCount += 1;
-          yield 1;
-          yieldCount += 1;
-          yield new Promise((resolve) => setTimeout(resolve, 200, 2));
-        }
-
-        const onResolve = sinon.stub();
-        Promise.race(gen()).then(onResolve);
-
-        tick(200);
-
-        sinon.assert.calledOnce(onResolve);
-        sinon.assert.calledWithExactly(onResolve, 1);
-        expect(yieldCount).to.be(2);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/promises/defer.ts b/src/legacy/ui/public/promises/defer.ts
deleted file mode 100644
index 3d435f2ba8dfdf..00000000000000
--- a/src/legacy/ui/public/promises/defer.ts
+++ /dev/null
@@ -1,33 +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 interface Defer<T> {
-  promise: Promise<T>;
-  resolve(value: T): void;
-  reject(reason: Error): void;
-}
-
-export function createDefer<T = unknown>(Class: typeof Promise): Defer<T> {
-  const defer: Partial<Defer<T>> = {};
-  defer.promise = new Class<T>((resolve, reject) => {
-    defer.resolve = resolve;
-    defer.reject = reject;
-  });
-  return defer as Defer<T>;
-}
diff --git a/src/legacy/ui/public/promises/index.ts b/src/legacy/ui/public/promises/index.ts
deleted file mode 100644
index 07bb2554c5eda6..00000000000000
--- a/src/legacy/ui/public/promises/index.ts
+++ /dev/null
@@ -1,28 +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 { PromiseServiceCreator } from '../../../../plugins/kibana_legacy/public';
-export { createDefer } from './defer';
-// @ts-ignore
-import { uiModules } from '../modules';
-
-const module = uiModules.get('kibana');
-// Provides a tiny subset of the excellent API from
-// bluebird, reimplemented using the $q service
-module.service('Promise', PromiseServiceCreator);
diff --git a/src/legacy/ui/public/react_components.js b/src/legacy/ui/public/react_components.js
deleted file mode 100644
index 21fb53d6407fa9..00000000000000
--- a/src/legacy/ui/public/react_components.js
+++ /dev/null
@@ -1,32 +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 'ngreact';
-
-import { EuiIcon, EuiIconTip } from '@elastic/eui';
-
-import { uiModules } from './modules';
-
-const app = uiModules.get('app/kibana', ['react']);
-
-app.directive('icon', (reactDirective) => reactDirective(EuiIcon));
-
-app.directive('iconTip', (reactDirective) =>
-  reactDirective(EuiIconTip, ['content', 'type', 'position', 'title', 'color'])
-);
diff --git a/src/legacy/ui/public/registry/__tests__/registry.js b/src/legacy/ui/public/registry/__tests__/registry.js
deleted file mode 100644
index 10b2423abc0e3b..00000000000000
--- a/src/legacy/ui/public/registry/__tests__/registry.js
+++ /dev/null
@@ -1,168 +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 { uiRegistry } from '../_registry';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-
-describe('Registry', function () {
-  let Private;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function ($injector) {
-      Private = $injector.get('Private');
-    })
-  );
-
-  it('is technically a function', function () {
-    const reg = uiRegistry();
-    expect(reg).to.be.a('function');
-  });
-
-  describe('#register', function () {
-    it('accepts a Private module', function () {
-      const reg = uiRegistry();
-      const mod = function SomePrivateModule() {};
-
-      reg.register(mod);
-      // modules are not exposed, so this is the most that we can test
-    });
-
-    it('applies the filter function if one is specified', function () {
-      const reg = uiRegistry({
-        filter: (item) => item.value % 2 === 0, // register only even numbers
-      });
-
-      reg.register(() => ({ value: 17 }));
-      reg.register(() => ({ value: 18 })); // only this one should get registered
-      reg.register(() => ({ value: 19 }));
-
-      const modules = Private(reg);
-      expect(modules).to.have.length(1);
-      expect(modules[0].value).to.be(18);
-    });
-  });
-
-  describe('as a module', function () {
-    it('exposes the list of registered modules', function () {
-      const reg = uiRegistry();
-      const mod = function SomePrivateModule(Private) {
-        this.PrivateModuleLoader = Private;
-      };
-
-      reg.register(mod);
-      const modules = Private(reg);
-      expect(modules).to.have.length(1);
-      expect(modules[0]).to.have.property('PrivateModuleLoader', Private);
-    });
-  });
-
-  describe('spec', function () {
-    it('executes with the module list as "this", and can override it', function () {
-      let self;
-
-      const reg = uiRegistry({
-        constructor: function () {
-          return { mods: (self = this) };
-        },
-      });
-
-      const modules = Private(reg);
-      expect(modules).to.be.an('object');
-      expect(modules).to.have.property('mods', self);
-    });
-  });
-
-  describe('spec.name', function () {
-    it('sets the displayName of the registry and the name param on the final instance', function () {
-      const reg = uiRegistry({
-        name: 'visTypes',
-      });
-
-      expect(reg).to.have.property('displayName', '[registry visTypes]');
-      expect(Private(reg)).to.have.property('name', 'visTypes');
-    });
-  });
-
-  describe('spec.constructor', function () {
-    it('executes before the modules are returned', function () {
-      let i = 0;
-
-      const reg = uiRegistry({
-        constructor: function () {
-          i = i + 1;
-        },
-      });
-
-      Private(reg);
-      expect(i).to.be(1);
-    });
-
-    it('executes with the module list as "this", and can override it', function () {
-      let self;
-
-      const reg = uiRegistry({
-        constructor: function () {
-          return { mods: (self = this) };
-        },
-      });
-
-      const modules = Private(reg);
-      expect(modules).to.be.an('object');
-      expect(modules).to.have.property('mods', self);
-    });
-  });
-
-  describe('spec.invokeProviders', () => {
-    it('is called with the registered providers and defines the initial set of values in the registry', () => {
-      const reg = uiRegistry({
-        invokeProviders(providers) {
-          return providers.map((i) => i * 1000);
-        },
-      });
-
-      reg.register(1);
-      reg.register(2);
-      reg.register(3);
-      expect(Private(reg).toJSON()).to.eql([1000, 2000, 3000]);
-    });
-    it('does not get assigned as a property of the registry', () => {
-      expect(
-        uiRegistry({
-          invokeProviders() {},
-        })
-      ).to.not.have.property('invokeProviders');
-    });
-  });
-
-  describe('spec[any]', function () {
-    it('mixes the extra properties into the module list', function () {
-      const reg = uiRegistry({
-        someMethod: function () {
-          return this;
-        },
-      });
-
-      const modules = Private(reg);
-      expect(modules).to.have.property('someMethod');
-      expect(modules.someMethod()).to.be(modules);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/registry/_registry.d.ts b/src/legacy/ui/public/registry/_registry.d.ts
deleted file mode 100644
index 42f1bb521763ca..00000000000000
--- a/src/legacy/ui/public/registry/_registry.d.ts
+++ /dev/null
@@ -1,40 +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 { IndexedArray, IndexedArrayConfig } from '../indexed_array';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface UIRegistry<T> extends IndexedArray<T> {}
-
-interface UIRegistrySpec<T> extends IndexedArrayConfig<T> {
-  name: string;
-  filter?(item: T): boolean;
-}
-
-/**
- * Creates a new UiRegistry (See js method for detailed documentation)
- * The generic type T is the type of objects which are stored in the registry.
- * The generic type A is an interface of accessors which depend on the
- * fields of the objects stored in the registry.
- * Example: if there is a string field "name" in type T, then A should be
- * `{ byName: { [typeName: string]: T }; }`
- */
-declare function uiRegistry<T, A = {}>(
-  spec: UIRegistrySpec<T>
-): { (): UIRegistry<T> & A; register<T>(privateModule: T): UIRegistry<T> & A };
diff --git a/src/legacy/ui/public/registry/_registry.js b/src/legacy/ui/public/registry/_registry.js
deleted file mode 100644
index 85aa1d9f2eca8f..00000000000000
--- a/src/legacy/ui/public/registry/_registry.js
+++ /dev/null
@@ -1,141 +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 _ from 'lodash';
-import { IndexedArray } from '../indexed_array';
-
-const notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor', 'invokeProviders');
-
-/**
- * Create a registry, which is just a Private module provider.
- *
- * The registry allows modifying the values it will provide
- * using the #register method.
- *
- * To access these modules, pass the registry to the Private
- * module loader.
- *
- * # Examples
- *
- * + register a module
- * ```js
- * let registry = require('ui/registry/vis_types');
- * registry.add(function InjectablePrivateModule($http, Promise) {
- *   ...
- * })
- * ```
- *
- * + get all registered modules
- * ```js
- * let visTypes = Private(RegistryVisTypesProvider);
- * ```
- *
- *
- * @param  {object} [spec] - an object describing the properties of
- *                         the registry to create. Any property specified
- *                         that is not listed below will be mixed into the
- *                         final IndexedArray object.
- *
- * # init
- * @param {Function} [spec.constructor] - an injectable function that is called when
- *                                      the registry is first instantiated by the app.
- * @param {boolean} [spec.filter] - function that will be used to filter items before
- *                                registering them. Function will called on each item and
- *                                should return true to keep the item (register it) or
- *                                skip it (don't register it)
- *
- * # IndexedArray params
- * @param {array[String]} [spec.index] - passed to the IndexedArray constructor
- * @param {array[String]} [spec.group] - passed to the IndexedArray constructor
- * @param {array[String]} [spec.order] - passed to the IndexedArray constructor
- * @param {array[String]} [spec.initialSet] - passed to the IndexedArray constructor
- * @param {array[String]} [spec.immutable] - passed to the IndexedArray constructor
- *
- * @return {[type]}      [description]
- */
-export function uiRegistry(spec) {
-  spec = spec || {};
-
-  const constructor = _.has(spec, 'constructor') && spec.constructor;
-  const filter = _.has(spec, 'filter') && spec.filter;
-  const invokeProviders = _.has(spec, 'invokeProviders') && spec.invokeProviders;
-  const iaOpts = _.defaults(_.pick(spec, IndexedArray.OPT_NAMES), { index: ['name'] });
-  const props = _.omit(spec, notPropsOptNames);
-  const providers = [];
-
-  let isInstantiated = false;
-  let getInvokedProviders;
-  let modules;
-
-  /**
-   * This is the Private module that will be instantiated by
-   *
-   * @tag:PrivateModule
-   * @return {IndexedArray} - an indexed array containing the values
-   *                          that were registered, the registry spec
-   *                          defines how things will be indexed.
-   */
-  const registry = function (Private, $injector) {
-    getInvokedProviders = function (newProviders) {
-      let set = invokeProviders
-        ? $injector.invoke(invokeProviders, undefined, { providers: newProviders })
-        : newProviders.map(Private);
-
-      if (filter && _.isFunction(filter)) {
-        set = set.filter((item) => filter(item));
-      }
-
-      return set;
-    };
-
-    iaOpts.initialSet = getInvokedProviders(providers);
-
-    modules = new IndexedArray(iaOpts);
-
-    // mixin other props
-    _.assign(modules, props);
-
-    // construct
-    if (constructor) {
-      modules = $injector.invoke(constructor, modules) || modules;
-    }
-
-    isInstantiated = true;
-
-    return modules;
-  };
-
-  registry.displayName = '[registry ' + props.name + ']';
-
-  registry.register = function (privateModule) {
-    providers.push(privateModule);
-
-    if (isInstantiated) {
-      const [provider] = getInvokedProviders([privateModule]);
-
-      if (provider) {
-        modules.push(provider);
-      }
-    }
-
-    return registry;
-  };
-
-  return registry;
-}
diff --git a/src/legacy/ui/public/registry/chrome_header_nav_controls.ts b/src/legacy/ui/public/registry/chrome_header_nav_controls.ts
deleted file mode 100644
index 7e6c80692cd634..00000000000000
--- a/src/legacy/ui/public/registry/chrome_header_nav_controls.ts
+++ /dev/null
@@ -1,49 +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 { IndexedArray } from '../indexed_array';
-import { uiRegistry, UIRegistry } from './_registry';
-
-interface ChromeHeaderNavControlsRegistryAccessors {
-  bySide: { [typeName: string]: IndexedArray<NavControl> };
-}
-
-export enum NavControlSide {
-  Left = 'left',
-  Right = 'right',
-}
-
-export interface NavControl {
-  name: string;
-  order: number;
-  side: NavControlSide;
-  render: (targetDomElement: HTMLDivElement) => () => void;
-}
-
-export type ChromeHeaderNavControlsRegistry = UIRegistry<NavControl> &
-  ChromeHeaderNavControlsRegistryAccessors;
-
-export const chromeHeaderNavControlsRegistry = uiRegistry<
-  NavControl,
-  ChromeHeaderNavControlsRegistryAccessors
->({
-  name: 'chromeHeaderNavControls',
-  order: ['order'],
-  group: ['side'],
-});
diff --git a/src/legacy/ui/public/registry/field_format_editors.ts b/src/legacy/ui/public/registry/field_format_editors.ts
deleted file mode 100644
index 5489ce9250e043..00000000000000
--- a/src/legacy/ui/public/registry/field_format_editors.ts
+++ /dev/null
@@ -1,25 +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 { uiRegistry } from './_registry';
-
-export const RegistryFieldFormatEditorsProvider = uiRegistry({
-  name: 'fieldFormatEditors',
-  index: ['formatId'],
-});
diff --git a/src/legacy/ui/public/routes/__tests__/_route_manager.js b/src/legacy/ui/public/routes/__tests__/_route_manager.js
deleted file mode 100644
index eb47a3e9ace709..00000000000000
--- a/src/legacy/ui/public/routes/__tests__/_route_manager.js
+++ /dev/null
@@ -1,218 +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 _ from 'lodash';
-import ngMock from 'ng_mock';
-import sinon from 'sinon';
-import RouteManager from '../route_manager';
-import expect from '@kbn/expect';
-
-let routes; // will contain an new instance of RouteManager for each test
-const chainableMethods = [
-  { name: 'when', args: ['', {}] },
-  { name: 'otherwise', args: [{}] },
-  { name: 'defaults', args: [/regexp/, {}] },
-];
-
-let $rp;
-describe('routes/route_manager', function () {
-  beforeEach(
-    ngMock.module('kibana', function ($routeProvider) {
-      $rp = $routeProvider;
-      sinon.stub($rp, 'otherwise');
-      sinon.stub($rp, 'when');
-    })
-  );
-
-  beforeEach(
-    ngMock.inject(function () {
-      routes = new RouteManager();
-    })
-  );
-
-  it('should have chainable methods: ' + _.map(chainableMethods, 'name').join(', '), function () {
-    chainableMethods.forEach(function (meth) {
-      expect(routes[meth.name].apply(routes, _.clone(meth.args))).to.be(routes);
-    });
-  });
-
-  describe('#otherwise', function () {
-    it('should forward the last otherwise route', function () {
-      const otherRoute = {};
-      routes.otherwise({});
-      routes.otherwise(otherRoute);
-
-      routes.config($rp);
-
-      expect($rp.otherwise.callCount).to.be(1);
-      expect($rp.otherwise.getCall(0).args[0]).to.be(otherRoute);
-    });
-  });
-
-  describe('#when', function () {
-    it('should merge the additions into the when() defined routes', function () {
-      routes.when('/some/route');
-      routes.when('/some/other/route');
-
-      // add the addition resolve to every route
-      routes.defaults(/.*/, {
-        resolve: {
-          addition: function () {},
-        },
-      });
-
-      routes.config($rp);
-
-      // should have run once for each when route
-      expect($rp.when.callCount).to.be(2);
-      expect($rp.otherwise.callCount).to.be(0);
-
-      // every route should have the "addition" resolve
-      expect($rp.when.getCall(0).args[1].resolve.addition).to.be.a('function');
-      expect($rp.when.getCall(1).args[1].resolve.addition).to.be.a('function');
-    });
-  });
-
-  describe('#config', function () {
-    it('should add defined routes to the global $routeProvider service in order', function () {
-      const args = [
-        ['/one', {}],
-        ['/two', {}],
-      ];
-
-      args.forEach(function (a) {
-        routes.when(a[0], a[1]);
-      });
-
-      routes.config($rp);
-
-      expect($rp.when.callCount).to.be(args.length);
-      _.times(args.length, function (i) {
-        const call = $rp.when.getCall(i);
-        const a = args.shift();
-
-        expect(call.args[0]).to.be(a[0]);
-        expect(call.args[1]).to.be(a[1]);
-      });
-    });
-
-    it('sets route.reloadOnSearch to false by default', function () {
-      routes.when('/nothing-set');
-      routes.when('/no-reload', { reloadOnSearch: false });
-      routes.when('/always-reload', { reloadOnSearch: true });
-      routes.config($rp);
-
-      expect($rp.when.callCount).to.be(3);
-      expect($rp.when.firstCall.args[1]).to.have.property('reloadOnSearch', false);
-      expect($rp.when.secondCall.args[1]).to.have.property('reloadOnSearch', false);
-      expect($rp.when.lastCall.args[1]).to.have.property('reloadOnSearch', true);
-    });
-  });
-
-  describe('#defaults()', () => {
-    it('adds defaults to routes with matching paths', () => {
-      routes.when('/foo', { name: 'foo' });
-      routes.when('/bar', { name: 'bar' });
-      routes.when('/baz', { name: 'baz' });
-      routes.defaults(/^\/ba/, {
-        withDefaults: true,
-      });
-      routes.config($rp);
-
-      sinon.assert.calledWithExactly(
-        $rp.when,
-        '/foo',
-        sinon.match({ name: 'foo', withDefaults: undefined })
-      );
-      sinon.assert.calledWithExactly(
-        $rp.when,
-        '/bar',
-        sinon.match({ name: 'bar', withDefaults: true })
-      );
-      sinon.assert.calledWithExactly(
-        $rp.when,
-        '/baz',
-        sinon.match({ name: 'baz', withDefaults: true })
-      );
-    });
-
-    it('does not override values specified in the route', () => {
-      routes.when('/foo', { name: 'foo' });
-      routes.defaults(/./, { name: 'bar' });
-      routes.config($rp);
-
-      sinon.assert.calledWithExactly($rp.when, '/foo', sinon.match({ name: 'foo' }));
-    });
-
-    // See https://github.com/elastic/kibana/issues/13294
-    it('does not assign defaults by reference, to prevent accidentally merging unrelated defaults together', () => {
-      routes.when('/foo', { name: 'foo' });
-      routes.when('/bar', { name: 'bar' });
-      routes.when('/baz', { name: 'baz', funcs: { bazFunc() {} } });
-
-      // multiple defaults must be defined that, when applied correctly, will
-      // create a new object property on all routes that is unique to all of them
-      routes.defaults(/./, { funcs: { all() {} } });
-      routes.defaults(/^\/foo/, { funcs: { fooFunc() {} } });
-      routes.defaults(/^\/bar/, { funcs: { barFunc() {} } });
-      routes.config($rp);
-
-      sinon.assert.calledThrice($rp.when);
-      sinon.assert.calledWithExactly(
-        $rp.when,
-        '/foo',
-        sinon.match({
-          name: 'foo',
-          funcs: sinon.match({
-            all: sinon.match.func,
-            fooFunc: sinon.match.func,
-            barFunc: undefined,
-            bazFunc: undefined,
-          }),
-        })
-      );
-      sinon.assert.calledWithExactly(
-        $rp.when,
-        '/bar',
-        sinon.match({
-          name: 'bar',
-          funcs: sinon.match({
-            all: sinon.match.func,
-            fooFunc: undefined,
-            barFunc: sinon.match.func,
-            bazFunc: undefined,
-          }),
-        })
-      );
-      sinon.assert.calledWithExactly(
-        $rp.when,
-        '/baz',
-        sinon.match({
-          name: 'baz',
-          funcs: sinon.match({
-            all: sinon.match.func,
-            fooFunc: undefined,
-            barFunc: undefined,
-            bazFunc: sinon.match.func,
-          }),
-        })
-      );
-    });
-  });
-});
diff --git a/src/legacy/ui/public/routes/__tests__/_work_queue.js b/src/legacy/ui/public/routes/__tests__/_work_queue.js
deleted file mode 100644
index 72891f7321fbd7..00000000000000
--- a/src/legacy/ui/public/routes/__tests__/_work_queue.js
+++ /dev/null
@@ -1,116 +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 _ from 'lodash';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-import { WorkQueue } from '../work_queue';
-import sinon from 'sinon';
-import { createDefer } from 'ui/promises';
-
-describe('work queue', function () {
-  let queue;
-  let Promise;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function (_Promise_) {
-      Promise = _Promise_;
-    })
-  );
-  beforeEach(function () {
-    queue = new WorkQueue();
-  });
-  afterEach(function () {
-    queue.empty();
-  });
-
-  describe('#push', function () {
-    it('adds to the interval queue', function () {
-      queue.push(createDefer(Promise));
-      expect(queue).to.have.length(1);
-    });
-  });
-
-  describe('#resolveWhenFull', function () {
-    it('resolves requests waiting for the queue to fill when appropriate', function () {
-      const size = _.random(5, 50);
-      queue.limit = size;
-
-      const whenFull = createDefer(Promise);
-      sinon.stub(whenFull, 'resolve');
-      queue.resolveWhenFull(whenFull);
-
-      // push all but one into the queue
-      _.times(size - 1, function () {
-        queue.push(createDefer(Promise));
-      });
-
-      expect(whenFull.resolve.callCount).to.be(0);
-      queue.push(createDefer(Promise));
-      expect(whenFull.resolve.callCount).to.be(1);
-
-      queue.empty();
-    });
-  });
-
-  /**
-   * Fills the queue with a random number of work defers, but stubs all defer methods
-   * with the same stub and passed it back.
-   *
-   * @param  {function} then - called with then(size, stub) so that the test
-   *                         can manipulate the filled queue
-   */
-  function fillWithStubs(then) {
-    const size = _.random(5, 50);
-    const stub = sinon.stub();
-
-    _.times(size, function () {
-      const d = createDefer(Promise);
-      // overwrite the defer methods with the stub
-      d.resolve = stub;
-      d.reject = stub;
-      queue.push(d);
-    });
-
-    then(size, stub);
-  }
-
-  describe('#doWork', function () {
-    it('flushes the queue and resolves all promises', function () {
-      fillWithStubs(function (size, stub) {
-        expect(queue).to.have.length(size);
-        queue.doWork();
-        expect(queue).to.have.length(0);
-        expect(stub.callCount).to.be(size);
-      });
-    });
-  });
-
-  describe('#empty()', function () {
-    it('empties the internal queue WITHOUT resolving any promises', function () {
-      fillWithStubs(function (size, stub) {
-        expect(queue).to.have.length(size);
-        queue.empty();
-        expect(queue).to.have.length(0);
-        expect(stub.callCount).to.be(0);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js b/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js
deleted file mode 100644
index 8ae85fce591a11..00000000000000
--- a/src/legacy/ui/public/routes/__tests__/_wrap_route_with_prep.js
+++ /dev/null
@@ -1,106 +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 RouteManager from '../route_manager';
-import expect from '@kbn/expect';
-import ngMock from 'ng_mock';
-
-import _ from 'lodash';
-import '../../private';
-
-let routes;
-
-describe('wrapRouteWithPrep fn', function () {
-  require('test_utils/no_digest_promises').activateForSuite();
-
-  beforeEach(function () {
-    routes = new RouteManager();
-  });
-
-  const SchedulingTest = function (opts) {
-    opts = opts || {};
-
-    const delaySetup = opts.delayUserWork ? 0 : 50;
-    const delayUserWork = opts.delayUserWork ? 50 : 0;
-
-    return function () {
-      ngMock.module('kibana');
-      let setupComplete = false;
-      let userWorkComplete = false;
-      let route;
-      let Promise;
-      let $injector;
-
-      ngMock.inject(function (_Promise_, _$injector_) {
-        Promise = _Promise_;
-        $injector = _$injector_;
-      });
-
-      routes.addSetupWork(function () {
-        return new Promise(function (resolve) {
-          setTimeout(function () {
-            setupComplete = true;
-            resolve();
-          }, delaySetup);
-        });
-      });
-
-      routes
-        .when('/', {
-          resolve: {
-            test: function () {
-              expect(setupComplete).to.be(true);
-              userWorkComplete = true;
-            },
-          },
-        })
-        .config({
-          when: function (p, _r) {
-            route = _r;
-          },
-        });
-
-      return new Promise(function (resolve, reject) {
-        setTimeout(function () {
-          Promise.all(
-            _.map(route.resolve, function (fn) {
-              return $injector.invoke(fn);
-            })
-          )
-            .then(function () {
-              expect(setupComplete).to.be(true);
-              expect(userWorkComplete).to.be(true);
-            })
-            .then(resolve, reject);
-        }, delayUserWork);
-      });
-    };
-  };
-
-  it('always waits for setup to complete before calling user work', new SchedulingTest());
-
-  it('does not call user work when setup fails', new SchedulingTest({ failSetup: true }));
-
-  it(
-    'calls all user work even if it is not initialized until after setup is complete',
-    new SchedulingTest({
-      delayUserWork: false,
-    })
-  );
-});
diff --git a/src/legacy/ui/public/routes/__tests__/index.js b/src/legacy/ui/public/routes/__tests__/index.js
deleted file mode 100644
index 30cedaaca3d19f..00000000000000
--- a/src/legacy/ui/public/routes/__tests__/index.js
+++ /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 './_route_manager';
-import './_work_queue';
-import './_wrap_route_with_prep';
-describe('Custom Route Management', function () {});
diff --git a/src/legacy/ui/public/routes/breadcrumbs.js b/src/legacy/ui/public/routes/breadcrumbs.js
deleted file mode 100644
index 7917ffbd7c6e61..00000000000000
--- a/src/legacy/ui/public/routes/breadcrumbs.js
+++ /dev/null
@@ -1,44 +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 { trim, startCase } from 'lodash';
-
-/**
- *  Take a path (from $location.path() usually) and parse
- *  it's segments into a list of breadcrumbs
- *
- *  @param  {string} path
- *  @return {Array<Breadcrumb>}
- */
-export function parsePathToBreadcrumbs(path) {
-  return trim(path, '/')
-    .split('/')
-    .reduce(
-      (acc, id, i, parts) => [
-        ...acc,
-        {
-          id,
-          display: startCase(id),
-          href: i === 0 ? `#/${id}` : `${acc[i - 1].href}/${id}`,
-          current: i === parts.length - 1,
-        },
-      ],
-      []
-    );
-}
diff --git a/src/legacy/ui/public/routes/index.d.ts b/src/legacy/ui/public/routes/index.d.ts
deleted file mode 100644
index 84e17b0a69452d..00000000000000
--- a/src/legacy/ui/public/routes/index.d.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 { uiRoutes, UIRoutes } from 'ui/routes/routes';
-
-// eslint-disable-next-line import/no-default-export
-export default uiRoutes;
-export { UIRoutes };
diff --git a/src/legacy/ui/public/routes/index.js b/src/legacy/ui/public/routes/index.js
deleted file mode 100644
index 9c826ebee12302..00000000000000
--- a/src/legacy/ui/public/routes/index.js
+++ /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 { uiRoutes } from './routes';
-
-// eslint-disable-next-line import/no-default-export
-export default uiRoutes;
diff --git a/src/legacy/ui/public/routes/route_manager.d.ts b/src/legacy/ui/public/routes/route_manager.d.ts
deleted file mode 100644
index a5261a7c8ee3a8..00000000000000
--- a/src/legacy/ui/public/routes/route_manager.d.ts
+++ /dev/null
@@ -1,47 +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.
- */
-
-/**
- * WARNING: these types are incomplete
- */
-
-import { ChromeBreadcrumb } from '../../../../core/public';
-
-export interface RouteConfiguration {
-  controller?: string | ((...args: any[]) => void);
-  redirectTo?: string;
-  resolveRedirectTo?: (...args: any[]) => void;
-  reloadOnSearch?: boolean;
-  reloadOnUrl?: boolean;
-  outerAngularWrapperRoute?: boolean;
-  resolve?: object;
-  template?: string;
-  k7Breadcrumbs?: (...args: any[]) => ChromeBreadcrumb[];
-  requireUICapability?: string;
-}
-
-interface RouteManager {
-  addSetupWork(cb: (...args: any[]) => void): void;
-  when(path: string, routeConfiguration: RouteConfiguration): RouteManager;
-  otherwise(routeConfiguration: RouteConfiguration): RouteManager;
-  defaults(path: string | RegExp, defaults: RouteConfiguration): RouteManager;
-}
-
-// eslint-disable-next-line import/no-default-export
-export default RouteManager;
diff --git a/src/legacy/ui/public/routes/route_manager.js b/src/legacy/ui/public/routes/route_manager.js
deleted file mode 100644
index de8a541d1c50a8..00000000000000
--- a/src/legacy/ui/public/routes/route_manager.js
+++ /dev/null
@@ -1,115 +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 { cloneDeep, defaultsDeep, wrap } from 'lodash';
-
-import { wrapRouteWithPrep } from './wrap_route_with_prep';
-import { RouteSetupManager } from './route_setup_manager';
-import { parsePathToBreadcrumbs } from './breadcrumbs';
-
-// eslint-disable-next-line import/no-default-export
-export default function RouteManager() {
-  const self = this;
-  const setup = new RouteSetupManager();
-  const when = [];
-  const defaults = [];
-  let otherwise;
-
-  self.config = function ($routeProvider) {
-    when.forEach(function (args) {
-      const path = args[0];
-      const route = args[1] || {};
-
-      defaults.forEach((def) => {
-        if (def.regex.test(path)) {
-          defaultsDeep(route, cloneDeep(def.value));
-        }
-      });
-
-      if (route.reloadOnSearch == null) {
-        route.reloadOnSearch = false;
-      }
-
-      wrapRouteWithPrep(route, setup);
-      $routeProvider.when(path, route);
-    });
-
-    if (otherwise) {
-      wrapRouteWithPrep(otherwise, setup);
-      $routeProvider.otherwise(otherwise);
-    }
-  };
-
-  self.run = function ($location, $route, $injector, $rootScope) {
-    if (window.elasticApm && typeof window.elasticApm.startTransaction === 'function') {
-      /**
-       * capture route-change events as transactions which happens after
-       * the browser's on load event.
-       *
-       * In Kibana app, this logic would run after the boostrap js files gets
-       * downloaded and get associated with the page-load transaction
-       */
-      $rootScope.$on('$routeChangeStart', (_, nextRoute) => {
-        if (nextRoute.$$route) {
-          const name = nextRoute.$$route.originalPath;
-          window.elasticApm.startTransaction(name, 'route-change');
-        }
-      });
-    }
-
-    self.getBreadcrumbs = () => {
-      const breadcrumbs = parsePathToBreadcrumbs($location.path());
-      const map = $route.current.mapBreadcrumbs;
-      return map ? $injector.invoke(map, null, { breadcrumbs }) : breadcrumbs;
-    };
-  };
-
-  const wrapSetupAndChain = (fn, ...args) => {
-    fn.apply(setup, args);
-    return this;
-  };
-
-  this.addSetupWork = wrap(setup.addSetupWork, wrapSetupAndChain);
-  this.afterSetupWork = wrap(setup.afterSetupWork, wrapSetupAndChain);
-  this.afterWork = wrap(setup.afterWork, wrapSetupAndChain);
-
-  self.when = function (path, route) {
-    when.push([path, route]);
-    return self;
-  };
-
-  // before attaching the routes to the routeProvider, test the RE
-  // against the .when() path and add/override the resolves if there is a match
-  self.defaults = function (regex, value) {
-    defaults.push({ regex, value });
-    return self;
-  };
-
-  self.otherwise = function (route) {
-    otherwise = route;
-    return self;
-  };
-
-  self.getBreadcrumbs = function () {
-    // overwritten in self.run();
-    return [];
-  };
-
-  self.RouteManager = RouteManager;
-}
diff --git a/src/legacy/ui/public/routes/route_setup_manager.js b/src/legacy/ui/public/routes/route_setup_manager.js
deleted file mode 100644
index a7a2f078f40fb7..00000000000000
--- a/src/legacy/ui/public/routes/route_setup_manager.js
+++ /dev/null
@@ -1,112 +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 _ from 'lodash';
-import { createDefer } from 'ui/promises';
-
-// Throw this inside of an Angular route resolver after calling `kbnUrl.change`
-// so that the $router can observe the $location update. Otherwise, the location
-// route setup work will resolve before the route update occurs.
-export const WAIT_FOR_URL_CHANGE_TOKEN = new Error('WAIT_FOR_URL_CHANGE_TOKEN');
-
-export class RouteSetupManager {
-  constructor() {
-    this.setupWork = [];
-    this.onSetupComplete = [];
-    this.onSetupError = [];
-    this.onWorkComplete = [];
-    this.onWorkError = [];
-  }
-
-  addSetupWork(fn) {
-    this.setupWork.push(fn);
-  }
-
-  afterSetupWork(onComplete, onError) {
-    this.onSetupComplete.push(onComplete);
-    this.onSetupError.push(onError);
-  }
-
-  afterWork(onComplete, onError) {
-    this.onWorkComplete.push(onComplete);
-    this.onWorkError.push(onError);
-  }
-
-  /**
-   * Do each setupWork function by injecting it with angular dependencies
-   * and accepting promises from it.
-   * @return {[type]} [description]
-   */
-  doWork(Promise, $injector, userWork) {
-    const invokeEach = (arr, locals) => {
-      return Promise.map(arr, (fn) => {
-        if (!fn) return;
-        return $injector.invoke(fn, null, locals);
-      });
-    };
-
-    // call each error handler in order, until one of them resolves
-    // or we run out of handlers
-    const callErrorHandlers = (handlers, origError) => {
-      if (!_.size(handlers)) throw origError;
-
-      // clone so we don't discard handlers or loose them
-      handlers = handlers.slice(0);
-
-      const next = (err) => {
-        if (!handlers.length) throw err;
-
-        const handler = handlers.shift();
-        if (!handler) return next(err);
-
-        return Promise.try(function () {
-          return $injector.invoke(handler, null, { err });
-        }).catch(next);
-      };
-
-      return next(origError);
-    };
-
-    return invokeEach(this.setupWork)
-      .then(
-        () => invokeEach(this.onSetupComplete),
-        (err) => callErrorHandlers(this.onSetupError, err)
-      )
-      .then(() => {
-        // wait for the queue to fill up, then do all the work
-        const defer = createDefer(Promise);
-        userWork.resolveWhenFull(defer);
-
-        return defer.promise.then(() => Promise.all(userWork.doWork()));
-      })
-      .catch((error) => {
-        if (error === WAIT_FOR_URL_CHANGE_TOKEN) {
-          // prevent moving forward, return a promise that never resolves
-          // so that the $router can observe the $location update
-          return Promise.halt();
-        }
-
-        throw error;
-      })
-      .then(
-        () => invokeEach(this.onWorkComplete),
-        (err) => callErrorHandlers(this.onWorkError, err)
-      );
-  }
-}
diff --git a/src/legacy/ui/public/routes/routes.d.ts b/src/legacy/ui/public/routes/routes.d.ts
deleted file mode 100644
index d48230e9d56f92..00000000000000
--- a/src/legacy/ui/public/routes/routes.d.ts
+++ /dev/null
@@ -1,28 +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 RouteManager from 'ui/routes/route_manager';
-
-interface DefaultRouteManager extends RouteManager {
-  WAIT_FOR_URL_CHANGE_TOKEN: string;
-  enable(): void;
-}
-
-export const uiRoutes: DefaultRouteManager;
-export type UIRoutes = DefaultRouteManager;
diff --git a/src/legacy/ui/public/routes/routes.js b/src/legacy/ui/public/routes/routes.js
deleted file mode 100644
index 2cfb7a608e853b..00000000000000
--- a/src/legacy/ui/public/routes/routes.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.
- */
-
-import RouteManager from './route_manager';
-import 'angular-route/angular-route';
-import { uiModules } from '../modules';
-import { WAIT_FOR_URL_CHANGE_TOKEN } from './route_setup_manager';
-const defaultRouteManager = new RouteManager();
-
-export const uiRoutes = Object.create(defaultRouteManager, {
-  WAIT_FOR_URL_CHANGE_TOKEN: {
-    value: WAIT_FOR_URL_CHANGE_TOKEN,
-  },
-
-  enable: {
-    value() {
-      uiModules
-        .get('kibana', ['ngRoute'])
-        .config(defaultRouteManager.config)
-        .run(defaultRouteManager.run);
-    },
-  },
-});
diff --git a/src/legacy/ui/public/routes/work_queue.js b/src/legacy/ui/public/routes/work_queue.js
deleted file mode 100644
index 5c4c83663c5902..00000000000000
--- a/src/legacy/ui/public/routes/work_queue.js
+++ /dev/null
@@ -1,65 +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 function WorkQueue() {
-  const q = this;
-
-  const work = [];
-  const fullDefers = [];
-
-  q.limit = 0;
-  Object.defineProperty(q, 'length', {
-    get: function () {
-      return work.length;
-    },
-  });
-
-  const resolve = function (defers) {
-    return defers.splice(0).map(function (defer) {
-      return defer.resolve();
-    });
-  };
-
-  const checkIfFull = function () {
-    if (work.length >= q.limit && fullDefers.length) {
-      resolve(fullDefers);
-    }
-  };
-
-  q.resolveWhenFull = function (defer) {
-    fullDefers.push(defer);
-    checkIfFull();
-  };
-
-  q.doWork = function () {
-    const resps = resolve(work);
-    checkIfFull();
-    return resps;
-  };
-
-  q.empty = function () {
-    work.splice(0);
-    checkIfFull();
-  };
-
-  q.push = function (defer) {
-    work.push(defer);
-    checkIfFull();
-  };
-}
diff --git a/src/legacy/ui/public/routes/wrap_route_with_prep.js b/src/legacy/ui/public/routes/wrap_route_with_prep.js
deleted file mode 100644
index e9ed33148d9acf..00000000000000
--- a/src/legacy/ui/public/routes/wrap_route_with_prep.js
+++ /dev/null
@@ -1,52 +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 angular from 'angular';
-import _ from 'lodash';
-import { createDefer } from 'ui/promises';
-import { WorkQueue } from './work_queue';
-
-export function wrapRouteWithPrep(route, setup) {
-  if (!route.resolve && route.redirectTo) return;
-
-  const userWork = new WorkQueue();
-  // the point at which we will consider the queue "full"
-  userWork.limit = _.keys(route.resolve).length;
-
-  const resolve = {
-    __prep__: function ($injector) {
-      return $injector.invoke(setup.doWork, setup, { userWork });
-    },
-  };
-
-  // send each user resolve to the userWork queue, which will prevent it from running before the
-  // prep is complete
-  _.forOwn(route.resolve || {}, function (expr, name) {
-    resolve[name] = function ($injector, Promise) {
-      const defer = createDefer(Promise);
-      userWork.push(defer);
-      return defer.promise.then(function () {
-        return $injector[angular.isString(expr) ? 'get' : 'invoke'](expr);
-      });
-    };
-  });
-
-  // we're copied everything over so now overwrite
-  route.resolve = resolve;
-}
diff --git a/src/legacy/ui/public/state_management/__tests__/app_state.js b/src/legacy/ui/public/state_management/__tests__/app_state.js
deleted file mode 100644
index c47fa3bb0417f4..00000000000000
--- a/src/legacy/ui/public/state_management/__tests__/app_state.js
+++ /dev/null
@@ -1,76 +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 ngMock from 'ng_mock';
-import { AppStateProvider } from '../app_state';
-
-describe('State Management', function () {
-  let $rootScope;
-  let AppState;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function (_$rootScope_, _$location_, Private) {
-      $rootScope = _$rootScope_;
-      AppState = Private(AppStateProvider);
-    })
-  );
-
-  describe('App State', function () {
-    let appState;
-
-    beforeEach(function () {
-      appState = new AppState();
-    });
-
-    it('should have _urlParam of _a', function () {
-      expect(appState).to.have.property('_urlParam');
-      expect(appState._urlParam).to.equal('_a');
-    });
-
-    it('should use passed in params', function () {
-      const params = {
-        test: true,
-        mock: false,
-      };
-
-      appState = new AppState(params);
-      expect(appState).to.have.property('_defaults');
-
-      Object.keys(params).forEach(function (key) {
-        expect(appState._defaults).to.have.property(key);
-        expect(appState._defaults[key]).to.equal(params[key]);
-      });
-    });
-
-    it('should have a destroy method', function () {
-      expect(appState).to.have.property('destroy');
-    });
-
-    it('should be destroyed on $routeChangeStart', function () {
-      const destroySpy = sinon.spy(appState, 'destroy');
-
-      $rootScope.$emit('$routeChangeStart');
-
-      expect(destroySpy.callCount).to.be(1);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/state_management/__tests__/config_provider.js b/src/legacy/ui/public/state_management/__tests__/config_provider.js
deleted file mode 100644
index 9f756bc51dcb0b..00000000000000
--- a/src/legacy/ui/public/state_management/__tests__/config_provider.js
+++ /dev/null
@@ -1,57 +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 ngMock from 'ng_mock';
-import '../config_provider';
-
-describe('State Management Config', function () {
-  let stateManagementConfig;
-
-  describe('is enabled', () => {
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(
-      ngMock.inject(function (_stateManagementConfig_) {
-        stateManagementConfig = _stateManagementConfig_;
-      })
-    );
-
-    it('should be enabled by default', () => {
-      expect(stateManagementConfig.enabled).to.be(true);
-    });
-  });
-
-  describe('can be disabled', () => {
-    beforeEach(
-      ngMock.module('kibana', function (stateManagementConfigProvider) {
-        stateManagementConfigProvider.disable();
-      })
-    );
-
-    beforeEach(
-      ngMock.inject(function (_stateManagementConfig_) {
-        stateManagementConfig = _stateManagementConfig_;
-      })
-    );
-
-    it('is disabled by config', () => {
-      expect(stateManagementConfig.enabled).to.be(false);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/state_management/__tests__/global_state.js b/src/legacy/ui/public/state_management/__tests__/global_state.js
deleted file mode 100644
index e9dae5880a8d13..00000000000000
--- a/src/legacy/ui/public/state_management/__tests__/global_state.js
+++ /dev/null
@@ -1,52 +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 ngMock from 'ng_mock';
-import '../global_state';
-
-describe('State Management', function () {
-  let $location;
-  let state;
-
-  beforeEach(ngMock.module('kibana'));
-  beforeEach(
-    ngMock.inject(function (_$location_, globalState) {
-      $location = _$location_;
-      state = globalState;
-    })
-  );
-
-  describe('Global State', function () {
-    it('should use previous state when not in URL', function () {
-      // set satte via URL
-      $location.search({ _g: '(foo:(bar:baz))' });
-      state.fetch();
-      expect(state.toObject()).to.eql({ foo: { bar: 'baz' } });
-
-      $location.search({ _g: '(fizz:buzz)' });
-      state.fetch();
-      expect(state.toObject()).to.eql({ fizz: 'buzz' });
-
-      $location.search({});
-      state.fetch();
-      expect(state.toObject()).to.eql({ fizz: 'buzz' });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/state_management/__tests__/state.js b/src/legacy/ui/public/state_management/__tests__/state.js
deleted file mode 100644
index b6c705e8145094..00000000000000
--- a/src/legacy/ui/public/state_management/__tests__/state.js
+++ /dev/null
@@ -1,393 +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 ngMock from 'ng_mock';
-import { encode as encodeRison } from 'rison-node';
-import uiRoutes from 'ui/routes';
-import '../../private';
-import { toastNotifications } from '../../notify';
-import * as FatalErrorNS from '../../notify/fatal_error';
-import { StateProvider } from '../state';
-import {
-  unhashQuery,
-  createStateHash,
-  isStateHash,
-  HashedItemStore,
-} from '../../../../../plugins/kibana_utils/public';
-import { StubBrowserStorage } from 'test_utils/stub_browser_storage';
-import { EventsProvider } from '../../events';
-
-describe('State Management', () => {
-  const sandbox = sinon.createSandbox();
-  afterEach(() => sandbox.restore());
-
-  uiRoutes.enable();
-
-  describe('Enabled', () => {
-    let $rootScope;
-    let $location;
-    let Events;
-    let setup;
-
-    beforeEach(ngMock.module('kibana'));
-    beforeEach(
-      ngMock.inject(function (_$rootScope_, _$location_, Private, config) {
-        const State = Private(StateProvider);
-        $location = _$location_;
-        $rootScope = _$rootScope_;
-        Events = Private(EventsProvider);
-
-        setup = (opts) => {
-          const { param, initial, storeInHash } = opts || {};
-          sinon.stub(config, 'get').withArgs('state:storeInSessionStorage').returns(!!storeInHash);
-          const store = new StubBrowserStorage();
-          const hashedItemStore = new HashedItemStore(store);
-          const state = new State(param, initial, hashedItemStore);
-
-          const getUnhashedSearch = () => unhashQuery($location.search());
-
-          return { store, hashedItemStore, state, getUnhashedSearch };
-        };
-      })
-    );
-
-    describe('Provider', () => {
-      it('should reset the state to the defaults', () => {
-        const { state, getUnhashedSearch } = setup({ initial: { message: ['test'] } });
-        state.reset();
-        const search = getUnhashedSearch(state);
-        expect(search).to.have.property('_s');
-        expect(search._s).to.equal('(message:!(test))');
-        expect(state.message).to.eql(['test']);
-      });
-
-      it('should apply the defaults upon initialization', () => {
-        const { state } = setup({ initial: { message: 'test' } });
-        expect(state).to.have.property('message', 'test');
-      });
-
-      it('should inherit from Events', () => {
-        const { state } = setup();
-        expect(state).to.be.an(Events);
-      });
-
-      it('should emit an event if reset with changes', (done) => {
-        const { state } = setup({ initial: { message: ['test'] } });
-        state.on('reset_with_changes', (keys) => {
-          expect(keys).to.eql(['message']);
-          done();
-        });
-        state.save();
-        state.message = 'foo';
-        state.reset();
-        $rootScope.$apply();
-      });
-
-      it('should not emit an event if reset without changes', () => {
-        const { state } = setup({ initial: { message: 'test' } });
-        state.on('reset_with_changes', () => {
-          expect().fail();
-        });
-        state.save();
-        state.message = 'test';
-        state.reset();
-        $rootScope.$apply();
-      });
-    });
-
-    describe('Search', () => {
-      it('should save to $location.search()', () => {
-        const { state, getUnhashedSearch } = setup({ initial: { test: 'foo' } });
-        state.save();
-        const search = getUnhashedSearch(state);
-        expect(search).to.have.property('_s');
-        expect(search._s).to.equal('(test:foo)');
-      });
-
-      it('should emit an event if changes are saved', (done) => {
-        const { state, getUnhashedSearch } = setup();
-        state.on('save_with_changes', (keys) => {
-          expect(keys).to.eql(['test']);
-          done();
-        });
-        state.test = 'foo';
-        state.save();
-        getUnhashedSearch(state);
-        $rootScope.$apply();
-      });
-    });
-
-    describe('Fetch', () => {
-      it('should emit an event if changes are fetched', (done) => {
-        const { state } = setup();
-        state.on('fetch_with_changes', (keys) => {
-          expect(keys).to.eql(['foo']);
-          done();
-        });
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        expect(state).to.have.property('foo', 'bar');
-        $rootScope.$apply();
-      });
-
-      it('should have events that attach to scope', (done) => {
-        const { state } = setup();
-        state.on('test', (message) => {
-          expect(message).to.equal('foo');
-          done();
-        });
-        state.emit('test', 'foo');
-        $rootScope.$apply();
-      });
-
-      it('should fire listeners for #onUpdate() on #fetch()', (done) => {
-        const { state } = setup();
-        state.on('fetch_with_changes', (keys) => {
-          expect(keys).to.eql(['foo']);
-          done();
-        });
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        expect(state).to.have.property('foo', 'bar');
-        $rootScope.$apply();
-      });
-
-      it('should apply defaults to fetches', () => {
-        const { state } = setup({ initial: { message: 'test' } });
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        expect(state).to.have.property('foo', 'bar');
-        expect(state).to.have.property('message', 'test');
-      });
-
-      it('should call fetch when $routeUpdate is fired on $rootScope', () => {
-        const { state } = setup();
-        const spy = sinon.spy(state, 'fetch');
-        $rootScope.$emit('$routeUpdate', 'test');
-        sinon.assert.calledOnce(spy);
-      });
-
-      it('should clear state when missing form URL', () => {
-        let stateObj;
-        const { state } = setup();
-
-        // set state via URL
-        $location.search({ _s: '(foo:(bar:baz))' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({ foo: { bar: 'baz' } });
-
-        // ensure changing URL changes state
-        $location.search({ _s: '(one:two)' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({ one: 'two' });
-
-        // remove search, state should be empty
-        $location.search({});
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({});
-      });
-
-      it('should clear state when it is invalid', () => {
-        let stateObj;
-        const { state } = setup();
-
-        $location.search({ _s: '' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({});
-
-        $location.search({ _s: '!n' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({});
-
-        $location.search({ _s: 'alert(1)' });
-        state.fetch();
-        stateObj = state.toObject();
-        expect(stateObj).to.eql({});
-      });
-
-      it('does not replace the state value on read', () => {
-        const { state } = setup();
-        sinon.stub($location, 'search').callsFake((newSearch) => {
-          if (newSearch) {
-            return $location;
-          } else {
-            return {
-              [state.getQueryParamName()]: '(a:1)',
-            };
-          }
-        });
-        const replaceStub = sinon.stub($location, 'replace').returns($location);
-
-        state.fetch();
-        sinon.assert.notCalled(replaceStub);
-      });
-    });
-
-    describe('Hashing', () => {
-      it('stores state values in a hashedItemStore, writing the hash to the url', () => {
-        const { state, hashedItemStore } = setup({ storeInHash: true });
-        state.foo = 'bar';
-        state.save();
-        const urlVal = $location.search()[state.getQueryParamName()];
-
-        expect(isStateHash(urlVal)).to.be(true);
-        expect(hashedItemStore.getItem(urlVal)).to.eql(JSON.stringify({ foo: 'bar' }));
-      });
-
-      it('should replace rison in the URL with a hash', () => {
-        const { state, hashedItemStore } = setup({ storeInHash: true });
-        const obj = { foo: { bar: 'baz' } };
-        const rison = encodeRison(obj);
-
-        $location.search({ _s: rison });
-        state.fetch();
-
-        const urlVal = $location.search()._s;
-        expect(urlVal).to.not.be(rison);
-        expect(isStateHash(urlVal)).to.be(true);
-        expect(hashedItemStore.getItem(urlVal)).to.eql(JSON.stringify(obj));
-      });
-
-      describe('error handling', () => {
-        it('notifies the user when a hash value does not map to a stored value', () => {
-          // Ideally, state.js shouldn't be tightly coupled to toastNotifications. Instead, it
-          // should notify its consumer of this error state and the consumer should be responsible
-          // for notifying the user of the error. This test verifies the side effect of the error
-          // until we can remove this coupling.
-
-          // Clear existing toasts.
-          toastNotifications.list.splice(0);
-
-          const { state } = setup({ storeInHash: true });
-          const search = $location.search();
-          const badHash = createStateHash('{"a": "b"}', () => null);
-
-          search[state.getQueryParamName()] = badHash;
-          $location.search(search);
-
-          expect(toastNotifications.list).to.have.length(0);
-          state.fetch();
-          expect(toastNotifications.list).to.have.length(1);
-          expect(toastNotifications.list[0].title).to.match(/use the share functionality/i);
-        });
-
-        it.skip('triggers fatal error linking to github when setting item fails', () => {
-          // NOTE: this test needs to be written in jest and removed from the browser ones
-          // More info could be read in the opened issue:
-          // https://github.com/elastic/kibana/issues/22751
-          const { state, hashedItemStore } = setup({ storeInHash: true });
-          const fatalErrorStub = sandbox.stub();
-          Object.defineProperty(FatalErrorNS, 'fatalError', {
-            writable: true,
-            value: fatalErrorStub,
-          });
-
-          sandbox.stub(hashedItemStore, 'setItem').returns(false);
-          state.toQueryParam();
-          sinon.assert.calledOnce(fatalErrorStub);
-          sinon.assert.calledWith(
-            fatalErrorStub,
-            sinon.match((error) => error instanceof Error && error.message.includes('github.com'))
-          );
-        });
-
-        it('translateHashToRison should gracefully fallback if parameter can not be parsed', () => {
-          const { state, hashedItemStore } = setup({ storeInHash: false });
-
-          expect(state.translateHashToRison('(a:b)')).to.be('(a:b)');
-          expect(state.translateHashToRison('')).to.be('');
-
-          const existingHash = createStateHash('{"a": "b"}', () => null);
-          hashedItemStore.setItem(existingHash, '{"a": "b"}');
-
-          const nonExistingHash = createStateHash('{"b": "c"}', () => null);
-
-          expect(state.translateHashToRison(existingHash)).to.be('(a:b)');
-          expect(state.translateHashToRison(nonExistingHash)).to.be('!n');
-        });
-      });
-    });
-  });
-
-  describe('Disabled with persisted state', () => {
-    let state;
-    let $location;
-    let $rootScope;
-    const stateParam = '_config_test';
-
-    const getLocationState = () => {
-      const search = $location.search();
-      return search[stateParam];
-    };
-
-    beforeEach(
-      ngMock.module('kibana', function (stateManagementConfigProvider) {
-        stateManagementConfigProvider.disable();
-      })
-    );
-    beforeEach(
-      ngMock.inject(function (_$rootScope_, _$location_, Private, config) {
-        const State = Private(StateProvider);
-        $location = _$location_;
-        $rootScope = _$rootScope_;
-
-        sinon.stub(config, 'get').withArgs('state:storeInSessionStorage').returns(false);
-
-        class MockPersistedState extends State {
-          _persistAcrossApps = true;
-        }
-
-        MockPersistedState.prototype._persistAcrossApps = true;
-
-        state = new MockPersistedState(stateParam);
-      })
-    );
-
-    describe('changing state', () => {
-      const methods = ['save', 'replace', 'reset'];
-
-      methods.forEach((method) => {
-        it(`${method} should not change the URL`, () => {
-          $location.search({ _s: '(foo:bar)' });
-          state[method]();
-          $rootScope.$apply();
-          expect(getLocationState()).to.be(undefined);
-        });
-      });
-    });
-
-    describe('reading state', () => {
-      it('should not change the URL', () => {
-        const saveSpy = sinon.spy(state, 'save');
-        $location.search({ _s: '(foo:bar)' });
-        state.fetch();
-        $rootScope.$apply();
-        sinon.assert.notCalled(saveSpy);
-        expect(getLocationState()).to.be(undefined);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js b/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js
deleted file mode 100644
index dc00d4e05e82f4..00000000000000
--- a/src/legacy/ui/public/state_management/__tests__/state_monitor_factory.js
+++ /dev/null
@@ -1,265 +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 sinon from 'sinon';
-import { EventEmitter } from 'events';
-import { cloneDeep } from 'lodash';
-import { stateMonitorFactory } from '../state_monitor_factory';
-
-describe('stateMonitorFactory', function () {
-  const noop = () => {};
-  const eventTypes = ['save_with_changes', 'reset_with_changes', 'fetch_with_changes'];
-
-  let mockState;
-
-  function setState(mockState, obj, emit = true) {
-    mockState.toJSON = () => cloneDeep(obj);
-    if (emit) mockState.emit(eventTypes[0]);
-  }
-
-  function createMockState(state = {}) {
-    const mockState = new EventEmitter();
-    setState(mockState, state, false);
-    return mockState;
-  }
-
-  beforeEach(() => {
-    mockState = createMockState({});
-  });
-
-  it('should have a create method', function () {
-    expect(stateMonitorFactory).to.have.property('create');
-    expect(stateMonitorFactory.create).to.be.a('function');
-  });
-
-  describe('factory creation', function () {
-    it('should not call onChange with only the state', function () {
-      const monitor = stateMonitorFactory.create(mockState);
-      const changeStub = sinon.stub();
-      monitor.onChange(changeStub);
-      sinon.assert.notCalled(changeStub);
-    });
-
-    it('should not call onChange with matching defaultState', function () {
-      const monitor = stateMonitorFactory.create(mockState, {});
-      const changeStub = sinon.stub();
-      monitor.onChange(changeStub);
-      sinon.assert.notCalled(changeStub);
-    });
-
-    it('should call onChange with differing defaultState', function () {
-      const monitor = stateMonitorFactory.create(mockState, { test: true });
-      const changeStub = sinon.stub();
-      monitor.onChange(changeStub);
-      sinon.assert.calledOnce(changeStub);
-    });
-  });
-
-  describe('instance', function () {
-    let monitor;
-
-    beforeEach(() => {
-      monitor = stateMonitorFactory.create(mockState);
-    });
-
-    describe('onChange', function () {
-      it('should throw if not given a handler function', function () {
-        const fn = () => monitor.onChange('not a function');
-        expect(fn).to.throwException(/must be a function/);
-      });
-
-      eventTypes.forEach((eventType) => {
-        describe(`when ${eventType} is emitted`, function () {
-          let handlerFn;
-
-          beforeEach(() => {
-            handlerFn = sinon.stub();
-            monitor.onChange(handlerFn);
-            sinon.assert.notCalled(handlerFn);
-          });
-
-          it('should get called', function () {
-            mockState.emit(eventType);
-            sinon.assert.calledOnce(handlerFn);
-          });
-
-          it('should be given the state status', function () {
-            mockState.emit(eventType);
-            const args = handlerFn.firstCall.args;
-            expect(args[0]).to.be.an('object');
-          });
-
-          it('should be given the event type', function () {
-            mockState.emit(eventType);
-            const args = handlerFn.firstCall.args;
-            expect(args[1]).to.equal(eventType);
-          });
-
-          it('should be given the changed keys', function () {
-            const keys = ['one', 'two', 'three'];
-            mockState.emit(eventType, keys);
-            const args = handlerFn.firstCall.args;
-            expect(args[2]).to.equal(keys);
-          });
-        });
-      });
-    });
-
-    describe('ignoreProps', function () {
-      it('should not set status to dirty when ignored properties change', function () {
-        let status;
-        const mockState = createMockState({ messages: { world: 'hello', foo: 'bar' } });
-        const monitor = stateMonitorFactory.create(mockState);
-        const changeStub = sinon.stub();
-        monitor.ignoreProps('messages.world');
-        monitor.onChange(changeStub);
-        sinon.assert.notCalled(changeStub);
-
-        // update the ignored state prop
-        setState(mockState, { messages: { world: 'howdy', foo: 'bar' } });
-        sinon.assert.calledOnce(changeStub);
-        status = changeStub.firstCall.args[0];
-        expect(status).to.have.property('clean', true);
-        expect(status).to.have.property('dirty', false);
-
-        // update a prop that is not ignored
-        setState(mockState, { messages: { world: 'howdy', foo: 'baz' } });
-        sinon.assert.calledTwice(changeStub);
-        status = changeStub.secondCall.args[0];
-        expect(status).to.have.property('clean', false);
-        expect(status).to.have.property('dirty', true);
-      });
-    });
-
-    describe('setInitialState', function () {
-      let changeStub;
-
-      beforeEach(() => {
-        changeStub = sinon.stub();
-        monitor.onChange(changeStub);
-        sinon.assert.notCalled(changeStub);
-      });
-
-      it('should throw if no state is provided', function () {
-        const fn = () => monitor.setInitialState();
-        expect(fn).to.throwException(/must be an object/);
-      });
-
-      it('should throw if given the wrong type', function () {
-        const fn = () => monitor.setInitialState([]);
-        expect(fn).to.throwException(/must be an object/);
-      });
-
-      it('should trigger the onChange handler', function () {
-        monitor.setInitialState({ new: 'state' });
-        sinon.assert.calledOnce(changeStub);
-      });
-
-      it('should change the status with differing state', function () {
-        monitor.setInitialState({ new: 'state' });
-        sinon.assert.calledOnce(changeStub);
-
-        const status = changeStub.firstCall.args[0];
-        expect(status).to.have.property('clean', false);
-        expect(status).to.have.property('dirty', true);
-      });
-
-      it('should not trigger the onChange handler without state change', function () {
-        monitor.setInitialState(cloneDeep(mockState.toJSON()));
-        sinon.assert.notCalled(changeStub);
-      });
-    });
-
-    describe('status object', function () {
-      let handlerFn;
-
-      beforeEach(() => {
-        handlerFn = sinon.stub();
-        monitor.onChange(handlerFn);
-      });
-
-      it('should be clean by default', function () {
-        mockState.emit(eventTypes[0]);
-        const status = handlerFn.firstCall.args[0];
-        expect(status).to.have.property('clean', true);
-        expect(status).to.have.property('dirty', false);
-      });
-
-      it('should be dirty when state changes', function () {
-        setState(mockState, { message: 'i am dirty now' });
-        const status = handlerFn.firstCall.args[0];
-        expect(status).to.have.property('clean', false);
-        expect(status).to.have.property('dirty', true);
-      });
-
-      it('should be clean when state is reset', function () {
-        const defaultState = { message: 'i am the original state' };
-        const handlerFn = sinon.stub();
-
-        let status;
-
-        // initial state and monitor setup
-        const mockState = createMockState(defaultState);
-        const monitor = stateMonitorFactory.create(mockState);
-        monitor.onChange(handlerFn);
-        sinon.assert.notCalled(handlerFn);
-
-        // change the state and emit an event
-        setState(mockState, { message: 'i am dirty now' });
-        sinon.assert.calledOnce(handlerFn);
-        status = handlerFn.firstCall.args[0];
-        expect(status).to.have.property('clean', false);
-        expect(status).to.have.property('dirty', true);
-
-        // reset the state and emit an event
-        setState(mockState, defaultState);
-        sinon.assert.calledTwice(handlerFn);
-        status = handlerFn.secondCall.args[0];
-        expect(status).to.have.property('clean', true);
-        expect(status).to.have.property('dirty', false);
-      });
-    });
-
-    describe('destroy', function () {
-      let stateSpy;
-
-      beforeEach(() => {
-        stateSpy = sinon.spy(mockState, 'off');
-        sinon.assert.notCalled(stateSpy);
-      });
-
-      it('should remove the listeners', function () {
-        monitor.onChange(noop);
-        monitor.destroy();
-        sinon.assert.callCount(stateSpy, eventTypes.length);
-        eventTypes.forEach((eventType) => {
-          sinon.assert.calledWith(stateSpy, eventType);
-        });
-      });
-
-      it('should stop the instance from being used any more', function () {
-        monitor.onChange(noop);
-        monitor.destroy();
-        const fn = () => monitor.onChange(noop);
-        expect(fn).to.throwException(/has been destroyed/);
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/state_management/app_state.d.ts b/src/legacy/ui/public/state_management/app_state.d.ts
deleted file mode 100644
index ddd0b907107665..00000000000000
--- a/src/legacy/ui/public/state_management/app_state.d.ts
+++ /dev/null
@@ -1,26 +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 { State } from './state';
-
-export class AppState extends State {}
-
-export type AppStateClass<
-  TAppState extends AppState = AppState,
-  TDefaults = { [key: string]: any }
-> = new (defaults: TDefaults) => TAppState;
diff --git a/src/legacy/ui/public/state_management/app_state.js b/src/legacy/ui/public/state_management/app_state.js
deleted file mode 100644
index ec680d163b9da6..00000000000000
--- a/src/legacy/ui/public/state_management/app_state.js
+++ /dev/null
@@ -1,137 +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.
- */
-
-/**
- * @name AppState
- *
- * @extends State
- *
- * @description Inherits State, which inherits Events. This class seems to be
- * concerned with mapping "props" to PersistedState instances, and surfacing the
- * ability to destroy those mappings.
- */
-
-import { uiModules } from '../modules';
-import { StateProvider } from './state';
-import { PersistedState } from '../../../../plugins/visualizations/public';
-import { createLegacyClass } from '../utils/legacy_class';
-
-const urlParam = '_a';
-
-export function AppStateProvider(Private, $location) {
-  const State = Private(StateProvider);
-
-  let persistedStates;
-  let eventUnsubscribers;
-
-  createLegacyClass(AppState).inherits(State);
-  function AppState(defaults) {
-    // Initialize persistedStates. This object maps "prop" names to
-    // PersistedState instances. These are used to make properties "stateful".
-    persistedStates = {};
-
-    // Initialize eventUnsubscribers. These will be called in `destroy`, to
-    // remove handlers for the 'change' and 'fetch_with_changes' events which
-    // are dispatched via the rootScope.
-    eventUnsubscribers = [];
-
-    AppState.Super.call(this, urlParam, defaults);
-    AppState.getAppState._set(this);
-  }
-
-  // if the url param is missing, write it back
-  AppState.prototype._persistAcrossApps = false;
-
-  AppState.prototype.destroy = function () {
-    AppState.Super.prototype.destroy.call(this);
-    AppState.getAppState._set(null);
-
-    eventUnsubscribers.forEach((listener) => listener());
-  };
-
-  /**
-   * @returns PersistedState instance.
-   */
-  AppState.prototype.makeStateful = function (prop) {
-    if (persistedStates[prop]) return persistedStates[prop];
-    const self = this;
-
-    // set up the ui state
-    persistedStates[prop] = new PersistedState();
-
-    // update the app state when the stateful instance changes
-    const updateOnChange = function () {
-      const replaceState = false; // TODO: debouncing logic
-      self[prop] = persistedStates[prop].getChanges();
-      // Save state to the URL.
-      self.save(replaceState);
-    };
-    const handlerOnChange = (method) => persistedStates[prop][method]('change', updateOnChange);
-    handlerOnChange('on');
-    eventUnsubscribers.push(() => handlerOnChange('off'));
-
-    // update the stateful object when the app state changes
-    const persistOnChange = function (changes) {
-      if (!changes) return;
-
-      if (changes.indexOf(prop) !== -1) {
-        persistedStates[prop].set(self[prop]);
-      }
-    };
-    const handlePersist = (method) => this[method]('fetch_with_changes', persistOnChange);
-    handlePersist('on');
-    eventUnsubscribers.push(() => handlePersist('off'));
-
-    // if the thing we're making stateful has an appState value, write to persisted state
-    if (self[prop]) persistedStates[prop].setSilent(self[prop]);
-
-    return persistedStates[prop];
-  };
-
-  AppState.getAppState = (function () {
-    let currentAppState;
-
-    function get() {
-      return currentAppState;
-    }
-
-    // Checks to see if the appState might already exist, even if it hasn't been newed up
-    get.previouslyStored = function () {
-      const search = $location.search();
-      return search[urlParam] ? true : false;
-    };
-
-    get._set = function (current) {
-      currentAppState = current;
-    };
-
-    return get;
-  })();
-
-  return AppState;
-}
-
-uiModules
-  .get('kibana/global_state')
-  .factory('AppState', function (Private) {
-    return Private(AppStateProvider);
-  })
-  .service('getAppState', function (Private) {
-    return Private(AppStateProvider).getAppState;
-  });
diff --git a/src/legacy/ui/public/state_management/config_provider.js b/src/legacy/ui/public/state_management/config_provider.js
deleted file mode 100644
index 68de449a57a56e..00000000000000
--- a/src/legacy/ui/public/state_management/config_provider.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.
- */
-
-/**
- * @name stateManagementConfig
- *
- * @description Allows apps to configure state management
- */
-
-import { uiModules } from '../modules';
-
-export class StateManagementConfigProvider {
-  _enabled = true;
-
-  $get(/* inject stuff */) {
-    return {
-      enabled: this._enabled,
-    };
-  }
-
-  disable() {
-    this._enabled = false;
-  }
-
-  enable() {
-    this._enabled = true;
-  }
-}
-
-uiModules
-  .get('kibana/state_management')
-  .provider('stateManagementConfig', StateManagementConfigProvider);
diff --git a/src/legacy/ui/public/state_management/global_state.d.ts b/src/legacy/ui/public/state_management/global_state.d.ts
deleted file mode 100644
index 66a85d88956c77..00000000000000
--- a/src/legacy/ui/public/state_management/global_state.d.ts
+++ /dev/null
@@ -1,22 +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 { State } from './state';
-
-export type GlobalState = State;
diff --git a/src/legacy/ui/public/state_management/global_state.js b/src/legacy/ui/public/state_management/global_state.js
deleted file mode 100644
index 0e8dfe40d5950b..00000000000000
--- a/src/legacy/ui/public/state_management/global_state.js
+++ /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 { StateProvider } from './state';
-import { uiModules } from '../modules';
-import { createLegacyClass } from '../utils/legacy_class';
-
-const module = uiModules.get('kibana/global_state');
-
-export function GlobalStateProvider(Private) {
-  const State = Private(StateProvider);
-
-  createLegacyClass(GlobalState).inherits(State);
-  function GlobalState(defaults) {
-    GlobalState.Super.call(this, '_g', defaults);
-  }
-
-  // if the url param is missing, write it back
-  GlobalState.prototype._persistAcrossApps = true;
-
-  return new GlobalState();
-}
-
-module.service('globalState', function (Private) {
-  return Private(GlobalStateProvider);
-});
diff --git a/src/legacy/ui/public/state_management/state.d.ts b/src/legacy/ui/public/state_management/state.d.ts
deleted file mode 100644
index b31862b681f55a..00000000000000
--- a/src/legacy/ui/public/state_management/state.d.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.
- */
-
-export class State {
-  [key: string]: any;
-  translateHashToRison: (stateHashOrRison: string | string[]) => string | string[];
-  getQueryParamName: () => string;
-}
diff --git a/src/legacy/ui/public/state_management/state.js b/src/legacy/ui/public/state_management/state.js
deleted file mode 100644
index d91834adb4a79e..00000000000000
--- a/src/legacy/ui/public/state_management/state.js
+++ /dev/null
@@ -1,359 +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.
- */
-
-/**
- * @name State
- *
- * @extends Events
- *
- * @description Persists generic "state" to and reads it from the URL.
- */
-
-import _ from 'lodash';
-import { i18n } from '@kbn/i18n';
-import angular from 'angular';
-import rison from 'rison-node';
-import { EventsProvider } from '../events';
-import { fatalError, toastNotifications } from '../notify';
-import './config_provider';
-import { createLegacyClass } from '../utils/legacy_class';
-import {
-  hashedItemStore,
-  isStateHash,
-  createStateHash,
-  applyDiff,
-} from '../../../../plugins/kibana_utils/public';
-
-export function StateProvider(
-  Private,
-  $rootScope,
-  $location,
-  stateManagementConfig,
-  config,
-  kbnUrl,
-  $injector
-) {
-  const Events = Private(EventsProvider);
-
-  const isDummyRoute = () =>
-    $injector.has('$route') &&
-    $injector.get('$route').current &&
-    $injector.get('$route').current.outerAngularWrapperRoute;
-
-  createLegacyClass(State).inherits(Events);
-  function State(urlParam, defaults, _hashedItemStore = hashedItemStore) {
-    State.Super.call(this);
-
-    this.setDefaults(defaults);
-    this._urlParam = urlParam || '_s';
-    this._hashedItemStore = _hashedItemStore;
-
-    // When the URL updates we need to fetch the values from the URL
-    this._cleanUpListeners = [
-      // partial route update, no app reload
-      $rootScope.$on('$routeUpdate', () => {
-        this.fetch();
-      }),
-
-      // beginning of full route update, new app will be initialized before
-      // $routeChangeSuccess or $routeChangeError
-      $rootScope.$on('$routeChangeStart', () => {
-        if (!this._persistAcrossApps) {
-          this.destroy();
-        }
-      }),
-
-      $rootScope.$on('$routeChangeSuccess', () => {
-        if (this._persistAcrossApps) {
-          this.fetch();
-        }
-      }),
-    ];
-
-    // Initialize the State with fetch
-    this.fetch();
-  }
-
-  State.prototype._readFromURL = function () {
-    const search = $location.search();
-    const urlVal = search[this._urlParam];
-
-    if (!urlVal) {
-      return null;
-    }
-
-    if (isStateHash(urlVal)) {
-      return this._parseStateHash(urlVal);
-    }
-
-    let risonEncoded;
-    let unableToParse;
-    try {
-      risonEncoded = rison.decode(urlVal);
-    } catch (e) {
-      unableToParse = true;
-    }
-
-    if (unableToParse) {
-      toastNotifications.addDanger(
-        i18n.translate('common.ui.stateManagement.unableToParseUrlErrorMessage', {
-          defaultMessage: 'Unable to parse URL',
-        })
-      );
-      search[this._urlParam] = this.toQueryParam(this._defaults);
-      $location.search(search).replace();
-    }
-
-    if (!risonEncoded) {
-      return null;
-    }
-
-    if (this.isHashingEnabled()) {
-      // RISON can find its way into the URL any number of ways, including the navbar links or
-      // shared urls with the entire state embedded. These values need to be translated into
-      // hashes and replaced in the browser history when state-hashing is enabled
-      search[this._urlParam] = this.toQueryParam(risonEncoded);
-      $location.search(search).replace();
-    }
-
-    return risonEncoded;
-  };
-
-  /**
-   * Fetches the state from the url
-   * @returns {void}
-   */
-  State.prototype.fetch = function () {
-    if (!stateManagementConfig.enabled) {
-      return;
-    }
-
-    let stash = this._readFromURL();
-
-    // nothing to read from the url? save if ordered to persist, but only if it's not on a wrapper route
-    if (stash === null) {
-      if (this._persistAcrossApps) {
-        return this.save();
-      } else {
-        stash = {};
-      }
-    }
-
-    _.defaults(stash, this._defaults);
-    // apply diff to state from stash, will change state in place via side effect
-    const diffResults = applyDiff(this, stash);
-
-    if (!isDummyRoute() && diffResults.keys.length) {
-      this.emit('fetch_with_changes', diffResults.keys);
-    }
-  };
-
-  /**
-   * Saves the state to the url
-   * @returns {void}
-   */
-  State.prototype.save = function (replace) {
-    if (!stateManagementConfig.enabled) {
-      return;
-    }
-
-    if (isDummyRoute()) {
-      return;
-    }
-
-    let stash = this._readFromURL();
-    const state = this.toObject();
-    replace = replace || false;
-
-    if (!stash) {
-      replace = true;
-      stash = {};
-    }
-
-    // apply diff to state from stash, will change state in place via side effect
-    const diffResults = applyDiff(stash, _.defaults({}, state, this._defaults));
-
-    if (diffResults.keys.length) {
-      this.emit('save_with_changes', diffResults.keys);
-    }
-
-    // persist the state in the URL
-    const search = $location.search();
-    search[this._urlParam] = this.toQueryParam(state);
-    if (replace) {
-      $location.search(search).replace();
-    } else {
-      $location.search(search);
-    }
-  };
-
-  /**
-   * Calls save with a forced replace
-   * @returns {void}
-   */
-  State.prototype.replace = function () {
-    if (!stateManagementConfig.enabled) {
-      return;
-    }
-
-    this.save(true);
-  };
-
-  /**
-   * Resets the state to the defaults
-   *
-   * @returns {void}
-   */
-  State.prototype.reset = function () {
-    if (!stateManagementConfig.enabled) {
-      return;
-    }
-
-    kbnUrl.removeParam(this.getQueryParamName());
-    // apply diff to attributes from defaults, this is side effecting so
-    // it will change the state in place.
-    const diffResults = applyDiff(this, this._defaults);
-    if (diffResults.keys.length) {
-      this.emit('reset_with_changes', diffResults.keys);
-    }
-    this.save();
-  };
-
-  /**
-   * Cleans up the state object
-   * @returns {void}
-   */
-  State.prototype.destroy = function () {
-    this.off(); // removes all listeners
-
-    // Removes the $routeUpdate listener
-    this._cleanUpListeners.forEach((listener) => listener(this));
-  };
-
-  State.prototype.setDefaults = function (defaults) {
-    this._defaults = defaults || {};
-  };
-
-  /**
-   *  Parse the state hash to it's unserialized value. Hashes are restored
-   *  to their pre-hashed state.
-   *
-   *  @param  {string} stateHash - state hash value from the query string.
-   *  @return {any} - the stored value, or null if hash does not resolve.
-   */
-  State.prototype._parseStateHash = function (stateHash) {
-    const json = this._hashedItemStore.getItem(stateHash);
-    if (json === null) {
-      toastNotifications.addDanger(
-        i18n.translate('common.ui.stateManagement.unableToRestoreUrlErrorMessage', {
-          defaultMessage:
-            'Unable to completely restore the URL, be sure to use the share functionality.',
-        })
-      );
-    }
-
-    return JSON.parse(json);
-  };
-
-  /**
-   *  Lookup the value for a hash and return it's value in rison format or just
-   *  return passed argument if it's not recognized as state hash.
-   *
-   *  @param  {string} stateHashOrRison - either state hash value or rison string.
-   *  @return {string} rison
-   */
-  State.prototype.translateHashToRison = function (stateHashOrRison) {
-    if (isStateHash(stateHashOrRison)) {
-      return rison.encode(this._parseStateHash(stateHashOrRison));
-    }
-
-    return stateHashOrRison;
-  };
-
-  State.prototype.isHashingEnabled = function () {
-    return !!config.get('state:storeInSessionStorage');
-  };
-
-  /**
-   *  Produce the hash version of the state in it's current position
-   *
-   *  @return {string}
-   */
-  State.prototype.toQueryParam = function (state = this.toObject()) {
-    if (!this.isHashingEnabled()) {
-      return rison.encode(state);
-    }
-
-    // We need to strip out Angular-specific properties.
-    const json = angular.toJson(state);
-    const hash = createStateHash(json);
-    const isItemSet = this._hashedItemStore.setItem(hash, json);
-
-    if (isItemSet) {
-      return hash;
-    }
-
-    // If we ran out of space trying to persist the state, notify the user.
-    const message = i18n.translate(
-      'common.ui.stateManagement.unableToStoreHistoryInSessionErrorMessage',
-      {
-        defaultMessage:
-          'Kibana is unable to store history items in your session ' +
-          `because it is full and there don't seem to be items any items safe ` +
-          'to delete.\n\n' +
-          'This can usually be fixed by moving to a fresh tab, but could ' +
-          'be caused by a larger issue. If you are seeing this message regularly, ' +
-          'please file an issue at {gitHubIssuesUrl}.',
-        values: { gitHubIssuesUrl: 'https://github.com/elastic/kibana/issues' },
-      }
-    );
-    fatalError(new Error(message));
-  };
-
-  /**
-   *  Get the query string parameter name where this state writes and reads
-   *  @return {string}
-   */
-  State.prototype.getQueryParamName = function () {
-    return this._urlParam;
-  };
-
-  /**
-   * Returns an object with each property name and value corresponding to the entries in this collection
-   * excluding fields started from '$', '_' and all methods
-   *
-   * @return {object}
-   */
-  State.prototype.toObject = function () {
-    return _.omitBy(this, (value, key) => {
-      return key.charAt(0) === '$' || key.charAt(0) === '_' || _.isFunction(value);
-    });
-  };
-
-  /** Alias for method 'toObject'
-   *
-   * @obsolete Please use 'toObject' method instead
-   * @return {object}
-   */
-  State.prototype.toJSON = function () {
-    return this.toObject();
-  };
-
-  return State;
-}
diff --git a/src/legacy/ui/public/state_management/state_monitor_factory.ts b/src/legacy/ui/public/state_management/state_monitor_factory.ts
deleted file mode 100644
index 968ececfe3be5d..00000000000000
--- a/src/legacy/ui/public/state_management/state_monitor_factory.ts
+++ /dev/null
@@ -1,157 +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 { set } from '@elastic/safer-lodash-set';
-import { cloneDeep, isEqual, isPlainObject } from 'lodash';
-import { State } from './state';
-
-export const stateMonitorFactory = {
-  create: <TStateDefault extends { [key: string]: unknown }>(
-    state: State,
-    customInitialState: TStateDefault
-  ) => stateMonitor<TStateDefault>(state, customInitialState),
-};
-
-interface StateStatus {
-  clean: boolean;
-  dirty: boolean;
-}
-
-export interface StateMonitor<TStateDefault extends { [key: string]: unknown }> {
-  setInitialState: (innerCustomInitialState: TStateDefault) => void;
-  ignoreProps: (props: string[] | string) => void;
-  onChange: (callback: ChangeHandlerFn) => StateMonitor<TStateDefault>;
-  destroy: () => void;
-}
-
-type ChangeHandlerFn = (status: StateStatus, type: string | null, keys: string[]) => void;
-
-function stateMonitor<TStateDefault extends { [key: string]: unknown }>(
-  state: State,
-  customInitialState: TStateDefault
-): StateMonitor<TStateDefault> {
-  let destroyed = false;
-  let ignoredProps: string[] = [];
-  let changeHandlers: ChangeHandlerFn[] | undefined = [];
-  let initialState: TStateDefault;
-
-  setInitialState(customInitialState);
-
-  function setInitialState(innerCustomInitialState: TStateDefault) {
-    // state.toJSON returns a reference, clone so we can mutate it safely
-    initialState = cloneDeep(innerCustomInitialState) || cloneDeep(state.toJSON());
-  }
-
-  function removeIgnoredProps(innerState: TStateDefault) {
-    ignoredProps.forEach((path) => {
-      set(innerState, path, true);
-    });
-    return innerState;
-  }
-
-  function getStatus(): StateStatus {
-    // state.toJSON returns a reference, clone so we can mutate it safely
-    const currentState = removeIgnoredProps(cloneDeep(state.toJSON()));
-    const isClean = isEqual(currentState, initialState);
-
-    return {
-      clean: isClean,
-      dirty: !isClean,
-    };
-  }
-
-  function dispatchChange(type: string | null = null, keys: string[] = []) {
-    const status = getStatus();
-    if (!changeHandlers) {
-      throw new Error('Change handlers is undefined, this object has been destroyed');
-    }
-    changeHandlers.forEach((changeHandler) => {
-      changeHandler(status, type, keys);
-    });
-  }
-
-  function dispatchFetch(keys: string[]) {
-    dispatchChange('fetch_with_changes', keys);
-  }
-
-  function dispatchSave(keys: string[]) {
-    dispatchChange('save_with_changes', keys);
-  }
-
-  function dispatchReset(keys: string[]) {
-    dispatchChange('reset_with_changes', keys);
-  }
-
-  return {
-    setInitialState(innerCustomInitialState: TStateDefault) {
-      if (!isPlainObject(innerCustomInitialState)) {
-        throw new TypeError('The default state must be an object');
-      }
-
-      // check the current status
-      const previousStatus = getStatus();
-
-      // update the initialState and apply ignoredProps
-      setInitialState(innerCustomInitialState);
-      removeIgnoredProps(initialState);
-
-      // fire the change handler if the status has changed
-      if (!isEqual(previousStatus, getStatus())) {
-        dispatchChange();
-      }
-    },
-
-    ignoreProps(props: string[] | string) {
-      ignoredProps = ignoredProps.concat(props);
-      removeIgnoredProps(initialState);
-      return this;
-    },
-
-    onChange(callback: ChangeHandlerFn) {
-      if (destroyed || !changeHandlers) {
-        throw new Error('Monitor has been destroyed');
-      }
-      if (typeof callback !== 'function') {
-        throw new Error('onChange handler must be a function');
-      }
-
-      changeHandlers.push(callback);
-
-      // Listen for state events.
-      state.on('fetch_with_changes', dispatchFetch);
-      state.on('save_with_changes', dispatchSave);
-      state.on('reset_with_changes', dispatchReset);
-
-      // if the state is already dirty, fire the change handler immediately
-      const status = getStatus();
-      if (status.dirty) {
-        dispatchChange();
-      }
-
-      return this;
-    },
-
-    destroy() {
-      destroyed = true;
-      changeHandlers = undefined;
-      state.off('fetch_with_changes', dispatchFetch);
-      state.off('save_with_changes', dispatchSave);
-      state.off('reset_with_changes', dispatchReset);
-    },
-  };
-}
diff --git a/src/legacy/ui/public/system_api/__tests__/system_api.js b/src/legacy/ui/public/system_api/__tests__/system_api.js
deleted file mode 100644
index 816024f13f8b25..00000000000000
--- a/src/legacy/ui/public/system_api/__tests__/system_api.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 expect from '@kbn/expect';
-import {
-  addSystemApiHeader,
-  isSystemApiRequest,
-} from '../../../../../plugins/kibana_legacy/public';
-
-describe('system_api', () => {
-  describe('#addSystemApiHeader', () => {
-    it('adds the correct system API header', () => {
-      const headers = {
-        'kbn-version': '4.6.0',
-      };
-      const newHeaders = addSystemApiHeader(headers);
-
-      expect(newHeaders).to.have.property('kbn-system-request');
-      expect(newHeaders['kbn-system-request']).to.be(true);
-
-      expect(newHeaders).to.have.property('kbn-version');
-      expect(newHeaders['kbn-version']).to.be('4.6.0');
-    });
-  });
-
-  describe('#isSystemApiRequest', () => {
-    it('returns true for a system HTTP request', () => {
-      const mockRequest = {
-        headers: {
-          'kbn-system-request': true,
-        },
-      };
-      expect(isSystemApiRequest(mockRequest)).to.be(true);
-    });
-
-    it('returns true for a legacy system API HTTP request', () => {
-      const mockRequest = {
-        headers: {
-          'kbn-system-api': true,
-        },
-      };
-      expect(isSystemApiRequest(mockRequest)).to.be(true);
-    });
-
-    it('returns false for a non-system API HTTP request', () => {
-      const mockRequest = {
-        headers: {},
-      };
-      expect(isSystemApiRequest(mockRequest)).to.be(false);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/system_api/index.js b/src/legacy/ui/public/system_api/index.js
deleted file mode 100644
index 6361c0ea6c69ad..00000000000000
--- a/src/legacy/ui/public/system_api/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 { addSystemApiHeader, isSystemApiRequest } from '../../../../plugins/kibana_legacy/public';
diff --git a/src/legacy/ui/public/timefilter/index.ts b/src/legacy/ui/public/timefilter/index.ts
deleted file mode 100644
index 83795c73112be1..00000000000000
--- a/src/legacy/ui/public/timefilter/index.ts
+++ /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.
- */
-
-import uiRoutes from 'ui/routes';
-import { npStart } from 'ui/new_platform';
-
-import { TimefilterContract, TimeHistoryContract } from '../../../../plugins/data/public';
-import { registerTimefilterWithGlobalState } from './setup_router';
-
-export {
-  getTime,
-  InputTimeRange,
-  TimeHistoryContract,
-  TimefilterContract,
-} from '../../../../plugins/data/public';
-export type Timefilter = TimefilterContract;
-export type TimeHistory = TimeHistoryContract;
-export const timeHistory = npStart.plugins.data.query.timefilter.history;
-export const timefilter = npStart.plugins.data.query.timefilter.timefilter;
-
-uiRoutes.addSetupWork((globalState, $rootScope) => {
-  return registerTimefilterWithGlobalState(timefilter, globalState, $rootScope);
-});
diff --git a/src/legacy/ui/public/timefilter/setup_router.test.js b/src/legacy/ui/public/timefilter/setup_router.test.js
deleted file mode 100644
index 2ae9a053ae2db1..00000000000000
--- a/src/legacy/ui/public/timefilter/setup_router.test.js
+++ /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 { registerTimefilterWithGlobalState } from './setup_router';
-
-jest.mock('../../../../plugins/kibana_legacy/public', () => ({
-  subscribeWithScope: jest.fn(),
-}));
-
-describe('registerTimefilterWithGlobalState()', () => {
-  it('should always use iso8601 strings', async () => {
-    const setTime = jest.fn();
-    const timefilter = {
-      setTime,
-      setRefreshInterval: jest.fn(),
-      getRefreshIntervalUpdate$: jest.fn(),
-      getTimeUpdate$: jest.fn(),
-    };
-
-    const globalState = {
-      time: {
-        from: '2017-09-07T20:12:04.011Z',
-        to: '2017-09-07T20:18:55.733Z',
-      },
-      on: (eventName, callback) => {
-        callback();
-      },
-    };
-
-    const rootScope = {
-      $on: jest.fn(),
-    };
-
-    registerTimefilterWithGlobalState(timefilter, globalState, rootScope);
-
-    expect(setTime.mock.calls.length).toBe(2);
-    expect(setTime.mock.calls[1][0]).toEqual(globalState.time);
-  });
-});
diff --git a/src/legacy/ui/public/timefilter/setup_router.ts b/src/legacy/ui/public/timefilter/setup_router.ts
deleted file mode 100644
index 7c25c6aa3166e3..00000000000000
--- a/src/legacy/ui/public/timefilter/setup_router.ts
+++ /dev/null
@@ -1,118 +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 _ from 'lodash';
-import { IScope } from 'angular';
-import moment from 'moment';
-import chrome from 'ui/chrome';
-import { Subscription } from 'rxjs';
-import { fatalError } from 'ui/notify/fatal_error';
-import { subscribeWithScope } from '../../../../plugins/kibana_legacy/public';
-import {
-  RefreshInterval,
-  TimeRange,
-  TimefilterContract,
-  UI_SETTINGS,
-} from '../../../../plugins/data/public';
-
-// TODO
-// remove everything underneath once globalState is no longer an angular service
-// and listener can be registered without angular.
-function convertISO8601(stringTime: string): string {
-  const obj = moment(stringTime, 'YYYY-MM-DDTHH:mm:ss.SSSZ', true);
-  return obj.isValid() ? obj.toISOString() : stringTime;
-}
-
-export function getTimefilterConfig() {
-  const settings = chrome.getUiSettingsClient();
-  return {
-    timeDefaults: settings.get('timepicker:timeDefaults'),
-    refreshIntervalDefaults: settings.get(UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS),
-  };
-}
-
-export const registerTimefilterWithGlobalStateFactory = (
-  timefilter: TimefilterContract,
-  globalState: any,
-  $rootScope: IScope
-) => {
-  // settings have to be re-fetched here, to make sure that settings changed by overrideLocalDefault are taken into account.
-  const config = getTimefilterConfig();
-  timefilter.setTime(_.defaults(globalState.time || {}, config.timeDefaults));
-  timefilter.setRefreshInterval(
-    _.defaults(globalState.refreshInterval || {}, config.refreshIntervalDefaults)
-  );
-
-  globalState.on('fetch_with_changes', () => {
-    // clone and default to {} in one
-    const newTime: TimeRange = _.defaults({}, globalState.time, config.timeDefaults);
-    const newRefreshInterval: RefreshInterval = _.defaults(
-      {},
-      globalState.refreshInterval,
-      config.refreshIntervalDefaults
-    );
-
-    if (newTime) {
-      if (newTime.to) newTime.to = convertISO8601(newTime.to);
-      if (newTime.from) newTime.from = convertISO8601(newTime.from);
-    }
-
-    timefilter.setTime(newTime);
-    timefilter.setRefreshInterval(newRefreshInterval);
-  });
-
-  const updateGlobalStateWithTime = () => {
-    globalState.time = timefilter.getTime();
-    globalState.refreshInterval = timefilter.getRefreshInterval();
-    globalState.save();
-  };
-
-  const subscriptions = new Subscription();
-  subscriptions.add(
-    subscribeWithScope(
-      $rootScope,
-      timefilter.getRefreshIntervalUpdate$(),
-      {
-        next: updateGlobalStateWithTime,
-      },
-      fatalError
-    )
-  );
-
-  subscriptions.add(
-    subscribeWithScope(
-      $rootScope,
-      timefilter.getTimeUpdate$(),
-      {
-        next: updateGlobalStateWithTime,
-      },
-      fatalError
-    )
-  );
-
-  $rootScope.$on('$destroy', () => {
-    subscriptions.unsubscribe();
-  });
-};
-
-// Currently some parts of Kibana (index patterns, timefilter) rely on addSetupWork in the uiRouter
-// and require it to be executed to properly function.
-// This function is exposed for applications that do not use uiRoutes like APM
-// Kibana issue https://github.com/elastic/kibana/issues/19110 tracks the removal of this dependency on uiRouter
-export const registerTimefilterWithGlobalState = _.once(registerTimefilterWithGlobalStateFactory);
diff --git a/src/legacy/ui/public/url/__tests__/extract_app_path_and_id.js b/src/legacy/ui/public/url/__tests__/extract_app_path_and_id.js
deleted file mode 100644
index 965e8f4bc9f383..00000000000000
--- a/src/legacy/ui/public/url/__tests__/extract_app_path_and_id.js
+++ /dev/null
@@ -1,122 +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 { extractAppPathAndId } from '../extract_app_path_and_id';
-
-describe('extractAppPathAndId', function () {
-  describe('from an absolute url with a base path', function () {
-    describe('with a base path', function () {
-      const basePath = '/gza';
-      const absoluteUrl = 'http://www.test.com:5601/gza/app/appId#appPathIsHere?query=here';
-      it('extracts app path', function () {
-        expect(extractAppPathAndId(absoluteUrl, basePath).appPath).to.be(
-          'appPathIsHere?query=here'
-        );
-      });
-
-      it('extracts app id', function () {
-        expect(extractAppPathAndId(absoluteUrl, basePath).appId).to.be('appId');
-      });
-
-      it('returns an empty object when there is no app path', function () {
-        const appPathAndId = extractAppPathAndId('http://www.test.com:5601/gza/noapppath');
-        expect(appPathAndId.appId).to.be(undefined);
-        expect(appPathAndId.appPath).to.be(undefined);
-      });
-    });
-
-    describe('without a base path', function () {
-      const absoluteUrl = 'http://www.test.com:5601/app/appId#appPathIsHere?query=here';
-      it('extracts app path', function () {
-        expect(extractAppPathAndId(absoluteUrl).appPath).to.be('appPathIsHere?query=here');
-      });
-
-      it('extracts app id', function () {
-        expect(extractAppPathAndId(absoluteUrl).appId).to.be('appId');
-      });
-
-      it('returns an empty object when there is no app path', function () {
-        const appPathAndId = extractAppPathAndId('http://www.test.com:5601/noapppath');
-        expect(appPathAndId.appId).to.be(undefined);
-        expect(appPathAndId.appPath).to.be(undefined);
-      });
-    });
-
-    describe('when appPath is empty', function () {
-      const absoluteUrl = 'http://www.test.com:5601/app/appId';
-      it('extracts app id', function () {
-        expect(extractAppPathAndId(absoluteUrl).appId).to.be('appId');
-      });
-      it('extracts empty appPath', function () {
-        expect(extractAppPathAndId(absoluteUrl).appPath).to.be('');
-      });
-    });
-  });
-
-  describe('from a root relative url', function () {
-    describe('with a base path', function () {
-      const basePath = '/gza';
-      const rootRelativePath = '/gza/app/appId#appPathIsHere?query=here';
-      it('extracts app path', function () {
-        expect(extractAppPathAndId(rootRelativePath, basePath).appPath).to.be(
-          'appPathIsHere?query=here'
-        );
-      });
-
-      it('extracts app id', function () {
-        expect(extractAppPathAndId(rootRelativePath, basePath).appId).to.be('appId');
-      });
-
-      it('returns an empty object when there is no app path', function () {
-        const appPathAndId = extractAppPathAndId('/gza/notformattedright');
-        expect(appPathAndId.appId).to.be(undefined);
-        expect(appPathAndId.appPath).to.be(undefined);
-      });
-    });
-
-    describe('without a base path', function () {
-      const rootRelativePath = '/app/appId#appPathIsHere?query=here';
-      it('extracts app path', function () {
-        expect(extractAppPathAndId(rootRelativePath).appPath).to.be('appPathIsHere?query=here');
-      });
-
-      it('extracts app id', function () {
-        expect(extractAppPathAndId(rootRelativePath).appId).to.be('appId');
-      });
-
-      it('returns an empty object when there is no app path', function () {
-        const appPathAndId = extractAppPathAndId('/notformattedright');
-        expect(appPathAndId.appId).to.be(undefined);
-        expect(appPathAndId.appPath).to.be(undefined);
-      });
-    });
-
-    describe('when appPath is empty', function () {
-      const rootRelativePath = '/app/appId';
-      it('extracts app id', function () {
-        expect(extractAppPathAndId(rootRelativePath).appId).to.be('appId');
-      });
-      it('extracts empty appPath', function () {
-        expect(extractAppPathAndId(rootRelativePath).appPath).to.be('');
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/url/__tests__/kibana_parsed_url.js b/src/legacy/ui/public/url/__tests__/kibana_parsed_url.js
deleted file mode 100644
index 6ea199c3d22cc1..00000000000000
--- a/src/legacy/ui/public/url/__tests__/kibana_parsed_url.js
+++ /dev/null
@@ -1,217 +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 { KibanaParsedUrl } from '../kibana_parsed_url';
-
-describe('KibanaParsedUrl', function () {
-  it('getHashedAppPath', function () {
-    const kibanaParsedUrl = new KibanaParsedUrl({
-      basePath: '/hi',
-      appId: 'bye',
-      appPath: 'visualize?hi=there&bye',
-    });
-    expect(kibanaParsedUrl.getHashedAppPath()).to.be('#visualize?hi=there&bye');
-  });
-
-  it('getAppRootPath', function () {
-    const kibanaParsedUrl = new KibanaParsedUrl({
-      basePath: '/hi',
-      appId: 'appId',
-      appPath: 'dashboard?edit=123',
-    });
-    expect(kibanaParsedUrl.getAppRootPath()).to.be('/app/appId#dashboard?edit=123');
-  });
-
-  describe('when basePath is specified', function () {
-    it('getRootRelativePath', function () {
-      const kibanaParsedUrl = new KibanaParsedUrl({
-        basePath: '/base',
-        appId: 'appId',
-        appPath: 'visualize?hi=there&bye',
-      });
-      expect(kibanaParsedUrl.getRootRelativePath()).to.be('/base/app/appId#visualize?hi=there&bye');
-    });
-
-    describe('getAbsolutePath', function () {
-      const protocol = 'http';
-      const hostname = 'www.test.com';
-      const port = '5601';
-
-      it('returns the absolute url when there is a port', function () {
-        const kibanaParsedUrl = new KibanaParsedUrl({
-          basePath: '/base',
-          appId: 'appId',
-          appPath: 'visualize?hi=there&bye',
-          hostname,
-          protocol,
-          port,
-        });
-        expect(kibanaParsedUrl.getAbsoluteUrl()).to.be(
-          'http://www.test.com:5601/base/app/appId#visualize?hi=there&bye'
-        );
-      });
-
-      it('returns the absolute url when there are no query parameters', function () {
-        const kibanaParsedUrl = new KibanaParsedUrl({
-          basePath: '/base',
-          appId: 'appId',
-          appPath: 'visualize',
-          hostname,
-          protocol,
-        });
-        expect(kibanaParsedUrl.getAbsoluteUrl()).to.be(
-          'http://www.test.com/base/app/appId#visualize'
-        );
-      });
-
-      it('returns the absolute url when the are query parameters', function () {
-        const kibanaParsedUrl = new KibanaParsedUrl({
-          basePath: '/base',
-          appId: 'appId',
-          appPath: 'visualize?hi=bye&tata',
-          hostname,
-          protocol,
-        });
-        expect(kibanaParsedUrl.getAbsoluteUrl()).to.be(
-          'http://www.test.com/base/app/appId#visualize?hi=bye&tata'
-        );
-      });
-    });
-  });
-
-  describe('when basePath is not specified', function () {
-    it('getRootRelativePath', function () {
-      const kibanaParsedUrl = new KibanaParsedUrl({
-        appId: 'appId',
-        appPath: 'visualize?hi=there&bye',
-      });
-      expect(kibanaParsedUrl.getRootRelativePath()).to.be('/app/appId#visualize?hi=there&bye');
-    });
-
-    describe('getAbsolutePath', function () {
-      const protocol = 'http';
-      const hostname = 'www.test.com';
-      const port = '5601';
-
-      it('returns the absolute url when there is a port', function () {
-        const kibanaParsedUrl = new KibanaParsedUrl({
-          appId: 'appId',
-          appPath: 'visualize?hi=there&bye',
-          hostname,
-          protocol,
-          port,
-        });
-        expect(kibanaParsedUrl.getAbsoluteUrl()).to.be(
-          'http://www.test.com:5601/app/appId#visualize?hi=there&bye'
-        );
-      });
-
-      it('returns the absolute url when there are no query parameters', function () {
-        const kibanaParsedUrl = new KibanaParsedUrl({
-          appId: 'appId',
-          appPath: 'visualize',
-          hostname,
-          protocol,
-        });
-        expect(kibanaParsedUrl.getAbsoluteUrl()).to.be('http://www.test.com/app/appId#visualize');
-      });
-
-      it('returns the absolute url when there are query parameters', function () {
-        const kibanaParsedUrl = new KibanaParsedUrl({
-          appId: 'appId',
-          appPath: 'visualize?hi=bye&tata',
-          hostname,
-          protocol,
-        });
-        expect(kibanaParsedUrl.getAbsoluteUrl()).to.be(
-          'http://www.test.com/app/appId#visualize?hi=bye&tata'
-        );
-      });
-    });
-  });
-
-  describe('getGlobalState', function () {
-    const basePath = '/xyz';
-    const appId = 'myApp';
-
-    it('returns an empty string when the KibanaParsedUrl is in an invalid state', function () {
-      const url = new KibanaParsedUrl({ basePath });
-      expect(url.getGlobalState()).to.be('');
-    });
-
-    it('returns an empty string when there is no global state', function () {
-      const url = new KibanaParsedUrl({ basePath, appId, appPath: '/hi?notg=something' });
-      expect(url.getGlobalState()).to.be('');
-    });
-
-    it('returns the global state when it is the last parameter', function () {
-      const url = new KibanaParsedUrl({
-        basePath,
-        appId,
-        appPath: '/hi?notg=something&_g=(thisismyglobalstate)',
-      });
-      expect(url.getGlobalState()).to.be('(thisismyglobalstate)');
-    });
-
-    it('returns the global state when it is the first parameter', function () {
-      const url = new KibanaParsedUrl({
-        basePath,
-        appId,
-        appPath: '/hi?_g=(thisismyglobalstate)&hi=bye',
-      });
-      expect(url.getGlobalState()).to.be('(thisismyglobalstate)');
-    });
-  });
-
-  describe('setGlobalState', function () {
-    const basePath = '/xyz';
-    const appId = 'myApp';
-
-    it('does nothing when KibanaParsedUrl is in an invalid state', function () {
-      const url = new KibanaParsedUrl({ basePath });
-      url.setGlobalState('newglobalstate');
-      expect(url.getGlobalState()).to.be('');
-    });
-
-    it('clears the global state when setting it to an empty string', function () {
-      const url = new KibanaParsedUrl({ basePath, appId, appPath: '/hi?_g=globalstate' });
-      url.setGlobalState('');
-      expect(url.getGlobalState()).to.be('');
-    });
-
-    it('updates the global state when a string is passed in', function () {
-      const url = new KibanaParsedUrl({
-        basePath,
-        appId,
-        appPath: '/hi?notg=something&_g=oldstate',
-      });
-      url.setGlobalState('newstate');
-      expect(url.getGlobalState()).to.be('newstate');
-    });
-
-    it('adds the global state parameters if it did not exist before', function () {
-      const url = new KibanaParsedUrl({ basePath, appId, appPath: '/hi' });
-      url.setGlobalState('newstate');
-      expect(url.getGlobalState()).to.be('newstate');
-      expect(url.appPath).to.be('/hi?_g=newstate');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/url/__tests__/prepend_path.js b/src/legacy/ui/public/url/__tests__/prepend_path.js
deleted file mode 100644
index 36991b77553e40..00000000000000
--- a/src/legacy/ui/public/url/__tests__/prepend_path.js
+++ /dev/null
@@ -1,80 +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 { prependPath } from '../prepend_path';
-
-describe('url prependPath', function () {
-  describe('returns the relative path unchanged', function () {
-    it('if it is null', function () {
-      expect(prependPath(null, 'kittens')).to.be(null);
-    });
-
-    it('if it is undefined', function () {
-      expect(prependPath(undefined, 'kittens')).to.be(undefined);
-    });
-
-    it('if it is an absolute url', function () {
-      expect(prependPath('http://www.hithere.com/howareyou', 'welcome')).to.be(
-        'http://www.hithere.com/howareyou'
-      );
-    });
-
-    it('if it does not start with a /', function () {
-      expect(prependPath('are/so/cool', 'cats')).to.be('are/so/cool');
-    });
-
-    it('when new path is empty', function () {
-      expect(prependPath('/are/so/cool', '')).to.be('/are/so/cool');
-    });
-
-    it('when it is only a slash and new path is empty', function () {
-      expect(prependPath('/', '')).to.be('/');
-    });
-  });
-
-  describe('returns an updated relative path', function () {
-    it('when it starts with a slash', function () {
-      expect(prependPath('/are/so/cool', 'dinosaurs')).to.be('dinosaurs/are/so/cool');
-    });
-
-    it('when new path starts with a slash', function () {
-      expect(prependPath('/are/so/cool', '/fish')).to.be('/fish/are/so/cool');
-    });
-
-    it('with two slashes if new path is a slash', function () {
-      expect(prependPath('/are/so/cool', '/')).to.be('//are/so/cool');
-    });
-
-    it('when there is a slash on the end', function () {
-      expect(prependPath('/are/delicious/', 'lollipops')).to.be('lollipops/are/delicious/');
-    });
-
-    it('when pathname that ends with a file', function () {
-      expect(prependPath('/are/delicious/index.html', 'donuts')).to.be(
-        'donuts/are/delicious/index.html'
-      );
-    });
-
-    it('when it is only a slash', function () {
-      expect(prependPath('/', 'kittens')).to.be('kittens/');
-    });
-  });
-});
diff --git a/src/legacy/ui/public/url/__tests__/url.js b/src/legacy/ui/public/url/__tests__/url.js
deleted file mode 100644
index 8b173482e1bb4d..00000000000000
--- a/src/legacy/ui/public/url/__tests__/url.js
+++ /dev/null
@@ -1,562 +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 ngMock from 'ng_mock';
-import faker from 'faker';
-import _ from 'lodash';
-import { AppStateProvider } from '../../state_management/app_state';
-import '..';
-
-// global vars, injected and mocked in init()
-let kbnUrl;
-let $route;
-let $location;
-let $rootScope;
-let appState;
-
-class StubAppState {
-  constructor() {
-    this.getQueryParamName = () => '_a';
-    this.toQueryParam = () => 'stateQueryParam';
-    this.destroy = sinon.stub();
-  }
-}
-
-function init() {
-  ngMock.module('kibana/url', 'kibana', function ($provide, PrivateProvider) {
-    $provide.service('$route', function () {
-      return {
-        reload: _.noop,
-      };
-    });
-
-    appState = new StubAppState();
-    PrivateProvider.swap(AppStateProvider, ($decorate) => {
-      const AppState = $decorate();
-      AppState.getAppState = () => appState;
-      return AppState;
-    });
-  });
-
-  ngMock.inject(function ($injector) {
-    $route = $injector.get('$route');
-    $location = $injector.get('$location');
-    $rootScope = $injector.get('$rootScope');
-    kbnUrl = $injector.get('kbnUrl');
-  });
-}
-
-describe('kbnUrl', function () {
-  beforeEach(function () {
-    init();
-  });
-
-  describe('forcing reload', function () {
-    it('schedules a listener for $locationChangeSuccess on the $rootScope', function () {
-      $location.url('/url');
-      $route.current = {
-        $$route: {
-          regex: /.*/,
-        },
-      };
-
-      sinon.stub($rootScope, '$on');
-
-      expect($rootScope.$on.callCount).to.be(0);
-      kbnUrl.change('/url');
-      sinon.assert.calledOnce(appState.destroy);
-      expect($rootScope.$on.callCount).to.be(1);
-      expect($rootScope.$on.firstCall.args[0]).to.be('$locationChangeSuccess');
-    });
-
-    it('handler unbinds the listener and calls reload', function () {
-      $location.url('/url');
-      $route.current = {
-        $$route: {
-          regex: /.*/,
-        },
-      };
-
-      const unbind = sinon.stub();
-      sinon.stub($rootScope, '$on').returns(unbind);
-      $route.reload = sinon.stub();
-
-      expect($rootScope.$on.callCount).to.be(0);
-      kbnUrl.change('/url');
-      expect($rootScope.$on.callCount).to.be(1);
-
-      const handler = $rootScope.$on.firstCall.args[1];
-      handler();
-      expect(unbind.callCount).to.be(1);
-      expect($route.reload.callCount).to.be(1);
-    });
-
-    it('reloads requested before the first are ignored', function () {
-      $location.url('/url');
-      $route.current = {
-        $$route: {
-          regex: /.*/,
-        },
-      };
-      $route.reload = sinon.stub();
-
-      sinon.stub($rootScope, '$on').returns(sinon.stub());
-
-      expect($rootScope.$on.callCount).to.be(0);
-      kbnUrl.change('/url');
-      expect($rootScope.$on.callCount).to.be(1);
-
-      // don't call the first handler
-
-      kbnUrl.change('/url');
-      expect($rootScope.$on.callCount).to.be(1);
-    });
-
-    it('one reload can happen once the first has completed', function () {
-      $location.url('/url');
-      $route.current = {
-        $$route: {
-          regex: /.*/,
-        },
-      };
-      $route.reload = sinon.stub();
-
-      sinon.stub($rootScope, '$on').returns(sinon.stub());
-
-      expect($rootScope.$on.callCount).to.be(0);
-      kbnUrl.change('/url');
-      expect($rootScope.$on.callCount).to.be(1);
-
-      // call the first handler
-      $rootScope.$on.firstCall.args[1]();
-      expect($route.reload.callCount).to.be(1);
-
-      expect($rootScope.$on.callCount).to.be(1);
-      kbnUrl.change('/url');
-      expect($rootScope.$on.callCount).to.be(2);
-    });
-  });
-
-  describe('remove', function () {
-    it('removes a parameter with a value from the url', function () {
-      $location.url('/myurl?exist&WithAParamToRemove=2&anothershouldexist=5');
-      kbnUrl.removeParam('WithAParamToRemove');
-      expect($location.url()).to.be('/myurl?exist&anothershouldexist=5');
-    });
-
-    it('removes a parameter with no value from the url', function () {
-      $location.url('/myurl?removeme&hi=5');
-      kbnUrl.removeParam('removeme');
-      expect($location.url()).to.be('/myurl?hi=5');
-    });
-
-    it('is noop if the given parameter doesn\t exist in the url', function () {
-      $location.url('/myurl?hi&bye');
-      kbnUrl.removeParam('noexist');
-      expect($location.url()).to.be('/myurl?hi&bye');
-    });
-
-    it('is noop if given empty string param', function () {
-      $location.url('/myurl?hi&bye');
-      kbnUrl.removeParam('');
-      expect($location.url()).to.be('/myurl?hi&bye');
-    });
-  });
-
-  describe('change', function () {
-    it('should set $location.url', function () {
-      sinon.stub($location, 'url');
-
-      expect($location.url.callCount).to.be(0);
-      kbnUrl.change('/some-url');
-      expect($location.url.callCount).to.be(1);
-    });
-
-    it('should uri encode replaced params', function () {
-      const url = '/some/path/';
-      const params = { replace: faker.Lorem.words(3).join(' ') };
-      const check = encodeURIComponent(params.replace);
-      sinon.stub($location, 'url');
-
-      kbnUrl.change(url + '{{replace}}', params);
-
-      expect($location.url.firstCall.args[0]).to.be(url + check);
-    });
-
-    it('should parse angular expression in substitutions and uri encode the results', function () {
-      // build url by piecing together these parts
-      const urlParts = ['/', '/', '?', '&', '#'];
-      // make sure it can parse templates with weird spacing
-      const wrappers = [
-        ['{{', '}}'],
-        ['{{ ', ' }}'],
-        ['{{', '  }}'],
-        ['{{    ', '}}'],
-        ['{{    ', '         }}'],
-      ];
-      // make sure filters are evaluated via angular expressions
-      const objIndex = 4; // used to case one replace as an object
-      const filters = ['', 'uppercase', '', 'uppercase', ''];
-
-      // the words (template keys) used must all be unique
-      const words = _.uniq(faker.Lorem.words(10))
-        .slice(0, urlParts.length)
-        .map(function (word, i) {
-          if (filters[i].length) {
-            return word + '|' + filters[i];
-          }
-          return word;
-        });
-
-      const replacements = faker.Lorem.words(urlParts.length).map(function (word, i) {
-        // make selected replacement into an object
-        if (i === objIndex) {
-          return { replace: word };
-        }
-
-        return word;
-      });
-
-      // build the url and test url
-      let url = '';
-      let testUrl = '';
-      urlParts.forEach(function (part, i) {
-        url += part + wrappers[i][0] + words[i] + wrappers[i][1];
-        const locals = {};
-        locals[words[i].split('|')[0]] = replacements[i];
-        testUrl += part + encodeURIComponent($rootScope.$eval(words[i], locals));
-      });
-
-      // create the locals replacement object
-      const params = {};
-      replacements.forEach(function (replacement, i) {
-        const word = words[i].split('|')[0];
-        params[word] = replacement;
-      });
-
-      sinon.stub($location, 'url');
-
-      kbnUrl.change(url, params);
-
-      expect($location.url.firstCall.args[0]).to.not.be(url);
-      expect($location.url.firstCall.args[0]).to.be(testUrl);
-    });
-
-    it('should handle dot notation', function () {
-      const url = '/some/thing/{{that.is.substituted}}';
-
-      kbnUrl.change(url, {
-        that: {
-          is: {
-            substituted: 'test',
-          },
-        },
-      });
-
-      expect($location.url()).to.be('/some/thing/test');
-    });
-
-    it('should throw when params are missing', function () {
-      const url = '/{{replace_me}}';
-      const params = {};
-
-      try {
-        kbnUrl.change(url, params);
-        throw new Error('this should not run');
-      } catch (err) {
-        expect(err).to.be.an(Error);
-        expect(err.message).to.match(/replace_me/);
-      }
-    });
-
-    it('should throw when filtered params are missing', function () {
-      const url = '/{{replace_me|number}}';
-      const params = {};
-
-      try {
-        kbnUrl.change(url, params);
-        throw new Error('this should not run');
-      } catch (err) {
-        expect(err).to.be.an(Error);
-        expect(err.message).to.match(/replace_me\|number/);
-      }
-    });
-
-    it('should change the entire url', function () {
-      const path = '/test/path';
-      const search = { search: 'test' };
-      const hash = 'hash';
-      const newPath = '/new/location';
-
-      $location.path(path).search(search).hash(hash);
-
-      // verify the starting state
-      expect($location.path()).to.be(path);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-
-      kbnUrl.change(newPath);
-
-      // verify the ending state
-      expect($location.path()).to.be(newPath);
-      expect($location.search()).to.eql({});
-      expect($location.hash()).to.be('');
-    });
-
-    it('should allow setting app state on the target url', function () {
-      const path = '/test/path';
-      const search = { search: 'test' };
-      const hash = 'hash';
-      const newPath = '/new/location';
-
-      $location.path(path).search(search).hash(hash);
-
-      // verify the starting state
-      expect($location.path()).to.be(path);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-
-      kbnUrl.change(newPath, null, new StubAppState());
-
-      // verify the ending state
-      expect($location.path()).to.be(newPath);
-      expect($location.search()).to.eql({ _a: 'stateQueryParam' });
-      expect($location.hash()).to.be('');
-    });
-  });
-
-  describe('changePath', function () {
-    it('should change just the path', function () {
-      const path = '/test/path';
-      const search = { search: 'test' };
-      const hash = 'hash';
-      const newPath = '/new/location';
-
-      $location.path(path).search(search).hash(hash);
-
-      // verify the starting state
-      expect($location.path()).to.be(path);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-
-      kbnUrl.changePath(newPath);
-
-      // verify the ending state
-      expect($location.path()).to.be(newPath);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-    });
-  });
-
-  describe('redirect', function () {
-    it('should change the entire url', function () {
-      const path = '/test/path';
-      const search = { search: 'test' };
-      const hash = 'hash';
-      const newPath = '/new/location';
-
-      $location.path(path).search(search).hash(hash);
-
-      // verify the starting state
-      expect($location.path()).to.be(path);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-
-      kbnUrl.redirect(newPath);
-
-      // verify the ending state
-      expect($location.path()).to.be(newPath);
-      expect($location.search()).to.eql({});
-      expect($location.hash()).to.be('');
-    });
-
-    it('should allow setting app state on the target url', function () {
-      const path = '/test/path';
-      const search = { search: 'test' };
-      const hash = 'hash';
-      const newPath = '/new/location';
-
-      $location.path(path).search(search).hash(hash);
-
-      // verify the starting state
-      expect($location.path()).to.be(path);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-
-      kbnUrl.redirect(newPath, null, new StubAppState());
-
-      // verify the ending state
-      expect($location.path()).to.be(newPath);
-      expect($location.search()).to.eql({ _a: 'stateQueryParam' });
-      expect($location.hash()).to.be('');
-    });
-
-    it('should replace the current history entry', function () {
-      sinon.stub($location, 'replace');
-      $location.url('/some/path');
-
-      expect($location.replace.callCount).to.be(0);
-      kbnUrl.redirect('/new/path/');
-      expect($location.replace.callCount).to.be(1);
-    });
-
-    it('should call replace on $location', function () {
-      sinon.stub(kbnUrl, '_shouldForceReload').returns(false);
-      sinon.stub($location, 'replace');
-
-      expect($location.replace.callCount).to.be(0);
-      kbnUrl.redirect('/poop');
-      expect($location.replace.callCount).to.be(1);
-    });
-  });
-
-  describe('redirectPath', function () {
-    it('should only change the path', function () {
-      const path = '/test/path';
-      const search = { search: 'test' };
-      const hash = 'hash';
-      const newPath = '/new/location';
-
-      $location.path(path).search(search).hash(hash);
-
-      // verify the starting state
-      expect($location.path()).to.be(path);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-
-      kbnUrl.redirectPath(newPath);
-
-      // verify the ending state
-      expect($location.path()).to.be(newPath);
-      expect($location.search()).to.eql(search);
-      expect($location.hash()).to.be(hash);
-    });
-
-    it('should call replace on $location', function () {
-      sinon.stub(kbnUrl, '_shouldForceReload').returns(false);
-      sinon.stub($location, 'replace');
-
-      expect($location.replace.callCount).to.be(0);
-      kbnUrl.redirectPath('/poop');
-      expect($location.replace.callCount).to.be(1);
-    });
-  });
-
-  describe('_shouldForceReload', function () {
-    let next;
-    let prev;
-
-    beforeEach(function () {
-      $route.current = {
-        $$route: {
-          regexp: /^\/is-current-route\/(\d+)/,
-          reloadOnSearch: true,
-        },
-      };
-
-      prev = { path: '/is-current-route/1', search: {} };
-      next = { path: '/is-current-route/1', search: {} };
-    });
-
-    it("returns false if the passed url doesn't match the current route", function () {
-      next.path = '/not current';
-      expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(false);
-    });
-
-    describe('if the passed url does match the route', function () {
-      describe('and the route reloads on search', function () {
-        describe('and the path is the same', function () {
-          describe('and the search params are the same', function () {
-            it('returns true', function () {
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(true);
-            });
-          });
-          describe('but the search params are different', function () {
-            it('returns false', function () {
-              next.search = {};
-              prev.search = { q: 'search term' };
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(false);
-            });
-          });
-        });
-
-        describe('and the path is different', function () {
-          beforeEach(function () {
-            next.path = '/not-same';
-          });
-
-          describe('and the search params are the same', function () {
-            it('returns false', function () {
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(false);
-            });
-          });
-          describe('but the search params are different', function () {
-            it('returns false', function () {
-              next.search = {};
-              prev.search = { q: 'search term' };
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(false);
-            });
-          });
-        });
-      });
-
-      describe('but the route does not reload on search', function () {
-        beforeEach(function () {
-          $route.current.$$route.reloadOnSearch = false;
-        });
-
-        describe('and the path is the same', function () {
-          describe('and the search params are the same', function () {
-            it('returns true', function () {
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(true);
-            });
-          });
-          describe('but the search params are different', function () {
-            it('returns true', function () {
-              next.search = {};
-              prev.search = { q: 'search term' };
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(true);
-            });
-          });
-        });
-
-        describe('and the path is different', function () {
-          beforeEach(function () {
-            next.path = '/not-same';
-          });
-
-          describe('and the search params are the same', function () {
-            it('returns false', function () {
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(false);
-            });
-          });
-          describe('but the search params are different', function () {
-            it('returns false', function () {
-              next.search = {};
-              prev.search = { q: 'search term' };
-              expect(kbnUrl._shouldForceReload(next, prev, $route)).to.be(false);
-            });
-          });
-        });
-      });
-    });
-  });
-});
diff --git a/src/legacy/ui/public/url/absolute_to_parsed_url.ts b/src/legacy/ui/public/url/absolute_to_parsed_url.ts
deleted file mode 100644
index 30f493c25776c2..00000000000000
--- a/src/legacy/ui/public/url/absolute_to_parsed_url.ts
+++ /dev/null
@@ -1,44 +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 { parse } from 'url';
-
-import { extractAppPathAndId } from './extract_app_path_and_id';
-import { KibanaParsedUrl } from './kibana_parsed_url';
-
-/**
- *
- * @param absoluteUrl - an absolute url, e.g. https://localhost:5601/gra/app/visualize#/edit/viz_id?hi=bye
- * @param basePath - An optional base path for kibana. If supplied, should start with a "/".
- * e.g. in https://localhost:5601/gra/app/visualize#/edit/viz_id the basePath is
- * "/gra".
- * @return {KibanaParsedUrl}
- */
-export function absoluteToParsedUrl(absoluteUrl: string, basePath = '') {
-  const { appPath, appId } = extractAppPathAndId(absoluteUrl, basePath);
-  const { hostname, port, protocol } = parse(absoluteUrl);
-  return new KibanaParsedUrl({
-    basePath,
-    appId: appId!,
-    appPath,
-    hostname,
-    port,
-    protocol,
-  });
-}
diff --git a/src/legacy/ui/public/url/extract_app_path_and_id.ts b/src/legacy/ui/public/url/extract_app_path_and_id.ts
deleted file mode 100644
index 44bba272e0873a..00000000000000
--- a/src/legacy/ui/public/url/extract_app_path_and_id.ts
+++ /dev/null
@@ -1,41 +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 { parse } from 'url';
-
-/**
- * If the url is determined to contain an appId and appPath, it returns those portions. If it is not in the right
- * format and an appId and appPath can't be extracted, it returns an empty object.
- * @param {string} url - a relative or absolute url which contains an appPath, an appId, and optionally, a basePath.
- * @param {string} basePath - optional base path, if given should start with "/".
- */
-export function extractAppPathAndId(url: string, basePath = '') {
-  const parsedUrl = parse(url);
-  if (!parsedUrl.path) {
-    return {};
-  }
-  const pathWithoutBase = parsedUrl.path.slice(basePath.length);
-
-  if (!pathWithoutBase.startsWith('/app/')) {
-    return {};
-  }
-
-  const appPath = parsedUrl.hash && parsedUrl.hash.length > 0 ? parsedUrl.hash.slice(1) : '';
-  return { appId: pathWithoutBase.slice('/app/'.length), appPath };
-}
diff --git a/src/legacy/ui/public/url/index.js b/src/legacy/ui/public/url/index.js
deleted file mode 100644
index 8ef267de2890c2..00000000000000
--- a/src/legacy/ui/public/url/index.js
+++ /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.
- */
-
-export { KbnUrlProvider } from './url';
-export { RedirectWhenMissingProvider } from './redirect_when_missing';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-export { modifyUrl } from '../../../../core/utils';
diff --git a/src/legacy/ui/public/url/kbn_url.ts b/src/legacy/ui/public/url/kbn_url.ts
deleted file mode 100644
index 42b6a8f19f9a9d..00000000000000
--- a/src/legacy/ui/public/url/kbn_url.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.
- */
-
-export interface KbnUrl {
-  change: (url: string) => void;
-  removeParam: (param: string) => void;
-}
diff --git a/src/legacy/ui/public/url/kibana_parsed_url.ts b/src/legacy/ui/public/url/kibana_parsed_url.ts
deleted file mode 100644
index 1c60e8729e0ff6..00000000000000
--- a/src/legacy/ui/public/url/kibana_parsed_url.ts
+++ /dev/null
@@ -1,148 +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 { parse } from 'url';
-
-import { modifyUrl } from '../../../../core/public';
-import { prependPath } from './prepend_path';
-
-interface Options {
-  /**
-   * An optional base path for kibana. If supplied, should start with a "/".
-   * e.g. in https://localhost:5601/gra/app/visualize#/edit/viz_id the
-   * basePath is "/gra"
-   */
-  basePath?: string;
-
-  /**
-   * The app id.
-   * e.g. in https://localhost:5601/gra/app/visualize#/edit/viz_id the app id is "kibana".
-   */
-  appId: string;
-
-  /**
-   * The path for a page in the the app. Should start with a "/". Don't include the hash sign. Can
-   * include all query parameters.
-   * e.g. in https://localhost:5601/gra/app/visualize#/edit/viz_id?g=state the appPath is
-   * "/edit/viz_id?g=state"
-   */
-  appPath?: string;
-
-  /**
-   * Optional hostname. Uses current window location's hostname if hostname, port,
-   * and protocol are undefined.
-   */
-  hostname?: string;
-
-  /**
-   * Optional port. Uses current window location's port if hostname, port,
-   * and protocol are undefined.
-   */
-  port?: string;
-
-  /**
-   * Optional protocol. Uses current window location's protocol if hostname, port,
-   * and protocol are undefined.
-   */
-  protocol?: string;
-}
-
-/**
- * Represents the pieces that make up a url in Kibana, offering some helpful functionality
- * for translating those pieces into absolute or relative urls. A Kibana url with a basePath
- * looks like this: http://localhost:5601/basePath/app/appId#/an/appPath?with=query&params
- *
- *  - basePath is "/basePath"
- *  - appId is "appId"
- *  - appPath is "/an/appPath?with=query&params"
- *
- * Almost all urls in Kibana should have this structure, including the "/app" portion in front of the appId
- * (one exception is the login link).
- */
-export class KibanaParsedUrl {
-  public appId: string;
-  public appPath: string;
-  public basePath: string;
-  public hostname?: string;
-  public protocol?: string;
-  public port?: string;
-
-  constructor(options: Options) {
-    const { appId, basePath = '', appPath = '', hostname, protocol, port } = options;
-
-    // We'll use window defaults
-    const hostOrProtocolSpecified = hostname || protocol || port;
-
-    this.basePath = basePath;
-    this.appId = appId;
-    this.appPath = appPath;
-    this.hostname = hostOrProtocolSpecified ? hostname : window.location.hostname;
-    this.port = hostOrProtocolSpecified ? port : window.location.port;
-    this.protocol = hostOrProtocolSpecified ? protocol : window.location.protocol;
-  }
-
-  public getGlobalState() {
-    if (!this.appPath) {
-      return '';
-    }
-    const parsedUrl = parse(this.appPath, true);
-    const query = parsedUrl.query || {};
-    return query._g || '';
-  }
-
-  public setGlobalState(newGlobalState: string | string[]) {
-    if (!this.appPath) {
-      return;
-    }
-
-    this.appPath = modifyUrl(this.appPath, (parsed) => {
-      parsed.query._g = newGlobalState;
-    });
-  }
-
-  public addQueryParameter(name: string, val: string) {
-    this.appPath = modifyUrl(this.appPath, (parsed) => {
-      parsed.query[name] = val;
-    });
-  }
-
-  public getHashedAppPath() {
-    return `#${this.appPath}`;
-  }
-
-  public getAppBasePath() {
-    return `/${this.appId}`;
-  }
-
-  public getAppRootPath() {
-    return `/app${this.getAppBasePath()}${this.getHashedAppPath()}`;
-  }
-
-  public getRootRelativePath() {
-    return prependPath(this.getAppRootPath(), this.basePath);
-  }
-
-  public getAbsoluteUrl() {
-    return modifyUrl(this.getRootRelativePath(), (parsed) => {
-      parsed.protocol = this.protocol;
-      parsed.port = this.port;
-      parsed.hostname = this.hostname;
-    });
-  }
-}
diff --git a/src/legacy/ui/public/url/prepend_path.ts b/src/legacy/ui/public/url/prepend_path.ts
deleted file mode 100644
index b8a77d5c23beeb..00000000000000
--- a/src/legacy/ui/public/url/prepend_path.ts
+++ /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 { isString } from 'lodash';
-import { format, parse } from 'url';
-
-/**
- *
- * @param {string} relativePath - a relative path that must start with a "/".
- * @param {string} newPath - the new path to prefix. ex: 'xyz'
- * @return {string} the url with the basePath prepended. ex. '/xyz/app/kibana#/management'. If
- * the relative path isn't in the right format (e.g. doesn't start with a "/") the relativePath is returned
- * unchanged.
- */
-export function prependPath(relativePath: string, newPath = '') {
-  if (!relativePath || !isString(relativePath)) {
-    return relativePath;
-  }
-
-  const parsed = parse(relativePath, true, true);
-  if (!parsed.host && parsed.pathname) {
-    if (parsed.pathname[0] === '/') {
-      parsed.pathname = newPath + parsed.pathname;
-    }
-  }
-
-  return format({
-    protocol: parsed.protocol,
-    host: parsed.host,
-    pathname: parsed.pathname,
-    query: parsed.query,
-    hash: parsed.hash,
-  });
-}
diff --git a/src/legacy/ui/public/url/redirect_when_missing.js b/src/legacy/ui/public/url/redirect_when_missing.js
deleted file mode 100644
index 85c90a14d9fd78..00000000000000
--- a/src/legacy/ui/public/url/redirect_when_missing.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 React from 'react';
-import { i18n } from '@kbn/i18n';
-import { MarkdownSimple } from '../../../../plugins/kibana_react/public';
-import { toastNotifications } from 'ui/notify';
-import { SavedObjectNotFound } from '../../../../plugins/kibana_utils/public';
-import { uiModules } from '../modules';
-
-uiModules.get('kibana/url').service('redirectWhenMissing', function (Private) {
-  return Private(RedirectWhenMissingProvider);
-});
-
-export function RedirectWhenMissingProvider(kbnUrl, Promise) {
-  /**
-   * Creates an error handler that will redirect to a url when a SavedObjectNotFound
-   * error is thrown
-   *
-   * @param  {string|object} mapping - a mapping of url's to redirect to based on the saved object that
-   *                                 couldn't be found, or just a string that will be used for all types
-   * @return {function} - the handler to pass to .catch()
-   */
-  return function (mapping) {
-    if (typeof mapping === 'string') {
-      mapping = { '*': mapping };
-    }
-
-    return function (error) {
-      // if this error is not "404", rethrow
-      const savedObjectNotFound = error instanceof SavedObjectNotFound;
-      const unknownVisType = error.message.indexOf('Invalid type') === 0;
-      if (unknownVisType) {
-        error.savedObjectType = 'visualization';
-      } else if (!savedObjectNotFound) {
-        throw error;
-      }
-
-      let url = mapping[error.savedObjectType] || mapping['*'];
-      if (!url) url = '/';
-
-      url += (url.indexOf('?') >= 0 ? '&' : '?') + `notFound=${error.savedObjectType}`;
-
-      toastNotifications.addWarning({
-        title: i18n.translate('common.ui.url.savedObjectIsMissingNotificationMessage', {
-          defaultMessage: 'Saved object is missing',
-        }),
-        text: <MarkdownSimple>{error.message}</MarkdownSimple>,
-      });
-
-      kbnUrl.redirect(url);
-      return Promise.halt();
-    };
-  };
-}
diff --git a/src/legacy/ui/public/url/relative_to_absolute.ts b/src/legacy/ui/public/url/relative_to_absolute.ts
deleted file mode 100644
index 7d0737d145a1b2..00000000000000
--- a/src/legacy/ui/public/url/relative_to_absolute.ts
+++ /dev/null
@@ -1,34 +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.
- */
-
-/**
- *
- * @param {string} url - a relative or root relative url.  If a relative path is given then the
- * absolute url returned will depend on the current page where this function is called from. For example
- * if you are on page "http://www.mysite.com/shopping/kids" and you pass this function "adults", you would get
- * back "http://www.mysite.com/shopping/adults".  If you passed this function a root relative path, or one that
- * starts with a "/", for example "/account/cart", you would get back "http://www.mysite.com/account/cart".
- * @return {string} the relative url transformed into an absolute url
- */
-export function relativeToAbsolute(url: string) {
-  // convert all link urls to absolute urls
-  const a = document.createElement('a');
-  a.setAttribute('href', url);
-  return a.href;
-}
diff --git a/src/legacy/ui/public/url/url.js b/src/legacy/ui/public/url/url.js
deleted file mode 100644
index fb243b02e05c7c..00000000000000
--- a/src/legacy/ui/public/url/url.js
+++ /dev/null
@@ -1,247 +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 _ from 'lodash';
-import { i18n } from '@kbn/i18n';
-import { uiModules } from '../modules';
-import { AppStateProvider } from '../state_management/app_state';
-
-uiModules.get('kibana/url').service('kbnUrl', function (Private, $injector) {
-  //config is not directly used but registers global event listeners to kbnUrl to function
-  $injector.get('config');
-  return Private(KbnUrlProvider);
-});
-
-export function KbnUrlProvider($injector, $location, $rootScope, $parse, Private) {
-  /**
-   *  the `kbnUrl` service was created to smooth over some of the
-   *  inconsistent behavior that occurs when modifying the url via
-   *  the `$location` api. In general it is recommended that you use
-   *  the `kbnUrl` service any time you want to modify the url.
-   *
-   *  "features" that `kbnUrl` does it's best to guarantee, which
-   *  are not guaranteed with the `$location` service:
-   *   - calling `kbnUrl.change()` with a url that resolves to the current
-   *     route will force a full transition (rather than just updating the
-   *     properties of the $route object)
-   *
-   *  Additional features of `kbnUrl`
-   *   - parameterized urls
-   *   - easily include an app state with the url
-   *
-   *  @type {KbnUrl}
-   */
-  const self = this;
-
-  /**
-   * Navigate to a url
-   *
-   * @param  {String} url - the new url, can be a template. See #eval
-   * @param  {Object} [paramObj] - optional set of parameters for the url template
-   * @return {undefined}
-   */
-  self.change = function (url, paramObj, appState) {
-    self._changeLocation('url', url, paramObj, false, appState);
-  };
-
-  /**
-   * Same as #change except only changes the url's path,
-   * leaving the search string and such intact
-   *
-   * @param  {String} path - the new path, can be a template. See #eval
-   * @param  {Object} [paramObj] - optional set of parameters for the path template
-   * @return {undefined}
-   */
-  self.changePath = function (path, paramObj) {
-    self._changeLocation('path', path, paramObj);
-  };
-
-  /**
-   * Same as #change except that it removes the current url from history
-   *
-   * @param  {String} url - the new url, can be a template. See #eval
-   * @param  {Object} [paramObj] - optional set of parameters for the url template
-   * @return {undefined}
-   */
-  self.redirect = function (url, paramObj, appState) {
-    self._changeLocation('url', url, paramObj, true, appState);
-  };
-
-  /**
-   * Same as #redirect except only changes the url's path,
-   * leaving the search string and such intact
-   *
-   * @param  {String} path - the new path, can be a template. See #eval
-   * @param  {Object} [paramObj] - optional set of parameters for the path template
-   * @return {undefined}
-   */
-  self.redirectPath = function (path, paramObj) {
-    self._changeLocation('path', path, paramObj, true);
-  };
-
-  /**
-   * Evaluate a url template. templates can contain double-curly wrapped
-   * expressions that are evaluated in the context of the paramObj
-   *
-   * @param  {String} template - the url template to evaluate
-   * @param  {Object} [paramObj] - the variables to expose to the template
-   * @return {String} - the evaluated result
-   * @throws {Error} If any of the expressions can't be parsed.
-   */
-  self.eval = function (template, paramObj) {
-    paramObj = paramObj || {};
-
-    return template.replace(/\{\{([^\}]+)\}\}/g, function (match, expr) {
-      // remove filters
-      const key = expr.split('|')[0].trim();
-
-      // verify that the expression can be evaluated
-      const p = $parse(key)(paramObj);
-
-      // if evaluation can't be made, throw
-      if (_.isUndefined(p)) {
-        throw new Error(
-          i18n.translate('common.ui.url.replacementFailedErrorMessage', {
-            defaultMessage: 'Replacement failed, unresolved expression: {expr}',
-            values: { expr },
-          })
-        );
-      }
-
-      return encodeURIComponent($parse(expr)(paramObj));
-    });
-  };
-
-  /**
-   * convert an object's route to an href, compatible with
-   * window.location.href= and <a href="">
-   *
-   * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-   * @param  {string} route - the route name
-   * @return {string} - the computed href
-   */
-  self.getRouteHref = function (obj, route) {
-    return '#' + self.getRouteUrl(obj, route);
-  };
-
-  /**
-   * convert an object's route to a url, compatible with url.change() or $location.url()
-   *
-   * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-   * @param  {string} route - the route name
-   * @return {string} - the computed url
-   */
-  self.getRouteUrl = function (obj, route) {
-    const template = obj && obj.routes && obj.routes[route];
-    if (template) return self.eval(template, obj);
-  };
-
-  /**
-   * Similar to getRouteUrl, supports objects which list their routes,
-   * and redirects to the named route. See #redirect
-   *
-   * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-   * @param  {string} route - the route name
-   * @return {undefined}
-   */
-  self.redirectToRoute = function (obj, route) {
-    self.redirect(self.getRouteUrl(obj, route));
-  };
-
-  /**
-   * Similar to getRouteUrl, supports objects which list their routes,
-   * and changes the url to the named route. See #change
-   *
-   * @param  {Object} obj - any object that list's it's routes at obj.routes{}
-   * @param  {string} route - the route name
-   * @return {undefined}
-   */
-  self.changeToRoute = function (obj, route) {
-    self.change(self.getRouteUrl(obj, route));
-  };
-
-  /**
-   * Removes the given parameter from the url. Does so without modifying the browser
-   * history.
-   * @param param
-   */
-  self.removeParam = function (param) {
-    $location.search(param, null).replace();
-  };
-
-  /////
-  // private api
-  /////
-  let reloading;
-
-  self._changeLocation = function (type, url, paramObj, replace, appState) {
-    const prev = {
-      path: $location.path(),
-      search: $location.search(),
-    };
-
-    url = self.eval(url, paramObj);
-    $location[type](url);
-    if (replace) $location.replace();
-
-    if (appState) {
-      $location.search(appState.getQueryParamName(), appState.toQueryParam());
-    }
-
-    const next = {
-      path: $location.path(),
-      search: $location.search(),
-    };
-
-    if ($injector.has('$route')) {
-      const $route = $injector.get('$route');
-
-      if (self._shouldForceReload(next, prev, $route)) {
-        const appState = Private(AppStateProvider).getAppState();
-        if (appState) appState.destroy();
-
-        reloading = $rootScope.$on('$locationChangeSuccess', function () {
-          // call the "unlisten" function returned by $on
-          reloading();
-          reloading = false;
-
-          $route.reload();
-        });
-      }
-    }
-  };
-
-  // determine if the router will automatically reload the route
-  self._shouldForceReload = function (next, prev, $route) {
-    if (reloading) return false;
-
-    const route = $route.current && $route.current.$$route;
-    if (!route) return false;
-
-    // for the purposes of determining whether the router will
-    // automatically be reloading, '' and '/' are equal
-    const nextPath = next.path || '/';
-    const prevPath = prev.path || '/';
-    if (nextPath !== prevPath) return false;
-
-    const reloadOnSearch = route.reloadOnSearch;
-    const searchSame = _.isEqual(next.search, prev.search);
-    return (reloadOnSearch && searchSame) || !reloadOnSearch;
-  };
-}
diff --git a/src/legacy/ui/public/utils/collection.test.ts b/src/legacy/ui/public/utils/collection.test.ts
deleted file mode 100644
index 0841e3554c0d09..00000000000000
--- a/src/legacy/ui/public/utils/collection.test.ts
+++ /dev/null
@@ -1,141 +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 { move } from './collection';
-
-describe('collection', () => {
-  describe('move', () => {
-    test('accepts previous from->to syntax', () => {
-      const list = [1, 1, 1, 1, 1, 1, 1, 1, 8, 1, 1];
-
-      expect(list[3]).toBe(1);
-      expect(list[8]).toBe(8);
-
-      move(list, 8, 3);
-
-      expect(list[8]).toBe(1);
-      expect(list[3]).toBe(8);
-    });
-
-    test('moves an object up based on a function callback', () => {
-      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
-
-      expect(list[4]).toBe(0);
-      expect(list[5]).toBe(1);
-      expect(list[6]).toBe(0);
-
-      move(list, 5, false, (v: any) => v === 0);
-
-      expect(list[4]).toBe(1);
-      expect(list[5]).toBe(0);
-      expect(list[6]).toBe(0);
-    });
-
-    test('moves an object down based on a function callback', () => {
-      const list = [1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1];
-
-      expect(list[4]).toBe(0);
-      expect(list[5]).toBe(1);
-      expect(list[6]).toBe(0);
-
-      move(list, 5, true, (v: any) => v === 0);
-
-      expect(list[4]).toBe(0);
-      expect(list[5]).toBe(0);
-      expect(list[6]).toBe(1);
-    });
-
-    test('moves an object up based on a where callback', () => {
-      const list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).toHaveProperty('v', 0);
-      expect(list[5]).toHaveProperty('v', 1);
-      expect(list[6]).toHaveProperty('v', 0);
-
-      move(list, 5, false, { v: 0 });
-
-      expect(list[4]).toHaveProperty('v', 1);
-      expect(list[5]).toHaveProperty('v', 0);
-      expect(list[6]).toHaveProperty('v', 0);
-    });
-
-    test('moves an object down based on a where callback', () => {
-      const list = [
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 0 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-        { v: 1 },
-      ];
-
-      expect(list[4]).toHaveProperty('v', 0);
-      expect(list[5]).toHaveProperty('v', 1);
-      expect(list[6]).toHaveProperty('v', 0);
-
-      move(list, 5, true, { v: 0 });
-
-      expect(list[4]).toHaveProperty('v', 0);
-      expect(list[5]).toHaveProperty('v', 0);
-      expect(list[6]).toHaveProperty('v', 1);
-    });
-
-    test('moves an object down based on a pluck callback', () => {
-      const list = [
-        { id: 0, normal: true },
-        { id: 1, normal: true },
-        { id: 2, normal: true },
-        { id: 3, normal: true },
-        { id: 4, normal: true },
-        { id: 5, normal: false },
-        { id: 6, normal: true },
-        { id: 7, normal: true },
-        { id: 8, normal: true },
-        { id: 9, normal: true },
-      ];
-
-      expect(list[4]).toHaveProperty('id', 4);
-      expect(list[5]).toHaveProperty('id', 5);
-      expect(list[6]).toHaveProperty('id', 6);
-
-      move(list, 5, true, 'normal');
-
-      expect(list[4]).toHaveProperty('id', 4);
-      expect(list[5]).toHaveProperty('id', 6);
-      expect(list[6]).toHaveProperty('id', 5);
-    });
-  });
-});
diff --git a/src/legacy/ui/public/utils/collection.ts b/src/legacy/ui/public/utils/collection.ts
deleted file mode 100644
index b882a2bbe6e5b9..00000000000000
--- a/src/legacy/ui/public/utils/collection.ts
+++ /dev/null
@@ -1,76 +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 _ from 'lodash';
-
-/**
- * move an obj either up or down in the collection by
- * injecting it either before/after the prev/next obj that
- * satisfied the qualifier
- *
- * or, just from one index to another...
- *
- * @param  {array} objs - the list to move the object within
- * @param  {number|any} obj - the object that should be moved, or the index that the object is currently at
- * @param  {number|boolean} below - the index to move the object to, or whether it should be moved up or down
- * @param  {function} qualifier - a lodash-y callback, object = _.where, string = _.pluck
- * @return {array} - the objs argument
- */
-export function move(
-  objs: any[],
-  obj: object | number,
-  below: number | boolean,
-  qualifier?: ((object: object, index: number) => any) | Record<string, any> | string
-): object[] {
-  const origI = _.isNumber(obj) ? obj : objs.indexOf(obj);
-  if (origI === -1) {
-    return objs;
-  }
-
-  if (_.isNumber(below)) {
-    // move to a specific index
-    objs.splice(below, 0, objs.splice(origI, 1)[0]);
-    return objs;
-  }
-
-  below = !!below;
-  qualifier = qualifier && _.iteratee(qualifier);
-
-  const above = !below;
-  const finder = below ? _.findIndex : _.findLastIndex;
-
-  // find the index of the next/previous obj that meets the qualifications
-  const targetI = finder(objs, (otherAgg, otherI) => {
-    if (below && otherI <= origI) {
-      return;
-    }
-    if (above && otherI >= origI) {
-      return;
-    }
-    return Boolean(_.isFunction(qualifier) && qualifier(otherAgg, otherI));
-  });
-
-  if (targetI === -1) {
-    return objs;
-  }
-
-  // place the obj at it's new index
-  objs.splice(targetI, 0, objs.splice(origI, 1)[0]);
-  return objs;
-}
diff --git a/src/legacy/ui/public/utils/legacy_class.js b/src/legacy/ui/public/utils/legacy_class.js
deleted file mode 100644
index f47650a77bb6d4..00000000000000
--- a/src/legacy/ui/public/utils/legacy_class.js
+++ /dev/null
@@ -1,56 +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.
- */
-
-// create a property descriptor for properties
-// that won't change
-function describeConst(val) {
-  return {
-    writable: false,
-    enumerable: false,
-    configurable: false,
-    value: val,
-  };
-}
-
-const props = {
-  inherits: describeConst(function (SuperClass) {
-    const prototype = Object.create(SuperClass.prototype, {
-      constructor: describeConst(this),
-      superConstructor: describeConst(SuperClass),
-    });
-
-    Object.defineProperties(this, {
-      prototype: describeConst(prototype),
-      Super: describeConst(SuperClass),
-    });
-
-    return this;
-  }),
-};
-
-/**
- * Add class-related behavior to a function, currently this
- * only attaches an .inherits() method.
- *
- * @param  {Constructor} ClassConstructor - The function that should be extended
- * @return {Constructor} - the constructor passed in;
- */
-export function createLegacyClass(ClassConstructor) {
-  return Object.defineProperties(ClassConstructor, props);
-}
diff --git a/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx b/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
index 6103041cf0a4c8..68a21c6a1587c4 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.test.tsx
@@ -32,10 +32,6 @@ import { AdvancedSettingsComponent } from './advanced_settings';
 import { notificationServiceMock, docLinksServiceMock } from '../../../../core/public/mocks';
 import { ComponentRegistry } from '../component_registry';
 
-jest.mock('ui/new_platform', () => ({
-  npStart: mockConfig(),
-}));
-
 jest.mock('./components/field', () => ({
   Field: () => {
     return 'field';
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts
index 51f4fc7ce94b90..5e0eeaee3c0d09 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts
@@ -22,5 +22,3 @@ import { setup } from 'test_utils/http_test_setup';
 export const { http } = setup((injectedMetadata) => {
   injectedMetadata.getBasePath.mockReturnValue('/hola/daro/');
 });
-
-jest.doMock('ui/new_platform', () => ({ npSetup: { core: { http } } }));
diff --git a/src/plugins/discover/public/application/components/field_name/field_name.test.tsx b/src/plugins/discover/public/application/components/field_name/field_name.test.tsx
index 46be1044c0d4d1..e6cf8a57686f14 100644
--- a/src/plugins/discover/public/application/components/field_name/field_name.test.tsx
+++ b/src/plugins/discover/public/application/components/field_name/field_name.test.tsx
@@ -20,8 +20,6 @@ import React from 'react';
 import { render } from 'enzyme';
 import { FieldName } from './field_name';
 
-jest.mock('ui/new_platform');
-
 // Note that it currently provides just 2 basic tests, there should be more, but
 // the components involved will soon change
 test('FieldName renders a string field by providing fieldType and fieldName', () => {
diff --git a/src/plugins/es_ui_shared/public/indices/validate/validate_index.test.ts b/src/plugins/es_ui_shared/public/indices/validate/validate_index.test.ts
index a6792543cd7267..b28cac1cb76f5f 100644
--- a/src/plugins/es_ui_shared/public/indices/validate/validate_index.test.ts
+++ b/src/plugins/es_ui_shared/public/indices/validate/validate_index.test.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-jest.mock('ui/new_platform');
-
 import { INDEX_ILLEGAL_CHARACTERS_VISIBLE } from '../constants';
 
 import {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
index 80132167b7f58f..ed50317aed6a0e 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
@@ -46,14 +46,6 @@ jest.mock('./components/table', () => ({
   },
 }));
 
-jest.mock('ui/documentation_links', () => ({
-  documentationLinks: {
-    scriptedFields: {
-      painless: 'painlessDocs',
-    },
-  },
-}));
-
 const helpers = {
   redirectToRoute: () => {},
   getRouteHref: () => '#',
diff --git a/src/plugins/timelion/public/directives/_saved_object_finder.scss b/src/plugins/timelion/public/directives/_saved_object_finder.scss
index b97dace5e9e000..e1a055a5f49e99 100644
--- a/src/plugins/timelion/public/directives/_saved_object_finder.scss
+++ b/src/plugins/timelion/public/directives/_saved_object_finder.scss
@@ -23,3 +23,74 @@
     }
   }
 }
+
+
+saved-object-finder {
+
+  .list-sort-button {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+    border: none;
+    padding: $euiSizeS $euiSize;
+    font-weight: $euiFontWeightRegular;
+    background-color: $euiColorLightestShade;
+  }
+
+  .li-striped {
+    li {
+      border: none;
+    }
+
+    li:nth-child(even) {
+      background-color: $euiColorLightestShade;
+    }
+
+    li:nth-child(odd) {
+      background-color: $euiColorEmptyShade;
+    }
+
+    .paginate-heading {
+      font-weight: $euiFontWeightRegular;
+      color: $euiColorDarkestShade;
+    }
+
+    .list-group-item {
+      padding: $euiSizeS $euiSize;
+
+      ul {
+        padding: 0;
+        display: flex;
+        flex-direction: row;
+
+        .finder-type {
+          margin-right: $euiSizeS;
+        }
+      }
+
+      a {
+        display: block;
+        color: $euiColorPrimary;
+
+        i {
+          color: shade($euiColorPrimary, 10%);
+          margin-right: $euiSizeS;
+        }
+      }
+
+      &:first-child {
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+      }
+
+      &.list-group-no-results p {
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  paginate {
+    paginate-controls {
+      margin: $euiSize;
+    }
+  }
+}
diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/get_axis_label_string.test.js b/src/plugins/vis_type_timeseries/public/application/components/lib/get_axis_label_string.test.js
index cfbd5ecb7bf655..068e3fea8b768a 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/get_axis_label_string.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/lib/get_axis_label_string.test.js
@@ -19,8 +19,6 @@
 
 import { getAxisLabelString } from './get_axis_label_string';
 
-jest.mock('ui/new_platform');
-
 describe('getAxisLabelString(interval)', () => {
   test('should return a valid label for 10 seconds', () => {
     expect(getAxisLabelString(10000)).toEqual('per 10 seconds');
diff --git a/src/test_utils/public/no_digest_promises.js b/src/test_utils/public/no_digest_promises.js
deleted file mode 100644
index 396d6fb4892f31..00000000000000
--- a/src/test_utils/public/no_digest_promises.js
+++ /dev/null
@@ -1,60 +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 Bluebird from 'bluebird';
-import 'ui/promises';
-import { uiModules } from 'ui/modules';
-
-Bluebird.longStackTraces();
-
-/**
- * replace the Promise service with Bluebird so that tests
- * can use promises without having to call $rootScope.apply()
- *
- * import noDigestPromises from 'test_utils/no_digest_promises';
- *
- * describe('some module that does complex shit with promises', function () {
- *   beforeEach(noDigestPromises.activate);
- *
- * });
- */
-
-let active = false;
-
-uiModules.get('kibana').config(function ($provide) {
-  $provide.decorator('Promise', function ($delegate) {
-    return active ? Bluebird : $delegate;
-  });
-});
-
-function activate() {
-  active = true;
-}
-function deactivate() {
-  active = false;
-}
-
-export default {
-  activate: activate,
-  deactivate: deactivate,
-  activateForSuite: function () {
-    before(activate);
-    after(deactivate);
-  },
-};
diff --git a/src/test_utils/public/stub_get_active_injector.js b/src/test_utils/public/stub_get_active_injector.js
deleted file mode 100644
index fb72cc5dabb7ee..00000000000000
--- a/src/test_utils/public/stub_get_active_injector.js
+++ /dev/null
@@ -1,65 +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.
- */
-
-/**
- * This test file contains stubs for chrome.dangerouslyGetActiveInjector, that you will
- * need to load if any part of the code you are testing relies on that method.
- * You will need to call setupInjectorStub and teardownInjectorStub in specific
- * places inside your test file to setup and teardown the stub.
- * If you can call both of them at the same place you can also use the shortcut
- * setupAndTeardownInjectorStub instead.
- */
-
-import ngMock from 'ng_mock';
-
-import chrome from 'ui/chrome';
-import sinon from 'sinon';
-
-/**
- * This method setups the stub for chrome.dangerouslyGetActiveInjector. You must call it in
- * a place where beforeEach is allowed to be called (read: inside your describe)
- * method. You must call this AFTER you've called `ngMock.module` to setup the modules,
- * but BEFORE you first execute code, that uses chrome.dangerouslyGetActiveInjector.
- */
-export function setupInjectorStub() {
-  beforeEach(
-    ngMock.inject(($injector) => {
-      sinon.stub(chrome, 'dangerouslyGetActiveInjector').returns(Promise.resolve($injector));
-    })
-  );
-}
-
-/**
- * This methods tears down the stub for chrome.dangerouslyGetActiveInjector. You must call it
- * in a place where afterEach is allowed to be called.
- */
-export function teardownInjectorStub() {
-  afterEach(() => {
-    chrome.dangerouslyGetActiveInjector.restore();
-  });
-}
-
-/**
- * This method combines setupInjectorStub and teardownInjectorStub in one method.
- * It can be used if you can call the other two methods directly behind each other.
- */
-export function setupAndTeardownInjectorStub() {
-  setupInjectorStub();
-  teardownInjectorStub();
-}
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
deleted file mode 100644
index 7aa12ea7a1130b..00000000000000
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/public/self_changing_vis/self_changing_vis.js
+++ /dev/null
@@ -1,47 +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 { SelfChangingEditor } from './self_changing_editor';
-import { SelfChangingComponent } from './self_changing_components';
-
-import { npSetup } from '../../../../../../src/legacy/ui/public/new_platform';
-
-npSetup.plugins.visualizations.createReactVisualization({
-  name: 'self_changing_vis',
-  title: 'Self Changing Vis',
-  icon: 'controlsHorizontal',
-  description:
-    'This visualization is able to change its own settings, that you could also set in the editor.',
-  visConfig: {
-    component: SelfChangingComponent,
-    defaults: {
-      counter: 0,
-    },
-  },
-  editorConfig: {
-    optionTabs: [
-      {
-        name: 'options',
-        title: 'Options',
-        editor: SelfChangingEditor,
-      },
-    ],
-  },
-  requestHandler: 'none',
-});
diff --git a/tsconfig.json b/tsconfig.json
index 66906fb18bb80a..819cb5dc4c1e3c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,9 +7,6 @@
       "kibana/public": ["src/core/public"],
       "kibana/server": ["src/core/server"],
       "plugins/*": ["src/legacy/core_plugins/*/public/"],
-      "ui/*": [
-        "src/legacy/ui/public/*"
-      ],
       "test_utils/*": [
         "src/test_utils/public/*"
       ],
diff --git a/x-pack/dev-tools/jest/create_jest_config.js b/x-pack/dev-tools/jest/create_jest_config.js
index a0574dbdf36da6..a693e008db6ea0 100644
--- a/x-pack/dev-tools/jest/create_jest_config.js
+++ b/x-pack/dev-tools/jest/create_jest_config.js
@@ -13,7 +13,6 @@ export function createJestConfig({ kibanaDirectory, rootDir, xPackKibanaDirector
     moduleNameMapper: {
       '@elastic/eui$': `${kibanaDirectory}/node_modules/@elastic/eui/test-env`,
       '@elastic/eui/lib/(.*)?': `${kibanaDirectory}/node_modules/@elastic/eui/test-env/$1`,
-      '^ui/(.*)': `${kibanaDirectory}/src/legacy/ui/public/$1`,
       '^fixtures/(.*)': `${kibanaDirectory}/src/fixtures/$1`,
       'uiExports/(.*)': fileMockPath,
       '^src/core/(.*)': `${kibanaDirectory}/src/core/$1`,
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.test.ts
index 882d1e2ea58b9a..33260b5c9303fb 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_lens.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.
  */
-jest.mock('ui/new_platform');
+
 import { savedLens } from './saved_lens';
 import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.test.ts
index 74e41a030de35d..b2de0b6526d1e7 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_map.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.
  */
-jest.mock('ui/new_platform');
+
 import { savedMap } from './saved_map';
 import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.test.ts
index 9bd32202b563a0..7d5952754aa908 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_search.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.
  */
-jest.mock('ui/new_platform');
+
 import { savedSearch } from './saved_search';
 import { buildEmbeddableFilters } from '../../../public/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.test.ts
index 8327c1433b9af4..a64fb167dd19f0 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.test.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/external/saved_visualization.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.
  */
-jest.mock('ui/new_platform');
+
 import { savedVisualization } from './saved_visualization';
 import { getQueryFilters } from '../../../public/lib/build_embeddable_filters';
 import { ExpressionValueFilter } from '../../../types';
diff --git a/x-pack/plugins/canvas/common/lib/autocomplete.test.ts b/x-pack/plugins/canvas/common/lib/autocomplete.test.ts
index f7a773f6ca36a2..777810cad05ba6 100644
--- a/x-pack/plugins/canvas/common/lib/autocomplete.test.ts
+++ b/x-pack/plugins/canvas/common/lib/autocomplete.test.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('ui/new_platform');
 import { functionSpecs } from '../../__tests__/fixtures/function_specs';
 
 import {
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx
index e8b772e0f2fbd8..b037d30ada12f6 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx
+++ b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx
@@ -14,7 +14,6 @@ import {
 import { METRIC_TYPE } from '../../../lib/ui_metric';
 import { ResolvedArgType } from '../../../../types';
 
-jest.mock('ui/new_platform');
 const trackMetric = jest.fn();
 const Component = withUnconnectedElementsLoadedTelemetry(() => <div />, trackMetric);
 
diff --git a/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
index bf69a862d5c300..e451a39df06db4 100644
--- a/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
+++ b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('ui/new_platform'); // actions/elements has some dependencies on ui/new_platform.
 jest.mock('../../../lib/app_state');
 
 import { workpadRefresh } from '../workpad_refresh';
diff --git a/x-pack/plugins/canvas/public/state/reducers/embeddables.test.ts b/x-pack/plugins/canvas/public/state/reducers/embeddables.test.ts
index 5b1192630897a2..08b59e5fedc440 100644
--- a/x-pack/plugins/canvas/public/state/reducers/embeddables.test.ts
+++ b/x-pack/plugins/canvas/public/state/reducers/embeddables.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.
  */
-jest.mock('ui/new_platform');
+
 import { State } from '../../../types';
 import { updateEmbeddableExpression } from '../actions/embeddable';
 import { embeddableReducer } from './embeddable';
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js
index eda275ba50c1a6..cdb107016e4659 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_form.test.js
@@ -11,8 +11,6 @@ jest.mock('../services/auto_follow_pattern_validators', () => ({
   validateLeaderIndexPattern: jest.fn(),
 }));
 
-jest.mock('ui/new_platform');
-
 describe('<AutoFollowPatternForm state update', () => {
   describe('updateFormErrors()', () => {
     it('should merge errors with existing fieldsErrors', () => {
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.test.js b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.test.js
index 93da20a8ed93c6..72c4832a631a7c 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/follower_index_form/follower_index_form.test.js
@@ -6,8 +6,6 @@
 
 import { updateFields, updateFormErrors } from './follower_index_form';
 
-jest.mock('ui/new_platform');
-
 describe('<FollowerIndexForm /> state transitions', () => {
   it('updateFormErrors() should merge errors with existing fieldsErrors', () => {
     const errors = { name: 'Some error' };
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js b/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js
index 11ec125c17d59c..924bbe708c73a4 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/services/auto_follow_pattern_validators.test.js
@@ -6,8 +6,6 @@
 
 import { validateAutoFollowPattern } from './auto_follow_pattern_validators';
 
-jest.mock('ui/new_platform');
-
 describe('Auto-follow pattern validators', () => {
   describe('validateAutoFollowPattern()', () => {
     it('returns empty object when autoFollowPattern is undefined', () => {
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/store/reducers/api.test.js b/x-pack/plugins/cross_cluster_replication/public/app/store/reducers/api.test.js
index 01dccf70a21d6e..a3655df1f89566 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/store/reducers/api.test.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/store/reducers/api.test.js
@@ -8,7 +8,6 @@ import { reducer, initialState } from './api';
 import { API_STATUS } from '../../constants';
 import { apiRequestStart, apiRequestEnd, setApiError } from '../actions';
 
-jest.mock('ui/new_platform');
 jest.mock('../../constants', () => ({
   API_STATUS: {
     IDLE: 'idle',
diff --git a/x-pack/plugins/graph/public/components/search_bar.test.tsx b/x-pack/plugins/graph/public/components/search_bar.test.tsx
index 100122af943e18..1b783df1b7d026 100644
--- a/x-pack/plugins/graph/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/graph/public/components/search_bar.test.tsx
@@ -21,7 +21,6 @@ import { ReactWrapper } from 'enzyme';
 import { createMockGraphStore } from '../state_management/mocks';
 import { Provider } from 'react-redux';
 
-jest.mock('ui/new_platform');
 jest.mock('../services/source_modal', () => ({ openSourceModal: jest.fn() }));
 
 const waitForIndexPatternFetch = () => new Promise((r) => setTimeout(r));
diff --git a/x-pack/plugins/graph/public/state_management/mocks.ts b/x-pack/plugins/graph/public/state_management/mocks.ts
index d32bc9a175a47c..f28f51544a6ede 100644
--- a/x-pack/plugins/graph/public/state_management/mocks.ts
+++ b/x-pack/plugins/graph/public/state_management/mocks.ts
@@ -17,8 +17,6 @@ import { GraphStoreDependencies, createRootReducer, GraphStore, GraphState } fro
 import { Workspace, GraphWorkspaceSavedObject, IndexPatternSavedObject } from '../types';
 import { IndexPattern } from '../../../../../src/plugins/data/public';
 
-jest.mock('ui/new_platform');
-
 export interface MockedGraphEnvironment {
   store: GraphStore;
   mockedDeps: jest.Mocked<GraphStoreDependencies>;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
index 7c7c0b70c0eedf..81eb1c8cad1358 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/ui_metric.test.ts
@@ -14,7 +14,6 @@ import {
 } from '../constants/';
 
 import { getUiMetricsForPhases } from './ui_metric';
-jest.mock('ui/new_platform');
 
 describe('getUiMetricsForPhases', () => {
   test('gets cold phase', () => {
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts
index a112d73230b82b..2a0585d61d6f6d 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts
@@ -12,11 +12,6 @@ import { ComponentTemplateDeserialized } from '../../shared_imports';
 
 const { setup } = pageHelpers.componentTemplateDetails;
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 const COMPONENT_TEMPLATE: ComponentTemplateDeserialized = {
   name: 'comp-1',
   template: {
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_list.test.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_list.test.ts
index bd6ac273758363..9bf7df263ec26c 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_list.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_list.test.ts
@@ -14,11 +14,6 @@ import { API_BASE_PATH } from './helpers/constants';
 
 const { setup } = pageHelpers.componentTemplateList;
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 describe('<ComponentTemplateList />', () => {
   const { server, httpRequestsMockHelpers } = setupEnvironment();
   let testBed: ComponentTemplateListTestBed;
diff --git a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_list.test.ts b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_list.test.ts
index 8d6a83a625651a..c0acc39ca35a1c 100644
--- a/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_list.test.ts
+++ b/x-pack/plugins/ingest_pipelines/__jest__/client_integration/ingest_pipelines_list.test.ts
@@ -13,11 +13,6 @@ import { PipelineListTestBed } from './helpers/pipelines_list.helpers';
 
 const { setup } = pageHelpers.pipelinesList;
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 describe('<PipelinesList />', () => {
   const { server, httpRequestsMockHelpers } = setupEnvironment();
   let testBed: PipelineListTestBed;
diff --git a/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx
index 52524d0c9a5fae..c5d6ced76b5c01 100644
--- a/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/ems_file_source/ems_file_source.test.tsx
@@ -6,7 +6,6 @@
 
 import { EMSFileSource } from './ems_file_source';
 
-jest.mock('ui/new_platform');
 jest.mock('../../layers/vector_layer/vector_layer', () => {});
 
 function makeEMSFileSource(tooltipProperties: string[]) {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
index 87abbedfdf50e2..cf0170ab7f1bdd 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_agg_source/es_agg_source.test.ts
@@ -11,8 +11,6 @@ import _ from 'lodash';
 import { AGG_TYPE } from '../../../../common/constants';
 import { AggDescriptor } from '../../../../common/descriptor_types';
 
-jest.mock('ui/new_platform');
-
 const sumFieldName = 'myFieldGettingSummed';
 const metricExamples = [
   {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
index 37193e148bdc7f..43bfb74bf54b68 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
@@ -6,7 +6,6 @@
 import { MapExtent, MapFilters } from '../../../../common/descriptor_types';
 
 jest.mock('../../../kibana_services');
-jest.mock('ui/new_platform');
 
 import { getIndexPatternService, getSearchService } from '../../../kibana_services';
 import { ESGeoGridSource } from './es_geo_grid_source';
diff --git a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js
index f6779206868a59..060096157f5781 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_term_source/es_term_source.test.js
@@ -6,7 +6,6 @@
 
 import { ESTermSource, extractPropertiesMap } from './es_term_source';
 
-jest.mock('ui/new_platform');
 jest.mock('../../layers/vector_layer/vector_layer', () => {});
 
 const indexPatternTitle = 'myIndex';
diff --git a/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.test.tsx b/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.test.tsx
index aa4dbc67e8e4de..f082e67512099a 100644
--- a/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/heatmap/components/heatmap_style_editor.test.tsx
@@ -9,8 +9,6 @@ import { shallow } from 'enzyme';
 
 import { HeatmapStyleEditor } from './heatmap_style_editor';
 
-jest.mock('ui/new_platform');
-
 describe('HeatmapStyleEditor', () => {
   test('is rendered', () => {
     const component = shallow(
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
index 62a6a59dd091ba..c3610cbc78e15f 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('ui/new_platform');
 jest.mock('../components/vector_style_editor', () => ({
   VectorStyleEditor: () => {
     return <div>mockVectorStyleEditor</div>;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.test.tsx
index af93c8e0c9d6db..06987ab8bcc48f 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_icon_property.test.tsx
@@ -6,7 +6,6 @@
 
 import { shallow } from 'enzyme';
 
-jest.mock('ui/new_platform');
 jest.mock('../components/vector_style_editor', () => ({
   VectorStyleEditor: () => {
     return <div>mockVectorStyleEditor</div>;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
index db44ae0da562d4..c5298067f6cbe7 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_size_property.test.tsx
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('ui/new_platform');
 jest.mock('../components/vector_style_editor', () => ({
   VectorStyleEditor: () => {
     return <div>mockVectorStyleEditor</div>;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
index a85cd0cc864075..28801a402ca14d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
+++ b/x-pack/plugins/maps/public/classes/styles/vector/vector_style.test.js
@@ -14,7 +14,6 @@ import {
 } from '../../../../common/constants';
 
 jest.mock('../../../kibana_services');
-jest.mock('ui/new_platform');
 
 class MockField {
   constructor({ fieldName }) {
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.ts b/x-pack/plugins/security/server/authorization/authorization_service.ts
index 4190499cbd5f43..2dead301b298a4 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.ts
+++ b/x-pack/plugins/security/server/authorization/authorization_service.ts
@@ -5,7 +5,7 @@
  */
 
 import { Subscription, Observable } from 'rxjs';
-import { UICapabilities } from 'ui/capabilities';
+import type { Capabilities as UICapabilities } from '../../../../../src/core/types';
 import {
   LoggerFactory,
   KibanaRequest,
diff --git a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
index c126be1b07f6e3..41d596d570fb97 100644
--- a/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
+++ b/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts
@@ -5,7 +5,7 @@
  */
 
 import { flatten, isObject, mapValues } from 'lodash';
-import { UICapabilities } from 'ui/capabilities';
+import type { Capabilities as UICapabilities } from '../../../../../src/core/types';
 import { KibanaRequest, Logger } from '../../../../../src/core/server';
 import { Feature } from '../../../features/server';
 
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
index 0abc47686a6b4b..6021ab2a42c90e 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/home.test.ts
@@ -20,13 +20,6 @@ import { REPOSITORY_NAME } from './helpers/constant';
 
 const { setup } = pageHelpers.home;
 
-jest.mock('ui/new_platform');
-
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 // Mocking FormattedDate and FormattedTime due to timezone differences on CI
 jest.mock('@kbn/i18n/react', () => {
   const original = jest.requireActual('@kbn/i18n/react');
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
index f480e937f162a8..dc568161d4fb4f 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
@@ -17,11 +17,6 @@ import { DEFAULT_POLICY_SCHEDULE } from '../../public/application/constants';
 
 const { setup } = pageHelpers.policyAdd;
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 // mock for EuiSelectable's virtualization
 jest.mock('react-virtualized-auto-sizer', () => {
   return ({
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts
index 7eec80890ca86a..a5b2ec73b85cd1 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_edit.test.ts
@@ -18,11 +18,6 @@ const { setup: setupPolicyAdd } = pageHelpers.policyAdd;
 const EXPIRE_AFTER_VALUE = '5';
 const EXPIRE_AFTER_UNIT = TIME_UNITS.MINUTE;
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 describe('<PolicyEdit />', () => {
   let testBed: PolicyFormTestBed;
   let testBedPolicyAdd: PolicyFormTestBed;
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts
index 2a9e17a1c9c4dd..e0c9aeffa09e8d 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_add.test.ts
@@ -11,16 +11,9 @@ import { RepositoryType } from '../../common/types';
 import { setupEnvironment, pageHelpers, nextTick } from './helpers';
 import { RepositoryAddTestBed } from './helpers/repository_add.helpers';
 
-jest.mock('ui/new_platform');
-
 const { setup } = pageHelpers.repositoryAdd;
 const repositoryTypes = ['fs', 'url', 'source', 'azure', 'gcs', 's3', 'hdfs'];
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 describe('<RepositoryAdd />', () => {
   let testBed: RepositoryAddTestBed;
 
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts
index bab276584966bb..1606db07b57b47 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/repository_edit.test.ts
@@ -12,16 +12,9 @@ import { RepositoryEditTestSubjects } from './helpers/repository_edit.helpers';
 import { RepositoryAddTestSubjects } from './helpers/repository_add.helpers';
 import { REPOSITORY_EDIT } from './helpers/constant';
 
-jest.mock('ui/new_platform');
-
 const { setup } = pageHelpers.repositoryEdit;
 const { setup: setupRepositoryAdd } = pageHelpers.repositoryAdd;
 
-jest.mock('ui/i18n', () => {
-  const I18nContext = ({ children }: any) => children;
-  return { I18nContext };
-});
-
 describe('<RepositoryEdit />', () => {
   let testBed: TestBed<RepositoryEditTestSubjects>;
   let testBedRepositoryAdd: TestBed<RepositoryAddTestSubjects>;
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 83dac4912d4ac1..89a020bd044cc3 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -253,31 +253,6 @@
     "charts.controls.rangeErrorMessage": "値は{min}と{max}の間でなければなりません",
     "charts.controls.vislibBasicOptions.legendPositionLabel": "凡例位置",
     "charts.controls.vislibBasicOptions.showTooltipLabel": "ツールヒントを表示",
-    "common.ui.flotCharts.aprLabel": "4 月",
-    "common.ui.flotCharts.augLabel": "8 月",
-    "common.ui.flotCharts.decLabel": "12 月",
-    "common.ui.flotCharts.febLabel": "2 月",
-    "common.ui.flotCharts.friLabel": "金",
-    "common.ui.flotCharts.janLabel": "1 月",
-    "common.ui.flotCharts.julLabel": "7 月",
-    "common.ui.flotCharts.junLabel": "6 月",
-    "common.ui.flotCharts.marLabel": "3 月",
-    "common.ui.flotCharts.mayLabel": "5 月",
-    "common.ui.flotCharts.monLabel": "月",
-    "common.ui.flotCharts.novLabel": "11 月",
-    "common.ui.flotCharts.octLabel": "10 月",
-    "common.ui.flotCharts.pie.unableToDrawLabelsInsideCanvasErrorMessage": "キャンバス内のラベルではパイを作成できません",
-    "common.ui.flotCharts.satLabel": "土",
-    "common.ui.flotCharts.sepLabel": "9 月",
-    "common.ui.flotCharts.sunLabel": "日",
-    "common.ui.flotCharts.thuLabel": "木",
-    "common.ui.flotCharts.tueLabel": "火",
-    "common.ui.flotCharts.wedLabel": "水",
-    "common.ui.stateManagement.unableToParseUrlErrorMessage": "URL をパースできません",
-    "common.ui.stateManagement.unableToRestoreUrlErrorMessage": "URL を完全に復元できません。共有機能を使用していることを確認してください。",
-    "common.ui.stateManagement.unableToStoreHistoryInSessionErrorMessage": "セッションがいっぱいで安全に削除できるアイテムが見つからないため、Kibana は履歴アイテムを保存できません。\n\nこれは大抵新規タブに移動することで解決されますが、より大きな問題が原因である可能性もあります。このメッセージが定期的に表示される場合は、{gitHubIssuesUrl} で問題を報告してください。",
-    "common.ui.url.replacementFailedErrorMessage": "置換に失敗、未解決の表現式: {expr}",
-    "common.ui.url.savedObjectIsMissingNotificationMessage": "保存されたオブジェクトがありません",
     "console.autocomplete.addMethodMetaText": "メソド",
     "console.consoleDisplayName": "コンソール",
     "console.consoleMenu.copyAsCurlMessage": "リクエストが URL としてコピーされました",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 8b3a1941f450a4..68c1b5dab92955 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -253,31 +253,6 @@
     "charts.controls.rangeErrorMessage": "值必须是在 {min} 到 {max} 的范围内",
     "charts.controls.vislibBasicOptions.legendPositionLabel": "图例位置",
     "charts.controls.vislibBasicOptions.showTooltipLabel": "显示工具提示",
-    "common.ui.flotCharts.aprLabel": "四月",
-    "common.ui.flotCharts.augLabel": "八月",
-    "common.ui.flotCharts.decLabel": "十二月",
-    "common.ui.flotCharts.febLabel": "二月",
-    "common.ui.flotCharts.friLabel": "周五",
-    "common.ui.flotCharts.janLabel": "一月",
-    "common.ui.flotCharts.julLabel": "七月",
-    "common.ui.flotCharts.junLabel": "六月",
-    "common.ui.flotCharts.marLabel": "三月",
-    "common.ui.flotCharts.mayLabel": "五月",
-    "common.ui.flotCharts.monLabel": "周一",
-    "common.ui.flotCharts.novLabel": "十一月",
-    "common.ui.flotCharts.octLabel": "十月",
-    "common.ui.flotCharts.pie.unableToDrawLabelsInsideCanvasErrorMessage": "无法用画布内包含的标签绘制饼图",
-    "common.ui.flotCharts.satLabel": "周六",
-    "common.ui.flotCharts.sepLabel": "九月",
-    "common.ui.flotCharts.sunLabel": "周日",
-    "common.ui.flotCharts.thuLabel": "周四",
-    "common.ui.flotCharts.tueLabel": "周二",
-    "common.ui.flotCharts.wedLabel": "周三",
-    "common.ui.stateManagement.unableToParseUrlErrorMessage": "无法解析 URL",
-    "common.ui.stateManagement.unableToRestoreUrlErrorMessage": "无法完整还原 URL，确保使用共享功能。",
-    "common.ui.stateManagement.unableToStoreHistoryInSessionErrorMessage": "Kibana 无法将历史记录项存储在您的会话中，因为其已满，并且似乎没有任何可安全删除的项。\n\n通常可通过移至新的标签页来解决此问题，但这会导致更大的问题。如果您有规律地看到此消息，请在 {gitHubIssuesUrl} 提交问题。",
-    "common.ui.url.replacementFailedErrorMessage": "替换失败，未解析的表达式：{expr}",
-    "common.ui.url.savedObjectIsMissingNotificationMessage": "已保存对象缺失",
     "console.autocomplete.addMethodMetaText": "方法",
     "console.consoleDisplayName": "控制台",
     "console.consoleMenu.copyAsCurlMessage": "请求已复制为 cURL",
diff --git a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
index 5f2e9d07c4bcba..9fb3a54d5a1825 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/can_inherit_time_range.test.ts
@@ -10,8 +10,6 @@ import { HelloWorldEmbeddable } from '../../../../examples/embeddable_examples/p
 /** eslint-enable */
 import { TimeRangeEmbeddable, TimeRangeContainer } from './test_helpers';
 
-jest.mock('ui/new_platform');
-
 test('canInheritTimeRange returns false if embeddable is inside container without a time range', () => {
   const embeddable = new TimeRangeEmbeddable(
     { id: '1234', timeRange: { from: 'noxw-15m', to: 'now' } },
diff --git a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
index 7919d2d2482ae6..9af79c9ac52597 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/custom_time_range_action.test.ts
@@ -21,8 +21,6 @@ import {
 import { nextTick } from 'test_utils/enzyme_helpers';
 import { ReactElement } from 'react';
 
-jest.mock('ui/new_platform');
-
 const createOpenModalMock = () => {
   const mock = jest.fn();
   mock.mockReturnValue({ close: jest.fn() });
diff --git a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
index 7f831973aea5c1..e567828598b317 100644
--- a/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
+++ b/x-pack/test/ui_capabilities/common/services/ui_capabilities.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import axios, { AxiosInstance } from 'axios';
-import { UICapabilities } from 'ui/capabilities';
+import type { Capabilities as UICapabilities } from 'src/core/types';
 import { format as formatUrl } from 'url';
 import util from 'util';
 import { ToolingLog } from '@kbn/dev-utils';
diff --git a/x-pack/test_utils/jest/config.js b/x-pack/test_utils/jest/config.js
index 7bb073023b7f8b..c94fe02d2f4bdb 100644
--- a/x-pack/test_utils/jest/config.js
+++ b/x-pack/test_utils/jest/config.js
@@ -17,7 +17,6 @@ export default {
   ],
   collectCoverageFrom: ['legacy/plugins/**/*.js', 'legacy/common/**/*.js', 'legacy/server/**/*.js'],
   moduleNameMapper: {
-    '^ui/(.*)': '<rootDir>**/public/$1',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$':
       '<rootDir>/src/dev/jest/mocks/file_mock.js',
     '\\.(css|less|scss)$': '<rootDir>/../src/dev/jest/mocks/style_mock.js',
diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
index e978702a356342..35e1800c6fbd19 100644
--- a/x-pack/tsconfig.json
+++ b/x-pack/tsconfig.json
@@ -22,9 +22,6 @@
     "paths": {
       "kibana/public": ["src/core/public"],
       "kibana/server": ["src/core/server"],
-      "ui/*": [
-        "src/legacy/ui/public/*"
-      ],
       "plugins/xpack_main/*": [
         "x-pack/legacy/plugins/xpack_main/public/*"
       ],

From 69461cc6184e661b0a2d6196b1082d63629ed6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= <mdelapenya@gmail.com>
Date: Tue, 1 Sep 2020 10:10:01 +0200
Subject: [PATCH 134/216] [APM UI] Rephrase BDD steps for RUM scenarios
 (#72492)

* chore: group tests doing the same

This will reduce the time it takes to execute the tests

* chore: rephrase step

* chore: extract common code to a function

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../rum_dashboard.feature.disabled            | 14 ++-----
 .../rum/client_metrics_helper.ts              | 37 +++++++++++++++++++
 .../step_definitions/rum/page_load_dist.ts    |  2 +-
 .../step_definitions/rum/rum_dashboard.ts     | 15 ++------
 .../rum/service_name_filter.ts                | 13 ++-----
 5 files changed, 48 insertions(+), 33 deletions(-)
 create mode 100644 x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/client_metrics_helper.ts

diff --git a/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature.disabled b/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature.disabled
index be1597c8340ebe..727898773904e1 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature.disabled
+++ b/x-pack/plugins/apm/e2e/cypress/integration/rum_dashboard.feature.disabled
@@ -12,20 +12,14 @@ Feature: RUM Dashboard
       | os         |
       | location   |
 
-  Scenario: Page load distribution percentiles
+  Scenario: Display RUM Data components
     When a user browses the APM UI application for RUM Data
     Then should display percentile for page load chart
-
-  Scenario: Page load distribution chart tooltip
-    When a user browses the APM UI application for RUM Data
-    Then should display tooltip on hover
-
-  Scenario: Page load distribution chart legends
-    When a user browses the APM UI application for RUM Data
-    Then should display chart legend
+      And should display tooltip on hover
+      And should display chart legend
 
   Scenario: Breakdown filter
-    Given a user click page load breakdown filter
+    Given a user clicks the page load breakdown filter
     When the user selected the breakdown
     Then breakdown series should appear in chart
 
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/client_metrics_helper.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/client_metrics_helper.ts
new file mode 100644
index 00000000000000..1cc36059b8ff8e
--- /dev/null
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/client_metrics_helper.ts
@@ -0,0 +1,37 @@
+/*
+ * 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_TIMEOUT } from './rum_dashboard';
+
+/**
+ * Verifies the behavior of the client metrics component
+ * @param metrics array of three elements
+ * @param checkTitleStatus if it's needed to check title elements
+ */
+export function verifyClientMetrics(
+  metrics: string[],
+  checkTitleStatus: boolean
+) {
+  const clientMetricsSelector = '[data-cy=client-metrics] .euiStat__title';
+
+  // wait for all loading to finish
+  cy.get('kbnLoadingIndicator').should('not.be.visible');
+
+  if (checkTitleStatus) {
+    cy.get('.euiStat__title', { timeout: DEFAULT_TIMEOUT }).should(
+      'be.visible'
+    );
+    cy.get('.euiSelect-isLoading').should('not.be.visible');
+  }
+
+  cy.get('.euiStat__title-isLoading').should('not.be.visible');
+
+  cy.get(clientMetricsSelector).eq(0).should('have.text', metrics[0]);
+
+  cy.get(clientMetricsSelector).eq(1).should('have.text', metrics[1]);
+
+  cy.get(clientMetricsSelector).eq(2).should('have.text', metrics[2]);
+}
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
index f319f7ef986673..d671bdc0078ebf 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/page_load_dist.ts
@@ -9,7 +9,7 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
 /** The default time in ms to wait for a Cypress command to complete */
 export const DEFAULT_TIMEOUT = 60 * 1000;
 
-Given(`a user click page load breakdown filter`, () => {
+Given(`a user clicks the page load breakdown filter`, () => {
   // wait for all loading to finish
   cy.get('kbnLoadingIndicator').should('not.be.visible');
   cy.get('.euiStat__title-isLoading').should('not.be.visible');
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts
index 8e010d5180f881..804974d8d437d7 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/rum_dashboard.ts
@@ -6,6 +6,7 @@
 
 import { Given, Then } from 'cypress-cucumber-preprocessor/steps';
 import { loginAndWaitForPage } from '../../../integration/helpers';
+import { verifyClientMetrics } from './client_metrics_helper';
 
 /** The default time in ms to wait for a Cypress command to complete */
 export const DEFAULT_TIMEOUT = 60 * 1000;
@@ -21,19 +22,9 @@ Given(`a user browses the APM UI application for RUM Data`, () => {
 });
 
 Then(`should have correct client metrics`, () => {
-  const clientMetrics = '[data-cy=client-metrics] .euiStat__title';
+  const metrics = ['0.01 sec', '0.08 sec', '55 '];
 
-  // wait for all loading to finish
-  cy.get('kbnLoadingIndicator').should('not.be.visible');
-  cy.get('.euiStat__title', { timeout: DEFAULT_TIMEOUT }).should('be.visible');
-  cy.get('.euiSelect-isLoading').should('not.be.visible');
-  cy.get('.euiStat__title-isLoading').should('not.be.visible');
-
-  cy.get(clientMetrics).eq(2).should('have.text', '55 ');
-
-  cy.get(clientMetrics).eq(1).should('have.text', '0.08 sec');
-
-  cy.get(clientMetrics).eq(0).should('have.text', '0.01 sec');
+  verifyClientMetrics(metrics, true);
 });
 
 Then(`should display percentile for page load chart`, () => {
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts
index b0694c902085ad..68fc4d528543ac 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/rum/service_name_filter.ts
@@ -6,6 +6,7 @@
 
 import { When, Then } from 'cypress-cucumber-preprocessor/steps';
 import { DEFAULT_TIMEOUT } from '../apm';
+import { verifyClientMetrics } from './client_metrics_helper';
 
 When('a user changes the selected service name', (filterName) => {
   // wait for all loading to finish
@@ -16,15 +17,7 @@ When('a user changes the selected service name', (filterName) => {
 });
 
 Then(`it displays relevant client metrics`, () => {
-  const clientMetrics = '[data-cy=client-metrics] .euiStat__title';
+  const metrics = ['0.01 sec', '0.07 sec', '7 '];
 
-  // wait for all loading to finish
-  cy.get('kbnLoadingIndicator').should('not.be.visible');
-  cy.get('.euiStat__title-isLoading').should('not.be.visible');
-
-  cy.get(clientMetrics).eq(2).should('have.text', '7 ');
-
-  cy.get(clientMetrics).eq(1).should('have.text', '0.07 sec');
-
-  cy.get(clientMetrics).eq(0).should('have.text', '0.01 sec');
+  verifyClientMetrics(metrics, false);
 });

From ec1c158e09a7a45b79ef8c17f10351e3e71229b6 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 1 Sep 2020 12:01:04 +0200
Subject: [PATCH 135/216] restore dummy documentation_links.ts file to fix doc
 build (#76354)

---
 .../documentation_links.ts                    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 src/legacy/ui/public/documentation_links/documentation_links.ts

diff --git a/src/legacy/ui/public/documentation_links/documentation_links.ts b/src/legacy/ui/public/documentation_links/documentation_links.ts
new file mode 100644
index 00000000000000..2520fb71801600
--- /dev/null
+++ b/src/legacy/ui/public/documentation_links/documentation_links.ts
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+/*
+  WARNING: The links in this file are validated during the docs build. This is accomplished with some regex magic that
+  looks for these particular constants. As a result, we should not add new constants or change the existing ones.
+  If you absolutely must make a change, talk to Clinton Gormley first so he can update his Perl scripts.
+ */
+export const DOC_LINK_VERSION = 'stub';
+export const ELASTIC_WEBSITE_URL = 'stub';
+
+export const documentationLinks = {};

From e7966e9d46870fa8da46d6d361200073593f9374 Mon Sep 17 00:00:00 2001
From: Angela Chuang <6295984+angorayc@users.noreply.github.com>
Date: Tue, 1 Sep 2020 11:06:38 +0100
Subject: [PATCH 136/216] [Security Solution]  Add tests for import / export
 timelines (#75537)

* add intergration test for install prebuilt timelines

* add integration tests

* add functional test for export timeline

* clean up

* asserts the content of the exported timeline

* update selector

* update selector

* reuses the timeline id from the expected exported file

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Gloria Hornero <snootchie.boochies@gmail.com>
---
 .../integration/timelines_export.spec.ts      |  41 ++
 .../cypress/screens/timeline.ts               |  10 +
 .../cypress/tasks/timeline.ts                 |  14 +
 .../expected_timelines_export.ndjson          |   1 +
 .../common/components/link_icon/index.tsx     |   4 +-
 .../open_timeline/open_timeline.tsx           |   2 +-
 .../basic/tests/add_prepackaged_rules.ts      |  46 +-
 .../basic/tests/import_timelines.ts           | 403 ++++++++++++++++++
 .../basic/tests/index.ts                      |   1 +
 .../tests/install_prepackaged_timelines.ts    |  87 ++++
 10 files changed, 605 insertions(+), 4 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts
 create mode 100644 x-pack/plugins/security_solution/cypress/test_files/expected_timelines_export.ndjson
 create mode 100644 x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
 create mode 100644 x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts

diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.ts
new file mode 100644
index 00000000000000..d8f96aaf5e5639
--- /dev/null
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines_export.spec.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 { exportTimeline, waitForTimelinesPanelToBeLoaded } from '../tasks/timeline';
+import { esArchiverLoad, esArchiverUnload } from '../tasks/es_archiver';
+import { loginAndWaitForPageWithoutDateRange } from '../tasks/login';
+
+import { TIMELINES_URL } from '../urls/navigation';
+
+const EXPECTED_EXPORTED_TIMELINE_PATH = 'cypress/test_files/expected_timelines_export.ndjson';
+
+describe('Export timelines', () => {
+  before(() => {
+    esArchiverLoad('timeline');
+    cy.server();
+    cy.route('POST', '**api/timeline/_export?file_name=timelines_export.ndjson*').as('export');
+  });
+
+  after(() => {
+    esArchiverUnload('timeline');
+  });
+
+  it('Exports a custom timeline', () => {
+    loginAndWaitForPageWithoutDateRange(TIMELINES_URL);
+    waitForTimelinesPanelToBeLoaded();
+
+    cy.readFile(EXPECTED_EXPORTED_TIMELINE_PATH).then(($expectedExportedJson) => {
+      const parsedJson = JSON.parse($expectedExportedJson);
+      const timelineId = parsedJson.savedObjectId;
+      exportTimeline(timelineId);
+
+      cy.wait('@export').then((response) => {
+        cy.wrap(response.status).should('eql', 200);
+        cy.wrap(response.xhr.responseText).should('eql', $expectedExportedJson);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/cypress/screens/timeline.ts b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
index 26203a8ca3b839..fd41cd63fc090a 100644
--- a/x-pack/plugins/security_solution/cypress/screens/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/timeline.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export const BULK_ACTIONS = '[data-test-subj="utility-bar-action-button"]';
+
 export const CLOSE_TIMELINE_BTN = '[data-test-subj="close-timeline"]';
 
 export const CREATE_NEW_TIMELINE = '[data-test-subj="timeline-new"]';
@@ -11,6 +13,8 @@ export const CREATE_NEW_TIMELINE = '[data-test-subj="timeline-new"]';
 export const DRAGGABLE_HEADER =
   '[data-test-subj="events-viewer-panel"] [data-test-subj="headers-group"] [data-test-subj="draggable-header"]';
 
+export const EXPORT_TIMELINE_ACTION = '[data-test-subj="export-timeline-action"]';
+
 export const HEADER = '[data-test-subj="header"]';
 
 export const HEADERS_GROUP = '[data-test-subj="headers-group"]';
@@ -41,6 +45,10 @@ export const TIMELINE = (id: string) => {
 
 export const TIMELINE_CHANGES_IN_PROGRESS = '[data-test-subj="timeline"] .euiProgress';
 
+export const TIMELINE_CHECKBOX = (id: string) => {
+  return `[data-test-subj="checkboxSelectRow-${id}"]`;
+};
+
 export const TIMELINE_COLUMN_SPINNER = '[data-test-subj="timeline-loading-spinner"]';
 
 export const TIMELINE_DATA_PROVIDERS = '[data-test-subj="dataProviders"]';
@@ -70,6 +78,8 @@ export const TIMELINE_SETTINGS_ICON = '[data-test-subj="settings-gear"]';
 
 export const TIMELINE_TITLE = '[data-test-subj="timeline-title"]';
 
+export const TIMELINES_TABLE = '[data-test-subj="timelines-table"]';
+
 export const TIMESTAMP_HEADER_FIELD = '[data-test-subj="header-text-@timestamp"]';
 
 export const TIMESTAMP_TOGGLE_FIELD = '[data-test-subj="toggle-field-@timestamp"]';
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index 08624df06e096d..6fb8bb5e29ae5e 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -5,8 +5,11 @@
  */
 
 import {
+  BULK_ACTIONS,
   CLOSE_TIMELINE_BTN,
   CREATE_NEW_TIMELINE,
+  EXPORT_TIMELINE_ACTION,
+  TIMELINE_CHECKBOX,
   HEADER,
   ID_FIELD,
   ID_HEADER_FIELD,
@@ -20,6 +23,7 @@ import {
   TIMELINE_INSPECT_BUTTON,
   TIMELINE_SETTINGS_ICON,
   TIMELINE_TITLE,
+  TIMELINES_TABLE,
   TIMESTAMP_TOGGLE_FIELD,
   TOGGLE_TIMELINE_EXPAND_EVENT,
   REMOVE_COLUMN,
@@ -66,6 +70,12 @@ export const expandFirstTimelineEventDetails = () => {
   cy.get(TOGGLE_TIMELINE_EXPAND_EVENT).first().click({ force: true });
 };
 
+export const exportTimeline = (timelineId: string) => {
+  cy.get(TIMELINE_CHECKBOX(timelineId)).click({ force: true });
+  cy.get(BULK_ACTIONS).click({ force: true });
+  cy.get(EXPORT_TIMELINE_ACTION).click();
+};
+
 export const openTimelineFieldsBrowser = () => {
   cy.get(TIMELINE_FIELDS_BUTTON).click({ force: true });
 };
@@ -122,6 +132,10 @@ export const resetFields = () => {
   cy.get(RESET_FIELDS).click({ force: true });
 };
 
+export const waitForTimelinesPanelToBeLoaded = () => {
+  cy.get(TIMELINES_TABLE).should('exist');
+};
+
 export const waitForTimelineChanges = () => {
   cy.get(TIMELINE_CHANGES_IN_PROGRESS).should('exist');
   cy.get(TIMELINE_CHANGES_IN_PROGRESS).should('not.exist');
diff --git a/x-pack/plugins/security_solution/cypress/test_files/expected_timelines_export.ndjson b/x-pack/plugins/security_solution/cypress/test_files/expected_timelines_export.ndjson
new file mode 100644
index 00000000000000..9cca356a8b0521
--- /dev/null
+++ b/x-pack/plugins/security_solution/cypress/test_files/expected_timelines_export.ndjson
@@ -0,0 +1 @@
+{"savedObjectId":"0162c130-78be-11ea-9718-118a926974a4","version":"WzcsMV0=","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"}],"created":1586256805054,"createdBy":"elastic","dataProviders":[],"dateRange":{"end":1586256837669,"start":1546343624710},"description":"description","eventType":"all","filters":[],"kqlMode":"filter","kqlQuery":{"filterQuery":{"kuery":{"expression":"host.name:*","kind":"kuery"},"serializedQuery":"{\"bool\":{\"should\":[{\"exists\":{\"field\":\"host.name\"}}],\"minimum_should_match\":1}}"}},"savedQueryId":null,"sort":{"columnId":"@timestamp","sortDirection":"desc"},"title":"SIEM test","updated":1586256839298,"updatedBy":"elastic","timelineType":"default","eventNotes":[],"globalNotes":[],"pinnedEventIds":[]}
diff --git a/x-pack/plugins/security_solution/public/common/components/link_icon/index.tsx b/x-pack/plugins/security_solution/public/common/components/link_icon/index.tsx
index 75d396fe384f81..19f1d70e6e230d 100644
--- a/x-pack/plugins/security_solution/public/common/components/link_icon/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/link_icon/index.tsx
@@ -6,7 +6,7 @@
 
 import { EuiIcon, EuiLink, IconSize, IconType } from '@elastic/eui';
 import { LinkAnchorProps } from '@elastic/eui/src/components/link/link';
-import React from 'react';
+import React, { ReactNode } from 'react';
 import styled, { css } from 'styled-components';
 
 interface LinkProps {
@@ -47,7 +47,7 @@ export const Link = styled(({ iconSide, children, ...rest }) => (
 Link.displayName = 'Link';
 
 export interface LinkIconProps extends LinkProps {
-  children: string;
+  children: string | ReactNode;
   iconSize?: IconSize;
   iconType: IconType;
   dataTestSubj?: string;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
index 1f5f0ccca3b708..e9ae66703f0178 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
@@ -224,7 +224,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
                       popoverContent={getBatchItemsPopoverContent}
                       data-test-subj="utility-bar-action"
                     >
-                      {i18n.BATCH_ACTIONS}
+                      <span data-test-subj="utility-bar-action-button">{i18n.BATCH_ACTIONS}</span>
                     </UtilityBarAction>
                   </>
                 )}
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts b/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
index a022b7c79c0795..c682c1f1f46402 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/add_prepackaged_rules.ts
@@ -49,7 +49,7 @@ export default ({ getService }: FtrProviderContext): void => {
         await deleteAllTimelines(es);
       });
 
-      it('should contain two output keys of rules_installed and rules_updated', async () => {
+      it('should contain rules_installed, rules_updated, timelines_installed, and timelines_updated', async () => {
         const { body } = await supertest
           .put(DETECTION_ENGINE_PREPACKAGED_URL)
           .set('kbn-xsrf', 'true')
@@ -74,6 +74,16 @@ export default ({ getService }: FtrProviderContext): void => {
         expect(body.rules_installed).to.be.greaterThan(0);
       });
 
+      it('should create the prepackaged timelines and return a count greater than zero', async () => {
+        const { body } = await supertest
+          .put(DETECTION_ENGINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.timelines_installed).to.be.greaterThan(0);
+      });
+
       it('should create the prepackaged rules that the rules_updated is of size zero', async () => {
         const { body } = await supertest
           .put(DETECTION_ENGINE_PREPACKAGED_URL)
@@ -84,6 +94,16 @@ export default ({ getService }: FtrProviderContext): void => {
         expect(body.rules_updated).to.eql(0);
       });
 
+      it('should create the prepackaged timelines and the timelines_updated is of size zero', async () => {
+        const { body } = await supertest
+          .put(DETECTION_ENGINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.timelines_updated).to.eql(0);
+      });
+
       it('should be possible to call the API twice and the second time the number of rules installed should be zero', async () => {
         await supertest
           .put(DETECTION_ENGINE_PREPACKAGED_URL)
@@ -109,6 +129,30 @@ export default ({ getService }: FtrProviderContext): void => {
 
         expect(body.rules_installed).to.eql(0);
       });
+
+      it('should be possible to call the API twice and the second time the number of timelines installed should be zero', async () => {
+        await supertest
+          .put(DETECTION_ENGINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        await waitFor(async () => {
+          const { body } = await supertest
+            .get(`${DETECTION_ENGINE_PREPACKAGED_URL}/_status`)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          return body.timelines_not_installed === 0;
+        });
+
+        const { body } = await supertest
+          .put(DETECTION_ENGINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.timelines_installed).to.eql(0);
+      });
     });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts b/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
new file mode 100644
index 00000000000000..209c7974a7c2a3
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/import_timelines.ts
@@ -0,0 +1,403 @@
+/*
+ * 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 { TIMELINE_IMPORT_URL } from '../../../../plugins/security_solution/common/constants';
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { deleteAllTimelines } from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('import timelines', () => {
+    describe('creating a timeline', () => {
+      const getTimeline = () => {
+        return Buffer.from(
+          JSON.stringify({
+            savedObjectId: '67664480-d191-11ea-ae67-4f4be8c1847b',
+            version: 'WzU1NSwxXQ==',
+            columns: [
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: '@timestamp',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'message',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'event.category',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'event.action',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'host.name',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'source.ip',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'destination.ip',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'user.name',
+                searchable: null,
+              },
+            ],
+            dataProviders: [],
+            description: '',
+            eventType: 'all',
+            filters: [],
+            kqlMode: 'filter',
+            timelineType: 'default',
+            kqlQuery: {
+              filterQuery: {
+                serializedQuery:
+                  '{"bool":{"should":[{"exists":{"field":"@timestamp"}}],"minimum_should_match":1}}',
+                kuery: {
+                  expression: '@timestamp : * ',
+                  kind: 'kuery',
+                },
+              },
+            },
+            title: 'x2',
+            sort: {
+              columnId: '@timestamp',
+              sortDirection: 'desc',
+            },
+            created: 1596036895488,
+            createdBy: 'angela',
+            updated: 1596491470411,
+            updatedBy: 'elastic',
+            templateTimelineId: null,
+            templateTimelineVersion: null,
+            dateRange: {
+              start: '2020-04-10T14:10:58.373Z',
+              end: '2020-05-30T14:16:58.373Z',
+            },
+            savedQueryId: null,
+            eventNotes: [
+              {
+                noteId: '7d875ba0-d5d3-11ea-9899-ebec3d084fe0',
+                version: 'WzU1NiwxXQ==',
+                eventId: '8KtMKnIBOS_moQ_K9fAe',
+                note: 'hi Xavier',
+                timelineId: '67664480-d191-11ea-ae67-4f4be8c1847b',
+                created: 1596491490806,
+                createdBy: 'elastic',
+                updated: 1596491490806,
+                updatedBy: 'elastic',
+              },
+            ],
+            globalNotes: [],
+            pinnedEventIds: [
+              'K99zy3EBDTDlbwBfpf6x',
+              'GKpFKnIBOS_moQ_Ke5AO',
+              '8KtMKnIBOS_moQ_K9fAe',
+            ],
+          })
+        );
+      };
+      beforeEach(async () => {});
+
+      afterEach(async () => {
+        await deleteAllTimelines(es);
+      });
+
+      it("if it doesn't exists", async () => {
+        const { body } = await supertest
+          .post(`${TIMELINE_IMPORT_URL}`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', getTimeline(), 'timelines.ndjson')
+          .expect(200);
+        expect(body).to.eql({
+          errors: [],
+          success: true,
+          success_count: 1,
+          timelines_installed: 1,
+          timelines_updated: 0,
+        });
+      });
+    });
+
+    describe('creating a timeline template', () => {
+      const getTimelineTemplate = () => {
+        return Buffer.from(
+          JSON.stringify({
+            savedObjectId: 'cab434d0-d26c-11ea-b887-3b103296472a',
+            version: 'WzQ0NSwxXQ==',
+            columns: [
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: '@timestamp',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'message',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'event.category',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'event.action',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'host.name',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'source.ip',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'destination.ip',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'user.name',
+                searchable: null,
+              },
+            ],
+            dataProviders: [],
+            description: 'desc',
+            eventType: 'all',
+            filters: [],
+            kqlMode: 'filter',
+            timelineType: 'template',
+            kqlQuery: { filterQuery: null },
+            title: 'my t template',
+            sort: { columnId: '@timestamp', sortDirection: 'desc' },
+            templateTimelineId: '46a50505-0a48-49cb-9ab2-d15d683efa3b',
+            templateTimelineVersion: 1,
+            created: 1596473742379,
+            createdBy: 'elastic',
+            updated: 1596473909169,
+            updatedBy: 'elastic',
+            dateRange: { start: '2020-08-02T16:55:22.160Z', end: '2020-08-03T16:55:22.161Z' },
+            savedQueryId: null,
+            eventNotes: [],
+            globalNotes: [
+              {
+                noteId: '358f45c0-d5aa-11ea-9b6d-53d136d390dc',
+                version: 'WzQzOCwxXQ==',
+                note: 'I have a global note',
+                timelineId: 'cab434d0-d26c-11ea-b887-3b103296472a',
+                created: 1596473760688,
+                createdBy: 'elastic',
+                updated: 1596473760688,
+                updatedBy: 'elastic',
+              },
+            ],
+            pinnedEventIds: [],
+          })
+        );
+      };
+
+      afterEach(async () => {
+        await deleteAllTimelines(es);
+      });
+
+      it("if it doesn't exists", async () => {
+        const { body } = await supertest
+          .post(`${TIMELINE_IMPORT_URL}`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', getTimelineTemplate(), 'timelines.ndjson')
+          .expect(200);
+        expect(body).to.eql({
+          errors: [],
+          success: true,
+          success_count: 1,
+          timelines_installed: 1,
+          timelines_updated: 0,
+        });
+      });
+    });
+
+    describe('Updating a timeline template', () => {
+      const getTimelineTemplate = (templateTimelineVersion: number) => {
+        return Buffer.from(
+          JSON.stringify({
+            savedObjectId: 'cab434d0-d26c-11ea-b887-3b103296472a',
+            version: 'WzQ0NSwxXQ==',
+            columns: [
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: '@timestamp',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'message',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'event.category',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'event.action',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'host.name',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'source.ip',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'destination.ip',
+                searchable: null,
+              },
+              {
+                indexes: null,
+                name: null,
+                columnHeaderType: 'not-filtered',
+                id: 'user.name',
+                searchable: null,
+              },
+            ],
+            dataProviders: [],
+            description: 'desc',
+            eventType: 'all',
+            filters: [],
+            kqlMode: 'filter',
+            timelineType: 'template',
+            kqlQuery: { filterQuery: null },
+            title: 'my t template',
+            sort: { columnId: '@timestamp', sortDirection: 'desc' },
+            templateTimelineId: '46a50505-0a48-49cb-9ab2-d15d683efa3b',
+            templateTimelineVersion,
+            created: 1596473742379,
+            createdBy: 'elastic',
+            updated: 1596473909169,
+            updatedBy: 'elastic',
+            dateRange: { start: '2020-08-02T16:55:22.160Z', end: '2020-08-03T16:55:22.161Z' },
+            savedQueryId: null,
+            eventNotes: [],
+            globalNotes: [
+              {
+                noteId: '358f45c0-d5aa-11ea-9b6d-53d136d390dc',
+                version: 'WzQzOCwxXQ==',
+                note: 'I have a global note',
+                timelineId: 'cab434d0-d26c-11ea-b887-3b103296472a',
+                created: 1596473760688,
+                createdBy: 'elastic',
+                updated: 1596473760688,
+                updatedBy: 'elastic',
+              },
+            ],
+            pinnedEventIds: [],
+          })
+        );
+      };
+
+      afterEach(async () => {
+        await deleteAllTimelines(es);
+      });
+
+      it("if it doesn't exists", async () => {
+        await supertest
+          .post(`${TIMELINE_IMPORT_URL}`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', getTimelineTemplate(1), 'timelines.ndjson')
+          .expect(200);
+        const { body } = await supertest
+          .post(`${TIMELINE_IMPORT_URL}`)
+          .set('kbn-xsrf', 'true')
+          .attach('file', getTimelineTemplate(2), 'timelines.ndjson')
+          .expect(200);
+        expect(body).to.eql({
+          errors: [],
+          success: true,
+          success_count: 1,
+          timelines_installed: 0,
+          timelines_updated: 1,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/index.ts b/x-pack/test/detection_engine_api_integration/basic/tests/index.ts
index a480e63ff4a923..09feb7ac5e0ec3 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/index.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/index.ts
@@ -28,5 +28,6 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./patch_rules'));
     loadTestFile(require.resolve('./query_signals'));
     loadTestFile(require.resolve('./open_close_signals'));
+    loadTestFile(require.resolve('./import_timelines'));
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts b/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.ts
new file mode 100644
index 00000000000000..556217877968b6
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/install_prepackaged_timelines.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 expect from '@kbn/expect';
+
+import { TIMELINE_PREPACKAGED_URL } from '../../../../plugins/security_solution/common/constants';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import {
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteAllTimelines,
+  deleteSignalsIndex,
+  waitFor,
+} from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('install_prepackaged_timelines', () => {
+    describe('creating prepackaged rules', () => {
+      beforeEach(async () => {
+        await createSignalsIndex(supertest);
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(es);
+        await deleteAllTimelines(es);
+      });
+
+      it('should contain timelines_installed, and timelines_updated', async () => {
+        const { body } = await supertest
+          .put(TIMELINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(Object.keys(body)).to.eql(['timelines_installed', 'timelines_updated']);
+      });
+
+      it('should create the prepackaged timelines and return a count greater than zero', async () => {
+        const { body } = await supertest
+          .put(TIMELINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.timelines_installed).to.be.greaterThan(0);
+      });
+
+      it('should create the prepackaged timelines and the timelines_updated is of size zero', async () => {
+        const { body } = await supertest
+          .put(TIMELINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.timelines_updated).to.eql(0);
+      });
+
+      it('should be possible to call the API twice and the second time the number of timelines installed should be zero', async () => {
+        await supertest.put(TIMELINE_PREPACKAGED_URL).set('kbn-xsrf', 'true').send().expect(200);
+
+        await waitFor(async () => {
+          const { body } = await supertest
+            .get(`${TIMELINE_PREPACKAGED_URL}/_status`)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+          return body.timelines_not_installed === 0;
+        });
+
+        const { body } = await supertest
+          .put(TIMELINE_PREPACKAGED_URL)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.timelines_installed).to.eql(0);
+      });
+    });
+  });
+};

From d802bf03f76050a03774591db11804f0159e9b1b Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 1 Sep 2020 12:19:06 +0200
Subject: [PATCH 137/216] xpack_main legacy plugin pre-removal cleanup (#76257)

* cleanup xpack_main legacy plugin, remove capabilities mixin

* fix test env

* delete injectXpackSignature and related tests
---
 .../capabilities/capabilities_mixin.test.ts   |  65 -----
 .../server/capabilities/capabilities_mixin.ts |  42 ----
 src/legacy/server/capabilities/index.ts       |  20 --
 src/legacy/server/kbn_server.js               |   4 -
 x-pack/legacy/plugins/xpack_main/index.js     |  28 ---
 .../lib/__tests__/call_cluster_factory.js     |  77 ------
 .../__tests__/inject_xpack_info_signature.js  | 125 ----------
 .../lib/__tests__/replace_injected_vars.js    | 225 ------------------
 .../server/lib/__tests__/setup_xpack_main.js  |  22 --
 .../server/lib/call_cluster_factory.js        |  45 ----
 .../server/lib/inject_xpack_info_signature.js |  25 --
 .../server/lib/replace_injected_vars.js       |  38 ---
 .../xpack_main/server/lib/setup_xpack_main.js |   6 -
 .../plugins/xpack_main/server/xpack_main.d.ts |   1 -
 x-pack/plugins/features/server/plugin.test.ts |  43 ++--
 x-pack/plugins/features/server/plugin.ts      |   7 +-
 x-pack/scripts/functional_tests.js            |   1 -
 x-pack/test/licensing_plugin/config.legacy.ts |  15 --
 x-pack/test/licensing_plugin/legacy/index.ts  |  16 --
 .../test/licensing_plugin/legacy/updates.ts   |  58 -----
 20 files changed, 35 insertions(+), 828 deletions(-)
 delete mode 100644 src/legacy/server/capabilities/capabilities_mixin.test.ts
 delete mode 100644 src/legacy/server/capabilities/capabilities_mixin.ts
 delete mode 100644 src/legacy/server/capabilities/index.ts
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/lib/__tests__/call_cluster_factory.js
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/lib/__tests__/inject_xpack_info_signature.js
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/lib/call_cluster_factory.js
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/lib/inject_xpack_info_signature.js
 delete mode 100644 x-pack/legacy/plugins/xpack_main/server/lib/replace_injected_vars.js
 delete mode 100644 x-pack/test/licensing_plugin/config.legacy.ts
 delete mode 100644 x-pack/test/licensing_plugin/legacy/index.ts
 delete mode 100644 x-pack/test/licensing_plugin/legacy/updates.ts

diff --git a/src/legacy/server/capabilities/capabilities_mixin.test.ts b/src/legacy/server/capabilities/capabilities_mixin.test.ts
deleted file mode 100644
index 3422d6a8cbb346..00000000000000
--- a/src/legacy/server/capabilities/capabilities_mixin.test.ts
+++ /dev/null
@@ -1,65 +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 { Server } from 'hapi';
-import KbnServer from '../kbn_server';
-
-import { capabilitiesMixin } from './capabilities_mixin';
-
-describe('capabilitiesMixin', () => {
-  let registerMock: jest.Mock;
-
-  const getKbnServer = (pluginSpecs: any[] = []) => {
-    return ({
-      afterPluginsInit: (callback: () => void) => callback(),
-      pluginSpecs,
-      newPlatform: {
-        setup: {
-          core: {
-            capabilities: {
-              registerProvider: registerMock,
-            },
-          },
-        },
-      },
-    } as unknown) as KbnServer;
-  };
-
-  let server: Server;
-  beforeEach(() => {
-    server = new Server();
-    server.getUiNavLinks = () => [];
-    registerMock = jest.fn();
-  });
-
-  it('calls capabilities#registerCapabilitiesProvider for each legacy plugin specs', async () => {
-    const getPluginSpec = (provider: () => any) => ({
-      getUiCapabilitiesProvider: () => provider,
-    });
-
-    const capaA = { catalogue: { A: true } };
-    const capaB = { catalogue: { B: true } };
-    const kbnServer = getKbnServer([getPluginSpec(() => capaA), getPluginSpec(() => capaB)]);
-    await capabilitiesMixin(kbnServer, server);
-
-    expect(registerMock).toHaveBeenCalledTimes(2);
-    expect(registerMock.mock.calls[0][0]()).toEqual(capaA);
-    expect(registerMock.mock.calls[1][0]()).toEqual(capaB);
-  });
-});
diff --git a/src/legacy/server/capabilities/capabilities_mixin.ts b/src/legacy/server/capabilities/capabilities_mixin.ts
deleted file mode 100644
index 1f8c869f17f663..00000000000000
--- a/src/legacy/server/capabilities/capabilities_mixin.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 { Server } from 'hapi';
-import KbnServer from '../kbn_server';
-
-export async function capabilitiesMixin(kbnServer: KbnServer, server: Server) {
-  const registerLegacyCapabilities = async () => {
-    const capabilitiesList = await Promise.all(
-      kbnServer.pluginSpecs
-        .map((spec) => spec.getUiCapabilitiesProvider())
-        .filter((provider) => !!provider)
-        .map((provider) => provider(server))
-    );
-
-    capabilitiesList.forEach((capabilities) => {
-      kbnServer.newPlatform.setup.core.capabilities.registerProvider(() => capabilities);
-    });
-  };
-
-  // Some plugin capabilities are derived from data provided by other plugins,
-  // so we need to wait until after all plugins have been init'd to fetch uiCapabilities.
-  kbnServer.afterPluginsInit(async () => {
-    await registerLegacyCapabilities();
-  });
-}
diff --git a/src/legacy/server/capabilities/index.ts b/src/legacy/server/capabilities/index.ts
deleted file mode 100644
index 8c5dea1226f2b6..00000000000000
--- a/src/legacy/server/capabilities/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 { capabilitiesMixin } from './capabilities_mixin';
diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js
index 1084521235ea03..320086b6d65310 100644
--- a/src/legacy/server/kbn_server.js
+++ b/src/legacy/server/kbn_server.js
@@ -34,7 +34,6 @@ import configCompleteMixin from './config/complete';
 import { optimizeMixin } from '../../optimize';
 import * as Plugins from './plugins';
 import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
-import { capabilitiesMixin } from './capabilities';
 import { serverExtensionsMixin } from './server_extensions';
 import { uiMixin } from '../ui';
 import { i18nMixin } from './i18n';
@@ -115,9 +114,6 @@ export default class KbnServer {
         // setup saved object routes
         savedObjectsMixin,
 
-        // setup capabilities routes
-        capabilitiesMixin,
-
         // setup routes that serve the @kbn/optimizer output
         optimizeMixin,
 
diff --git a/x-pack/legacy/plugins/xpack_main/index.js b/x-pack/legacy/plugins/xpack_main/index.js
index b83c5a5ff606e3..854fba6624719f 100644
--- a/x-pack/legacy/plugins/xpack_main/index.js
+++ b/x-pack/legacy/plugins/xpack_main/index.js
@@ -6,12 +6,9 @@
 
 import { resolve } from 'path';
 import { mirrorPluginStatus } from '../../server/lib/mirror_plugin_status';
-import { replaceInjectedVars } from './server/lib/replace_injected_vars';
 import { setupXPackMain } from './server/lib/setup_xpack_main';
 import { xpackInfoRoute, settingsRoute } from './server/routes/api/v1';
 
-export { callClusterFactory } from './server/lib/call_cluster_factory';
-
 export const xpackMain = (kibana) => {
   return new kibana.Plugin({
     id: 'xpack_main',
@@ -25,32 +22,7 @@ export const xpackMain = (kibana) => {
       }).default();
     },
 
-    uiCapabilities(server) {
-      const featuresPlugin = server.newPlatform.setup.plugins.features;
-      if (!featuresPlugin) {
-        throw new Error('New Platform XPack Features plugin is not available.');
-      }
-      return featuresPlugin.getFeaturesUICapabilities();
-    },
-
-    uiExports: {
-      replaceInjectedVars,
-      injectDefaultVars(server) {
-        const config = server.config();
-
-        return {
-          activeSpace: null,
-          spacesEnabled: config.get('xpack.spaces.enabled'),
-        };
-      },
-    },
-
     init(server) {
-      const featuresPlugin = server.newPlatform.setup.plugins.features;
-      if (!featuresPlugin) {
-        throw new Error('New Platform XPack Features plugin is not available.');
-      }
-
       mirrorPluginStatus(server.plugins.elasticsearch, this, 'yellow', 'red');
 
       setupXPackMain(server);
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/call_cluster_factory.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/call_cluster_factory.js
deleted file mode 100644
index abe0d327d7b5cb..00000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/call_cluster_factory.js
+++ /dev/null
@@ -1,77 +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 expect from '@kbn/expect';
-import sinon from 'sinon';
-import { callClusterFactory } from '../call_cluster_factory';
-
-describe('callClusterFactory', () => {
-  let mockServer;
-  let mockCluster;
-
-  beforeEach(() => {
-    mockCluster = {
-      callWithRequest: sinon.stub().returns(Promise.resolve({ hits: { total: 0 } })),
-      callWithInternalUser: sinon.stub().returns(Promise.resolve({ hits: { total: 0 } })),
-    };
-    mockServer = {
-      plugins: {
-        elasticsearch: {
-          getCluster: sinon.stub().withArgs('admin').returns(mockCluster),
-        },
-      },
-      log() {},
-    };
-  });
-
-  it('returns an object with getter methods', () => {
-    const _callClusterFactory = callClusterFactory(mockServer);
-    expect(_callClusterFactory).to.be.an('object');
-    expect(_callClusterFactory.getCallClusterWithReq).to.be.an('function');
-    expect(_callClusterFactory.getCallClusterInternal).to.be.an('function');
-    expect(mockCluster.callWithRequest.called).to.be(false);
-    expect(mockCluster.callWithInternalUser.called).to.be(false);
-  });
-
-  describe('getCallClusterWithReq', () => {
-    it('throws an error if req is not passed', async () => {
-      const runCallCluster = () => callClusterFactory(mockServer).getCallClusterWithReq();
-      expect(runCallCluster).to.throwException();
-    });
-
-    it('returns a method that wraps callWithRequest', async () => {
-      const mockReq = {
-        headers: {
-          authorization: 'Basic dSQzcm5AbTM6cEAkJHcwcmQ=', // u$3rn@m3:p@$$w0rd
-        },
-      };
-      const callCluster = callClusterFactory(mockServer).getCallClusterWithReq(mockReq);
-
-      const result = await callCluster('search', { body: { match: { match_all: {} } } });
-      expect(result).to.eql({ hits: { total: 0 } });
-
-      expect(mockCluster.callWithInternalUser.called).to.be(false);
-      expect(mockCluster.callWithRequest.calledOnce).to.be(true);
-      const [req, method] = mockCluster.callWithRequest.getCall(0).args;
-      expect(req).to.be(mockReq);
-      expect(method).to.be('search');
-    });
-  });
-
-  describe('getCallClusterInternal', () => {
-    it('returns a method that wraps callWithInternalUser', async () => {
-      const callCluster = callClusterFactory(mockServer).getCallClusterInternal();
-
-      const result = await callCluster('search', { body: { match: { match_all: {} } } });
-      expect(result).to.eql({ hits: { total: 0 } });
-
-      expect(mockCluster.callWithRequest.called).to.be(false);
-      expect(mockCluster.callWithInternalUser.calledOnce).to.be(true);
-      const [method] = mockCluster.callWithInternalUser.getCall(0).args;
-      expect(method).to.eql('search');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/inject_xpack_info_signature.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/inject_xpack_info_signature.js
deleted file mode 100644
index 420f3b2d6631cc..00000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/inject_xpack_info_signature.js
+++ /dev/null
@@ -1,125 +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 sinon from 'sinon';
-import expect from '@kbn/expect';
-import { injectXPackInfoSignature } from '../inject_xpack_info_signature';
-
-describe('injectXPackInfoSignature()', () => {
-  class MockErrorResponse extends Error {
-    constructor() {
-      super();
-      this.output = {
-        headers: {},
-      };
-
-      this.headers = {};
-    }
-  }
-
-  const fakeH = { continue: 'blah' };
-
-  let mockXPackInfo;
-  beforeEach(() => {
-    mockXPackInfo = sinon.stub({
-      isAvailable() {},
-      getSignature() {},
-      refreshNow() {},
-    });
-  });
-
-  describe('error response', () => {
-    it('refreshes `xpackInfo` and do not inject signature if it is not available.', async () => {
-      mockXPackInfo.isAvailable.returns(true);
-      mockXPackInfo.getSignature.returns('this-should-never-be-set');
-
-      // We need this to make sure the code waits for `refreshNow` to complete before it tries
-      // to access its properties.
-      mockXPackInfo.refreshNow = () => {
-        return new Promise((resolve) => {
-          mockXPackInfo.isAvailable.returns(false);
-          resolve();
-        });
-      };
-
-      const mockResponse = new MockErrorResponse();
-      const response = await injectXPackInfoSignature(
-        mockXPackInfo,
-        { response: mockResponse },
-        fakeH
-      );
-
-      expect(mockResponse.headers).to.eql({});
-      expect(mockResponse.output.headers).to.eql({});
-      expect(response).to.be(fakeH.continue);
-    });
-
-    it('refreshes `xpackInfo` and injects its updated signature.', async () => {
-      mockXPackInfo.isAvailable.returns(true);
-      mockXPackInfo.getSignature.returns('old-signature');
-
-      // We need this to make sure the code waits for `refreshNow` to complete before it tries
-      // to access its properties.
-      mockXPackInfo.refreshNow = () => {
-        return new Promise((resolve) => {
-          mockXPackInfo.getSignature.returns('new-signature');
-          resolve();
-        });
-      };
-
-      const mockResponse = new MockErrorResponse();
-      const response = await injectXPackInfoSignature(
-        mockXPackInfo,
-        { response: mockResponse },
-        fakeH
-      );
-
-      expect(mockResponse.headers).to.eql({});
-      expect(mockResponse.output.headers).to.eql({
-        'kbn-xpack-sig': 'new-signature',
-      });
-      expect(response).to.be(fakeH.continue);
-    });
-  });
-
-  describe('non-error response', () => {
-    it('do not inject signature if `xpackInfo` is not available.', async () => {
-      mockXPackInfo.isAvailable.returns(false);
-      mockXPackInfo.getSignature.returns('this-should-never-be-set');
-
-      const mockResponse = { headers: {}, output: { headers: {} } };
-      const response = await injectXPackInfoSignature(
-        mockXPackInfo,
-        { response: mockResponse },
-        fakeH
-      );
-
-      expect(mockResponse.headers).to.eql({});
-      expect(mockResponse.output.headers).to.eql({});
-      sinon.assert.notCalled(mockXPackInfo.refreshNow);
-      expect(response).to.be(fakeH.continue);
-    });
-
-    it('injects signature if `xpackInfo` is available.', async () => {
-      mockXPackInfo.isAvailable.returns(true);
-      mockXPackInfo.getSignature.returns('available-signature');
-
-      const mockResponse = { headers: {}, output: { headers: {} } };
-      const response = await injectXPackInfoSignature(
-        mockXPackInfo,
-        { response: mockResponse },
-        fakeH
-      );
-
-      expect(mockResponse.headers).to.eql({
-        'kbn-xpack-sig': 'available-signature',
-      });
-      expect(mockResponse.output.headers).to.eql({});
-      sinon.assert.notCalled(mockXPackInfo.refreshNow);
-      expect(response).to.be(fakeH.continue);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
deleted file mode 100644
index ce6e20bd874b29..00000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/replace_injected_vars.js
+++ /dev/null
@@ -1,225 +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 sinon from 'sinon';
-import expect from '@kbn/expect';
-
-import { replaceInjectedVars } from '../replace_injected_vars';
-import { KibanaRequest } from '../../../../../../../src/core/server';
-
-const buildRequest = (path = '/app/kibana') => {
-  const get = sinon.stub();
-
-  return {
-    app: {},
-    path,
-    route: { settings: {} },
-    headers: {},
-    raw: {
-      req: {
-        socket: {},
-      },
-    },
-    getSavedObjectsClient: () => {
-      return {
-        get,
-        create: sinon.stub(),
-
-        errors: {
-          isNotFoundError: (error) => {
-            return error.message === 'not found exception';
-          },
-        },
-      };
-    },
-  };
-};
-
-describe('replaceInjectedVars uiExport', () => {
-  it('sends xpack info if request is authenticated and license is not basic', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: {
-        b: 1,
-      },
-    });
-
-    sinon.assert.calledOnce(server.newPlatform.setup.plugins.security.authc.isAuthenticated);
-    sinon.assert.calledWithExactly(
-      server.newPlatform.setup.plugins.security.authc.isAuthenticated,
-      sinon.match.instanceOf(KibanaRequest)
-    );
-  });
-
-  it('sends the xpack info if security plugin is disabled', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-    delete server.plugins.security;
-    delete server.newPlatform.setup.plugins.security;
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: {
-        b: 1,
-      },
-    });
-  });
-
-  it('sends the xpack info if xpack license is basic', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-    server.plugins.xpack_main.info.license.isOneOf.returns(true);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: {
-        b: 1,
-      },
-    });
-  });
-
-  it('respects the telemetry opt-in document when opted-out', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-    server.plugins.xpack_main.info.license.isOneOf.returns(true);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: {
-        b: 1,
-      },
-    });
-  });
-
-  it('respects the telemetry opt-in document when opted-in', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-    server.plugins.xpack_main.info.license.isOneOf.returns(true);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: {
-        b: 1,
-      },
-    });
-  });
-
-  it('indicates that telemetry is opted-out when not loading an application', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest(true, '/');
-    const server = mockServer();
-    server.plugins.xpack_main.info.license.isOneOf.returns(true);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: {
-        b: 1,
-      },
-    });
-  });
-
-  it('sends the originalInjectedVars if not authenticated', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-    server.newPlatform.setup.plugins.security.authc.isAuthenticated.returns(false);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql(originalInjectedVars);
-  });
-
-  it('sends the originalInjectedVars if xpack info is unavailable', async () => {
-    const originalInjectedVars = { a: 1 };
-    const request = buildRequest();
-    const server = mockServer();
-    server.plugins.xpack_main.info.isAvailable.returns(false);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql(originalInjectedVars);
-  });
-
-  it('sends the originalInjectedVars (with xpackInitialInfo = undefined) if security is disabled, xpack info is unavailable', async () => {
-    const originalInjectedVars = {
-      a: 1,
-      uiCapabilities: { navLinks: { foo: true }, bar: { baz: true }, catalogue: { cfoo: true } },
-    };
-    const request = buildRequest();
-    const server = mockServer();
-    delete server.plugins.security;
-    server.plugins.xpack_main.info.isAvailable.returns(false);
-
-    const newVars = await replaceInjectedVars(originalInjectedVars, request, server);
-    expect(newVars).to.eql({
-      a: 1,
-      xpackInitialInfo: undefined,
-      uiCapabilities: {
-        navLinks: { foo: true },
-        bar: { baz: true },
-        catalogue: {
-          cfoo: true,
-        },
-      },
-    });
-  });
-});
-
-// creates a mock server object that defaults to being authenticated with a
-// non-basic license
-function mockServer() {
-  const getLicenseCheckResults = sinon.stub().returns({});
-  return {
-    newPlatform: {
-      setup: {
-        plugins: { security: { authc: { isAuthenticated: sinon.stub().returns(true) } } },
-      },
-    },
-    plugins: {
-      security: {},
-      xpack_main: {
-        getFeatures: () => [
-          {
-            id: 'mockFeature',
-            name: 'Mock Feature',
-            privileges: {
-              all: {
-                app: [],
-                savedObject: {
-                  all: [],
-                  read: [],
-                },
-                ui: ['mockFeatureCapability'],
-              },
-            },
-          },
-        ],
-        info: {
-          isAvailable: sinon.stub().returns(true),
-          feature: () => ({
-            getLicenseCheckResults,
-          }),
-          license: {
-            isOneOf: sinon.stub().returns(false),
-          },
-          toJSON: () => ({ b: 1 }),
-        },
-      },
-    },
-  };
-}
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/setup_xpack_main.js b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/setup_xpack_main.js
index b4a2c090d63092..c34e27642d2ceb 100644
--- a/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/setup_xpack_main.js
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/__tests__/setup_xpack_main.js
@@ -8,7 +8,6 @@ import { BehaviorSubject } from 'rxjs';
 import sinon from 'sinon';
 import { XPackInfo } from '../xpack_info';
 import { setupXPackMain } from '../setup_xpack_main';
-import * as InjectXPackInfoSignatureNS from '../inject_xpack_info_signature';
 
 describe('setupXPackMain()', () => {
   const sandbox = sinon.createSandbox();
@@ -19,7 +18,6 @@ describe('setupXPackMain()', () => {
 
   beforeEach(() => {
     sandbox.useFakeTimers();
-    sandbox.stub(InjectXPackInfoSignatureNS, 'injectXPackInfoSignature');
 
     mockElasticsearchPlugin = {
       getCluster: sinon.stub(),
@@ -63,29 +61,9 @@ describe('setupXPackMain()', () => {
     setupXPackMain(mockServer);
 
     sinon.assert.calledWithExactly(mockServer.expose, 'info', sinon.match.instanceOf(XPackInfo));
-    sinon.assert.calledWithExactly(mockServer.ext, 'onPreResponse', sinon.match.func);
     sinon.assert.calledWithExactly(mockElasticsearchPlugin.status.on, 'change', sinon.match.func);
   });
 
-  it('onPreResponse hook calls `injectXPackInfoSignature` for every request.', () => {
-    setupXPackMain(mockServer);
-
-    const xPackInfo = mockServer.expose.firstCall.args[1];
-    const onPreResponse = mockServer.ext.firstCall.args[1];
-
-    const mockRequest = {};
-    const mockReply = sinon.stub();
-
-    onPreResponse(mockRequest, mockReply);
-
-    sinon.assert.calledWithExactly(
-      InjectXPackInfoSignatureNS.injectXPackInfoSignature,
-      xPackInfo,
-      sinon.match.same(mockRequest),
-      sinon.match.same(mockReply)
-    );
-  });
-
   describe('Elasticsearch plugin state changes cause XPackMain plugin state change.', () => {
     let xPackInfo;
     let onElasticsearchPluginStatusChange;
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/call_cluster_factory.js b/x-pack/legacy/plugins/xpack_main/server/lib/call_cluster_factory.js
deleted file mode 100644
index f946725e017ffd..00000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/lib/call_cluster_factory.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.
- */
-
-/*
- * Factory for acquiring a method that can send an authenticated query to Elasticsearch.
- *
- * The method can either:
- * - take authentication from an HTTP request object, which should be used when
- *   the caller is an HTTP API
- * - fabricate authentication using the system username and password from the
- *   Kibana config, which should be used when the caller is an internal process
- *
- * @param {Object} server: the Kibana server object
- * @return {Function}: callCluster function
- */
-export function callClusterFactory(server) {
-  const { callWithRequest, callWithInternalUser } = server.plugins.elasticsearch.getCluster(
-    'admin'
-  );
-
-  return {
-    /*
-     * caller is coming from a request, so use callWithRequest with actual
-     * Authorization header credentials
-     * @param {Object} req: HTTP request object
-     */
-    getCallClusterWithReq(req) {
-      if (req === undefined) {
-        throw new Error('request object is required');
-      }
-      return (...args) => callWithRequest(req, ...args);
-    },
-
-    getCallClusterInternal() {
-      /*
-       * caller is an internal function of the stats collection system, so use
-       * internal system user
-       */
-      return callWithInternalUser;
-    },
-  };
-}
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/inject_xpack_info_signature.js b/x-pack/legacy/plugins/xpack_main/server/lib/inject_xpack_info_signature.js
deleted file mode 100644
index 166bd2b4755f05..00000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/lib/inject_xpack_info_signature.js
+++ /dev/null
@@ -1,25 +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 async function injectXPackInfoSignature(info, request, h) {
-  // If we're returning an error response, refresh xpack info from
-  // Elasticsearch in case the error is due to a change in license information
-  // in Elasticsearch.
-  const isErrorResponse = request.response instanceof Error;
-  if (isErrorResponse) {
-    await info.refreshNow();
-  }
-
-  if (info.isAvailable()) {
-    // Note: request.response.output is used instead of request.response because
-    // evidently HAPI does not allow headers to be set on the latter in case of
-    // error responses.
-    const response = isErrorResponse ? request.response.output : request.response;
-    response.headers['kbn-xpack-sig'] = info.getSignature();
-  }
-
-  return h.continue;
-}
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/replace_injected_vars.js b/x-pack/legacy/plugins/xpack_main/server/lib/replace_injected_vars.js
deleted file mode 100644
index f09f97d44bfe8b..00000000000000
--- a/x-pack/legacy/plugins/xpack_main/server/lib/replace_injected_vars.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 { KibanaRequest } from '../../../../../../src/core/server';
-
-export async function replaceInjectedVars(originalInjectedVars, request, server) {
-  const xpackInfo = server.plugins.xpack_main.info;
-
-  const withXpackInfo = async () => ({
-    ...originalInjectedVars,
-    xpackInitialInfo: xpackInfo.isAvailable() ? xpackInfo.toJSON() : undefined,
-  });
-
-  // security feature is disabled
-  if (!server.plugins.security || !server.newPlatform.setup.plugins.security) {
-    return await withXpackInfo();
-  }
-
-  // not enough license info to make decision one way or another
-  if (!xpackInfo.isAvailable()) {
-    return originalInjectedVars;
-  }
-
-  // request is not authenticated
-  if (
-    !(await server.newPlatform.setup.plugins.security.authc.isAuthenticated(
-      KibanaRequest.from(request)
-    ))
-  ) {
-    return originalInjectedVars;
-  }
-
-  // plugin enabled, license is appropriate, request is authenticated
-  return await withXpackInfo();
-}
diff --git a/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js b/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js
index 9196b210bba20a..33b551bbe864ff 100644
--- a/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js
+++ b/x-pack/legacy/plugins/xpack_main/server/lib/setup_xpack_main.js
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { injectXPackInfoSignature } from './inject_xpack_info_signature';
 import { XPackInfo } from './xpack_info';
 
 /**
@@ -20,11 +19,6 @@ export function setupXPackMain(server) {
 
   server.expose('info', info);
 
-  server.ext('onPreResponse', (request, h) => injectXPackInfoSignature(info, request, h));
-
-  const { getFeatures } = server.newPlatform.setup.plugins.features;
-  server.expose('getFeatures', getFeatures);
-
   const setPluginStatus = () => {
     if (info.isAvailable()) {
       server.plugins.xpack_main.status.green('Ready');
diff --git a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
index 2a59c2f1366d4a..f4363a8e57b37c 100644
--- a/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
+++ b/x-pack/legacy/plugins/xpack_main/server/xpack_main.d.ts
@@ -11,5 +11,4 @@ export { XPackFeature } from './lib/xpack_info';
 
 export interface XPackMainPlugin {
   info: XPackInfo;
-  getFeatures(): Feature[];
 }
diff --git a/x-pack/plugins/features/server/plugin.test.ts b/x-pack/plugins/features/server/plugin.test.ts
index 3d85c2e9eb751c..00d578f5ca8664 100644
--- a/x-pack/plugins/features/server/plugin.test.ts
+++ b/x-pack/plugins/features/server/plugin.test.ts
@@ -4,23 +4,30 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { coreMock, savedObjectsServiceMock } from 'src/core/server/mocks';
-
 import { Plugin } from './plugin';
-const initContext = coreMock.createPluginInitializerContext();
-const coreSetup = coreMock.createSetup();
-const coreStart = coreMock.createStart();
-const typeRegistry = savedObjectsServiceMock.createTypeRegistryMock();
-typeRegistry.getVisibleTypes.mockReturnValue([
-  {
-    name: 'foo',
-    hidden: false,
-    mappings: { properties: {} },
-    namespaceType: 'single' as 'single',
-  },
-]);
-coreStart.savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
 
 describe('Features Plugin', () => {
+  let initContext: ReturnType<typeof coreMock.createPluginInitializerContext>;
+  let coreSetup: ReturnType<typeof coreMock.createSetup>;
+  let coreStart: ReturnType<typeof coreMock.createStart>;
+  let typeRegistry: ReturnType<typeof savedObjectsServiceMock.createTypeRegistryMock>;
+
+  beforeEach(() => {
+    initContext = coreMock.createPluginInitializerContext();
+    coreSetup = coreMock.createSetup();
+    coreStart = coreMock.createStart();
+    typeRegistry = savedObjectsServiceMock.createTypeRegistryMock();
+    typeRegistry.getVisibleTypes.mockReturnValue([
+      {
+        name: 'foo',
+        hidden: false,
+        mappings: { properties: {} },
+        namespaceType: 'single' as 'single',
+      },
+    ]);
+    coreStart.savedObjects.getTypeRegistry.mockReturnValue(typeRegistry);
+  });
+
   it('returns OSS + registered features', async () => {
     const plugin = new Plugin(initContext);
     const { registerFeature } = await plugin.setup(coreSetup, {});
@@ -88,4 +95,12 @@ describe('Features Plugin', () => {
     expect(soTypes.includes('foo')).toBe(true);
     expect(soTypes.includes('bar')).toBe(false);
   });
+
+  it('registers a capabilities provider', async () => {
+    const plugin = new Plugin(initContext);
+    await plugin.setup(coreSetup, {});
+
+    expect(coreSetup.capabilities.registerProvider).toHaveBeenCalledTimes(1);
+    expect(coreSetup.capabilities.registerProvider).toHaveBeenCalledWith(expect.any(Function));
+  });
 });
diff --git a/x-pack/plugins/features/server/plugin.ts b/x-pack/plugins/features/server/plugin.ts
index 5783b20eae6484..61b66d95ca44f3 100644
--- a/x-pack/plugins/features/server/plugin.ts
+++ b/x-pack/plugins/features/server/plugin.ts
@@ -61,10 +61,15 @@ export class Plugin {
       featureRegistry: this.featureRegistry,
     });
 
+    const getFeaturesUICapabilities = () =>
+      uiCapabilitiesForFeatures(this.featureRegistry.getAll());
+
+    core.capabilities.registerProvider(getFeaturesUICapabilities);
+
     return deepFreeze({
       registerFeature: this.featureRegistry.register.bind(this.featureRegistry),
       getFeatures: this.featureRegistry.getAll.bind(this.featureRegistry),
-      getFeaturesUICapabilities: () => uiCapabilitiesForFeatures(this.featureRegistry.getAll()),
+      getFeaturesUICapabilities,
     });
   }
 
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index 421e709444d0f7..6271c4b6013071 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -56,7 +56,6 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/upgrade_assistant_integration/config.js'),
   require.resolve('../test/licensing_plugin/config.ts'),
   require.resolve('../test/licensing_plugin/config.public.ts'),
-  require.resolve('../test/licensing_plugin/config.legacy.ts'),
   require.resolve('../test/endpoint_api_integration_no_ingest/config.ts'),
   require.resolve('../test/reporting_api_integration/reporting_and_security.config.ts'),
   require.resolve('../test/reporting_api_integration/reporting_without_security.config.ts'),
diff --git a/x-pack/test/licensing_plugin/config.legacy.ts b/x-pack/test/licensing_plugin/config.legacy.ts
deleted file mode 100644
index 14eadc3194f9e3..00000000000000
--- a/x-pack/test/licensing_plugin/config.legacy.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 { FtrConfigProviderContext } from '@kbn/test/types/ftr';
-
-export default async function ({ readConfigFile }: FtrConfigProviderContext) {
-  const commonConfig = await readConfigFile(require.resolve('./config'));
-
-  return {
-    ...commonConfig.getAll(),
-    testFiles: [require.resolve('./legacy')],
-  };
-}
diff --git a/x-pack/test/licensing_plugin/legacy/index.ts b/x-pack/test/licensing_plugin/legacy/index.ts
deleted file mode 100644
index 6274bd39690420..00000000000000
--- a/x-pack/test/licensing_plugin/legacy/index.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 { FtrProviderContext } from '../services';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ loadTestFile }: FtrProviderContext) {
-  describe('Legacy licensing plugin', function () {
-    this.tags('ciGroup2');
-    // MUST BE LAST! CHANGES LICENSE TYPE!
-    loadTestFile(require.resolve('./updates'));
-  });
-}
diff --git a/x-pack/test/licensing_plugin/legacy/updates.ts b/x-pack/test/licensing_plugin/legacy/updates.ts
deleted file mode 100644
index 1de8659672d2f5..00000000000000
--- a/x-pack/test/licensing_plugin/legacy/updates.ts
+++ /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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../services';
-import { createScenario } from '../scenario';
-import '../../../../test/plugin_functional/plugins/core_provider_plugin/types';
-
-// eslint-disable-next-line import/no-default-export
-export default function (ftrContext: FtrProviderContext) {
-  const { getService } = ftrContext;
-  const supertest = getService('supertest');
-  const testSubjects = getService('testSubjects');
-
-  const scenario = createScenario(ftrContext);
-
-  describe('changes in license types', () => {
-    after(async () => {
-      await scenario.teardown();
-    });
-
-    it('provides changes in license types', async () => {
-      await scenario.setup();
-      await scenario.waitForPluginToDetectLicenseUpdate();
-
-      const {
-        body: legacyInitialLicense,
-        header: legacyInitialLicenseHeaders,
-      } = await supertest.get('/api/xpack/v1/info').expect(200);
-
-      expect(legacyInitialLicense.license?.type).to.be('basic');
-      expect(legacyInitialLicenseHeaders['kbn-xpack-sig']).to.be.a('string');
-
-      await scenario.startTrial();
-      await scenario.waitForPluginToDetectLicenseUpdate();
-
-      const { body: legacyTrialLicense, header: legacyTrialLicenseHeaders } = await supertest
-        .get('/api/xpack/v1/info')
-        .expect(200);
-
-      expect(legacyTrialLicense.license?.type).to.be('trial');
-      expect(legacyTrialLicenseHeaders['kbn-xpack-sig']).to.not.be(
-        legacyInitialLicenseHeaders['kbn-xpack-sig']
-      );
-
-      await scenario.startBasic();
-      await scenario.waitForPluginToDetectLicenseUpdate();
-
-      const { body: legacyBasicLicense } = await supertest.get('/api/xpack/v1/info').expect(200);
-      expect(legacyBasicLicense.license?.type).to.be('basic');
-
-      // banner shown only when license expired not just deleted
-      await testSubjects.missingOrFail('licenseExpiredBanner');
-    });
-  });
-}

From b8c7945b124351ec38d5b1b46790de42da3091c4 Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Tue, 1 Sep 2020 13:29:35 +0300
Subject: [PATCH 138/216] [TSVB] Fix panel config updates on history changes
 (#75896)

* Apply history changes to panel config

* Add functional tests

* Update jest snapshot

* Add waiters for stabilizing vis chart

* Fix comments

* Remove unused method isValidKueryQuery

* Add a waiter for component render

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../application/components/panel_config.js    |  4 +-
 .../components/panel_config/gauge.js          |  4 +-
 .../components/panel_config/markdown.js       |  4 +-
 .../components/panel_config/metric.js         |  4 +-
 .../components/panel_config/table.js          |  4 +-
 .../components/panel_config/timeseries.js     |  5 +-
 .../components/panel_config/top_n.js          |  4 +-
 .../splits/__snapshots__/terms.test.js.snap   |  1 +
 .../application/components/splits/terms.js    |  1 +
 .../application/components/vis_editor.js      | 31 ++++----
 test/functional/apps/visualize/_tsvb_chart.ts | 75 +++++++++++++++++++
 .../page_objects/visual_builder_page.ts       | 44 +++++++++++
 12 files changed, 153 insertions(+), 28 deletions(-)

diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config.js
index c950c39f06a66a..3b081d8eb7db9e 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config.js
@@ -67,7 +67,9 @@ export function PanelConfig(props) {
     return (
       <FormValidationContext.Provider value={updateControlValidity}>
         <VisDataContext.Provider value={visData}>
-          <Component {...props} />
+          <div data-test-subj={`tvbPanelConfig__${model.type}`}>
+            <Component {...props} />
+          </div>
         </VisDataContext.Provider>
       </FormValidationContext.Provider>
     );
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js
index 18380680283ef5..7f26701e38277a 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/gauge.js
@@ -330,7 +330,7 @@ class GaugePanelConfigUi extends Component {
       );
     }
     return (
-      <div>
+      <>
         <EuiTabs size="s">
           <EuiTab isSelected={selectedTab === 'data'} onClick={() => this.switchTab('data')}>
             <FormattedMessage
@@ -346,7 +346,7 @@ class GaugePanelConfigUi extends Component {
           </EuiTab>
         </EuiTabs>
         {view}
-      </div>
+      </>
     );
   }
 }
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.js
index 03d84d67ea7879..36d0e3a80e227d 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/markdown.js
@@ -294,7 +294,7 @@ class MarkdownPanelConfigUi extends Component {
       );
     }
     return (
-      <div>
+      <>
         <EuiTabs size="s">
           <EuiTab
             isSelected={selectedTab === 'markdown'}
@@ -325,7 +325,7 @@ class MarkdownPanelConfigUi extends Component {
           </EuiTab>
         </EuiTabs>
         {view}
-      </div>
+      </>
     );
   }
 }
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.js
index feb809f20995a9..568194c2e09184 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/metric.js
@@ -167,7 +167,7 @@ export class MetricPanelConfig extends Component {
       );
     }
     return (
-      <div>
+      <>
         <EuiTabs size="s">
           <EuiTab isSelected={selectedTab === 'data'} onClick={() => this.switchTab('data')}>
             <FormattedMessage
@@ -187,7 +187,7 @@ export class MetricPanelConfig extends Component {
           </EuiTab>
         </EuiTabs>
         {view}
-      </div>
+      </>
     );
   }
 }
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js
index 2b729e403898e9..bb3f0041abca7f 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/table.js
@@ -269,7 +269,7 @@ export class TablePanelConfig extends Component {
       );
     }
     return (
-      <div>
+      <>
         <EuiTabs size="s">
           <EuiTab isSelected={selectedTab === 'data'} onClick={() => this.switchTab('data')}>
             <FormattedMessage
@@ -285,7 +285,7 @@ export class TablePanelConfig extends Component {
           </EuiTab>
         </EuiTabs>
         {view}
-      </div>
+      </>
     );
   }
 }
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js
index 3e5e335a9ea397..03da52b10f08b5 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/timeseries.js
@@ -44,6 +44,7 @@ import {
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { getDefaultQueryLanguage } from '../lib/get_default_query_language';
 import { QueryBarWrapper } from '../query_bar_wrapper';
+
 class TimeseriesPanelConfigUi extends Component {
   constructor(props) {
     super(props);
@@ -401,7 +402,7 @@ class TimeseriesPanelConfigUi extends Component {
       );
     }
     return (
-      <div>
+      <>
         <EuiTabs size="s">
           <EuiTab isSelected={selectedTab === 'data'} onClick={() => this.switchTab('data')}>
             <FormattedMessage
@@ -430,7 +431,7 @@ class TimeseriesPanelConfigUi extends Component {
           </EuiTab>
         </EuiTabs>
         {view}
-      </div>
+      </>
     );
   }
 }
diff --git a/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.js b/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.js
index 4752e0ee7de65e..14c4400180280f 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/panel_config/top_n.js
@@ -227,7 +227,7 @@ export class TopNPanelConfig extends Component {
       );
     }
     return (
-      <div>
+      <>
         <EuiTabs size="s">
           <EuiTab isSelected={selectedTab === 'data'} onClick={() => this.switchTab('data')}>
             <FormattedMessage
@@ -243,7 +243,7 @@ export class TopNPanelConfig extends Component {
           </EuiTab>
         </EuiTabs>
         {view}
-      </div>
+      </>
     );
   }
 }
diff --git a/src/plugins/vis_type_timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap b/src/plugins/vis_type_timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap
index 3bf8b77621cf5e..daff68e40dbaea 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap
+++ b/src/plugins/vis_type_timeseries/public/application/components/splits/__snapshots__/terms.test.js.snap
@@ -44,6 +44,7 @@ exports[`src/legacy/core_plugins/metrics/public/components/splits/terms.test.js
         labelType="label"
       >
         <InjectIntl(FieldSelectUi)
+          data-test-subj="groupByField"
           fields={
             Object {
               "kibana_sample_data_flights": Array [
diff --git a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js
index b71141f44f52dd..a72c7598509a85 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js
@@ -132,6 +132,7 @@ export const SplitByTermsUI = ({
             }
           >
             <FieldSelect
+              data-test-subj="groupByField"
               indexPattern={indexPattern}
               onChange={handleSelectChange('terms_field')}
               value={model.terms_field}
diff --git a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
index 50585869862eea..47b30f9ab27116 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/vis_editor.js
@@ -29,7 +29,6 @@ import { PanelConfig } from './panel_config';
 import { createBrushHandler } from '../lib/create_brush_handler';
 import { fetchFields } from '../lib/fetch_fields';
 import { extractIndexPatterns } from '../../../../../plugins/vis_type_timeseries/common/extract_index_patterns';
-import { esKuery, UI_SETTINGS } from '../../../../../plugins/data/public';
 import { getSavedObjectsClient, getUISettings, getDataStart, getCoreStart } from '../../services';
 
 import { CoreStartContextProvider } from '../contexts/query_input_bar_context';
@@ -86,20 +85,6 @@ export class VisEditor extends Component {
     });
   }, VIS_STATE_DEBOUNCE_DELAY);
 
-  isValidKueryQuery = (filterQuery) => {
-    if (filterQuery && filterQuery.language === 'kuery') {
-      try {
-        const queryOptions = this.coreContext.uiSettings.get(
-          UI_SETTINGS.QUERY_ALLOW_LEADING_WILDCARDS
-        );
-        esKuery.fromKueryExpression(filterQuery.query, { allowLeadingWildcards: queryOptions });
-      } catch (error) {
-        return false;
-      }
-    }
-    return true;
-  };
-
   handleChange = (partialModel) => {
     if (isEmpty(partialModel)) {
       return;
@@ -134,6 +119,14 @@ export class VisEditor extends Component {
     });
   };
 
+  updateModel = () => {
+    const { params } = this.props.vis.clone();
+
+    this.setState({
+      model: params,
+    });
+  };
+
   handleCommit = () => {
     this.updateVisState();
     this.setState({ dirty: false });
@@ -219,6 +212,10 @@ export class VisEditor extends Component {
 
   componentDidMount() {
     this.props.renderComplete();
+
+    if (this.props.isEditorMode && this.props.eventEmitter) {
+      this.props.eventEmitter.on('updateEditor', this.updateModel);
+    }
   }
 
   componentDidUpdate() {
@@ -227,6 +224,10 @@ export class VisEditor extends Component {
 
   componentWillUnmount() {
     this.updateVisState.cancel();
+
+    if (this.props.isEditorMode && this.props.eventEmitter) {
+      this.props.eventEmitter.off('updateEditor', this.updateModel);
+    }
   }
 }
 
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
index 74d5798d127c3e..06828e8e98cce7 100644
--- a/test/functional/apps/visualize/_tsvb_chart.ts
+++ b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -21,6 +21,7 @@ import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const browser = getService('browser');
   const esArchiver = getService('esArchiver');
   const log = getService('log');
   const inspector = getService('inspector');
@@ -146,5 +147,79 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         expect(newValue).to.eql('10');
       });
     });
+
+    describe('browser history changes', () => {
+      it('should activate previous/next chart tab and panel config', async () => {
+        await PageObjects.visualBuilder.resetPage();
+
+        log.debug('Click metric chart');
+        await PageObjects.visualBuilder.clickMetric();
+        await PageObjects.visualBuilder.checkMetricTabIsPresent();
+        await PageObjects.visualBuilder.checkTabIsSelected('metric');
+
+        log.debug('Click Top N chart');
+        await PageObjects.visualBuilder.clickTopN();
+        await PageObjects.visualBuilder.checkTopNTabIsPresent();
+        await PageObjects.visualBuilder.checkTabIsSelected('top_n');
+
+        log.debug('Go back in browser history');
+        await browser.goBack();
+
+        log.debug('Check metric chart and panel config is rendered');
+        await PageObjects.visualBuilder.checkMetricTabIsPresent();
+        await PageObjects.visualBuilder.checkTabIsSelected('metric');
+        await PageObjects.visualBuilder.checkPanelConfigIsPresent('metric');
+
+        log.debug('Go back in browser history');
+        await browser.goBack();
+
+        log.debug('Check timeseries chart and panel config is rendered');
+        await PageObjects.visualBuilder.checkTimeSeriesChartIsPresent();
+        await PageObjects.visualBuilder.checkTabIsSelected('timeseries');
+        await PageObjects.visualBuilder.checkPanelConfigIsPresent('timeseries');
+
+        log.debug('Go forward in browser history');
+        await browser.goForward();
+
+        log.debug('Check metric chart and panel config is rendered');
+        await PageObjects.visualBuilder.checkMetricTabIsPresent();
+        await PageObjects.visualBuilder.checkTabIsSelected('metric');
+        await PageObjects.visualBuilder.checkPanelConfigIsPresent('metric');
+      });
+
+      it('should update panel config', async () => {
+        await PageObjects.visualBuilder.resetPage();
+
+        const initialLegendItems = ['Count: 156'];
+        const finalLegendItems = ['jpg: 106', 'css: 22', 'png: 14', 'gif: 8', 'php: 6'];
+
+        log.debug('Group metrics by terms: extension.raw');
+        await PageObjects.visualBuilder.setMetricsGroupByTerms('extension.raw');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        const legendItems1 = await PageObjects.visualBuilder.getLegendItemsContent();
+        expect(legendItems1).to.eql(finalLegendItems);
+
+        log.debug('Go back in browser history');
+        await browser.goBack();
+        const isTermsSelected = await PageObjects.visualBuilder.checkSelectedMetricsGroupByValue(
+          'Terms'
+        );
+        expect(isTermsSelected).to.be(true);
+
+        log.debug('Go back in browser history');
+        await browser.goBack();
+        await PageObjects.visualBuilder.checkSelectedMetricsGroupByValue('Everything');
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        const legendItems2 = await PageObjects.visualBuilder.getLegendItemsContent();
+        expect(legendItems2).to.eql(initialLegendItems);
+
+        log.debug('Go forward twice in browser history');
+        await browser.goForward();
+        await browser.goForward();
+        await PageObjects.visChart.waitForVisualizationRenderingStabilized();
+        const legendItems3 = await PageObjects.visualBuilder.getLegendItemsContent();
+        expect(legendItems3).to.eql(finalLegendItems);
+      });
+    });
   });
 }
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index f376c39ff67bbe..a95d535281fa33 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -64,6 +64,19 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       }
     }
 
+    public async checkTabIsSelected(chartType: string) {
+      const chartTypeBtn = await testSubjects.find(`${chartType}TsvbTypeBtn`);
+      const isSelected = await chartTypeBtn.getAttribute('aria-selected');
+
+      if (isSelected !== 'true') {
+        throw new Error(`TSVB ${chartType} tab is not selected`);
+      }
+    }
+
+    public async checkPanelConfigIsPresent(chartType: string) {
+      await testSubjects.existOrFail(`tvbPanelConfig__${chartType}`);
+    }
+
     public async checkVisualBuilderIsPresent() {
       await this.checkTabIsLoaded('tvbVisEditor', 'Time Series');
     }
@@ -558,9 +571,40 @@ export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrPro
       return await find.allByCssSelector('.echLegendItem');
     }
 
+    public async getLegendItemsContent(): Promise<string[]> {
+      const legendList = await find.byCssSelector('.echLegendList');
+      const $ = await legendList.parseDomContent();
+
+      return $('li')
+        .toArray()
+        .map((li) => {
+          const label = $(li).find('.echLegendItem__label').text();
+          const value = $(li).find('.echLegendItem__extra').text();
+
+          return `${label}: ${value}`;
+        });
+    }
+
     public async getSeries(): Promise<WebElementWrapper[]> {
       return await find.allByCssSelector('.tvbSeriesEditor');
     }
+
+    public async setMetricsGroupByTerms(field: string) {
+      const groupBy = await find.byCssSelector(
+        '.tvbAggRow--split [data-test-subj="comboBoxInput"]'
+      );
+      await comboBox.setElement(groupBy, 'Terms', { clickWithMouse: true });
+      await PageObjects.common.sleep(1000);
+      const byField = await testSubjects.find('groupByField');
+      await comboBox.setElement(byField, field, { clickWithMouse: true });
+    }
+
+    public async checkSelectedMetricsGroupByValue(value: string) {
+      const groupBy = await find.byCssSelector(
+        '.tvbAggRow--split [data-test-subj="comboBoxInput"]'
+      );
+      return await comboBox.isOptionSelected(groupBy, value);
+    }
   }
 
   return new VisualBuilderPage();

From a0b64baadb22422fb83c9d444569e5b088512af1 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Tue, 1 Sep 2020 13:32:49 +0200
Subject: [PATCH 139/216] Align extract-zip 2.x versions (#76350)

---
 yarn.lock | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index bd02196e487969..c0c2305609f580 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12673,18 +12673,7 @@ extract-zip@1.7.0, extract-zip@^1.6.6, extract-zip@^1.7.0:
     mkdirp "^0.5.4"
     yauzl "^2.10.0"
 
-extract-zip@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.0.tgz#f53b71d44f4ff5a4527a2259ade000fb8b303492"
-  integrity sha512-i42GQ498yibjdvIhivUsRslx608whtGoFIhF26Z7O4MYncBxp8CwalOs1lnHy21A9sIohWO2+uiE4SRtC9JXDg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
-extract-zip@^2.0.1:
+extract-zip@^2.0.0, 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==

From bf7b4782e633b87909303930af4083b5002552f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cau=C3=AA=20Marcondes?=
 <55978943+cauemarcondes@users.noreply.github.com>
Date: Tue, 1 Sep 2020 12:38:45 +0100
Subject: [PATCH 140/216] [APM] Remove additional "No data" message and
 re-ordering charts (#75399)

* removing extra message

* adding x-axis values when no data is available

* reordering charts

* fixing internationalization

* fixing transaction RUM agent order

* addressing PR comment

* removing kpis list and show it in the chart legend instead

* fixing API test

* moving asPercent to the common directory

* fixing api test

* fixing unit test

* removing unused prop

* fixing unit test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../utils}/formatters.test.ts                 |   2 +-
 x-pack/plugins/apm/common/utils/formatters.ts |  28 +
 .../ServiceMap/Popover/ServiceStatsList.tsx   |   3 +-
 .../app/ServiceNodeOverview/index.tsx         |   7 +-
 .../WaterfallWithSummmary/PercentOfParent.tsx |   2 +-
 .../app/TransactionDetails/index.tsx          |  39 +-
 .../app/TransactionOverview/index.tsx         |  15 -
 .../TransactionBreakdownGraph/index.tsx       |  31 +-
 .../TransactionBreakdownKpiList.tsx           |  75 ---
 .../shared/TransactionBreakdown/index.tsx     |  27 +-
 .../shared/charts/CustomPlot/index.js         |  14 +-
 .../shared/charts/CustomPlot/plotUtils.tsx    |   2 +-
 .../__snapshots__/CustomPlot.test.js.snap     | 580 +++++++++---------
 .../ErroneousTransactionsRateChart/index.tsx  |   4 +-
 .../shared/charts/MetricsChart/index.tsx      |   2 +-
 .../TransactionLineChart/index.tsx            |   3 +
 .../shared/charts/TransactionCharts/index.tsx |  81 +--
 .../public/hooks/useTransactionBreakdown.ts   |   2 +-
 .../apm/public/utils/formatters/formatters.ts |  21 -
 .../lib/transactions/breakdown/index.test.ts  |  33 +-
 .../lib/transactions/breakdown/index.ts       |  20 +-
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 .../tests/transaction_groups/breakdown.ts     |  26 +-
 .../expectation/breakdown.json                |  34 +-
 .../breakdown_transaction_name.json           |  55 --
 26 files changed, 469 insertions(+), 639 deletions(-)
 rename x-pack/plugins/apm/{public/utils/formatters/__test__ => common/utils}/formatters.test.ts (96%)
 create mode 100644 x-pack/plugins/apm/common/utils/formatters.ts
 delete mode 100644 x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownKpiList.tsx
 delete mode 100644 x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown_transaction_name.json

diff --git a/x-pack/plugins/apm/public/utils/formatters/__test__/formatters.test.ts b/x-pack/plugins/apm/common/utils/formatters.test.ts
similarity index 96%
rename from x-pack/plugins/apm/public/utils/formatters/__test__/formatters.test.ts
rename to x-pack/plugins/apm/common/utils/formatters.test.ts
index 66101baf3a7461..ce317c5a6a8271 100644
--- a/x-pack/plugins/apm/public/utils/formatters/__test__/formatters.test.ts
+++ b/x-pack/plugins/apm/common/utils/formatters.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 { asPercent } from '../formatters';
+import { asPercent } from './formatters';
 
 describe('formatters', () => {
   describe('asPercent', () => {
diff --git a/x-pack/plugins/apm/common/utils/formatters.ts b/x-pack/plugins/apm/common/utils/formatters.ts
new file mode 100644
index 00000000000000..f7c609d949adf7
--- /dev/null
+++ b/x-pack/plugins/apm/common/utils/formatters.ts
@@ -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 numeral from '@elastic/numeral';
+
+export function asPercent(
+  numerator: number,
+  denominator: number | undefined,
+  fallbackResult = ''
+) {
+  if (!denominator || isNaN(numerator)) {
+    return fallbackResult;
+  }
+
+  const decimal = numerator / denominator;
+
+  // 33.2 => 33%
+  // 3.32 => 3.3%
+  // 0 => 0%
+  if (Math.abs(decimal) >= 0.1 || decimal === 0) {
+    return numeral(decimal).format('0%');
+  }
+
+  return numeral(decimal).format('0.0%');
+}
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsList.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsList.tsx
index be52018735099a..ba4451c37b3046 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsList.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsList.tsx
@@ -8,8 +8,9 @@ import { i18n } from '@kbn/i18n';
 import { isNumber } from 'lodash';
 import React from 'react';
 import styled from 'styled-components';
+import { asPercent } from '../../../../../common/utils/formatters';
 import { ServiceNodeStats } from '../../../../../common/service_map';
-import { asDuration, asPercent, tpmUnit } from '../../../../utils/formatters';
+import { asDuration, tpmUnit } from '../../../../utils/formatters';
 
 export const ItemRow = styled('tr')`
   line-height: 2;
diff --git a/x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx b/x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx
index 3cde48aa483cba..9940a7aabb2190 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx
@@ -13,6 +13,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
+import { asPercent } from '../../../../common/utils/formatters';
 import { UNIDENTIFIED_SERVICE_NODES_LABEL } from '../../../../common/i18n';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
 import { Projection } from '../../../../common/projections';
@@ -20,11 +21,7 @@ import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { useUrlParams } from '../../../hooks/useUrlParams';
 import { ManagedTable, ITableColumn } from '../../shared/ManagedTable';
 import { useFetcher } from '../../../hooks/useFetcher';
-import {
-  asDynamicBytes,
-  asInteger,
-  asPercent,
-} from '../../../utils/formatters';
+import { asDynamicBytes, asInteger } from '../../../utils/formatters';
 import { ServiceNodeMetricOverviewLink } from '../../shared/Links/apm/ServiceNodeMetricOverviewLink';
 import { truncate, px, unit } from '../../../style/variables';
 
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/PercentOfParent.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/PercentOfParent.tsx
index 1725a13f4da66c..41c958838803e2 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/PercentOfParent.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/WaterfallWithSummmary/PercentOfParent.tsx
@@ -7,7 +7,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiToolTip } from '@elastic/eui';
-import { asPercent } from '../../../../utils/formatters';
+import { asPercent } from '../../../../../common/utils/formatters';
 
 interface PercentOfParentProps {
   duration: number;
diff --git a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx
index 0dc2f607b1ef27..515fcbc88c9014 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionDetails/index.tsx
@@ -5,32 +5,29 @@
  */
 
 import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
   EuiPanel,
   EuiSpacer,
   EuiTitle,
-  EuiHorizontalRule,
-  EuiFlexGroup,
-  EuiFlexItem,
 } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { EuiFlexGrid } from '@elastic/eui';
+import { useTrackPageview } from '../../../../../observability/public';
+import { Projection } from '../../../../common/projections';
+import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
+import { FETCH_STATUS } from '../../../hooks/useFetcher';
+import { useLocation } from '../../../hooks/useLocation';
 import { useTransactionCharts } from '../../../hooks/useTransactionCharts';
 import { useTransactionDistribution } from '../../../hooks/useTransactionDistribution';
+import { useUrlParams } from '../../../hooks/useUrlParams';
 import { useWaterfall } from '../../../hooks/useWaterfall';
-import { TransactionCharts } from '../../shared/charts/TransactionCharts';
 import { ApmHeader } from '../../shared/ApmHeader';
+import { TransactionCharts } from '../../shared/charts/TransactionCharts';
+import { HeightRetainer } from '../../shared/HeightRetainer';
+import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { TransactionDistribution } from './Distribution';
 import { WaterfallWithSummmary } from './WaterfallWithSummmary';
-import { useLocation } from '../../../hooks/useLocation';
-import { useUrlParams } from '../../../hooks/useUrlParams';
-import { FETCH_STATUS } from '../../../hooks/useFetcher';
-import { TransactionBreakdown } from '../../shared/TransactionBreakdown';
-import { ChartsSyncContextProvider } from '../../../context/ChartsSyncContext';
-import { useTrackPageview } from '../../../../../observability/public';
-import { Projection } from '../../../../common/projections';
-import { LocalUIFilters } from '../../shared/LocalUIFilters';
-import { HeightRetainer } from '../../shared/HeightRetainer';
-import { ErroneousTransactionsRateChart } from '../../shared/charts/ErroneousTransactionsRateChart';
 
 export function TransactionDetails() {
   const location = useLocation();
@@ -86,21 +83,9 @@ export function TransactionDetails() {
         </EuiFlexItem>
         <EuiFlexItem grow={7}>
           <ChartsSyncContextProvider>
-            <EuiFlexGrid columns={2} gutterSize="s">
-              <EuiFlexItem>
-                <TransactionBreakdown />
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <ErroneousTransactionsRateChart />
-              </EuiFlexItem>
-            </EuiFlexGrid>
-
-            <EuiSpacer size="s" />
-
             <TransactionCharts
               charts={transactionChartsData}
               urlParams={urlParams}
-              location={location}
             />
           </ChartsSyncContextProvider>
 
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 0757ae572152c9..81d8a6f8073753 100644
--- a/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/TransactionOverview/index.tsx
@@ -7,7 +7,6 @@
 import {
   EuiCallOut,
   EuiCode,
-  EuiFlexGrid,
   EuiFlexGroup,
   EuiFlexItem,
   EuiHorizontalRule,
@@ -29,13 +28,11 @@ import { useServiceTransactionTypes } from '../../../hooks/useServiceTransaction
 import { useTransactionCharts } from '../../../hooks/useTransactionCharts';
 import { useTransactionList } from '../../../hooks/useTransactionList';
 import { useUrlParams } from '../../../hooks/useUrlParams';
-import { ErroneousTransactionsRateChart } from '../../shared/charts/ErroneousTransactionsRateChart';
 import { TransactionCharts } from '../../shared/charts/TransactionCharts';
 import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink';
 import { fromQuery, toQuery } from '../../shared/Links/url_helpers';
 import { LocalUIFilters } from '../../shared/LocalUIFilters';
 import { TransactionTypeFilter } from '../../shared/LocalUIFilters/TransactionTypeFilter';
-import { TransactionBreakdown } from '../../shared/TransactionBreakdown';
 import { TransactionList } from './List';
 import { useRedirect } from './useRedirect';
 
@@ -125,20 +122,8 @@ export function TransactionOverview() {
         </EuiFlexItem>
         <EuiFlexItem grow={7}>
           <ChartsSyncContextProvider>
-            <EuiFlexGrid columns={2} gutterSize="s">
-              <EuiFlexItem>
-                <TransactionBreakdown />
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <ErroneousTransactionsRateChart />
-              </EuiFlexItem>
-            </EuiFlexGrid>
-
-            <EuiSpacer size="s" />
-
             <TransactionCharts
               charts={transactionCharts}
-              location={location}
               urlParams={urlParams}
             />
           </ChartsSyncContextProvider>
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownGraph/index.tsx b/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownGraph/index.tsx
index 209657971620bb..b908eb8da4d03e 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownGraph/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownGraph/index.tsx
@@ -4,19 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useMemo } from 'react';
 import { throttle } from 'lodash';
+import React, { useMemo } from 'react';
+import { asPercent } from '../../../../../common/utils/formatters';
+import { useUiTracker } from '../../../../../../observability/public';
 import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
-import { Coordinate, TimeSeries } from '../../../../../typings/timeseries';
 import { Maybe } from '../../../../../typings/common';
-import { TransactionLineChart } from '../../charts/TransactionCharts/TransactionLineChart';
-import { asPercent } from '../../../../utils/formatters';
-import { unit } from '../../../../style/variables';
+import { Coordinate, TimeSeries } from '../../../../../typings/timeseries';
+import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
-import { useUiTracker } from '../../../../../../observability/public';
+import { getEmptySeries } from '../../charts/CustomPlot/getEmptySeries';
+import { TransactionLineChart } from '../../charts/TransactionCharts/TransactionLineChart';
 
 interface Props {
   timeseries: TimeSeries[];
+  noHits: boolean;
 }
 
 const tickFormatY = (y: Maybe<number>) => {
@@ -29,8 +31,9 @@ const formatTooltipValue = (coordinate: Coordinate) => {
     : NOT_AVAILABLE_LABEL;
 };
 
-function TransactionBreakdownGraph(props: Props) {
-  const { timeseries } = props;
+function TransactionBreakdownGraph({ timeseries, noHits }: Props) {
+  const { urlParams } = useUrlParams();
+  const { rangeFrom, rangeTo } = urlParams;
   const trackApmEvent = useUiTracker({ app: 'apm' });
   const handleHover = useMemo(
     () =>
@@ -38,15 +41,23 @@ function TransactionBreakdownGraph(props: Props) {
     [trackApmEvent]
   );
 
+  const emptySeries =
+    rangeFrom && rangeTo
+      ? getEmptySeries(
+          new Date(rangeFrom).getTime(),
+          new Date(rangeTo).getTime()
+        )
+      : [];
+
   return (
     <TransactionLineChart
-      series={timeseries}
+      series={noHits ? emptySeries : timeseries}
       tickFormatY={tickFormatY}
       formatTooltipValue={formatTooltipValue}
       yMax={1}
-      height={unit * 12}
       stacked={true}
       onHover={handleHover}
+      visibleLegendCount={10}
     />
   );
 }
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownKpiList.tsx b/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownKpiList.tsx
deleted file mode 100644
index d3761cf0fe38e3..00000000000000
--- a/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/TransactionBreakdownKpiList.tsx
+++ /dev/null
@@ -1,75 +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 {
-  EuiFlexGrid,
-  EuiFlexItem,
-  EuiFlexGroup,
-  EuiText,
-  EuiTitle,
-  EuiIcon,
-} from '@elastic/eui';
-import styled from 'styled-components';
-import { asPercent } from '../../../utils/formatters';
-
-interface TransactionBreakdownKpi {
-  name: string;
-  percentage: number;
-  color: string;
-}
-
-interface Props {
-  kpis: TransactionBreakdownKpi[];
-}
-
-const Description = styled.span`
-   {
-    white-space: nowrap;
-  }
-`;
-
-function KpiDescription({ name, color }: { name: string; color: string }) {
-  return (
-    <EuiFlexGroup
-      alignItems="center"
-      gutterSize="s"
-      direction="row"
-      wrap={false}
-    >
-      <EuiFlexItem grow={false}>
-        <EuiIcon type="dot" color={color} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiText color="subdued" size="xs">
-          <Description>{name}</Description>
-        </EuiText>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-}
-
-function TransactionBreakdownKpiList({ kpis }: Props) {
-  return (
-    <EuiFlexGrid>
-      {kpis.map((kpi) => (
-        <EuiFlexItem key={kpi.name} grow={false}>
-          <EuiFlexGroup direction="column" gutterSize="s">
-            <EuiFlexItem grow={false}>
-              <KpiDescription name={kpi.name} color={kpi.color} />
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiTitle size="s">
-                <span>{asPercent(kpi.percentage, 1)}</span>
-              </EuiTitle>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      ))}
-    </EuiFlexGrid>
-  );
-}
-
-export { TransactionBreakdownKpiList };
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/index.tsx b/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/index.tsx
index 80ed9163ec08d4..55826497ca3858 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/TransactionBreakdown/index.tsx
@@ -3,28 +3,18 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPanel,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { isEmpty } from 'lodash';
 import React from 'react';
 import { FETCH_STATUS } from '../../../hooks/useFetcher';
 import { useTransactionBreakdown } from '../../../hooks/useTransactionBreakdown';
 import { TransactionBreakdownGraph } from './TransactionBreakdownGraph';
-import { TransactionBreakdownKpiList } from './TransactionBreakdownKpiList';
-
-const emptyMessage = i18n.translate('xpack.apm.transactionBreakdown.noData', {
-  defaultMessage: 'No data within this time range.',
-});
 
 function TransactionBreakdown() {
   const { data, status } = useTransactionBreakdown();
-  const { kpis, timeseries } = data;
-  const noHits = data.kpis.length === 0 && status === FETCH_STATUS.SUCCESS;
+  const { timeseries } = data;
+  const noHits = isEmpty(timeseries) && status === FETCH_STATUS.SUCCESS;
 
   return (
     <EuiPanel>
@@ -39,14 +29,7 @@ function TransactionBreakdown() {
           </EuiTitle>
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          {noHits ? (
-            <EuiText>{emptyMessage}</EuiText>
-          ) : (
-            <TransactionBreakdownKpiList kpis={kpis} />
-          )}
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <TransactionBreakdownGraph timeseries={timeseries} />
+          <TransactionBreakdownGraph timeseries={timeseries} noHits={noHits} />
         </EuiFlexItem>
       </EuiFlexGroup>
     </EuiPanel>
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 41925d651e3617..501d30b5e2ba12 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
@@ -67,7 +67,7 @@ export class InnerCustomPlot extends PureComponent {
     (series) => {
       return series.slice(
         0,
-        VISIBLE_LEGEND_COUNT + getHiddenLegendCount(series)
+        this.props.visibleLegendCount + getHiddenLegendCount(series)
       );
     }
   );
@@ -128,14 +128,20 @@ export class InnerCustomPlot extends PureComponent {
   }
 
   render() {
-    const { series, truncateLegends, width, annotations } = this.props;
+    const {
+      series,
+      truncateLegends,
+      width,
+      annotations,
+      visibleLegendCount,
+    } = this.props;
 
     if (!width) {
       return null;
     }
 
     const hiddenSeriesCount = Math.max(
-      series.length - VISIBLE_LEGEND_COUNT - getHiddenLegendCount(series),
+      series.length - visibleLegendCount - getHiddenLegendCount(series),
       0
     );
     const visibleSeries = this.getVisibleSeries({ series });
@@ -239,6 +245,7 @@ InnerCustomPlot.propTypes = {
     })
   ),
   noHits: PropTypes.bool,
+  visibleLegendCount: PropTypes.number,
   onToggleLegend: PropTypes.func,
 };
 
@@ -249,6 +256,7 @@ InnerCustomPlot.defaultProps = {
   truncateLegends: false,
   xAxisTickSizeOuter: 0,
   noHits: false,
+  visibleLegendCount: VISIBLE_LEGEND_COUNT,
 };
 
 export default makeWidthFlexible(InnerCustomPlot);
diff --git a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx
index 7721375a404c40..67b7fd31b05bc3 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/CustomPlot/plotUtils.tsx
@@ -19,7 +19,7 @@ const XY_HEIGHT = unit * 16;
 const XY_MARGIN = {
   top: unit,
   left: unit * 5,
-  right: 0,
+  right: unit,
   bottom: unit * 2,
 };
 
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 f413610ebd9844..20636fa1444797 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
@@ -82,7 +82,7 @@ Array [
               className="rv-xy-plot__axis__line"
               style={Object {}}
               x1={0}
-              x2={720}
+              x2={704}
               y1={0}
               y2={0}
             />
@@ -93,7 +93,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(72, 0)"
+                transform="translate(70.4, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -116,7 +116,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(192, 0)"
+                transform="translate(187.73333333333332, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -139,7 +139,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(312, 0)"
+                transform="translate(305.06666666666666, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -162,7 +162,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(432, 0)"
+                transform="translate(422.4, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -185,7 +185,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(552, 0)"
+                transform="translate(539.7333333333333, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -208,7 +208,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(672, 0)"
+                transform="translate(657.0666666666667, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -237,21 +237,21 @@ Array [
             <line
               className="rv-xy-plot__grid-lines__line"
               x1={0}
-              x2={720}
+              x2={704}
               y1={208}
               y2={208}
             />
             <line
               className="rv-xy-plot__grid-lines__line"
               x1={0}
-              x2={720}
+              x2={704}
               y1={104}
               y2={104}
             />
             <line
               className="rv-xy-plot__grid-lines__line"
               x1={0}
-              x2={720}
+              x2={704}
               y1={0}
               y2={0}
             />
@@ -434,7 +434,7 @@ Array [
           >
             <path
               className="rv-xy-plot__series rv-xy-plot__series--line "
-              d="M0,208C8,177.67069216000004,16,147.3413843200001,24,145.82854374400006C32,144.31570316800003,40,143.55928288,48,143.55928288C56,143.55928288,64,143.69173256533335,72,143.95663193600006C80,144.22153130666678,88,150.087546752,96,150.087546752C104,150.087546752,112,143.61986468266673,120,141.36762432000006C128,139.1153839573334,136,138.10678017066667,144,136.574104576C152,135.04142898133333,160,134.60761100800002,168,132.171570752C176,129.735530496,184,122.7740017919999,192,121.95786303999996C200,121.14172428800003,208,120.73365491200006,216,120.73365491200006C224,120.73365491200006,232,150.33875334399997,240,150.33875334399997C248,150.33875334399997,256,145.21265574400005,264,145.21265574400005C272,145.21265574400005,280,159.49950515199998,288,159.49950515199998C296,159.49950515199998,304,159.25604087466667,312,158.76911232C320,158.28218376533334,328,153.13340861866664,336,148.71727519999996C344,144.30114178133329,352,136.23707191466664,360,132.27231180799998C368,128.30755170133332,376,127.558024672,384,124.92871456C392,122.299404448,400,116.49645113600002,408,116.49645113600002C416,116.49645113600002,424,142.8818553066667,432,147.94231920000001C440,153.00278309333333,448,155.53301504,456,155.53301504C464,155.53301504,472,147.54844651733333,480,141.915090304C488,136.28173409066667,495.99999999999994,121.73287776000008,503.99999999999994,121.73287776000008C511.99999999999994,121.73287776000008,520,147.90280169599995,528,152.63684758399998C536,157.370893472,544,159.73791641600002,552,159.73791641600002C560,159.73791641600002,568,140.4438672,576,140.4438672C584,140.4438672,592,150.146582976,600,150.146582976C608,150.146582976,616,121.98686448,624,121.98686448C632,121.98686448,640,208,648,208C656,208,664,133.83377571200015,672,102.0323582720003C680,70.23094083200043,688,17.191495360000836,696,17.191495360000836C704,17.191495360000836,712,112.59574768000043,720,208"
+              d="M0,208C7.822222222222222,177.67069216000004,15.644444444444442,147.3413843200001,23.466666666666665,145.82854374400006C31.288888888888888,144.31570316800003,39.11111111111111,143.55928288,46.93333333333333,143.55928288C54.75555555555555,143.55928288,62.57777777777778,143.69173256533335,70.4,143.95663193600006C78.22222222222223,144.22153130666678,86.04444444444444,150.087546752,93.86666666666666,150.087546752C101.68888888888888,150.087546752,109.5111111111111,143.61986468266673,117.33333333333333,141.36762432000006C125.15555555555555,139.1153839573334,132.9777777777778,138.10678017066667,140.8,136.574104576C148.62222222222223,135.04142898133333,156.44444444444446,134.60761100800002,164.26666666666668,132.171570752C172.0888888888889,129.735530496,179.9111111111111,122.7740017919999,187.73333333333332,121.95786303999996C195.55555555555554,121.14172428800003,203.37777777777777,120.73365491200006,211.2,120.73365491200006C219.0222222222222,120.73365491200006,226.84444444444443,150.33875334399997,234.66666666666666,150.33875334399997C242.48888888888888,150.33875334399997,250.3111111111111,145.21265574400005,258.1333333333333,145.21265574400005C265.9555555555556,145.21265574400005,273.77777777777777,159.49950515199998,281.6,159.49950515199998C289.4222222222222,159.49950515199998,297.24444444444447,159.25604087466667,305.06666666666666,158.76911232C312.8888888888889,158.28218376533334,320.7111111111111,153.13340861866664,328.53333333333336,148.71727519999996C336.35555555555555,144.30114178133329,344.1777777777778,136.23707191466664,352,132.27231180799998C359.8222222222222,128.30755170133332,367.64444444444445,127.55802467199999,375.46666666666664,124.92871456C383.2888888888889,122.299404448,391.1111111111111,116.49645113600002,398.93333333333334,116.49645113600002C406.75555555555553,116.49645113600002,414.5777777777778,142.8818553066667,422.4,147.94231920000001C430.22222222222223,153.00278309333333,438.0444444444444,155.53301504,445.8666666666667,155.53301504C453.68888888888887,155.53301504,461.5111111111111,147.5484465173333,469.3333333333333,141.915090304C477.1555555555555,136.28173409066667,484.97777777777776,121.73287776000008,492.79999999999995,121.73287776000008C500.6222222222222,121.73287776000008,508.4444444444444,147.90280169599995,516.2666666666667,152.63684758399998C524.0888888888888,157.370893472,531.9111111111112,159.73791641600002,539.7333333333333,159.73791641600002C547.5555555555555,159.73791641600002,555.3777777777779,140.4438672,563.2,140.4438672C571.0222222222222,140.4438672,578.8444444444445,150.146582976,586.6666666666667,150.146582976C594.4888888888889,150.146582976,602.3111111111111,121.98686448,610.1333333333333,121.98686448C617.9555555555555,121.98686448,625.7777777777778,208,633.6,208C641.4222222222222,208,649.2444444444445,133.8337757120002,657.0666666666667,102.0323582720003C664.8888888888889,70.23094083200053,672.7111111111111,17.191495360000836,680.5333333333333,17.191495360000836C688.3555555555555,17.191495360000836,696.1777777777778,112.59574768000043,704,208"
               onClick={[Function]}
               onContextMenu={[Function]}
               onMouseOut={[Function]}
@@ -471,7 +471,7 @@ Array [
                 }
               />
               <circle
-                cx={24}
+                cx={23.466666666666665}
                 cy={145.82854374400006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -488,7 +488,7 @@ Array [
                 }
               />
               <circle
-                cx={48}
+                cx={46.93333333333333}
                 cy={143.55928288}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -505,7 +505,7 @@ Array [
                 }
               />
               <circle
-                cx={72}
+                cx={70.4}
                 cy={143.95663193600006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -522,7 +522,7 @@ Array [
                 }
               />
               <circle
-                cx={96}
+                cx={93.86666666666666}
                 cy={150.087546752}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -539,7 +539,7 @@ Array [
                 }
               />
               <circle
-                cx={120}
+                cx={117.33333333333333}
                 cy={141.36762432000006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -556,7 +556,7 @@ Array [
                 }
               />
               <circle
-                cx={144}
+                cx={140.8}
                 cy={136.574104576}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -573,7 +573,7 @@ Array [
                 }
               />
               <circle
-                cx={168}
+                cx={164.26666666666668}
                 cy={132.171570752}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -590,7 +590,7 @@ Array [
                 }
               />
               <circle
-                cx={192}
+                cx={187.73333333333332}
                 cy={121.95786303999996}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -607,7 +607,7 @@ Array [
                 }
               />
               <circle
-                cx={216}
+                cx={211.2}
                 cy={120.73365491200006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -624,7 +624,7 @@ Array [
                 }
               />
               <circle
-                cx={240}
+                cx={234.66666666666666}
                 cy={150.33875334399997}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -641,7 +641,7 @@ Array [
                 }
               />
               <circle
-                cx={264}
+                cx={258.1333333333333}
                 cy={145.21265574400005}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -658,7 +658,7 @@ Array [
                 }
               />
               <circle
-                cx={288}
+                cx={281.6}
                 cy={159.49950515199998}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -675,7 +675,7 @@ Array [
                 }
               />
               <circle
-                cx={312}
+                cx={305.06666666666666}
                 cy={158.76911232}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -692,7 +692,7 @@ Array [
                 }
               />
               <circle
-                cx={336}
+                cx={328.53333333333336}
                 cy={148.71727519999996}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -709,7 +709,7 @@ Array [
                 }
               />
               <circle
-                cx={360}
+                cx={352}
                 cy={132.27231180799998}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -726,7 +726,7 @@ Array [
                 }
               />
               <circle
-                cx={384}
+                cx={375.46666666666664}
                 cy={124.92871456}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -743,7 +743,7 @@ Array [
                 }
               />
               <circle
-                cx={408}
+                cx={398.93333333333334}
                 cy={116.49645113600002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -760,7 +760,7 @@ Array [
                 }
               />
               <circle
-                cx={432}
+                cx={422.4}
                 cy={147.94231920000001}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -777,7 +777,7 @@ Array [
                 }
               />
               <circle
-                cx={456}
+                cx={445.8666666666667}
                 cy={155.53301504}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -794,7 +794,7 @@ Array [
                 }
               />
               <circle
-                cx={480}
+                cx={469.3333333333333}
                 cy={141.915090304}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -811,7 +811,7 @@ Array [
                 }
               />
               <circle
-                cx={503.99999999999994}
+                cx={492.79999999999995}
                 cy={121.73287776000008}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -828,7 +828,7 @@ Array [
                 }
               />
               <circle
-                cx={528}
+                cx={516.2666666666667}
                 cy={152.63684758399998}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -845,7 +845,7 @@ Array [
                 }
               />
               <circle
-                cx={552}
+                cx={539.7333333333333}
                 cy={159.73791641600002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -862,7 +862,7 @@ Array [
                 }
               />
               <circle
-                cx={576}
+                cx={563.2}
                 cy={140.4438672}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -879,7 +879,7 @@ Array [
                 }
               />
               <circle
-                cx={600}
+                cx={586.6666666666667}
                 cy={150.146582976}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -896,7 +896,7 @@ Array [
                 }
               />
               <circle
-                cx={624}
+                cx={610.1333333333333}
                 cy={121.98686448}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -913,7 +913,7 @@ Array [
                 }
               />
               <circle
-                cx={648}
+                cx={633.6}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -930,7 +930,7 @@ Array [
                 }
               />
               <circle
-                cx={672}
+                cx={657.0666666666667}
                 cy={102.0323582720003}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -947,7 +947,7 @@ Array [
                 }
               />
               <circle
-                cx={696}
+                cx={680.5333333333333}
                 cy={17.191495360000836}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -964,7 +964,7 @@ Array [
                 }
               />
               <circle
-                cx={720}
+                cx={704}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -987,7 +987,7 @@ Array [
           >
             <path
               className="rv-xy-plot__series rv-xy-plot__series--line "
-              d="M0,208C8,183.10434549333334,16,158.20869098666665,24,157.4191424C32,156.62959381333334,40,156.23481952,48,156.23481952C56,156.23481952,64,160.81596682666668,72,161.56425792000002C80,162.31254901333335,88,162.68669456,96,162.68669456C104,162.68669456,112,158.86059904000004,120,158.86059904000004C128,158.86059904000004,136,163.62246992000001,144,163.62246992000001C152,163.62246992000001,160,142.73391392000002,168,142.73391392000002C176,142.73391392000002,184,165.8699744,192,165.8699744C200,165.8699744,208,163.6534529066668,216,163.52439168000006C224,163.39533045333334,232,163.45986106666672,240,163.33079984C248,163.20173861333328,256,161.4781168,264,161.4781168C272,161.4781168,280,161.87593552,288,162.16472064C296,162.45350576,304,162.51342293333335,312,163.21082752C320,163.90823210666667,328,166.81319824,336,166.81319824C344,166.81319824,352,143.21282560000003,360,143.21282560000003C368,143.21282560000003,376,164.71169104,384,164.71169104C392,164.71169104,400,135.88840304000001,408,135.88840304000001C416,135.88840304000001,424,152.6074260533333,432,157.5681224C440,162.52881874666667,448,165.65258112,456,165.65258112C464,165.65258112,472,165.61368234666668,480,165.53588480000002C488,165.45808725333336,495.99999999999994,147.713644,503.99999999999994,147.713644C511.99999999999994,147.713644,520,163.65928869333334,528,164.06490256C536,164.47051642666668,544,164.27093592,552,164.67332336C560,165.07571080000002,568,166.4792272,576,166.4792272C584,166.4792272,592,152.7591936,600,152.7591936C608,152.7591936,616,156.23893584,624,163.19842032C632,170.15790479999998,640,208,648,208C656,208,664,177.47751424,672,161.37461184C680,145.27170944,688,111.3825856,696,111.3825856C704,111.3825856,712,159.6912928,720,208"
+              d="M0,208C7.822222222222222,183.10434549333334,15.644444444444442,158.20869098666665,23.466666666666665,157.4191424C31.288888888888888,156.62959381333334,39.11111111111111,156.23481952,46.93333333333333,156.23481952C54.75555555555555,156.23481952,62.57777777777778,160.81596682666668,70.4,161.56425792000002C78.22222222222223,162.31254901333335,86.04444444444444,162.68669456,93.86666666666666,162.68669456C101.68888888888888,162.68669456,109.5111111111111,158.86059904000004,117.33333333333333,158.86059904000004C125.15555555555555,158.86059904000004,132.9777777777778,163.62246992000001,140.8,163.62246992000001C148.62222222222223,163.62246992000001,156.44444444444446,142.73391392000002,164.26666666666668,142.73391392000002C172.0888888888889,142.73391392000002,179.9111111111111,165.8699744,187.73333333333332,165.8699744C195.55555555555554,165.8699744,203.37777777777777,163.6534529066668,211.2,163.52439168000006C219.0222222222222,163.39533045333334,226.84444444444443,163.45986106666672,234.66666666666666,163.33079984C242.48888888888888,163.20173861333328,250.3111111111111,161.4781168,258.1333333333333,161.4781168C265.9555555555556,161.4781168,273.77777777777777,161.87593552,281.6,162.16472064C289.4222222222222,162.45350576,297.24444444444447,162.51342293333335,305.06666666666666,163.21082752C312.8888888888889,163.90823210666667,320.7111111111111,166.81319824,328.53333333333336,166.81319824C336.35555555555555,166.81319824,344.1777777777778,143.21282560000003,352,143.21282560000003C359.8222222222222,143.21282560000003,367.64444444444445,164.71169104,375.46666666666664,164.71169104C383.2888888888889,164.71169104,391.1111111111111,135.88840304000001,398.93333333333334,135.88840304000001C406.75555555555553,135.88840304000001,414.5777777777778,152.6074260533333,422.4,157.5681224C430.22222222222223,162.52881874666667,438.0444444444444,165.65258112,445.8666666666667,165.65258112C453.68888888888887,165.65258112,461.5111111111111,165.61368234666668,469.3333333333333,165.53588480000002C477.1555555555555,165.45808725333336,484.97777777777776,147.713644,492.79999999999995,147.713644C500.6222222222222,147.713644,508.4444444444444,163.65928869333334,516.2666666666667,164.06490256C524.0888888888888,164.47051642666668,531.9111111111112,164.27093592,539.7333333333333,164.67332336C547.5555555555555,165.07571080000002,555.3777777777779,166.4792272,563.2,166.4792272C571.0222222222222,166.4792272,578.8444444444445,152.7591936,586.6666666666667,152.7591936C594.4888888888889,152.7591936,602.3111111111111,156.23893584,610.1333333333333,163.19842032C617.9555555555555,170.15790480000004,625.7777777777778,208,633.6,208C641.4222222222222,208,649.2444444444445,177.47751424000003,657.0666666666667,161.37461184C664.8888888888889,145.27170944000005,672.7111111111111,111.3825856,680.5333333333333,111.3825856C688.3555555555555,111.3825856,696.1777777777778,159.69129279999999,704,208"
               onClick={[Function]}
               onContextMenu={[Function]}
               onMouseOut={[Function]}
@@ -1024,7 +1024,7 @@ Array [
                 }
               />
               <circle
-                cx={24}
+                cx={23.466666666666665}
                 cy={157.4191424}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1041,7 +1041,7 @@ Array [
                 }
               />
               <circle
-                cx={48}
+                cx={46.93333333333333}
                 cy={156.23481952}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1058,7 +1058,7 @@ Array [
                 }
               />
               <circle
-                cx={72}
+                cx={70.4}
                 cy={161.56425792000002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1075,7 +1075,7 @@ Array [
                 }
               />
               <circle
-                cx={96}
+                cx={93.86666666666666}
                 cy={162.68669456}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1092,7 +1092,7 @@ Array [
                 }
               />
               <circle
-                cx={120}
+                cx={117.33333333333333}
                 cy={158.86059904000004}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1109,7 +1109,7 @@ Array [
                 }
               />
               <circle
-                cx={144}
+                cx={140.8}
                 cy={163.62246992000001}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1126,7 +1126,7 @@ Array [
                 }
               />
               <circle
-                cx={168}
+                cx={164.26666666666668}
                 cy={142.73391392000002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1143,7 +1143,7 @@ Array [
                 }
               />
               <circle
-                cx={192}
+                cx={187.73333333333332}
                 cy={165.8699744}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1160,7 +1160,7 @@ Array [
                 }
               />
               <circle
-                cx={216}
+                cx={211.2}
                 cy={163.52439168000006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1177,7 +1177,7 @@ Array [
                 }
               />
               <circle
-                cx={240}
+                cx={234.66666666666666}
                 cy={163.33079984}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1194,7 +1194,7 @@ Array [
                 }
               />
               <circle
-                cx={264}
+                cx={258.1333333333333}
                 cy={161.4781168}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1211,7 +1211,7 @@ Array [
                 }
               />
               <circle
-                cx={288}
+                cx={281.6}
                 cy={162.16472064}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1228,7 +1228,7 @@ Array [
                 }
               />
               <circle
-                cx={312}
+                cx={305.06666666666666}
                 cy={163.21082752}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1245,7 +1245,7 @@ Array [
                 }
               />
               <circle
-                cx={336}
+                cx={328.53333333333336}
                 cy={166.81319824}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1262,7 +1262,7 @@ Array [
                 }
               />
               <circle
-                cx={360}
+                cx={352}
                 cy={143.21282560000003}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1279,7 +1279,7 @@ Array [
                 }
               />
               <circle
-                cx={384}
+                cx={375.46666666666664}
                 cy={164.71169104}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1296,7 +1296,7 @@ Array [
                 }
               />
               <circle
-                cx={408}
+                cx={398.93333333333334}
                 cy={135.88840304000001}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1313,7 +1313,7 @@ Array [
                 }
               />
               <circle
-                cx={432}
+                cx={422.4}
                 cy={157.5681224}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1330,7 +1330,7 @@ Array [
                 }
               />
               <circle
-                cx={456}
+                cx={445.8666666666667}
                 cy={165.65258112}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1347,7 +1347,7 @@ Array [
                 }
               />
               <circle
-                cx={480}
+                cx={469.3333333333333}
                 cy={165.53588480000002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1364,7 +1364,7 @@ Array [
                 }
               />
               <circle
-                cx={503.99999999999994}
+                cx={492.79999999999995}
                 cy={147.713644}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1381,7 +1381,7 @@ Array [
                 }
               />
               <circle
-                cx={528}
+                cx={516.2666666666667}
                 cy={164.06490256}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1398,7 +1398,7 @@ Array [
                 }
               />
               <circle
-                cx={552}
+                cx={539.7333333333333}
                 cy={164.67332336}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1415,7 +1415,7 @@ Array [
                 }
               />
               <circle
-                cx={576}
+                cx={563.2}
                 cy={166.4792272}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1432,7 +1432,7 @@ Array [
                 }
               />
               <circle
-                cx={600}
+                cx={586.6666666666667}
                 cy={152.7591936}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1449,7 +1449,7 @@ Array [
                 }
               />
               <circle
-                cx={624}
+                cx={610.1333333333333}
                 cy={163.19842032}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1466,7 +1466,7 @@ Array [
                 }
               />
               <circle
-                cx={648}
+                cx={633.6}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1483,7 +1483,7 @@ Array [
                 }
               />
               <circle
-                cx={672}
+                cx={657.0666666666667}
                 cy={161.37461184}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1500,7 +1500,7 @@ Array [
                 }
               />
               <circle
-                cx={696}
+                cx={680.5333333333333}
                 cy={111.3825856}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1517,7 +1517,7 @@ Array [
                 }
               />
               <circle
-                cx={720}
+                cx={704}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1540,7 +1540,7 @@ Array [
           >
             <path
               className="rv-xy-plot__series rv-xy-plot__series--line "
-              d="M0,208C8,198.0144506122449,16,188.0289012244898,24,188.0289012244898C32,188.0289012244898,40,190.93245866666666,48,190.93245866666666C56,190.93245866666666,64,190.28154649962812,72,189.81180675918367C80,189.34206701873921,88,188.114020224,96,188.114020224C104,188.114020224,112,188.75217580408165,120,188.75217580408165C128,188.75217580408165,136,187.7737856411058,144,186.9231112C152,186.07243675889418,160,183.64812915744682,168,183.64812915744682C176,183.64812915744682,184,187.40215166647675,192,188.65222657560977C200,189.9023014847428,208,191.1485786122449,216,191.1485786122449C224,191.1485786122449,232,187.99938938181816,240,187.99938938181816C248,187.99938938181816,256,192.51163795348836,264,192.51163795348836C272,192.51163795348836,280,186.99252785777776,288,186.99252785777776C296,186.99252785777776,304,191.5321727255814,312,191.5321727255814C320,191.5321727255814,328,188.75657926666668,336,188.75657926666668C344,188.75657926666668,352,189.74989696,360,189.74989696C368,189.74989696,376,189.71163744,384,189.6351184C392,189.55859936000002,400,184.25858141935484,408,184.25858141935484C416,184.25858141935484,424,190.2827607652174,432,190.2827607652174C440,190.2827607652174,448,189.76271776603772,456,189.76271776603772C464,189.76271776603772,472,191.83746261333334,480,191.83746261333334C488,191.83746261333334,495.99999999999994,187.9456040347826,503.99999999999994,187.9456040347826C511.99999999999994,187.9456040347826,520,188.09594339288537,528,188.3966221090909C536,188.69730082529645,544,191.762533248,552,191.762533248C560,191.762533248,568,191.6625795195817,576,191.4626720627451C584,191.2627646059085,592,189.4011021381818,600,189.4011021381818C608,189.4011021381818,616,189.79567013943304,624,190.58480614193547C632,191.3739421444379,640,208,648,208C656,208,664,194.91739193977511,672,189.69166496603773C680,184.46593799230035,688,176.64563815757575,696,176.64563815757575C704,176.64563815757575,712,192.32281907878786,720,208"
+              d="M0,208C7.822222222222222,198.0144506122449,15.644444444444442,188.0289012244898,23.466666666666665,188.0289012244898C31.288888888888888,188.0289012244898,39.11111111111111,190.93245866666666,46.93333333333333,190.93245866666666C54.75555555555555,190.93245866666666,62.57777777777778,190.28154649962812,70.4,189.81180675918367C78.22222222222223,189.34206701873921,86.04444444444444,188.114020224,93.86666666666666,188.114020224C101.68888888888888,188.114020224,109.5111111111111,188.75217580408165,117.33333333333333,188.75217580408165C125.15555555555555,188.75217580408165,132.9777777777778,187.7737856411058,140.8,186.9231112C148.62222222222223,186.07243675889418,156.44444444444446,183.64812915744682,164.26666666666668,183.64812915744682C172.0888888888889,183.64812915744682,179.9111111111111,187.40215166647675,187.73333333333332,188.65222657560977C195.55555555555554,189.9023014847428,203.37777777777777,191.1485786122449,211.2,191.1485786122449C219.0222222222222,191.1485786122449,226.84444444444443,187.99938938181816,234.66666666666666,187.99938938181816C242.48888888888888,187.99938938181816,250.3111111111111,192.51163795348836,258.1333333333333,192.51163795348836C265.9555555555556,192.51163795348836,273.77777777777777,186.99252785777776,281.6,186.99252785777776C289.4222222222222,186.99252785777776,297.24444444444447,191.5321727255814,305.06666666666666,191.5321727255814C312.8888888888889,191.5321727255814,320.7111111111111,188.75657926666668,328.53333333333336,188.75657926666668C336.35555555555555,188.75657926666668,344.1777777777778,189.74989696,352,189.74989696C359.8222222222222,189.74989696,367.64444444444445,189.71163744,375.46666666666664,189.6351184C383.2888888888889,189.55859936000002,391.1111111111111,184.25858141935484,398.93333333333334,184.25858141935484C406.75555555555553,184.25858141935484,414.5777777777778,190.2827607652174,422.4,190.2827607652174C430.22222222222223,190.2827607652174,438.0444444444444,189.76271776603772,445.8666666666667,189.76271776603772C453.68888888888887,189.76271776603772,461.5111111111111,191.83746261333334,469.3333333333333,191.83746261333334C477.1555555555555,191.83746261333334,484.97777777777776,187.9456040347826,492.79999999999995,187.9456040347826C500.6222222222222,187.9456040347826,508.4444444444444,188.09594339288537,516.2666666666667,188.3966221090909C524.0888888888888,188.69730082529645,531.9111111111112,191.762533248,539.7333333333333,191.762533248C547.5555555555555,191.762533248,555.3777777777779,191.6625795195817,563.2,191.4626720627451C571.0222222222222,191.2627646059085,578.8444444444445,189.4011021381818,586.6666666666667,189.4011021381818C594.4888888888889,189.4011021381818,602.3111111111111,189.79567013943304,610.1333333333333,190.58480614193547C617.9555555555555,191.3739421444379,625.7777777777778,208,633.6,208C641.4222222222222,208,649.2444444444445,194.91739193977511,657.0666666666667,189.69166496603773C664.8888888888889,184.46593799230038,672.7111111111111,176.64563815757575,680.5333333333333,176.64563815757575C688.3555555555555,176.64563815757575,696.1777777777778,192.32281907878786,704,208"
               onClick={[Function]}
               onContextMenu={[Function]}
               onMouseOut={[Function]}
@@ -1577,7 +1577,7 @@ Array [
                 }
               />
               <circle
-                cx={24}
+                cx={23.466666666666665}
                 cy={188.0289012244898}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1594,7 +1594,7 @@ Array [
                 }
               />
               <circle
-                cx={48}
+                cx={46.93333333333333}
                 cy={190.93245866666666}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1611,7 +1611,7 @@ Array [
                 }
               />
               <circle
-                cx={72}
+                cx={70.4}
                 cy={189.81180675918367}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1628,7 +1628,7 @@ Array [
                 }
               />
               <circle
-                cx={96}
+                cx={93.86666666666666}
                 cy={188.114020224}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1645,7 +1645,7 @@ Array [
                 }
               />
               <circle
-                cx={120}
+                cx={117.33333333333333}
                 cy={188.75217580408165}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1662,7 +1662,7 @@ Array [
                 }
               />
               <circle
-                cx={144}
+                cx={140.8}
                 cy={186.9231112}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1679,7 +1679,7 @@ Array [
                 }
               />
               <circle
-                cx={168}
+                cx={164.26666666666668}
                 cy={183.64812915744682}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1696,7 +1696,7 @@ Array [
                 }
               />
               <circle
-                cx={192}
+                cx={187.73333333333332}
                 cy={188.65222657560977}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1713,7 +1713,7 @@ Array [
                 }
               />
               <circle
-                cx={216}
+                cx={211.2}
                 cy={191.1485786122449}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1730,7 +1730,7 @@ Array [
                 }
               />
               <circle
-                cx={240}
+                cx={234.66666666666666}
                 cy={187.99938938181816}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1747,7 +1747,7 @@ Array [
                 }
               />
               <circle
-                cx={264}
+                cx={258.1333333333333}
                 cy={192.51163795348836}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1764,7 +1764,7 @@ Array [
                 }
               />
               <circle
-                cx={288}
+                cx={281.6}
                 cy={186.99252785777776}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1781,7 +1781,7 @@ Array [
                 }
               />
               <circle
-                cx={312}
+                cx={305.06666666666666}
                 cy={191.5321727255814}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1798,7 +1798,7 @@ Array [
                 }
               />
               <circle
-                cx={336}
+                cx={328.53333333333336}
                 cy={188.75657926666668}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1815,7 +1815,7 @@ Array [
                 }
               />
               <circle
-                cx={360}
+                cx={352}
                 cy={189.74989696}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1832,7 +1832,7 @@ Array [
                 }
               />
               <circle
-                cx={384}
+                cx={375.46666666666664}
                 cy={189.6351184}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1849,7 +1849,7 @@ Array [
                 }
               />
               <circle
-                cx={408}
+                cx={398.93333333333334}
                 cy={184.25858141935484}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1866,7 +1866,7 @@ Array [
                 }
               />
               <circle
-                cx={432}
+                cx={422.4}
                 cy={190.2827607652174}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1883,7 +1883,7 @@ Array [
                 }
               />
               <circle
-                cx={456}
+                cx={445.8666666666667}
                 cy={189.76271776603772}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1900,7 +1900,7 @@ Array [
                 }
               />
               <circle
-                cx={480}
+                cx={469.3333333333333}
                 cy={191.83746261333334}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1917,7 +1917,7 @@ Array [
                 }
               />
               <circle
-                cx={503.99999999999994}
+                cx={492.79999999999995}
                 cy={187.9456040347826}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1934,7 +1934,7 @@ Array [
                 }
               />
               <circle
-                cx={528}
+                cx={516.2666666666667}
                 cy={188.3966221090909}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1951,7 +1951,7 @@ Array [
                 }
               />
               <circle
-                cx={552}
+                cx={539.7333333333333}
                 cy={191.762533248}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1968,7 +1968,7 @@ Array [
                 }
               />
               <circle
-                cx={576}
+                cx={563.2}
                 cy={191.4626720627451}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -1985,7 +1985,7 @@ Array [
                 }
               />
               <circle
-                cx={600}
+                cx={586.6666666666667}
                 cy={189.4011021381818}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -2002,7 +2002,7 @@ Array [
                 }
               />
               <circle
-                cx={624}
+                cx={610.1333333333333}
                 cy={190.58480614193547}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -2019,7 +2019,7 @@ Array [
                 }
               />
               <circle
-                cx={648}
+                cx={633.6}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -2036,7 +2036,7 @@ Array [
                 }
               />
               <circle
-                cx={672}
+                cx={657.0666666666667}
                 cy={189.69166496603773}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -2053,7 +2053,7 @@ Array [
                 }
               />
               <circle
-                cx={696}
+                cx={680.5333333333333}
                 cy={176.64563815757575}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -2070,7 +2070,7 @@ Array [
                 }
               />
               <circle
-                cx={720}
+                cx={704}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -2160,7 +2160,7 @@ Array [
           >
             <path
               className="rv-voronoi__cell "
-              d="M92,256L92,16L80,16L80,256Z"
+              d="M91.7333335,256L91.7333335,16L80,16L80,256Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2175,7 +2175,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M92,16L92,256L116,256L116,16Z"
+              d="M91.7333335,16L91.7333335,256L115.19999999999999,256L115.19999999999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2190,7 +2190,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M116,16L116,256L140,256L140,16Z"
+              d="M115.19999999999999,16L115.19999999999999,256L138.6666665,256L138.6666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2205,7 +2205,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M140,16L140,256L164,256L164,16Z"
+              d="M138.6666665,16L138.6666665,256L162.1333335,256L162.1333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2220,7 +2220,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M164,16L164,256L188,256L188,16Z"
+              d="M162.1333335,16L162.1333335,256L185.59999999999997,256L185.59999999999997,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2235,7 +2235,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M188,16L188,256L212,256L212,16Z"
+              d="M185.59999999999997,16L185.59999999999997,256L209.0666665,256L209.0666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2250,7 +2250,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M212,16L212,256L236,256L236,16Z"
+              d="M209.0666665,16L209.0666665,256L232.53333349999997,256L232.53333349999997,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2265,7 +2265,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M236,16L236,256L260,256L260,16Z"
+              d="M232.53333349999997,16L232.53333349999997,256L256,256L256,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2280,7 +2280,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M260,16L260,256L284,256L284,16Z"
+              d="M256,16L256,256L279.4666665,256L279.4666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2295,7 +2295,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M284,16L284,256L308,256L308,16Z"
+              d="M279.4666665,16L279.4666665,256L302.9333335,256L302.9333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2310,7 +2310,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M308,16L308,256L332,256L332,16Z"
+              d="M302.9333335,16L302.9333335,256L326.4,256L326.4,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2325,7 +2325,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M332,16L332,256L356,256L356,16Z"
+              d="M326.4,16L326.4,256L349.86666649999995,256L349.86666649999995,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2340,7 +2340,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M356,16L356,256L380,256L380,16Z"
+              d="M349.86666649999995,16L349.86666649999995,256L373.3333335,256L373.3333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2355,7 +2355,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M380,16L380,256L404,256L404,16Z"
+              d="M373.3333335,16L373.3333335,256L396.79999999999995,256L396.79999999999995,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2370,7 +2370,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M404,16L404,256L428,256L428,16Z"
+              d="M396.79999999999995,16L396.79999999999995,256L420.2666665,256L420.2666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2385,7 +2385,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M428,16L428,256L452,256L452,16Z"
+              d="M420.2666665,16L420.2666665,256L443.73333349999996,256L443.73333349999996,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2400,7 +2400,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M452,16L452,256L476,256L476,16Z"
+              d="M443.73333349999996,16L443.73333349999996,256L467.2,256L467.2,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2415,7 +2415,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M476,16L476,256L500,256L500,16Z"
+              d="M467.2,16L467.2,256L490.6666665,256L490.6666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2430,7 +2430,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M500,16L500,256L524,256L524,16Z"
+              d="M490.6666665,16L490.6666665,256L514.1333334999999,256L514.1333334999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2445,7 +2445,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M524,16L524,256L548,256L548,16Z"
+              d="M514.1333334999999,16L514.1333334999999,256L537.5999999999999,256L537.5999999999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2460,7 +2460,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M548,16L548,256L572,256L572,16Z"
+              d="M537.5999999999999,16L537.5999999999999,256L561.0666664999999,256L561.0666664999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2475,7 +2475,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M572,16L572,256L596,256L596,16Z"
+              d="M561.0666664999999,16L561.0666664999999,256L584.5333335,256L584.5333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2490,7 +2490,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M596,16L596,256L620,256L620,16Z"
+              d="M584.5333335,16L584.5333335,256L608,256L608,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2505,7 +2505,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M620,16L620,256L644,256L644,16Z"
+              d="M608,16L608,256L631.4666665,256L631.4666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2520,7 +2520,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M644,16L644,256L668,256L668,16Z"
+              d="M631.4666665,16L631.4666665,256L654.9333334999999,256L654.9333334999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2535,7 +2535,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M668,16L668,256L692,256L692,16Z"
+              d="M654.9333334999999,16L654.9333334999999,256L678.4,256L678.4,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2550,7 +2550,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M692,16L692,256L716,256L716,16Z"
+              d="M678.4,16L678.4,256L701.8666665000001,256L701.8666665000001,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2565,7 +2565,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M716,16L716,256L740,256L740,16Z"
+              d="M701.8666665000001,16L701.8666665000001,256L725.3333335,256L725.3333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2580,7 +2580,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M740,16L740,256L764,256L764,16Z"
+              d="M725.3333335,16L725.3333335,256L748.8,256L748.8,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2595,7 +2595,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M764,16L764,256L788,256L788,16Z"
+              d="M748.8,16L748.8,256L772.2666664999999,256L772.2666664999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2610,7 +2610,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M788,16L788,256L800,256L800,16Z"
+              d="M772.2666664999999,16L772.2666664999999,256L800,256L800,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -2840,8 +2840,8 @@ exports[`when response has data when dragging without releasing should display S
   fillOpacity="0.1"
   height={208}
   pointerEvents="none"
-  width={239.9999999999999}
-  x={320}
+  width={234.66666666666663}
+  x={314.66666666666663}
   y={16}
 />
 `;
@@ -3018,7 +3018,7 @@ Array [
               className="rv-xy-plot__axis__line"
               style={Object {}}
               x1={0}
-              x2={720}
+              x2={704}
               y1={0}
               y2={0}
             />
@@ -3029,7 +3029,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(72, 0)"
+                transform="translate(70.4, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -3052,7 +3052,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(192, 0)"
+                transform="translate(187.73333333333332, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -3075,7 +3075,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(312, 0)"
+                transform="translate(305.06666666666666, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -3098,7 +3098,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(432, 0)"
+                transform="translate(422.4, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -3121,7 +3121,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(552, 0)"
+                transform="translate(539.7333333333333, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -3144,7 +3144,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(672, 0)"
+                transform="translate(657.0666666666667, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -3173,21 +3173,21 @@ Array [
             <line
               className="rv-xy-plot__grid-lines__line"
               x1={0}
-              x2={720}
+              x2={704}
               y1={208}
               y2={208}
             />
             <line
               className="rv-xy-plot__grid-lines__line"
               x1={0}
-              x2={720}
+              x2={704}
               y1={104}
               y2={104}
             />
             <line
               className="rv-xy-plot__grid-lines__line"
               x1={0}
-              x2={720}
+              x2={704}
               y1={0}
               y2={0}
             />
@@ -3370,7 +3370,7 @@ Array [
           >
             <path
               className="rv-xy-plot__series rv-xy-plot__series--line "
-              d="M0,208C8,177.67069216000004,16,147.3413843200001,24,145.82854374400006C32,144.31570316800003,40,143.55928288,48,143.55928288C56,143.55928288,64,143.69173256533335,72,143.95663193600006C80,144.22153130666678,88,150.087546752,96,150.087546752C104,150.087546752,112,143.61986468266673,120,141.36762432000006C128,139.1153839573334,136,138.10678017066667,144,136.574104576C152,135.04142898133333,160,134.60761100800002,168,132.171570752C176,129.735530496,184,122.7740017919999,192,121.95786303999996C200,121.14172428800003,208,120.73365491200006,216,120.73365491200006C224,120.73365491200006,232,150.33875334399997,240,150.33875334399997C248,150.33875334399997,256,145.21265574400005,264,145.21265574400005C272,145.21265574400005,280,159.49950515199998,288,159.49950515199998C296,159.49950515199998,304,159.25604087466667,312,158.76911232C320,158.28218376533334,328,153.13340861866664,336,148.71727519999996C344,144.30114178133329,352,136.23707191466664,360,132.27231180799998C368,128.30755170133332,376,127.558024672,384,124.92871456C392,122.299404448,400,116.49645113600002,408,116.49645113600002C416,116.49645113600002,424,142.8818553066667,432,147.94231920000001C440,153.00278309333333,448,155.53301504,456,155.53301504C464,155.53301504,472,147.54844651733333,480,141.915090304C488,136.28173409066667,495.99999999999994,121.73287776000008,503.99999999999994,121.73287776000008C511.99999999999994,121.73287776000008,520,147.90280169599995,528,152.63684758399998C536,157.370893472,544,159.73791641600002,552,159.73791641600002C560,159.73791641600002,568,140.4438672,576,140.4438672C584,140.4438672,592,150.146582976,600,150.146582976C608,150.146582976,616,121.98686448,624,121.98686448C632,121.98686448,640,208,648,208C656,208,664,133.83377571200015,672,102.0323582720003C680,70.23094083200043,688,17.191495360000836,696,17.191495360000836C704,17.191495360000836,712,112.59574768000043,720,208"
+              d="M0,208C7.822222222222222,177.67069216000004,15.644444444444442,147.3413843200001,23.466666666666665,145.82854374400006C31.288888888888888,144.31570316800003,39.11111111111111,143.55928288,46.93333333333333,143.55928288C54.75555555555555,143.55928288,62.57777777777778,143.69173256533335,70.4,143.95663193600006C78.22222222222223,144.22153130666678,86.04444444444444,150.087546752,93.86666666666666,150.087546752C101.68888888888888,150.087546752,109.5111111111111,143.61986468266673,117.33333333333333,141.36762432000006C125.15555555555555,139.1153839573334,132.9777777777778,138.10678017066667,140.8,136.574104576C148.62222222222223,135.04142898133333,156.44444444444446,134.60761100800002,164.26666666666668,132.171570752C172.0888888888889,129.735530496,179.9111111111111,122.7740017919999,187.73333333333332,121.95786303999996C195.55555555555554,121.14172428800003,203.37777777777777,120.73365491200006,211.2,120.73365491200006C219.0222222222222,120.73365491200006,226.84444444444443,150.33875334399997,234.66666666666666,150.33875334399997C242.48888888888888,150.33875334399997,250.3111111111111,145.21265574400005,258.1333333333333,145.21265574400005C265.9555555555556,145.21265574400005,273.77777777777777,159.49950515199998,281.6,159.49950515199998C289.4222222222222,159.49950515199998,297.24444444444447,159.25604087466667,305.06666666666666,158.76911232C312.8888888888889,158.28218376533334,320.7111111111111,153.13340861866664,328.53333333333336,148.71727519999996C336.35555555555555,144.30114178133329,344.1777777777778,136.23707191466664,352,132.27231180799998C359.8222222222222,128.30755170133332,367.64444444444445,127.55802467199999,375.46666666666664,124.92871456C383.2888888888889,122.299404448,391.1111111111111,116.49645113600002,398.93333333333334,116.49645113600002C406.75555555555553,116.49645113600002,414.5777777777778,142.8818553066667,422.4,147.94231920000001C430.22222222222223,153.00278309333333,438.0444444444444,155.53301504,445.8666666666667,155.53301504C453.68888888888887,155.53301504,461.5111111111111,147.5484465173333,469.3333333333333,141.915090304C477.1555555555555,136.28173409066667,484.97777777777776,121.73287776000008,492.79999999999995,121.73287776000008C500.6222222222222,121.73287776000008,508.4444444444444,147.90280169599995,516.2666666666667,152.63684758399998C524.0888888888888,157.370893472,531.9111111111112,159.73791641600002,539.7333333333333,159.73791641600002C547.5555555555555,159.73791641600002,555.3777777777779,140.4438672,563.2,140.4438672C571.0222222222222,140.4438672,578.8444444444445,150.146582976,586.6666666666667,150.146582976C594.4888888888889,150.146582976,602.3111111111111,121.98686448,610.1333333333333,121.98686448C617.9555555555555,121.98686448,625.7777777777778,208,633.6,208C641.4222222222222,208,649.2444444444445,133.8337757120002,657.0666666666667,102.0323582720003C664.8888888888889,70.23094083200053,672.7111111111111,17.191495360000836,680.5333333333333,17.191495360000836C688.3555555555555,17.191495360000836,696.1777777777778,112.59574768000043,704,208"
               onClick={[Function]}
               onContextMenu={[Function]}
               onMouseOut={[Function]}
@@ -3407,7 +3407,7 @@ Array [
                 }
               />
               <circle
-                cx={24}
+                cx={23.466666666666665}
                 cy={145.82854374400006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3424,7 +3424,7 @@ Array [
                 }
               />
               <circle
-                cx={48}
+                cx={46.93333333333333}
                 cy={143.55928288}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3441,7 +3441,7 @@ Array [
                 }
               />
               <circle
-                cx={72}
+                cx={70.4}
                 cy={143.95663193600006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3458,7 +3458,7 @@ Array [
                 }
               />
               <circle
-                cx={96}
+                cx={93.86666666666666}
                 cy={150.087546752}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3475,7 +3475,7 @@ Array [
                 }
               />
               <circle
-                cx={120}
+                cx={117.33333333333333}
                 cy={141.36762432000006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3492,7 +3492,7 @@ Array [
                 }
               />
               <circle
-                cx={144}
+                cx={140.8}
                 cy={136.574104576}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3509,7 +3509,7 @@ Array [
                 }
               />
               <circle
-                cx={168}
+                cx={164.26666666666668}
                 cy={132.171570752}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3526,7 +3526,7 @@ Array [
                 }
               />
               <circle
-                cx={192}
+                cx={187.73333333333332}
                 cy={121.95786303999996}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3543,7 +3543,7 @@ Array [
                 }
               />
               <circle
-                cx={216}
+                cx={211.2}
                 cy={120.73365491200006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3560,7 +3560,7 @@ Array [
                 }
               />
               <circle
-                cx={240}
+                cx={234.66666666666666}
                 cy={150.33875334399997}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3577,7 +3577,7 @@ Array [
                 }
               />
               <circle
-                cx={264}
+                cx={258.1333333333333}
                 cy={145.21265574400005}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3594,7 +3594,7 @@ Array [
                 }
               />
               <circle
-                cx={288}
+                cx={281.6}
                 cy={159.49950515199998}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3611,7 +3611,7 @@ Array [
                 }
               />
               <circle
-                cx={312}
+                cx={305.06666666666666}
                 cy={158.76911232}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3628,7 +3628,7 @@ Array [
                 }
               />
               <circle
-                cx={336}
+                cx={328.53333333333336}
                 cy={148.71727519999996}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3645,7 +3645,7 @@ Array [
                 }
               />
               <circle
-                cx={360}
+                cx={352}
                 cy={132.27231180799998}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3662,7 +3662,7 @@ Array [
                 }
               />
               <circle
-                cx={384}
+                cx={375.46666666666664}
                 cy={124.92871456}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3679,7 +3679,7 @@ Array [
                 }
               />
               <circle
-                cx={408}
+                cx={398.93333333333334}
                 cy={116.49645113600002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3696,7 +3696,7 @@ Array [
                 }
               />
               <circle
-                cx={432}
+                cx={422.4}
                 cy={147.94231920000001}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3713,7 +3713,7 @@ Array [
                 }
               />
               <circle
-                cx={456}
+                cx={445.8666666666667}
                 cy={155.53301504}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3730,7 +3730,7 @@ Array [
                 }
               />
               <circle
-                cx={480}
+                cx={469.3333333333333}
                 cy={141.915090304}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3747,7 +3747,7 @@ Array [
                 }
               />
               <circle
-                cx={503.99999999999994}
+                cx={492.79999999999995}
                 cy={121.73287776000008}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3764,7 +3764,7 @@ Array [
                 }
               />
               <circle
-                cx={528}
+                cx={516.2666666666667}
                 cy={152.63684758399998}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3781,7 +3781,7 @@ Array [
                 }
               />
               <circle
-                cx={552}
+                cx={539.7333333333333}
                 cy={159.73791641600002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3798,7 +3798,7 @@ Array [
                 }
               />
               <circle
-                cx={576}
+                cx={563.2}
                 cy={140.4438672}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3815,7 +3815,7 @@ Array [
                 }
               />
               <circle
-                cx={600}
+                cx={586.6666666666667}
                 cy={150.146582976}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3832,7 +3832,7 @@ Array [
                 }
               />
               <circle
-                cx={624}
+                cx={610.1333333333333}
                 cy={121.98686448}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3849,7 +3849,7 @@ Array [
                 }
               />
               <circle
-                cx={648}
+                cx={633.6}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3866,7 +3866,7 @@ Array [
                 }
               />
               <circle
-                cx={672}
+                cx={657.0666666666667}
                 cy={102.0323582720003}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3883,7 +3883,7 @@ Array [
                 }
               />
               <circle
-                cx={696}
+                cx={680.5333333333333}
                 cy={17.191495360000836}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3900,7 +3900,7 @@ Array [
                 }
               />
               <circle
-                cx={720}
+                cx={704}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3923,7 +3923,7 @@ Array [
           >
             <path
               className="rv-xy-plot__series rv-xy-plot__series--line "
-              d="M0,208C8,183.10434549333334,16,158.20869098666665,24,157.4191424C32,156.62959381333334,40,156.23481952,48,156.23481952C56,156.23481952,64,160.81596682666668,72,161.56425792000002C80,162.31254901333335,88,162.68669456,96,162.68669456C104,162.68669456,112,158.86059904000004,120,158.86059904000004C128,158.86059904000004,136,163.62246992000001,144,163.62246992000001C152,163.62246992000001,160,142.73391392000002,168,142.73391392000002C176,142.73391392000002,184,165.8699744,192,165.8699744C200,165.8699744,208,163.6534529066668,216,163.52439168000006C224,163.39533045333334,232,163.45986106666672,240,163.33079984C248,163.20173861333328,256,161.4781168,264,161.4781168C272,161.4781168,280,161.87593552,288,162.16472064C296,162.45350576,304,162.51342293333335,312,163.21082752C320,163.90823210666667,328,166.81319824,336,166.81319824C344,166.81319824,352,143.21282560000003,360,143.21282560000003C368,143.21282560000003,376,164.71169104,384,164.71169104C392,164.71169104,400,135.88840304000001,408,135.88840304000001C416,135.88840304000001,424,152.6074260533333,432,157.5681224C440,162.52881874666667,448,165.65258112,456,165.65258112C464,165.65258112,472,165.61368234666668,480,165.53588480000002C488,165.45808725333336,495.99999999999994,147.713644,503.99999999999994,147.713644C511.99999999999994,147.713644,520,163.65928869333334,528,164.06490256C536,164.47051642666668,544,164.27093592,552,164.67332336C560,165.07571080000002,568,166.4792272,576,166.4792272C584,166.4792272,592,152.7591936,600,152.7591936C608,152.7591936,616,156.23893584,624,163.19842032C632,170.15790479999998,640,208,648,208C656,208,664,177.47751424,672,161.37461184C680,145.27170944,688,111.3825856,696,111.3825856C704,111.3825856,712,159.6912928,720,208"
+              d="M0,208C7.822222222222222,183.10434549333334,15.644444444444442,158.20869098666665,23.466666666666665,157.4191424C31.288888888888888,156.62959381333334,39.11111111111111,156.23481952,46.93333333333333,156.23481952C54.75555555555555,156.23481952,62.57777777777778,160.81596682666668,70.4,161.56425792000002C78.22222222222223,162.31254901333335,86.04444444444444,162.68669456,93.86666666666666,162.68669456C101.68888888888888,162.68669456,109.5111111111111,158.86059904000004,117.33333333333333,158.86059904000004C125.15555555555555,158.86059904000004,132.9777777777778,163.62246992000001,140.8,163.62246992000001C148.62222222222223,163.62246992000001,156.44444444444446,142.73391392000002,164.26666666666668,142.73391392000002C172.0888888888889,142.73391392000002,179.9111111111111,165.8699744,187.73333333333332,165.8699744C195.55555555555554,165.8699744,203.37777777777777,163.6534529066668,211.2,163.52439168000006C219.0222222222222,163.39533045333334,226.84444444444443,163.45986106666672,234.66666666666666,163.33079984C242.48888888888888,163.20173861333328,250.3111111111111,161.4781168,258.1333333333333,161.4781168C265.9555555555556,161.4781168,273.77777777777777,161.87593552,281.6,162.16472064C289.4222222222222,162.45350576,297.24444444444447,162.51342293333335,305.06666666666666,163.21082752C312.8888888888889,163.90823210666667,320.7111111111111,166.81319824,328.53333333333336,166.81319824C336.35555555555555,166.81319824,344.1777777777778,143.21282560000003,352,143.21282560000003C359.8222222222222,143.21282560000003,367.64444444444445,164.71169104,375.46666666666664,164.71169104C383.2888888888889,164.71169104,391.1111111111111,135.88840304000001,398.93333333333334,135.88840304000001C406.75555555555553,135.88840304000001,414.5777777777778,152.6074260533333,422.4,157.5681224C430.22222222222223,162.52881874666667,438.0444444444444,165.65258112,445.8666666666667,165.65258112C453.68888888888887,165.65258112,461.5111111111111,165.61368234666668,469.3333333333333,165.53588480000002C477.1555555555555,165.45808725333336,484.97777777777776,147.713644,492.79999999999995,147.713644C500.6222222222222,147.713644,508.4444444444444,163.65928869333334,516.2666666666667,164.06490256C524.0888888888888,164.47051642666668,531.9111111111112,164.27093592,539.7333333333333,164.67332336C547.5555555555555,165.07571080000002,555.3777777777779,166.4792272,563.2,166.4792272C571.0222222222222,166.4792272,578.8444444444445,152.7591936,586.6666666666667,152.7591936C594.4888888888889,152.7591936,602.3111111111111,156.23893584,610.1333333333333,163.19842032C617.9555555555555,170.15790480000004,625.7777777777778,208,633.6,208C641.4222222222222,208,649.2444444444445,177.47751424000003,657.0666666666667,161.37461184C664.8888888888889,145.27170944000005,672.7111111111111,111.3825856,680.5333333333333,111.3825856C688.3555555555555,111.3825856,696.1777777777778,159.69129279999999,704,208"
               onClick={[Function]}
               onContextMenu={[Function]}
               onMouseOut={[Function]}
@@ -3960,7 +3960,7 @@ Array [
                 }
               />
               <circle
-                cx={24}
+                cx={23.466666666666665}
                 cy={157.4191424}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3977,7 +3977,7 @@ Array [
                 }
               />
               <circle
-                cx={48}
+                cx={46.93333333333333}
                 cy={156.23481952}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -3994,7 +3994,7 @@ Array [
                 }
               />
               <circle
-                cx={72}
+                cx={70.4}
                 cy={161.56425792000002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4011,7 +4011,7 @@ Array [
                 }
               />
               <circle
-                cx={96}
+                cx={93.86666666666666}
                 cy={162.68669456}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4028,7 +4028,7 @@ Array [
                 }
               />
               <circle
-                cx={120}
+                cx={117.33333333333333}
                 cy={158.86059904000004}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4045,7 +4045,7 @@ Array [
                 }
               />
               <circle
-                cx={144}
+                cx={140.8}
                 cy={163.62246992000001}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4062,7 +4062,7 @@ Array [
                 }
               />
               <circle
-                cx={168}
+                cx={164.26666666666668}
                 cy={142.73391392000002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4079,7 +4079,7 @@ Array [
                 }
               />
               <circle
-                cx={192}
+                cx={187.73333333333332}
                 cy={165.8699744}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4096,7 +4096,7 @@ Array [
                 }
               />
               <circle
-                cx={216}
+                cx={211.2}
                 cy={163.52439168000006}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4113,7 +4113,7 @@ Array [
                 }
               />
               <circle
-                cx={240}
+                cx={234.66666666666666}
                 cy={163.33079984}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4130,7 +4130,7 @@ Array [
                 }
               />
               <circle
-                cx={264}
+                cx={258.1333333333333}
                 cy={161.4781168}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4147,7 +4147,7 @@ Array [
                 }
               />
               <circle
-                cx={288}
+                cx={281.6}
                 cy={162.16472064}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4164,7 +4164,7 @@ Array [
                 }
               />
               <circle
-                cx={312}
+                cx={305.06666666666666}
                 cy={163.21082752}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4181,7 +4181,7 @@ Array [
                 }
               />
               <circle
-                cx={336}
+                cx={328.53333333333336}
                 cy={166.81319824}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4198,7 +4198,7 @@ Array [
                 }
               />
               <circle
-                cx={360}
+                cx={352}
                 cy={143.21282560000003}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4215,7 +4215,7 @@ Array [
                 }
               />
               <circle
-                cx={384}
+                cx={375.46666666666664}
                 cy={164.71169104}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4232,7 +4232,7 @@ Array [
                 }
               />
               <circle
-                cx={408}
+                cx={398.93333333333334}
                 cy={135.88840304000001}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4249,7 +4249,7 @@ Array [
                 }
               />
               <circle
-                cx={432}
+                cx={422.4}
                 cy={157.5681224}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4266,7 +4266,7 @@ Array [
                 }
               />
               <circle
-                cx={456}
+                cx={445.8666666666667}
                 cy={165.65258112}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4283,7 +4283,7 @@ Array [
                 }
               />
               <circle
-                cx={480}
+                cx={469.3333333333333}
                 cy={165.53588480000002}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4300,7 +4300,7 @@ Array [
                 }
               />
               <circle
-                cx={503.99999999999994}
+                cx={492.79999999999995}
                 cy={147.713644}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4317,7 +4317,7 @@ Array [
                 }
               />
               <circle
-                cx={528}
+                cx={516.2666666666667}
                 cy={164.06490256}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4334,7 +4334,7 @@ Array [
                 }
               />
               <circle
-                cx={552}
+                cx={539.7333333333333}
                 cy={164.67332336}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4351,7 +4351,7 @@ Array [
                 }
               />
               <circle
-                cx={576}
+                cx={563.2}
                 cy={166.4792272}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4368,7 +4368,7 @@ Array [
                 }
               />
               <circle
-                cx={600}
+                cx={586.6666666666667}
                 cy={152.7591936}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4385,7 +4385,7 @@ Array [
                 }
               />
               <circle
-                cx={624}
+                cx={610.1333333333333}
                 cy={163.19842032}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4402,7 +4402,7 @@ Array [
                 }
               />
               <circle
-                cx={648}
+                cx={633.6}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4419,7 +4419,7 @@ Array [
                 }
               />
               <circle
-                cx={672}
+                cx={657.0666666666667}
                 cy={161.37461184}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4436,7 +4436,7 @@ Array [
                 }
               />
               <circle
-                cx={696}
+                cx={680.5333333333333}
                 cy={111.3825856}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4453,7 +4453,7 @@ Array [
                 }
               />
               <circle
-                cx={720}
+                cx={704}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4476,7 +4476,7 @@ Array [
           >
             <path
               className="rv-xy-plot__series rv-xy-plot__series--line "
-              d="M0,208C8,198.0144506122449,16,188.0289012244898,24,188.0289012244898C32,188.0289012244898,40,190.93245866666666,48,190.93245866666666C56,190.93245866666666,64,190.28154649962812,72,189.81180675918367C80,189.34206701873921,88,188.114020224,96,188.114020224C104,188.114020224,112,188.75217580408165,120,188.75217580408165C128,188.75217580408165,136,187.7737856411058,144,186.9231112C152,186.07243675889418,160,183.64812915744682,168,183.64812915744682C176,183.64812915744682,184,187.40215166647675,192,188.65222657560977C200,189.9023014847428,208,191.1485786122449,216,191.1485786122449C224,191.1485786122449,232,187.99938938181816,240,187.99938938181816C248,187.99938938181816,256,192.51163795348836,264,192.51163795348836C272,192.51163795348836,280,186.99252785777776,288,186.99252785777776C296,186.99252785777776,304,191.5321727255814,312,191.5321727255814C320,191.5321727255814,328,188.75657926666668,336,188.75657926666668C344,188.75657926666668,352,189.74989696,360,189.74989696C368,189.74989696,376,189.71163744,384,189.6351184C392,189.55859936000002,400,184.25858141935484,408,184.25858141935484C416,184.25858141935484,424,190.2827607652174,432,190.2827607652174C440,190.2827607652174,448,189.76271776603772,456,189.76271776603772C464,189.76271776603772,472,191.83746261333334,480,191.83746261333334C488,191.83746261333334,495.99999999999994,187.9456040347826,503.99999999999994,187.9456040347826C511.99999999999994,187.9456040347826,520,188.09594339288537,528,188.3966221090909C536,188.69730082529645,544,191.762533248,552,191.762533248C560,191.762533248,568,191.6625795195817,576,191.4626720627451C584,191.2627646059085,592,189.4011021381818,600,189.4011021381818C608,189.4011021381818,616,189.79567013943304,624,190.58480614193547C632,191.3739421444379,640,208,648,208C656,208,664,194.91739193977511,672,189.69166496603773C680,184.46593799230035,688,176.64563815757575,696,176.64563815757575C704,176.64563815757575,712,192.32281907878786,720,208"
+              d="M0,208C7.822222222222222,198.0144506122449,15.644444444444442,188.0289012244898,23.466666666666665,188.0289012244898C31.288888888888888,188.0289012244898,39.11111111111111,190.93245866666666,46.93333333333333,190.93245866666666C54.75555555555555,190.93245866666666,62.57777777777778,190.28154649962812,70.4,189.81180675918367C78.22222222222223,189.34206701873921,86.04444444444444,188.114020224,93.86666666666666,188.114020224C101.68888888888888,188.114020224,109.5111111111111,188.75217580408165,117.33333333333333,188.75217580408165C125.15555555555555,188.75217580408165,132.9777777777778,187.7737856411058,140.8,186.9231112C148.62222222222223,186.07243675889418,156.44444444444446,183.64812915744682,164.26666666666668,183.64812915744682C172.0888888888889,183.64812915744682,179.9111111111111,187.40215166647675,187.73333333333332,188.65222657560977C195.55555555555554,189.9023014847428,203.37777777777777,191.1485786122449,211.2,191.1485786122449C219.0222222222222,191.1485786122449,226.84444444444443,187.99938938181816,234.66666666666666,187.99938938181816C242.48888888888888,187.99938938181816,250.3111111111111,192.51163795348836,258.1333333333333,192.51163795348836C265.9555555555556,192.51163795348836,273.77777777777777,186.99252785777776,281.6,186.99252785777776C289.4222222222222,186.99252785777776,297.24444444444447,191.5321727255814,305.06666666666666,191.5321727255814C312.8888888888889,191.5321727255814,320.7111111111111,188.75657926666668,328.53333333333336,188.75657926666668C336.35555555555555,188.75657926666668,344.1777777777778,189.74989696,352,189.74989696C359.8222222222222,189.74989696,367.64444444444445,189.71163744,375.46666666666664,189.6351184C383.2888888888889,189.55859936000002,391.1111111111111,184.25858141935484,398.93333333333334,184.25858141935484C406.75555555555553,184.25858141935484,414.5777777777778,190.2827607652174,422.4,190.2827607652174C430.22222222222223,190.2827607652174,438.0444444444444,189.76271776603772,445.8666666666667,189.76271776603772C453.68888888888887,189.76271776603772,461.5111111111111,191.83746261333334,469.3333333333333,191.83746261333334C477.1555555555555,191.83746261333334,484.97777777777776,187.9456040347826,492.79999999999995,187.9456040347826C500.6222222222222,187.9456040347826,508.4444444444444,188.09594339288537,516.2666666666667,188.3966221090909C524.0888888888888,188.69730082529645,531.9111111111112,191.762533248,539.7333333333333,191.762533248C547.5555555555555,191.762533248,555.3777777777779,191.6625795195817,563.2,191.4626720627451C571.0222222222222,191.2627646059085,578.8444444444445,189.4011021381818,586.6666666666667,189.4011021381818C594.4888888888889,189.4011021381818,602.3111111111111,189.79567013943304,610.1333333333333,190.58480614193547C617.9555555555555,191.3739421444379,625.7777777777778,208,633.6,208C641.4222222222222,208,649.2444444444445,194.91739193977511,657.0666666666667,189.69166496603773C664.8888888888889,184.46593799230038,672.7111111111111,176.64563815757575,680.5333333333333,176.64563815757575C688.3555555555555,176.64563815757575,696.1777777777778,192.32281907878786,704,208"
               onClick={[Function]}
               onContextMenu={[Function]}
               onMouseOut={[Function]}
@@ -4513,7 +4513,7 @@ Array [
                 }
               />
               <circle
-                cx={24}
+                cx={23.466666666666665}
                 cy={188.0289012244898}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4530,7 +4530,7 @@ Array [
                 }
               />
               <circle
-                cx={48}
+                cx={46.93333333333333}
                 cy={190.93245866666666}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4547,7 +4547,7 @@ Array [
                 }
               />
               <circle
-                cx={72}
+                cx={70.4}
                 cy={189.81180675918367}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4564,7 +4564,7 @@ Array [
                 }
               />
               <circle
-                cx={96}
+                cx={93.86666666666666}
                 cy={188.114020224}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4581,7 +4581,7 @@ Array [
                 }
               />
               <circle
-                cx={120}
+                cx={117.33333333333333}
                 cy={188.75217580408165}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4598,7 +4598,7 @@ Array [
                 }
               />
               <circle
-                cx={144}
+                cx={140.8}
                 cy={186.9231112}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4615,7 +4615,7 @@ Array [
                 }
               />
               <circle
-                cx={168}
+                cx={164.26666666666668}
                 cy={183.64812915744682}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4632,7 +4632,7 @@ Array [
                 }
               />
               <circle
-                cx={192}
+                cx={187.73333333333332}
                 cy={188.65222657560977}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4649,7 +4649,7 @@ Array [
                 }
               />
               <circle
-                cx={216}
+                cx={211.2}
                 cy={191.1485786122449}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4666,7 +4666,7 @@ Array [
                 }
               />
               <circle
-                cx={240}
+                cx={234.66666666666666}
                 cy={187.99938938181816}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4683,7 +4683,7 @@ Array [
                 }
               />
               <circle
-                cx={264}
+                cx={258.1333333333333}
                 cy={192.51163795348836}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4700,7 +4700,7 @@ Array [
                 }
               />
               <circle
-                cx={288}
+                cx={281.6}
                 cy={186.99252785777776}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4717,7 +4717,7 @@ Array [
                 }
               />
               <circle
-                cx={312}
+                cx={305.06666666666666}
                 cy={191.5321727255814}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4734,7 +4734,7 @@ Array [
                 }
               />
               <circle
-                cx={336}
+                cx={328.53333333333336}
                 cy={188.75657926666668}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4751,7 +4751,7 @@ Array [
                 }
               />
               <circle
-                cx={360}
+                cx={352}
                 cy={189.74989696}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4768,7 +4768,7 @@ Array [
                 }
               />
               <circle
-                cx={384}
+                cx={375.46666666666664}
                 cy={189.6351184}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4785,7 +4785,7 @@ Array [
                 }
               />
               <circle
-                cx={408}
+                cx={398.93333333333334}
                 cy={184.25858141935484}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4802,7 +4802,7 @@ Array [
                 }
               />
               <circle
-                cx={432}
+                cx={422.4}
                 cy={190.2827607652174}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4819,7 +4819,7 @@ Array [
                 }
               />
               <circle
-                cx={456}
+                cx={445.8666666666667}
                 cy={189.76271776603772}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4836,7 +4836,7 @@ Array [
                 }
               />
               <circle
-                cx={480}
+                cx={469.3333333333333}
                 cy={191.83746261333334}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4853,7 +4853,7 @@ Array [
                 }
               />
               <circle
-                cx={503.99999999999994}
+                cx={492.79999999999995}
                 cy={187.9456040347826}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4870,7 +4870,7 @@ Array [
                 }
               />
               <circle
-                cx={528}
+                cx={516.2666666666667}
                 cy={188.3966221090909}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4887,7 +4887,7 @@ Array [
                 }
               />
               <circle
-                cx={552}
+                cx={539.7333333333333}
                 cy={191.762533248}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4904,7 +4904,7 @@ Array [
                 }
               />
               <circle
-                cx={576}
+                cx={563.2}
                 cy={191.4626720627451}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4921,7 +4921,7 @@ Array [
                 }
               />
               <circle
-                cx={600}
+                cx={586.6666666666667}
                 cy={189.4011021381818}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4938,7 +4938,7 @@ Array [
                 }
               />
               <circle
-                cx={624}
+                cx={610.1333333333333}
                 cy={190.58480614193547}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4955,7 +4955,7 @@ Array [
                 }
               />
               <circle
-                cx={648}
+                cx={633.6}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4972,7 +4972,7 @@ Array [
                 }
               />
               <circle
-                cx={672}
+                cx={657.0666666666667}
                 cy={189.69166496603773}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -4989,7 +4989,7 @@ Array [
                 }
               />
               <circle
-                cx={696}
+                cx={680.5333333333333}
                 cy={176.64563815757575}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -5006,7 +5006,7 @@ Array [
                 }
               />
               <circle
-                cx={720}
+                cx={704}
                 cy={208}
                 onClick={[Function]}
                 onContextMenu={[Function]}
@@ -5063,7 +5063,7 @@ Array [
             transform="translate(80,16)"
           >
             <circle
-              cx={360}
+              cx={352}
               cy={132.27231180799998}
               onClick={[Function]}
               onContextMenu={[Function]}
@@ -5080,7 +5080,7 @@ Array [
               }
             />
             <circle
-              cx={360}
+              cx={352}
               cy={143.21282560000003}
               onClick={[Function]}
               onContextMenu={[Function]}
@@ -5097,7 +5097,7 @@ Array [
               }
             />
             <circle
-              cx={360}
+              cx={352}
               cy={189.74989696}
               onClick={[Function]}
               onContextMenu={[Function]}
@@ -5120,8 +5120,8 @@ Array [
           >
             <line
               className="rv-xy-plot__grid-lines__line"
-              x1={360}
-              x2={360}
+              x1={352}
+              x2={352}
               y1={0}
               y2={208}
             />
@@ -5132,7 +5132,7 @@ Array [
      rv-hint--verticalAlign-bottom"
           style={
             Object {
-              "left": 440,
+              "left": 432,
               "position": "absolute",
               "top": 120,
             }
@@ -5339,7 +5339,7 @@ Array [
           >
             <path
               className="rv-voronoi__cell "
-              d="M92,256L92,16L80,16L80,256Z"
+              d="M91.7333335,256L91.7333335,16L80,16L80,256Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5354,7 +5354,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M92,16L92,256L116,256L116,16Z"
+              d="M91.7333335,16L91.7333335,256L115.19999999999999,256L115.19999999999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5369,7 +5369,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M116,16L116,256L140,256L140,16Z"
+              d="M115.19999999999999,16L115.19999999999999,256L138.6666665,256L138.6666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5384,7 +5384,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M140,16L140,256L164,256L164,16Z"
+              d="M138.6666665,16L138.6666665,256L162.1333335,256L162.1333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5399,7 +5399,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M164,16L164,256L188,256L188,16Z"
+              d="M162.1333335,16L162.1333335,256L185.59999999999997,256L185.59999999999997,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5414,7 +5414,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M188,16L188,256L212,256L212,16Z"
+              d="M185.59999999999997,16L185.59999999999997,256L209.0666665,256L209.0666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5429,7 +5429,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M212,16L212,256L236,256L236,16Z"
+              d="M209.0666665,16L209.0666665,256L232.53333349999997,256L232.53333349999997,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5444,7 +5444,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M236,16L236,256L260,256L260,16Z"
+              d="M232.53333349999997,16L232.53333349999997,256L256,256L256,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5459,7 +5459,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M260,16L260,256L284,256L284,16Z"
+              d="M256,16L256,256L279.4666665,256L279.4666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5474,7 +5474,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M284,16L284,256L308,256L308,16Z"
+              d="M279.4666665,16L279.4666665,256L302.9333335,256L302.9333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5489,7 +5489,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M308,16L308,256L332,256L332,16Z"
+              d="M302.9333335,16L302.9333335,256L326.4,256L326.4,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5504,7 +5504,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M332,16L332,256L356,256L356,16Z"
+              d="M326.4,16L326.4,256L349.86666649999995,256L349.86666649999995,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5519,7 +5519,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M356,16L356,256L380,256L380,16Z"
+              d="M349.86666649999995,16L349.86666649999995,256L373.3333335,256L373.3333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5534,7 +5534,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M380,16L380,256L404,256L404,16Z"
+              d="M373.3333335,16L373.3333335,256L396.79999999999995,256L396.79999999999995,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5549,7 +5549,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M404,16L404,256L428,256L428,16Z"
+              d="M396.79999999999995,16L396.79999999999995,256L420.2666665,256L420.2666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5564,7 +5564,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M428,16L428,256L452,256L452,16Z"
+              d="M420.2666665,16L420.2666665,256L443.73333349999996,256L443.73333349999996,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5579,7 +5579,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M452,16L452,256L476,256L476,16Z"
+              d="M443.73333349999996,16L443.73333349999996,256L467.2,256L467.2,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5594,7 +5594,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M476,16L476,256L500,256L500,16Z"
+              d="M467.2,16L467.2,256L490.6666665,256L490.6666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5609,7 +5609,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M500,16L500,256L524,256L524,16Z"
+              d="M490.6666665,16L490.6666665,256L514.1333334999999,256L514.1333334999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5624,7 +5624,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M524,16L524,256L548,256L548,16Z"
+              d="M514.1333334999999,16L514.1333334999999,256L537.5999999999999,256L537.5999999999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5639,7 +5639,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M548,16L548,256L572,256L572,16Z"
+              d="M537.5999999999999,16L537.5999999999999,256L561.0666664999999,256L561.0666664999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5654,7 +5654,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M572,16L572,256L596,256L596,16Z"
+              d="M561.0666664999999,16L561.0666664999999,256L584.5333335,256L584.5333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5669,7 +5669,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M596,16L596,256L620,256L620,16Z"
+              d="M584.5333335,16L584.5333335,256L608,256L608,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5684,7 +5684,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M620,16L620,256L644,256L644,16Z"
+              d="M608,16L608,256L631.4666665,256L631.4666665,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5699,7 +5699,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M644,16L644,256L668,256L668,16Z"
+              d="M631.4666665,16L631.4666665,256L654.9333334999999,256L654.9333334999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5714,7 +5714,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M668,16L668,256L692,256L692,16Z"
+              d="M654.9333334999999,16L654.9333334999999,256L678.4,256L678.4,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5729,7 +5729,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M692,16L692,256L716,256L716,16Z"
+              d="M678.4,16L678.4,256L701.8666665000001,256L701.8666665000001,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5744,7 +5744,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M716,16L716,256L740,256L740,16Z"
+              d="M701.8666665000001,16L701.8666665000001,256L725.3333335,256L725.3333335,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5759,7 +5759,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M740,16L740,256L764,256L764,16Z"
+              d="M725.3333335,16L725.3333335,256L748.8,256L748.8,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5774,7 +5774,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M764,16L764,256L788,256L788,16Z"
+              d="M748.8,16L748.8,256L772.2666664999999,256L772.2666664999999,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -5789,7 +5789,7 @@ Array [
             />
             <path
               className="rv-voronoi__cell "
-              d="M788,16L788,256L800,256L800,16Z"
+              d="M772.2666664999999,16L772.2666664999999,256L800,256L800,16Z"
               fill="none"
               onClick={[Function]}
               onMouseDown={[Function]}
@@ -6063,7 +6063,7 @@ Array [
               className="rv-xy-plot__axis__line"
               style={Object {}}
               x1={0}
-              x2={720}
+              x2={704}
               y1={0}
               y2={0}
             />
@@ -6097,7 +6097,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(60, 0)"
+                transform="translate(58.666666666666664, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6120,7 +6120,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(120, 0)"
+                transform="translate(117.33333333333333, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6143,7 +6143,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(180, 0)"
+                transform="translate(176, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6166,7 +6166,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(240, 0)"
+                transform="translate(234.66666666666666, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6189,7 +6189,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(300, 0)"
+                transform="translate(293.33333333333337, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6212,7 +6212,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(360, 0)"
+                transform="translate(352, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6235,7 +6235,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(420, 0)"
+                transform="translate(410.6666666666667, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6258,7 +6258,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(480, 0)"
+                transform="translate(469.3333333333333, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6281,7 +6281,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(540, 0)"
+                transform="translate(528, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6304,7 +6304,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(600, 0)"
+                transform="translate(586.6666666666667, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6327,7 +6327,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(660, 0)"
+                transform="translate(645.3333333333333, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6350,7 +6350,7 @@ Array [
               <g
                 className="rv-xy-plot__axis__tick"
                 style={Object {}}
-                transform="translate(720, 0)"
+                transform="translate(704, 0)"
               >
                 <line
                   className="rv-xy-plot__axis__tick__line"
@@ -6379,7 +6379,7 @@ Array [
               "left": "50%",
               "position": "absolute",
               "top": "50%",
-              "transform": "translate(calc(-50% + 30px),calc(-50% + -16px - 15px))",
+              "transform": "translate(calc(-50% + 14px),calc(-50% + -16px - 15px))",
             }
           }
         >
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 3b6d1684e08e1c..1676d3f68b57cf 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
@@ -8,11 +8,12 @@ import theme from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
 import React, { useCallback } from 'react';
 import { EuiPanel } from '@elastic/eui';
+import { EuiSpacer } from '@elastic/eui';
+import { asPercent } from '../../../../../common/utils/formatters';
 import { useChartsSync } from '../../../../hooks/useChartsSync';
 import { useFetcher } from '../../../../hooks/useFetcher';
 import { useUrlParams } from '../../../../hooks/useUrlParams';
 import { callApmApi } from '../../../../services/rest/createCallApmApi';
-import { asPercent } from '../../../../utils/formatters';
 // @ts-ignore
 import CustomPlot from '../CustomPlot';
 
@@ -71,6 +72,7 @@ export function ErroneousTransactionsRateChart() {
           })}
         </span>
       </EuiTitle>
+      <EuiSpacer size="m" />
       <CustomPlot
         {...syncedChartsProps}
         noHits={data?.noHits}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/MetricsChart/index.tsx b/x-pack/plugins/apm/public/components/shared/charts/MetricsChart/index.tsx
index 5b167e8160ffab..3b77ef3b51403f 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/MetricsChart/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/MetricsChart/index.tsx
@@ -5,13 +5,13 @@
  */
 import { EuiTitle } from '@elastic/eui';
 import React from 'react';
+import { asPercent } from '../../../../../common/utils/formatters';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { GenericMetricsChart } from '../../../../../server/lib/metrics/transform_metrics_chart';
 // @ts-expect-error
 import CustomPlot from '../CustomPlot';
 import {
   asDecimal,
-  asPercent,
   asInteger,
   asDynamicBytes,
   getFixedByteFormatter,
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 07b7f01194d5c8..5d55a6ff5bd8fb 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
@@ -19,6 +19,7 @@ interface Props {
   height?: number;
   stacked?: boolean;
   onHover?: () => void;
+  visibleLegendCount?: number;
   onToggleLegend?: (disabledSeriesState: boolean[]) => void;
 }
 
@@ -32,6 +33,7 @@ function TransactionLineChart(props: Props) {
     truncateLegends,
     stacked = false,
     onHover,
+    visibleLegendCount,
     onToggleLegend,
   } = props;
 
@@ -59,6 +61,7 @@ function TransactionLineChart(props: Props) {
       height={height}
       truncateLegends={truncateLegends}
       {...(stacked ? { stackBy: 'y' } : {})}
+      visibleLegendCount={visibleLegendCount}
       onToggleLegend={onToggleLegend}
     />
   );
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 d11925dc0303d2..6ba080a07b9d38 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
@@ -13,7 +13,6 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Location } from 'history';
 import React from 'react';
 import { NOT_AVAILABLE_LABEL } from '../../../../../common/i18n';
 import {
@@ -29,6 +28,8 @@ import { asDecimal, tpmUnit } from '../../../../utils/formatters';
 import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue';
 import { BrowserLineChart } from './BrowserLineChart';
 import { DurationByCountryMap } from './DurationByCountryMap';
+import { ErroneousTransactionsRateChart } from '../ErroneousTransactionsRateChart';
+import { TransactionBreakdown } from '../../TransactionBreakdown';
 import {
   getResponseTimeTickFormatter,
   getResponseTimeTooltipFormatter,
@@ -39,13 +40,11 @@ import { useFormatter } from './use_formatter';
 
 interface TransactionChartProps {
   charts: ITransactionChartData;
-  location: Location;
   urlParams: IUrlParams;
 }
 
 export function TransactionCharts({
   charts,
-  location,
   urlParams,
 }: TransactionChartProps) {
   const getTPMFormatter = (t: number) => {
@@ -72,48 +71,56 @@ export function TransactionCharts({
       <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}
-                    />
-                  )}
-                </LicenseContext.Consumer>
-              </EuiFlexGroup>
-              <TransactionLineChart
-                series={responseTimeSeries}
-                tickFormatY={getResponseTimeTickFormatter(formatter)}
-                formatTooltipValue={getResponseTimeTooltipFormatter(formatter)}
-                onToggleLegend={setDisabledSeriesState}
-              />
-            </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}
+                  />
+                )}
+              </LicenseContext.Consumer>
+            </EuiFlexGroup>
+            <TransactionLineChart
+              series={responseTimeSeries}
+              tickFormatY={getResponseTimeTickFormatter(formatter)}
+              formatTooltipValue={getResponseTimeTooltipFormatter(formatter)}
+              onToggleLegend={setDisabledSeriesState}
+            />
           </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>
+            <EuiTitle size="xs">
+              <span>{tpmLabel(transactionType)}</span>
+            </EuiTitle>
+            <TransactionLineChart
+              series={tpmSeries}
+              tickFormatY={getTPMFormatter}
+              formatTooltipValue={getTPMTooltipFormatter}
+              truncateLegends
+            />
           </EuiPanel>
         </EuiFlexItem>
       </EuiFlexGrid>
+
+      <EuiSpacer size="s" />
+
+      <EuiFlexGrid columns={2} gutterSize="s">
+        <EuiFlexItem>
+          <ErroneousTransactionsRateChart />
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <TransactionBreakdown />
+        </EuiFlexItem>
+      </EuiFlexGrid>
+
       {transactionType === TRANSACTION_PAGE_LOAD && (
         <>
           <EuiSpacer size="s" />
diff --git a/x-pack/plugins/apm/public/hooks/useTransactionBreakdown.ts b/x-pack/plugins/apm/public/hooks/useTransactionBreakdown.ts
index 2449c13f294352..9db78fde2d8c86 100644
--- a/x-pack/plugins/apm/public/hooks/useTransactionBreakdown.ts
+++ b/x-pack/plugins/apm/public/hooks/useTransactionBreakdown.ts
@@ -13,7 +13,7 @@ export function useTransactionBreakdown() {
     uiFilters,
   } = useUrlParams();
 
-  const { data = { kpis: [], timeseries: [] }, error, status } = useFetcher(
+  const { data = { timeseries: [] }, error, status } = useFetcher(
     (callApmApi) => {
       if (serviceName && start && end && transactionType) {
         return callApmApi({
diff --git a/x-pack/plugins/apm/public/utils/formatters/formatters.ts b/x-pack/plugins/apm/public/utils/formatters/formatters.ts
index 649f11063b149a..6249ce53b6779e 100644
--- a/x-pack/plugins/apm/public/utils/formatters/formatters.ts
+++ b/x-pack/plugins/apm/public/utils/formatters/formatters.ts
@@ -23,24 +23,3 @@ export function tpmUnit(type?: string) {
         defaultMessage: 'tpm',
       });
 }
-
-export function asPercent(
-  numerator: number,
-  denominator: number | undefined,
-  fallbackResult = ''
-) {
-  if (!denominator || isNaN(numerator)) {
-    return fallbackResult;
-  }
-
-  const decimal = numerator / denominator;
-
-  // 33.2 => 33%
-  // 3.32 => 3.3%
-  // 0 => 0%
-  if (Math.abs(decimal) >= 0.1 || decimal === 0) {
-    return numeral(decimal).format('0%');
-  }
-
-  return numeral(decimal).format('0.0%');
-}
diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
index 731f75226cbe4c..e943214b0b5177 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts
@@ -50,40 +50,9 @@ describe('getTransactionBreakdown', () => {
       setup: getMockSetup(noDataResponse),
     });
 
-    expect(response.kpis.length).toBe(0);
-
     expect(Object.keys(response.timeseries).length).toBe(0);
   });
 
-  it('returns transaction breakdowns grouped by type and subtype', async () => {
-    const response = await getTransactionBreakdown({
-      serviceName: 'myServiceName',
-      transactionType: 'request',
-      setup: getMockSetup(dataResponse),
-    });
-
-    expect(response.kpis.length).toBe(4);
-
-    expect(response.kpis.map((kpi) => kpi.name)).toEqual([
-      'app',
-      'dispatcher-servlet',
-      'http',
-      'postgresql',
-    ]);
-
-    expect(response.kpis[0]).toEqual({
-      name: 'app',
-      color: '#54b399',
-      percentage: 0.5408550899466306,
-    });
-
-    expect(response.kpis[3]).toEqual({
-      name: 'postgresql',
-      color: '#9170b8',
-      percentage: 0.047366859295002,
-    });
-  });
-
   it('returns a timeseries grouped by type and subtype', async () => {
     const response = await getTransactionBreakdown({
       serviceName: 'myServiceName',
@@ -98,7 +67,7 @@ describe('getTransactionBreakdown', () => {
     const appTimeseries = timeseries[0];
     expect(appTimeseries.title).toBe('app');
     expect(appTimeseries.type).toBe('areaStacked');
-    expect(appTimeseries.hideLegend).toBe(true);
+    expect(appTimeseries.hideLegend).toBe(false);
 
     // empty buckets should result in null values for visible types
     expect(appTimeseries.data.length).toBe(276);
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 fbdddea32deb4f..9730ddbbf38d7c 100644
--- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
@@ -5,6 +5,7 @@
  */
 
 import { flatten, orderBy, last } from 'lodash';
+import { asPercent } from '../../../../common/utils/formatters';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import {
   SERVICE_NAME,
@@ -149,9 +150,16 @@ export async function getTransactionBreakdown({
       )
     : [];
 
-  const kpis = orderBy(visibleKpis, 'name').map((kpi, index) => {
-    return {
+  const kpis = orderBy(
+    visibleKpis.map((kpi) => ({
       ...kpi,
+      lowerCaseName: kpi.name.toLowerCase(),
+    })),
+    'lowerCaseName'
+  ).map((kpi, index) => {
+    const { lowerCaseName, ...rest } = kpi;
+    return {
+      ...rest,
       color: getVizColorForIndex(index),
     };
   });
@@ -213,11 +221,9 @@ export async function getTransactionBreakdown({
     color: kpi.color,
     type: 'areaStacked',
     data: timeseriesPerSubtype[kpi.name],
-    hideLegend: true,
+    hideLegend: false,
+    legendValue: asPercent(kpi.percentage, 1),
   }));
 
-  return {
-    kpis,
-    timeseries,
-  };
+  return { timeseries };
 }
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 89a020bd044cc3..b45598cb4f9985 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -5042,7 +5042,6 @@
     "xpack.apm.transactionActionMenu.viewInUptime": "ステータス",
     "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "サンプルドキュメントを表示",
     "xpack.apm.transactionBreakdown.chartTitle": "スパンタイプ別時間",
-    "xpack.apm.transactionBreakdown.noData": "この時間範囲のデータがありません。",
     "xpack.apm.transactionCardinalityWarning.body": "一意のトランザクション名の数が構成された値{bucketSize}を超えています。エージェントを再構成し、類似したトランザクションをグループ化するか、{codeBlock}の値を増やしてください。",
     "xpack.apm.transactionCardinalityWarning.docsLink": "詳細はドキュメントをご覧ください",
     "xpack.apm.transactionCardinalityWarning.title": "このビューには、報告されたトランザクションのサブセットが表示されます。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 68c1b5dab92955..248a6986bb2a3d 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -5044,7 +5044,6 @@
     "xpack.apm.transactionActionMenu.viewInUptime": "状态",
     "xpack.apm.transactionActionMenu.viewSampleDocumentLinkLabel": "查看样例文档",
     "xpack.apm.transactionBreakdown.chartTitle": "跨度类型花费的时间",
-    "xpack.apm.transactionBreakdown.noData": "此时间范围内没有数据。",
     "xpack.apm.transactionCardinalityWarning.body": "唯一事务名称的数目超过 {bucketSize} 的已配置值。尝试重新配置您的代理以对类似的事务分组或增大 {codeBlock} 的值",
     "xpack.apm.transactionCardinalityWarning.docsLink": "在文档中了解详情",
     "xpack.apm.transactionCardinalityWarning.title": "此视图显示已报告事务的子集。",
diff --git a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/breakdown.ts b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/breakdown.ts
index 5b61112a374c12..0b94abaa158909 100644
--- a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/breakdown.ts
+++ b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/breakdown.ts
@@ -6,7 +6,6 @@
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
 import expectedBreakdown from './expectation/breakdown.json';
-import expectedBreakdownWithTransactionName from './expectation/breakdown_transaction_name.json';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
@@ -25,7 +24,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           `/api/apm/services/opbeans-node/transaction_groups/breakdown?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=${transactionType}`
         );
         expect(response.status).to.be(200);
-        expect(response.body).to.eql({ kpis: [], timeseries: [] });
+        expect(response.body).to.eql({ timeseries: [] });
       });
     });
 
@@ -47,15 +46,32 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         );
 
         expect(response.status).to.be(200);
-        expect(response.body).to.eql(expectedBreakdownWithTransactionName);
+        const { timeseries } = response.body;
+        const { title, color, type, data, hideLegend, legendValue } = timeseries[0];
+        expect(data).to.eql([
+          { x: 1593413100000, y: null },
+          { x: 1593413130000, y: null },
+          { x: 1593413160000, y: null },
+          { x: 1593413190000, y: null },
+          { x: 1593413220000, y: null },
+          { x: 1593413250000, y: null },
+          { x: 1593413280000, y: null },
+          { x: 1593413310000, y: 1 },
+          { x: 1593413340000, y: null },
+        ]);
+        expect(title).to.be('app');
+        expect(color).to.be('#54b399');
+        expect(type).to.be('areaStacked');
+        expect(hideLegend).to.be(false);
+        expect(legendValue).to.be('100%');
       });
-      it('returns the top 4 by percentage and sorts them by name', async () => {
+      it('returns the transaction breakdown sorted by name', async () => {
         const response = await supertest.get(
           `/api/apm/services/opbeans-node/transaction_groups/breakdown?start=${start}&end=${end}&uiFilters=${uiFilters}&transactionType=${transactionType}`
         );
 
         expect(response.status).to.be(200);
-        expect(response.body.kpis.map((kpi: { name: string }) => kpi.name)).to.eql([
+        expect(response.body.timeseries.map((serie: { title: string }) => serie.title)).to.eql([
           'app',
           'http',
           'postgresql',
diff --git a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown.json b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown.json
index 3b884a9eb7907d..8ffbba64ec7aba 100644
--- a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown.json
+++ b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown.json
@@ -1,26 +1,4 @@
 {
-  "kpis":[
-     {
-        "name":"app",
-        "percentage":0.16700861715223636,
-        "color":"#54b399"
-     },
-     {
-        "name":"http",
-        "percentage":0.7702092736971686,
-        "color":"#6092c0"
-     },
-     {
-        "name":"postgresql",
-        "percentage":0.0508822322527698,
-        "color":"#d36086"
-     },
-     {
-        "name":"redis",
-        "percentage":0.011899876897825195,
-        "color":"#9170b8"
-     }
-  ],
   "timeseries":[
      {
         "title":"app",
@@ -64,7 +42,8 @@
               "y":null
            }
         ],
-        "hideLegend":true
+        "hideLegend":false,
+        "legendValue": "17%"
      },
      {
         "title":"http",
@@ -108,7 +87,8 @@
               "y":null
            }
         ],
-        "hideLegend":true
+        "hideLegend":false,
+        "legendValue": "77%"
      },
      {
         "title":"postgresql",
@@ -152,7 +132,8 @@
               "y":null
            }
         ],
-        "hideLegend":true
+        "hideLegend":false,
+        "legendValue": "5.1%"
      },
      {
         "title":"redis",
@@ -196,7 +177,8 @@
               "y":null
            }
         ],
-        "hideLegend":true
+        "hideLegend":false,
+        "legendValue": "1.2%"
      }
   ]
 }
\ No newline at end of file
diff --git a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown_transaction_name.json b/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown_transaction_name.json
deleted file mode 100644
index b4f8e376d36094..00000000000000
--- a/x-pack/test/apm_api_integration/basic/tests/transaction_groups/expectation/breakdown_transaction_name.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "kpis":[
-     {
-        "name":"app",
-        "percentage":1,
-        "color":"#54b399"
-     }
-  ],
-  "timeseries":[
-     {
-        "title":"app",
-        "color":"#54b399",
-        "type":"areaStacked",
-        "data":[
-           {
-              "x":1593413100000,
-              "y":null
-           },
-           {
-              "x":1593413130000,
-              "y":null
-           },
-           {
-              "x":1593413160000,
-              "y":null
-           },
-           {
-              "x":1593413190000,
-              "y":null
-           },
-           {
-              "x":1593413220000,
-              "y":null
-           },
-           {
-              "x":1593413250000,
-              "y":null
-           },
-           {
-              "x":1593413280000,
-              "y":null
-           },
-           {
-              "x":1593413310000,
-              "y":1
-           },
-           {
-              "x":1593413340000,
-              "y":null
-           }
-        ],
-        "hideLegend":true
-     }
-  ]
-}
\ No newline at end of file

From 97c8c941f305810b045b398861cd98c0e0b3e67f Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Tue, 1 Sep 2020 08:07:39 -0400
Subject: [PATCH 141/216] [SECURITY_SOLUTION][ENDPOINT] Generate Trusted Apps
 artifacts and Manifest entries (#74988)

* Generate Trusted Apps artifacts + manifest entries
* Artifacts mocks support for generating trusted apps entries
* Adjusted Manifest + Artifacts tests to account for trusted apps
---
 .../new/trusted_app_list_item_agnostic.json   |  18 +++
 .../endpoint/ingest_integration.test.ts       |  30 ++++
 .../server/endpoint/lib/artifacts/common.ts   |   2 +
 .../endpoint/lib/artifacts/lists.test.ts      |  93 ++++++++++--
 .../server/endpoint/lib/artifacts/lists.ts    |  12 +-
 .../endpoint/lib/artifacts/manifest.test.ts   |  51 +++++++
 .../server/endpoint/lib/artifacts/mocks.ts    |  15 +-
 .../schemas/artifacts/saved_objects.mock.ts   |  31 +++-
 .../manifest_manager/manifest_manager.test.ts | 139 ++++++++++++++++--
 .../manifest_manager/manifest_manager.ts      |  48 +++++-
 .../apps/endpoint/policy_details.ts           |  36 +++++
 11 files changed, 429 insertions(+), 46 deletions(-)
 create mode 100644 x-pack/plugins/lists/server/scripts/exception_lists/new/trusted_app_list_item_agnostic.json

diff --git a/x-pack/plugins/lists/server/scripts/exception_lists/new/trusted_app_list_item_agnostic.json b/x-pack/plugins/lists/server/scripts/exception_lists/new/trusted_app_list_item_agnostic.json
new file mode 100644
index 00000000000000..9f0c306a408f0d
--- /dev/null
+++ b/x-pack/plugins/lists/server/scripts/exception_lists/new/trusted_app_list_item_agnostic.json
@@ -0,0 +1,18 @@
+{
+  "list_id": "endpoint_trusted_apps",
+  "item_id": "endpoint_trusted_apps_item",
+  "_tags": ["endpoint",  "os:linux", "os:windows", "os:macos", "trusted-app"],
+  "tags": ["user added string for a tag", "malware"],
+  "type": "simple",
+  "description": "This is a sample agnostic endpoint trusted app entry",
+  "name": "Sample Endpoint Trusted App Entry",
+  "namespace_type": "agnostic",
+  "entries": [
+    {
+      "field": "actingProcess.file.signer",
+      "operator": "included",
+      "type": "match",
+      "value": "Elastic, N.V."
+    }
+  ]
+}
diff --git a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
index 73f2124736a79b..c28ffcf5b7a3f0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/ingest_integration.test.ts
@@ -49,6 +49,36 @@ describe('ingest_integration tests ', () => {
             relative_url:
               '/api/endpoint/artifacts/download/endpoint-exceptionlist-windows-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
           },
+          'endpoint-trustlist-linux-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+            decoded_size: 287,
+            encoded_sha256: 'c3dec543df1177561ab2aa74a37997ea3c1d748d532a597884f5a5c16670d56c',
+            encoded_size: 133,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-linux-v1/1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          },
+          'endpoint-trustlist-macos-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+            decoded_size: 287,
+            encoded_sha256: 'c3dec543df1177561ab2aa74a37997ea3c1d748d532a597884f5a5c16670d56c',
+            encoded_size: 133,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-macos-v1/1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          },
+          'endpoint-trustlist-windows-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+            decoded_size: 287,
+            encoded_sha256: 'c3dec543df1177561ab2aa74a37997ea3c1d748d532a597884f5a5c16670d56c',
+            encoded_size: 133,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-windows-v1/1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          },
         },
         manifest_version: '1.0.0',
         schema_version: 'v1',
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
index 7f90aa7b910632..457e50b686863a 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/common.ts
@@ -14,6 +14,8 @@ export const ArtifactConstants = {
   GLOBAL_ALLOWLIST_NAME: 'endpoint-exceptionlist',
   SAVED_OBJECT_TYPE: 'endpoint:user-artifact',
   SUPPORTED_OPERATING_SYSTEMS: ['macos', 'windows'],
+  SUPPORTED_TRUSTED_APPS_OPERATING_SYSTEMS: ['macos', 'windows', 'linux'],
+  GLOBAL_TRUSTED_APPS_NAME: 'endpoint-trustlist',
 };
 
 export const ManifestConstants = {
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
index fea3b2b9a45266..a10ba9d6be38c2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.test.ts
@@ -11,6 +11,8 @@ import { getExceptionListItemSchemaMock } from '../../../../../lists/common/sche
 import { EntriesArray, EntryList } from '../../../../../lists/common/schemas/types';
 import { buildArtifact, getFullEndpointExceptionList } from './lists';
 import { TranslatedEntry, TranslatedExceptionListItem } from '../../schemas/artifacts';
+import { ArtifactConstants } from './common';
+import { ENDPOINT_LIST_ID } from '../../../../../lists/common';
 
 describe('buildEventTypeSignal', () => {
   let mockExceptionClient: ExceptionListClient;
@@ -47,7 +49,12 @@ describe('buildEventTypeSignal', () => {
 
     const first = getFoundExceptionListItemSchemaMock();
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -88,7 +95,12 @@ describe('buildEventTypeSignal', () => {
     first.data[0].entries = testEntries;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -134,7 +146,12 @@ describe('buildEventTypeSignal', () => {
     first.data[0].entries = testEntries;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -182,7 +199,12 @@ describe('buildEventTypeSignal', () => {
     first.data[0].entries = testEntries;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -229,7 +251,12 @@ describe('buildEventTypeSignal', () => {
     first.data[0].entries = testEntries;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -267,7 +294,12 @@ describe('buildEventTypeSignal', () => {
     first.data[1].entries = testEntries;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -305,7 +337,12 @@ describe('buildEventTypeSignal', () => {
     first.data[0].entries = testEntries;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(first);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp).toEqual({
       entries: [expectedEndpointExceptions],
     });
@@ -329,7 +366,12 @@ describe('buildEventTypeSignal', () => {
       .mockReturnValueOnce(first)
       .mockReturnValueOnce(second);
 
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
 
     // Expect 2 exceptions, the first two calls returned the same exception list items
     expect(resp.entries.length).toEqual(2);
@@ -340,7 +382,12 @@ describe('buildEventTypeSignal', () => {
     exceptionsResponse.data = [];
     exceptionsResponse.total = 0;
     mockExceptionClient.findExceptionListItem = jest.fn().mockReturnValueOnce(exceptionsResponse);
-    const resp = await getFullEndpointExceptionList(mockExceptionClient, 'linux', 'v1');
+    const resp = await getFullEndpointExceptionList(
+      mockExceptionClient,
+      'linux',
+      'v1',
+      ENDPOINT_LIST_ID
+    );
     expect(resp.entries.length).toEqual(0);
   });
 
@@ -385,8 +432,18 @@ describe('buildEventTypeSignal', () => {
       ],
     };
 
-    const artifact1 = await buildArtifact(translatedExceptionList, 'linux', 'v1');
-    const artifact2 = await buildArtifact(translatedExceptionListReversed, 'linux', 'v1');
+    const artifact1 = await buildArtifact(
+      translatedExceptionList,
+      'linux',
+      'v1',
+      ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+    );
+    const artifact2 = await buildArtifact(
+      translatedExceptionListReversed,
+      'linux',
+      'v1',
+      ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+    );
     expect(artifact1.decodedSha256).toEqual(artifact2.decodedSha256);
   });
 
@@ -430,8 +487,18 @@ describe('buildEventTypeSignal', () => {
       entries: translatedItems.reverse(),
     };
 
-    const artifact1 = await buildArtifact(translatedExceptionList, 'linux', 'v1');
-    const artifact2 = await buildArtifact(translatedExceptionListReversed, 'linux', 'v1');
+    const artifact1 = await buildArtifact(
+      translatedExceptionList,
+      'linux',
+      'v1',
+      ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+    );
+    const artifact2 = await buildArtifact(
+      translatedExceptionListReversed,
+      'linux',
+      'v1',
+      ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+    );
     expect(artifact1.decodedSha256).toEqual(artifact2.decodedSha256);
   });
 });
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
index e41781dd605a07..731b083f3293c3 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/lists.ts
@@ -28,19 +28,20 @@ import {
   internalArtifactCompleteSchema,
   InternalArtifactCompleteSchema,
 } from '../../schemas';
-import { ArtifactConstants } from './common';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../lists/common/constants';
 
 export async function buildArtifact(
   exceptions: WrappedTranslatedExceptionList,
   os: string,
-  schemaVersion: string
+  schemaVersion: string,
+  name: string
 ): Promise<InternalArtifactCompleteSchema> {
   const exceptionsBuffer = Buffer.from(JSON.stringify(exceptions));
   const sha256 = createHash('sha256').update(exceptionsBuffer.toString()).digest('hex');
 
   // Keep compression info empty in case its a duplicate. Lazily compress before committing if needed.
   return {
-    identifier: `${ArtifactConstants.GLOBAL_ALLOWLIST_NAME}-${os}-${schemaVersion}`,
+    identifier: `${name}-${os}-${schemaVersion}`,
     compressionAlgorithm: 'none',
     encryptionAlgorithm: 'none',
     decodedSha256: sha256,
@@ -76,7 +77,8 @@ export function isCompressed(artifact: InternalArtifactSchema) {
 export async function getFullEndpointExceptionList(
   eClient: ExceptionListClient,
   os: string,
-  schemaVersion: string
+  schemaVersion: string,
+  listId: typeof ENDPOINT_LIST_ID | typeof ENDPOINT_TRUSTED_APPS_LIST_ID
 ): Promise<WrappedTranslatedExceptionList> {
   const exceptions: WrappedTranslatedExceptionList = { entries: [] };
   let page = 1;
@@ -84,7 +86,7 @@ export async function getFullEndpointExceptionList(
 
   while (paging) {
     const response = await eClient.findExceptionListItem({
-      listId: ENDPOINT_LIST_ID,
+      listId,
       namespaceType: 'agnostic',
       filter: `exception-list-agnostic.attributes._tags:\"os:${os}\"`,
       perPage: 100,
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest.test.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest.test.ts
index 3d70f7266277f6..507b81b12e10b0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/manifest.test.ts
@@ -94,6 +94,36 @@ describe('manifest', () => {
             relative_url:
               '/api/endpoint/artifacts/download/endpoint-exceptionlist-windows-v1/96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
           },
+          'endpoint-trustlist-linux-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+            decoded_size: 432,
+            encoded_sha256: '975382ab55d019cbab0bbac207a54e2a7d489fad6e8f6de34fc6402e5ef37b1e',
+            encoded_size: 147,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-linux-v1/96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          },
+          'endpoint-trustlist-macos-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+            decoded_size: 432,
+            encoded_sha256: '975382ab55d019cbab0bbac207a54e2a7d489fad6e8f6de34fc6402e5ef37b1e',
+            encoded_size: 147,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-macos-v1/96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          },
+          'endpoint-trustlist-windows-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+            decoded_size: 432,
+            encoded_sha256: '975382ab55d019cbab0bbac207a54e2a7d489fad6e8f6de34fc6402e5ef37b1e',
+            encoded_size: 147,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-windows-v1/96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          },
         },
         manifest_version: '1.0.0',
         schema_version: 'v1',
@@ -107,6 +137,9 @@ describe('manifest', () => {
         ids: [
           'endpoint-exceptionlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
           'endpoint-exceptionlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          'endpoint-trustlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          'endpoint-trustlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          'endpoint-trustlist-linux-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
         ],
       });
     });
@@ -119,6 +152,21 @@ describe('manifest', () => {
             'endpoint-exceptionlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
           type: 'delete',
         },
+        {
+          id:
+            'endpoint-trustlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
+        {
+          id:
+            'endpoint-trustlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
+        {
+          id:
+            'endpoint-trustlist-linux-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
         {
           id:
             'endpoint-exceptionlist-macos-v1-0a5a2013a79f9e60682472284a1be45ab1ff68b9b43426d00d665016612c15c8',
@@ -139,6 +187,9 @@ describe('manifest', () => {
       expect(keys).toEqual([
         'endpoint-exceptionlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
         'endpoint-exceptionlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+        'endpoint-trustlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+        'endpoint-trustlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+        'endpoint-trustlist-linux-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
       ]);
     });
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
index 61850bfb3bc7d3..cdfbb551940e1b 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/mocks.ts
@@ -16,13 +16,20 @@ import { ArtifactConstants } from './common';
 import { Manifest } from './manifest';
 
 export const getMockArtifacts = async (opts?: { compress: boolean }) => {
-  return Promise.all(
-    ArtifactConstants.SUPPORTED_OPERATING_SYSTEMS.map<Promise<InternalArtifactCompleteSchema>>(
+  return Promise.all([
+    // Exceptions items
+    ...ArtifactConstants.SUPPORTED_OPERATING_SYSTEMS.map<Promise<InternalArtifactCompleteSchema>>(
       async (os) => {
         return getInternalArtifactMock(os, 'v1', opts);
       }
-    )
-  );
+    ),
+    // Trusted Apps items
+    ...ArtifactConstants.SUPPORTED_TRUSTED_APPS_OPERATING_SYSTEMS.map<
+      Promise<InternalArtifactCompleteSchema>
+    >(async (os) => {
+      return getInternalArtifactMock(os, 'v1', opts, ArtifactConstants.GLOBAL_TRUSTED_APPS_NAME);
+    }),
+  ]);
 };
 
 export const getMockArtifactsWithDiff = async (opts?: { compress: boolean }) => {
diff --git a/x-pack/plugins/security_solution/server/endpoint/schemas/artifacts/saved_objects.mock.ts b/x-pack/plugins/security_solution/server/endpoint/schemas/artifacts/saved_objects.mock.ts
index ae565f785c399d..5d46fd0f2456b5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/schemas/artifacts/saved_objects.mock.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/schemas/artifacts/saved_objects.mock.ts
@@ -4,7 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { buildArtifact, maybeCompressArtifact, isCompressed } from '../../lib/artifacts';
+import {
+  buildArtifact,
+  maybeCompressArtifact,
+  isCompressed,
+  ArtifactConstants,
+} from '../../lib/artifacts';
 import { getTranslatedExceptionListMock } from './lists.mock';
 import {
   InternalManifestSchema,
@@ -25,9 +30,15 @@ const compressArtifact = async (artifact: InternalArtifactCompleteSchema) => {
 export const getInternalArtifactMock = async (
   os: string,
   schemaVersion: string,
-  opts?: { compress: boolean }
+  opts?: { compress: boolean },
+  artifactName: string = ArtifactConstants.GLOBAL_ALLOWLIST_NAME
 ): Promise<InternalArtifactCompleteSchema> => {
-  const artifact = await buildArtifact(getTranslatedExceptionListMock(), os, schemaVersion);
+  const artifact = await buildArtifact(
+    getTranslatedExceptionListMock(),
+    os,
+    schemaVersion,
+    artifactName
+  );
   return opts?.compress ? compressArtifact(artifact) : artifact;
 };
 
@@ -36,7 +47,12 @@ export const getEmptyInternalArtifactMock = async (
   schemaVersion: string,
   opts?: { compress: boolean }
 ): Promise<InternalArtifactCompleteSchema> => {
-  const artifact = await buildArtifact({ entries: [] }, os, schemaVersion);
+  const artifact = await buildArtifact(
+    { entries: [] },
+    os,
+    schemaVersion,
+    ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+  );
   return opts?.compress ? compressArtifact(artifact) : artifact;
 };
 
@@ -47,7 +63,12 @@ export const getInternalArtifactMockWithDiffs = async (
 ): Promise<InternalArtifactCompleteSchema> => {
   const mock = getTranslatedExceptionListMock();
   mock.entries.pop();
-  const artifact = await buildArtifact(mock, os, schemaVersion);
+  const artifact = await buildArtifact(
+    mock,
+    os,
+    schemaVersion,
+    ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+  );
   return opts?.compress ? compressArtifact(artifact) : artifact;
 };
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
index bb6504de6e0a42..40b408166b17f4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.test.ts
@@ -24,11 +24,41 @@ describe('manifest_manager', () => {
             'endpoint-exceptionlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
           type: 'delete',
         },
+        {
+          id:
+            'endpoint-trustlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
+        {
+          id:
+            'endpoint-trustlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
+        {
+          id:
+            'endpoint-trustlist-linux-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
         {
           id:
             'endpoint-exceptionlist-macos-v1-0a5a2013a79f9e60682472284a1be45ab1ff68b9b43426d00d665016612c15c8',
           type: 'add',
         },
+        {
+          id:
+            'endpoint-trustlist-macos-v1-1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          type: 'add',
+        },
+        {
+          id:
+            'endpoint-trustlist-windows-v1-1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          type: 'add',
+        },
+        {
+          id:
+            'endpoint-trustlist-linux-v1-1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          type: 'add',
+        },
       ]);
     });
 
@@ -44,16 +74,53 @@ describe('manifest_manager', () => {
             'endpoint-exceptionlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
           type: 'delete',
         },
+        {
+          id:
+            'endpoint-trustlist-macos-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
+        {
+          id:
+            'endpoint-trustlist-windows-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
+        {
+          id:
+            'endpoint-trustlist-linux-v1-96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
+          type: 'delete',
+        },
         {
           id:
             'endpoint-exceptionlist-macos-v1-0a5a2013a79f9e60682472284a1be45ab1ff68b9b43426d00d665016612c15c8',
           type: 'add',
         },
+        {
+          id:
+            'endpoint-trustlist-macos-v1-1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          type: 'add',
+        },
+        {
+          id:
+            'endpoint-trustlist-windows-v1-1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          type: 'add',
+        },
+        {
+          id:
+            'endpoint-trustlist-linux-v1-1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          type: 'add',
+        },
       ]);
 
-      const newArtifactId = diffs[1].id;
-      await newManifest.compressArtifact(newArtifactId);
-      const artifact = newManifest.getArtifact(newArtifactId)!;
+      const firstNewArtifactId = diffs.find((diff) => diff.type === 'add')!.id;
+
+      // Compress all `add` artifacts
+      for (const artifactDiff of diffs) {
+        if (artifactDiff.type === 'add') {
+          await newManifest.compressArtifact(artifactDiff.id);
+        }
+      }
+
+      const artifact = newManifest.getArtifact(firstNewArtifactId)!;
 
       if (isCompleteArtifact(artifact)) {
         await manifestManager.pushArtifacts([artifact]); // caches the artifact
@@ -61,7 +128,7 @@ describe('manifest_manager', () => {
         throw new Error('Artifact is missing a body.');
       }
 
-      const entry = JSON.parse(inflateSync(cache.get(newArtifactId)! as Buffer).toString());
+      const entry = JSON.parse(inflateSync(cache.get(firstNewArtifactId)! as Buffer).toString());
       expect(entry).toEqual({
         entries: [
           {
@@ -107,8 +174,12 @@ describe('manifest_manager', () => {
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
-      const newArtifactId = diffs[1].id;
-      await newManifest.compressArtifact(newArtifactId);
+
+      for (const artifactDiff of diffs) {
+        if (artifactDiff.type === 'add') {
+          await newManifest.compressArtifact(artifactDiff.id);
+        }
+      }
 
       newManifest.bumpSemanticVersion();
 
@@ -145,6 +216,36 @@ describe('manifest_manager', () => {
             relative_url:
               '/api/endpoint/artifacts/download/endpoint-exceptionlist-windows-v1/96b76a1a911662053a1562ac14c4ff1e87c2ff550d6fe52e1e0b3790526597d3',
           },
+          'endpoint-trustlist-linux-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+            decoded_size: 287,
+            encoded_sha256: 'c3dec543df1177561ab2aa74a37997ea3c1d748d532a597884f5a5c16670d56c',
+            encoded_size: 133,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-linux-v1/1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          },
+          'endpoint-trustlist-macos-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+            decoded_size: 287,
+            encoded_sha256: 'c3dec543df1177561ab2aa74a37997ea3c1d748d532a597884f5a5c16670d56c',
+            encoded_size: 133,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-macos-v1/1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          },
+          'endpoint-trustlist-windows-v1': {
+            compression_algorithm: 'zlib',
+            decoded_sha256: '1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+            decoded_size: 287,
+            encoded_sha256: 'c3dec543df1177561ab2aa74a37997ea3c1d748d532a597884f5a5c16670d56c',
+            encoded_size: 133,
+            encryption_algorithm: 'none',
+            relative_url:
+              '/api/endpoint/artifacts/download/endpoint-trustlist-windows-v1/1a8295e6ccb93022c6f5ceb8997b29f2912389b3b38f52a8f5a2ff7b0154b1bc',
+          },
         },
       });
     });
@@ -155,8 +256,12 @@ describe('manifest_manager', () => {
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
-      const newArtifactId = diffs[1].id;
-      await newManifest.compressArtifact(newArtifactId);
+
+      for (const artifactDiff of diffs) {
+        if (artifactDiff.type === 'add') {
+          await newManifest.compressArtifact(artifactDiff.id);
+        }
+      }
 
       newManifest.bumpSemanticVersion();
 
@@ -174,11 +279,17 @@ describe('manifest_manager', () => {
       const oldManifest = await manifestManager.getLastComputedManifest();
       const newManifest = await manifestManager.buildNewManifest(oldManifest!);
       const diffs = newManifest.diff(oldManifest!);
-      const oldArtifactId = diffs[0].id;
-      const newArtifactId = diffs[1].id;
-      await newManifest.compressArtifact(newArtifactId);
+      const firstOldArtifactId = diffs.find((diff) => diff.type === 'delete')!.id;
+      const FirstNewArtifactId = diffs.find((diff) => diff.type === 'add')!.id;
+
+      // Compress all new artifacts
+      for (const artifactDiff of diffs) {
+        if (artifactDiff.type === 'add') {
+          await newManifest.compressArtifact(artifactDiff.id);
+        }
+      }
 
-      const artifact = newManifest.getArtifact(newArtifactId)!;
+      const artifact = newManifest.getArtifact(FirstNewArtifactId)!;
       if (isCompleteArtifact(artifact)) {
         await manifestManager.pushArtifacts([artifact]);
       } else {
@@ -186,7 +297,7 @@ describe('manifest_manager', () => {
       }
 
       await manifestManager.commit(newManifest);
-      await manifestManager.deleteArtifacts([oldArtifactId]);
+      await manifestManager.deleteArtifacts([firstOldArtifactId]);
 
       // created new artifact
       expect(savedObjectsClient.create.mock.calls[0][0]).toEqual(
@@ -201,7 +312,7 @@ describe('manifest_manager', () => {
       // deleted old artifact
       expect(savedObjectsClient.delete).toHaveBeenCalledWith(
         ArtifactConstants.SAVED_OBJECT_TYPE,
-        oldArtifactId
+        firstOldArtifactId
       );
     });
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
index 70557886e57c51..f9836c7ecdc30c 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/artifacts/manifest_manager/manifest_manager.ts
@@ -13,11 +13,11 @@ import { manifestDispatchSchema } from '../../../../../common/endpoint/schema/ma
 
 import {
   ArtifactConstants,
-  Manifest,
   buildArtifact,
+  getArtifactId,
   getFullEndpointExceptionList,
+  Manifest,
   ManifestDiff,
-  getArtifactId,
 } from '../../../lib/artifacts';
 import {
   InternalArtifactCompleteSchema,
@@ -25,6 +25,8 @@ import {
 } from '../../../schemas/artifacts';
 import { ArtifactClient } from '../artifact_client';
 import { ManifestClient } from '../manifest_client';
+import { ENDPOINT_LIST_ID } from '../../../../../../lists/common';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../../lists/common/constants';
 
 export interface ManifestManagerContext {
   savedObjectsClient: SavedObjectsClientContract;
@@ -87,9 +89,43 @@ export class ManifestManager {
       const exceptionList = await getFullEndpointExceptionList(
         this.exceptionListClient,
         os,
-        artifactSchemaVersion ?? 'v1'
+        artifactSchemaVersion ?? 'v1',
+        ENDPOINT_LIST_ID
+      );
+      const artifact = await buildArtifact(
+        exceptionList,
+        os,
+        artifactSchemaVersion ?? 'v1',
+        ArtifactConstants.GLOBAL_ALLOWLIST_NAME
+      );
+      artifacts.push(artifact);
+    }
+    return artifacts;
+  }
+
+  /**
+   * Builds an array of artifacts (one per supported OS) based on the current state of the
+   * Trusted Apps list (which uses the `exception-list-agnostic` SO type)
+   * @param artifactSchemaVersion
+   */
+  protected async buildTrustedAppsArtifacts(
+    artifactSchemaVersion?: string
+  ): Promise<InternalArtifactCompleteSchema[]> {
+    const artifacts: InternalArtifactCompleteSchema[] = [];
+
+    for (const os of ArtifactConstants.SUPPORTED_TRUSTED_APPS_OPERATING_SYSTEMS) {
+      const trustedApps = await getFullEndpointExceptionList(
+        this.exceptionListClient,
+        os,
+        artifactSchemaVersion ?? 'v1',
+        ENDPOINT_TRUSTED_APPS_LIST_ID
+      );
+      const artifact = await buildArtifact(
+        trustedApps,
+        os,
+        'v1',
+        ArtifactConstants.GLOBAL_TRUSTED_APPS_NAME
       );
-      const artifact = await buildArtifact(exceptionList, os, artifactSchemaVersion ?? 'v1');
       artifacts.push(artifact);
     }
     return artifacts;
@@ -205,7 +241,9 @@ export class ManifestManager {
    */
   public async buildNewManifest(baselineManifest?: Manifest): Promise<Manifest> {
     // Build new exception list artifacts
-    const artifacts = await this.buildExceptionListArtifacts();
+    const artifacts = (
+      await Promise.all([this.buildExceptionListArtifacts(), this.buildTrustedAppsArtifacts()])
+    ).flat();
 
     // Build new manifest
     const manifest = Manifest.fromArtifacts(
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index 3e04a507d3810f..a0998f1a838baf 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -142,6 +142,42 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
                     relative_url:
                       '/api/endpoint/artifacts/download/endpoint-exceptionlist-windows-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
                   },
+                  'endpoint-trustlist-linux-v1': {
+                    compression_algorithm: 'zlib',
+                    decoded_sha256:
+                      'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                    decoded_size: 14,
+                    encoded_sha256:
+                      'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+                    encoded_size: 22,
+                    encryption_algorithm: 'none',
+                    relative_url:
+                      '/api/endpoint/artifacts/download/endpoint-trustlist-linux-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                  },
+                  'endpoint-trustlist-macos-v1': {
+                    compression_algorithm: 'zlib',
+                    decoded_sha256:
+                      'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                    decoded_size: 14,
+                    encoded_sha256:
+                      'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+                    encoded_size: 22,
+                    encryption_algorithm: 'none',
+                    relative_url:
+                      '/api/endpoint/artifacts/download/endpoint-trustlist-macos-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                  },
+                  'endpoint-trustlist-windows-v1': {
+                    compression_algorithm: 'zlib',
+                    decoded_sha256:
+                      'd801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                    decoded_size: 14,
+                    encoded_sha256:
+                      'f8e6afa1d5662f5b37f83337af774b5785b5b7f1daee08b7b00c2d6813874cda',
+                    encoded_size: 22,
+                    encryption_algorithm: 'none',
+                    relative_url:
+                      '/api/endpoint/artifacts/download/endpoint-trustlist-windows-v1/d801aa1fb7ddcc330a5e3173372ea6af4a3d08ec58074478e85aa5603e926658',
+                  },
                 },
                 // The manifest version could have changed when the Policy was updated because the
                 // policy details page ensures that a save action applies the udpated policy on top

From 7c3ad238e52092fd57b89e3d15a4226beba79eac Mon Sep 17 00:00:00 2001
From: Diana Derevyankina
 <54894989+DziyanaDzeraviankina@users.noreply.github.com>
Date: Tue, 1 Sep 2020 15:33:26 +0300
Subject: [PATCH 142/216] KQL autocomplete cut off in visualize editor with
 styled-components (#75557)

* KQL autocomplete cut off in visualize editor

Closes #70964

* Refactor some code

* Accept api changes, refactor query_string_input and suggestions_component

* Add a comment to suggestions_component

* Fix dropdown position, add close event on scroll and hide description if it doesn't fit

* Update tests to pass type check

* Fix displaying bugs

* Remove closeList

* Replace dropdownHeight with className

* Update suggestions_component.test and public.api.md

* KQL autocomplete cut off in visualize editor with styled-components

* Update suggestions_component.test values

* Add logic to open the list up

* Remove unnecessary semicolon

* Remove a gap between the list and input by inlining offset -2px from _suggestion.scss

* Rename the constants and add docs to them

* Wrap div inside SuggestionsComponent by styled component instead of wrapping the whole component

* Update public.api.md

* Refactor .kbnTypeahead__popover--top style

* Remove unnecessary condition

* Fix eslint problems

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...in-plugins-data-public.querystringinput.md |  2 +-
 src/plugins/data/public/public.api.md         |  2 +-
 .../query_string_input/query_string_input.tsx | 43 +++++++++++----
 .../suggestions_component.test.tsx.snap       | 32 +++++++----
 .../data/public/ui/typeahead/_suggestion.scss | 34 +++++++-----
 .../data/public/ui/typeahead/constants.ts     | 36 +++++++++++++
 .../typeahead/suggestion_component.test.tsx   |  5 ++
 .../ui/typeahead/suggestion_component.tsx     |  5 +-
 .../typeahead/suggestions_component.test.tsx  |  6 +++
 .../ui/typeahead/suggestions_component.tsx    | 54 ++++++++++++++++---
 .../public/components/controls/filter.tsx     |  1 +
 11 files changed, 177 insertions(+), 43 deletions(-)
 create mode 100644 src/plugins/data/public/ui/typeahead/constants.ts

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
index e139b326b75008..9f3ed8c1263ba0 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
+QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
 ```
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index ba40dece25df9b..0c4465ae7f4b91 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1508,7 +1508,7 @@ export interface QueryState {
 // Warning: (ae-missing-release-tag) "QueryStringInput" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
-export const QueryStringInput: React.FC<Pick<Props_3, "query" | "prepend" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
+export const QueryStringInput: React.FC<Pick<Props_3, "query" | "prepend" | "size" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>;
 
 // @public (undocumented)
 export type QuerySuggestion = QuerySuggestionBasic | QuerySuggestionField;
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
index 86ee98b7af9d84..2d311fd88eb394 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
+++ b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { Component } from 'react';
-import React from 'react';
+import React, { Component, RefObject, createRef } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import {
@@ -30,6 +29,7 @@ import {
   EuiButton,
   EuiLink,
   htmlIdGenerator,
+  EuiPortal,
 } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -42,6 +42,7 @@ import { withKibana, KibanaReactContextValue, toMountPoint } from '../../../../k
 import { fetchIndexPatterns } from './fetch_index_patterns';
 import { QueryLanguageSwitcher } from './language_switcher';
 import { PersistedLog, getQueryLog, matchPairs, toUser, fromUser } from '../../query';
+import { SuggestionsListSize } from '../typeahead/suggestions_component';
 import { SuggestionsComponent } from '..';
 
 interface Props {
@@ -60,6 +61,7 @@ interface Props {
   onChangeQueryInputFocus?: (isFocused: boolean) => void;
   onSubmit?: (query: Query) => void;
   dataTestSubj?: string;
+  size?: SuggestionsListSize;
 }
 
 interface State {
@@ -70,6 +72,7 @@ interface State {
   selectionStart: number | null;
   selectionEnd: number | null;
   indexPatterns: IIndexPattern[];
+  queryBarRect: DOMRect | undefined;
 }
 
 const KEY_CODES = {
@@ -93,6 +96,7 @@ export class QueryStringInputUI extends Component<Props, State> {
     selectionStart: null,
     selectionEnd: null,
     indexPatterns: [],
+    queryBarRect: undefined,
   };
 
   public inputRef: HTMLTextAreaElement | null = null;
@@ -101,6 +105,7 @@ export class QueryStringInputUI extends Component<Props, State> {
   private abortController?: AbortController;
   private services = this.props.kibana.services;
   private componentIsUnmounting = false;
+  private queryBarInputDivRefInstance: RefObject<HTMLDivElement> = createRef();
 
   private getQueryString = () => {
     return toUser(this.props.query.query);
@@ -494,8 +499,13 @@ export class QueryStringInputUI extends Component<Props, State> {
 
     this.initPersistedLog();
     this.fetchIndexPatterns().then(this.updateSuggestions);
+    this.handleListUpdate();
 
     window.addEventListener('resize', this.handleAutoHeight);
+    window.addEventListener('scroll', this.handleListUpdate, {
+      passive: true, // for better performance as we won't call preventDefault
+      capture: true, // scroll events don't bubble, they must be captured instead
+    });
   }
 
   public componentDidUpdate(prevProps: Props) {
@@ -533,12 +543,19 @@ export class QueryStringInputUI extends Component<Props, State> {
     this.updateSuggestions.cancel();
     this.componentIsUnmounting = true;
     window.removeEventListener('resize', this.handleAutoHeight);
+    window.removeEventListener('scroll', this.handleListUpdate);
   }
 
+  handleListUpdate = () =>
+    this.setState({
+      queryBarRect: this.queryBarInputDivRefInstance.current?.getBoundingClientRect(),
+    });
+
   handleAutoHeight = () => {
     if (this.inputRef !== null && document.activeElement === this.inputRef) {
       this.inputRef.style.setProperty('height', `${this.inputRef.scrollHeight}px`, 'important');
     }
+    this.handleListUpdate();
   };
 
   handleRemoveHeight = () => {
@@ -587,6 +604,7 @@ export class QueryStringInputUI extends Component<Props, State> {
             <div
               role="search"
               className="euiFormControlLayout__childrenWrapper kuiLocalSearchAssistedInput"
+              ref={this.queryBarInputDivRefInstance}
             >
               <EuiTextArea
                 placeholder={
@@ -633,15 +651,18 @@ export class QueryStringInputUI extends Component<Props, State> {
                 {this.getQueryString()}
               </EuiTextArea>
             </div>
-
-            <SuggestionsComponent
-              show={this.state.isSuggestionsVisible}
-              suggestions={this.state.suggestions.slice(0, this.state.suggestionLimit)}
-              index={this.state.index}
-              onClick={this.onClickSuggestion}
-              onMouseEnter={this.onMouseEnterSuggestion}
-              loadMore={this.increaseLimit}
-            />
+            <EuiPortal>
+              <SuggestionsComponent
+                show={this.state.isSuggestionsVisible}
+                suggestions={this.state.suggestions.slice(0, this.state.suggestionLimit)}
+                index={this.state.index}
+                onClick={this.onClickSuggestion}
+                onMouseEnter={this.onMouseEnterSuggestion}
+                loadMore={this.increaseLimit}
+                queryBarRect={this.state.queryBarRect}
+                size={this.props.size}
+              />
+            </EuiPortal>
           </div>
         </EuiOutsideClickDetector>
 
diff --git a/src/plugins/data/public/ui/typeahead/__snapshots__/suggestions_component.test.tsx.snap b/src/plugins/data/public/ui/typeahead/__snapshots__/suggestions_component.test.tsx.snap
index 3b51c1db50d00c..2fa7834872f6b1 100644
--- a/src/plugins/data/public/ui/typeahead/__snapshots__/suggestions_component.test.tsx.snap
+++ b/src/plugins/data/public/ui/typeahead/__snapshots__/suggestions_component.test.tsx.snap
@@ -1,17 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`SuggestionsComponent Passing the index should control which suggestion is selected 1`] = `
-<div
-  className="reactSuggestionTypeahead"
+<styled.div
+  queryBarRect={
+    Object {
+      "top": 0,
+    }
+  }
+  verticalListPosition="bottom: 768px;"
 >
   <div
     className="kbnTypeahead"
   >
     <div
-      className="kbnTypeahead__popover"
+      className="kbnTypeahead__popover kbnTypeahead__popover--top"
     >
       <div
-        className="kbnTypeahead__items"
         id="kbnTypeahead__items"
         onScroll={[Function]}
         role="listbox"
@@ -23,6 +27,7 @@ exports[`SuggestionsComponent Passing the index should control which suggestion
           onClick={[Function]}
           onMouseEnter={[Function]}
           selected={false}
+          shouldDisplayDescription={false}
           suggestion={
             Object {
               "description": "This is not a helpful suggestion",
@@ -40,6 +45,7 @@ exports[`SuggestionsComponent Passing the index should control which suggestion
           onClick={[Function]}
           onMouseEnter={[Function]}
           selected={true}
+          shouldDisplayDescription={false}
           suggestion={
             Object {
               "description": "This is another unhelpful suggestion",
@@ -53,21 +59,25 @@ exports[`SuggestionsComponent Passing the index should control which suggestion
       </div>
     </div>
   </div>
-</div>
+</styled.div>
 `;
 
 exports[`SuggestionsComponent Should display given suggestions if the show prop is true 1`] = `
-<div
-  className="reactSuggestionTypeahead"
+<styled.div
+  queryBarRect={
+    Object {
+      "top": 0,
+    }
+  }
+  verticalListPosition="bottom: 768px;"
 >
   <div
     className="kbnTypeahead"
   >
     <div
-      className="kbnTypeahead__popover"
+      className="kbnTypeahead__popover kbnTypeahead__popover--top"
     >
       <div
-        className="kbnTypeahead__items"
         id="kbnTypeahead__items"
         onScroll={[Function]}
         role="listbox"
@@ -79,6 +89,7 @@ exports[`SuggestionsComponent Should display given suggestions if the show prop
           onClick={[Function]}
           onMouseEnter={[Function]}
           selected={true}
+          shouldDisplayDescription={false}
           suggestion={
             Object {
               "description": "This is not a helpful suggestion",
@@ -96,6 +107,7 @@ exports[`SuggestionsComponent Should display given suggestions if the show prop
           onClick={[Function]}
           onMouseEnter={[Function]}
           selected={false}
+          shouldDisplayDescription={false}
           suggestion={
             Object {
               "description": "This is another unhelpful suggestion",
@@ -109,5 +121,5 @@ exports[`SuggestionsComponent Should display given suggestions if the show prop
       </div>
     </div>
   </div>
-</div>
+</styled.div>
 `;
diff --git a/src/plugins/data/public/ui/typeahead/_suggestion.scss b/src/plugins/data/public/ui/typeahead/_suggestion.scss
index 81c05f1a8a78c7..67ff17d017053e 100644
--- a/src/plugins/data/public/ui/typeahead/_suggestion.scss
+++ b/src/plugins/data/public/ui/typeahead/_suggestion.scss
@@ -6,28 +6,36 @@ $kbnTypeaheadTypes: (
   conjunction: $euiColorVis3,
 );
 
+.kbnTypeahead.kbnTypeahead--small {
+  max-height: 20vh;
+}
+
+.kbnTypeahead__popover--top {
+  @include euiBottomShadowFlat;
+  border-top-left-radius: $euiBorderRadius;
+  border-top-right-radius: $euiBorderRadius;
+}
+
+.kbnTypeahead__popover--bottom {
+  @include euiBottomShadow($adjustBorders: true);
+  border-bottom-left-radius: $euiBorderRadius;
+  border-bottom-right-radius: $euiBorderRadius;
+}
+
 .kbnTypeahead {
-  position: relative;
+  max-height: 60vh;
 
   .kbnTypeahead__popover {
-    @include euiBottomShadow($adjustBorders: true);
+    max-height: inherit;
+    @include euiScrollBar;
     border: 1px solid;
     border-color: $euiBorderColor;
     color: $euiTextColor;
     background-color: $euiColorEmptyShade;
-    position: absolute;
-    top: -2px;
+    position: relative;
     z-index: $euiZContentMenu;
     width: 100%;
-    border-bottom-left-radius: $euiBorderRadius;
-    border-bottom-right-radius: $euiBorderRadius;
-
-    .kbnTypeahead__items {
-      @include euiScrollBar;
-
-      max-height: 60vh;
-      overflow-y: auto;
-    }
+    overflow-y: auto;
 
     .kbnTypeahead__item {
       height: $euiSizeXL;
diff --git a/src/plugins/data/public/ui/typeahead/constants.ts b/src/plugins/data/public/ui/typeahead/constants.ts
new file mode 100644
index 00000000000000..08f9bd23e16f35
--- /dev/null
+++ b/src/plugins/data/public/ui/typeahead/constants.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.
+ */
+
+/**
+ * Minimum width in px to display suggestion description correctly
+ * @public
+ */
+export const SUGGESTIONS_LIST_REQUIRED_WIDTH = 600;
+
+/**
+ * Minimum bottom distance in px to display list of suggestions
+ * @public
+ */
+export const SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE = 250;
+
+/**
+ * A distance in px to display suggestions list right under the query input without a gap
+ * @public
+ */
+export const SUGGESTIONS_LIST_REQUIRED_TOP_OFFSET = 2;
diff --git a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx b/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
index 9fe33b003527e9..ba78bdd802601d 100644
--- a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
@@ -44,6 +44,7 @@ describe('SuggestionComponent', () => {
         suggestion={mockSuggestion}
         innerRef={noop}
         ariaId={'suggestion-1'}
+        shouldDisplayDescription={true}
       />
     );
 
@@ -59,6 +60,7 @@ describe('SuggestionComponent', () => {
         suggestion={mockSuggestion}
         innerRef={noop}
         ariaId={'suggestion-1'}
+        shouldDisplayDescription={true}
       />
     );
 
@@ -79,6 +81,7 @@ describe('SuggestionComponent', () => {
         suggestion={mockSuggestion}
         innerRef={innerRefCallback}
         ariaId={'suggestion-1'}
+        shouldDisplayDescription={true}
       />
     );
   });
@@ -94,6 +97,7 @@ describe('SuggestionComponent', () => {
         suggestion={mockSuggestion}
         innerRef={noop}
         ariaId={'suggestion-1'}
+        shouldDisplayDescription={true}
       />
     );
 
@@ -113,6 +117,7 @@ describe('SuggestionComponent', () => {
         suggestion={mockSuggestion}
         innerRef={noop}
         ariaId={'suggestion-1'}
+        shouldDisplayDescription={true}
       />
     );
 
diff --git a/src/plugins/data/public/ui/typeahead/suggestion_component.tsx b/src/plugins/data/public/ui/typeahead/suggestion_component.tsx
index b859428e6ed7ea..724287b874bf70 100644
--- a/src/plugins/data/public/ui/typeahead/suggestion_component.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestion_component.tsx
@@ -46,6 +46,7 @@ interface Props {
   suggestion: QuerySuggestion;
   innerRef: (node: HTMLDivElement) => void;
   ariaId: string;
+  shouldDisplayDescription: boolean;
 }
 
 export function SuggestionComponent(props: Props) {
@@ -72,7 +73,9 @@ export function SuggestionComponent(props: Props) {
           <EuiIcon type={getEuiIconType(props.suggestion.type)} />
         </div>
         <div className="kbnSuggestionItem__text">{props.suggestion.text}</div>
-        <div className="kbnSuggestionItem__description">{props.suggestion.description}</div>
+        {props.shouldDisplayDescription && (
+          <div className="kbnSuggestionItem__description">{props.suggestion.description}</div>
+        )}
       </div>
     </div>
   );
diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx b/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
index 011a729c6a6169..583940015c152a 100644
--- a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
@@ -54,6 +54,7 @@ describe('SuggestionsComponent', () => {
         show={false}
         suggestions={mockSuggestions}
         loadMore={noop}
+        queryBarRect={{ top: 0 } as DOMRect}
       />
     );
 
@@ -69,6 +70,7 @@ describe('SuggestionsComponent', () => {
         show={true}
         suggestions={[]}
         loadMore={noop}
+        queryBarRect={{ top: 0 } as DOMRect}
       />
     );
 
@@ -84,6 +86,7 @@ describe('SuggestionsComponent', () => {
         show={true}
         suggestions={mockSuggestions}
         loadMore={noop}
+        queryBarRect={{ top: 0 } as DOMRect}
       />
     );
 
@@ -100,6 +103,7 @@ describe('SuggestionsComponent', () => {
         show={true}
         suggestions={mockSuggestions}
         loadMore={noop}
+        queryBarRect={{ top: 0 } as DOMRect}
       />
     );
 
@@ -116,6 +120,7 @@ describe('SuggestionsComponent', () => {
         show={true}
         suggestions={mockSuggestions}
         loadMore={noop}
+        queryBarRect={{ top: 0 } as DOMRect}
       />
     );
 
@@ -134,6 +139,7 @@ describe('SuggestionsComponent', () => {
         show={true}
         suggestions={mockSuggestions}
         loadMore={noop}
+        queryBarRect={{ top: 0 } as DOMRect}
       />
     );
 
diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.tsx b/src/plugins/data/public/ui/typeahead/suggestions_component.tsx
index 77dd7dcec01ee6..dc7c55374f1d5f 100644
--- a/src/plugins/data/public/ui/typeahead/suggestions_component.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestions_component.tsx
@@ -19,8 +19,15 @@
 
 import { isEmpty } from 'lodash';
 import React, { Component } from 'react';
+import classNames from 'classnames';
+import styled from 'styled-components';
 import { QuerySuggestion } from '../../autocomplete';
 import { SuggestionComponent } from './suggestion_component';
+import {
+  SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE,
+  SUGGESTIONS_LIST_REQUIRED_TOP_OFFSET,
+  SUGGESTIONS_LIST_REQUIRED_WIDTH,
+} from './constants';
 
 interface Props {
   index: number | null;
@@ -29,18 +36,24 @@ interface Props {
   show: boolean;
   suggestions: QuerySuggestion[];
   loadMore: () => void;
+  queryBarRect?: DOMRect;
+  size?: SuggestionsListSize;
 }
 
+export type SuggestionsListSize = 's' | 'l';
+
 export class SuggestionsComponent extends Component<Props> {
   private childNodes: HTMLDivElement[] = [];
   private parentNode: HTMLDivElement | null = null;
 
   public render() {
-    if (!this.props.show || isEmpty(this.props.suggestions)) {
+    if (!this.props.queryBarRect || !this.props.show || isEmpty(this.props.suggestions)) {
       return null;
     }
 
     const suggestions = this.props.suggestions.map((suggestion, index) => {
+      const isDescriptionFittable =
+        this.props.queryBarRect!.width >= SUGGESTIONS_LIST_REQUIRED_WIDTH;
       return (
         <SuggestionComponent
           innerRef={(node) => (this.childNodes[index] = node)}
@@ -50,17 +63,38 @@ export class SuggestionsComponent extends Component<Props> {
           onMouseEnter={() => this.props.onMouseEnter(index)}
           ariaId={'suggestion-' + index}
           key={`${suggestion.type} - ${suggestion.text}`}
+          shouldDisplayDescription={isDescriptionFittable}
         />
       );
     });
 
+    const documentHeight = document.documentElement.clientHeight || window.innerHeight;
+    const { queryBarRect } = this.props;
+
+    // reflects if the suggestions list has enough space below to be opened down
+    const isSuggestionsListFittable =
+      documentHeight - (queryBarRect.top + queryBarRect.height) >
+      SUGGESTIONS_LIST_REQUIRED_BOTTOM_SPACE;
+    const verticalListPosition = isSuggestionsListFittable
+      ? `top: ${window.scrollY + queryBarRect.bottom - SUGGESTIONS_LIST_REQUIRED_TOP_OFFSET}px;`
+      : `bottom: ${documentHeight - (window.scrollY + queryBarRect.top)}px;`;
+
     return (
-      <div className="reactSuggestionTypeahead">
-        <div className="kbnTypeahead">
-          <div className="kbnTypeahead__popover">
+      <StyledSuggestionsListDiv
+        queryBarRect={queryBarRect}
+        verticalListPosition={verticalListPosition}
+      >
+        <div
+          className={classNames('kbnTypeahead', { 'kbnTypeahead--small': this.props.size === 's' })}
+        >
+          <div
+            className={classNames('kbnTypeahead__popover', {
+              ['kbnTypeahead__popover--bottom']: isSuggestionsListFittable,
+              ['kbnTypeahead__popover--top']: !isSuggestionsListFittable,
+            })}
+          >
             <div
               id="kbnTypeahead__items"
-              className="kbnTypeahead__items"
               role="listbox"
               ref={(node) => (this.parentNode = node)}
               onScroll={this.handleScroll}
@@ -69,7 +103,7 @@ export class SuggestionsComponent extends Component<Props> {
             </div>
           </div>
         </div>
-      </div>
+      </StyledSuggestionsListDiv>
     );
   }
 
@@ -116,3 +150,11 @@ export class SuggestionsComponent extends Component<Props> {
     }
   };
 }
+
+const StyledSuggestionsListDiv = styled.div`
+  ${(props: { queryBarRect: DOMRect; verticalListPosition: string }) => `
+      position: absolute;
+      left: ${props.queryBarRect.left}px;
+      width: ${props.queryBarRect.width}px;
+      ${props.verticalListPosition}`}
+`;
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 101ca3e8ad457b..c373f9331c9a72 100644
--- a/src/plugins/vis_default_editor/public/components/controls/filter.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/filter.tsx
@@ -115,6 +115,7 @@ function FilterRow({
           dataTestSubj={dataTestSubj}
           bubbleSubmitEvent={true}
           languageSwitcherPopoverAnchorPosition="leftDown"
+          size="s"
         />
       </EuiFormRow>
       {showCustomLabel ? (

From 27bdc88011c14f35048c1e11b5cfd6eb5cd4d41c Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Tue, 1 Sep 2020 14:46:55 +0200
Subject: [PATCH 143/216] [Discover] Add sidebar jest test (#76286)

* Add Jest test removed in #73226
---
 .../components/sidebar/discover_field.test.tsx            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
index a0d9e3c541e47e..6d1238e02c7fb9 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
@@ -80,11 +80,10 @@ function getComponent(selected = false, showDetails = false, useShortDots = fals
   const props = {
     indexPattern,
     field,
-    getDetails: jest.fn(),
+    getDetails: jest.fn(() => ({ buckets: [], error: '', exists: 1, total: true, columns: [] })),
     onAddFilter: jest.fn(),
     onAddField: jest.fn(),
     onRemoveField: jest.fn(),
-    onShowDetails: jest.fn(),
     showDetails,
     selected,
     useShortDots,
@@ -104,4 +103,9 @@ describe('discover sidebar field', function () {
     findTestSubject(comp, 'fieldToggle-bytes').simulate('click');
     expect(props.onRemoveField).toHaveBeenCalledWith('bytes');
   });
+  it('should trigger getDetails', function () {
+    const { comp, props } = getComponent(true);
+    findTestSubject(comp, 'field-bytes-showDetails').simulate('click');
+    expect(props.getDetails).toHaveBeenCalledWith(props.field);
+  });
 });

From ef7246f157100a1454c7a974d5de93ee9bddf65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sabee77@gmail.com>
Date: Tue, 1 Sep 2020 14:48:11 +0200
Subject: [PATCH 144/216] [Form lib] Add useFormData() hook to listen to fields
 value changes (#76107)

---
 .../components/fields/combobox_field.tsx      |   2 +-
 .../forms/hook_form_lib/components/form.tsx   |  17 +-
 .../components/form_data_provider.test.tsx    |  19 +-
 .../components/form_data_provider.ts          |  45 +---
 .../forms/hook_form_lib/form_data_context.tsx |  50 ++++
 .../static/forms/hook_form_lib/hooks/index.ts |   1 +
 .../forms/hook_form_lib/hooks/use_field.ts    |  18 +-
 .../hook_form_lib/hooks/use_form.test.tsx     |   2 +-
 .../forms/hook_form_lib/hooks/use_form.ts     |   8 +
 .../hooks/use_form_data.test.tsx              | 234 ++++++++++++++++++
 .../hook_form_lib/hooks/use_form_data.ts      |  91 +++++++
 .../static/forms/hook_form_lib/index.ts       |   2 +-
 .../static/forms/hook_form_lib/types.ts       |   8 +
 .../fields/edit_field/edit_field.tsx          |   4 +-
 .../template_form/steps/step_logistics.tsx    |  82 +++---
 .../template_form/template_form.tsx           |   2 +-
 .../template_form/template_form_schemas.tsx   |  13 +-
 .../index_management/public/shared_imports.ts |   1 +
 18 files changed, 482 insertions(+), 117 deletions(-)
 create mode 100644 src/plugins/es_ui_shared/static/forms/hook_form_lib/form_data_context.tsx
 create mode 100644 src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.test.tsx
 create mode 100644 src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.ts

diff --git a/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx b/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx
index 9fb804eb7fafac..b2f1a70341315f 100644
--- a/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx
+++ b/src/plugins/es_ui_shared/static/forms/components/fields/combobox_field.tsx
@@ -74,7 +74,7 @@ export const ComboBoxField = ({ field, euiFieldProps = {}, ...rest }: Props) =>
   };
 
   const onSearchComboChange = (value: string) => {
-    if (value) {
+    if (value !== undefined) {
       field.clearErrors(VALIDATION_TYPES.ARRAY_ITEM);
     }
   };
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form.tsx
index b3a15fea8b187e..287ac562434460 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/form.tsx
@@ -21,6 +21,7 @@ import React, { ReactNode } from 'react';
 import { EuiForm } from '@elastic/eui';
 
 import { FormProvider } from '../form_context';
+import { FormDataContextProvider } from '../form_data_context';
 import { FormHook } from '../types';
 
 interface Props {
@@ -30,8 +31,14 @@ interface Props {
   [key: string]: any;
 }
 
-export const Form = ({ form, FormWrapper = EuiForm, ...rest }: Props) => (
-  <FormProvider form={form}>
-    <FormWrapper {...rest} />
-  </FormProvider>
-);
+export const Form = ({ form, FormWrapper = EuiForm, ...rest }: Props) => {
+  const { getFormData, __getFormData$ } = form;
+
+  return (
+    <FormDataContextProvider getFormData={getFormData} getFormData$={__getFormData$}>
+      <FormProvider form={form}>
+        <FormWrapper {...rest} />
+      </FormProvider>
+    </FormDataContextProvider>
+  );
+};
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 25448dff18e8ac..d9095944eaa335 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
@@ -75,16 +75,7 @@ describe('<FormDataProvider />', () => {
       setInputValue('lastNameField', 'updated value');
     });
 
-    /**
-     * The children will be rendered three times:
-     * - Twice for each input value that has changed
-     * - once because after updating both fields, the **form** isValid state changes (from "undefined" to "true")
-     *   causing a new "form" object to be returned and thus a re-render.
-     *
-     * When the form object will be memoized (in a future PR), te bellow call count should only be 2 as listening
-     * to form data changes should not receive updates when the "isValid" state of the form changes.
-     */
-    expect(onFormData.mock.calls.length).toBe(3);
+    expect(onFormData).toBeCalledTimes(2);
 
     const [formDataUpdated] = onFormData.mock.calls[onFormData.mock.calls.length - 1] as Parameters<
       OnUpdateHandler
@@ -130,7 +121,7 @@ describe('<FormDataProvider />', () => {
       find,
     } = setup() as TestBed;
 
-    expect(onFormData.mock.calls.length).toBe(0); // Not present in the DOM yet
+    expect(onFormData).toBeCalledTimes(0); // Not present in the DOM yet
 
     // Make some changes to the form fields
     await act(async () => {
@@ -188,7 +179,7 @@ describe('<FormDataProvider />', () => {
       setInputValue('lastNameField', 'updated value');
     });
 
-    expect(onFormData.mock.calls.length).toBe(0);
+    expect(onFormData).toBeCalledTimes(0);
   });
 
   test('props.pathsToWatch (Array<string>): should not re-render the children when the field that changed is not in the watch list', async () => {
@@ -228,14 +219,14 @@ describe('<FormDataProvider />', () => {
     });
 
     // No re-render
-    expect(onFormData.mock.calls.length).toBe(0);
+    expect(onFormData).toBeCalledTimes(0);
 
     // Make some changes to fields in the watch list
     await act(async () => {
       setInputValue('nameField', 'updated value');
     });
 
-    expect(onFormData.mock.calls.length).toBe(1);
+    expect(onFormData).toBeCalledTimes(1);
 
     onFormData.mockReset();
 
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 3630b902f05649..ac141baf8fc719 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
@@ -17,10 +17,10 @@
  * under the License.
  */
 
-import React, { useState, useEffect, useRef, useCallback } from 'react';
+import React from 'react';
 
 import { FormData } from '../types';
-import { useFormContext } from '../form_context';
+import { useFormData } from '../hooks';
 
 interface Props {
   children: (formData: FormData) => JSX.Element | null;
@@ -28,46 +28,9 @@ interface Props {
 }
 
 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 { 0: formData, 2: isReady } = useFormData({ watch: pathsToWatch });
 
-  const onFormData = useCallback(
-    ({ data: { raw } }) => {
-      // To avoid re-rendering the children for updates on the form data
-      // that we are **not** interested in, we can specify one or multiple path(s)
-      // to watch.
-      if (pathsToWatch) {
-        const valuesToWatchArray = Array.isArray(pathsToWatch)
-          ? (pathsToWatch as string[])
-          : ([pathsToWatch] as string[]);
-
-        if (valuesToWatchArray.some((value) => previousRawData.current[value] !== raw[value])) {
-          previousRawData.current = raw;
-          setFormData(raw);
-        }
-      } else {
-        setFormData(raw);
-      }
-    },
-    [pathsToWatch]
-  );
-
-  useEffect(() => {
-    const subscription = subscribe(onFormData);
-    return subscription.unsubscribe;
-  }, [subscribe, onFormData]);
-
-  useEffect(() => {
-    isMounted.current = true;
-    return () => {
-      isMounted.current = false;
-    };
-  }, []);
-
-  if (!isMounted.current && Object.keys(formData).length === 0) {
+  if (!isReady) {
     // No field has mounted yet, don't render anything
     return null;
   }
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/form_data_context.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/form_data_context.tsx
new file mode 100644
index 00000000000000..0e6a75e9c5065a
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/form_data_context.tsx
@@ -0,0 +1,50 @@
+/*
+ * 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, { createContext, useContext, useMemo } from 'react';
+
+import { FormData, FormHook } from './types';
+import { Subject } from './lib';
+
+export interface Context<T extends FormData = FormData> {
+  getFormData$: () => Subject<FormData>;
+  getFormData: FormHook<T>['getFormData'];
+}
+
+const FormDataContext = createContext<Context<any> | undefined>(undefined);
+
+interface Props extends Context {
+  children: React.ReactNode;
+}
+
+export const FormDataContextProvider = ({ children, getFormData$, getFormData }: Props) => {
+  const value = useMemo<Context>(
+    () => ({
+      getFormData,
+      getFormData$,
+    }),
+    [getFormData, getFormData$]
+  );
+
+  return <FormDataContext.Provider value={value}>{children}</FormDataContext.Provider>;
+};
+
+export function useFormDataContext<T extends FormData = FormData>() {
+  return useContext<Context<T> | undefined>(FormDataContext);
+}
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/index.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/index.ts
index 6a04a592227f95..45c11dd6272e4b 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/index.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/index.ts
@@ -19,3 +19,4 @@
 
 export { useField } from './use_field';
 export { useForm } from './use_form';
+export { useFormData } from './use_form_data';
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 9d22e4eb2ee5e5..fa29f900af2ef5 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
@@ -254,6 +254,8 @@ export const useField = <T>(
 
           validationErrors.push({
             ...validationResult,
+            // See comment below that explains why we add "__isBlocking__".
+            __isBlocking__: validationResult.__isBlocking__ ?? validation.isBlocking,
             validationType: validationType || VALIDATION_TYPES.FIELD,
           });
 
@@ -306,6 +308,11 @@ export const useField = <T>(
 
           validationErrors.push({
             ...(validationResult as ValidationError),
+            // We add an "__isBlocking__" property to know if this error is a blocker or no.
+            // Most validation errors are blockers but in some cases a validation is more a warning than an error
+            // like with the ComboBox items when they are added.
+            __isBlocking__:
+              (validationResult as ValidationError).__isBlocking__ ?? validation.isBlocking,
             validationType: validationType || VALIDATION_TYPES.FIELD,
           });
 
@@ -394,7 +401,13 @@ export const useField = <T>(
   );
 
   const _setErrors: FieldHook<T>['setErrors'] = useCallback((_errors) => {
-    setErrors(_errors.map((error) => ({ validationType: VALIDATION_TYPES.FIELD, ...error })));
+    setErrors(
+      _errors.map((error) => ({
+        validationType: VALIDATION_TYPES.FIELD,
+        __isBlocking__: true,
+        ...error,
+      }))
+    );
   }, []);
 
   /**
@@ -463,7 +476,8 @@ export const useField = <T>(
     [setValue, deserializeValue, defaultValue]
   );
 
-  const isValid = errors.length === 0;
+  // Don't take into account non blocker validation. Some are just warning (like trying to add a wrong ComboBox item)
+  const isValid = errors.filter((e) => e.__isBlocking__ !== false).length === 0;
 
   const field = useMemo<FieldHook<T>>(() => {
     return {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
index 007e492243baca..4a880415b6d228 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
@@ -39,7 +39,7 @@ const onFormHook = (_form: FormHook<any>) => {
   formHook = _form;
 };
 
-describe('use_form() hook', () => {
+describe('useForm() hook', () => {
   beforeEach(() => {
     formHook = null;
   });
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 35bac5b9a58c65..7b72a9eeacf7b1 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
@@ -240,6 +240,12 @@ export function useForm<T extends FormData = FormData>(
 
       if (!field.isValidated) {
         setIsValid(undefined);
+
+        // When we submit the form (and set "isSubmitted" to "true"), we validate **all fields**.
+        // If a field is added and it is not validated it means that we have swapped fields and added new ones:
+        // --> we have basically have a new form in front of us.
+        // For that reason we make sure that the "isSubmitted" state is false.
+        setIsSubmitted(false);
       }
     },
     [updateFormDataAt]
@@ -389,6 +395,7 @@ export function useForm<T extends FormData = FormData>(
       isValid,
       id,
       submit: submitForm,
+      validate: validateAllFields,
       subscribe,
       setFieldValue,
       setFieldErrors,
@@ -428,6 +435,7 @@ export function useForm<T extends FormData = FormData>(
     addField,
     removeField,
     validateFields,
+    validateAllFields,
   ]);
 
   useEffect(() => {
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.test.tsx
new file mode 100644
index 00000000000000..0fb65daecf2f4f
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.test.tsx
@@ -0,0 +1,234 @@
+/*
+ * 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, { useEffect } from 'react';
+import { act } from 'react-dom/test-utils';
+
+import { registerTestBed, TestBed } from '../shared_imports';
+import { Form, UseField } from '../components';
+import { useForm } from './use_form';
+import { useFormData, HookReturn } from './use_form_data';
+
+interface Props {
+  onChange(data: HookReturn): void;
+  watch?: string | string[];
+}
+
+describe('useFormData() hook', () => {
+  const HookListenerComp = React.memo(({ onChange, watch }: Props) => {
+    const hookValue = useFormData({ watch });
+
+    useEffect(() => {
+      onChange(hookValue);
+    }, [hookValue, onChange]);
+
+    return null;
+  });
+
+  describe('form data updates', () => {
+    let testBed: TestBed;
+    let onChangeSpy: jest.Mock;
+
+    const getLastMockValue = () => {
+      return onChangeSpy.mock.calls[onChangeSpy.mock.calls.length - 1][0] as HookReturn;
+    };
+
+    const TestComp = (props: Props) => {
+      const { form } = useForm();
+
+      return (
+        <Form form={form}>
+          <UseField path="title" defaultValue="titleInitialValue" data-test-subj="titleField" />
+          <HookListenerComp {...props} />
+        </Form>
+      );
+    };
+
+    const setup = registerTestBed(TestComp, {
+      memoryRouter: { wrapComponent: false },
+    });
+
+    beforeEach(() => {
+      onChangeSpy = jest.fn();
+      testBed = setup({ onChange: onChangeSpy }) as TestBed;
+    });
+
+    test('should return the form data', () => {
+      // Called twice:
+      // once when the hook is called and once when the fields have mounted and updated the form data
+      expect(onChangeSpy).toBeCalledTimes(2);
+      const [data] = getLastMockValue();
+      expect(data).toEqual({ title: 'titleInitialValue' });
+    });
+
+    test('should listen to field changes', async () => {
+      const {
+        form: { setInputValue },
+      } = testBed;
+
+      await act(async () => {
+        setInputValue('titleField', 'titleChanged');
+      });
+
+      expect(onChangeSpy).toBeCalledTimes(3);
+      const [data] = getLastMockValue();
+      expect(data).toEqual({ title: 'titleChanged' });
+    });
+  });
+
+  describe('format form data', () => {
+    let onChangeSpy: jest.Mock;
+
+    const getLastMockValue = () => {
+      return onChangeSpy.mock.calls[onChangeSpy.mock.calls.length - 1][0] as HookReturn;
+    };
+
+    const TestComp = (props: Props) => {
+      const { form } = useForm();
+
+      return (
+        <Form form={form}>
+          <UseField path="user.firstName" defaultValue="John" />
+          <UseField path="user.lastName" defaultValue="Snow" />
+          <HookListenerComp {...props} />
+        </Form>
+      );
+    };
+
+    const setup = registerTestBed(TestComp, {
+      memoryRouter: { wrapComponent: false },
+    });
+
+    beforeEach(() => {
+      onChangeSpy = jest.fn();
+      setup({ onChange: onChangeSpy });
+    });
+
+    test('should expose a handler to build the form data', () => {
+      const { 1: format } = getLastMockValue();
+      expect(format()).toEqual({
+        user: {
+          firstName: 'John',
+          lastName: 'Snow',
+        },
+      });
+    });
+  });
+
+  describe('options', () => {
+    describe('watch', () => {
+      let testBed: TestBed;
+      let onChangeSpy: jest.Mock;
+
+      const getLastMockValue = () => {
+        return onChangeSpy.mock.calls[onChangeSpy.mock.calls.length - 1][0] as HookReturn;
+      };
+
+      const TestComp = (props: Props) => {
+        const { form } = useForm();
+
+        return (
+          <Form form={form}>
+            <UseField path="title" defaultValue="titleInitialValue" data-test-subj="titleField" />
+            <HookListenerComp {...props} />
+            <UseField
+              path="subTitle"
+              defaultValue="subTitleInitialValue"
+              data-test-subj="subTitleField"
+            />
+          </Form>
+        );
+      };
+
+      const setup = registerTestBed(TestComp, {
+        memoryRouter: { wrapComponent: false },
+      });
+
+      beforeEach(() => {
+        onChangeSpy = jest.fn();
+        testBed = setup({ watch: 'title', onChange: onChangeSpy }) as TestBed;
+      });
+
+      test('should not listen to changes on fields we are not interested in', async () => {
+        const {
+          form: { setInputValue },
+        } = testBed;
+
+        await act(async () => {
+          // Changing a field we are **not** interested in
+          setInputValue('subTitleField', 'subTitleChanged');
+          // Changing a field we **are** interested in
+          setInputValue('titleField', 'titleChanged');
+        });
+
+        const [data] = getLastMockValue();
+        expect(data).toEqual({ title: 'titleChanged', subTitle: 'subTitleInitialValue' });
+      });
+    });
+
+    describe('form', () => {
+      let testBed: TestBed;
+      let onChangeSpy: jest.Mock;
+
+      const getLastMockValue = () => {
+        return onChangeSpy.mock.calls[onChangeSpy.mock.calls.length - 1][0] as HookReturn;
+      };
+
+      const TestComp = ({ onChange }: Props) => {
+        const { form } = useForm();
+        const hookValue = useFormData({ form });
+
+        useEffect(() => {
+          onChange(hookValue);
+        }, [hookValue, onChange]);
+
+        return (
+          <Form form={form}>
+            <UseField path="title" defaultValue="titleInitialValue" data-test-subj="titleField" />
+          </Form>
+        );
+      };
+
+      const setup = registerTestBed(TestComp, {
+        memoryRouter: { wrapComponent: false },
+      });
+
+      beforeEach(() => {
+        onChangeSpy = jest.fn();
+        testBed = setup({ onChange: onChangeSpy }) as TestBed;
+      });
+
+      test('should allow a form to be provided when the hook is called outside of the FormDataContext', async () => {
+        const {
+          form: { setInputValue },
+        } = testBed;
+
+        const [initialData] = getLastMockValue();
+        expect(initialData).toEqual({ title: 'titleInitialValue' });
+
+        await act(async () => {
+          setInputValue('titleField', 'titleChanged');
+        });
+
+        const [updatedData] = getLastMockValue();
+        expect(updatedData).toEqual({ title: 'titleChanged' });
+      });
+    });
+  });
+});
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.ts
new file mode 100644
index 00000000000000..fb4a0984438ad4
--- /dev/null
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form_data.ts
@@ -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 { useState, useEffect, useRef, useCallback } from 'react';
+
+import { FormData, FormHook } from '../types';
+import { useFormDataContext, Context } from '../form_data_context';
+
+interface Options {
+  watch?: string | string[];
+  form?: FormHook<any>;
+}
+
+export type HookReturn<T extends object = FormData> = [FormData, () => T, boolean];
+
+export const useFormData = <T extends object = FormData>(options: Options = {}): HookReturn<T> => {
+  const { watch, form } = options;
+  const ctx = useFormDataContext<T>();
+
+  let getFormData: Context<T>['getFormData'];
+  let getFormData$: Context<T>['getFormData$'];
+
+  if (form !== undefined) {
+    getFormData = form.getFormData;
+    getFormData$ = form.__getFormData$;
+  } else if (ctx !== undefined) {
+    ({ getFormData, getFormData$ } = ctx);
+  } else {
+    throw new Error(
+      'useFormData() must be used within a <FormDataContextProvider /> or you need to pass FormHook object in the options.'
+    );
+  }
+
+  const initialValue = getFormData$().value;
+
+  const previousRawData = useRef<FormData>(initialValue);
+  const isMounted = useRef(false);
+  const [formData, setFormData] = useState<FormData>(previousRawData.current);
+
+  const formatFormData = useCallback(() => {
+    return getFormData({ unflatten: true });
+  }, [getFormData]);
+
+  useEffect(() => {
+    const subscription = getFormData$().subscribe((raw) => {
+      if (watch) {
+        const valuesToWatchArray = Array.isArray(watch)
+          ? (watch as string[])
+          : ([watch] as string[]);
+
+        if (valuesToWatchArray.some((value) => previousRawData.current[value] !== raw[value])) {
+          previousRawData.current = raw;
+          // Only update the state if one of the field we watch has changed.
+          setFormData(raw);
+        }
+      } else {
+        setFormData(raw);
+      }
+    });
+    return subscription.unsubscribe;
+  }, [getFormData$, watch]);
+
+  useEffect(() => {
+    isMounted.current = true;
+    return () => {
+      isMounted.current = false;
+    };
+  }, []);
+
+  if (!isMounted.current && Object.keys(formData).length === 0) {
+    // No field has mounted yet
+    return [formData, formatFormData, false];
+  }
+
+  return [formData, formatFormData, true];
+};
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/index.ts b/src/plugins/es_ui_shared/static/forms/hook_form_lib/index.ts
index 3079814c9ad14b..8d6b57fbeb3155 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/index.ts
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/index.ts
@@ -19,7 +19,7 @@
 
 // Only export the useForm hook. The "useField" hook is for internal use
 // as the consumer of the library must use the <UseField /> component
-export { useForm } from './hooks';
+export { useForm, useFormData } from './hooks';
 export { getFieldValidityAndErrorMessage } from './helpers';
 
 export * from './form_context';
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 dc495f6eb56b4e..4b343ec5e9f2e1 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
@@ -30,6 +30,7 @@ export interface FormHook<T extends FormData = FormData> {
   readonly isValid: boolean | undefined;
   readonly id: string;
   submit: (e?: FormEvent<HTMLFormElement> | MouseEvent) => Promise<{ data: T; isValid: boolean }>;
+  validate: () => Promise<boolean>;
   subscribe: (handler: OnUpdateHandler<T>) => Subscription;
   setFieldValue: (fieldName: string, value: FieldValue) => void;
   setFieldErrors: (fieldName: string, errors: ValidationError[]) => void;
@@ -147,6 +148,7 @@ export interface ValidationError<T = string> {
   message: string;
   code?: T;
   validationType?: string;
+  __isBlocking__?: boolean;
   [key: string]: any;
 }
 
@@ -185,5 +187,11 @@ type FieldValue = unknown;
 export interface ValidationConfig<T extends FormData = any> {
   validator: ValidationFunc<T>;
   type?: string;
+  /**
+   * By default all validation are blockers, which means that if they fail, the field is invalid.
+   * In some cases, like when trying to add an item to the ComboBox, if the item is not valid we want
+   * to show a validation error. But this validation is **not** blocking. Simply, the item has not been added.
+   */
+  isBlocking?: boolean;
   exitOnFail?: boolean;
 }
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 6b5a848ce85d32..95575124b6abdd 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 === false && (
+        {form.isSubmitted && !form.isValid && (
           <>
             <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 === false}
+              disabled={form.isSubmitted && !form.isValid}
               data-test-subj="editFieldUpdateButton"
             >
               {i18n.translate('xpack.idxMgmt.mappingsEditor.editFieldUpdateButtonLabel', {
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/steps/step_logistics.tsx b/x-pack/plugins/index_management/public/application/components/template_form/steps/step_logistics.tsx
index fcc9795617ebb6..56f040fc59a7b1 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/steps/step_logistics.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/steps/step_logistics.tsx
@@ -17,13 +17,13 @@ import { i18n } from '@kbn/i18n';
 
 import {
   useForm,
+  useFormData,
   Form,
   getUseField,
   getFormRow,
   Field,
   Forms,
   JsonEditorField,
-  FormDataProvider,
 } from '../../../../shared_imports';
 import { documentationService } from '../../../services/documentation';
 import { schemas, nameConfig, nameConfigWithoutValidations } from '../template_form_schemas';
@@ -118,9 +118,7 @@ interface LogisticsForm {
 }
 
 interface LogisticsFormInternal extends LogisticsForm {
-  __internal__: {
-    addMeta: boolean;
-  };
+  addMeta: boolean;
 }
 
 interface Props {
@@ -133,14 +131,12 @@ interface Props {
 function formDeserializer(formData: LogisticsForm): LogisticsFormInternal {
   return {
     ...formData,
-    __internal__: {
-      addMeta: Boolean(formData._meta && Object.keys(formData._meta).length),
-    },
+    addMeta: Boolean(formData._meta && Object.keys(formData._meta).length),
   };
 }
 
 function formSerializer(formData: LogisticsFormInternal): LogisticsForm {
-  const { __internal__, ...rest } = formData;
+  const { addMeta, ...rest } = formData;
   return rest;
 }
 
@@ -153,7 +149,18 @@ export const StepLogistics: React.FunctionComponent<Props> = React.memo(
       serializer: formSerializer,
       deserializer: formDeserializer,
     });
-    const { subscribe, submit, isSubmitted, isValid: isFormValid, getErrors: getFormErrors } = form;
+    const {
+      submit,
+      isSubmitted,
+      isValid: isFormValid,
+      getErrors: getFormErrors,
+      getFormData,
+    } = form;
+
+    const [{ addMeta }] = useFormData({
+      form,
+      watch: 'addMeta',
+    });
 
     /**
      * When the consumer call validate() on this step, we submit the form so it enters the "isSubmitted" state
@@ -164,15 +171,12 @@ export const StepLogistics: React.FunctionComponent<Props> = React.memo(
     }, [submit]);
 
     useEffect(() => {
-      const subscription = subscribe(({ data, isValid }) => {
-        onChange({
-          isValid,
-          validate,
-          getData: data.format,
-        });
+      onChange({
+        isValid: isFormValid,
+        getData: getFormData,
+        validate,
       });
-      return subscription.unsubscribe;
-    }, [onChange, validate, subscribe]);
+    }, [onChange, isFormValid, validate, getFormData]);
 
     const { name, indexPatterns, dataStream, order, priority, version } = getFieldsMeta(
       documentationService.getEsDocsBase()
@@ -296,34 +300,28 @@ export const StepLogistics: React.FunctionComponent<Props> = React.memo(
                     defaultMessage="Use the _meta field to store any metadata you want."
                   />
                   <EuiSpacer size="m" />
-                  <UseField path="__internal__.addMeta" data-test-subj="metaToggle" />
+                  <UseField path="addMeta" data-test-subj="metaToggle" />
                 </>
               }
             >
-              <FormDataProvider pathsToWatch="__internal__.addMeta">
-                {({ '__internal__.addMeta': addMeta }) => {
-                  return (
-                    addMeta && (
-                      <UseField
-                        path="_meta"
-                        component={JsonEditorField}
-                        componentProps={{
-                          euiCodeEditorProps: {
-                            height: '280px',
-                            'aria-label': i18n.translate(
-                              'xpack.idxMgmt.templateForm.stepLogistics.metaFieldEditorAriaLabel',
-                              {
-                                defaultMessage: '_meta field data editor',
-                              }
-                            ),
-                            'data-test-subj': 'metaField',
-                          },
-                        }}
-                      />
-                    )
-                  );
-                }}
-              </FormDataProvider>
+              {addMeta && (
+                <UseField
+                  path="_meta"
+                  component={JsonEditorField}
+                  componentProps={{
+                    euiCodeEditorProps: {
+                      height: '280px',
+                      'aria-label': i18n.translate(
+                        'xpack.idxMgmt.templateForm.stepLogistics.metaFieldEditorAriaLabel',
+                        {
+                          defaultMessage: '_meta field data editor',
+                        }
+                      ),
+                      'data-test-subj': 'metaField',
+                    },
+                  }}
+                />
+              )}
             </FormRow>
           )}
         </Form>
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 537f4211733588..3a03835e859701 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
@@ -192,8 +192,8 @@ export const TemplateForm = ({
       wizardData: WizardContent
     ): TemplateDeserialized => {
       const outputTemplate = {
-        ...initialTemplate,
         ...wizardData.logistics,
+        _kbnMeta: initialTemplate._kbnMeta,
         composedOf: wizardData.components,
         template: {
           settings: wizardData.settings,
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx b/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx
index 0d9ce57a64c843..c85126f08685e0 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/template_form_schemas.tsx
@@ -125,6 +125,7 @@ export const schemas: Record<string, FormSchema> = {
         {
           validator: indexPatternField(i18n),
           type: VALIDATION_TYPES.ARRAY_ITEM,
+          isBlocking: false,
         },
       ],
     },
@@ -213,13 +214,11 @@ export const schemas: Record<string, FormSchema> = {
         }
       },
     },
-    __internal__: {
-      addMeta: {
-        type: FIELD_TYPES.TOGGLE,
-        label: i18n.translate('xpack.idxMgmt.templateForm.stepLogistics.addMetadataLabel', {
-          defaultMessage: 'Add metadata',
-        }),
-      },
+    addMeta: {
+      type: FIELD_TYPES.TOGGLE,
+      label: i18n.translate('xpack.idxMgmt.templateForm.stepLogistics.addMetadataLabel', {
+        defaultMessage: 'Add metadata',
+      }),
     },
   },
 };
diff --git a/x-pack/plugins/index_management/public/shared_imports.ts b/x-pack/plugins/index_management/public/shared_imports.ts
index 2ba2a5c493c493..f7f992a090501f 100644
--- a/x-pack/plugins/index_management/public/shared_imports.ts
+++ b/x-pack/plugins/index_management/public/shared_imports.ts
@@ -21,6 +21,7 @@ export {
   VALIDATION_TYPES,
   FieldConfig,
   useForm,
+  useFormData,
   Form,
   getUseField,
   UseField,

From 4bd9ccec02d9a9723d541c40c6286fee6142d02a Mon Sep 17 00:00:00 2001
From: Corey Robertson <corey.robertson@elastic.co>
Date: Tue, 1 Sep 2020 09:34:01 -0400
Subject: [PATCH 145/216] [Canvas][tech-debt] Renderer stories (#74373)

* Add stories for renderers

* Fix Typecheck

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../canvas_plugin_src/functions/common/pie.ts |  6 +-
 .../__snapshots__/image.stories.storyshot     | 14 ++++
 .../repeat_image.stories.storyshot            | 14 ++++
 .../__snapshots__/table.stories.storyshot     | 14 ++++
 .../renderers/__stories__/image.stories.tsx   | 20 +++++
 .../renderers/__stories__/render.tsx          | 65 +++++++++++++++++
 .../__stories__/repeat_image.stories.tsx      | 23 ++++++
 .../renderers/__stories__/table.stories.tsx   | 45 ++++++++++++
 .../__snapshots__/error.stories.storyshot     | 14 ++++
 .../error/__stories__/error.stories.tsx       | 17 +++++
 .../__snapshots__/markdown.stories.storyshot  | 27 +++++++
 .../markdown/__stories__/markdown.stories.tsx | 35 +++++++++
 .../__snapshots__/pie.stories.storyshot       | 27 +++++++
 .../renderers/pie/__stories__/pie.stories.tsx | 73 +++++++++++++++++++
 .../__snapshots__/plot.stories.storyshot      | 14 ++++
 .../plot/__stories__/plot.stories.tsx         | 68 +++++++++++++++++
 .../__snapshots__/progress.stories.storyshot  | 14 ++++
 .../progress/__stories__/progress.stories.tsx | 30 ++++++++
 .../reveal_image.stories.storyshot            | 14 ++++
 .../__stories__/reveal_image.stories.tsx      | 23 ++++++
 .../__snapshots__/shape.stories.storyshot     | 14 ++++
 .../shape/__stories__/shape.stories.tsx       | 23 ++++++
 22 files changed, 591 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/image.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/repeat_image.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/table.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/image.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/render.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/repeat_image.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/table.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/__snapshots__/error.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/error.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/__snapshots__/markdown.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/__snapshots__/pie.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/__snapshots__/plot.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/__snapshots__/progress.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/progress.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/__snapshots__/reveal_image.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/reveal_image.stories.tsx
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/__snapshots__/shape.stories.storyshot
 create mode 100644 x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/shape.stories.tsx

diff --git a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
index 16eee349475ef6..11551c50d9f257 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
+++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts
@@ -39,9 +39,9 @@ interface PieOptions {
   colors: string[];
   legend: {
     show: boolean;
-    backgroundOpacity: number;
-    labelBoxBorderColor: string;
-    position: Legend;
+    backgroundOpacity?: number;
+    labelBoxBorderColor?: string;
+    position?: Legend;
   };
   grid: {
     show: boolean;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/image.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/image.stories.storyshot
new file mode 100644
index 00000000000000..b9bc21dd6e3ea1
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/image.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/image default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "400px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/repeat_image.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/repeat_image.stories.storyshot
new file mode 100644
index 00000000000000..9b97ae1fdacb32
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/repeat_image.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/repeatImage default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "400px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/table.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/table.stories.storyshot
new file mode 100644
index 00000000000000..cf9cc6dd82f7f8
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/__snapshots__/table.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/table default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "400px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/image.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/image.stories.tsx
new file mode 100644
index 00000000000000..bcd83650344480
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/image.stories.tsx
@@ -0,0 +1,20 @@
+/*
+ * 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 { storiesOf } from '@storybook/react';
+import { image } from '../image';
+import { Render } from './render';
+import { elasticLogo } from '../../lib/elastic_logo';
+
+storiesOf('renderers/image', module).add('default', () => {
+  const config = {
+    type: 'image' as 'image',
+    mode: 'cover',
+    dataurl: elasticLogo,
+  };
+
+  return <Render renderer={image} config={config} width="400px" />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/render.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/render.tsx
new file mode 100644
index 00000000000000..647c63c2c10427
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/render.tsx
@@ -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 { action } from '@storybook/addon-actions';
+import React, { useRef, useEffect } from 'react';
+import { RendererFactory, RendererHandlers } from '../../../types';
+
+export const defaultHandlers: RendererHandlers = {
+  destroy: () => action('destroy'),
+  getElementId: () => 'element-id',
+  getFilter: () => 'filter',
+  onComplete: (fn) => undefined,
+  onEmbeddableDestroyed: action('onEmbeddableDestroyed'),
+  onEmbeddableInputChange: action('onEmbeddableInputChange'),
+  onResize: action('onResize'),
+  resize: action('resize'),
+  setFilter: action('setFilter'),
+  done: action('done'),
+  onDestroy: action('onDestroy'),
+  reload: action('reload'),
+  update: action('update'),
+  event: action('event'),
+};
+
+/*
+  Uses a RenderDefinitionFactory and Config to render into an element.
+
+  Intended to be used for stories for RenderDefinitionFactory
+*/
+interface RenderAdditionalProps {
+  height?: string;
+  width?: string;
+  handlers?: RendererHandlers;
+}
+
+export const Render = <Renderer,>({
+  renderer,
+  config,
+  ...rest
+}: Renderer extends RendererFactory<infer Config>
+  ? { renderer: Renderer; config: Config } & RenderAdditionalProps
+  : { renderer: undefined; config: undefined } & RenderAdditionalProps) => {
+  const { height, width, handlers } = {
+    height: '200px',
+    width: '200px',
+    handlers: defaultHandlers,
+    ...rest,
+  };
+
+  const containerRef = useRef<HTMLDivElement | null>(null);
+
+  useEffect(() => {
+    if (renderer && containerRef.current !== null) {
+      renderer().render(containerRef.current, config, handlers);
+    }
+  }, [renderer, config, handlers]);
+
+  return (
+    <div style={{ width, height }} ref={containerRef}>
+      {' '}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/repeat_image.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/repeat_image.stories.tsx
new file mode 100644
index 00000000000000..41ccc054a77fbd
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/repeat_image.stories.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 { storiesOf } from '@storybook/react';
+import { repeatImage } from '../repeat_image';
+import { Render } from './render';
+import { elasticLogo } from '../../lib/elastic_logo';
+import { elasticOutline } from '../../lib/elastic_outline';
+
+storiesOf('renderers/repeatImage', module).add('default', () => {
+  const config = {
+    count: 42,
+    image: elasticLogo,
+    size: 20,
+    max: 60,
+    emptyImage: elasticOutline,
+  };
+
+  return <Render renderer={repeatImage} config={config} width="400px" />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/table.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/table.stories.tsx
new file mode 100644
index 00000000000000..f3c70cb30de454
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/__stories__/table.stories.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 React from 'react';
+import { storiesOf } from '@storybook/react';
+import { table } from '../table';
+import { Render } from './render';
+
+storiesOf('renderers/table', module).add('default', () => {
+  const config = {
+    paginate: true,
+    perPage: 5,
+    showHeader: true,
+    datatable: {
+      type: 'datatable' as 'datatable',
+      columns: [
+        {
+          name: 'Foo',
+          type: 'string' as 'string',
+          id: 'id-foo',
+          meta: { type: 'string' as 'string' },
+        },
+        {
+          name: 'Bar',
+          type: 'number' as 'number',
+          id: 'id-bar',
+          meta: { type: 'string' as 'string' },
+        },
+      ],
+      rows: [
+        { Foo: 'a', Bar: 700 },
+        { Foo: 'b', Bar: 600 },
+        { Foo: 'c', Bar: 500 },
+        { Foo: 'd', Bar: 400 },
+        { Foo: 'e', Bar: 300 },
+        { Foo: 'f', Bar: 200 },
+        { Foo: 'g', Bar: 100 },
+      ],
+    },
+  };
+
+  return <Render renderer={table} config={config} width="400px" />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/__snapshots__/error.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/__snapshots__/error.stories.storyshot
new file mode 100644
index 00000000000000..b7039ee1847c74
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/__snapshots__/error.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/error default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/error.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/error.stories.tsx
new file mode 100644
index 00000000000000..c71999bc04bb1c
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/__stories__/error.stories.tsx
@@ -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 React from 'react';
+import { storiesOf } from '@storybook/react';
+import { error } from '../';
+import { Render } from '../../__stories__/render';
+
+storiesOf('renderers/error', module).add('default', () => {
+  const thrownError = new Error('There was an error');
+  const config = {
+    error: thrownError,
+  };
+  return <Render renderer={error} config={config} />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/__snapshots__/markdown.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/__snapshots__/markdown.stories.storyshot
new file mode 100644
index 00000000000000..79f447c953d6d1
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/__snapshots__/markdown.stories.storyshot
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/markdown default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
+
+exports[`Storyshots renderers/markdown links in new tab 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.tsx
new file mode 100644
index 00000000000000..d5b190c74a92fd
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/__stories__/markdown.stories.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 { storiesOf } from '@storybook/react';
+import { markdown } from '../';
+import { Render } from '../../__stories__/render';
+
+storiesOf('renderers/markdown', module)
+  .add('default', () => {
+    const config = {
+      content: '# This is Markdown',
+      font: {
+        css: '',
+        spec: {},
+        type: 'style' as 'style',
+      },
+      openLinksInNewTab: false,
+    };
+    return <Render renderer={markdown} config={config} />;
+  })
+  .add('links in new tab', () => {
+    const config = {
+      content: '[Elastic.co](https://elastic.co)',
+      font: {
+        css: '',
+        spec: {},
+        type: 'style' as 'style',
+      },
+      openLinksInNewTab: true,
+    };
+    return <Render renderer={markdown} config={config} />;
+  });
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/__snapshots__/pie.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/__snapshots__/pie.stories.storyshot
new file mode 100644
index 00000000000000..3260dbe8c83c27
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/__snapshots__/pie.stories.storyshot
@@ -0,0 +1,27 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/pie default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
+
+exports[`Storyshots renderers/pie with legend 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
new file mode 100644
index 00000000000000..dea2876de0ec8a
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/__stories__/pie.stories.tsx
@@ -0,0 +1,73 @@
+/*
+ * 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 { storiesOf } from '@storybook/react';
+import { pie } from '../';
+import { Render } from '../../__stories__/render';
+
+const pieOptions = {
+  canvas: false,
+  colors: ['#882E72', '#B178A6', '#D6C1DE'],
+  grid: { show: false },
+  legend: { show: false },
+  series: {
+    pie: {
+      show: true,
+      innerRadius: 0,
+      label: { show: true, radius: 1 },
+      radius: 'auto' as 'auto',
+      stroke: { width: 0 },
+      tilt: 1,
+    },
+  },
+};
+
+const data = [
+  {
+    data: [10],
+    label: 'A',
+  },
+  {
+    data: [10],
+    label: 'B',
+  },
+  {
+    data: [10],
+    label: 'C',
+  },
+];
+
+storiesOf('renderers/pie', module)
+  .add('default', () => {
+    const config = {
+      data,
+      options: pieOptions,
+      font: {
+        css: '',
+        spec: {},
+        type: 'style' as 'style',
+      },
+    };
+    return <Render renderer={pie} config={config} />;
+  })
+  .add('with legend', () => {
+    const options = {
+      ...pieOptions,
+      legend: { show: true },
+    };
+
+    const config = {
+      data,
+      options,
+      font: {
+        css: '',
+        spec: {},
+        type: 'style' as 'style',
+      },
+    };
+
+    return <Render renderer={pie} config={config} />;
+  });
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/__snapshots__/plot.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/__snapshots__/plot.stories.storyshot
new file mode 100644
index 00000000000000..7419d13fc7195b
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/__snapshots__/plot.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/plot default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
new file mode 100644
index 00000000000000..0e9566d2a5c20c
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/__stories__/plot.stories.tsx
@@ -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 React from 'react';
+import { storiesOf } from '@storybook/react';
+import { plot } from '../';
+import { Render } from '../../__stories__/render';
+
+const plotOptions = {
+  canvas: false,
+  colors: ['#882E72', '#B178A6', '#D6C1DE'],
+  grid: {
+    margin: {
+      bottom: 0,
+      left: 0,
+      right: 30,
+      top: 20,
+    },
+  },
+  legend: { show: true },
+  series: {
+    bubbles: {
+      show: true,
+      fill: false,
+    },
+  },
+  xaxis: {
+    show: true,
+    mode: 'time',
+  },
+  yaxis: {
+    show: true,
+  },
+};
+
+const data = [
+  {
+    bubbles: { show: true },
+    data: [
+      [1546351551031, 33, { size: 5 }],
+      [1546351551131, 38, { size: 2 }],
+    ],
+    label: 'done',
+  },
+  {
+    bubbles: { show: true },
+    data: [
+      [1546351551032, 37, { size: 4 }],
+      [1546351551139, 45, { size: 3 }],
+    ],
+    label: 'running',
+  },
+];
+
+storiesOf('renderers/plot', module).add('default', () => {
+  const config = {
+    data,
+    options: plotOptions,
+    font: {
+      css: '',
+      spec: {},
+      type: 'style' as 'style',
+    },
+  };
+  return <Render renderer={plot} config={config} />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/__snapshots__/progress.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/__snapshots__/progress.stories.storyshot
new file mode 100644
index 00000000000000..1fe884656ef3b4
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/__snapshots__/progress.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/progress default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/progress.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/progress.stories.tsx
new file mode 100644
index 00000000000000..3e20cfd4772a80
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/__stories__/progress.stories.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 from 'react';
+import { storiesOf } from '@storybook/react';
+import { progress } from '../';
+import { Render } from '../../__stories__/render';
+import { Shape } from '../../../functions/common/progress';
+
+storiesOf('renderers/progress', module).add('default', () => {
+  const config = {
+    barColor: '#bc1234',
+    barWeight: 20,
+    font: {
+      css: '',
+      spec: {},
+      type: 'style' as 'style',
+    },
+    label: '66%',
+    max: 1,
+    shape: Shape.UNICORN,
+    value: 0.66,
+    valueColor: '#000',
+    valueWeight: 15,
+  };
+
+  return <Render renderer={progress} config={config} />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/__snapshots__/reveal_image.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/__snapshots__/reveal_image.stories.storyshot
new file mode 100644
index 00000000000000..b9963565a09f58
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/__snapshots__/reveal_image.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/revealImage default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/reveal_image.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/reveal_image.stories.tsx
new file mode 100644
index 00000000000000..637f9a2bb6986e
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/__stories__/reveal_image.stories.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 { storiesOf } from '@storybook/react';
+import { revealImage } from '../';
+import { Render } from '../../__stories__/render';
+import { elasticOutline } from '../../../lib/elastic_outline';
+import { elasticLogo } from '../../../lib/elastic_logo';
+import { Origin } from '../../../functions/common/revealImage';
+
+storiesOf('renderers/revealImage', module).add('default', () => {
+  const config = {
+    image: elasticLogo,
+    emptyImage: elasticOutline,
+    origin: Origin.LEFT,
+    percent: 0.45,
+  };
+
+  return <Render renderer={revealImage} config={config} />;
+});
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/__snapshots__/shape.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/__snapshots__/shape.stories.storyshot
new file mode 100644
index 00000000000000..317c20021015af
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/__snapshots__/shape.stories.storyshot
@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Storyshots renderers/shape default 1`] = `
+<div
+  style={
+    Object {
+      "height": "200px",
+      "width": "200px",
+    }
+  }
+>
+   
+</div>
+`;
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/shape.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/shape.stories.tsx
new file mode 100644
index 00000000000000..19df14c08688f5
--- /dev/null
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/__stories__/shape.stories.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 { storiesOf } from '@storybook/react';
+import { shape } from '../';
+import { Render } from '../../__stories__/render';
+import { Shape } from '../../../functions/common/shape';
+
+storiesOf('renderers/shape', module).add('default', () => {
+  const config = {
+    type: 'shape' as 'shape',
+    border: '#FFEEDD',
+    borderWidth: 8,
+    shape: Shape.BOOKMARK,
+    fill: '#112233',
+    maintainAspect: true,
+  };
+
+  return <Render renderer={shape} config={config} />;
+});

From 2006ecaa32c78fdc8db82d4df81454396e4c1da2 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 1 Sep 2020 07:36:05 -0600
Subject: [PATCH 146/216] Add plugin status API (#75819)

---
 ...server.statusservicesetup.dependencies_.md |  13 +
 ...erver.statusservicesetup.derivedstatus_.md |  20 ++
 ...a-plugin-core-server.statusservicesetup.md |  63 ++++
 ...ugin-core-server.statusservicesetup.set.md |  28 ++
 rfcs/text/0010_service_status.md              |   2 +-
 src/core/server/legacy/legacy_service.ts      |   3 +
 src/core/server/plugins/plugin_context.ts     |   3 +
 .../server/plugins/plugins_system.test.ts     |  30 +-
 src/core/server/plugins/plugins_system.ts     |  21 +-
 src/core/server/plugins/types.ts              |   6 +
 src/core/server/server.api.md                 |  13 +-
 src/core/server/server.test.ts                |  30 +-
 src/core/server/server.ts                     |  13 +-
 .../server/status/get_summary_status.test.ts  |  44 ++-
 src/core/server/status/get_summary_status.ts  |  12 +-
 src/core/server/status/plugins_status.test.ts | 338 ++++++++++++++++++
 src/core/server/status/plugins_status.ts      |  98 +++++
 src/core/server/status/status_service.mock.ts |   8 +
 src/core/server/status/status_service.test.ts |  75 ++++
 src/core/server/status/status_service.ts      |  37 +-
 src/core/server/status/types.ts               |  91 ++++-
 21 files changed, 916 insertions(+), 32 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.statusservicesetup.dependencies_.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.statusservicesetup.derivedstatus_.md
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md
 create mode 100644 src/core/server/status/plugins_status.test.ts
 create mode 100644 src/core/server/status/plugins_status.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.dependencies_.md b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.dependencies_.md
new file mode 100644
index 00000000000000..7475f0e3a4c1c3
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.dependencies_.md
@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [StatusServiceSetup](./kibana-plugin-core-server.statusservicesetup.md) &gt; [dependencies$](./kibana-plugin-core-server.statusservicesetup.dependencies_.md)
+
+## StatusServiceSetup.dependencies$ property
+
+Current status for all plugins this plugin depends on. Each key of the `Record` is a plugin id.
+
+<b>Signature:</b>
+
+```typescript
+dependencies$: Observable<Record<string, ServiceStatus>>;
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.derivedstatus_.md b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.derivedstatus_.md
new file mode 100644
index 00000000000000..6c65e44270a063
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.derivedstatus_.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; [derivedStatus$](./kibana-plugin-core-server.statusservicesetup.derivedstatus_.md)
+
+## StatusServiceSetup.derivedStatus$ property
+
+The status of this plugin as derived from its dependencies.
+
+<b>Signature:</b>
+
+```typescript
+derivedStatus$: Observable<ServiceStatus>;
+```
+
+## Remarks
+
+By default, plugins inherit this derived status from their dependencies. Calling  overrides this default status.
+
+This may emit multliple times for a single status change event as propagates through the dependency tree
+
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 3d3b73ccda25f8..ba0645be4d26c7 100644
--- a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.md
@@ -12,10 +12,73 @@ API for accessing status of Core and this plugin's dependencies as well as for c
 export interface StatusServiceSetup 
 ```
 
+## Remarks
+
+By default, a plugin inherits it's current status from the most severe status level of any Core services and any plugins that it depends on. This default status is available on the  API.
+
+Plugins may customize their status calculation by calling the  API with an Observable. Within this Observable, a plugin may choose to only depend on the status of some of its dependencies, to ignore severe status levels of particular Core services they are not concerned with, or to make its status dependent on other external services.
+
+## Example 1
+
+Customize a plugin's status to only depend on the status of SavedObjects:
+
+```ts
+core.status.set(
+  core.status.core$.pipe(
+.   map((coreStatus) => {
+      return coreStatus.savedObjects;
+    }) ;
+  );
+);
+
+```
+
+## Example 2
+
+Customize a plugin's status to include an external service:
+
+```ts
+const externalStatus$ = interval(1000).pipe(
+  switchMap(async () => {
+    const resp = await fetch(`https://myexternaldep.com/_healthz`);
+    const body = await resp.json();
+    if (body.ok) {
+      return of({ level: ServiceStatusLevels.available, summary: 'External Service is up'});
+    } else {
+      return of({ level: ServiceStatusLevels.available, summary: 'External Service is unavailable'});
+    }
+  }),
+  catchError((error) => {
+    of({ level: ServiceStatusLevels.unavailable, summary: `External Service is down`, meta: { error }})
+  })
+);
+
+core.status.set(
+  combineLatest([core.status.derivedStatus$, externalStatus$]).pipe(
+    map(([derivedStatus, externalStatus]) => {
+      if (externalStatus.level > derivedStatus) {
+        return externalStatus;
+      } else {
+        return derivedStatus;
+      }
+    })
+  )
+);
+
+```
+
 ## Properties
 
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [core$](./kibana-plugin-core-server.statusservicesetup.core_.md) | <code>Observable&lt;CoreStatus&gt;</code> | Current status for all Core services. |
+|  [dependencies$](./kibana-plugin-core-server.statusservicesetup.dependencies_.md) | <code>Observable&lt;Record&lt;string, ServiceStatus&gt;&gt;</code> | Current status for all plugins this plugin depends on. Each key of the <code>Record</code> is a plugin id. |
+|  [derivedStatus$](./kibana-plugin-core-server.statusservicesetup.derivedstatus_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | The status of this plugin as derived from its dependencies. |
 |  [overall$](./kibana-plugin-core-server.statusservicesetup.overall_.md) | <code>Observable&lt;ServiceStatus&gt;</code> | Overall system status for all of Kibana. |
 
+## Methods
+
+|  Method | Description |
+|  --- | --- |
+|  [set(status$)](./kibana-plugin-core-server.statusservicesetup.set.md) | Allows a plugin to specify a custom status dependent on its own criteria. Completely overrides the default inherited status. |
+
diff --git a/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md
new file mode 100644
index 00000000000000..143cd397c40ae4
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.statusservicesetup.set.md
@@ -0,0 +1,28 @@
+<!-- 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; [set](./kibana-plugin-core-server.statusservicesetup.set.md)
+
+## StatusServiceSetup.set() method
+
+Allows a plugin to specify a custom status dependent on its own criteria. Completely overrides the default inherited status.
+
+<b>Signature:</b>
+
+```typescript
+set(status$: Observable<ServiceStatus>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  status$ | <code>Observable&lt;ServiceStatus&gt;</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
+## Remarks
+
+See the [StatusServiceSetup.derivedStatus$](./kibana-plugin-core-server.statusservicesetup.derivedstatus_.md) API for leveraging the default status calculation that is provided by Core.
+
diff --git a/rfcs/text/0010_service_status.md b/rfcs/text/0010_service_status.md
index ded594930a3677..76195c4f1ab89f 100644
--- a/rfcs/text/0010_service_status.md
+++ b/rfcs/text/0010_service_status.md
@@ -137,7 +137,7 @@ interface StatusSetup {
    * Current status for all dependencies of the current plugin.
    * Each key of the `Record` is a plugin id.
    */
-  plugins$: Observable<Record<string, ServiceStatus>>;
+  dependencies$: Observable<Record<string, ServiceStatus>>;
 
   /**
    * The status of this plugin as derived from its dependencies.
diff --git a/src/core/server/legacy/legacy_service.ts b/src/core/server/legacy/legacy_service.ts
index adfdecdd7c9761..7d5557be92b300 100644
--- a/src/core/server/legacy/legacy_service.ts
+++ b/src/core/server/legacy/legacy_service.ts
@@ -323,6 +323,9 @@ export class LegacyService implements CoreService {
       status: {
         core$: setupDeps.core.status.core$,
         overall$: setupDeps.core.status.overall$,
+        set: setupDeps.core.status.plugins.set.bind(null, 'legacy'),
+        dependencies$: setupDeps.core.status.plugins.getDependenciesStatus$('legacy'),
+        derivedStatus$: setupDeps.core.status.plugins.getDerivedStatus$('legacy'),
       },
       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 fa2659ca130a03..eb31b2380d177f 100644
--- a/src/core/server/plugins/plugin_context.ts
+++ b/src/core/server/plugins/plugin_context.ts
@@ -185,6 +185,9 @@ export function createPluginSetupContext<TPlugin, TPluginDependencies>(
     status: {
       core$: deps.status.core$,
       overall$: deps.status.overall$,
+      set: deps.status.plugins.set.bind(null, plugin.name),
+      dependencies$: deps.status.plugins.getDependenciesStatus$(plugin.name),
+      derivedStatus$: deps.status.plugins.getDerivedStatus$(plugin.name),
     },
     uiSettings: {
       register: deps.uiSettings.register,
diff --git a/src/core/server/plugins/plugins_system.test.ts b/src/core/server/plugins/plugins_system.test.ts
index 7af77491df1ab8..71ac31db13f928 100644
--- a/src/core/server/plugins/plugins_system.test.ts
+++ b/src/core/server/plugins/plugins_system.test.ts
@@ -100,15 +100,27 @@ test('getPluginDependencies returns dependency tree of symbols', () => {
   pluginsSystem.addPlugin(createPlugin('no-dep'));
 
   expect(pluginsSystem.getPluginDependencies()).toMatchInlineSnapshot(`
-    Map {
-      Symbol(plugin-a) => Array [
-        Symbol(no-dep),
-      ],
-      Symbol(plugin-b) => Array [
-        Symbol(plugin-a),
-        Symbol(no-dep),
-      ],
-      Symbol(no-dep) => Array [],
+    Object {
+      "asNames": Map {
+        "plugin-a" => Array [
+          "no-dep",
+        ],
+        "plugin-b" => Array [
+          "plugin-a",
+          "no-dep",
+        ],
+        "no-dep" => Array [],
+      },
+      "asOpaqueIds": Map {
+        Symbol(plugin-a) => Array [
+          Symbol(no-dep),
+        ],
+        Symbol(plugin-b) => Array [
+          Symbol(plugin-a),
+          Symbol(no-dep),
+        ],
+        Symbol(no-dep) => Array [],
+      },
     }
   `);
 });
diff --git a/src/core/server/plugins/plugins_system.ts b/src/core/server/plugins/plugins_system.ts
index f5c1b35d678a36..b2acd9a6fd04bb 100644
--- a/src/core/server/plugins/plugins_system.ts
+++ b/src/core/server/plugins/plugins_system.ts
@@ -20,10 +20,11 @@
 import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
 import { PluginWrapper } from './plugin';
-import { DiscoveredPlugin, PluginName, PluginOpaqueId } from './types';
+import { DiscoveredPlugin, PluginName } from './types';
 import { createPluginSetupContext, createPluginStartContext } from './plugin_context';
 import { PluginsServiceSetupDeps, PluginsServiceStartDeps } from './plugins_service';
 import { withTimeout } from '../../utils';
+import { PluginDependencies } from '.';
 
 const Sec = 1000;
 /** @internal */
@@ -45,9 +46,19 @@ export class PluginsSystem {
    * @returns a ReadonlyMap of each plugin and an Array of its available dependencies
    * @internal
    */
-  public getPluginDependencies(): ReadonlyMap<PluginOpaqueId, PluginOpaqueId[]> {
-    // Return dependency map of opaque ids
-    return new Map(
+  public getPluginDependencies(): PluginDependencies {
+    const asNames = new Map(
+      [...this.plugins].map(([name, plugin]) => [
+        plugin.name,
+        [
+          ...new Set([
+            ...plugin.requiredPlugins,
+            ...plugin.optionalPlugins.filter((optPlugin) => this.plugins.has(optPlugin)),
+          ]),
+        ].map((depId) => this.plugins.get(depId)!.name),
+      ])
+    );
+    const asOpaqueIds = new Map(
       [...this.plugins].map(([name, plugin]) => [
         plugin.opaqueId,
         [
@@ -58,6 +69,8 @@ export class PluginsSystem {
         ].map((depId) => this.plugins.get(depId)!.opaqueId),
       ])
     );
+
+    return { asNames, asOpaqueIds };
   }
 
   public async setupPlugins(deps: PluginsServiceSetupDeps) {
diff --git a/src/core/server/plugins/types.ts b/src/core/server/plugins/types.ts
index eb2a9ca3daf5f7..517261b5bc9bb1 100644
--- a/src/core/server/plugins/types.ts
+++ b/src/core/server/plugins/types.ts
@@ -93,6 +93,12 @@ export type PluginName = string;
 /** @public */
 export type PluginOpaqueId = symbol;
 
+/** @internal */
+export interface PluginDependencies {
+  asNames: ReadonlyMap<PluginName, PluginName[]>;
+  asOpaqueIds: ReadonlyMap<PluginOpaqueId, PluginOpaqueId[]>;
+}
+
 /**
  * Describes the set of required and optional properties plugin can define in its
  * mandatory JSON manifest file.
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 49c97d837579d3..fb4e4494801ed6 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2853,10 +2853,17 @@ export type SharedGlobalConfig = RecursiveReadonly<{
 // @public
 export type StartServicesAccessor<TPluginsStart extends object = object, TStart = unknown> = () => Promise<[CoreStart, TPluginsStart, TStart]>;
 
+// Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "ServiceStatusSetup"
+// Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "ServiceStatusSetup"
+//
 // @public
 export interface StatusServiceSetup {
     core$: Observable<CoreStatus>;
+    dependencies$: Observable<Record<string, ServiceStatus>>;
+    // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "StatusSetup"
+    derivedStatus$: Observable<ServiceStatus>;
     overall$: Observable<ServiceStatus>;
+    set(status$: Observable<ServiceStatus>): void;
 }
 
 // @public
@@ -2949,8 +2956,8 @@ export const validBodyOutput: readonly ["data", "stream"];
 // src/core/server/legacy/types.ts:165:3 - (ae-forgotten-export) The symbol "LegacyNavLinkSpec" needs to be exported by the entry point index.d.ts
 // src/core/server/legacy/types.ts:166:3 - (ae-forgotten-export) The symbol "LegacyAppSpec" needs to be exported by the entry point index.d.ts
 // src/core/server/legacy/types.ts:167:16 - (ae-forgotten-export) The symbol "LegacyPluginSpec" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:266:3 - (ae-forgotten-export) The symbol "KibanaConfigType" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:266:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
-// src/core/server/plugins/types.ts:268:3 - (ae-forgotten-export) The symbol "PathConfigType" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:272:3 - (ae-forgotten-export) The symbol "KibanaConfigType" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:272:3 - (ae-forgotten-export) The symbol "SharedGlobalConfigKeys" needs to be exported by the entry point index.d.ts
+// src/core/server/plugins/types.ts:274:3 - (ae-forgotten-export) The symbol "PathConfigType" needs to be exported by the entry point index.d.ts
 
 ```
diff --git a/src/core/server/server.test.ts b/src/core/server/server.test.ts
index 417f66a2988c2e..1bd364c2f87b77 100644
--- a/src/core/server/server.test.ts
+++ b/src/core/server/server.test.ts
@@ -41,6 +41,7 @@ import { Server } from './server';
 import { getEnvOptions } from './config/__mocks__/env';
 import { loggingSystemMock } from './logging/logging_system.mock';
 import { rawConfigServiceMock } from './config/raw_config_service.mock';
+import { PluginName } from './plugins';
 
 const env = new Env('.', getEnvOptions());
 const logger = loggingSystemMock.create();
@@ -49,7 +50,7 @@ const rawConfigService = rawConfigServiceMock.create({});
 beforeEach(() => {
   mockConfigService.atPath.mockReturnValue(new BehaviorSubject({ autoListen: true }));
   mockPluginsService.discover.mockResolvedValue({
-    pluginTree: new Map(),
+    pluginTree: { asOpaqueIds: new Map(), asNames: new Map() },
     uiPlugins: { internal: new Map(), public: new Map(), browserConfigs: new Map() },
   });
 });
@@ -98,7 +99,7 @@ test('injects legacy dependency to context#setup()', async () => {
     [pluginB, [pluginA]],
   ]);
   mockPluginsService.discover.mockResolvedValue({
-    pluginTree: pluginDependencies,
+    pluginTree: { asOpaqueIds: pluginDependencies, asNames: new Map() },
     uiPlugins: { internal: new Map(), public: new Map(), browserConfigs: new Map() },
   });
 
@@ -113,6 +114,31 @@ test('injects legacy dependency to context#setup()', async () => {
   });
 });
 
+test('injects legacy dependency to status#setup()', async () => {
+  const server = new Server(rawConfigService, env, logger);
+
+  const pluginDependencies = new Map<PluginName, PluginName[]>([
+    ['a', []],
+    ['b', ['a']],
+  ]);
+  mockPluginsService.discover.mockResolvedValue({
+    pluginTree: { asOpaqueIds: new Map(), asNames: pluginDependencies },
+    uiPlugins: { internal: new Map(), public: new Map(), browserConfigs: new Map() },
+  });
+
+  await server.setup();
+
+  expect(mockStatusService.setup).toHaveBeenCalledWith({
+    elasticsearch: expect.any(Object),
+    savedObjects: expect.any(Object),
+    pluginDependencies: new Map([
+      ['a', []],
+      ['b', ['a']],
+      ['legacy', ['a', 'b']],
+    ]),
+  });
+});
+
 test('runs services on "start"', async () => {
   const server = new Server(rawConfigService, env, logger);
 
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index cc6d8171e7a037..e2f77f0551f34c 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -121,10 +121,13 @@ export class Server {
 
     const contextServiceSetup = this.context.setup({
       // We inject a fake "legacy plugin" with dependencies on every plugin so that legacy plugins:
-      // 1) Can access context from any NP plugin
+      // 1) Can access context from any KP plugin
       // 2) Can register context providers that will only be available to other legacy plugins and will not leak into
       //    New Platform plugins.
-      pluginDependencies: new Map([...pluginTree, [this.legacy.legacyId, [...pluginTree.keys()]]]),
+      pluginDependencies: new Map([
+        ...pluginTree.asOpaqueIds,
+        [this.legacy.legacyId, [...pluginTree.asOpaqueIds.keys()]],
+      ]),
     });
 
     const auditTrailSetup = this.auditTrail.setup();
@@ -154,6 +157,12 @@ export class Server {
 
     const statusSetup = await this.status.setup({
       elasticsearch: elasticsearchServiceSetup,
+      // We inject a fake "legacy plugin" with dependencies on every plugin so that legacy can access plugin status from
+      // any KP plugin
+      pluginDependencies: new Map([
+        ...pluginTree.asNames,
+        ['legacy', [...pluginTree.asNames.keys()]],
+      ]),
       savedObjects: savedObjectsSetup,
     });
 
diff --git a/src/core/server/status/get_summary_status.test.ts b/src/core/server/status/get_summary_status.test.ts
index 7516e82ee784de..d97083162b5028 100644
--- a/src/core/server/status/get_summary_status.test.ts
+++ b/src/core/server/status/get_summary_status.test.ts
@@ -94,6 +94,38 @@ describe('getSummaryStatus', () => {
   describe('summary', () => {
     describe('when a single service is at highest level', () => {
       it('returns all information about that single service', () => {
+        expect(
+          getSummaryStatus(
+            Object.entries({
+              s1: degraded,
+              s2: {
+                level: ServiceStatusLevels.unavailable,
+                summary: 'Lorem ipsum',
+                meta: {
+                  custom: { data: 'here' },
+                },
+              },
+            })
+          )
+        ).toEqual({
+          level: ServiceStatusLevels.unavailable,
+          summary: '[s2]: Lorem ipsum',
+          detail: 'See the status page for more information',
+          meta: {
+            affectedServices: {
+              s2: {
+                level: ServiceStatusLevels.unavailable,
+                summary: 'Lorem ipsum',
+                meta: {
+                  custom: { data: 'here' },
+                },
+              },
+            },
+          },
+        });
+      });
+
+      it('allows the single service to override the detail and documentationUrl fields', () => {
         expect(
           getSummaryStatus(
             Object.entries({
@@ -115,7 +147,17 @@ describe('getSummaryStatus', () => {
           detail: 'Vivamus pulvinar sem ac luctus ultrices.',
           documentationUrl: 'http://helpmenow.com/problem1',
           meta: {
-            custom: { data: 'here' },
+            affectedServices: {
+              s2: {
+                level: ServiceStatusLevels.unavailable,
+                summary: 'Lorem ipsum',
+                detail: 'Vivamus pulvinar sem ac luctus ultrices.',
+                documentationUrl: 'http://helpmenow.com/problem1',
+                meta: {
+                  custom: { data: 'here' },
+                },
+              },
+            },
           },
         });
       });
diff --git a/src/core/server/status/get_summary_status.ts b/src/core/server/status/get_summary_status.ts
index 748a54f0bf8bba..1dc92839e8261b 100644
--- a/src/core/server/status/get_summary_status.ts
+++ b/src/core/server/status/get_summary_status.ts
@@ -23,7 +23,10 @@ import { ServiceStatus, ServiceStatusLevels, ServiceStatusLevel } from './types'
  * Returns a single {@link ServiceStatus} that summarizes the most severe status level from a group of statuses.
  * @param statuses
  */
-export const getSummaryStatus = (statuses: Array<[string, ServiceStatus]>): ServiceStatus => {
+export const getSummaryStatus = (
+  statuses: Array<[string, ServiceStatus]>,
+  { allAvailableSummary = `All services are available` }: { allAvailableSummary?: string } = {}
+): ServiceStatus => {
   const grouped = groupByLevel(statuses);
   const highestSeverityLevel = getHighestSeverityLevel(grouped.keys());
   const highestSeverityGroup = grouped.get(highestSeverityLevel)!;
@@ -31,13 +34,18 @@ export const getSummaryStatus = (statuses: Array<[string, ServiceStatus]>): Serv
   if (highestSeverityLevel === ServiceStatusLevels.available) {
     return {
       level: ServiceStatusLevels.available,
-      summary: `All services are available`,
+      summary: allAvailableSummary,
     };
   } else if (highestSeverityGroup.size === 1) {
     const [serviceName, status] = [...highestSeverityGroup.entries()][0];
     return {
       ...status,
       summary: `[${serviceName}]: ${status.summary!}`,
+      // TODO: include URL to status page
+      detail: status.detail ?? `See the status page for more information`,
+      meta: {
+        affectedServices: { [serviceName]: status },
+      },
     };
   } else {
     return {
diff --git a/src/core/server/status/plugins_status.test.ts b/src/core/server/status/plugins_status.test.ts
new file mode 100644
index 00000000000000..b2d2ac8a5ef90c
--- /dev/null
+++ b/src/core/server/status/plugins_status.test.ts
@@ -0,0 +1,338 @@
+/*
+ * 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 { PluginName } from '../plugins';
+import { PluginsStatusService } from './plugins_status';
+import { of, Observable, BehaviorSubject } from 'rxjs';
+import { ServiceStatusLevels, CoreStatus, ServiceStatus } from './types';
+import { first } from 'rxjs/operators';
+import { ServiceStatusLevelSnapshotSerializer } from './test_utils';
+
+expect.addSnapshotSerializer(ServiceStatusLevelSnapshotSerializer);
+
+describe('PluginStatusService', () => {
+  const coreAllAvailable$: Observable<CoreStatus> = of({
+    elasticsearch: { level: ServiceStatusLevels.available, summary: 'elasticsearch avail' },
+    savedObjects: { level: ServiceStatusLevels.available, summary: 'savedObjects avail' },
+  });
+  const coreOneDegraded$: Observable<CoreStatus> = of({
+    elasticsearch: { level: ServiceStatusLevels.available, summary: 'elasticsearch avail' },
+    savedObjects: { level: ServiceStatusLevels.degraded, summary: 'savedObjects degraded' },
+  });
+  const coreOneCriticalOneDegraded$: Observable<CoreStatus> = of({
+    elasticsearch: { level: ServiceStatusLevels.critical, summary: 'elasticsearch critical' },
+    savedObjects: { level: ServiceStatusLevels.degraded, summary: 'savedObjects degraded' },
+  });
+  const pluginDependencies: Map<PluginName, PluginName[]> = new Map([
+    ['a', []],
+    ['b', ['a']],
+    ['c', ['a', 'b']],
+  ]);
+
+  describe('getDerivedStatus$', () => {
+    it(`defaults to core's most severe status`, async () => {
+      const serviceAvailable = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies,
+      });
+      expect(await serviceAvailable.getDerivedStatus$('a').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.available,
+        summary: 'All dependencies are available',
+      });
+
+      const serviceDegraded = new PluginsStatusService({
+        core$: coreOneDegraded$,
+        pluginDependencies,
+      });
+      expect(await serviceDegraded.getDerivedStatus$('a').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.degraded,
+        summary: '[savedObjects]: savedObjects degraded',
+        detail: 'See the status page for more information',
+        meta: expect.any(Object),
+      });
+
+      const serviceCritical = new PluginsStatusService({
+        core$: coreOneCriticalOneDegraded$,
+        pluginDependencies,
+      });
+      expect(await serviceCritical.getDerivedStatus$('a').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.critical,
+        summary: '[elasticsearch]: elasticsearch critical',
+        detail: 'See the status page for more information',
+        meta: expect.any(Object),
+      });
+    });
+
+    it(`provides a summary status when core and dependencies are at same severity level`, async () => {
+      const service = new PluginsStatusService({ core$: coreOneDegraded$, pluginDependencies });
+      service.set('a', of({ level: ServiceStatusLevels.degraded, summary: 'a is degraded' }));
+      expect(await service.getDerivedStatus$('b').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.degraded,
+        summary: '[2] services are degraded',
+        detail: 'See the status page for more information',
+        meta: expect.any(Object),
+      });
+    });
+
+    it(`allows dependencies status to take precedence over lower severity core statuses`, async () => {
+      const service = new PluginsStatusService({ core$: coreOneDegraded$, pluginDependencies });
+      service.set('a', of({ level: ServiceStatusLevels.unavailable, summary: 'a is not working' }));
+      expect(await service.getDerivedStatus$('b').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.unavailable,
+        summary: '[a]: a is not working',
+        detail: 'See the status page for more information',
+        meta: expect.any(Object),
+      });
+    });
+
+    it(`allows core status to take precedence over lower severity dependencies statuses`, async () => {
+      const service = new PluginsStatusService({
+        core$: coreOneCriticalOneDegraded$,
+        pluginDependencies,
+      });
+      service.set('a', of({ level: ServiceStatusLevels.unavailable, summary: 'a is not working' }));
+      expect(await service.getDerivedStatus$('b').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.critical,
+        summary: '[elasticsearch]: elasticsearch critical',
+        detail: 'See the status page for more information',
+        meta: expect.any(Object),
+      });
+    });
+
+    it(`allows a severe dependency status to take precedence over a less severe dependency status`, async () => {
+      const service = new PluginsStatusService({ core$: coreOneDegraded$, pluginDependencies });
+      service.set('a', of({ level: ServiceStatusLevels.degraded, summary: 'a is degraded' }));
+      service.set('b', of({ level: ServiceStatusLevels.unavailable, summary: 'b is not working' }));
+      expect(await service.getDerivedStatus$('c').pipe(first()).toPromise()).toEqual({
+        level: ServiceStatusLevels.unavailable,
+        summary: '[b]: b is not working',
+        detail: 'See the status page for more information',
+        meta: expect.any(Object),
+      });
+    });
+  });
+
+  describe('getAll$', () => {
+    it('defaults to empty record if no plugins', async () => {
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies: new Map(),
+      });
+      expect(await service.getAll$().pipe(first()).toPromise()).toEqual({});
+    });
+
+    it('defaults to core status when no plugin statuses are set', async () => {
+      const serviceAvailable = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies,
+      });
+      expect(await serviceAvailable.getAll$().pipe(first()).toPromise()).toEqual({
+        a: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+        b: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+        c: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+      });
+
+      const serviceDegraded = new PluginsStatusService({
+        core$: coreOneDegraded$,
+        pluginDependencies,
+      });
+      expect(await serviceDegraded.getAll$().pipe(first()).toPromise()).toEqual({
+        a: {
+          level: ServiceStatusLevels.degraded,
+          summary: '[savedObjects]: savedObjects degraded',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+        b: {
+          level: ServiceStatusLevels.degraded,
+          summary: '[2] services are degraded',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+        c: {
+          level: ServiceStatusLevels.degraded,
+          summary: '[3] services are degraded',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+      });
+
+      const serviceCritical = new PluginsStatusService({
+        core$: coreOneCriticalOneDegraded$,
+        pluginDependencies,
+      });
+      expect(await serviceCritical.getAll$().pipe(first()).toPromise()).toEqual({
+        a: {
+          level: ServiceStatusLevels.critical,
+          summary: '[elasticsearch]: elasticsearch critical',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+        b: {
+          level: ServiceStatusLevels.critical,
+          summary: '[2] services are critical',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+        c: {
+          level: ServiceStatusLevels.critical,
+          summary: '[3] services are critical',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+      });
+    });
+
+    it('uses the manually set status level if plugin specifies one', async () => {
+      const service = new PluginsStatusService({ core$: coreOneDegraded$, pluginDependencies });
+      service.set('a', of({ level: ServiceStatusLevels.available, summary: 'a status' }));
+
+      expect(await service.getAll$().pipe(first()).toPromise()).toEqual({
+        a: { level: ServiceStatusLevels.available, summary: 'a status' }, // a is available depsite savedObjects being degraded
+        b: {
+          level: ServiceStatusLevels.degraded,
+          summary: '[savedObjects]: savedObjects degraded',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+        c: {
+          level: ServiceStatusLevels.degraded,
+          summary: '[2] services are degraded',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+      });
+    });
+
+    it('updates when a new plugin status observable is set', async () => {
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies: new Map([['a', []]]),
+      });
+      const statusUpdates: Array<Record<PluginName, ServiceStatus>> = [];
+      const subscription = service
+        .getAll$()
+        .subscribe((pluginStatuses) => statusUpdates.push(pluginStatuses));
+
+      service.set('a', of({ level: ServiceStatusLevels.degraded, summary: 'a degraded' }));
+      service.set('a', of({ level: ServiceStatusLevels.unavailable, summary: 'a unavailable' }));
+      service.set('a', of({ level: ServiceStatusLevels.available, summary: 'a available' }));
+      subscription.unsubscribe();
+
+      expect(statusUpdates).toEqual([
+        { a: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' } },
+        { a: { level: ServiceStatusLevels.degraded, summary: 'a degraded' } },
+        { a: { level: ServiceStatusLevels.unavailable, summary: 'a unavailable' } },
+        { a: { level: ServiceStatusLevels.available, summary: 'a available' } },
+      ]);
+    });
+  });
+
+  describe('getDependenciesStatus$', () => {
+    it('only includes dependencies of specified plugin', async () => {
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies,
+      });
+      expect(await service.getDependenciesStatus$('a').pipe(first()).toPromise()).toEqual({});
+      expect(await service.getDependenciesStatus$('b').pipe(first()).toPromise()).toEqual({
+        a: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+      });
+      expect(await service.getDependenciesStatus$('c').pipe(first()).toPromise()).toEqual({
+        a: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+        b: { level: ServiceStatusLevels.available, summary: 'All dependencies are available' },
+      });
+    });
+
+    it('uses the manually set status level if plugin specifies one', async () => {
+      const service = new PluginsStatusService({ core$: coreOneDegraded$, pluginDependencies });
+      service.set('a', of({ level: ServiceStatusLevels.available, summary: 'a status' }));
+
+      expect(await service.getDependenciesStatus$('c').pipe(first()).toPromise()).toEqual({
+        a: { level: ServiceStatusLevels.available, summary: 'a status' }, // a is available depsite savedObjects being degraded
+        b: {
+          level: ServiceStatusLevels.degraded,
+          summary: '[savedObjects]: savedObjects degraded',
+          detail: 'See the status page for more information',
+          meta: expect.any(Object),
+        },
+      });
+    });
+
+    it('throws error if unknown plugin passed', () => {
+      const service = new PluginsStatusService({ core$: coreAllAvailable$, pluginDependencies });
+      expect(() => {
+        service.getDependenciesStatus$('dont-exist');
+      }).toThrowError();
+    });
+
+    it('debounces events in quick succession', async () => {
+      const service = new PluginsStatusService({
+        core$: coreAllAvailable$,
+        pluginDependencies,
+      });
+      const available: ServiceStatus = {
+        level: ServiceStatusLevels.available,
+        summary: 'a available',
+      };
+      const degraded: ServiceStatus = {
+        level: ServiceStatusLevels.degraded,
+        summary: 'a degraded',
+      };
+      const pluginA$ = new BehaviorSubject(available);
+      service.set('a', pluginA$);
+
+      const statusUpdates: Array<Record<string, ServiceStatus>> = [];
+      const subscription = service
+        .getDependenciesStatus$('b')
+        .subscribe((status) => statusUpdates.push(status));
+      const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+
+      pluginA$.next(degraded);
+      pluginA$.next(available);
+      pluginA$.next(degraded);
+      pluginA$.next(available);
+      pluginA$.next(degraded);
+      pluginA$.next(available);
+      pluginA$.next(degraded);
+      // Waiting for the debounce timeout should cut a new update
+      await delay(100);
+      pluginA$.next(available);
+      await delay(100);
+      subscription.unsubscribe();
+
+      expect(statusUpdates).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "a": Object {
+              "level": degraded,
+              "summary": "a degraded",
+            },
+          },
+          Object {
+            "a": Object {
+              "level": available,
+              "summary": "a available",
+            },
+          },
+        ]
+      `);
+    });
+  });
+});
diff --git a/src/core/server/status/plugins_status.ts b/src/core/server/status/plugins_status.ts
new file mode 100644
index 00000000000000..df6f13eeec4e58
--- /dev/null
+++ b/src/core/server/status/plugins_status.ts
@@ -0,0 +1,98 @@
+/*
+ * 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 { BehaviorSubject, Observable, combineLatest, of } from 'rxjs';
+import { map, distinctUntilChanged, switchMap, debounceTime } from 'rxjs/operators';
+import { isDeepStrictEqual } from 'util';
+
+import { PluginName } from '../plugins';
+import { ServiceStatus, CoreStatus } from './types';
+import { getSummaryStatus } from './get_summary_status';
+
+interface Deps {
+  core$: Observable<CoreStatus>;
+  pluginDependencies: ReadonlyMap<PluginName, PluginName[]>;
+}
+
+export class PluginsStatusService {
+  private readonly pluginStatuses = new Map<PluginName, Observable<ServiceStatus>>();
+  private readonly update$ = new BehaviorSubject(true);
+  constructor(private readonly deps: Deps) {}
+
+  public set(plugin: PluginName, status$: Observable<ServiceStatus>) {
+    this.pluginStatuses.set(plugin, status$);
+    this.update$.next(true); // trigger all existing Observables to update from the new source Observable
+  }
+
+  public getAll$(): Observable<Record<PluginName, ServiceStatus>> {
+    return this.getPluginStatuses$([...this.deps.pluginDependencies.keys()]);
+  }
+
+  public getDependenciesStatus$(plugin: PluginName): Observable<Record<PluginName, ServiceStatus>> {
+    const dependencies = this.deps.pluginDependencies.get(plugin);
+    if (!dependencies) {
+      throw new Error(`Unknown plugin: ${plugin}`);
+    }
+
+    return this.getPluginStatuses$(dependencies).pipe(
+      // Prevent many emissions at once from dependency status resolution from making this too noisy
+      debounceTime(100)
+    );
+  }
+
+  public getDerivedStatus$(plugin: PluginName): Observable<ServiceStatus> {
+    return combineLatest([this.deps.core$, this.getDependenciesStatus$(plugin)]).pipe(
+      map(([coreStatus, pluginStatuses]) => {
+        return getSummaryStatus(
+          [...Object.entries(coreStatus), ...Object.entries(pluginStatuses)],
+          {
+            allAvailableSummary: `All dependencies are available`,
+          }
+        );
+      })
+    );
+  }
+
+  private getPluginStatuses$(plugins: PluginName[]): Observable<Record<PluginName, ServiceStatus>> {
+    if (plugins.length === 0) {
+      return of({});
+    }
+
+    return this.update$.pipe(
+      switchMap(() => {
+        const pluginStatuses = plugins
+          .map(
+            (depName) =>
+              [depName, this.pluginStatuses.get(depName) ?? this.getDerivedStatus$(depName)] as [
+                PluginName,
+                Observable<ServiceStatus>
+              ]
+          )
+          .map(([pName, status$]) =>
+            status$.pipe(map((status) => [pName, status] as [PluginName, ServiceStatus]))
+          );
+
+        return combineLatest(pluginStatuses).pipe(
+          map((statuses) => Object.fromEntries(statuses)),
+          distinctUntilChanged(isDeepStrictEqual)
+        );
+      })
+    );
+  }
+}
diff --git a/src/core/server/status/status_service.mock.ts b/src/core/server/status/status_service.mock.ts
index 47ef8659b40796..42b3eecdca310f 100644
--- a/src/core/server/status/status_service.mock.ts
+++ b/src/core/server/status/status_service.mock.ts
@@ -40,6 +40,9 @@ const createSetupContractMock = () => {
   const setupContract: jest.Mocked<StatusServiceSetup> = {
     core$: new BehaviorSubject(availableCoreStatus),
     overall$: new BehaviorSubject(available),
+    set: jest.fn(),
+    dependencies$: new BehaviorSubject({}),
+    derivedStatus$: new BehaviorSubject(available),
   };
 
   return setupContract;
@@ -50,6 +53,11 @@ const createInternalSetupContractMock = () => {
     core$: new BehaviorSubject(availableCoreStatus),
     overall$: new BehaviorSubject(available),
     isStatusPageAnonymous: jest.fn().mockReturnValue(false),
+    plugins: {
+      set: jest.fn(),
+      getDependenciesStatus$: jest.fn(),
+      getDerivedStatus$: jest.fn(),
+    },
   };
 
   return setupContract;
diff --git a/src/core/server/status/status_service.test.ts b/src/core/server/status/status_service.test.ts
index 863fe34e8ecea8..341c40a86bf77f 100644
--- a/src/core/server/status/status_service.test.ts
+++ b/src/core/server/status/status_service.test.ts
@@ -34,6 +34,7 @@ describe('StatusService', () => {
     service = new StatusService(mockCoreContext.create());
   });
 
+  const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
   const available: ServiceStatus<any> = {
     level: ServiceStatusLevels.available,
     summary: 'Available',
@@ -53,6 +54,7 @@ describe('StatusService', () => {
           savedObjects: {
             status$: of(degraded),
           },
+          pluginDependencies: new Map(),
         });
         expect(await setup.core$.pipe(first()).toPromise()).toEqual({
           elasticsearch: available,
@@ -68,6 +70,7 @@ describe('StatusService', () => {
           savedObjects: {
             status$: of(degraded),
           },
+          pluginDependencies: new Map(),
         });
         const subResult1 = await setup.core$.pipe(first()).toPromise();
         const subResult2 = await setup.core$.pipe(first()).toPromise();
@@ -96,6 +99,7 @@ describe('StatusService', () => {
           savedObjects: {
             status$: savedObjects$,
           },
+          pluginDependencies: new Map(),
         });
 
         const statusUpdates: CoreStatus[] = [];
@@ -158,6 +162,7 @@ describe('StatusService', () => {
           savedObjects: {
             status$: of(degraded),
           },
+          pluginDependencies: new Map(),
         });
         expect(await setup.overall$.pipe(first()).toPromise()).toMatchObject({
           level: ServiceStatusLevels.degraded,
@@ -173,6 +178,7 @@ describe('StatusService', () => {
           savedObjects: {
             status$: of(degraded),
           },
+          pluginDependencies: new Map(),
         });
         const subResult1 = await setup.overall$.pipe(first()).toPromise();
         const subResult2 = await setup.overall$.pipe(first()).toPromise();
@@ -201,26 +207,95 @@ describe('StatusService', () => {
           savedObjects: {
             status$: savedObjects$,
           },
+          pluginDependencies: new Map(),
         });
 
         const statusUpdates: ServiceStatus[] = [];
         const subscription = setup.overall$.subscribe((status) => statusUpdates.push(status));
 
+        // Wait for timers to ensure that duplicate events are still filtered out regardless of debouncing.
         elasticsearch$.next(available);
+        await delay(100);
         elasticsearch$.next(available);
+        await delay(100);
         elasticsearch$.next({
           level: ServiceStatusLevels.available,
           summary: `Wow another summary`,
         });
+        await delay(100);
         savedObjects$.next(degraded);
+        await delay(100);
         savedObjects$.next(available);
+        await delay(100);
         savedObjects$.next(available);
+        await delay(100);
         subscription.unsubscribe();
 
         expect(statusUpdates).toMatchInlineSnapshot(`
           Array [
             Object {
+              "detail": "See the status page for more information",
               "level": degraded,
+              "meta": Object {
+                "affectedServices": Object {
+                  "savedObjects": Object {
+                    "level": degraded,
+                    "summary": "This is degraded!",
+                  },
+                },
+              },
+              "summary": "[savedObjects]: This is degraded!",
+            },
+            Object {
+              "level": available,
+              "summary": "All services are available",
+            },
+          ]
+        `);
+      });
+
+      it('debounces events in quick succession', async () => {
+        const savedObjects$ = new BehaviorSubject(available);
+        const setup = await service.setup({
+          elasticsearch: {
+            status$: new BehaviorSubject(available),
+          },
+          savedObjects: {
+            status$: savedObjects$,
+          },
+          pluginDependencies: new Map(),
+        });
+
+        const statusUpdates: ServiceStatus[] = [];
+        const subscription = setup.overall$.subscribe((status) => statusUpdates.push(status));
+
+        // All of these should debounced into a single `available` status
+        savedObjects$.next(degraded);
+        savedObjects$.next(available);
+        savedObjects$.next(degraded);
+        savedObjects$.next(available);
+        savedObjects$.next(degraded);
+        savedObjects$.next(available);
+        savedObjects$.next(degraded);
+        // Waiting for the debounce timeout should cut a new update
+        await delay(100);
+        savedObjects$.next(available);
+        await delay(100);
+        subscription.unsubscribe();
+
+        expect(statusUpdates).toMatchInlineSnapshot(`
+          Array [
+            Object {
+              "detail": "See the status page for more information",
+              "level": degraded,
+              "meta": Object {
+                "affectedServices": Object {
+                  "savedObjects": Object {
+                    "level": degraded,
+                    "summary": "This is degraded!",
+                  },
+                },
+              },
               "summary": "[savedObjects]: This is degraded!",
             },
             Object {
diff --git a/src/core/server/status/status_service.ts b/src/core/server/status/status_service.ts
index aea335e64babf8..59e81343597c94 100644
--- a/src/core/server/status/status_service.ts
+++ b/src/core/server/status/status_service.ts
@@ -18,7 +18,7 @@
  */
 
 import { Observable, combineLatest } from 'rxjs';
-import { map, distinctUntilChanged, shareReplay, take } from 'rxjs/operators';
+import { map, distinctUntilChanged, shareReplay, take, debounceTime } from 'rxjs/operators';
 import { isDeepStrictEqual } from 'util';
 
 import { CoreService } from '../../types';
@@ -26,13 +26,16 @@ import { CoreContext } from '../core_context';
 import { Logger } from '../logging';
 import { InternalElasticsearchServiceSetup } from '../elasticsearch';
 import { InternalSavedObjectsServiceSetup } from '../saved_objects';
+import { PluginName } from '../plugins';
 
 import { config, StatusConfigType } from './status_config';
 import { ServiceStatus, CoreStatus, InternalStatusServiceSetup } from './types';
 import { getSummaryStatus } from './get_summary_status';
+import { PluginsStatusService } from './plugins_status';
 
 interface SetupDeps {
   elasticsearch: Pick<InternalElasticsearchServiceSetup, 'status$'>;
+  pluginDependencies: ReadonlyMap<PluginName, PluginName[]>;
   savedObjects: Pick<InternalSavedObjectsServiceSetup, 'status$'>;
 }
 
@@ -40,17 +43,29 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
   private readonly logger: Logger;
   private readonly config$: Observable<StatusConfigType>;
 
+  private pluginsStatus?: PluginsStatusService;
+
   constructor(coreContext: CoreContext) {
     this.logger = coreContext.logger.get('status');
     this.config$ = coreContext.configService.atPath<StatusConfigType>(config.path);
   }
 
-  public async setup(core: SetupDeps) {
+  public async setup({ elasticsearch, pluginDependencies, savedObjects }: SetupDeps) {
     const statusConfig = await this.config$.pipe(take(1)).toPromise();
-    const core$ = this.setupCoreStatus(core);
-    const overall$: Observable<ServiceStatus> = core$.pipe(
-      map((coreStatus) => {
-        const summary = getSummaryStatus(Object.entries(coreStatus));
+    const core$ = this.setupCoreStatus({ elasticsearch, savedObjects });
+    this.pluginsStatus = new PluginsStatusService({ core$, pluginDependencies });
+
+    const overall$: Observable<ServiceStatus> = combineLatest(
+      core$,
+      this.pluginsStatus.getAll$()
+    ).pipe(
+      // Prevent many emissions at once from dependency status resolution from making this too noisy
+      debounceTime(100),
+      map(([coreStatus, pluginsStatus]) => {
+        const summary = getSummaryStatus([
+          ...Object.entries(coreStatus),
+          ...Object.entries(pluginsStatus),
+        ]);
         this.logger.debug(`Recalculated overall status`, { status: summary });
         return summary;
       }),
@@ -60,6 +75,11 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
     return {
       core$,
       overall$,
+      plugins: {
+        set: this.pluginsStatus.set.bind(this.pluginsStatus),
+        getDependenciesStatus$: this.pluginsStatus.getDependenciesStatus$.bind(this.pluginsStatus),
+        getDerivedStatus$: this.pluginsStatus.getDerivedStatus$.bind(this.pluginsStatus),
+      },
       isStatusPageAnonymous: () => statusConfig.allowAnonymous,
     };
   }
@@ -68,7 +88,10 @@ export class StatusService implements CoreService<InternalStatusServiceSetup> {
 
   public stop() {}
 
-  private setupCoreStatus({ elasticsearch, savedObjects }: SetupDeps): Observable<CoreStatus> {
+  private setupCoreStatus({
+    elasticsearch,
+    savedObjects,
+  }: Pick<SetupDeps, 'elasticsearch' | 'savedObjects'>): Observable<CoreStatus> {
     return combineLatest([elasticsearch.status$, savedObjects.status$]).pipe(
       map(([elasticsearchStatus, savedObjectsStatus]) => ({
         elasticsearch: elasticsearchStatus,
diff --git a/src/core/server/status/types.ts b/src/core/server/status/types.ts
index 2ecf11deb2960e..f884b80316fa81 100644
--- a/src/core/server/status/types.ts
+++ b/src/core/server/status/types.ts
@@ -19,6 +19,7 @@
 
 import { Observable } from 'rxjs';
 import { deepFreeze } from '../../utils';
+import { PluginName } from '../plugins';
 
 /**
  * The current status of a service at a point in time.
@@ -116,6 +117,60 @@ export interface CoreStatus {
 
 /**
  * API for accessing status of Core and this plugin's dependencies as well as for customizing this plugin's status.
+ *
+ * @remarks
+ * By default, a plugin inherits it's current status from the most severe status level of any Core services and any
+ * plugins that it depends on. This default status is available on the
+ * {@link ServiceStatusSetup.derivedStatus$ | core.status.derviedStatus$} API.
+ *
+ * Plugins may customize their status calculation by calling the {@link ServiceStatusSetup.set | core.status.set} API
+ * with an Observable. Within this Observable, a plugin may choose to only depend on the status of some of its
+ * dependencies, to ignore severe status levels of particular Core services they are not concerned with, or to make its
+ * status dependent on other external services.
+ *
+ * @example
+ * Customize a plugin's status to only depend on the status of SavedObjects:
+ * ```ts
+ * core.status.set(
+ *   core.status.core$.pipe(
+ * .   map((coreStatus) => {
+ *       return coreStatus.savedObjects;
+ *     }) ;
+ *   );
+ * );
+ * ```
+ *
+ * @example
+ * Customize a plugin's status to include an external service:
+ * ```ts
+ * const externalStatus$ = interval(1000).pipe(
+ *   switchMap(async () => {
+ *     const resp = await fetch(`https://myexternaldep.com/_healthz`);
+ *     const body = await resp.json();
+ *     if (body.ok) {
+ *       return of({ level: ServiceStatusLevels.available, summary: 'External Service is up'});
+ *     } else {
+ *       return of({ level: ServiceStatusLevels.available, summary: 'External Service is unavailable'});
+ *     }
+ *   }),
+ *   catchError((error) => {
+ *     of({ level: ServiceStatusLevels.unavailable, summary: `External Service is down`, meta: { error }})
+ *   })
+ * );
+ *
+ * core.status.set(
+ *   combineLatest([core.status.derivedStatus$, externalStatus$]).pipe(
+ *     map(([derivedStatus, externalStatus]) => {
+ *       if (externalStatus.level > derivedStatus) {
+ *         return externalStatus;
+ *       } else {
+ *         return derivedStatus;
+ *       }
+ *     })
+ *   )
+ * );
+ * ```
+ *
  * @public
  */
 export interface StatusServiceSetup {
@@ -134,9 +189,43 @@ export interface StatusServiceSetup {
    * only depend on the statuses of {@link StatusServiceSetup.core$ | Core} or their dependencies.
    */
   overall$: Observable<ServiceStatus>;
+
+  /**
+   * Allows a plugin to specify a custom status dependent on its own criteria.
+   * Completely overrides the default inherited status.
+   *
+   * @remarks
+   * See the {@link StatusServiceSetup.derivedStatus$} API for leveraging the default status
+   * calculation that is provided by Core.
+   */
+  set(status$: Observable<ServiceStatus>): void;
+
+  /**
+   * Current status for all plugins this plugin depends on.
+   * Each key of the `Record` is a plugin id.
+   */
+  dependencies$: Observable<Record<string, ServiceStatus>>;
+
+  /**
+   * The status of this plugin as derived from its dependencies.
+   *
+   * @remarks
+   * By default, plugins inherit this derived status from their dependencies.
+   * Calling {@link StatusSetup.set} overrides this default status.
+   *
+   * This may emit multliple times for a single status change event as propagates
+   * through the dependency tree
+   */
+  derivedStatus$: Observable<ServiceStatus>;
 }
 
 /** @internal */
-export interface InternalStatusServiceSetup extends StatusServiceSetup {
+export interface InternalStatusServiceSetup extends Pick<StatusServiceSetup, 'core$' | 'overall$'> {
   isStatusPageAnonymous: () => boolean;
+  // Namespaced under `plugins` key to improve clarity that these are APIs for plugins specifically.
+  plugins: {
+    set(plugin: PluginName, status$: Observable<ServiceStatus>): void;
+    getDependenciesStatus$(plugin: PluginName): Observable<Record<string, ServiceStatus>>;
+    getDerivedStatus$(plugin: PluginName): Observable<ServiceStatus>;
+  };
 }

From 21140178589c86c946867cf00a0595ba19dd64cf Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler.smalley@elastic.co>
Date: Tue, 1 Sep 2020 06:49:00 -0700
Subject: [PATCH 147/216] [docs] Updates to development branching (#76063)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
Co-authored-by: Stacey Gammon <gammon@elastic.co>
Co-authored-by: Brandon Kobel <brandon.kobel@gmail.com>
Co-authored-by: Peter Schretlen <peter.schretlen@gmail.com>
---
 .../contributing/development-github.asciidoc  | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/docs/developer/contributing/development-github.asciidoc b/docs/developer/contributing/development-github.asciidoc
index a6d4e29940487a..84f51843098a70 100644
--- a/docs/developer/contributing/development-github.asciidoc
+++ b/docs/developer/contributing/development-github.asciidoc
@@ -1,5 +1,5 @@
 [[development-github]]
-== How we use git and github
+== How we use Git and GitHub
 
 [discrete]
 === Forking
@@ -12,17 +12,21 @@ repo, which we'll refer to in later code snippets.
 [discrete]
 === Branching
 
-* All work on the next major release goes into master.
-* Past major release branches are named `{majorVersion}.x`. They contain
-work that will go into the next minor release. For example, if the next
-minor release is `5.2.0`, work for it should go into the `5.x` branch.
-* Past minor release branches are named `{majorVersion}.{minorVersion}`.
-They contain work that will go into the next patch release. For example,
-if the next patch release is `5.3.1`, work for it should go into the
-`5.3` branch.
-* All work is done on feature branches and merged into one of these
-branches.
-* Where appropriate, we'll backport changes into older release branches.
+At Elastic, all products in the stack, including Kibana, are released at the same time with the same version number. Most of these projects have the following branching strategy:
+
+* `master` is the next major version.
+* `<major>.x` is the next minor version.
+* `<major>.<minor>` is the next release of a minor version, including patch releases.
+
+As an example, let's assume that the `7.x` branch is currently a not-yet-released `7.6.0`. Once `7.6.0` has reached feature freeze, it will be branched to `7.6` and `7.x` will be updated to reflect `7.7.0`. The release of `7.6.0` and subsequent patch releases will be cut from the `7.6` branch. At any time, you can verify the current version of a branch by inspecting the `version` attribute in the `package.json` file within the Kibana source.
+
+Pull requests are made into the `master` branch and then backported when it is safe and appropriate.
+
+* Breaking changes do not get backported and only go into `master`.
+* All non-breaking changes can be backported to the `<major>.x` branch.
+* Features should not be backported to a `<major>.<minor>` branch.
+* Bugs can be backported to a `<major>.<minor>` branch if the changes are safe and appropriate. Safety is a judgment call you make based on factors like the bug's severity, test coverage, confidence in the changes, etc. Your reasoning should be included in the pull request description.
+* Documentation changes can be backported to any branch at any time.
 
 [discrete]
 === Commits and Merging
@@ -109,4 +113,4 @@ Assuming you've successfully rebased and you're happy with the code, you should
 [discrete]
 === Creating a pull request
 
-See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.
\ No newline at end of file
+See <<development-pull-request>> for the next steps on getting your code changes merged into {kib}.

From 9a27beba75a57e39caeb3dcfa1c57000da6cb630 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 1 Sep 2020 07:11:42 -0700
Subject: [PATCH 148/216] [ML] Remove "Are you sure" from anomaly detection
 jobs (#75931)

---
 .../__snapshots__/delete_rule_modal.test.js.snap    | 12 ++----------
 .../select_rule_action/delete_rule_modal.js         | 11 ++---------
 .../components/delete_job_modal/delete_job_modal.js | 13 ++-----------
 x-pack/plugins/translations/translations/ja-JP.json |  2 --
 x-pack/plugins/translations/translations/zh-CN.json |  2 --
 5 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap
index 708bddd1453930..a132e6682ee250 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/__snapshots__/delete_rule_modal.test.js.snap
@@ -64,20 +64,12 @@ exports[`DeleteRuleModal renders modal after clicking delete rule link 1`] = `
       onConfirm={[Function]}
       title={
         <FormattedMessage
-          defaultMessage="Delete rule"
+          defaultMessage="Delete rule?"
           id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle"
           values={Object {}}
         />
       }
-    >
-      <p>
-        <FormattedMessage
-          defaultMessage="Are you sure you want to delete this rule?"
-          id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription"
-          values={Object {}}
-        />
-      </p>
-    </EuiConfirmModal>
+    />
   </EuiOverlayMask>
 </Fragment>
 `;
diff --git a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js
index 9fcd457df008f0..5140fe77ff9792 100644
--- a/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js
+++ b/x-pack/plugins/ml/public/application/components/rule_editor/select_rule_action/delete_rule_modal.js
@@ -47,7 +47,7 @@ export class DeleteRuleModal extends Component {
             title={
               <FormattedMessage
                 id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle"
-                defaultMessage="Delete rule"
+                defaultMessage="Delete rule?"
               />
             }
             onCancel={this.closeModal}
@@ -66,14 +66,7 @@ export class DeleteRuleModal extends Component {
               />
             }
             defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
-          >
-            <p>
-              <FormattedMessage
-                id="xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription"
-                defaultMessage="Are you sure you want to delete this rule?"
-              />
-            </p>
-          </EuiConfirmModal>
+          />
         </EuiOverlayMask>
       );
     }
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js
index 1e3ec6241311bc..f80578cb18341c 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/delete_job_modal/delete_job_modal.js
@@ -98,7 +98,7 @@ export class DeleteJobModal extends Component {
       const title = (
         <FormattedMessage
           id="xpack.ml.jobsList.deleteJobModal.deleteJobsTitle"
-          defaultMessage="Delete {jobsCount, plural, one {{jobId}} other {# jobs}}"
+          defaultMessage="Delete {jobsCount, plural, one {{jobId}} other {# jobs}}?"
           values={{
             jobsCount: this.state.jobs.length,
             jobId: this.state.jobs[0].id,
@@ -144,21 +144,12 @@ export class DeleteJobModal extends Component {
 
             {this.state.deleting === false && (
               <React.Fragment>
-                <p>
-                  <FormattedMessage
-                    id="xpack.ml.jobsList.deleteJobModal.deleteJobsDescription"
-                    defaultMessage="Are you sure you want to delete {jobsCount, plural, one {this job} other {these jobs}}?"
-                    values={{
-                      jobsCount: this.state.jobs.length,
-                    }}
-                  />
-                </p>
                 <p>
                   <FormattedMessage
                     id="xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription"
                     defaultMessage="Deleting {jobsCount, plural, one {a job} other {multiple jobs}} can be time consuming.
                     {jobsCount, plural, one {It} other {They}} will be deleted in the background
-                    and may not disappear from the jobs list instantly"
+                    and may not disappear from the jobs list instantly."
                     values={{
                       jobsCount: this.state.jobs.length,
                     }}
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b45598cb4f9985..b70ab0bb255610 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11608,7 +11608,6 @@
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.jobsList.deleteJobModal.closeButtonLabel": "閉じる",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "削除",
-    "xpack.ml.jobsList.deleteJobModal.deleteJobsDescription": "{jobsCount, plural, one {このジョブ} other {これらのジョブ}}を削除してよろしいですか？",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "{jobsCount, plural, one {{jobId}} other {# 件のジョブ}}を削除",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "{jobsCount, plural, one {ジョブ} other {複数ジョブ}}の削除には時間がかかる場合があります。{jobsCount, plural, one {} other {}}バックグラウンドで削除され、ジョブリストからすぐに消えない場合があります",
     "xpack.ml.jobsList.deleteJobModal.deletingJobsStatusLabel": "ジョブを削除中",
@@ -12277,7 +12276,6 @@
     "xpack.ml.ruleEditor.deleteJobRule.ruleNoLongerExistsErrorMessage": "ジョブ {jobId} の検知器インデックス {detectorIndex} のルールが現在存在しません",
     "xpack.ml.ruleEditor.deleteRuleModal.cancelButtonLabel": "キャンセル",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteButtonLabel": "削除",
-    "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription": "このルールを削除してよろしいですか？",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleLinkText": "ルールを削除",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle": "ルールの削除",
     "xpack.ml.ruleEditor.detectorDescriptionList.detectorTitle": "検知器",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 248a6986bb2a3d..72010e00dc820f 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11612,7 +11612,6 @@
     "xpack.ml.jobsList.deleteJobModal.cancelButtonLabel": "取消",
     "xpack.ml.jobsList.deleteJobModal.closeButtonLabel": "关闭",
     "xpack.ml.jobsList.deleteJobModal.deleteButtonLabel": "删除",
-    "xpack.ml.jobsList.deleteJobModal.deleteJobsDescription": "是否确定要删除{jobsCount, plural, one {此作业} other {这些作业}}？",
     "xpack.ml.jobsList.deleteJobModal.deleteJobsTitle": "删除 {jobsCount, plural, one {{jobId}} other {# 个作业}}",
     "xpack.ml.jobsList.deleteJobModal.deleteMultipleJobsDescription": "删除{jobsCount, plural, one {一个作业} other {多个作业}}会非常耗时。将在后台删除{jobsCount, plural, one {该作业} other {这些作业}}，但删除的作业可能不会立即从作业列表中消失",
     "xpack.ml.jobsList.deleteJobModal.deletingJobsStatusLabel": "正在删除作业",
@@ -12281,7 +12280,6 @@
     "xpack.ml.ruleEditor.deleteJobRule.ruleNoLongerExistsErrorMessage": "作业 {jobId} 中不再存在检测工具索引 {detectorIndex} 的规则",
     "xpack.ml.ruleEditor.deleteRuleModal.cancelButtonLabel": "取消",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteButtonLabel": "删除",
-    "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleDescription": "是否确定要删除此规则？",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleLinkText": "删除规则",
     "xpack.ml.ruleEditor.deleteRuleModal.deleteRuleTitle": "删除规则",
     "xpack.ml.ruleEditor.detectorDescriptionList.detectorTitle": "检测工具",

From ba9ad8d1fb1b23de8a0af4f96c183b4a5b162d4a Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Tue, 1 Sep 2020 09:27:03 -0700
Subject: [PATCH 149/216] [Reporting/CSV] Do not fail the job if scroll ID can
 not be cleared (#76014)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../csv/generate_csv/hit_iterator.test.ts     | 36 +++++++++++++++----
 .../csv/generate_csv/hit_iterator.ts          | 16 ++++++---
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.test.ts b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.test.ts
index 831bf45cf72ea2..b7147fe0a9ebde 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.test.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.test.ts
@@ -7,17 +7,13 @@
 import expect from '@kbn/expect';
 import sinon from 'sinon';
 import { CancellationToken } from '../../../../common';
-import { LevelLogger } from '../../../lib';
+import { createMockLevelLogger } from '../../../test_helpers/create_mock_levellogger';
 import { ScrollConfig } from '../../../types';
 import { createHitIterator } from './hit_iterator';
 
-const mockLogger = {
-  error: new Function(),
-  debug: new Function(),
-  warning: new Function(),
-} as LevelLogger;
+const mockLogger = createMockLevelLogger();
 const debugLogStub = sinon.stub(mockLogger, 'debug');
-const warnLogStub = sinon.stub(mockLogger, 'warning');
+const warnLogStub = sinon.stub(mockLogger, 'warn');
 const errorLogStub = sinon.stub(mockLogger, 'error');
 const mockCallEndpoint = sinon.stub();
 const mockSearchRequest = {};
@@ -134,4 +130,30 @@ describe('hitIterator', function () {
     expect(errorLogStub.callCount).to.be(1);
     expect(errorThrown).to.be(true);
   });
+
+  it('handles scroll id could not be cleared', async () => {
+    // Setup
+    mockCallEndpoint.withArgs('clearScroll').rejects({ status: 404 });
+
+    // Begin
+    const hitIterator = createHitIterator(mockLogger);
+    const iterator = hitIterator(
+      mockConfig,
+      mockCallEndpoint,
+      mockSearchRequest,
+      realCancellationToken
+    );
+
+    while (true) {
+      const { done: iterationDone, value: hit } = await iterator.next();
+      if (iterationDone) {
+        break;
+      }
+      expect(hit).to.be('you found me');
+    }
+
+    expect(mockCallEndpoint.callCount).to.be(13);
+    expect(warnLogStub.callCount).to.be(1);
+    expect(errorLogStub.callCount).to.be(1);
+  });
 });
diff --git a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.ts b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.ts
index dee653cf30007b..b95a3112002660 100644
--- a/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.ts
+++ b/x-pack/plugins/reporting/server/export_types/csv/generate_csv/hit_iterator.ts
@@ -68,11 +68,17 @@ export function createHitIterator(logger: LevelLogger) {
       );
     }
 
-    function clearScroll(scrollId: string | undefined) {
+    async function clearScroll(scrollId: string | undefined) {
       logger.debug('executing clearScroll request');
-      return callEndpoint('clearScroll', {
-        scrollId: [scrollId],
-      });
+      try {
+        await callEndpoint('clearScroll', {
+          scrollId: [scrollId],
+        });
+      } catch (err) {
+        // Do not throw the error, as the job can still be completed successfully
+        logger.warn('Scroll context can not be cleared!');
+        logger.error(err);
+      }
     }
 
     try {
@@ -86,7 +92,7 @@ export function createHitIterator(logger: LevelLogger) {
           ({ scrollId, hits } = await scroll(scrollId));
 
           if (cancellationToken.isCancelled()) {
-            logger.warning(
+            logger.warn(
               'Any remaining scrolling searches have been cancelled by the cancellation token.'
             );
           }

From 846647436e829c34e4f67edb9c4ce2df4abe7aab Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Tue, 1 Sep 2020 10:33:28 -0700
Subject: [PATCH 150/216] [yarn] remove typings-tester, use @ts-expect-error
 (#76341)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 package.json                                  |   2 -
 .../public/lib/aeroelastic/tsconfig.json      |  21 ---
 .../typespec_tests.ts => typespec.test.ts}    | 172 +++++++++---------
 .../scripts/optimize_tsconfig/tsconfig.json   |   3 +-
 x-pack/tsconfig.json                          |   3 +-
 yarn.lock                                     |   9 +-
 6 files changed, 94 insertions(+), 116 deletions(-)
 delete mode 100644 x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json
 rename x-pack/plugins/canvas/public/lib/aeroelastic/{__fixtures__/typescript/typespec_tests.ts => typespec.test.ts} (67%)

diff --git a/package.json b/package.json
index 5c95f538a00e1f..3485ce5d7a7fc2 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
     "test:ftr:server": "node scripts/functional_tests_server",
     "test:ftr:runner": "node scripts/functional_test_runner",
     "test:coverage": "grunt test:coverage",
-    "typespec": "typings-tester --config x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts",
     "checkLicenses": "node scripts/check_licenses --dev",
     "build": "node scripts/build --all-platforms",
     "start": "node scripts/kibana --dev",
@@ -473,7 +472,6 @@
     "topojson-client": "3.0.0",
     "tree-kill": "^1.2.2",
     "typescript": "4.0.2",
-    "typings-tester": "^0.3.2",
     "ui-select": "0.19.8",
     "vega": "^5.13.0",
     "vega-lite": "^4.13.1",
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json b/x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json
deleted file mode 100644
index 3b61e4b414626c..00000000000000
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "extends": "../../../../../tsconfig",
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es2018", "dom"],
-    "noImplicitAny": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": false,
-    "strictPropertyInitialization": true,
-    "noImplicitThis": true,
-    "noImplicitReturns": true,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "baseUrl": ".",
-    "paths": {
-      "layout/*": ["aeroelastic/*"]
-    },
-    "types": ["@kbn/x-pack/plugins/canvas/public/lib/aeroelastic"]
-  },
-  "exclude": ["node_modules", "**/*.spec.ts", "node_modules/@types/mocha"]
-}
diff --git a/x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
similarity index 67%
rename from x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts
rename to x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
index cb46a3d6be4025..3b1fde12edcc48 100644
--- a/x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts
+++ b/x-pack/plugins/canvas/public/lib/aeroelastic/typespec.test.ts
@@ -4,49 +4,47 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { select } from '../../select';
-import { Json, Selector, Vector2d, Vector3d, TransformMatrix2d, TransformMatrix3d } from '../..';
+import { select } from './select';
+import { Json, Selector, Vector2d, Vector3d, TransformMatrix2d, TransformMatrix3d } from './index';
 import {
   mvMultiply as mult2d,
   ORIGIN as UNIT2D,
   UNITMATRIX as UNITMATRIX2D,
   add as add2d,
-} from '../../matrix2d';
+} from './matrix2d';
 import {
   mvMultiply as mult3d,
   ORIGIN as UNIT3D,
   NANMATRIX as NANMATRIX3D,
   add as add3d,
-} from '../../matrix';
+} from './matrix';
 
-/*
+// helper to mark variables as "used" so they don't trigger errors
+const use = (...vars: any[]) => vars.includes(null);
 
+/*
   Type checking isn't too useful if future commits can accidentally weaken the type constraints, because a
   TypeScript linter will not complain - everything that passed before will continue to pass. The coder
   will not have feedback that the original intent with the typing got compromised. To declare the intent
   via passing and failing type checks, test cases are needed, some of which designed to expect a TS pass,
   some of them to expect a TS complaint. It documents intent for peers too, as type specs are a tough read.
 
-  Run compile-time type specification tests in the `kibana` root with:
-
-     yarn typespec
-
   Test "cases" expecting to pass TS checks are not annotated, while ones we want TS to complain about
   are prepended with the comment
- 
-  // typings:expect-error
+
+  // @ts-expect-error
 
   The test "suite" and "cases" are wrapped in IIFEs to prevent linters from complaining about the unused
   binding. It can be structured internally as desired.
-  
 */
 
-((): void => {
-  /**
-   * TYPE TEST SUITE
-   */
+describe('vector array creation', () => {
+  it('passes typechecking', () => {
+    let vec2d: Vector2d = UNIT2D;
+    let vec3d: Vector3d = UNIT3D;
+
+    use(vec2d, vec3d);
 
-  (function vectorArrayCreationTests(vec2d: Vector2d, vec3d: Vector3d): void {
     // 2D vector OK
     vec2d = [0, 0, 0] as Vector2d; // OK
     vec2d = [-0, NaN, -Infinity] as Vector2d; // IEEE 754 values are OK
@@ -57,30 +55,35 @@ import {
 
     // 2D vector not OK
 
-    // typings:expect-error
+    // @ts-expect-error
     vec2d = 3; // not even an array
-    // typings:expect-error
+    // @ts-expect-error
     vec2d = [] as Vector2d; // no elements
-    // typings:expect-error
+    // @ts-expect-error
     vec2d = [0, 0] as Vector2d; // too few elements
-    // typings:expect-error
+    // @ts-expect-error
     vec2d = [0, 0, 0, 0] as Vector2d; // too many elements
 
     // 3D vector not OK
 
-    // typings:expect-error
+    // @ts-expect-error
     vec3d = 3; // not even an array
-    // typings:expect-error
+    // @ts-expect-error
     vec3d = [] as Vector3d; // no elements
-    // typings:expect-error
+    // @ts-expect-error
     vec3d = [0, 0, 0] as Vector3d; // too few elements
-    // typings:expect-error
+    // @ts-expect-error
     vec3d = [0, 0, 0, 0, 0] as Vector3d; // too many elements
+  });
+});
+
+describe('matrix array creation', () => {
+  it('passes typechecking', () => {
+    let mat2d: TransformMatrix2d = UNITMATRIX2D;
+    let mat3d: TransformMatrix3d = NANMATRIX3D;
 
-    return; // arrayCreationTests
-  })(UNIT2D, UNIT3D);
+    use(mat2d, mat3d);
 
-  (function matrixArrayCreationTests(mat2d: TransformMatrix2d, mat3d: TransformMatrix3d): void {
     // 2D matrix OK
     mat2d = [0, 1, 2, 3, 4, 5, 6, 7, 8] as TransformMatrix2d; // OK
     mat2d = [-0, NaN, -Infinity, 3, 4, 5, 6, 7, 8] as TransformMatrix2d; // IEEE 754 values are OK
@@ -91,80 +94,87 @@ import {
 
     // 2D matrix not OK
 
-    // typings:expect-error
+    // @ts-expect-error
     mat2d = 3; // not even an array
-    // typings:expect-error
+    // @ts-expect-error
     mat2d = [] as TransformMatrix2d; // no elements
-    // typings:expect-error
+    // @ts-expect-error
     mat2d = [0, 1, 2, 3, 4, 5, 6, 7] as TransformMatrix2d; // too few elements
-    // typings:expect-error
+    // @ts-expect-error
     mat2d = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] as TransformMatrix2d; // too many elements
 
     // 3D vector not OK
 
-    // typings:expect-error
+    // @ts-expect-error
     mat3d = 3; // not even an array
-    // typings:expect-error
+    // @ts-expect-error
     mat3d = [] as TransformMatrix3d; // no elements
-    // typings:expect-error
+    // @ts-expect-error
     mat3d = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14] as TransformMatrix3d; // too few elements
-    // typings:expect-error
+    // @ts-expect-error
     mat3d = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16] as TransformMatrix3d; // too many elements
 
-    // Matrix modification should NOT be OK
-    mat3d[3] = 100; // too bad the ReadOnly part appears not to be enforced so can't precede it with typings:expect-error
+    // @ts-expect-error
+    mat3d[3] = 100; // Matrix modification is NOT OK
+  });
+});
 
-    return; // arrayCreationTests
-  })(UNITMATRIX2D, NANMATRIX3D);
+describe('matrix addition', () => {
+  it('passes typecheck', () => {
+    const mat2d: TransformMatrix2d = UNITMATRIX2D;
+    const mat3d: TransformMatrix3d = NANMATRIX3D;
 
-  (function matrixMatrixAdditionTests(mat2d: TransformMatrix2d, mat3d: TransformMatrix3d): void {
     add2d(mat2d, mat2d); // OK
     add3d(mat3d, mat3d); // OK
 
-    // typings:expect-error
+    // @ts-expect-error
     add2d(mat2d, mat3d); // at least one arg doesn't comply
-    // typings:expect-error
+    // @ts-expect-error
     add2d(mat3d, mat2d); // at least one arg doesn't comply
-    // typings:expect-error
+    // @ts-expect-error
     add2d(mat3d, mat3d); // at least one arg doesn't comply
-    // typings:expect-error
+    // @ts-expect-error
     add3d(mat2d, mat3d); // at least one arg doesn't comply
-    // typings:expect-error
+    // @ts-expect-error
     add3d(mat3d, mat2d); // at least one arg doesn't comply
-    // typings:expect-error
+    // @ts-expect-error
     add3d(mat2d, mat2d); // at least one arg doesn't comply
+  });
+});
 
-    return; // matrixMatrixAdditionTests
-  })(UNITMATRIX2D, NANMATRIX3D);
+describe('matric vector multiplication', () => {
+  it('passes typecheck', () => {
+    const vec2d: Vector2d = UNIT2D;
+    const mat2d: TransformMatrix2d = UNITMATRIX2D;
+    const vec3d: Vector3d = UNIT3D;
+    const mat3d: TransformMatrix3d = NANMATRIX3D;
 
-  (function matrixVectorMultiplicationTests(
-    vec2d: Vector2d,
-    mat2d: TransformMatrix2d,
-    vec3d: Vector3d,
-    mat3d: TransformMatrix3d
-  ): void {
     mult2d(mat2d, vec2d); // OK
     mult3d(mat3d, vec3d); // OK
 
-    // typings:expect-error
+    // @ts-expect-error
     mult3d(mat2d, vec2d); // trying to use a 3d fun for 2d args
-    // typings:expect-error
+    // @ts-expect-error
     mult2d(mat3d, vec3d); // trying to use a 2d fun for 3d args
 
-    // typings:expect-error
+    // @ts-expect-error
     mult2d(mat3d, vec2d); // 1st arg is a mismatch
-    // typings:expect-error
+    // @ts-expect-error
     mult2d(mat2d, vec3d); // 2nd arg is a mismatch
 
-    // typings:expect-error
+    // @ts-expect-error
     mult3d(mat2d, vec3d); // 1st arg is a mismatch
-    // typings:expect-error
+    // @ts-expect-error
     mult3d(mat3d, vec2d); // 2nd arg is a mismatch
+  });
+});
 
-    return; // matrixVectorTests
-  })(UNIT2D, UNITMATRIX2D, UNIT3D, NANMATRIX3D);
+describe('json', () => {
+  it('passes typecheck', () => {
+    let plain: Json = null;
+
+    use(plain);
 
-  (function jsonTests(plain: Json): void {
     // numbers are OK
     plain = 1;
     plain = NaN;
@@ -182,37 +192,37 @@ import {
     plain = [0, null, false, NaN, 3.14, 'one more'];
     plain = { a: { b: 5, c: { d: [1, 'a', -Infinity, null], e: -1 }, f: 'b' }, g: false };
 
-    // typings:expect-error
+    // @ts-expect-error
     plain = undefined; // it's undefined
-    // typings:expect-error
+    // @ts-expect-error
     plain = (a) => a; // it's a function
-    // typings:expect-error
+    // @ts-expect-error
     plain = [new Date()]; // it's a time
-    // typings:expect-error
+    // @ts-expect-error
     plain = { a: Symbol('haha') }; // symbol isn't permitted either
-    // typings:expect-error
+    // @ts-expect-error
     plain = window || void 0;
-    // typings:expect-error
+    // @ts-expect-error
     plain = { a: { b: 5, c: { d: [1, 'a', undefined, null] } } }; // going deep into the structure
+  });
+});
 
-    return; // jsonTests
-  })(null);
+describe('select', () => {
+  it('passes typecheck', () => {
+    let selector: Selector;
 
-  (function selectTests(selector: Selector): void {
     selector = select((a: Json) => a); // one arg
     selector = select((a: Json, b: Json): Json => `${a} and ${b}`); // more args
     selector = select(() => 1); // zero arg
     selector = select((...args: Json[]) => args); // variadic
 
-    // typings:expect-error
+    // @ts-expect-error
     selector = (a: Json) => a; // not a selector
-    // typings:expect-error
+    // @ts-expect-error
     selector = select(() => {}); // should yield a JSON value, but it returns void
-    // typings:expect-error
+    // @ts-expect-error
     selector = select((x: Json) => ({ a: x, b: undefined })); // should return a Json
 
-    return; // selectTests
-  })(select((a: Json) => a));
-
-  return; // test suite
-})();
+    use(selector);
+  });
+});
diff --git a/x-pack/plugins/security_solution/scripts/optimize_tsconfig/tsconfig.json b/x-pack/plugins/security_solution/scripts/optimize_tsconfig/tsconfig.json
index ea7a11b89dab2b..ac56a6af31c72c 100644
--- a/x-pack/plugins/security_solution/scripts/optimize_tsconfig/tsconfig.json
+++ b/x-pack/plugins/security_solution/scripts/optimize_tsconfig/tsconfig.json
@@ -10,7 +10,6 @@
   "exclude": [
     "test/**/*",
     "**/__fixtures__/**/*",
-    "plugins/security_solution/cypress/**/*",
-    "**/typespec_tests.ts"
+    "plugins/security_solution/cypress/**/*"
   ]
 }
diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
index 35e1800c6fbd19..7c6210bb9ce191 100644
--- a/x-pack/tsconfig.json
+++ b/x-pack/tsconfig.json
@@ -14,8 +14,7 @@
     "test/**/*",
     "plugins/security_solution/cypress/**/*",
     "plugins/apm/e2e/cypress/**/*",
-    "plugins/apm/scripts/**/*",
-    "**/typespec_tests.ts"
+    "plugins/apm/scripts/**/*"
   ],
   "compilerOptions": {
     "outDir": ".",
diff --git a/yarn.lock b/yarn.lock
index c0c2305609f580..3be2599c64201d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9035,7 +9035,7 @@ comma-separated-tokens@^1.0.1:
   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:
+commander@2, commander@2.19.0, commander@^2.11.0:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
@@ -28423,13 +28423,6 @@ typescript@4.0.2, typescript@^3.0.1, typescript@^3.0.3, typescript@^3.2.2, types
   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"
-  resolved "https://registry.yarnpkg.com/typings-tester/-/typings-tester-0.3.2.tgz#04cc499d15ab1d8b2d14dd48415a13d01333bc5b"
-  integrity sha512-HjGoAM2UoGhmSKKy23TYEKkxlphdJFdix5VvqWFLzH1BJVnnwG38tpC6SXPgqhfFGfHY77RlN1K8ts0dbWBQ7A==
-  dependencies:
-    commander "^2.12.2"
-
 ua-parser-js@^0.7.18:
   version "0.7.21"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"

From ff7e7effeda65065339f737ac845ad89323a11c6 Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Tue, 1 Sep 2020 10:42:28 -0700
Subject: [PATCH 151/216] [ML] Remove "Are you sure" from data frame analytics
 jobs (#76214)

---
 .../components/action_delete/delete_action_modal.tsx   | 10 +---------
 .../components/action_start/start_action_modal.tsx     |  4 ++--
 x-pack/plugins/translations/translations/ja-JP.json    |  1 -
 x-pack/plugins/translations/translations/zh-CN.json    |  1 -
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx
index 5ffa5e304b9968..5db8446dec32f7 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx
@@ -14,7 +14,6 @@ import {
   EuiFlexItem,
   EUI_MODAL_CONFIRM_BUTTON,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
 
 import { DeleteAction } from './use_delete_action';
 
@@ -40,7 +39,7 @@ export const DeleteActionModal: FC<DeleteAction> = ({
       <EuiConfirmModal
         data-test-subj="mlAnalyticsJobDeleteModal"
         title={i18n.translate('xpack.ml.dataframe.analyticsList.deleteModalTitle', {
-          defaultMessage: 'Delete {analyticsId}',
+          defaultMessage: 'Delete {analyticsId}?',
           values: { analyticsId: item.config.id },
         })}
         onCancel={closeModal}
@@ -60,13 +59,6 @@ export const DeleteActionModal: FC<DeleteAction> = ({
         defaultFocusedButton={EUI_MODAL_CONFIRM_BUTTON}
         buttonColor="danger"
       >
-        <p>
-          <FormattedMessage
-            id="xpack.ml.dataframe.analyticsList.deleteModalBody"
-            defaultMessage="Are you sure you want to delete this analytics job?"
-          />
-        </p>
-
         <EuiFlexGroup direction="column" gutterSize="none">
           <EuiFlexItem>
             {userCanDeleteIndex && (
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx
index fa559e807f5ea5..2048d1144952d7 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_start/start_action_modal.tsx
@@ -17,7 +17,7 @@ export const StartActionModal: FC<StartAction> = ({ closeModal, item, startAndCl
         <EuiOverlayMask>
           <EuiConfirmModal
             title={i18n.translate('xpack.ml.dataframe.analyticsList.startModalTitle', {
-              defaultMessage: 'Start {analyticsId}',
+              defaultMessage: 'Start {analyticsId}?',
               values: { analyticsId: item.config.id },
             })}
             onCancel={closeModal}
@@ -40,7 +40,7 @@ export const StartActionModal: FC<StartAction> = ({ closeModal, item, startAndCl
             <p>
               {i18n.translate('xpack.ml.dataframe.analyticsList.startModalBody', {
                 defaultMessage:
-                  'A data frame analytics job will increase search and indexing load in your cluster. Please stop the analytics job if excessive load is experienced. Are you sure you want to start this analytics job?',
+                  'A data frame analytics job increases search and indexing load in your cluster. If excessive load occurs, stop the job.',
               })}
             </p>
           </EuiConfirmModal>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b70ab0bb255610..df78975d21b075 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -11113,7 +11113,6 @@
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternSuccessMessage": "インデックスパターン{destinationIndex}を削除する要求が確認されました。",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexSuccessMessage": "ディスティネーションインデックス{destinationIndex}を削除する要求が確認されました。",
     "xpack.ml.dataframe.analyticsList.deleteDestinationIndexTitle": "ディスティネーションインデックス{indexName}を削除",
-    "xpack.ml.dataframe.analyticsList.deleteModalBody": "この分析ジョブを削除してよろしいですか？",
     "xpack.ml.dataframe.analyticsList.deleteModalCancelButton": "キャンセル",
     "xpack.ml.dataframe.analyticsList.deleteModalDeleteButton": "削除",
     "xpack.ml.dataframe.analyticsList.deleteModalTitle": "{analyticsId}の削除",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 72010e00dc820f..cfee565a1da933 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -11116,7 +11116,6 @@
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternSuccessMessage": "删除索引模式 {destinationIndex} 的请求已确认。",
     "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexSuccessMessage": "删除目标索引 {destinationIndex} 的请求已确认。",
     "xpack.ml.dataframe.analyticsList.deleteDestinationIndexTitle": "删除目标索引 {indexName}",
-    "xpack.ml.dataframe.analyticsList.deleteModalBody": "是否确定要删除此分析作业？",
     "xpack.ml.dataframe.analyticsList.deleteModalCancelButton": "取消",
     "xpack.ml.dataframe.analyticsList.deleteModalDeleteButton": "删除",
     "xpack.ml.dataframe.analyticsList.deleteModalTitle": "删除 {analyticsId}",

From 981691d378cf6bce738d8d30f568f2f407468e29 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Tue, 1 Sep 2020 19:42:41 +0200
Subject: [PATCH 152/216] Add setHeaderActionMenu API to AppMountParameters
 (#75422)

* add `setHeaderActionMenu` to AppMountParameters

* allow to remove the current menu by calling handler with undefined

* update generated doc

* updating snapshots

* fix legacy tests

* call renderApp with params

* rename toMountPoint component file for consistency

* add the MountPointPortal utility component

* adapt TopNavMenu to add optional `setMenuMountPoint` prop

* add kibanaReact as required bundle.

* use innerHTML instead of textContent for portal tests

* add error boundaries to portal component

* improve renderLayout readability

* duplicate wrapper in portal mode to avoid altering styles

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...a-plugin-core-public.appmountparameters.md |   1 +
 ....appmountparameters.setheaderactionmenu.md |  39 ++++
 .../application_service.test.ts.snap          |   1 +
 .../application/application_service.mock.ts   |   2 +
 .../application/application_service.tsx       |  42 +++-
 .../application_service.test.tsx              | 187 ++++++++++++++++
 .../integration_tests/router.test.tsx         |   1 +
 src/core/public/application/types.ts          |  40 ++++
 .../application/ui/app_container.test.tsx     |   4 +
 .../public/application/ui/app_container.tsx   |  17 +-
 src/core/public/application/ui/app_router.tsx |   7 +-
 .../header/__snapshots__/header.test.tsx.snap |  36 +++
 src/core/public/mocks.ts                      |   1 +
 src/core/public/public.api.md                 |   1 +
 src/plugins/dev_tools/public/application.tsx  |   1 +
 src/plugins/kibana_react/public/index.ts      |   2 +-
 src/plugins/kibana_react/public/util/index.ts |   3 +-
 .../public/util/mount_point_portal.test.tsx   | 210 ++++++++++++++++++
 .../public/util/mount_point_portal.tsx        |  88 ++++++++
 .../{react_mount.tsx => to_mount_point.tsx}   |   0
 src/plugins/navigation/kibana.json            |   5 +-
 .../public/top_nav_menu/top_nav_menu.test.tsx |  60 ++++-
 .../public/top_nav_menu/top_nav_menu.tsx      |  53 ++++-
 x-pack/plugins/ml/public/plugin.ts            |   7 +-
 .../account_management_app.test.ts            |   1 +
 .../access_agreement_app.test.ts              |   1 +
 .../capture_url/capture_url_app.test.ts       |   1 +
 .../logged_out/logged_out_app.test.ts         |   1 +
 .../authentication/login/login_app.test.ts    |   1 +
 .../authentication/logout/logout_app.test.ts  |   1 +
 .../overwritten_session_app.test.ts           |   1 +
 31 files changed, 785 insertions(+), 30 deletions(-)
 create mode 100644 docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md
 create mode 100644 src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
 create mode 100644 src/plugins/kibana_react/public/util/mount_point_portal.tsx
 rename src/plugins/kibana_react/public/util/{react_mount.tsx => to_mount_point.tsx} (100%)

diff --git a/docs/development/core/public/kibana-plugin-core-public.appmountparameters.md b/docs/development/core/public/kibana-plugin-core-public.appmountparameters.md
index de79fc8281c45f..f6c57603beddec 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appmountparameters.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appmountparameters.md
@@ -19,4 +19,5 @@ export interface AppMountParameters<HistoryLocationState = unknown>
 |  [element](./kibana-plugin-core-public.appmountparameters.element.md) | <code>HTMLElement</code> | The container element to render the application into. |
 |  [history](./kibana-plugin-core-public.appmountparameters.history.md) | <code>ScopedHistory&lt;HistoryLocationState&gt;</code> | A scoped history instance for your application. Should be used to wire up your applications Router. |
 |  [onAppLeave](./kibana-plugin-core-public.appmountparameters.onappleave.md) | <code>(handler: AppLeaveHandler) =&gt; void</code> | A function that can be used to register a handler that will be called when the user is leaving the current application, allowing to prompt a confirmation message before actually changing the page.<!-- -->This will be called either when the user goes to another application, or when trying to close the tab or manually changing the url. |
+|  [setHeaderActionMenu](./kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md) | <code>(menuMount: MountPoint &#124; undefined) =&gt; void</code> | A function that can be used to set the mount point used to populate the application action container in the chrome header.<!-- -->Calling the handler multiple time will erase the current content of the action menu with the mount from the latest call. Calling the handler with <code>undefined</code> will unmount the current mount point. Calling the handler after the application has been unmounted will have no effect. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md b/docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md
new file mode 100644
index 00000000000000..ca9cee64bb1f92
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md
@@ -0,0 +1,39 @@
+<!-- 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; [AppMountParameters](./kibana-plugin-core-public.appmountparameters.md) &gt; [setHeaderActionMenu](./kibana-plugin-core-public.appmountparameters.setheaderactionmenu.md)
+
+## AppMountParameters.setHeaderActionMenu property
+
+A function that can be used to set the mount point used to populate the application action container in the chrome header.
+
+Calling the handler multiple time will erase the current content of the action menu with the mount from the latest call. Calling the handler with `undefined` will unmount the current mount point. Calling the handler after the application has been unmounted will have no effect.
+
+<b>Signature:</b>
+
+```typescript
+setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
+```
+
+## Example
+
+
+```ts
+// application.tsx
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { BrowserRouter, Route } from 'react-router-dom';
+
+import { CoreStart, AppMountParameters } from 'src/core/public';
+import { MyPluginDepsStart } from './plugin';
+
+export renderApp = ({ element, history, setHeaderActionMenu }: AppMountParameters) => {
+   const { renderApp } = await import('./application');
+   const { renderActionMenu } = await import('./action_menu');
+   setHeaderActionMenu((element) => {
+     return renderActionMenu(element);
+   })
+   return renderApp({ element, history });
+}
+
+```
+
diff --git a/src/core/public/application/__snapshots__/application_service.test.ts.snap b/src/core/public/application/__snapshots__/application_service.test.ts.snap
index c63a22170c4f61..a6c9eb27e338a5 100644
--- a/src/core/public/application/__snapshots__/application_service.test.ts.snap
+++ b/src/core/public/application/__snapshots__/application_service.test.ts.snap
@@ -80,6 +80,7 @@ exports[`#start() getComponent returns renderable JSX tree 1`] = `
     }
   }
   mounters={Map {}}
+  setAppActionMenu={[Function]}
   setAppLeaveHandler={[Function]}
   setIsMounting={[Function]}
 />
diff --git a/src/core/public/application/application_service.mock.ts b/src/core/public/application/application_service.mock.ts
index 47a8a01d917eb0..2bdf56ee342114 100644
--- a/src/core/public/application/application_service.mock.ts
+++ b/src/core/public/application/application_service.mock.ts
@@ -20,6 +20,7 @@
 import { History } from 'history';
 import { BehaviorSubject, Subject } from 'rxjs';
 
+import type { MountPoint } from '../types';
 import { capabilitiesServiceMock } from './capabilities/capabilities_service.mock';
 import {
   ApplicationSetup,
@@ -87,6 +88,7 @@ const createInternalStartContractMock = (): jest.Mocked<InternalApplicationStart
     applications$: new BehaviorSubject<Map<string, PublicAppInfo | PublicLegacyAppInfo>>(new Map()),
     capabilities: capabilitiesServiceMock.createStartContract().capabilities,
     currentAppId$: currentAppId$.asObservable(),
+    currentActionMenu$: new BehaviorSubject<MountPoint | undefined>(undefined),
     getComponent: jest.fn(),
     getUrlForApp: jest.fn(),
     navigateToApp: jest.fn().mockImplementation((appId) => currentAppId$.next(appId)),
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index d7f15decb255dd..df0f74c1914e9a 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -22,6 +22,7 @@ import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
 import { map, shareReplay, takeUntil, distinctUntilChanged, filter } from 'rxjs/operators';
 import { createBrowserHistory, History } from 'history';
 
+import { MountPoint } from '../types';
 import { InjectedMetadataSetup } from '../injected_metadata';
 import { HttpSetup, HttpStart } from '../http';
 import { OverlayStart } from '../overlays';
@@ -90,6 +91,11 @@ interface AppUpdaterWrapper {
   updater: AppUpdater;
 }
 
+interface AppInternalState {
+  leaveHandler?: AppLeaveHandler;
+  actionMenu?: MountPoint;
+}
+
 /**
  * Service that is responsible for registering new applications.
  * @internal
@@ -98,8 +104,9 @@ export class ApplicationService {
   private readonly apps = new Map<string, App<any> | LegacyApp>();
   private readonly mounters = new Map<string, Mounter>();
   private readonly capabilities = new CapabilitiesService();
-  private readonly appLeaveHandlers = new Map<string, AppLeaveHandler>();
+  private readonly appInternalStates = new Map<string, AppInternalState>();
   private currentAppId$ = new BehaviorSubject<string | undefined>(undefined);
+  private currentActionMenu$ = new BehaviorSubject<MountPoint | undefined>(undefined);
   private readonly statusUpdaters$ = new BehaviorSubject<Map<symbol, AppUpdaterWrapper>>(new Map());
   private readonly subscriptions: Subscription[] = [];
   private stop$ = new Subject();
@@ -293,12 +300,14 @@ export class ApplicationService {
         if (path === undefined) {
           path = applications$.value.get(appId)?.defaultPath;
         }
-        this.appLeaveHandlers.delete(this.currentAppId$.value!);
+        this.appInternalStates.delete(this.currentAppId$.value!);
         this.navigate!(getAppUrl(availableMounters, appId, path), state, replace);
         this.currentAppId$.next(appId);
       }
     };
 
+    this.currentAppId$.subscribe(() => this.refreshCurrentActionMenu());
+
     return {
       applications$: applications$.pipe(
         map((apps) => new Map([...apps.entries()].map(([id, app]) => [id, getAppInfo(app)]))),
@@ -310,6 +319,10 @@ export class ApplicationService {
         distinctUntilChanged(),
         takeUntil(this.stop$)
       ),
+      currentActionMenu$: this.currentActionMenu$.pipe(
+        distinctUntilChanged(),
+        takeUntil(this.stop$)
+      ),
       history: this.history,
       registerMountContext: this.mountContext.registerContext,
       getUrlForApp: (
@@ -338,6 +351,7 @@ export class ApplicationService {
             mounters={availableMounters}
             appStatuses$={applicationStatuses$}
             setAppLeaveHandler={this.setAppLeaveHandler}
+            setAppActionMenu={this.setAppActionMenu}
             setIsMounting={(isMounting) => httpLoadingCount$.next(isMounting ? 1 : 0)}
           />
         );
@@ -346,7 +360,24 @@ export class ApplicationService {
   }
 
   private setAppLeaveHandler = (appId: string, handler: AppLeaveHandler) => {
-    this.appLeaveHandlers.set(appId, handler);
+    this.appInternalStates.set(appId, {
+      ...(this.appInternalStates.get(appId) ?? {}),
+      leaveHandler: handler,
+    });
+  };
+
+  private setAppActionMenu = (appId: string, mount: MountPoint | undefined) => {
+    this.appInternalStates.set(appId, {
+      ...(this.appInternalStates.get(appId) ?? {}),
+      actionMenu: mount,
+    });
+    this.refreshCurrentActionMenu();
+  };
+
+  private refreshCurrentActionMenu = () => {
+    const appId = this.currentAppId$.getValue();
+    const currentActionMenu = appId ? this.appInternalStates.get(appId)?.actionMenu : undefined;
+    this.currentActionMenu$.next(currentActionMenu);
   };
 
   private async shouldNavigate(overlays: OverlayStart): Promise<boolean> {
@@ -354,7 +385,7 @@ export class ApplicationService {
     if (currentAppId === undefined) {
       return true;
     }
-    const action = getLeaveAction(this.appLeaveHandlers.get(currentAppId));
+    const action = getLeaveAction(this.appInternalStates.get(currentAppId)?.leaveHandler);
     if (isConfirmAction(action)) {
       const confirmed = await overlays.openConfirm(action.text, {
         title: action.title,
@@ -372,7 +403,7 @@ export class ApplicationService {
     if (currentAppId === undefined) {
       return;
     }
-    const action = getLeaveAction(this.appLeaveHandlers.get(currentAppId));
+    const action = getLeaveAction(this.appInternalStates.get(currentAppId)?.leaveHandler);
     if (isConfirmAction(action)) {
       event.preventDefault();
       // some browsers accept a string return value being the message displayed
@@ -383,6 +414,7 @@ export class ApplicationService {
   public stop() {
     this.stop$.next();
     this.currentAppId$.complete();
+    this.currentActionMenu$.complete();
     this.statusUpdaters$.complete();
     this.subscriptions.forEach((sub) => sub.unsubscribe());
     window.removeEventListener('beforeunload', this.onBeforeUnload);
diff --git a/src/core/public/application/integration_tests/application_service.test.tsx b/src/core/public/application/integration_tests/application_service.test.tsx
index b0419d276dfa18..9eafddd6a61fed 100644
--- a/src/core/public/application/integration_tests/application_service.test.tsx
+++ b/src/core/public/application/integration_tests/application_service.test.tsx
@@ -30,6 +30,8 @@ import { MockLifecycle } from '../test_types';
 import { overlayServiceMock } from '../../overlays/overlay_service.mock';
 import { AppMountParameters } from '../types';
 import { ScopedHistory } from '../scoped_history';
+import { Observable } from 'rxjs';
+import { MountPoint } from 'kibana/public';
 
 const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
 
@@ -309,4 +311,189 @@ describe('ApplicationService', () => {
       expect(history.entries[1].pathname).toEqual('/app/app1');
     });
   });
+
+  describe('registering action menus', () => {
+    const getValue = (obs: Observable<MountPoint | undefined>): Promise<MountPoint | undefined> => {
+      return obs.pipe(take(1)).toPromise();
+    };
+
+    const mounter1: MountPoint = () => () => undefined;
+    const mounter2: MountPoint = () => () => undefined;
+
+    it('updates the observable value when an application is mounted', async () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), {
+        id: 'app1',
+        title: 'App1',
+        mount: async ({ setHeaderActionMenu }: AppMountParameters) => {
+          setHeaderActionMenu(mounter1);
+          return () => undefined;
+        },
+      });
+
+      const { navigateToApp, getComponent, currentActionMenu$ } = await service.start(startDeps);
+      update = createRenderer(getComponent());
+
+      expect(await getValue(currentActionMenu$)).toBeUndefined();
+
+      await act(async () => {
+        await navigateToApp('app1');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter1);
+    });
+
+    it('updates the observable value when switching application', async () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), {
+        id: 'app1',
+        title: 'App1',
+        mount: async ({ setHeaderActionMenu }: AppMountParameters) => {
+          setHeaderActionMenu(mounter1);
+          return () => undefined;
+        },
+      });
+      register(Symbol(), {
+        id: 'app2',
+        title: 'App2',
+        mount: async ({ setHeaderActionMenu }: AppMountParameters) => {
+          setHeaderActionMenu(mounter2);
+          return () => undefined;
+        },
+      });
+
+      const { navigateToApp, getComponent, currentActionMenu$ } = await service.start(startDeps);
+      update = createRenderer(getComponent());
+
+      await act(async () => {
+        await navigateToApp('app1');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter1);
+
+      await act(async () => {
+        await navigateToApp('app2');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter2);
+    });
+
+    it('updates the observable value to undefined when switching to an application without action menu', async () => {
+      const { register } = service.setup(setupDeps);
+
+      register(Symbol(), {
+        id: 'app1',
+        title: 'App1',
+        mount: async ({ setHeaderActionMenu }: AppMountParameters) => {
+          setHeaderActionMenu(mounter1);
+          return () => undefined;
+        },
+      });
+      register(Symbol(), {
+        id: 'app2',
+        title: 'App2',
+        mount: async ({}: AppMountParameters) => {
+          return () => undefined;
+        },
+      });
+
+      const { navigateToApp, getComponent, currentActionMenu$ } = await service.start(startDeps);
+      update = createRenderer(getComponent());
+
+      await act(async () => {
+        await navigateToApp('app1');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter1);
+
+      await act(async () => {
+        await navigateToApp('app2');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBeUndefined();
+    });
+
+    it('allow applications to call `setHeaderActionMenu` multiple times', async () => {
+      const { register } = service.setup(setupDeps);
+
+      let resolveMount: () => void;
+      const promise = new Promise((resolve) => {
+        resolveMount = resolve;
+      });
+
+      register(Symbol(), {
+        id: 'app1',
+        title: 'App1',
+        mount: async ({ setHeaderActionMenu }: AppMountParameters) => {
+          setHeaderActionMenu(mounter1);
+          promise.then(() => {
+            setHeaderActionMenu(mounter2);
+          });
+          return () => undefined;
+        },
+      });
+
+      const { navigateToApp, getComponent, currentActionMenu$ } = await service.start(startDeps);
+      update = createRenderer(getComponent());
+
+      await act(async () => {
+        await navigateToApp('app1');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter1);
+
+      await act(async () => {
+        resolveMount();
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter2);
+    });
+
+    it('allow applications to unset the current menu', async () => {
+      const { register } = service.setup(setupDeps);
+
+      let resolveMount: () => void;
+      const promise = new Promise((resolve) => {
+        resolveMount = resolve;
+      });
+
+      register(Symbol(), {
+        id: 'app1',
+        title: 'App1',
+        mount: async ({ setHeaderActionMenu }: AppMountParameters) => {
+          setHeaderActionMenu(mounter1);
+          promise.then(() => {
+            setHeaderActionMenu(undefined);
+          });
+          return () => undefined;
+        },
+      });
+
+      const { navigateToApp, getComponent, currentActionMenu$ } = await service.start(startDeps);
+      update = createRenderer(getComponent());
+
+      await act(async () => {
+        await navigateToApp('app1');
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBe(mounter1);
+
+      await act(async () => {
+        resolveMount();
+        await flushPromises();
+      });
+
+      expect(await getValue(currentActionMenu$)).toBeUndefined();
+    });
+  });
 });
diff --git a/src/core/public/application/integration_tests/router.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
index f992e121437a96..6408b8123365e4 100644
--- a/src/core/public/application/integration_tests/router.test.tsx
+++ b/src/core/public/application/integration_tests/router.test.tsx
@@ -59,6 +59,7 @@ describe('AppRouter', () => {
         mounters={mockMountersToMounters()}
         appStatuses$={mountersToAppStatus$()}
         setAppLeaveHandler={noop}
+        setAppActionMenu={noop}
         setIsMounting={noop}
       />
     );
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 0fe97431b15690..320416a8c2379a 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -21,6 +21,7 @@ import { Observable } from 'rxjs';
 import { History } from 'history';
 import { RecursiveReadonly } from '@kbn/utility-types';
 
+import { MountPoint } from '../types';
 import { Capabilities } from './capabilities';
 import { ChromeStart } from '../chrome';
 import { IContextProvider } from '../context';
@@ -495,6 +496,37 @@ export interface AppMountParameters<HistoryLocationState = unknown> {
    * ```
    */
   onAppLeave: (handler: AppLeaveHandler) => void;
+
+  /**
+   * A function that can be used to set the mount point used to populate the application action container
+   * in the chrome header.
+   *
+   * Calling the handler multiple time will erase the current content of the action menu with the mount from the latest call.
+   * Calling the handler with `undefined` will unmount the current mount point.
+   * Calling the handler after the application has been unmounted will have no effect.
+   *
+   * @example
+   *
+   * ```ts
+   * // application.tsx
+   * import React from 'react';
+   * import ReactDOM from 'react-dom';
+   * import { BrowserRouter, Route } from 'react-router-dom';
+   *
+   * import { CoreStart, AppMountParameters } from 'src/core/public';
+   * import { MyPluginDepsStart } from './plugin';
+   *
+   * export renderApp = ({ element, history, setHeaderActionMenu }: AppMountParameters) => {
+   *    const { renderApp } = await import('./application');
+   *    const { renderActionMenu } = await import('./action_menu');
+   *    setHeaderActionMenu((element) => {
+   *      return renderActionMenu(element);
+   *    })
+   *    return renderApp({ element, history });
+   * }
+   * ```
+   */
+  setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
 }
 
 /**
@@ -820,6 +852,14 @@ export interface InternalApplicationStart extends Omit<ApplicationStart, 'regist
   // Internal APIs
   getComponent(): JSX.Element | null;
 
+  /**
+   * The potential action menu set by the currently mounted app.
+   * Consumed by the chrome header.
+   *
+   * @internal
+   */
+  currentActionMenu$: Observable<MountPoint | undefined>;
+
   /**
    * The global history instance, exposed only to Core. Undefined when rendering a legacy application.
    * @internal
diff --git a/src/core/public/application/ui/app_container.test.tsx b/src/core/public/application/ui/app_container.test.tsx
index a94313dd53abbc..e26fe7e59fd040 100644
--- a/src/core/public/application/ui/app_container.test.tsx
+++ b/src/core/public/application/ui/app_container.test.tsx
@@ -29,6 +29,7 @@ import { ScopedHistory } from '../scoped_history';
 describe('AppContainer', () => {
   const appId = 'someApp';
   const setAppLeaveHandler = jest.fn();
+  const setAppActionMenu = jest.fn();
   const setIsMounting = jest.fn();
 
   beforeEach(() => {
@@ -76,6 +77,7 @@ describe('AppContainer', () => {
         appStatus={AppStatus.inaccessible}
         mounter={mounter}
         setAppLeaveHandler={setAppLeaveHandler}
+        setAppActionMenu={setAppActionMenu}
         setIsMounting={setIsMounting}
         createScopedHistory={(appPath: string) =>
           // Create a history using the appPath as the current location
@@ -116,6 +118,7 @@ describe('AppContainer', () => {
         appStatus={AppStatus.accessible}
         mounter={mounter}
         setAppLeaveHandler={setAppLeaveHandler}
+        setAppActionMenu={setAppActionMenu}
         setIsMounting={setIsMounting}
         createScopedHistory={(appPath: string) =>
           // Create a history using the appPath as the current location
@@ -158,6 +161,7 @@ describe('AppContainer', () => {
         appStatus={AppStatus.accessible}
         mounter={mounter}
         setAppLeaveHandler={setAppLeaveHandler}
+        setAppActionMenu={setAppActionMenu}
         setIsMounting={setIsMounting}
         createScopedHistory={(appPath: string) =>
           // Create a history using the appPath as the current location
diff --git a/src/core/public/application/ui/app_container.tsx b/src/core/public/application/ui/app_container.tsx
index 332c31c64b6ba1..f668cf851da55f 100644
--- a/src/core/public/application/ui/app_container.tsx
+++ b/src/core/public/application/ui/app_container.tsx
@@ -25,8 +25,9 @@ import React, {
   useState,
   MutableRefObject,
 } from 'react';
-
 import { EuiLoadingSpinner } from '@elastic/eui';
+
+import type { MountPoint } from '../../types';
 import { AppLeaveHandler, AppStatus, AppUnmount, Mounter } from '../types';
 import { AppNotFound } from './app_not_found_screen';
 import { ScopedHistory } from '../scoped_history';
@@ -39,6 +40,7 @@ interface Props {
   mounter?: Mounter;
   appStatus: AppStatus;
   setAppLeaveHandler: (appId: string, handler: AppLeaveHandler) => void;
+  setAppActionMenu: (appId: string, mount: MountPoint | undefined) => void;
   createScopedHistory: (appUrl: string) => ScopedHistory;
   setIsMounting: (isMounting: boolean) => void;
 }
@@ -48,6 +50,7 @@ export const AppContainer: FunctionComponent<Props> = ({
   appId,
   appPath,
   setAppLeaveHandler,
+  setAppActionMenu,
   createScopedHistory,
   appStatus,
   setIsMounting,
@@ -84,6 +87,7 @@ export const AppContainer: FunctionComponent<Props> = ({
             history: createScopedHistory(appPath),
             element: elementRef.current!,
             onAppLeave: (handler) => setAppLeaveHandler(appId, handler),
+            setHeaderActionMenu: (menuMount) => setAppActionMenu(appId, menuMount),
           })) || null;
       } catch (e) {
         // TODO: add error UI
@@ -98,7 +102,16 @@ export const AppContainer: FunctionComponent<Props> = ({
     mount();
 
     return unmount;
-  }, [appId, appStatus, mounter, createScopedHistory, setAppLeaveHandler, appPath, setIsMounting]);
+  }, [
+    appId,
+    appStatus,
+    mounter,
+    createScopedHistory,
+    setAppLeaveHandler,
+    setAppActionMenu,
+    appPath,
+    setIsMounting,
+  ]);
 
   return (
     <Fragment>
diff --git a/src/core/public/application/ui/app_router.tsx b/src/core/public/application/ui/app_router.tsx
index f1f22237c32db0..5021dd3ae765ab 100644
--- a/src/core/public/application/ui/app_router.tsx
+++ b/src/core/public/application/ui/app_router.tsx
@@ -23,6 +23,7 @@ import { History } from 'history';
 import { Observable } from 'rxjs';
 import useObservable from 'react-use/lib/useObservable';
 
+import type { MountPoint } from '../../types';
 import { AppLeaveHandler, AppStatus, Mounter } from '../types';
 import { AppContainer } from './app_container';
 import { ScopedHistory } from '../scoped_history';
@@ -32,6 +33,7 @@ interface Props {
   history: History;
   appStatuses$: Observable<Map<string, AppStatus>>;
   setAppLeaveHandler: (appId: string, handler: AppLeaveHandler) => void;
+  setAppActionMenu: (appId: string, mount: MountPoint | undefined) => void;
   setIsMounting: (isMounting: boolean) => void;
 }
 
@@ -43,6 +45,7 @@ export const AppRouter: FunctionComponent<Props> = ({
   history,
   mounters,
   setAppLeaveHandler,
+  setAppActionMenu,
   appStatuses$,
   setIsMounting,
 }) => {
@@ -69,7 +72,7 @@ export const AppRouter: FunctionComponent<Props> = ({
                   appPath={path}
                   appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
                   createScopedHistory={createScopedHistory}
-                  {...{ appId, mounter, setAppLeaveHandler, setIsMounting }}
+                  {...{ appId, mounter, setAppLeaveHandler, setAppActionMenu, setIsMounting }}
                 />
               )}
             />
@@ -94,7 +97,7 @@ export const AppRouter: FunctionComponent<Props> = ({
                 appId={id}
                 appStatus={appStatuses.get(id) ?? AppStatus.inaccessible}
                 createScopedHistory={createScopedHistory}
-                {...{ mounter, setAppLeaveHandler, setIsMounting }}
+                {...{ mounter, setAppLeaveHandler, setAppActionMenu, setIsMounting }}
               />
             );
           }}
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 3aabd2a1127dcd..5ec7a4773967b2 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
@@ -29,6 +29,15 @@ exports[`Header renders 1`] = `
         "management": Object {},
         "navLinks": Object {},
       },
+      "currentActionMenu$": BehaviorSubject {
+        "_isScalar": false,
+        "_value": undefined,
+        "closed": false,
+        "hasError": false,
+        "isStopped": false,
+        "observers": Array [],
+        "thrownError": null,
+      },
       "currentAppId$": Observable {
         "_isScalar": false,
         "source": Subject {
@@ -641,6 +650,15 @@ exports[`Header renders 2`] = `
         "management": Object {},
         "navLinks": Object {},
       },
+      "currentActionMenu$": BehaviorSubject {
+        "_isScalar": false,
+        "_value": undefined,
+        "closed": false,
+        "hasError": false,
+        "isStopped": false,
+        "observers": Array [],
+        "thrownError": null,
+      },
       "currentAppId$": Observable {
         "_isScalar": false,
         "source": Subject {
@@ -4854,6 +4872,15 @@ exports[`Header renders 3`] = `
         "management": Object {},
         "navLinks": Object {},
       },
+      "currentActionMenu$": BehaviorSubject {
+        "_isScalar": false,
+        "_value": undefined,
+        "closed": false,
+        "hasError": false,
+        "isStopped": false,
+        "observers": Array [],
+        "thrownError": null,
+      },
       "currentAppId$": Observable {
         "_isScalar": false,
         "source": Subject {
@@ -9708,6 +9735,15 @@ exports[`Header renders 4`] = `
         "management": Object {},
         "navLinks": Object {},
       },
+      "currentActionMenu$": BehaviorSubject {
+        "_isScalar": false,
+        "_value": undefined,
+        "closed": false,
+        "hasError": false,
+        "isStopped": false,
+        "observers": Array [],
+        "thrownError": null,
+      },
       "currentAppId$": Observable {
         "_isScalar": false,
         "source": Subject {
diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts
index 2f7f6fae944369..aefcb830d40bf0 100644
--- a/src/core/public/mocks.ts
+++ b/src/core/public/mocks.ts
@@ -166,6 +166,7 @@ function createAppMountParametersMock(appBasePath = '') {
     element: document.createElement('div'),
     history,
     onAppLeave: jest.fn(),
+    setHeaderActionMenu: jest.fn(),
   };
 
   return params;
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 6f25f46c76fb91..570732fa6e5d66 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -165,6 +165,7 @@ export interface AppMountParameters<HistoryLocationState = unknown> {
     element: HTMLElement;
     history: ScopedHistory<HistoryLocationState>;
     onAppLeave: (handler: AppLeaveHandler) => void;
+    setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
 }
 
 // @public
diff --git a/src/plugins/dev_tools/public/application.tsx b/src/plugins/dev_tools/public/application.tsx
index 46f09a8ebb8796..d3a54627b02407 100644
--- a/src/plugins/dev_tools/public/application.tsx
+++ b/src/plugins/dev_tools/public/application.tsx
@@ -90,6 +90,7 @@ function DevToolsWrapper({ devTools, activeDevTool, updateRoute }: DevToolsWrapp
               element,
               appBasePath: '',
               onAppLeave: () => undefined,
+              setHeaderActionMenu: () => undefined,
               // TODO: adapt to use Core's ScopedHistory
               history: {} as any,
             };
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 34140703fd8aee..9a9486da892e44 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -32,7 +32,7 @@ export * from './notifications';
 export { Markdown, MarkdownSimple } from './markdown';
 export { reactToUiComponent, uiToReactComponent } from './adapters';
 export { useUrlTracker } from './use_url_tracker';
-export { toMountPoint } from './util';
+export { toMountPoint, MountPointPortal } from './util';
 export { RedirectAppLinks } from './app_links';
 
 /** dummy plugin, we just want kibanaReact to have its own bundle */
diff --git a/src/plugins/kibana_react/public/util/index.ts b/src/plugins/kibana_react/public/util/index.ts
index 71a281dbdaad3c..a6f3f87535f468 100644
--- a/src/plugins/kibana_react/public/util/index.ts
+++ b/src/plugins/kibana_react/public/util/index.ts
@@ -17,4 +17,5 @@
  * under the License.
  */
 
-export * from './react_mount';
+export { toMountPoint } from './to_mount_point';
+export { MountPointPortal } from './mount_point_portal';
diff --git a/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx b/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
new file mode 100644
index 00000000000000..c13b8eae262213
--- /dev/null
+++ b/src/plugins/kibana_react/public/util/mount_point_portal.test.tsx
@@ -0,0 +1,210 @@
+/*
+ * 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 { mount, ReactWrapper } from 'enzyme';
+import { MountPoint, UnmountCallback } from 'kibana/public';
+import { MountPointPortal } from './mount_point_portal';
+import { act } from 'react-dom/test-utils';
+
+describe('MountPointPortal', () => {
+  let portalTarget: HTMLElement;
+  let mountPoint: MountPoint;
+  let setMountPoint: jest.Mock<(mountPoint: MountPoint<HTMLElement>) => void>;
+  let dom: ReactWrapper;
+
+  const refresh = () => {
+    new Promise(async (resolve) => {
+      if (dom) {
+        act(() => {
+          dom.update();
+        });
+      }
+      setImmediate(() => resolve(dom)); // flushes any pending promises
+    });
+  };
+
+  beforeEach(() => {
+    portalTarget = document.createElement('div');
+    document.body.append(portalTarget);
+    setMountPoint = jest.fn().mockImplementation((mp) => (mountPoint = mp));
+  });
+
+  afterEach(() => {
+    if (portalTarget) {
+      portalTarget.remove();
+    }
+  });
+
+  it('calls the provided `setMountPoint` during render', async () => {
+    dom = mount(
+      <MountPointPortal setMountPoint={setMountPoint}>
+        <span>portal content</span>
+      </MountPointPortal>
+    );
+
+    await refresh();
+
+    expect(setMountPoint).toHaveBeenCalledTimes(1);
+  });
+
+  it('renders the portal content when calling the mountPoint ', async () => {
+    dom = mount(
+      <MountPointPortal setMountPoint={setMountPoint}>
+        <span>portal content</span>
+      </MountPointPortal>
+    );
+
+    await refresh();
+
+    expect(mountPoint).toBeDefined();
+
+    act(() => {
+      mountPoint(portalTarget);
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<span>portal content</span>');
+  });
+
+  it('cleanup the portal content when the component is unmounted', async () => {
+    dom = mount(
+      <MountPointPortal setMountPoint={setMountPoint}>
+        <span>portal content</span>
+      </MountPointPortal>
+    );
+
+    act(() => {
+      mountPoint(portalTarget);
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<span>portal content</span>');
+
+    dom.unmount();
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('');
+  });
+
+  it('cleanup the portal content when unmounting the MountPoint from outside', async () => {
+    dom = mount(
+      <MountPointPortal setMountPoint={setMountPoint}>
+        <span>portal content</span>
+      </MountPointPortal>
+    );
+
+    let unmount: UnmountCallback;
+    act(() => {
+      unmount = mountPoint(portalTarget);
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<span>portal content</span>');
+
+    act(() => {
+      unmount();
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('');
+  });
+
+  it('updates the content of the portal element when the content of MountPointPortal changes', async () => {
+    const Wrapper: FC<{
+      setMount: (mountPoint: MountPoint<HTMLElement>) => void;
+      portalContent: string;
+    }> = ({ setMount, portalContent }) => {
+      return (
+        <MountPointPortal setMountPoint={setMount}>
+          <div>{portalContent}</div>
+        </MountPointPortal>
+      );
+    };
+
+    dom = mount(<Wrapper setMount={setMountPoint} portalContent={'before'} />);
+
+    act(() => {
+      mountPoint(portalTarget);
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<div>before</div>');
+
+    dom.setProps({
+      portalContent: 'after',
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<div>after</div>');
+  });
+
+  it('cleanup the previous portal content when setMountPoint changes', async () => {
+    dom = mount(
+      <MountPointPortal setMountPoint={setMountPoint}>
+        <span>portal content</span>
+      </MountPointPortal>
+    );
+
+    act(() => {
+      mountPoint(portalTarget);
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<span>portal content</span>');
+
+    const newSetMountPoint = jest.fn();
+
+    dom.setProps({
+      setMountPoint: newSetMountPoint,
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('');
+  });
+
+  it('intercepts errors and display an error message', async () => {
+    const CrashTest = () => {
+      throw new Error('crash');
+    };
+
+    dom = mount(
+      <MountPointPortal setMountPoint={setMountPoint}>
+        <CrashTest />
+      </MountPointPortal>
+    );
+
+    act(() => {
+      mountPoint(portalTarget);
+    });
+
+    await refresh();
+
+    expect(portalTarget.innerHTML).toBe('<p>Error rendering portal content</p>');
+  });
+});
diff --git a/src/plugins/kibana_react/public/util/mount_point_portal.tsx b/src/plugins/kibana_react/public/util/mount_point_portal.tsx
new file mode 100644
index 00000000000000..b762fba88791e8
--- /dev/null
+++ b/src/plugins/kibana_react/public/util/mount_point_portal.tsx
@@ -0,0 +1,88 @@
+/*
+ * 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 React, { useRef, useEffect, useState, Component } from 'react';
+import ReactDOM from 'react-dom';
+import { MountPoint } from 'kibana/public';
+
+interface MountPointPortalProps {
+  setMountPoint: (mountPoint: MountPoint<HTMLElement>) => void;
+}
+
+/**
+ * Utility component to portal a part of a react application into the provided `MountPoint`.
+ */
+export const MountPointPortal: React.FC<MountPointPortalProps> = ({ children, setMountPoint }) => {
+  // state used to force re-renders when the element changes
+  const [shouldRender, setShouldRender] = useState(false);
+  const el = useRef<HTMLElement>();
+
+  useEffect(() => {
+    setMountPoint((element) => {
+      el.current = element;
+      setShouldRender(true);
+      return () => {
+        setShouldRender(false);
+        el.current = undefined;
+      };
+    });
+
+    return () => {
+      setShouldRender(false);
+      el.current = undefined;
+    };
+  }, [setMountPoint]);
+
+  if (shouldRender && el.current) {
+    return ReactDOM.createPortal(
+      <MountPointPortalErrorBoundary>{children}</MountPointPortalErrorBoundary>,
+      el.current
+    );
+  } else {
+    return null;
+  }
+};
+
+class MountPointPortalErrorBoundary extends Component<{}, { error?: any }> {
+  state = {
+    error: undefined,
+  };
+
+  static getDerivedStateFromError(error: any) {
+    return { error };
+  }
+
+  componentDidCatch() {
+    // nothing, will just rerender to display the error message
+  }
+
+  render() {
+    if (this.state.error) {
+      return (
+        <p>
+          {i18n.translate('kibana-react.mountPointPortal.errorMessage', {
+            defaultMessage: 'Error rendering portal content',
+          })}
+        </p>
+      );
+    }
+    return this.props.children;
+  }
+}
diff --git a/src/plugins/kibana_react/public/util/react_mount.tsx b/src/plugins/kibana_react/public/util/to_mount_point.tsx
similarity index 100%
rename from src/plugins/kibana_react/public/util/react_mount.tsx
rename to src/plugins/kibana_react/public/util/to_mount_point.tsx
diff --git a/src/plugins/navigation/kibana.json b/src/plugins/navigation/kibana.json
index 000d5acf2635f7..85d2049a34be0b 100644
--- a/src/plugins/navigation/kibana.json
+++ b/src/plugins/navigation/kibana.json
@@ -3,5 +3,6 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["data"]
-}
\ No newline at end of file
+  "requiredPlugins": ["data"],
+  "requiredBundles": ["kibanaReact"]
+}
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
index 46384fb3f27d5b..f21e5680e8f611 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.test.tsx
@@ -18,9 +18,12 @@
  */
 
 import React from 'react';
+import { ReactWrapper } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+import { MountPoint } from 'kibana/public';
 import { TopNavMenu } from './top_nav_menu';
 import { TopNavMenuData } from './top_nav_menu_data';
-import { shallowWithIntl } from 'test_utils/enzyme_helpers';
+import { shallowWithIntl, mountWithIntl } from 'test_utils/enzyme_helpers';
 
 const dataShim = {
   ui: {
@@ -109,4 +112,59 @@ describe('TopNavMenu', () => {
     expect(component.find('.kbnTopNavMenu').length).toBe(1);
     expect(component.find('.myCoolClass').length).toBeTruthy();
   });
+
+  describe('when setMenuMountPoint is provided', () => {
+    let portalTarget: HTMLElement;
+    let mountPoint: MountPoint;
+    let setMountPoint: jest.Mock<(mountPoint: MountPoint<HTMLElement>) => void>;
+    let dom: ReactWrapper;
+
+    const refresh = () => {
+      new Promise(async (resolve) => {
+        if (dom) {
+          act(() => {
+            dom.update();
+          });
+        }
+        setImmediate(() => resolve(dom)); // flushes any pending promises
+      });
+    };
+
+    beforeEach(() => {
+      portalTarget = document.createElement('div');
+      document.body.append(portalTarget);
+      setMountPoint = jest.fn().mockImplementation((mp) => (mountPoint = mp));
+    });
+
+    afterEach(() => {
+      if (portalTarget) {
+        portalTarget.remove();
+      }
+    });
+
+    it('mounts the menu inside the provided mountPoint', async () => {
+      const component = mountWithIntl(
+        <TopNavMenu
+          appName={'test'}
+          config={menuItems}
+          showSearchBar={true}
+          data={dataShim as any}
+          setMenuMountPoint={setMountPoint}
+        />
+      );
+
+      act(() => {
+        mountPoint(portalTarget);
+      });
+
+      await refresh();
+
+      expect(component.find(WRAPPER_SELECTOR).length).toBe(1);
+      expect(component.find(SEARCH_BAR_SELECTOR).length).toBe(1);
+
+      // menu is rendered outside of the component
+      expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
+      expect(portalTarget.getElementsByTagName('BUTTON').length).toBe(menuItems.length);
+    });
+  });
 });
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
index 2cfca332effb0d..a1a40b49cc8f06 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
@@ -18,13 +18,14 @@
  */
 
 import React, { ReactElement } from 'react';
-
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-
 import classNames from 'classnames';
+
+import { MountPoint } from '../../../../core/public';
+import { MountPointPortal } from '../../../kibana_react/public';
+import { StatefulSearchBarProps, DataPublicPluginStart } from '../../../data/public';
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
-import { StatefulSearchBarProps, DataPublicPluginStart } from '../../../data/public';
 
 export type TopNavMenuProps = StatefulSearchBarProps & {
   config?: TopNavMenuData[];
@@ -35,6 +36,25 @@ export type TopNavMenuProps = StatefulSearchBarProps & {
   showFilterBar?: boolean;
   data?: DataPublicPluginStart;
   className?: string;
+  /**
+   * If provided, the menu part of the component will be rendered as a portal inside the given mount point.
+   *
+   * This is meant to be used with the `setHeaderActionMenu` core API.
+   *
+   * @example
+   * ```ts
+   * export renderApp = ({ element, history, setHeaderActionMenu }: AppMountParameters) => {
+   *   const topNavConfig = ...; // TopNavMenuProps
+   *   return (
+   *     <Router history=history>
+   *       <TopNavMenu {...topNavConfig} setMenuMountPoint={setHeaderActionMenu}>
+   *       <MyRoutes />
+   *     </Router>
+   *   )
+   * }
+   * ```
+   */
+  setMenuMountPoint?: (menuMount: MountPoint | undefined) => void;
 };
 
 /*
@@ -92,13 +112,26 @@ export function TopNavMenu(props: TopNavMenuProps): ReactElement | null {
   }
 
   function renderLayout() {
-    const className = classNames('kbnTopNavMenu', props.className);
-    return (
-      <span className="kbnTopNavMenu__wrapper">
-        {renderMenu(className)}
-        {renderSearchBar()}
-      </span>
-    );
+    const { setMenuMountPoint } = props;
+    const menuClassName = classNames('kbnTopNavMenu', props.className);
+    const wrapperClassName = 'kbnTopNavMenu__wrapper';
+    if (setMenuMountPoint) {
+      return (
+        <>
+          <MountPointPortal setMountPoint={setMenuMountPoint}>
+            <span className={wrapperClassName}>{renderMenu(menuClassName)}</span>
+          </MountPointPortal>
+          <span className={wrapperClassName}>{renderSearchBar()}</span>
+        </>
+      );
+    } else {
+      return (
+        <span className={wrapperClassName}>
+          {renderMenu(menuClassName)}
+          {renderSearchBar()}
+        </span>
+      );
+    }
   }
 
   return renderLayout();
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 4f8ceb8effe982..214b393a0fda92 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -96,12 +96,7 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
             uiActions: pluginsStart.uiActions,
             kibanaVersion,
           },
-          {
-            element: params.element,
-            appBasePath: params.appBasePath,
-            onAppLeave: params.onAppLeave,
-            history: params.history,
-          }
+          params
         );
       },
     });
diff --git a/x-pack/plugins/security/public/account_management/account_management_app.test.ts b/x-pack/plugins/security/public/account_management/account_management_app.test.ts
index 37b97a84723104..c41bd43872beed 100644
--- a/x-pack/plugins/security/public/account_management/account_management_app.test.ts
+++ b/x-pack/plugins/security/public/account_management/account_management_app.test.ts
@@ -54,6 +54,7 @@ describe('accountManagementApp', () => {
       element: containerMock,
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: scopedHistoryMock.create(),
     });
 
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
index 0e262e9089842b..eafad74d2f0d83 100644
--- a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
@@ -48,6 +48,7 @@ describe('accessAgreementApp', () => {
       element: containerMock,
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: scopedHistoryMock.create(),
     });
 
diff --git a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
index c5b9245414630a..e6723085460f89 100644
--- a/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/capture_url/capture_url_app.test.ts
@@ -54,6 +54,7 @@ describe('captureURLApp', () => {
       element: document.createElement('div'),
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: (scopedHistoryMock.create() as unknown) as ScopedHistory,
     });
 
diff --git a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
index 15d55136b405dc..86a5d21f1b233b 100644
--- a/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/logged_out/logged_out_app.test.ts
@@ -46,6 +46,7 @@ describe('loggedOutApp', () => {
       element: containerMock,
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: scopedHistoryMock.create(),
     });
 
diff --git a/x-pack/plugins/security/public/authentication/login/login_app.test.ts b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
index a6e5a321ef6ec2..5ae8afab9de23b 100644
--- a/x-pack/plugins/security/public/authentication/login/login_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/login/login_app.test.ts
@@ -51,6 +51,7 @@ describe('loginApp', () => {
       element: containerMock,
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: scopedHistoryMock.create(),
     });
 
diff --git a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
index 46b1083a2ed14a..b7bfdf492305e5 100644
--- a/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts
@@ -52,6 +52,7 @@ describe('logoutApp', () => {
       element: containerMock,
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: scopedHistoryMock.create(),
     });
 
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
index 0eed1382c270b2..6e0e06dd3dc44f 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/overwritten_session_app.test.ts
@@ -53,6 +53,7 @@ describe('overwrittenSessionApp', () => {
       element: containerMock,
       appBasePath: '',
       onAppLeave: jest.fn(),
+      setHeaderActionMenu: jest.fn(),
       history: scopedHistoryMock.create(),
     });
 

From d7869dee6e386a5576343ef2d5f2c46abf449a02 Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Tue, 1 Sep 2020 14:17:52 -0400
Subject: [PATCH 153/216] [Maps] Add mvt support for ES doc sources  (#75698)

---
 x-pack/package.json                           |   2 +
 x-pack/plugins/maps/common/constants.ts       |   7 +
 .../data_request_descriptor_types.ts          |   1 -
 .../maps/common/elasticsearch_geo_utils.d.ts  |  10 +
 .../public/classes/fields/es_doc_field.ts     |   8 +
 .../tiled_vector_layer.test.tsx               |  63 ++---
 .../tiled_vector_layer/tiled_vector_layer.tsx |  24 +-
 .../layers/vector_layer/vector_layer.js       |  49 ++++
 .../es_geo_grid_source.test.ts                |  18 +-
 .../__snapshots__/scaling_form.test.tsx.snap  | 152 +++++++++++-
 .../update_source_editor.test.js.snap         |   6 +
 .../es_search_source/create_source_editor.js  |   5 +
 .../es_documents_layer_wizard.tsx             |  11 +-
 .../es_search_source/es_search_source.d.ts    |  15 +-
 .../es_search_source/es_search_source.js      |  81 ++++++-
 .../es_search_source/es_search_source.test.ts | 155 ++++++++++++
 .../es_search_source/scaling_form.test.tsx    |  52 ++--
 .../sources/es_search_source/scaling_form.tsx |  72 +++++-
 .../es_search_source/update_source_editor.js  |  10 +
 .../classes/sources/es_source/es_source.js    |   2 +-
 .../sources/vector_source/vector_source.d.ts  |   7 +-
 .../categorical_field_meta_popover.tsx        |   2 +
 .../field_meta/ordinal_field_meta_popover.tsx |   2 +
 .../dynamic_color_property.test.tsx.snap      |  26 ++
 .../dynamic_color_property.test.tsx           |  36 +++
 .../properties/dynamic_style_property.tsx     |   4 +
 .../classes/util/mb_filter_expressions.ts     |  40 +++-
 .../map/mb/tooltip_control/tooltip_control.js |   8 +-
 .../connected_components/map/mb/view.js       |  14 +-
 .../plugins/maps/public/index_pattern_util.ts |  10 +
 .../mvt/__tests__/json/0_0_0_search.json      |   1 +
 .../maps/server/mvt/__tests__/pbf/0_0_0.pbf   | Bin 0 -> 155 bytes
 .../server/mvt/__tests__/tile_searches.ts     |  28 +++
 .../plugins/maps/server/mvt/get_tile.test.ts  |  63 +++++
 x-pack/plugins/maps/server/mvt/get_tile.ts    | 226 ++++++++++++++++++
 x-pack/plugins/maps/server/mvt/mvt_routes.ts  |  73 ++++++
 x-pack/plugins/maps/server/mvt/util.ts        |  72 ++++++
 x-pack/plugins/maps/server/routes.js          |  28 ++-
 .../api_integration/apis/maps/get_tile.js     |  29 +++
 .../test/api_integration/apis/maps/index.js   |   1 +
 x-pack/test/functional/apps/maps/index.js     |   1 +
 x-pack/test/functional/apps/maps/joins.js     |  28 ++-
 .../functional/apps/maps/mapbox_styles.js     |  36 +--
 .../test/functional/apps/maps/mvt_scaling.js  |  75 ++++++
 .../es_archives/maps/kibana/data.json         |  34 +++
 45 files changed, 1444 insertions(+), 143 deletions(-)
 create mode 100644 x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
 create mode 100644 x-pack/plugins/maps/server/mvt/__tests__/json/0_0_0_search.json
 create mode 100644 x-pack/plugins/maps/server/mvt/__tests__/pbf/0_0_0.pbf
 create mode 100644 x-pack/plugins/maps/server/mvt/__tests__/tile_searches.ts
 create mode 100644 x-pack/plugins/maps/server/mvt/get_tile.test.ts
 create mode 100644 x-pack/plugins/maps/server/mvt/get_tile.ts
 create mode 100644 x-pack/plugins/maps/server/mvt/mvt_routes.ts
 create mode 100644 x-pack/plugins/maps/server/mvt/util.ts
 create mode 100644 x-pack/test/api_integration/apis/maps/get_tile.js
 create mode 100644 x-pack/test/functional/apps/maps/mvt_scaling.js

diff --git a/x-pack/package.json b/x-pack/package.json
index f25fe7e3418ae6..0e9aef37aa2532 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -313,6 +313,7 @@
     "file-type": "^10.9.0",
     "font-awesome": "4.7.0",
     "fp-ts": "^2.3.1",
+    "geojson-vt": "^3.2.1",
     "get-port": "^5.0.0",
     "getos": "^3.1.0",
     "git-url-parse": "11.1.2",
@@ -384,6 +385,7 @@
     "ui-select": "0.19.8",
     "uuid": "3.3.2",
     "vscode-languageserver": "^5.2.1",
+    "vt-pbf": "^3.1.1",
     "webpack": "^4.41.5",
     "wellknown": "^0.5.0",
     "xml2js": "^0.4.22",
diff --git a/x-pack/plugins/maps/common/constants.ts b/x-pack/plugins/maps/common/constants.ts
index 363122ac62212a..a4f20caedfc9bd 100644
--- a/x-pack/plugins/maps/common/constants.ts
+++ b/x-pack/plugins/maps/common/constants.ts
@@ -33,6 +33,12 @@ export const MAP_PATH = 'map';
 export const GIS_API_PATH = `api/${APP_ID}`;
 export const INDEX_SETTINGS_API_PATH = `${GIS_API_PATH}/indexSettings`;
 export const FONTS_API_PATH = `${GIS_API_PATH}/fonts`;
+export const API_ROOT_PATH = `/${GIS_API_PATH}`;
+
+export const MVT_GETTILE_API_PATH = 'mvt/getTile';
+export const MVT_SOURCE_LAYER_NAME = 'source_layer';
+export const KBN_TOO_MANY_FEATURES_PROPERTY = '__kbn_too_many_features__';
+export const KBN_TOO_MANY_FEATURES_IMAGE_ID = '__kbn_too_many_features_image_id__';
 
 const MAP_BASE_URL = `/${MAPS_APP_PATH}/${MAP_PATH}`;
 export function getNewMapPath() {
@@ -220,6 +226,7 @@ export enum SCALING_TYPES {
   LIMIT = 'LIMIT',
   CLUSTERS = 'CLUSTERS',
   TOP_HITS = 'TOP_HITS',
+  MVT = 'MVT',
 }
 
 export const RGBA_0000 = 'rgba(0,0,0,0)';
diff --git a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
index cd7d2d5d0f461f..f3521cca2e456f 100644
--- a/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/data_request_descriptor_types.ts
@@ -18,7 +18,6 @@ export type MapFilters = {
   refreshTimerLastTriggeredAt?: string;
   timeFilters: TimeRange;
   zoom: number;
-  geogridPrecision?: number;
 };
 
 type ESSearchSourceSyncMeta = {
diff --git a/x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts b/x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts
index 44250360e9d00a..e57efca94d95e7 100644
--- a/x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_geo_utils.d.ts
@@ -4,7 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { FeatureCollection, GeoJsonProperties } from 'geojson';
 import { MapExtent } from './descriptor_types';
+import { ES_GEO_FIELD_TYPE } from './constants';
 
 export function scaleBounds(bounds: MapExtent, scaleFactor: number): MapExtent;
 
@@ -13,3 +15,11 @@ export function turfBboxToBounds(turfBbox: unknown): MapExtent;
 export function clampToLatBounds(lat: number): number;
 
 export function clampToLonBounds(lon: number): number;
+
+export function hitsToGeoJson(
+  hits: Array<Record<string, unknown>>,
+  flattenHit: (elasticSearchHit: Record<string, unknown>) => GeoJsonProperties,
+  geoFieldName: string,
+  geoFieldType: ES_GEO_FIELD_TYPE,
+  epochMillisFields: string[]
+): FeatureCollection;
diff --git a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
index 9faa33fae5a431..543dbf6d87039c 100644
--- a/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
+++ b/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts
@@ -15,18 +15,22 @@ import { IVectorSource } from '../sources/vector_source';
 
 export class ESDocField extends AbstractField implements IField {
   private readonly _source: IESSource;
+  private readonly _canReadFromGeoJson: boolean;
 
   constructor({
     fieldName,
     source,
     origin,
+    canReadFromGeoJson = true,
   }: {
     fieldName: string;
     source: IESSource;
     origin: FIELD_ORIGIN;
+    canReadFromGeoJson?: boolean;
   }) {
     super({ fieldName, origin });
     this._source = source;
+    this._canReadFromGeoJson = canReadFromGeoJson;
   }
 
   canValueBeFormatted(): boolean {
@@ -60,6 +64,10 @@ export class ESDocField extends AbstractField implements IField {
     return true;
   }
 
+  canReadFromGeoJson(): boolean {
+    return this._canReadFromGeoJson;
+  }
+
   async getOrdinalFieldMetaRequest(): Promise<unknown> {
     const indexPatternField = await this._getIndexPatternField();
 
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
index faae26cac08e71..822b78aa0deffa 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.test.tsx
@@ -128,32 +128,41 @@ describe('syncData', () => {
     sinon.assert.notCalled(syncContext2.stopLoading);
   });
 
-  it('Should resync when changes to source params', async () => {
-    const layer1: TiledVectorLayer = createLayer({}, {});
-    const syncContext1 = new MockSyncContext({ dataFilters: {} });
-
-    await layer1.syncData(syncContext1);
-
-    const dataRequestDescriptor: DataRequestDescriptor = {
-      data: defaultConfig,
-      dataId: 'source',
-    };
-    const layer2: TiledVectorLayer = createLayer(
-      {
-        __dataRequests: [dataRequestDescriptor],
-      },
-      { layerName: 'barfoo' }
-    );
-    const syncContext2 = new MockSyncContext({ dataFilters: {} });
-    await layer2.syncData(syncContext2);
-
-    // @ts-expect-error
-    sinon.assert.calledOnce(syncContext2.startLoading);
-    // @ts-expect-error
-    sinon.assert.calledOnce(syncContext2.stopLoading);
-
-    // @ts-expect-error
-    const call = syncContext2.stopLoading.getCall(0);
-    expect(call.args[2]).toEqual({ ...defaultConfig, layerName: 'barfoo' });
+  describe('Should resync when changes to source params: ', () => {
+    [
+      { layerName: 'barfoo' },
+      { urlTemplate: 'https://sub.example.com/{z}/{x}/{y}.pbf' },
+      { minSourceZoom: 1 },
+      { maxSourceZoom: 12 },
+    ].forEach((changes) => {
+      it(`change in ${Object.keys(changes).join(',')}`, async () => {
+        const layer1: TiledVectorLayer = createLayer({}, {});
+        const syncContext1 = new MockSyncContext({ dataFilters: {} });
+
+        await layer1.syncData(syncContext1);
+
+        const dataRequestDescriptor: DataRequestDescriptor = {
+          data: defaultConfig,
+          dataId: 'source',
+        };
+        const layer2: TiledVectorLayer = createLayer(
+          {
+            __dataRequests: [dataRequestDescriptor],
+          },
+          changes
+        );
+        const syncContext2 = new MockSyncContext({ dataFilters: {} });
+        await layer2.syncData(syncContext2);
+
+        // @ts-expect-error
+        sinon.assert.calledOnce(syncContext2.startLoading);
+        // @ts-expect-error
+        sinon.assert.calledOnce(syncContext2.stopLoading);
+
+        // @ts-expect-error
+        const call = syncContext2.stopLoading.getCall(0);
+        expect(call.args[2]).toEqual({ ...defaultConfig, ...changes });
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
index c9ae1c805fa306..70bf8ea3883b72 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/tiled_vector_layer.tsx
@@ -63,21 +63,24 @@ export class TiledVectorLayer extends VectorLayer {
     );
     const prevDataRequest = this.getSourceDataRequest();
 
+    const templateWithMeta = await this._source.getUrlTemplateWithMeta(searchFilters);
     if (prevDataRequest) {
       const data: MVTSingleLayerVectorSourceConfig = prevDataRequest.getData() as MVTSingleLayerVectorSourceConfig;
-      const canSkipBecauseNoChanges =
-        data.layerName === this._source.getLayerName() &&
-        data.minSourceZoom === this._source.getMinZoom() &&
-        data.maxSourceZoom === this._source.getMaxZoom();
-
-      if (canSkipBecauseNoChanges) {
-        return null;
+      if (data) {
+        const canSkipBecauseNoChanges =
+          data.layerName === this._source.getLayerName() &&
+          data.minSourceZoom === this._source.getMinZoom() &&
+          data.maxSourceZoom === this._source.getMaxZoom() &&
+          data.urlTemplate === templateWithMeta.urlTemplate;
+
+        if (canSkipBecauseNoChanges) {
+          return null;
+        }
       }
     }
 
     startLoading(SOURCE_DATA_REQUEST_ID, requestToken, searchFilters);
     try {
-      const templateWithMeta = await this._source.getUrlTemplateWithMeta();
       stopLoading(SOURCE_DATA_REQUEST_ID, requestToken, templateWithMeta, {});
     } catch (error) {
       onLoadError(SOURCE_DATA_REQUEST_ID, requestToken, error.message);
@@ -160,6 +163,11 @@ export class TiledVectorLayer extends VectorLayer {
       return false;
     }
 
+    if (!mbTileSource.tiles) {
+      // Expected source is not compatible, so remove.
+      return true;
+    }
+
     const isSourceDifferent =
       mbTileSource.tiles[0] !== tiledSourceMeta.urlTemplate ||
       mbTileSource.minzoom !== tiledSourceMeta.minSourceZoom ||
diff --git a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js
index 2ba7f750e9b409..c49d0044e6ad60 100644
--- a/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js
+++ b/x-pack/plugins/maps/public/classes/layers/vector_layer/vector_layer.js
@@ -15,9 +15,11 @@ import {
   SOURCE_BOUNDS_DATA_REQUEST_ID,
   FEATURE_VISIBLE_PROPERTY_NAME,
   EMPTY_FEATURE_COLLECTION,
+  KBN_TOO_MANY_FEATURES_PROPERTY,
   LAYER_TYPE,
   FIELD_ORIGIN,
   LAYER_STYLE_TYPE,
+  KBN_TOO_MANY_FEATURES_IMAGE_ID,
 } from '../../../../common/constants';
 import _ from 'lodash';
 import { JoinTooltipProperty } from '../../tooltips/join_tooltip_property';
@@ -777,6 +779,8 @@ export class VectorLayer extends AbstractLayer {
     const sourceId = this.getId();
     const fillLayerId = this._getMbPolygonLayerId();
     const lineLayerId = this._getMbLineLayerId();
+    const tooManyFeaturesLayerId = this._getMbTooManyFeaturesLayerId();
+
     const hasJoins = this.hasJoins();
     if (!mbMap.getLayer(fillLayerId)) {
       const mbLayer = {
@@ -802,6 +806,30 @@ export class VectorLayer extends AbstractLayer {
       }
       mbMap.addLayer(mbLayer);
     }
+    if (!mbMap.getLayer(tooManyFeaturesLayerId)) {
+      const mbLayer = {
+        id: tooManyFeaturesLayerId,
+        type: 'fill',
+        source: sourceId,
+        paint: {},
+      };
+      if (mvtSourceLayer) {
+        mbLayer['source-layer'] = mvtSourceLayer;
+      }
+      mbMap.addLayer(mbLayer);
+      mbMap.setFilter(tooManyFeaturesLayerId, [
+        '==',
+        ['get', KBN_TOO_MANY_FEATURES_PROPERTY],
+        true,
+      ]);
+      mbMap.setPaintProperty(
+        tooManyFeaturesLayerId,
+        'fill-pattern',
+        KBN_TOO_MANY_FEATURES_IMAGE_ID
+      );
+      mbMap.setPaintProperty(tooManyFeaturesLayerId, 'fill-opacity', this.getAlpha());
+    }
+
     this.getCurrentStyle().setMBPaintProperties({
       alpha: this.getAlpha(),
       mbMap,
@@ -822,6 +850,9 @@ export class VectorLayer extends AbstractLayer {
     if (lineFilterExpr !== mbMap.getFilter(lineLayerId)) {
       mbMap.setFilter(lineLayerId, lineFilterExpr);
     }
+
+    this.syncVisibilityWithMb(mbMap, tooManyFeaturesLayerId);
+    mbMap.setLayerZoomRange(tooManyFeaturesLayerId, this.getMinZoom(), this.getMaxZoom());
   }
 
   _syncStylePropertiesWithMb(mbMap) {
@@ -836,6 +867,19 @@ export class VectorLayer extends AbstractLayer {
         type: 'geojson',
         data: EMPTY_FEATURE_COLLECTION,
       });
+    } else if (mbSource.type !== 'geojson') {
+      // Recreate source when existing source is not geojson. This can occur when layer changes from tile layer to vector layer.
+      this.getMbLayerIds().forEach((mbLayerId) => {
+        if (mbMap.getLayer(mbLayerId)) {
+          mbMap.removeLayer(mbLayerId);
+        }
+      });
+
+      mbMap.removeSource(this._getMbSourceId());
+      mbMap.addSource(this._getMbSourceId(), {
+        type: 'geojson',
+        data: EMPTY_FEATURE_COLLECTION,
+      });
     }
   }
 
@@ -865,6 +909,10 @@ export class VectorLayer extends AbstractLayer {
     return this.makeMbLayerId('fill');
   }
 
+  _getMbTooManyFeaturesLayerId() {
+    return this.makeMbLayerId('toomanyfeatures');
+  }
+
   getMbLayerIds() {
     return [
       this._getMbPointLayerId(),
@@ -872,6 +920,7 @@ export class VectorLayer extends AbstractLayer {
       this._getMbSymbolLayerId(),
       this._getMbLineLayerId(),
       this._getMbPolygonLayerId(),
+      this._getMbTooManyFeaturesLayerId(),
     ];
   }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
index 43bfb74bf54b68..2e0ba7cf3efee0 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.test.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.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 { MapExtent, MapFilters } from '../../../../common/descriptor_types';
+import { MapExtent, VectorSourceRequestMeta } from '../../../../common/descriptor_types';
 
 jest.mock('../../../kibana_services');
 
@@ -19,6 +19,7 @@ import { SearchSource } from '../../../../../../../src/plugins/data/public/searc
 
 export class MockSearchSource {
   setField = jest.fn();
+  setParent() {}
 }
 
 describe('ESGeoGridSource', () => {
@@ -104,6 +105,9 @@ describe('ESGeoGridSource', () => {
           async create() {
             return mockSearchSource as SearchSource;
           },
+          createEmpty() {
+            return mockSearchSource as SearchSource;
+          },
         },
       };
 
@@ -120,7 +124,7 @@ describe('ESGeoGridSource', () => {
       maxLat: 80,
     };
 
-    const mapFilters: MapFilters = {
+    const mapFilters: VectorSourceRequestMeta = {
       geogridPrecision: 4,
       filters: [],
       timeFilters: {
@@ -128,8 +132,16 @@ describe('ESGeoGridSource', () => {
         to: '15m',
         mode: 'relative',
       },
-      // extent,
+      extent,
+      applyGlobalQuery: true,
+      fieldNames: [],
       buffer: extent,
+      sourceQuery: {
+        query: '',
+        language: 'KQL',
+        queryLastTriggeredAt: '2019-04-25T20:53:22.331Z',
+      },
+      sourceMeta: null,
       zoom: 0,
     };
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
index 8ebb389472f74c..dd62be11c679db 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/scaling_form.test.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`should disable clusters option when clustering is not supported 1`] = `
+exports[`scaling form should disable clusters option when clustering is not supported 1`] = `
 <Fragment>
   <EuiTitle
     size="xs"
@@ -50,6 +50,106 @@ exports[`should disable clusters option when clustering is not supported 1`] = `
           onChange={[Function]}
         />
       </EuiToolTip>
+      <EuiToolTip
+        content={
+          <React.Fragment>
+            <EuiBetaBadge
+              label="beta"
+            />
+            <EuiHorizontalRule
+              margin="xs"
+            />
+            Use vector tiles for faster display of large datasets.
+          </React.Fragment>
+        }
+        delay="regular"
+        position="left"
+      >
+        <EuiRadio
+          checked={false}
+          disabled={false}
+          id="MVT"
+          label="Use vector tiles"
+          onChange={[Function]}
+        />
+      </EuiToolTip>
+    </div>
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      compressed={true}
+      label="Dynamically filter for data in the visible map area"
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+</Fragment>
+`;
+
+exports[`scaling form should disable mvt option when mvt is not supported 1`] = `
+<Fragment>
+  <EuiTitle
+    size="xs"
+  >
+    <h5>
+      <FormattedMessage
+        defaultMessage="Scaling"
+        id="xpack.maps.esSearch.scaleTitle"
+        values={Object {}}
+      />
+    </h5>
+  </EuiTitle>
+  <EuiSpacer
+    size="m"
+  />
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <div>
+      <EuiRadio
+        checked={true}
+        id="LIMIT"
+        label="Limit results to 10000."
+        onChange={[Function]}
+      />
+      <EuiRadio
+        checked={false}
+        id="TOP_HITS"
+        label="Show top hits per entity."
+        onChange={[Function]}
+      />
+      <EuiRadio
+        checked={false}
+        disabled={false}
+        id="CLUSTERS"
+        label="Show clusters when results exceed 10000."
+        onChange={[Function]}
+      />
+      <EuiToolTip
+        content="Simulated mvt disabled"
+        delay="regular"
+        position="left"
+      >
+        <EuiRadio
+          checked={false}
+          disabled={true}
+          id="MVT"
+          label="Use vector tiles"
+          onChange={[Function]}
+        />
+      </EuiToolTip>
     </div>
   </EuiFormRow>
   <EuiFormRow
@@ -70,7 +170,7 @@ exports[`should disable clusters option when clustering is not supported 1`] = `
 </Fragment>
 `;
 
-exports[`should render 1`] = `
+exports[`scaling form should render 1`] = `
 <Fragment>
   <EuiTitle
     size="xs"
@@ -114,6 +214,29 @@ exports[`should render 1`] = `
         label="Show clusters when results exceed 10000."
         onChange={[Function]}
       />
+      <EuiToolTip
+        content={
+          <React.Fragment>
+            <EuiBetaBadge
+              label="beta"
+            />
+            <EuiHorizontalRule
+              margin="xs"
+            />
+            Use vector tiles for faster display of large datasets.
+          </React.Fragment>
+        }
+        delay="regular"
+        position="left"
+      >
+        <EuiRadio
+          checked={false}
+          disabled={false}
+          id="MVT"
+          label="Use vector tiles"
+          onChange={[Function]}
+        />
+      </EuiToolTip>
     </div>
   </EuiFormRow>
   <EuiFormRow
@@ -134,7 +257,7 @@ exports[`should render 1`] = `
 </Fragment>
 `;
 
-exports[`should render top hits form when scaling type is TOP_HITS 1`] = `
+exports[`scaling form should render top hits form when scaling type is TOP_HITS 1`] = `
 <Fragment>
   <EuiTitle
     size="xs"
@@ -178,6 +301,29 @@ exports[`should render top hits form when scaling type is TOP_HITS 1`] = `
         label="Show clusters when results exceed 10000."
         onChange={[Function]}
       />
+      <EuiToolTip
+        content={
+          <React.Fragment>
+            <EuiBetaBadge
+              label="beta"
+            />
+            <EuiHorizontalRule
+              margin="xs"
+            />
+            Use vector tiles for faster display of large datasets.
+          </React.Fragment>
+        }
+        delay="regular"
+        position="left"
+      >
+        <EuiRadio
+          checked={false}
+          disabled={false}
+          id="MVT"
+          label="Use vector tiles"
+          onChange={[Function]}
+        />
+      </EuiToolTip>
     </div>
   </EuiFormRow>
   <EuiFormRow
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
index 0cb7f67fb9c92b..8eb8067368d630 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/__snapshots__/update_source_editor.test.js.snap
@@ -92,11 +92,14 @@ exports[`should enable sort order select when sort field provided 1`] = `
   />
   <EuiPanel>
     <ScalingForm
+      clusteringDisabledReason={null}
       filterByMapBounds={true}
       indexPatternId="indexPattern1"
+      mvtDisabledReason={null}
       onChange={[Function]}
       scalingType="LIMIT"
       supportsClustering={false}
+      supportsMvt={false}
       termFields={null}
       topHitsSize={1}
       topHitsSplitField="trackId"
@@ -199,11 +202,14 @@ exports[`should render update source editor 1`] = `
   />
   <EuiPanel>
     <ScalingForm
+      clusteringDisabledReason={null}
       filterByMapBounds={true}
       indexPatternId="indexPattern1"
+      mvtDisabledReason={null}
       onChange={[Function]}
       scalingType="LIMIT"
       supportsClustering={false}
+      supportsMvt={false}
       termFields={null}
       topHitsSize={1}
       topHitsSplitField="trackId"
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
index 0423d70b3f4276..29cac809799e9b 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/create_source_editor.js
@@ -19,6 +19,8 @@ import {
   getTermsFields,
   getGeoTileAggNotSupportedReason,
   supportsGeoTileAgg,
+  supportsMvt,
+  getMvtDisabledReason,
 } from '../../../index_pattern_util';
 
 function doesGeoFieldSupportGeoTileAgg(indexPattern, geoFieldName) {
@@ -147,6 +149,7 @@ export class CreateSourceEditor extends Component {
       return null;
     }
 
+    const mvtSupported = supportsMvt(this.state.indexPattern, this.state.geoFieldName);
     return (
       <Fragment>
         <EuiSpacer size="m" />
@@ -159,6 +162,8 @@ export class CreateSourceEditor extends Component {
             this.state.indexPattern,
             this.state.geoFieldName
           )}
+          supportsMvt={mvtSupported}
+          mvtDisabledReason={mvtSupported ? null : getMvtDisabledReason()}
           clusteringDisabledReason={
             this.state.indexPattern
               ? getGeoTileAggNotSupportedReason(
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx
index 1ec6d2a1ff6716..249b9a2454d7d5 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_documents_layer_wizard.tsx
@@ -14,13 +14,18 @@ import { ESSearchSource, sourceTitle } from './es_search_source';
 import { BlendedVectorLayer } from '../../layers/blended_vector_layer/blended_vector_layer';
 import { VectorLayer } from '../../layers/vector_layer/vector_layer';
 import { LAYER_WIZARD_CATEGORY, SCALING_TYPES } from '../../../../common/constants';
+import { TiledVectorLayer } from '../../layers/tiled_vector_layer/tiled_vector_layer';
 
 export function createDefaultLayerDescriptor(sourceConfig: unknown, mapColors: string[]) {
   const sourceDescriptor = ESSearchSource.createDescriptor(sourceConfig);
 
-  return sourceDescriptor.scalingType === SCALING_TYPES.CLUSTERS
-    ? BlendedVectorLayer.createDescriptor({ sourceDescriptor }, mapColors)
-    : VectorLayer.createDescriptor({ sourceDescriptor }, mapColors);
+  if (sourceDescriptor.scalingType === SCALING_TYPES.CLUSTERS) {
+    return BlendedVectorLayer.createDescriptor({ sourceDescriptor }, mapColors);
+  } else if (sourceDescriptor.scalingType === SCALING_TYPES.MVT) {
+    return TiledVectorLayer.createDescriptor({ sourceDescriptor }, mapColors);
+  } else {
+    return VectorLayer.createDescriptor({ sourceDescriptor }, mapColors);
+  }
 }
 
 export const esDocumentsLayerWizardConfig: LayerWizard = {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.d.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.d.ts
index 23e3c759d73c39..67d68dc065b006 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.d.ts
@@ -5,11 +5,22 @@
  */
 
 import { AbstractESSource } from '../es_source';
-import { ESSearchSourceDescriptor } from '../../../../common/descriptor_types';
+import { ESSearchSourceDescriptor, MapFilters } from '../../../../common/descriptor_types';
+import { ITiledSingleLayerVectorSource } from '../vector_source';
 
-export class ESSearchSource extends AbstractESSource {
+export class ESSearchSource extends AbstractESSource implements ITiledSingleLayerVectorSource {
   static createDescriptor(sourceConfig: unknown): ESSearchSourceDescriptor;
 
   constructor(sourceDescriptor: Partial<ESSearchSourceDescriptor>, inspectorAdapters: unknown);
   getFieldNames(): string[];
+
+  getUrlTemplateWithMeta(
+    searchFilters: MapFilters
+  ): Promise<{
+    layerName: string;
+    urlTemplate: string;
+    minSourceZoom: number;
+    maxSourceZoom: number;
+  }>;
+  getLayerName(): string;
 }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js
index 6d61c4a7455b21..7ac2738eaeb51f 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.js
@@ -6,9 +6,10 @@
 
 import _ from 'lodash';
 import React from 'react';
+import rison from 'rison-node';
 
 import { AbstractESSource } from '../es_source';
-import { getSearchService } from '../../../kibana_services';
+import { getSearchService, getHttp } from '../../../kibana_services';
 import { hitsToGeoJson } from '../../../../common/elasticsearch_geo_utils';
 import { UpdateSourceEditor } from './update_source_editor';
 import {
@@ -18,6 +19,9 @@ import {
   SORT_ORDER,
   SCALING_TYPES,
   VECTOR_SHAPE_TYPE,
+  MVT_SOURCE_LAYER_NAME,
+  GIS_API_PATH,
+  MVT_GETTILE_API_PATH,
 } from '../../../../common/constants';
 import { i18n } from '@kbn/i18n';
 import { getDataSourceLabel } from '../../../../common/i18n_getters';
@@ -96,6 +100,7 @@ export class ESSearchSource extends AbstractESSource {
     return new ESDocField({
       fieldName,
       source: this,
+      canReadFromGeoJson: this._descriptor.scalingType !== SCALING_TYPES.MVT,
     });
   }
 
@@ -448,9 +453,13 @@ export class ESSearchSource extends AbstractESSource {
   }
 
   isFilterByMapBounds() {
-    return this._descriptor.scalingType === SCALING_TYPES.CLUSTER
-      ? true
-      : this._descriptor.filterByMapBounds;
+    if (this._descriptor.scalingType === SCALING_TYPES.CLUSTER) {
+      return true;
+    } else if (this._descriptor.scalingType === SCALING_TYPES.MVT) {
+      return false;
+    } else {
+      return this._descriptor.filterByMapBounds;
+    }
   }
 
   async getLeftJoinFields() {
@@ -553,11 +562,65 @@ export class ESSearchSource extends AbstractESSource {
   }
 
   getJoinsDisabledReason() {
-    return this._descriptor.scalingType === SCALING_TYPES.CLUSTERS
-      ? i18n.translate('xpack.maps.source.esSearch.joinsDisabledReason', {
-          defaultMessage: 'Joins are not supported when scaling by clusters',
-        })
-      : null;
+    let reason;
+    if (this._descriptor.scalingType === SCALING_TYPES.CLUSTERS) {
+      reason = i18n.translate('xpack.maps.source.esSearch.joinsDisabledReason', {
+        defaultMessage: 'Joins are not supported when scaling by clusters',
+      });
+    } else if (this._descriptor.scalingType === SCALING_TYPES.MVT) {
+      reason = i18n.translate('xpack.maps.source.esSearch.joinsDisabledReasonMvt', {
+        defaultMessage: 'Joins are not supported when scaling by mvt vector tiles',
+      });
+    } else {
+      reason = null;
+    }
+    return reason;
+  }
+
+  getLayerName() {
+    return MVT_SOURCE_LAYER_NAME;
+  }
+
+  async getUrlTemplateWithMeta(searchFilters) {
+    const indexPattern = await this.getIndexPattern();
+    const indexSettings = await loadIndexSettings(indexPattern.title);
+
+    const { docValueFields, sourceOnlyFields } = getDocValueAndSourceFields(
+      indexPattern,
+      searchFilters.fieldNames
+    );
+
+    const initialSearchContext = { docvalue_fields: docValueFields }; // Request fields in docvalue_fields insted of _source
+
+    const searchSource = await this.makeSearchSource(
+      searchFilters,
+      indexSettings.maxResultWindow,
+      initialSearchContext
+    );
+    searchSource.setField('fields', searchFilters.fieldNames); // Setting "fields" filters out unused scripted fields
+    if (sourceOnlyFields.length === 0) {
+      searchSource.setField('source', false); // do not need anything from _source
+    } else {
+      searchSource.setField('source', sourceOnlyFields);
+    }
+    if (this._hasSort()) {
+      searchSource.setField('sort', this._buildEsSort());
+    }
+
+    const dsl = await searchSource.getSearchRequestBody();
+    const risonDsl = rison.encode(dsl);
+
+    const mvtUrlServicePath = getHttp().basePath.prepend(
+      `/${GIS_API_PATH}/${MVT_GETTILE_API_PATH}`
+    );
+
+    const urlTemplate = `${mvtUrlServicePath}?x={x}&y={y}&z={z}&geometryFieldName=${this._descriptor.geoField}&index=${indexPattern.title}&requestBody=${risonDsl}`;
+    return {
+      layerName: this.getLayerName(),
+      minSourceZoom: this.getMinZoom(),
+      maxSourceZoom: this.getMaxZoom(),
+      urlTemplate: urlTemplate,
+    };
   }
 }
 
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.ts
new file mode 100644
index 00000000000000..3223d0c94178ff
--- /dev/null
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.test.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 { ES_GEO_FIELD_TYPE, SCALING_TYPES } from '../../../../common/constants';
+
+jest.mock('../../../kibana_services');
+jest.mock('./load_index_settings');
+
+import { getIndexPatternService, getSearchService, getHttp } from '../../../kibana_services';
+import { SearchSource } from '../../../../../../../src/plugins/data/public/search/search_source';
+
+// @ts-expect-error
+import { loadIndexSettings } from './load_index_settings';
+
+import { ESSearchSource } from './es_search_source';
+import { VectorSourceRequestMeta } from '../../../../common/descriptor_types';
+
+describe('ESSearchSource', () => {
+  it('constructor', () => {
+    const esSearchSource = new ESSearchSource({}, null);
+    expect(esSearchSource instanceof ESSearchSource).toBe(true);
+  });
+
+  describe('ITiledSingleLayerVectorSource', () => {
+    it('mb-source params', () => {
+      const esSearchSource = new ESSearchSource({}, null);
+      expect(esSearchSource.getMinZoom()).toBe(0);
+      expect(esSearchSource.getMaxZoom()).toBe(24);
+      expect(esSearchSource.getLayerName()).toBe('source_layer');
+    });
+
+    describe('getUrlTemplateWithMeta', () => {
+      const geoFieldName = 'bar';
+      const mockIndexPatternService = {
+        get() {
+          return {
+            title: 'foobar-title-*',
+            fields: {
+              getByName() {
+                return {
+                  name: geoFieldName,
+                  type: ES_GEO_FIELD_TYPE.GEO_SHAPE,
+                };
+              },
+            },
+          };
+        },
+      };
+
+      beforeEach(async () => {
+        const mockSearchSource = {
+          setField: jest.fn(),
+          getSearchRequestBody() {
+            return { foobar: 'ES_DSL_PLACEHOLDER', params: this.setField.mock.calls };
+          },
+          setParent() {},
+        };
+        const mockSearchService = {
+          searchSource: {
+            async create() {
+              return (mockSearchSource as unknown) as SearchSource;
+            },
+            createEmpty() {
+              return (mockSearchSource as unknown) as SearchSource;
+            },
+          },
+        };
+
+        // @ts-expect-error
+        getIndexPatternService.mockReturnValue(mockIndexPatternService);
+        // @ts-expect-error
+        getSearchService.mockReturnValue(mockSearchService);
+        loadIndexSettings.mockReturnValue({
+          maxResultWindow: 1000,
+        });
+        // @ts-expect-error
+        getHttp.mockReturnValue({
+          basePath: {
+            prepend(path: string) {
+              return `rootdir${path};`;
+            },
+          },
+        });
+      });
+
+      const searchFilters: VectorSourceRequestMeta = {
+        filters: [],
+        zoom: 0,
+        fieldNames: ['tooltipField', 'styleField'],
+        timeFilters: {
+          from: 'now',
+          to: '15m',
+          mode: 'relative',
+        },
+        sourceQuery: {
+          query: 'tooltipField: foobar',
+          language: 'KQL',
+          queryLastTriggeredAt: '2019-04-25T20:53:22.331Z',
+        },
+        sourceMeta: null,
+        applyGlobalQuery: true,
+      };
+
+      it('Should only include required props', async () => {
+        const esSearchSource = new ESSearchSource(
+          { geoField: geoFieldName, indexPatternId: 'ipId' },
+          null
+        );
+        const urlTemplateWithMeta = await esSearchSource.getUrlTemplateWithMeta(searchFilters);
+        expect(urlTemplateWithMeta.urlTemplate).toBe(
+          `rootdir/api/maps/mvt/getTile;?x={x}&y={y}&z={z}&geometryFieldName=bar&index=foobar-title-*&requestBody=(foobar:ES_DSL_PLACEHOLDER,params:('0':('0':index,'1':(fields:(),title:'foobar-title-*')),'1':('0':size,'1':1000),'2':('0':filter,'1':!()),'3':('0':query),'4':('0':index,'1':(fields:(),title:'foobar-title-*')),'5':('0':query,'1':(language:KQL,query:'tooltipField: foobar',queryLastTriggeredAt:'2019-04-25T20:53:22.331Z')),'6':('0':fields,'1':!(tooltipField,styleField)),'7':('0':source,'1':!(tooltipField,styleField))))`
+        );
+      });
+    });
+  });
+
+  describe('isFilterByMapBounds', () => {
+    it('default', () => {
+      const esSearchSource = new ESSearchSource({}, null);
+      expect(esSearchSource.isFilterByMapBounds()).toBe(true);
+    });
+    it('mvt', () => {
+      const esSearchSource = new ESSearchSource({ scalingType: SCALING_TYPES.MVT }, null);
+      expect(esSearchSource.isFilterByMapBounds()).toBe(false);
+    });
+  });
+
+  describe('getJoinsDisabledReason', () => {
+    it('default', () => {
+      const esSearchSource = new ESSearchSource({}, null);
+      expect(esSearchSource.getJoinsDisabledReason()).toBe(null);
+    });
+    it('mvt', () => {
+      const esSearchSource = new ESSearchSource({ scalingType: SCALING_TYPES.MVT }, null);
+      expect(esSearchSource.getJoinsDisabledReason()).toBe(
+        'Joins are not supported when scaling by mvt vector tiles'
+      );
+    });
+  });
+
+  describe('getFields', () => {
+    it('default', () => {
+      const esSearchSource = new ESSearchSource({}, null);
+      const docField = esSearchSource.createField({ fieldName: 'prop1' });
+      expect(docField.canReadFromGeoJson()).toBe(true);
+    });
+    it('mvt', () => {
+      const esSearchSource = new ESSearchSource({ scalingType: SCALING_TYPES.MVT }, null);
+      const docField = esSearchSource.createField({ fieldName: 'prop1' });
+      expect(docField.canReadFromGeoJson()).toBe(false);
+    });
+  });
+});
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx
index 6e56c179b4ead2..f57335db14c629 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.test.tsx
@@ -27,28 +27,46 @@ const defaultProps = {
   termFields: [],
   topHitsSplitField: null,
   topHitsSize: 1,
+  supportsMvt: true,
+  mvtDisabledReason: null,
 };
 
-test('should render', async () => {
-  const component = shallow(<ScalingForm {...defaultProps} />);
+describe('scaling form', () => {
+  test('should render', async () => {
+    const component = shallow(<ScalingForm {...defaultProps} />);
 
-  expect(component).toMatchSnapshot();
-});
+    expect(component).toMatchSnapshot();
+  });
 
-test('should disable clusters option when clustering is not supported', async () => {
-  const component = shallow(
-    <ScalingForm
-      {...defaultProps}
-      supportsClustering={false}
-      clusteringDisabledReason="Simulated clustering disabled"
-    />
-  );
+  test('should disable clusters option when clustering is not supported', async () => {
+    const component = shallow(
+      <ScalingForm
+        {...defaultProps}
+        supportsClustering={false}
+        clusteringDisabledReason="Simulated clustering disabled"
+      />
+    );
 
-  expect(component).toMatchSnapshot();
-});
+    expect(component).toMatchSnapshot();
+  });
+
+  test('should render top hits form when scaling type is TOP_HITS', async () => {
+    const component = shallow(
+      <ScalingForm {...defaultProps} scalingType={SCALING_TYPES.TOP_HITS} />
+    );
+
+    expect(component).toMatchSnapshot();
+  });
 
-test('should render top hits form when scaling type is TOP_HITS', async () => {
-  const component = shallow(<ScalingForm {...defaultProps} scalingType={SCALING_TYPES.TOP_HITS} />);
+  test('should disable mvt option when mvt is not supported', async () => {
+    const component = shallow(
+      <ScalingForm
+        {...defaultProps}
+        supportsMvt={false}
+        mvtDisabledReason={'Simulated mvt disabled'}
+      />
+    );
 
-  expect(component).toMatchSnapshot();
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx
index 816db6a98d593b..cc2d4d059a3a8f 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/scaling_form.tsx
@@ -4,16 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment, Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import {
   EuiFormRow,
+  EuiHorizontalRule,
+  EuiRadio,
+  EuiSpacer,
   EuiSwitch,
   EuiSwitchEvent,
   EuiTitle,
-  EuiSpacer,
-  EuiHorizontalRule,
-  EuiRadio,
   EuiToolTip,
+  EuiBetaBadge,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -24,8 +25,8 @@ import { ValidatedRange } from '../../../components/validated_range';
 import {
   DEFAULT_MAX_INNER_RESULT_WINDOW,
   DEFAULT_MAX_RESULT_WINDOW,
-  SCALING_TYPES,
   LAYER_TYPE,
+  SCALING_TYPES,
 } from '../../../../common/constants';
 // @ts-ignore
 import { loadIndexSettings } from './load_index_settings';
@@ -38,7 +39,9 @@ interface Props {
   onChange: (args: OnSourceChangeArgs) => void;
   scalingType: SCALING_TYPES;
   supportsClustering: boolean;
+  supportsMvt: boolean;
   clusteringDisabledReason?: string | null;
+  mvtDisabledReason?: string | null;
   termFields: IFieldType[];
   topHitsSplitField: string | null;
   topHitsSize: number;
@@ -80,8 +83,15 @@ export class ScalingForm extends Component<Props, State> {
   }
 
   _onScalingTypeChange = (optionId: string): void => {
-    const layerType =
-      optionId === SCALING_TYPES.CLUSTERS ? LAYER_TYPE.BLENDED_VECTOR : LAYER_TYPE.VECTOR;
+    let layerType;
+    if (optionId === SCALING_TYPES.CLUSTERS) {
+      layerType = LAYER_TYPE.BLENDED_VECTOR;
+    } else if (optionId === SCALING_TYPES.MVT) {
+      layerType = LAYER_TYPE.TILED_VECTOR;
+    } else {
+      layerType = LAYER_TYPE.VECTOR;
+    }
+
     this.props.onChange({ propName: 'scalingType', value: optionId, newLayerType: layerType });
   };
 
@@ -177,9 +187,47 @@ export class ScalingForm extends Component<Props, State> {
     );
   }
 
+  _renderMVTRadio() {
+    const labelText = i18n.translate('xpack.maps.source.esSearch.useMVTVectorTiles', {
+      defaultMessage: 'Use vector tiles',
+    });
+    const mvtRadio = (
+      <EuiRadio
+        id={SCALING_TYPES.MVT}
+        label={labelText}
+        checked={this.props.scalingType === SCALING_TYPES.MVT}
+        onChange={() => this._onScalingTypeChange(SCALING_TYPES.MVT)}
+        disabled={!this.props.supportsMvt}
+      />
+    );
+
+    const enabledInfo = (
+      <>
+        <EuiBetaBadge label={'beta'} />
+        <EuiHorizontalRule margin="xs" />
+        {i18n.translate('xpack.maps.source.esSearch.mvtDescription', {
+          defaultMessage: 'Use vector tiles for faster display of large datasets.',
+        })}
+      </>
+    );
+
+    return !this.props.supportsMvt ? (
+      <EuiToolTip position="left" content={this.props.mvtDisabledReason}>
+        {mvtRadio}
+      </EuiToolTip>
+    ) : (
+      <EuiToolTip position="left" content={enabledInfo}>
+        {mvtRadio}
+      </EuiToolTip>
+    );
+  }
+
   render() {
     let filterByBoundsSwitch;
-    if (this.props.scalingType !== SCALING_TYPES.CLUSTERS) {
+    if (
+      this.props.scalingType === SCALING_TYPES.TOP_HITS ||
+      this.props.scalingType === SCALING_TYPES.LIMIT
+    ) {
       filterByBoundsSwitch = (
         <EuiFormRow>
           <EuiSwitch
@@ -194,9 +242,9 @@ export class ScalingForm extends Component<Props, State> {
       );
     }
 
-    let scalingForm = null;
+    let topHitsOptionsForm = null;
     if (this.props.scalingType === SCALING_TYPES.TOP_HITS) {
-      scalingForm = (
+      topHitsOptionsForm = (
         <Fragment>
           <EuiHorizontalRule margin="xs" />
           {this._renderTopHitsForm()}
@@ -234,12 +282,12 @@ export class ScalingForm extends Component<Props, State> {
               onChange={() => this._onScalingTypeChange(SCALING_TYPES.TOP_HITS)}
             />
             {this._renderClusteringRadio()}
+            {this._renderMVTRadio()}
           </div>
         </EuiFormRow>
 
         {filterByBoundsSwitch}
-
-        {scalingForm}
+        {topHitsOptionsForm}
       </Fragment>
     );
   }
diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
index 0701dbbaecdd56..c123c307c4895b 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js
@@ -17,6 +17,8 @@ import {
   getTermsFields,
   getSourceFields,
   supportsGeoTileAgg,
+  supportsMvt,
+  getMvtDisabledReason,
 } from '../../../index_pattern_util';
 import { SORT_ORDER } from '../../../../common/constants';
 import { ESDocField } from '../../fields/es_doc_field';
@@ -42,6 +44,9 @@ export class UpdateSourceEditor extends Component {
     termFields: null,
     sortFields: null,
     supportsClustering: false,
+    supportsMvt: false,
+    mvtDisabledReason: null,
+    clusteringDisabledReason: null,
   };
 
   componentDidMount() {
@@ -94,9 +99,12 @@ export class UpdateSourceEditor extends Component {
       });
     });
 
+    const mvtSupported = supportsMvt(indexPattern, geoField.name);
     this.setState({
       supportsClustering: supportsGeoTileAgg(geoField),
+      supportsMvt: mvtSupported,
       clusteringDisabledReason: getGeoTileAggNotSupportedReason(geoField),
+      mvtDisabledReason: mvtSupported ? null : getMvtDisabledReason(),
       sourceFields: sourceFields,
       termFields: getTermsFields(indexPattern.fields), //todo change term fields to use fields
       sortFields: indexPattern.fields.filter(
@@ -207,7 +215,9 @@ export class UpdateSourceEditor extends Component {
           onChange={this.props.onChange}
           scalingType={this.props.scalingType}
           supportsClustering={this.state.supportsClustering}
+          supportsMvt={this.state.supportsMvt}
           clusteringDisabledReason={this.state.clusteringDisabledReason}
+          mvtDisabledReason={this.state.mvtDisabledReason}
           termFields={this.state.termFields}
           topHitsSplitField={this.props.topHitsSplitField}
           topHitsSize={this.props.topHitsSize}
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
index 8cc2aa018979b5..56b830e9ff0983 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
@@ -184,7 +184,7 @@ export class AbstractESSource extends AbstractVectorSource {
     const minLon = esBounds.top_left.lon;
     const maxLon = esBounds.bottom_right.lon;
     return {
-      minLon: minLon > maxLon ? minLon - 360 : minLon,
+      minLon: minLon > maxLon ? minLon - 360 : minLon, //fixes an ES bbox to straddle dateline
       maxLon,
       minLat: esBounds.bottom_right.lat,
       maxLat: esBounds.top_left.lat,
diff --git a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts
index 271505010f36a8..fd9c1792754448 100644
--- a/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts
+++ b/x-pack/plugins/maps/public/classes/sources/vector_source/vector_source.d.ts
@@ -14,6 +14,7 @@ import {
   MapExtent,
   MapFilters,
   MapQuery,
+  VectorSourceRequestMeta,
   VectorSourceSyncMeta,
 } from '../../../../common/descriptor_types';
 import { VECTOR_SHAPE_TYPE } from '../../../../common/constants';
@@ -64,7 +65,7 @@ export class AbstractVectorSource extends AbstractSource implements IVectorSourc
   ): MapExtent | null;
   getGeoJsonWithMeta(
     layerName: string,
-    searchFilters: MapFilters,
+    searchFilters: VectorSourceRequestMeta,
     registerCancelCallback: (callback: () => void) => void
   ): Promise<GeoJsonWithMeta>;
 
@@ -79,7 +80,9 @@ export class AbstractVectorSource extends AbstractSource implements IVectorSourc
 }
 
 export interface ITiledSingleLayerVectorSource extends IVectorSource {
-  getUrlTemplateWithMeta(): Promise<{
+  getUrlTemplateWithMeta(
+    searchFilters: VectorSourceRequestMeta
+  ): Promise<{
     layerName: string;
     urlTemplate: string;
     minSourceZoom: number;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
index e49c15c68b8db9..2a544b94d760ab 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/categorical_field_meta_popover.tsx
@@ -14,6 +14,7 @@ import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
 type Props = {
   fieldMetaOptions: FieldMetaOptions;
   onChange: (fieldMetaOptions: FieldMetaOptions) => void;
+  switchDisabled: boolean;
 };
 
 export function CategoricalFieldMetaPopover(props: Props) {
@@ -34,6 +35,7 @@ export function CategoricalFieldMetaPopover(props: Props) {
           checked={props.fieldMetaOptions.isEnabled}
           onChange={onIsEnabledChange}
           compressed
+          disabled={props.switchDisabled}
         />
       </EuiFormRow>
     </FieldMetaPopover>
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
index 9086c4df315967..09be9d72af9704 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx
@@ -40,6 +40,7 @@ type Props = {
   fieldMetaOptions: FieldMetaOptions;
   styleName: VECTOR_STYLES;
   onChange: (fieldMetaOptions: FieldMetaOptions) => void;
+  switchDisabled: boolean;
 };
 
 export function OrdinalFieldMetaPopover(props: Props) {
@@ -66,6 +67,7 @@ export function OrdinalFieldMetaPopover(props: Props) {
             checked={props.fieldMetaOptions.isEnabled}
             onChange={onIsEnabledChange}
             compressed
+            disabled={props.switchDisabled}
           />
         </EuiFormRow>
 
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
index c722e86512e528..34d2d7fb0cbbf6 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/__snapshots__/dynamic_color_property.test.tsx.snap
@@ -325,3 +325,29 @@ exports[`ordinal Should render ordinal legend as bands 1`] = `
   </EuiFlexGroup>
 </div>
 `;
+
+exports[`renderFieldMetaPopover Should disable toggle when field is not backed by geojson source 1`] = `
+<OrdinalFieldMetaPopover
+  fieldMetaOptions={
+    Object {
+      "isEnabled": true,
+    }
+  }
+  onChange={[Function]}
+  styleName="lineColor"
+  switchDisabled={true}
+/>
+`;
+
+exports[`renderFieldMetaPopover Should enable toggle when field is backed by geojson-source 1`] = `
+<OrdinalFieldMetaPopover
+  fieldMetaOptions={
+    Object {
+      "isEnabled": true,
+    }
+  }
+  onChange={[Function]}
+  styleName="lineColor"
+  switchDisabled={false}
+/>
+`;
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
index c3610cbc78e15f..de8f3b5c09175f 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/properties/dynamic_color_property.test.tsx
@@ -577,3 +577,39 @@ test('Should read out ordinal type correctly', async () => {
   expect(ordinalColorStyle2.isOrdinal()).toEqual(true);
   expect(ordinalColorStyle2.isCategorical()).toEqual(false);
 });
+
+describe('renderFieldMetaPopover', () => {
+  test('Should enable toggle when field is backed by geojson-source', () => {
+    const colorStyle = makeProperty(
+      {
+        color: 'Blues',
+        type: undefined,
+        fieldMetaOptions,
+      },
+      undefined,
+      mockField
+    );
+
+    const legendRow = colorStyle.renderFieldMetaPopover(() => {});
+    expect(legendRow).toMatchSnapshot();
+  });
+
+  test('Should disable toggle when field is not backed by geojson source', () => {
+    const nonGeoJsonField = Object.create(mockField);
+    nonGeoJsonField.canReadFromGeoJson = () => {
+      return false;
+    };
+    const colorStyle = makeProperty(
+      {
+        color: 'Blues',
+        type: undefined,
+        fieldMetaOptions,
+      },
+      undefined,
+      nonGeoJsonField
+    );
+
+    const legendRow = colorStyle.renderFieldMetaPopover(() => {});
+    expect(legendRow).toMatchSnapshot();
+  });
+});
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 b16755e69f92de..f6ab052497723e 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
@@ -328,16 +328,20 @@ export class DynamicStyleProperty<T>
       return null;
     }
 
+    const switchDisabled = !!this._field && !this._field.canReadFromGeoJson();
+
     return this.isCategorical() ? (
       <CategoricalFieldMetaPopover
         fieldMetaOptions={this.getFieldMetaOptions()}
         onChange={onFieldMetaOptionsChange}
+        switchDisabled={switchDisabled}
       />
     ) : (
       <OrdinalFieldMetaPopover
         fieldMetaOptions={this.getFieldMetaOptions()}
         styleName={this.getStyleName()}
         onChange={onFieldMetaOptionsChange}
+        switchDisabled={switchDisabled}
       />
     );
   }
diff --git a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
index 8da6fa2318de96..0da6f632eb4a84 100644
--- a/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
+++ b/x-pack/plugins/maps/public/classes/util/mb_filter_expressions.ts
@@ -4,32 +4,48 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { GEO_JSON_TYPE, FEATURE_VISIBLE_PROPERTY_NAME } from '../../../common/constants';
+import {
+  GEO_JSON_TYPE,
+  FEATURE_VISIBLE_PROPERTY_NAME,
+  KBN_TOO_MANY_FEATURES_PROPERTY,
+} from '../../../common/constants';
+
+export const EXCLUDE_TOO_MANY_FEATURES_BOX = ['!=', ['get', KBN_TOO_MANY_FEATURES_PROPERTY], true];
 
 const VISIBILITY_FILTER_CLAUSE = ['all', ['==', ['get', FEATURE_VISIBLE_PROPERTY_NAME], true]];
+const TOO_MANY_FEATURES_FILTER = ['all', EXCLUDE_TOO_MANY_FEATURES_BOX];
 
 const CLOSED_SHAPE_MB_FILTER = [
-  'any',
-  ['==', ['geometry-type'], GEO_JSON_TYPE.POLYGON],
-  ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POLYGON],
+  ...TOO_MANY_FEATURES_FILTER,
+  [
+    'any',
+    ['==', ['geometry-type'], GEO_JSON_TYPE.POLYGON],
+    ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POLYGON],
+  ],
 ];
 
 const VISIBLE_CLOSED_SHAPE_MB_FILTER = [...VISIBILITY_FILTER_CLAUSE, CLOSED_SHAPE_MB_FILTER];
 
 const ALL_SHAPE_MB_FILTER = [
-  'any',
-  ['==', ['geometry-type'], GEO_JSON_TYPE.POLYGON],
-  ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POLYGON],
-  ['==', ['geometry-type'], GEO_JSON_TYPE.LINE_STRING],
-  ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_LINE_STRING],
+  ...TOO_MANY_FEATURES_FILTER,
+  [
+    'any',
+    ['==', ['geometry-type'], GEO_JSON_TYPE.POLYGON],
+    ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POLYGON],
+    ['==', ['geometry-type'], GEO_JSON_TYPE.LINE_STRING],
+    ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_LINE_STRING],
+  ],
 ];
 
 const VISIBLE_ALL_SHAPE_MB_FILTER = [...VISIBILITY_FILTER_CLAUSE, ALL_SHAPE_MB_FILTER];
 
 const POINT_MB_FILTER = [
-  'any',
-  ['==', ['geometry-type'], GEO_JSON_TYPE.POINT],
-  ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POINT],
+  ...TOO_MANY_FEATURES_FILTER,
+  [
+    'any',
+    ['==', ['geometry-type'], GEO_JSON_TYPE.POINT],
+    ['==', ['geometry-type'], GEO_JSON_TYPE.MULTI_POINT],
+  ],
 ];
 
 const VISIBLE_POINT_MB_FILTER = [...VISIBILITY_FILTER_CLAUSE, POINT_MB_FILTER];
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 87d6f8e1d8e716..edfeb3c76b1046 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
@@ -8,6 +8,7 @@ import _ from 'lodash';
 import React from 'react';
 import { FEATURE_ID_PROPERTY_NAME, LON_INDEX } from '../../../../../common/constants';
 import { TooltipPopover } from './tooltip_popover';
+import { EXCLUDE_TOO_MANY_FEATURES_BOX } from '../../../../classes/util/mb_filter_expressions';
 
 function justifyAnchorLocation(mbLngLat, targetFeature) {
   let popupAnchorLocation = [mbLngLat.lng, mbLngLat.lat]; // default popup location to mouse location
@@ -79,7 +80,7 @@ export class TooltipControl extends React.Component {
         // - As empty object literal
         // To avoid ambiguity, normalize properties to empty object literal.
         const mbProperties = mbFeature.properties ? mbFeature.properties : {};
-        //This keeps track of first properties (assuming these will be identical for features in different tiles
+        //This keeps track of first properties (assuming these will be identical for features in different tiles)
         uniqueFeatures.push({
           id: featureId,
           layerId: layerId,
@@ -175,7 +176,10 @@ export class TooltipControl extends React.Component {
         y: mbLngLatPoint.y + PADDING,
       },
     ];
-    return this.props.mbMap.queryRenderedFeatures(mbBbox, { layers: mbLayerIds });
+    return this.props.mbMap.queryRenderedFeatures(mbBbox, {
+      layers: mbLayerIds,
+      filter: EXCLUDE_TOO_MANY_FEATURES_BOX,
+    });
   }
 
   render() {
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 22c374aceedd5d..eede1edf40cc4f 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
@@ -10,7 +10,11 @@ import { ResizeChecker } from '../../../../../../../src/plugins/kibana_utils/pub
 import { removeOrphanedSourcesAndLayers, addSpritesheetToMap } from './utils';
 import { syncLayerOrder } from './sort_layers';
 import { getGlyphUrl, isRetina } from '../../../meta';
-import { DECIMAL_DEGREES_PRECISION, ZOOM_PRECISION } from '../../../../common/constants';
+import {
+  DECIMAL_DEGREES_PRECISION,
+  KBN_TOO_MANY_FEATURES_IMAGE_ID,
+  ZOOM_PRECISION,
+} from '../../../../common/constants';
 import mapboxgl from 'mapbox-gl/dist/mapbox-gl-csp';
 import mbWorkerUrl from '!!file-loader!mapbox-gl/dist/mapbox-gl-csp-worker';
 import mbRtlPlugin from '!!file-loader!@mapbox/mapbox-gl-rtl-text/mapbox-gl-rtl-text.min.js';
@@ -143,6 +147,14 @@ export class MBMap extends React.Component {
         mbMap.addControl(new mapboxgl.NavigationControl({ showCompass: false }), 'top-left');
       }
 
+      const tooManyFeaturesImageSrc =
+        'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAA7DgAAOw4BzLahgwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAARLSURBVHic7ZnPbxRVAMe/7735sWO3293ZlUItJsivCxEE0oTYRgu1FqTQoFSwKTYx8SAH/wHjj4vRozGGi56sMcW2UfqTEuOhppE0KJc2GIuKQFDY7qzdtrudX88D3YTUdFuQN8+k87ltZt7uZz958/bNLAGwBWsYKltANmEA2QKyCQPIFpBNGEC2gGzCALIFZBMGkC0gmzCAbAHZhAFkC8gmDCBbQDZhANkCslnzARQZH6oDpNs0D5UDSUIInePcOpPLfdfnODNBuwQWIAWwNOABwHZN0x8npE6hNLJ4DPWRyFSf40wE5VOEQPBjcR0g3YlE4ybGmtK+/1NzJtOZA/xSYwZMs3nG962T2ez3It2AANaA/kSidYuivOQBs5WM1fUnk6f0u+GXJUqIuUtVXx00zRbRfkIDfBqL7a1WlIYbjvNtTTr99jXXHVpH6dMjK0R4cXq6c9rzxjcx9sKX8XitSEdhAToMI7VP10/97fsTh7PZrgWAN1lW72KE2vOm2b5chDTgtWQyn93x/bEEIetEOQIC14CxVOr1CkKefH929t0v8vn0vcdGEoljGxXl4C3PGz2YyXy+AHARDqtByAxoUdWKBKV70r4/vvTLA0CjZfX+5nkDGxirKzUTgkBIgNaysh3gnF627R+XO+dQJvP1ddcdrmSsbtA020pF+CAW21qrqmUiXIUEqGRsIwD0FQq/lzqv0bJ6rrvucBVjzwyb5ivLRTiiaW+8VV7eIEBVTAANiIIQd9RxZlc6t9Gyem647vn1jD07ZJonl4sQASoevqmgABzwwHnJzc69PGdZ3X+47sgGxuqHTPPE0ggeVtg5/QeEBMhxPg1Aa1DV2GrHPG9ZXy1G2D+wNALn9jyQEeHKAJgP+033Kgrdqij7AFwZtu3bqx3XWShMHtV1o1pRGo4YxiNd+fyEB2DKdX/4aG5u0hbwcylkBryTy/3scT6zW9Nq7ndso2Wdvea6Q1WUHuiPx1/WAXLBcWZXun94UMRcAoD/p+ddTFK6u8MwUvc7vsmyem+67oVqVT0wkEgcF+FYRNhW+L25uX6f84XThtHxIBudE5bVY/t++jFVrU/dvVSFICzAqG3PX/S8rihj2/61qK1AOUB7ksl2jdLUL7Z9rvgcQQRCFsEi5wqFmw26XnhCUQ63GcZmCly95Lrzpca0G0byk3j8tEnpU1c975tmyxoU5QcE8EAEAM5WVOzfoarHAeC2749dcpzxMwsLv07Ztg0AOzVNf03Ttu/S9T2PMlbjc25fdpyutmx2TLRbIAEA4M1otKo1EjmaoHQn4ZwBgA/kAVAK6MXXdzxv/ONcrq/HcbJBeAUWoEizqsaORaPbKglZrxMSZZyrM76f/ovzWx/m85PFWREUgQf4v7Hm/xcIA8gWkE0YQLaAbMIAsgVkEwaQLSCbMIBsAdmEAWQLyCYMIFtANmEA2QKyCQPIFpDNmg/wD3OFdEybUvJjAAAAAElFTkSuQmCC';
+      const tooManyFeaturesImage = new Image();
+      tooManyFeaturesImage.onload = () => {
+        mbMap.addImage(KBN_TOO_MANY_FEATURES_IMAGE_ID, tooManyFeaturesImage);
+      };
+      tooManyFeaturesImage.src = tooManyFeaturesImageSrc;
+
       let emptyImage;
       mbMap.on('styleimagemissing', (e) => {
         if (emptyImage) {
diff --git a/x-pack/plugins/maps/public/index_pattern_util.ts b/x-pack/plugins/maps/public/index_pattern_util.ts
index 4b4bfb41990b92..bd2a14619ac419 100644
--- a/x-pack/plugins/maps/public/index_pattern_util.ts
+++ b/x-pack/plugins/maps/public/index_pattern_util.ts
@@ -81,6 +81,16 @@ export function supportsGeoTileAgg(field?: IFieldType): boolean {
   );
 }
 
+export function supportsMvt(indexPattern: IndexPattern, geoFieldName: string): boolean {
+  const field = indexPattern.fields.getByName(geoFieldName);
+  return !!field && field.type === ES_GEO_FIELD_TYPE.GEO_SHAPE;
+}
+
+export function getMvtDisabledReason() {
+  return i18n.translate('xpack.maps.mbt.disabled', {
+    defaultMessage: 'Display as vector tiles is only supported for geo_shape field-types.',
+  });
+}
 // Returns filtered fields list containing only fields that exist in _source.
 export function getSourceFields(fields: IFieldType[]): IFieldType[] {
   return fields.filter((field) => {
diff --git a/x-pack/plugins/maps/server/mvt/__tests__/json/0_0_0_search.json b/x-pack/plugins/maps/server/mvt/__tests__/json/0_0_0_search.json
new file mode 100644
index 00000000000000..0fc99ffd811f71
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/__tests__/json/0_0_0_search.json
@@ -0,0 +1 @@
+{"took":0,"timed_out":false,"_shards":{"total":1,"successful":1,"skipped":0,"failed":0},"hits":{"total":{"value":1,"relation":"eq"},"max_score":0,"hits":[{"_index":"poly","_id":"G7PRMXQBgyyZ-h5iYibj","_score":0,"_source":{"coordinates":{"coordinates":[[[-106.171875,36.59788913307022],[-50.625,-22.91792293614603],[4.921875,42.8115217450979],[-33.046875,63.54855223203644],[-66.796875,63.860035895395306],[-106.171875,36.59788913307022]]],"type":"polygon"}}}]}}
diff --git a/x-pack/plugins/maps/server/mvt/__tests__/pbf/0_0_0.pbf b/x-pack/plugins/maps/server/mvt/__tests__/pbf/0_0_0.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..9a9296e2ece3f94ac726f6a83f2958ba2e22074b
GIT binary patch
literal 155
zcmb1|!C1k>#Z#PLT9lj`pOaXbTBOmSAfzP3#=yYH$iyVUtR%)cfww_Yse%1Hdjp%m
z1GW`x?>R5<@Jq49XXd4(R!A|&XQoIA$H!+U<;BORr6!h?7Nr7(;^URrxL6AEb1Id@
lxJ2B|1A=@b0-e$;E2DHXOfw@hld_a#xuikzR@fx13;_42EcXBa

literal 0
HcmV?d00001

diff --git a/x-pack/plugins/maps/server/mvt/__tests__/tile_searches.ts b/x-pack/plugins/maps/server/mvt/__tests__/tile_searches.ts
new file mode 100644
index 00000000000000..317d6434cf81ef
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/__tests__/tile_searches.ts
@@ -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 * as path from 'path';
+import * as fs from 'fs';
+
+const search000path = path.resolve(__dirname, './json/0_0_0_search.json');
+const search000raw = fs.readFileSync(search000path);
+const search000json = JSON.parse((search000raw as unknown) as string);
+
+export const TILE_SEARCHES = {
+  '0.0.0': {
+    countResponse: {
+      count: 1,
+      _shards: {
+        total: 1,
+        successful: 1,
+        skipped: 0,
+        failed: 0,
+      },
+    },
+    searchResponse: search000json,
+  },
+  '1.1.0': {},
+};
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.test.ts b/x-pack/plugins/maps/server/mvt/get_tile.test.ts
new file mode 100644
index 00000000000000..b9c928d594539c
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/get_tile.test.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 { getTile } from './get_tile';
+import { TILE_SEARCHES } from './__tests__/tile_searches';
+import { Logger } from 'src/core/server';
+import * as path from 'path';
+import * as fs from 'fs';
+
+describe('getTile', () => {
+  const mockCallElasticsearch = jest.fn();
+
+  const requestBody = {
+    _source: { excludes: [] },
+    docvalue_fields: [],
+    query: { bool: { filter: [{ match_all: {} }], must: [], must_not: [], should: [] } },
+    script_fields: {},
+    size: 10000,
+    stored_fields: ['*'],
+  };
+  const geometryFieldName = 'coordinates';
+
+  beforeEach(() => {
+    mockCallElasticsearch.mockReset();
+  });
+
+  test('0.0.0 - under limit', async () => {
+    mockCallElasticsearch.mockImplementation((type) => {
+      if (type === 'count') {
+        return TILE_SEARCHES['0.0.0'].countResponse;
+      } else if (type === 'search') {
+        return TILE_SEARCHES['0.0.0'].searchResponse;
+      } else {
+        throw new Error(`${type} not recognized`);
+      }
+    });
+
+    const tile = await getTile({
+      x: 0,
+      y: 0,
+      z: 0,
+      index: 'world_countries',
+      requestBody,
+      geometryFieldName,
+      logger: ({
+        info: () => {},
+      } as unknown) as Logger,
+      callElasticsearch: mockCallElasticsearch,
+    });
+
+    if (tile === null) {
+      throw new Error('Tile should be created');
+    }
+
+    const expectedPath = path.resolve(__dirname, './__tests__/pbf/0_0_0.pbf');
+    const expectedBin = fs.readFileSync(expectedPath, 'binary');
+    const expectedTile = Buffer.from(expectedBin, 'binary');
+    expect(expectedTile.equals(tile)).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.ts b/x-pack/plugins/maps/server/mvt/get_tile.ts
new file mode 100644
index 00000000000000..9621f7f174a306
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/get_tile.ts
@@ -0,0 +1,226 @@
+/*
+ * 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
+import geojsonvt from 'geojson-vt';
+// @ts-expect-error
+import vtpbf from 'vt-pbf';
+import { Logger } from 'src/core/server';
+import { Feature, FeatureCollection, Polygon } from 'geojson';
+import {
+  ES_GEO_FIELD_TYPE,
+  FEATURE_ID_PROPERTY_NAME,
+  KBN_TOO_MANY_FEATURES_PROPERTY,
+  MVT_SOURCE_LAYER_NAME,
+} from '../../common/constants';
+
+import { hitsToGeoJson } from '../../common/elasticsearch_geo_utils';
+import { flattenHit } from './util';
+
+interface ESBounds {
+  top_left: {
+    lon: number;
+    lat: number;
+  };
+  bottom_right: {
+    lon: number;
+    lat: number;
+  };
+}
+
+export async function getTile({
+  logger,
+  callElasticsearch,
+  index,
+  geometryFieldName,
+  x,
+  y,
+  z,
+  requestBody = {},
+}: {
+  x: number;
+  y: number;
+  z: number;
+  geometryFieldName: string;
+  index: string;
+  callElasticsearch: (type: string, ...args: any[]) => Promise<unknown>;
+  logger: Logger;
+  requestBody: any;
+}): Promise<Buffer | null> {
+  const geojsonBbox = tileToGeoJsonPolygon(x, y, z);
+
+  let resultFeatures: Feature[];
+  try {
+    let result;
+    try {
+      const geoShapeFilter = {
+        geo_shape: {
+          [geometryFieldName]: {
+            shape: geojsonBbox,
+            relation: 'INTERSECTS',
+          },
+        },
+      };
+      requestBody.query.bool.filter.push(geoShapeFilter);
+
+      const esSearchQuery = {
+        index,
+        body: requestBody,
+      };
+
+      const esCountQuery = {
+        index,
+        body: {
+          query: requestBody.query,
+        },
+      };
+
+      const countResult = await callElasticsearch('count', esCountQuery);
+
+      // @ts-expect-error
+      if (countResult.count > requestBody.size) {
+        // Generate "too many features"-bounds
+        const bboxAggName = 'data_bounds';
+        const bboxQuery = {
+          index,
+          body: {
+            size: 0,
+            query: requestBody.query,
+            aggs: {
+              [bboxAggName]: {
+                geo_bounds: {
+                  field: geometryFieldName,
+                },
+              },
+            },
+          },
+        };
+
+        const bboxResult = await callElasticsearch('search', bboxQuery);
+
+        // @ts-expect-error
+        const bboxForData = esBboxToGeoJsonPolygon(bboxResult.aggregations[bboxAggName].bounds);
+
+        resultFeatures = [
+          {
+            type: 'Feature',
+            properties: {
+              [KBN_TOO_MANY_FEATURES_PROPERTY]: true,
+            },
+            geometry: bboxForData,
+          },
+        ];
+      } else {
+        // Perform actual search
+        result = await callElasticsearch('search', esSearchQuery);
+
+        // Todo: pass in epochMillies-fields
+        const featureCollection = hitsToGeoJson(
+          // @ts-expect-error
+          result.hits.hits,
+          (hit: Record<string, unknown>) => {
+            return flattenHit(geometryFieldName, hit);
+          },
+          geometryFieldName,
+          ES_GEO_FIELD_TYPE.GEO_SHAPE,
+          []
+        );
+
+        resultFeatures = featureCollection.features;
+
+        // Correct system-fields.
+        for (let i = 0; i < resultFeatures.length; i++) {
+          const props = resultFeatures[i].properties;
+          if (props !== null) {
+            props[FEATURE_ID_PROPERTY_NAME] = resultFeatures[i].id;
+          }
+        }
+      }
+    } catch (e) {
+      logger.warn(e.message);
+      throw e;
+    }
+
+    const featureCollection: FeatureCollection = {
+      features: resultFeatures,
+      type: 'FeatureCollection',
+    };
+
+    const tileIndex = geojsonvt(featureCollection, {
+      maxZoom: 24, // max zoom to preserve detail on; can't be higher than 24
+      tolerance: 3, // simplification tolerance (higher means simpler)
+      extent: 4096, // tile extent (both width and height)
+      buffer: 64, // tile buffer on each side
+      debug: 0, // logging level (0 to disable, 1 or 2)
+      lineMetrics: false, // whether to enable line metrics tracking for LineString/MultiLineString features
+      promoteId: null, // name of a feature property to promote to feature.id. Cannot be used with `generateId`
+      generateId: false, // whether to generate feature ids. Cannot be used with `promoteId`
+      indexMaxZoom: 5, // max zoom in the initial tile index
+      indexMaxPoints: 100000, // max number of points per tile in the index
+    });
+    const tile = tileIndex.getTile(z, x, y);
+
+    if (tile) {
+      const pbf = vtpbf.fromGeojsonVt({ [MVT_SOURCE_LAYER_NAME]: tile }, { version: 2 });
+      return Buffer.from(pbf);
+    } else {
+      return null;
+    }
+  } catch (e) {
+    logger.warn(`Cannot generate tile for ${z}/${x}/${y}: ${e.message}`);
+    return null;
+  }
+}
+
+function tileToGeoJsonPolygon(x: number, y: number, z: number): Polygon {
+  const wLon = tile2long(x, z);
+  const sLat = tile2lat(y + 1, z);
+  const eLon = tile2long(x + 1, z);
+  const nLat = tile2lat(y, z);
+
+  return {
+    type: 'Polygon',
+    coordinates: [
+      [
+        [wLon, sLat],
+        [wLon, nLat],
+        [eLon, nLat],
+        [eLon, sLat],
+        [wLon, sLat],
+      ],
+    ],
+  };
+}
+
+function tile2long(x: number, z: number): number {
+  return (x / Math.pow(2, z)) * 360 - 180;
+}
+
+function tile2lat(y: number, z: number): number {
+  const n = Math.PI - (2 * Math.PI * y) / Math.pow(2, z);
+  return (180 / Math.PI) * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n)));
+}
+
+function esBboxToGeoJsonPolygon(esBounds: ESBounds): Polygon {
+  let minLon = esBounds.top_left.lon;
+  const maxLon = esBounds.bottom_right.lon;
+  minLon = minLon > maxLon ? minLon - 360 : minLon; // fixes an ES bbox to straddle dateline
+  const minLat = esBounds.bottom_right.lat;
+  const maxLat = esBounds.top_left.lat;
+
+  return {
+    type: 'Polygon',
+    coordinates: [
+      [
+        [minLon, minLat],
+        [minLon, maxLat],
+        [maxLon, maxLat],
+        [maxLon, minLat],
+        [minLon, minLat],
+      ],
+    ],
+  };
+}
diff --git a/x-pack/plugins/maps/server/mvt/mvt_routes.ts b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
new file mode 100644
index 00000000000000..32c14a355ba2a1
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/mvt_routes.ts
@@ -0,0 +1,73 @@
+/*
+ * 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 rison from 'rison-node';
+import { schema } from '@kbn/config-schema';
+import { Logger } from 'src/core/server';
+import { IRouter } from 'src/core/server';
+import { MVT_GETTILE_API_PATH, API_ROOT_PATH } from '../../common/constants';
+import { getTile } from './get_tile';
+
+const CACHE_TIMEOUT = 0; // Todo. determine good value. Unsure about full-implications (e.g. wrt. time-based data).
+
+export function initMVTRoutes({ router, logger }: { logger: Logger; router: IRouter }) {
+  router.get(
+    {
+      path: `${API_ROOT_PATH}/${MVT_GETTILE_API_PATH}`,
+      validate: {
+        query: schema.object({
+          x: schema.number(),
+          y: schema.number(),
+          z: schema.number(),
+          geometryFieldName: schema.string(),
+          requestBody: schema.string(),
+          index: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      const { query } = request;
+
+      const callElasticsearch = async (type: string, ...args: any[]): Promise<unknown> => {
+        return await context.core.elasticsearch.legacy.client.callAsCurrentUser(type, ...args);
+      };
+
+      const requestBodyDSL = rison.decode(query.requestBody);
+
+      const tile = await getTile({
+        logger,
+        callElasticsearch,
+        geometryFieldName: query.geometryFieldName,
+        x: query.x,
+        y: query.y,
+        z: query.z,
+        index: query.index,
+        requestBody: requestBodyDSL,
+      });
+
+      if (tile) {
+        return response.ok({
+          body: tile,
+          headers: {
+            'content-disposition': 'inline',
+            'content-length': `${tile.length}`,
+            'Content-Type': 'application/x-protobuf',
+            'Cache-Control': `max-age=${CACHE_TIMEOUT}`,
+          },
+        });
+      } else {
+        return response.ok({
+          headers: {
+            'content-disposition': 'inline',
+            'content-length': '0',
+            'Content-Type': 'application/x-protobuf',
+            'Cache-Control': `max-age=${CACHE_TIMEOUT}`,
+          },
+        });
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/maps/server/mvt/util.ts b/x-pack/plugins/maps/server/mvt/util.ts
new file mode 100644
index 00000000000000..eb85468dd770dc
--- /dev/null
+++ b/x-pack/plugins/maps/server/mvt/util.ts
@@ -0,0 +1,72 @@
+/*
+ * 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.
+ */
+
+// This implementation:
+// - does not include meta-fields
+// - does not validate the schema against the index-pattern (e.g. nested fields)
+// In the context of .mvt this is sufficient:
+// - only fields from the response are packed in the tile (more efficient)
+// - query-dsl submitted from the client, which was generated by the IndexPattern
+// todo: Ideally, this should adapt/reuse from https://github.com/elastic/kibana/blob/52b42a81faa9dd5c102b9fbb9a645748c3623121/src/plugins/data/common/index_patterns/index_patterns/flatten_hit.ts#L26
+import { GeoJsonProperties } from 'geojson';
+
+export function flattenHit(geometryField: string, hit: Record<string, unknown>): GeoJsonProperties {
+  const flat: GeoJsonProperties = {};
+  if (hit) {
+    flattenSource(flat, '', hit._source as Record<string, unknown>, geometryField);
+    if (hit.fields) {
+      flattenFields(flat, hit.fields as Array<Record<string, unknown>>);
+    }
+
+    // Attach meta fields
+    flat._index = hit._index;
+    flat._id = hit._id;
+  }
+  return flat;
+}
+
+function flattenSource(
+  accum: GeoJsonProperties,
+  path: string,
+  properties: Record<string, unknown> = {},
+  geometryField: string
+): GeoJsonProperties {
+  accum = accum || {};
+  for (const key in properties) {
+    if (properties.hasOwnProperty(key)) {
+      const newKey = path ? path + '.' + key : key;
+      let value;
+      if (geometryField === newKey) {
+        value = properties[key]; // do not deep-copy the geometry
+      } else if (properties[key] !== null && typeof value === 'object' && !Array.isArray(value)) {
+        value = flattenSource(
+          accum,
+          newKey,
+          properties[key] as Record<string, unknown>,
+          geometryField
+        );
+      } else {
+        value = properties[key];
+      }
+      accum[newKey] = value;
+    }
+  }
+  return accum;
+}
+
+function flattenFields(accum: GeoJsonProperties = {}, fields: Array<Record<string, unknown>>) {
+  accum = accum || {};
+  for (const key in fields) {
+    if (fields.hasOwnProperty(key)) {
+      const value = fields[key];
+      if (Array.isArray(value)) {
+        accum[key] = value[0];
+      } else {
+        accum[key] = value;
+      }
+    }
+  }
+}
diff --git a/x-pack/plugins/maps/server/routes.js b/x-pack/plugins/maps/server/routes.js
index 1876c0de19c560..6b19103b597228 100644
--- a/x-pack/plugins/maps/server/routes.js
+++ b/x-pack/plugins/maps/server/routes.js
@@ -22,6 +22,7 @@ import {
   EMS_SPRITES_PATH,
   INDEX_SETTINGS_API_PATH,
   FONTS_API_PATH,
+  API_ROOT_PATH,
 } from '../common/constants';
 import { EMSClient } from '@elastic/ems-client';
 import fetch from 'node-fetch';
@@ -30,8 +31,7 @@ import { getIndexPatternSettings } from './lib/get_index_pattern_settings';
 import { schema } from '@kbn/config-schema';
 import fs from 'fs';
 import path from 'path';
-
-const ROOT = `/${GIS_API_PATH}`;
+import { initMVTRoutes } from './mvt/mvt_routes';
 
 export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
   let emsClient;
@@ -69,7 +69,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_FILES_API_PATH}/${EMS_FILES_DEFAULT_JSON_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_FILES_API_PATH}/${EMS_FILES_DEFAULT_JSON_PATH}`,
       validate: {
         query: schema.object({
           id: schema.maybe(schema.string()),
@@ -109,7 +109,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_RASTER_TILE_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_TILES_RASTER_TILE_PATH}`,
       validate: false,
     },
     async (context, request, response) => {
@@ -145,7 +145,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_CATALOGUE_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_CATALOGUE_PATH}`,
       validate: false,
     },
     async (context, request, { ok, badRequest }) => {
@@ -181,7 +181,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_FILES_CATALOGUE_PATH}/{emsVersion}/manifest`,
+      path: `${API_ROOT_PATH}/${EMS_FILES_CATALOGUE_PATH}/{emsVersion}/manifest`,
       validate: false,
     },
     async (context, request, { ok, badRequest }) => {
@@ -213,7 +213,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_CATALOGUE_PATH}/{emsVersion}/manifest`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_CATALOGUE_PATH}/{emsVersion}/manifest`,
       validate: false,
     },
     async (context, request, { ok, badRequest }) => {
@@ -257,7 +257,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_RASTER_STYLE_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_TILES_RASTER_STYLE_PATH}`,
       validate: {
         query: schema.object({
           id: schema.maybe(schema.string()),
@@ -293,7 +293,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_STYLE_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_STYLE_PATH}`,
       validate: {
         query: schema.object({
           id: schema.string(),
@@ -341,7 +341,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_SOURCE_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_SOURCE_PATH}`,
       validate: {
         query: schema.object({
           id: schema.string(),
@@ -379,7 +379,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_TILE_PATH}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_TILE_PATH}`,
       validate: {
         query: schema.object({
           id: schema.string(),
@@ -417,7 +417,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_GLYPHS_PATH}/{fontstack}/{range}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_GLYPHS_PATH}/{fontstack}/{range}`,
       validate: {
         params: schema.object({
           fontstack: schema.string(),
@@ -439,7 +439,7 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
 
   router.get(
     {
-      path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_SPRITES_PATH}/{id}/sprite{scaling?}.{extension}`,
+      path: `${API_ROOT_PATH}/${EMS_TILES_API_PATH}/${EMS_SPRITES_PATH}/{id}/sprite{scaling?}.{extension}`,
       validate: {
         query: schema.object({
           elastic_tile_service_tos: schema.maybe(schema.string()),
@@ -591,4 +591,6 @@ export function initRoutes(router, licenseUid, mapConfig, kbnVersion, logger) {
       return response.badRequest(`Cannot connect to EMS`);
     }
   }
+
+  initMVTRoutes({ router, logger });
 }
diff --git a/x-pack/test/api_integration/apis/maps/get_tile.js b/x-pack/test/api_integration/apis/maps/get_tile.js
new file mode 100644
index 00000000000000..7219fc858e059c
--- /dev/null
+++ b/x-pack/test/api_integration/apis/maps/get_tile.js
@@ -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.
+ */
+
+export default function ({ getService }) {
+  const supertest = getService('supertest');
+
+  describe('getTile', () => {
+    it('should validate params', async () => {
+      await supertest
+        .get(
+          `/api/maps/mvt/getTile?x=15&y=11&z=5&geometryFieldName=coordinates&index=logstash*&requestBody=(_source:(includes:!(coordinates)),docvalue_fields:!(),query:(bool:(filter:!((match_all:())),must:!(),must_not:!(),should:!())),script_fields:(),size:10000,stored_fields:!(coordinates))`
+        )
+        .set('kbn-xsrf', 'kibana')
+        .expect(200);
+    });
+
+    it('should not validate when required params are missing', async () => {
+      await supertest
+        .get(
+          `/api/maps/mvt/getTile?&index=logstash*&requestBody=(_source:(includes:!(coordinates)),docvalue_fields:!(),query:(bool:(filter:!((match_all:())),must:!(),must_not:!(),should:!())),script_fields:(),size:10000,stored_fields:!(coordinates))`
+        )
+        .set('kbn-xsrf', 'kibana')
+        .expect(400);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/maps/index.js b/x-pack/test/api_integration/apis/maps/index.js
index f9dff19229645a..6c213380dd64e1 100644
--- a/x-pack/test/api_integration/apis/maps/index.js
+++ b/x-pack/test/api_integration/apis/maps/index.js
@@ -16,6 +16,7 @@ export default function ({ loadTestFile, getService }) {
       loadTestFile(require.resolve('./fonts_api'));
       loadTestFile(require.resolve('./index_settings'));
       loadTestFile(require.resolve('./migrations'));
+      loadTestFile(require.resolve('./get_tile'));
     });
   });
 }
diff --git a/x-pack/test/functional/apps/maps/index.js b/x-pack/test/functional/apps/maps/index.js
index 4bbe38367d0a21..ef8b4ad4c0f190 100644
--- a/x-pack/test/functional/apps/maps/index.js
+++ b/x-pack/test/functional/apps/maps/index.js
@@ -46,6 +46,7 @@ export default function ({ loadTestFile, getService }) {
       loadTestFile(require.resolve('./es_geo_grid_source'));
       loadTestFile(require.resolve('./es_pew_pew_source'));
       loadTestFile(require.resolve('./joins'));
+      loadTestFile(require.resolve('./mvt_scaling'));
       loadTestFile(require.resolve('./add_layer_panel'));
       loadTestFile(require.resolve('./import_geojson'));
       loadTestFile(require.resolve('./layer_errors'));
diff --git a/x-pack/test/functional/apps/maps/joins.js b/x-pack/test/functional/apps/maps/joins.js
index e447996a08dfe1..1139ae204aefd2 100644
--- a/x-pack/test/functional/apps/maps/joins.js
+++ b/x-pack/test/functional/apps/maps/joins.js
@@ -5,7 +5,6 @@
  */
 
 import expect from '@kbn/expect';
-import { set } from '@elastic/safer-lodash-set';
 
 import { MAPBOX_STYLES } from './mapbox_styles';
 
@@ -21,6 +20,7 @@ const VECTOR_SOURCE_ID = 'n1t6f';
 const CIRCLE_STYLE_LAYER_INDEX = 0;
 const FILL_STYLE_LAYER_INDEX = 2;
 const LINE_STYLE_LAYER_INDEX = 3;
+const TOO_MANY_FEATURES_LAYER_INDEX = 4;
 
 export default function ({ getPageObjects, getService }) {
   const PageObjects = getPageObjects(['maps']);
@@ -87,28 +87,32 @@ export default function ({ getPageObjects, getService }) {
       });
     });
 
-    it('should style fills, points and lines independently', async () => {
+    it('should style fills, points, lines, and bounding-boxes independently', async () => {
       const mapboxStyle = await PageObjects.maps.getMapboxStyle();
       const layersForVectorSource = mapboxStyle.layers.filter((mbLayer) => {
         return mbLayer.id.startsWith(VECTOR_SOURCE_ID);
       });
 
-      // Color is dynamically obtained from eui source lib
-      const dynamicColor =
-        layersForVectorSource[CIRCLE_STYLE_LAYER_INDEX].paint['circle-stroke-color'];
-
       //circle layer for points
-      expect(layersForVectorSource[CIRCLE_STYLE_LAYER_INDEX]).to.eql(
-        set(MAPBOX_STYLES.POINT_LAYER, 'paint.circle-stroke-color', dynamicColor)
-      );
+      expect(layersForVectorSource[CIRCLE_STYLE_LAYER_INDEX]).to.eql(MAPBOX_STYLES.POINT_LAYER);
 
       //fill layer
       expect(layersForVectorSource[FILL_STYLE_LAYER_INDEX]).to.eql(MAPBOX_STYLES.FILL_LAYER);
 
       //line layer for borders
-      expect(layersForVectorSource[LINE_STYLE_LAYER_INDEX]).to.eql(
-        set(MAPBOX_STYLES.LINE_LAYER, 'paint.line-color', dynamicColor)
-      );
+      expect(layersForVectorSource[LINE_STYLE_LAYER_INDEX]).to.eql(MAPBOX_STYLES.LINE_LAYER);
+
+      //Too many features layer (this is a static style config)
+      expect(layersForVectorSource[TOO_MANY_FEATURES_LAYER_INDEX]).to.eql({
+        id: 'n1t6f_toomanyfeatures',
+        type: 'fill',
+        source: 'n1t6f',
+        minzoom: 0,
+        maxzoom: 24,
+        filter: ['==', ['get', '__kbn_too_many_features__'], true],
+        layout: { visibility: 'visible' },
+        paint: { 'fill-pattern': '__kbn_too_many_features_image_id__', 'fill-opacity': 0.75 },
+      });
     });
 
     it('should flag only the joined features as visible', async () => {
diff --git a/x-pack/test/functional/apps/maps/mapbox_styles.js b/x-pack/test/functional/apps/maps/mapbox_styles.js
index 744eb4ac74bf65..78720fa1689ec6 100644
--- a/x-pack/test/functional/apps/maps/mapbox_styles.js
+++ b/x-pack/test/functional/apps/maps/mapbox_styles.js
@@ -14,7 +14,11 @@ export const MAPBOX_STYLES = {
     filter: [
       'all',
       ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
-      ['any', ['==', ['geometry-type'], 'Point'], ['==', ['geometry-type'], 'MultiPoint']],
+      [
+        'all',
+        ['!=', ['get', '__kbn_too_many_features__'], true],
+        ['any', ['==', ['geometry-type'], 'Point'], ['==', ['geometry-type'], 'MultiPoint']],
+      ],
     ],
     layout: { visibility: 'visible' },
     paint: {
@@ -84,7 +88,11 @@ export const MAPBOX_STYLES = {
     filter: [
       'all',
       ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
-      ['any', ['==', ['geometry-type'], 'Polygon'], ['==', ['geometry-type'], 'MultiPolygon']],
+      [
+        'all',
+        ['!=', ['get', '__kbn_too_many_features__'], true],
+        ['any', ['==', ['geometry-type'], 'Polygon'], ['==', ['geometry-type'], 'MultiPolygon']],
+      ],
     ],
     layout: { visibility: 'visible' },
     paint: {
@@ -151,20 +159,18 @@ export const MAPBOX_STYLES = {
       'all',
       ['==', ['get', '__kbn_isvisibleduetojoin__'], true],
       [
-        'any',
-        ['==', ['geometry-type'], 'Polygon'],
-        ['==', ['geometry-type'], 'MultiPolygon'],
-        ['==', ['geometry-type'], 'LineString'],
-        ['==', ['geometry-type'], 'MultiLineString'],
+        'all',
+        ['!=', ['get', '__kbn_too_many_features__'], true],
+        [
+          'any',
+          ['==', ['geometry-type'], 'Polygon'],
+          ['==', ['geometry-type'], 'MultiPolygon'],
+          ['==', ['geometry-type'], 'LineString'],
+          ['==', ['geometry-type'], 'MultiLineString'],
+        ],
       ],
     ],
-    layout: {
-      visibility: 'visible',
-    },
-    paint: {
-      /* 'line-color': '' */ // Obtained dynamically
-      'line-opacity': 0.75,
-      'line-width': 1,
-    },
+    layout: { visibility: 'visible' },
+    paint: { 'line-color': '#41937c', 'line-opacity': 0.75, 'line-width': 1 },
   },
 };
diff --git a/x-pack/test/functional/apps/maps/mvt_scaling.js b/x-pack/test/functional/apps/maps/mvt_scaling.js
new file mode 100644
index 00000000000000..e50b72658fb435
--- /dev/null
+++ b/x-pack/test/functional/apps/maps/mvt_scaling.js
@@ -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';
+
+const VECTOR_SOURCE_ID = 'caffa63a-ebfb-466d-8ff6-d797975b88ab';
+
+export default function ({ getPageObjects, getService }) {
+  const PageObjects = getPageObjects(['maps']);
+  const inspector = getService('inspector');
+
+  describe('mvt geoshape layer', () => {
+    before(async () => {
+      await PageObjects.maps.loadSavedMap('geo_shape_mvt');
+    });
+
+    after(async () => {
+      await inspector.close();
+    });
+
+    it('should render with mvt-source', async () => {
+      const mapboxStyle = await PageObjects.maps.getMapboxStyle();
+
+      //Source should be correct
+      expect(mapboxStyle.sources[VECTOR_SOURCE_ID].tiles[0]).to.equal(
+        '/api/maps/mvt/getTile?x={x}&y={y}&z={z}&geometryFieldName=geometry&index=geo_shapes*&requestBody=(_source:(includes:!(geometry,prop1)),docvalue_fields:!(prop1),query:(bool:(filter:!((match_all:())),must:!(),must_not:!(),should:!())),script_fields:(),size:10000,stored_fields:!(geometry,prop1))'
+      );
+
+      //Should correctly load meta for style-rule (sigma is set to 1, opacity to 1)
+      const fillLayer = mapboxStyle.layers.find((layer) => layer.id === VECTOR_SOURCE_ID + '_fill');
+      expect(fillLayer.paint).to.eql({
+        'fill-color': [
+          'interpolate',
+          ['linear'],
+          [
+            'coalesce',
+            [
+              'case',
+              ['==', ['get', 'prop1'], null],
+              0.3819660112501051,
+              [
+                'max',
+                ['min', ['to-number', ['get', 'prop1']], 3.618033988749895],
+                1.381966011250105,
+              ],
+            ],
+            0.3819660112501051,
+          ],
+          0.3819660112501051,
+          'rgba(0,0,0,0)',
+          1.381966011250105,
+          '#ecf1f7',
+          1.6614745084375788,
+          '#d9e3ef',
+          1.9409830056250525,
+          '#c5d5e7',
+          2.2204915028125263,
+          '#b2c7df',
+          2.5,
+          '#9eb9d8',
+          2.7795084971874737,
+          '#8bacd0',
+          3.0590169943749475,
+          '#769fc8',
+          3.338525491562421,
+          '#6092c0',
+        ],
+        'fill-opacity': 1,
+      });
+    });
+  });
+}
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 0f1fd3c09d7065..f756d73484198f 100644
--- a/x-pack/test/functional/es_archives/maps/kibana/data.json
+++ b/x-pack/test/functional/es_archives/maps/kibana/data.json
@@ -1008,6 +1008,40 @@
   }
 }
 
+{
+  "type": "doc",
+  "value": {
+    "id": "map:bff99716-e3dc-11ea-87d0-0242ac130003",
+    "index": ".kibana",
+    "source": {
+      "map" : {
+        "description":"shapes with mvt scaling",
+        "layerListJSON":"[{\"sourceDescriptor\":{\"type\":\"EMS_TMS\",\"isAutoSelect\":true},\"id\":\"76b9fc1d-1e8a-4d2f-9f9e-6ba2b19f24bb\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":1,\"visible\":true,\"style\":{\"type\":\"TILE\"},\"type\":\"VECTOR_TILE\"},{\"sourceDescriptor\":{\"geoField\":\"geometry\",\"filterByMapBounds\":true,\"scalingType\":\"MVT\",\"topHitsSize\":1,\"id\":\"97f8555e-8db0-4bd8-8b18-22e32f468667\",\"type\":\"ES_SEARCH\",\"tooltipProperties\":[],\"sortField\":\"\",\"sortOrder\":\"desc\",\"indexPatternRefName\":\"layer_1_source_index_pattern\"},\"id\":\"caffa63a-ebfb-466d-8ff6-d797975b88ab\",\"label\":null,\"minZoom\":0,\"maxZoom\":24,\"alpha\":1,\"visible\":true,\"style\":{\"type\":\"VECTOR\",\"properties\":{\"icon\":{\"type\":\"STATIC\",\"options\":{\"value\":\"marker\"}},\"fillColor\":{\"type\":\"DYNAMIC\",\"options\":{\"color\":\"Blues\",\"colorCategory\":\"palette_0\",\"field\":{\"name\":\"prop1\",\"origin\":\"source\"},\"fieldMetaOptions\":{\"isEnabled\":true,\"sigma\":1},\"type\":\"ORDINAL\"}},\"lineColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#41937c\"}},\"lineWidth\":{\"type\":\"STATIC\",\"options\":{\"size\":1}},\"iconSize\":{\"type\":\"STATIC\",\"options\":{\"size\":6}},\"iconOrientation\":{\"type\":\"STATIC\",\"options\":{\"orientation\":0}},\"labelText\":{\"type\":\"STATIC\",\"options\":{\"value\":\"\"}},\"labelColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#000000\"}},\"labelSize\":{\"type\":\"STATIC\",\"options\":{\"size\":14}},\"labelBorderColor\":{\"type\":\"STATIC\",\"options\":{\"color\":\"#FFFFFF\"}},\"symbolizeAs\":{\"options\":{\"value\":\"circle\"}},\"labelBorderSize\":{\"options\":{\"size\":\"SMALL\"}}},\"isTimeAware\":true},\"type\":\"TILED_VECTOR\",\"joins\":[]}]",
+        "mapStateJSON":"{\"zoom\":3.75,\"center\":{\"lon\":80.01106,\"lat\":3.65009},\"timeFilters\":{\"from\":\"now-15m\",\"to\":\"now\"},\"refreshConfig\":{\"isPaused\":true,\"interval\":0},\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filters\":[],\"settings\":{\"autoFitToDataBounds\":false,\"initialLocation\":\"LAST_SAVED_LOCATION\",\"fixedLocation\":{\"lat\":0,\"lon\":0,\"zoom\":2},\"browserLocation\":{\"zoom\":2},\"maxZoom\":24,\"minZoom\":0,\"showSpatialFilters\":true,\"spatialFiltersAlpa\":0.3,\"spatialFiltersFillColor\":\"#DA8B45\",\"spatialFiltersLineColor\":\"#DA8B45\"}}",
+        "title":"geo_shape_mvt",
+        "uiStateJSON":"{\"isLayerTOCOpen\":true,\"openTOCDetails\":[]}"
+      },
+      "type" : "map",
+      "references" : [
+        {
+          "id":"561253e0-f731-11e8-8487-11b9dd924f96",
+          "name":"layer_1_source_index_pattern",
+          "type":"index-pattern"
+        }
+      ],
+      "migrationVersion" : {
+        "map" : "7.9.0"
+      },
+      "updated_at" : "2020-08-10T18:27:39.805Z"
+    }
+  }
+}
+
+
+
+
+
+
 {
   "type": "doc",
   "value": {

From 1ae2a145fbf58fe07ecac030df727447f1377f4e Mon Sep 17 00:00:00 2001
From: Devon Thomson <devon.thomson@hotmail.com>
Date: Tue, 1 Sep 2020 14:34:45 -0400
Subject: [PATCH 154/216] [Dashboard First] Library Notification (#76122)

Added a notification to show when an embeddable is saved to the Visualize Library
---
 .../public/application/actions/index.ts       |   5 +
 .../library_notification_action.test.tsx      | 100 ++++++++++++++++++
 .../actions/library_notification_action.tsx   |  89 ++++++++++++++++
 src/plugins/dashboard/public/plugin.tsx       |  17 ++-
 .../lib/panel/panel_header/panel_header.tsx   |   5 +-
 5 files changed, 210 insertions(+), 6 deletions(-)
 create mode 100644 src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
 create mode 100644 src/plugins/dashboard/public/application/actions/library_notification_action.tsx

diff --git a/src/plugins/dashboard/public/application/actions/index.ts b/src/plugins/dashboard/public/application/actions/index.ts
index 4343a3409b6967..cd32c2025456f5 100644
--- a/src/plugins/dashboard/public/application/actions/index.ts
+++ b/src/plugins/dashboard/public/application/actions/index.ts
@@ -42,3 +42,8 @@ export {
   UnlinkFromLibraryActionContext,
   ACTION_UNLINK_FROM_LIBRARY,
 } from './unlink_from_library_action';
+export {
+  LibraryNotificationActionContext,
+  LibraryNotificationAction,
+  ACTION_LIBRARY_NOTIFICATION,
+} from './library_notification_action';
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
new file mode 100644
index 00000000000000..385f6f14ba94ce
--- /dev/null
+++ b/src/plugins/dashboard/public/application/actions/library_notification_action.test.tsx
@@ -0,0 +1,100 @@
+/*
+ * 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 { isErrorEmbeddable, ReferenceOrValueEmbeddable } from '../../embeddable_plugin';
+import { DashboardContainer } from '../embeddable';
+import { getSampleDashboardInput } from '../test_helpers';
+import {
+  CONTACT_CARD_EMBEDDABLE,
+  ContactCardEmbeddableFactory,
+  ContactCardEmbeddable,
+  ContactCardEmbeddableInput,
+  ContactCardEmbeddableOutput,
+} from '../../embeddable_plugin_test_samples';
+import { coreMock } from '../../../../../core/public/mocks';
+import { CoreStart } from 'kibana/public';
+import { LibraryNotificationAction } from '.';
+import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { ViewMode } from '../../../../embeddable/public';
+
+const { setup, doStart } = embeddablePluginMock.createInstance();
+setup.registerEmbeddableFactory(
+  CONTACT_CARD_EMBEDDABLE,
+  new ContactCardEmbeddableFactory((() => null) as any, {} as any)
+);
+const start = doStart();
+
+let container: DashboardContainer;
+let embeddable: ContactCardEmbeddable & ReferenceOrValueEmbeddable;
+let coreStart: CoreStart;
+beforeEach(async () => {
+  coreStart = coreMock.createStart();
+
+  const containerOptions = {
+    ExitFullScreenButton: () => null,
+    SavedObjectFinder: () => null,
+    application: {} as any,
+    embeddable: start,
+    inspector: {} as any,
+    notifications: {} as any,
+    overlays: coreStart.overlays,
+    savedObjectMetaData: {} as any,
+    uiActions: {} as any,
+  };
+
+  container = new DashboardContainer(getSampleDashboardInput(), containerOptions);
+
+  const contactCardEmbeddable = await container.addNewEmbeddable<
+    ContactCardEmbeddableInput,
+    ContactCardEmbeddableOutput,
+    ContactCardEmbeddable
+  >(CONTACT_CARD_EMBEDDABLE, {
+    firstName: 'Kibanana',
+  });
+
+  if (isErrorEmbeddable(contactCardEmbeddable)) {
+    throw new Error('Failed to create embeddable');
+  }
+  embeddable = embeddablePluginMock.mockRefOrValEmbeddable<
+    ContactCardEmbeddable,
+    ContactCardEmbeddableInput
+  >(contactCardEmbeddable, {
+    mockedByReferenceInput: { savedObjectId: 'testSavedObjectId', id: contactCardEmbeddable.id },
+    mockedByValueInput: { firstName: 'Kibanana', id: contactCardEmbeddable.id },
+  });
+  embeddable.updateInput({ viewMode: ViewMode.EDIT });
+});
+
+test('Notification is shown when embeddable on dashboard has reference type input', async () => {
+  const action = new LibraryNotificationAction();
+  embeddable.updateInput(await embeddable.getInputAsRefType());
+  expect(await action.isCompatible({ embeddable })).toBe(true);
+});
+
+test('Notification is not shown when embeddable input is by value', async () => {
+  const action = new LibraryNotificationAction();
+  embeddable.updateInput(await embeddable.getInputAsValueType());
+  expect(await action.isCompatible({ embeddable })).toBe(false);
+});
+
+test('Notification is not shown when view mode is set to view', async () => {
+  const action = new LibraryNotificationAction();
+  embeddable.updateInput(await embeddable.getInputAsRefType());
+  embeddable.updateInput({ viewMode: ViewMode.VIEW });
+  expect(await action.isCompatible({ embeddable })).toBe(false);
+});
diff --git a/src/plugins/dashboard/public/application/actions/library_notification_action.tsx b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
new file mode 100644
index 00000000000000..974b55275ccc1d
--- /dev/null
+++ b/src/plugins/dashboard/public/application/actions/library_notification_action.tsx
@@ -0,0 +1,89 @@
+/*
+ * 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 { i18n } from '@kbn/i18n';
+import { EuiBadge } from '@elastic/eui';
+import { IEmbeddable, ViewMode, isReferenceOrValueEmbeddable } from '../../embeddable_plugin';
+import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin';
+import { reactToUiComponent } from '../../../../kibana_react/public';
+
+export const ACTION_LIBRARY_NOTIFICATION = 'ACTION_LIBRARY_NOTIFICATION';
+
+export interface LibraryNotificationActionContext {
+  embeddable: IEmbeddable;
+}
+
+export class LibraryNotificationAction implements ActionByType<typeof ACTION_LIBRARY_NOTIFICATION> {
+  public readonly id = ACTION_LIBRARY_NOTIFICATION;
+  public readonly type = ACTION_LIBRARY_NOTIFICATION;
+  public readonly order = 1;
+
+  private displayName = i18n.translate('dashboard.panel.LibraryNotification', {
+    defaultMessage: 'Library',
+  });
+
+  private icon = 'folderCheck';
+
+  public readonly MenuItem = reactToUiComponent(() => (
+    <EuiBadge
+      data-test-subj={`embeddablePanelNotification-${this.id}`}
+      iconType={this.icon}
+      key={this.id}
+      style={{ marginTop: '2px', marginRight: '4px' }}
+      color="hollow"
+    >
+      {this.displayName}
+    </EuiBadge>
+  ));
+
+  public getDisplayName({ embeddable }: LibraryNotificationActionContext) {
+    if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+      throw new IncompatibleActionError();
+    }
+    return this.displayName;
+  }
+
+  public getIconType({ embeddable }: LibraryNotificationActionContext) {
+    if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+      throw new IncompatibleActionError();
+    }
+    return this.icon;
+  }
+
+  public getDisplayNameTooltip = ({ embeddable }: LibraryNotificationActionContext) => {
+    if (!embeddable.getRoot() || !embeddable.getRoot().isContainer) {
+      throw new IncompatibleActionError();
+    }
+    return i18n.translate('dashboard.panel.libraryNotification.toolTip', {
+      defaultMessage:
+        'This panel is linked to a Library item. Editing the panel might affect other dashboards.',
+    });
+  };
+
+  public isCompatible = async ({ embeddable }: LibraryNotificationActionContext) => {
+    return (
+      embeddable.getInput()?.viewMode !== ViewMode.VIEW &&
+      isReferenceOrValueEmbeddable(embeddable) &&
+      embeddable.inputIsRefType(embeddable.getInput())
+    );
+  };
+
+  public execute = async () => {};
+}
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 8b9b92faf90316..3df52f4e7a2054 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -40,6 +40,7 @@ import {
   EmbeddableStart,
   SavedObjectEmbeddableInput,
   EmbeddableInput,
+  PANEL_NOTIFICATION_TRIGGER,
 } from '../../embeddable/public';
 import { DataPublicPluginSetup, DataPublicPluginStart, esFilters } from '../../data/public';
 import { SharePluginSetup, SharePluginStart, UrlGeneratorContract } from '../../share/public';
@@ -83,6 +84,12 @@ import {
   ACTION_UNLINK_FROM_LIBRARY,
   UnlinkFromLibraryActionContext,
   UnlinkFromLibraryAction,
+  ACTION_ADD_TO_LIBRARY,
+  AddToLibraryActionContext,
+  AddToLibraryAction,
+  ACTION_LIBRARY_NOTIFICATION,
+  LibraryNotificationActionContext,
+  LibraryNotificationAction,
 } from './application';
 import {
   createDashboardUrlGenerator,
@@ -95,11 +102,6 @@ import { addEmbeddableToDashboardUrl } from './url_utils/url_helper';
 import { PlaceholderEmbeddableFactory } from './application/embeddable/placeholder';
 import { UrlGeneratorState } from '../../share/public';
 import { AttributeService } from '.';
-import {
-  AddToLibraryAction,
-  ACTION_ADD_TO_LIBRARY,
-  AddToLibraryActionContext,
-} from './application/actions/add_to_library_action';
 
 declare module '../../share/public' {
   export interface UrlGeneratorStateMapping {
@@ -162,6 +164,7 @@ declare module '../../../plugins/ui_actions/public' {
     [ACTION_CLONE_PANEL]: ClonePanelActionContext;
     [ACTION_ADD_TO_LIBRARY]: AddToLibraryActionContext;
     [ACTION_UNLINK_FROM_LIBRARY]: UnlinkFromLibraryActionContext;
+    [ACTION_LIBRARY_NOTIFICATION]: LibraryNotificationActionContext;
   }
 }
 
@@ -437,6 +440,10 @@ export class DashboardPlugin
       const unlinkFromLibraryAction = new UnlinkFromLibraryAction();
       uiActions.registerAction(unlinkFromLibraryAction);
       uiActions.attachAction(CONTEXT_MENU_TRIGGER, unlinkFromLibraryAction.id);
+
+      const libraryNotificationAction = new LibraryNotificationAction();
+      uiActions.registerAction(libraryNotificationAction);
+      uiActions.attachAction(PANEL_NOTIFICATION_TRIGGER, libraryNotificationAction.id);
     }
 
     const savedDashboardLoader = createSavedDashboardLoader({
diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
index 5d7daaa7217ed7..f3c4cae720193c 100644
--- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
+++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_header.tsx
@@ -31,6 +31,7 @@ import { Action } from 'src/plugins/ui_actions/public';
 import { PanelOptionsMenu } from './panel_options_menu';
 import { IEmbeddable } from '../../embeddables';
 import { EmbeddableContext, panelBadgeTrigger, panelNotificationTrigger } from '../../triggers';
+import { uiToReactComponent } from '../../../../../kibana_react/public';
 
 export interface PanelHeaderProps {
   title?: string;
@@ -65,7 +66,9 @@ function renderNotifications(
   return notifications.map((notification) => {
     const context = { embeddable };
 
-    let badge = (
+    let badge = notification.MenuItem ? (
+      React.createElement(uiToReactComponent(notification.MenuItem))
+    ) : (
       <EuiNotificationBadge
         data-test-subj={`embeddablePanelNotification-${notification.id}`}
         key={notification.id}

From b2be910509f0b7319755df8d43d003a8edc6923a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Tue, 1 Sep 2020 21:30:45 +0200
Subject: [PATCH 155/216] [Detections Engine] Add Alert actions to the Timeline
 (#73228)

---
 .../security_solution/public/app/app.tsx      |   6 +-
 .../public/app/home/index.tsx                 |   7 +-
 .../components/alerts_viewer/alerts_table.tsx |   5 +-
 .../alerts_viewer/histogram_configs.ts        |   4 +-
 .../common/components/alerts_viewer/index.tsx |   4 +-
 .../events_viewer/events_viewer.test.tsx      |  42 --
 .../events_viewer/events_viewer.tsx           |   7 +-
 .../common/components/events_viewer/index.tsx |   7 +-
 .../exceptions/add_exception_modal/index.tsx  |   6 +-
 .../components/matrix_histogram/types.ts      |   2 +-
 .../common/components/url_state/helpers.ts    |   3 +-
 .../histogram_configs.ts                      |   4 +-
 .../public/common/mock/timeline_results.ts    |   4 +-
 .../components/alerts_table/actions.test.tsx  |  14 +-
 .../components/alerts_table/actions.tsx       |  16 +-
 .../alerts_table/default_config.tsx           | 229 +--------
 .../components/alerts_table/index.test.tsx    |   2 -
 .../components/alerts_table/index.tsx         | 204 +-------
 .../timeline_actions/alert_context_menu.tsx   | 484 ++++++++++++++++++
 .../investigate_in_timeline_action.tsx        |  85 +++
 .../components/alerts_table/translations.ts   |   7 +
 .../components/alerts_table/types.ts          |   1 -
 .../detections/components/user_info/index.tsx |   2 +-
 .../detection_engine.test.tsx                 |   4 +-
 .../detection_engine/detection_engine.tsx     |  22 +-
 .../pages/detection_engine/index.test.tsx     |   4 +-
 .../pages/detection_engine/index.tsx          |  43 +-
 .../rules/create/index.test.tsx               |   4 +-
 .../detection_engine/rules/create/index.tsx   |  18 +-
 .../rules/details/index.test.tsx              |   4 +-
 .../detection_engine/rules/details/index.tsx  |  22 +-
 .../rules/edit/index.test.tsx                 |   4 +-
 .../detection_engine/rules/edit/index.tsx     |  18 +-
 .../detection_engine/rules/index.test.tsx     |   4 +-
 .../pages/detection_engine/rules/index.tsx    |  20 +-
 .../public/detections/routes.tsx              |  13 +-
 .../public/graphql/introspection.json         |   8 +
 .../security_solution/public/graphql/types.ts |   4 +
 .../authentications_query_tab_body.tsx        |   4 +-
 .../navigation/events_query_tab_body.tsx      |  16 +-
 .../pages/navigation/dns_query_tab_body.tsx   |   6 +-
 .../components/alerts_by_category/index.tsx   |   4 +-
 .../components/events_by_dataset/index.tsx    |   4 +-
 .../fields_browser/field_browser.tsx          |  10 +-
 .../components/fields_browser/header.tsx      |  10 +-
 .../components/fields_browser/index.tsx       |   2 -
 .../components/manage_timeline/index.test.tsx |  39 +-
 .../components/manage_timeline/index.tsx      |  56 +-
 .../components/open_timeline/helpers.test.ts  |  26 +-
 .../components/open_timeline/helpers.ts       |  13 +-
 .../components/open_timeline/index.tsx        |   5 +-
 .../body/actions/action_icon_item.tsx         |  55 ++
 .../body/actions/add_note_icon_item.tsx       |  59 +++
 .../timeline/body/actions/index.test.tsx      | 228 ---------
 .../timeline/body/actions/index.tsx           | 227 +++-----
 .../body/actions/pin_event_action.tsx         |  58 +++
 .../timeline/body/column_headers/index.tsx    |   1 -
 .../body/events/event_column_view.test.tsx    | 117 +++++
 .../body/events/event_column_view.tsx         | 246 ++++-----
 .../components/timeline/body/events/index.tsx |   6 +-
 .../timeline/body/events/stateful_event.tsx   |  14 +-
 .../timeline/body/{helpers.ts => helpers.tsx} |  69 +--
 .../components/timeline/body/index.test.tsx   |   3 +-
 .../components/timeline/body/index.tsx        |  35 +-
 .../timeline/body/stateful_body.tsx           |  10 +-
 .../timeline/properties/helpers.tsx           |  35 +-
 .../properties/new_template_timeline.tsx      |   4 +-
 .../components/timeline/timeline.tsx          |  11 +-
 .../timelines/containers/index.gql_query.ts   |   1 +
 .../public/timelines/pages/timelines_page.tsx |   4 +-
 .../timeline/epic_local_storage.test.tsx      |   4 +-
 .../server/graphql/ecs/schema.gql.ts          |   1 +
 .../security_solution/server/graphql/types.ts |   9 +
 .../server/lib/ecs_fields/index.ts            |   1 +
 .../routes/__mocks__/import_timelines.ts      |  20 +-
 75 files changed, 1374 insertions(+), 1376 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
 create mode 100644 x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/add_note_icon_item.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
 create mode 100644 x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
 rename x-pack/plugins/security_solution/public/timelines/components/timeline/body/{helpers.ts => helpers.tsx} (67%)

diff --git a/x-pack/plugins/security_solution/public/app/app.tsx b/x-pack/plugins/security_solution/public/app/app.tsx
index b5e952b0ffa8ee..b4e9ba3dd7a716 100644
--- a/x-pack/plugins/security_solution/public/app/app.tsx
+++ b/x-pack/plugins/security_solution/public/app/app.tsx
@@ -15,6 +15,7 @@ import { EuiErrorBoundary } from '@elastic/eui';
 import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
 import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 
+import { ManageUserInfo } from '../detections/components/user_info';
 import { DEFAULT_DARK_MODE, APP_NAME } from '../../common/constants';
 import { ErrorToastDispatcher } from '../common/components/error_toast_dispatcher';
 import { MlCapabilitiesProvider } from '../common/components/ml/permissions/ml_capabilities_provider';
@@ -28,6 +29,7 @@ import { ManageGlobalTimeline } from '../timelines/components/manage_timeline';
 import { StartServices } from '../types';
 import { PageRouter } from './routes';
 import { ManageSource } from '../common/containers/sourcerer';
+
 interface StartAppComponent extends AppFrontendLibs {
   children: React.ReactNode;
   history: History;
@@ -57,7 +59,9 @@ const StartAppComponent: FC<StartAppComponent> = ({ children, apolloClient, hist
                   <ManageSource>
                     <ThemeProvider theme={theme}>
                       <MlCapabilitiesProvider>
-                        <PageRouter history={history}>{children}</PageRouter>
+                        <ManageUserInfo>
+                          <PageRouter history={history}>{children}</PageRouter>
+                        </ManageUserInfo>
                       </MlCapabilitiesProvider>
                     </ThemeProvider>
                   </ManageSource>
diff --git a/x-pack/plugins/security_solution/public/app/home/index.tsx b/x-pack/plugins/security_solution/public/app/home/index.tsx
index 7c287646ba7ac5..b48ae4e6e2d75c 100644
--- a/x-pack/plugins/security_solution/public/app/home/index.tsx
+++ b/x-pack/plugins/security_solution/public/app/home/index.tsx
@@ -7,6 +7,7 @@
 import React, { useMemo } from 'react';
 import styled from 'styled-components';
 
+import { TimelineId } from '../../../common/types/timeline';
 import { DragDropContextWrapper } from '../../common/components/drag_and_drop/drag_drop_context_wrapper';
 import { Flyout } from '../../timelines/components/flyout';
 import { HeaderGlobal } from '../../common/components/header_global';
@@ -17,6 +18,7 @@ import { useWithSource } from '../../common/containers/source';
 import { useShowTimeline } from '../../common/utils/timeline/use_show_timeline';
 import { navTabs } from './home_navigations';
 import { useSignalIndex } from '../../detections/containers/detection_engine/alerts/use_signal_index';
+import { useUserInfo } from '../../detections/components/user_info';
 
 const SecuritySolutionAppWrapper = styled.div`
   display: flex;
@@ -52,6 +54,9 @@ const HomePageComponent: React.FC<HomePageProps> = ({ children }) => {
   const [showTimeline] = useShowTimeline();
   const { browserFields, indexPattern, indicesExist } = useWithSource('default', indexToAdd);
 
+  // side effect: this will attempt to create the signals index if it doesn't exist
+  useUserInfo();
+
   return (
     <SecuritySolutionAppWrapper>
       <HeaderGlobal />
@@ -62,7 +67,7 @@ const HomePageComponent: React.FC<HomePageProps> = ({ children }) => {
           {indicesExist && showTimeline && (
             <>
               <AutoSaveWarningMsg />
-              <Flyout timelineId="timeline-1" usersViewing={usersViewing} />
+              <Flyout timelineId={TimelineId.active} usersViewing={usersViewing} />
             </>
           )}
 
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
index 841a1ef09ede6c..00879ace040b91 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/alerts_table.tsx
@@ -5,14 +5,12 @@
  */
 
 import React, { useEffect, useMemo } from 'react';
-import { useDispatch } from 'react-redux';
 
 import { Filter } from '../../../../../../../src/plugins/data/public';
 import { TimelineIdLiteral } from '../../../../common/types/timeline';
 import { StatefulEventsViewer } from '../events_viewer';
 import { alertsDefaultModel } from './default_headers';
 import { useManageTimeline } from '../../../timelines/components/manage_timeline';
-import { getInvestigateInResolverAction } from '../../../timelines/components/timeline/body/helpers';
 import * as i18n from './translations';
 import { useKibana } from '../../lib/kibana';
 
@@ -68,7 +66,6 @@ const AlertsTableComponent: React.FC<Props> = ({
   startDate,
   pageFilters = [],
 }) => {
-  const dispatch = useDispatch();
   const alertsFilter = useMemo(() => [...defaultAlertsFilters, ...pageFilters], [pageFilters]);
   const { filterManager } = useKibana().services.data.query;
   const { initializeTimeline } = useManageTimeline();
@@ -80,12 +77,12 @@ const AlertsTableComponent: React.FC<Props> = ({
       filterManager,
       defaultModel: alertsDefaultModel,
       footerText: i18n.TOTAL_COUNT_OF_ALERTS,
-      timelineRowActions: () => [getInvestigateInResolverAction({ dispatch, timelineId })],
       title: i18n.ALERTS_TABLE_TITLE,
       unit: i18n.UNIT,
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
   return (
     <StatefulEventsViewer
       pageFilters={alertsFilter}
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/histogram_configs.ts b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/histogram_configs.ts
index 363c7ee7e058be..c7376b67c51885 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/histogram_configs.ts
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/histogram_configs.ts
@@ -5,7 +5,7 @@
  */
 
 import * as i18n from './translations';
-import { MatrixHistogramOption, MatrixHisrogramConfigs } from '../matrix_histogram/types';
+import { MatrixHistogramOption, MatrixHistogramConfigs } from '../matrix_histogram/types';
 import { HistogramType } from '../../../graphql/types';
 
 export const alertsStackByOptions: MatrixHistogramOption[] = [
@@ -21,7 +21,7 @@ export const alertsStackByOptions: MatrixHistogramOption[] = [
 
 const DEFAULT_STACK_BY = 'event.module';
 
-export const histogramConfigs: MatrixHisrogramConfigs = {
+export const histogramConfigs: MatrixHistogramConfigs = {
   defaultStackByOption:
     alertsStackByOptions.find((o) => o.text === DEFAULT_STACK_BY) ?? alertsStackByOptions[1],
   errorMessage: i18n.ERROR_FETCHING_ALERTS_DATA,
diff --git a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/index.tsx
index 633135d63ac33a..de9a8b32f1f90b 100644
--- a/x-pack/plugins/security_solution/public/common/components/alerts_viewer/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/alerts_viewer/index.tsx
@@ -15,7 +15,7 @@ import * as i18n from './translations';
 import { useUiSetting$ } from '../../lib/kibana';
 import { MatrixHistogramContainer } from '../matrix_histogram';
 import { histogramConfigs } from './histogram_configs';
-import { MatrixHisrogramConfigs } from '../matrix_histogram/types';
+import { MatrixHistogramConfigs } from '../matrix_histogram/types';
 const ID = 'alertsOverTimeQuery';
 
 export const AlertsView = ({
@@ -38,7 +38,7 @@ export const AlertsView = ({
     []
   );
   const { globalFullScreen } = useFullScreen();
-  const alertsHistogramConfigs: MatrixHisrogramConfigs = useMemo(
+  const alertsHistogramConfigs: MatrixHistogramConfigs = useMemo(
     () => ({
       ...histogramConfigs,
       subtitle: getSubtitle,
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 6f77d15913d073..833688ae579932 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,10 +50,6 @@ 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: [],
@@ -464,42 +460,4 @@ 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 ebda64efabf65b..3d193856a8ae43 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,7 +109,6 @@ 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> = ({
@@ -135,7 +134,6 @@ const EventsViewerComponent: React.FC<Props> = ({
   toggleColumn,
   utilityBar,
   graphEventId,
-  exceptionsModal,
 }) => {
   const { globalFullScreen } = useFullScreen();
   const columnsHeader = isEmpty(columns) ? defaultHeaders : columns;
@@ -261,7 +259,6 @@ const EventsViewerComponent: React.FC<Props> = ({
                       </HeaderFilterGroupWrapper>
                     )}
                   </HeaderSection>
-                  {exceptionsModal && exceptionsModal(refetch)}
                   {utilityBar && !resolverIsShowing(graphEventId) && (
                     <UtilityBar>{utilityBar?.(refetch, totalCountMinusDeleted)}</UtilityBar>
                   )}
@@ -280,6 +277,7 @@ const EventsViewerComponent: React.FC<Props> = ({
                       docValueFields={docValueFields}
                       id={id}
                       isEventViewer={true}
+                      refetch={refetch}
                       sort={sort}
                       toggleColumn={toggleColumn}
                     />
@@ -338,6 +336,5 @@ export const EventsViewer = React.memo(
     prevProps.start === nextProps.start &&
     prevProps.sort === nextProps.sort &&
     prevProps.utilityBar === nextProps.utilityBar &&
-    prevProps.graphEventId === nextProps.graphEventId &&
-    prevProps.exceptionsModal === nextProps.exceptionsModal
+    prevProps.graphEventId === nextProps.graphEventId
 );
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 ec56a3a1bd8d3f..e4520dab4626a8 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,7 +43,6 @@ 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;
@@ -75,7 +74,6 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
   utilityBar,
   // If truthy, the graph viewer (Resolver) is showing
   graphEventId,
-  exceptionsModal,
 }) => {
   const [
     { docValueFields, browserFields, indexPatterns, isLoading: isLoadingIndexPattern },
@@ -158,7 +156,6 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
           toggleColumn={toggleColumn}
           utilityBar={utilityBar}
           graphEventId={graphEventId}
-          exceptionsModal={exceptionsModal}
         />
       </InspectButtonContainer>
     </FullScreenContainer>
@@ -223,7 +220,6 @@ 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) &&
@@ -244,7 +240,6 @@ export const StatefulEventsViewer = connector(
       prevProps.showCheckboxes === nextProps.showCheckboxes &&
       prevProps.start === nextProps.start &&
       prevProps.utilityBar === nextProps.utilityBar &&
-      prevProps.graphEventId === nextProps.graphEventId &&
-      prevProps.exceptionsModal === nextProps.exceptionsModal
+      prevProps.graphEventId === nextProps.graphEventId
   )
 );
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 21f82c6ab4c986..c46eb1b6b59cc8 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
@@ -63,7 +63,7 @@ export interface AddExceptionModalBaseProps {
 
 export interface AddExceptionModalProps extends AddExceptionModalBaseProps {
   onCancel: () => void;
-  onConfirm: (didCloseAlert: boolean) => void;
+  onConfirm: (didCloseAlert: boolean, didBulkCloseAlert: boolean) => void;
   onRuleChange?: () => void;
   alertStatus?: Status;
 }
@@ -137,8 +137,8 @@ export const AddExceptionModal = memo(function AddExceptionModal({
   );
   const onSuccess = useCallback(() => {
     addSuccess(i18n.ADD_EXCEPTION_SUCCESS);
-    onConfirm(shouldCloseAlert);
-  }, [addSuccess, onConfirm, shouldCloseAlert]);
+    onConfirm(shouldCloseAlert, shouldBulkCloseAlert);
+  }, [addSuccess, onConfirm, shouldBulkCloseAlert, shouldCloseAlert]);
 
   const [{ isLoading: addExceptionIsLoading }, addOrUpdateExceptionItems] = useAddOrUpdateException(
     {
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts
index a859b0dd392310..d471b5ae9bed17 100644
--- a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts
+++ b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/types.ts
@@ -25,7 +25,7 @@ export interface MatrixHistogramOption {
 export type GetSubTitle = (count: number) => string;
 export type GetTitle = (matrixHistogramOption: MatrixHistogramOption) => string;
 
-export interface MatrixHisrogramConfigs {
+export interface MatrixHistogramConfigs {
   defaultStackByOption: MatrixHistogramOption;
   errorMessage: string;
   hideHistogramIfEmpty?: boolean;
diff --git a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
index 5e40cd00fa69ef..6052913b4183b1 100644
--- a/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
+++ b/x-pack/plugins/security_solution/public/common/components/url_state/helpers.ts
@@ -12,6 +12,7 @@ import * as H from 'history';
 import { Query, Filter } from '../../../../../../../src/plugins/data/public';
 import { url } from '../../../../../../../src/plugins/kibana_utils/public';
 
+import { TimelineId } from '../../../../common/types/timeline';
 import { SecurityPageName } from '../../../app/types';
 import { inputsSelectors, State } from '../../store';
 import { UrlInputsModel } from '../../store/inputs/model';
@@ -122,7 +123,7 @@ export const makeMapStateToProps = () => {
     const { linkTo: globalLinkTo, timerange: globalTimerange } = inputState.global;
     const { linkTo: timelineLinkTo, timerange: timelineTimerange } = inputState.timeline;
 
-    const flyoutTimeline = getTimeline(state, 'timeline-1');
+    const flyoutTimeline = getTimeline(state, TimelineId.active);
     const timeline =
       flyoutTimeline != null
         ? {
diff --git a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts
index b32919f4868dcc..6a05f97da2fefa 100644
--- a/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/anomalies/anomalies_query_tab_body/histogram_configs.ts
@@ -6,7 +6,7 @@
 import * as i18n from './translations';
 import {
   MatrixHistogramOption,
-  MatrixHisrogramConfigs,
+  MatrixHistogramConfigs,
 } from '../../../components/matrix_histogram/types';
 import { HistogramType } from '../../../../graphql/types';
 
@@ -19,7 +19,7 @@ export const anomaliesStackByOptions: MatrixHistogramOption[] = [
 
 const DEFAULT_STACK_BY = i18n.ANOMALIES_STACK_BY_JOB_ID;
 
-export const histogramConfigs: MatrixHisrogramConfigs = {
+export const histogramConfigs: MatrixHistogramConfigs = {
   defaultStackByOption:
     anomaliesStackByOptions.find((o) => o.text === DEFAULT_STACK_BY) ?? anomaliesStackByOptions[0],
   errorMessage: i18n.ERROR_FETCHING_ANOMALIES_DATA,
diff --git a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
index ab9f12a67fe897..26013915315afb 100644
--- a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
@@ -5,7 +5,7 @@
  */
 import { FilterStateStore } from '../../../../../../src/plugins/data/common/es_query/filters/meta_filter';
 
-import { TimelineType, TimelineStatus } from '../../../common/types/timeline';
+import { TimelineId, TimelineType, TimelineStatus } from '../../../common/types/timeline';
 
 import { OpenTimelineResult } from '../../timelines/components/open_timeline/types';
 import {
@@ -2227,7 +2227,7 @@ export const defaultTimelineProps: CreateTimelineProps = {
     filters: [],
     highlightedDropAndProviderId: '',
     historyIds: [],
-    id: 'timeline-1',
+    id: TimelineId.active,
     isFavorite: false,
     isLive: false,
     isLoading: false,
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index e8015f601cb184..3f95fd36b60106 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -18,7 +18,7 @@ import {
 } from '../../../common/mock/';
 import { CreateTimeline, UpdateTimelineLoading } from './types';
 import { Ecs } from '../../../graphql/types';
-import { TimelineType, TimelineStatus } from '../../../../common/types/timeline';
+import { TimelineId, TimelineType, TimelineStatus } from '../../../../common/types/timeline';
 
 jest.mock('apollo-client');
 
@@ -67,7 +67,10 @@ describe('alert actions', () => {
         });
 
         expect(updateTimelineIsLoading).toHaveBeenCalledTimes(1);
-        expect(updateTimelineIsLoading).toHaveBeenCalledWith({ id: 'timeline-1', isLoading: true });
+        expect(updateTimelineIsLoading).toHaveBeenCalledWith({
+          id: TimelineId.active,
+          isLoading: true,
+        });
       });
 
       test('it invokes createTimeline with designated timeline template if "timelineTemplate" exists', async () => {
@@ -313,9 +316,12 @@ describe('alert actions', () => {
           updateTimelineIsLoading,
         });
 
-        expect(updateTimelineIsLoading).toHaveBeenCalledWith({ id: 'timeline-1', isLoading: true });
         expect(updateTimelineIsLoading).toHaveBeenCalledWith({
-          id: 'timeline-1',
+          id: TimelineId.active,
+          isLoading: true,
+        });
+        expect(updateTimelineIsLoading).toHaveBeenCalledWith({
+          id: TimelineId.active,
           isLoading: false,
         });
         expect(createTimeline).toHaveBeenCalledTimes(1);
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
index 34c0537a6d7d24..3545bfd91e553d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.tsx
@@ -10,6 +10,7 @@ import dateMath from '@elastic/datemath';
 import { get, getOr, isEmpty, find } from 'lodash/fp';
 import moment from 'moment';
 
+import { TimelineId } from '../../../../common/types/timeline';
 import { updateAlertStatus } from '../../containers/detection_engine/alerts/api';
 import { SendAlertToTimelineActionProps, UpdateAlertStatusActionProps } from './types';
 import {
@@ -67,7 +68,6 @@ export const getFilterAndRuleBounds = (
 export const updateAlertStatusAction = async ({
   query,
   alertIds,
-  status,
   selectedStatus,
   setEventsLoading,
   setEventsDeleted,
@@ -126,7 +126,7 @@ export const getThresholdAggregationDataProvider = (
   return [
     {
       and: [],
-      id: `send-alert-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-${aggregationFieldId}-${dataProviderValue}`,
+      id: `send-alert-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-${aggregationFieldId}-${dataProviderValue}`,
       name: ecsData.signal?.rule?.threshold.field,
       enabled: true,
       excluded: false,
@@ -155,7 +155,7 @@ export const sendAlertToTimelineAction = async ({
 
   if (timelineId !== '' && apolloClient != null) {
     try {
-      updateTimelineIsLoading({ id: 'timeline-1', isLoading: true });
+      updateTimelineIsLoading({ id: TimelineId.active, isLoading: true });
       const [responseTimeline, eventDataResp] = await Promise.all([
         apolloClient.query<GetOneTimeline.Query, GetOneTimeline.Variables>({
           query: oneTimelineQuery,
@@ -236,7 +236,7 @@ export const sendAlertToTimelineAction = async ({
       }
     } catch {
       openAlertInBasicTimeline = true;
-      updateTimelineIsLoading({ id: 'timeline-1', isLoading: false });
+      updateTimelineIsLoading({ id: TimelineId.active, isLoading: false });
     }
   }
 
@@ -253,7 +253,7 @@ export const sendAlertToTimelineAction = async ({
         dataProviders: [
           {
             and: [],
-            id: `send-alert-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-alert-id-${ecsData._id}`,
+            id: `send-alert-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-alert-id-${ecsData._id}`,
             name: ecsData._id,
             enabled: true,
             excluded: false,
@@ -266,7 +266,7 @@ export const sendAlertToTimelineAction = async ({
           },
           ...getThresholdAggregationDataProvider(ecsData, nonEcsData),
         ],
-        id: 'timeline-1',
+        id: TimelineId.active,
         dateRange: {
           start: from,
           end: to,
@@ -304,7 +304,7 @@ export const sendAlertToTimelineAction = async ({
         dataProviders: [
           {
             and: [],
-            id: `send-alert-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-alert-id-${ecsData._id}`,
+            id: `send-alert-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-alert-id-${ecsData._id}`,
             name: ecsData._id,
             enabled: true,
             excluded: false,
@@ -316,7 +316,7 @@ export const sendAlertToTimelineAction = async ({
             },
           },
         ],
-        id: 'timeline-1',
+        id: TimelineId.active,
         dateRange: {
           start: from,
           end: to,
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 ca17d331c67e58..eebabc59d93244 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
@@ -4,44 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React from 'react';
-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';
 import { Filter } from '../../../../../../../src/plugins/data/common/es_query';
-import {
-  TimelineRowAction,
-  TimelineRowActionOnClick,
-} from '../../../timelines/components/timeline/body/actions';
+
 import { defaultColumnHeaderType } from '../../../timelines/components/timeline/body/column_headers/default_headers';
-import { getInvestigateInResolverAction } from '../../../timelines/components/timeline/body/helpers';
 import {
   DEFAULT_COLUMN_MIN_WIDTH,
   DEFAULT_DATE_COLUMN_MIN_WIDTH,
 } from '../../../timelines/components/timeline/body/constants';
-import { DEFAULT_ICON_BUTTON_WIDTH } from '../../../timelines/components/timeline/helpers';
 import { ColumnHeaderOptions, SubsetTimelineModel } from '../../../timelines/store/timeline/model';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
 
-import { FILTER_OPEN, FILTER_CLOSED, FILTER_IN_PROGRESS } from './alerts_filter_group';
-import { sendAlertToTimelineAction, updateAlertStatusAction } from './actions';
 import * as i18n from './translations';
-import {
-  CreateTimeline,
-  SetEventsDeletedProps,
-  SetEventsLoadingProps,
-  UpdateTimelineLoading,
-} from './types';
-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[] => [
   {
@@ -189,13 +164,16 @@ export const alertsDefaultModel: SubsetTimelineModel = {
 
 export const requiredFieldsForActions = [
   '@timestamp',
+  'signal.status',
   'signal.original_time',
   'signal.rule.filters',
   'signal.rule.from',
   'signal.rule.language',
   'signal.rule.query',
+  'signal.rule.name',
   'signal.rule.to',
   'signal.rule.id',
+  'signal.rule.index',
   'signal.rule.type',
   'signal.original_event.kind',
   'signal.original_event.module',
@@ -208,202 +186,3 @@ export const requiredFieldsForActions = [
   'host.os.family',
   'event.code',
 ];
-
-interface AlertActionArgs {
-  apolloClient?: ApolloClient<{}>;
-  canUserCRUD: boolean;
-  createTimeline: CreateTimeline;
-  dispatch: Dispatch;
-  ecsRowData: Ecs;
-  nonEcsRowData: TimelineNonEcsData[];
-  hasIndexWrite: boolean;
-  onAlertStatusUpdateFailure: (status: Status, error: Error) => void;
-  onAlertStatusUpdateSuccess: (count: number, status: Status) => void;
-  setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
-  setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
-  status: Status;
-  timelineId: string;
-  updateTimelineIsLoading: UpdateTimelineLoading;
-  openAddExceptionModal: ({
-    exceptionListType,
-    alertData,
-    ruleName,
-    ruleId,
-  }: AddExceptionModalBaseProps) => void;
-}
-
-export const getAlertActions = ({
-  apolloClient,
-  canUserCRUD,
-  createTimeline,
-  dispatch,
-  ecsRowData,
-  nonEcsRowData,
-  hasIndexWrite,
-  onAlertStatusUpdateFailure,
-  onAlertStatusUpdateSuccess,
-  setEventsDeleted,
-  setEventsLoading,
-  status,
-  timelineId,
-  updateTimelineIsLoading,
-  openAddExceptionModal,
-}: AlertActionArgs): TimelineRowAction[] => {
-  const openAlertActionComponent: TimelineRowAction = {
-    ariaLabel: 'Open alert',
-    content: <EuiText size="m">{i18n.ACTION_OPEN_ALERT}</EuiText>,
-    dataTestSubj: 'open-alert-status',
-    displayType: 'contextMenu',
-    id: FILTER_OPEN,
-    isActionDisabled: () => !canUserCRUD || !hasIndexWrite,
-    onClick: ({ eventId }: TimelineRowActionOnClick) =>
-      updateAlertStatusAction({
-        alertIds: [eventId],
-        onAlertStatusUpdateFailure,
-        onAlertStatusUpdateSuccess,
-        setEventsDeleted,
-        setEventsLoading,
-        status,
-        selectedStatus: FILTER_OPEN,
-      }),
-    width: DEFAULT_ICON_BUTTON_WIDTH,
-  };
-
-  const closeAlertActionComponent: TimelineRowAction = {
-    ariaLabel: 'Close alert',
-    content: <EuiText size="m">{i18n.ACTION_CLOSE_ALERT}</EuiText>,
-    dataTestSubj: 'close-alert-status',
-    displayType: 'contextMenu',
-    id: FILTER_CLOSED,
-    isActionDisabled: () => !canUserCRUD || !hasIndexWrite,
-    onClick: ({ eventId }: TimelineRowActionOnClick) =>
-      updateAlertStatusAction({
-        alertIds: [eventId],
-        onAlertStatusUpdateFailure,
-        onAlertStatusUpdateSuccess,
-        setEventsDeleted,
-        setEventsLoading,
-        status,
-        selectedStatus: FILTER_CLOSED,
-      }),
-    width: DEFAULT_ICON_BUTTON_WIDTH,
-  };
-
-  const inProgressAlertActionComponent: TimelineRowAction = {
-    ariaLabel: 'Mark alert in progress',
-    content: <EuiText size="m">{i18n.ACTION_IN_PROGRESS_ALERT}</EuiText>,
-    dataTestSubj: 'in-progress-alert-status',
-    displayType: 'contextMenu',
-    id: FILTER_IN_PROGRESS,
-    isActionDisabled: () => !canUserCRUD || !hasIndexWrite,
-    onClick: ({ eventId }: TimelineRowActionOnClick) =>
-      updateAlertStatusAction({
-        alertIds: [eventId],
-        onAlertStatusUpdateFailure,
-        onAlertStatusUpdateSuccess,
-        setEventsDeleted,
-        setEventsLoading,
-        status,
-        selectedStatus: FILTER_IN_PROGRESS,
-      }),
-    width: DEFAULT_ICON_BUTTON_WIDTH,
-  };
-
-  const isEndpointAlert = () => {
-    const [module] = getMappedNonEcsValue({
-      data: nonEcsRowData,
-      fieldName: 'signal.original_event.module',
-    });
-    const [kind] = getMappedNonEcsValue({
-      data: nonEcsRowData,
-      fieldName: 'signal.original_event.kind',
-    });
-    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 }),
-    },
-    {
-      ariaLabel: 'Send alert to timeline',
-      content: i18n.ACTION_INVESTIGATE_IN_TIMELINE,
-      dataTestSubj: 'send-alert-to-timeline',
-      displayType: 'icon',
-      iconType: 'timeline',
-      id: 'sendAlertToTimeline',
-      onClick: ({ ecsData, data }: TimelineRowActionOnClick) =>
-        sendAlertToTimelineAction({
-          apolloClient,
-          createTimeline,
-          ecsData,
-          nonEcsData: data,
-          updateTimelineIsLoading,
-        }),
-      width: DEFAULT_ICON_BUTTON_WIDTH,
-    },
-    // Context menu items
-    ...(FILTER_OPEN !== status ? [openAlertActionComponent] : []),
-    ...(FILTER_CLOSED !== status ? [closeAlertActionComponent] : []),
-    ...(FILTER_IN_PROGRESS !== status ? [inProgressAlertActionComponent] : []),
-    {
-      onClick: ({ ecsData, data }: TimelineRowActionOnClick) => {
-        const [ruleName] = getMappedNonEcsValue({ data, fieldName: 'signal.rule.name' });
-        const [ruleId] = getMappedNonEcsValue({ data, fieldName: 'signal.rule.id' });
-        const ruleIndices = getMappedNonEcsValue({ data, fieldName: 'signal.rule.index' });
-        if (ruleId !== undefined) {
-          openAddExceptionModal({
-            ruleName: ruleName ?? '',
-            ruleId,
-            ruleIndices: ruleIndices.length > 0 ? ruleIndices : DEFAULT_INDEX_PATTERN,
-            exceptionListType: 'endpoint',
-            alertData: {
-              ecsData,
-              nonEcsData: data,
-            },
-          });
-        }
-      },
-      id: 'addEndpointException',
-      isActionDisabled: () => !canUserCRUD || !hasIndexWrite || !isEndpointAlert(),
-      dataTestSubj: 'add-endpoint-exception-menu-item',
-      ariaLabel: 'Add Endpoint Exception',
-      content: <EuiText size="m">{i18n.ACTION_ADD_ENDPOINT_EXCEPTION}</EuiText>,
-      displayType: 'contextMenu',
-    },
-    {
-      onClick: ({ ecsData, data }: TimelineRowActionOnClick) => {
-        const [ruleName] = getMappedNonEcsValue({ data, fieldName: 'signal.rule.name' });
-        const [ruleId] = getMappedNonEcsValue({ data, fieldName: 'signal.rule.id' });
-        const ruleIndices = getMappedNonEcsValue({ data, fieldName: 'signal.rule.index' });
-        if (ruleId !== undefined) {
-          openAddExceptionModal({
-            ruleName: ruleName ?? '',
-            ruleId,
-            ruleIndices: ruleIndices.length > 0 ? ruleIndices : DEFAULT_INDEX_PATTERN,
-            exceptionListType: 'detection',
-            alertData: {
-              ecsData,
-              nonEcsData: data,
-            },
-          });
-        }
-      },
-      id: 'addException',
-      isActionDisabled: () => !canUserCRUD || !hasIndexWrite || !exceptionsAreAllowed(),
-      dataTestSubj: 'add-exception-menu-item',
-      ariaLabel: 'Add Exception',
-      content: <EuiText size="m">{i18n.ACTION_ADD_EXCEPTION}</EuiText>,
-      displayType: 'contextMenu',
-    },
-  ];
-};
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
index d5688d84e97597..be249576020370 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.test.tsx
@@ -40,8 +40,6 @@ describe('AlertsTableComponent', () => {
           clearEventsDeleted={jest.fn()}
           showBuildingBlockAlerts={false}
           onShowBuildingBlockAlertsChanged={jest.fn()}
-          updateTimelineIsLoading={jest.fn()}
-          updateTimeline={jest.fn()}
         />
       </TestProviders>
     );
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 854565ace9b4bd..63e1c8aca9082b 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
@@ -7,7 +7,7 @@
 import { EuiPanel, EuiLoadingContent } from '@elastic/eui';
 import { isEmpty } from 'lodash/fp';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { connect, ConnectedProps, useDispatch } from 'react-redux';
+import { connect, ConnectedProps } from 'react-redux';
 import { Dispatch } from 'redux';
 
 import { Status } from '../../../../common/detection_engine/schemas/common/schemas';
@@ -22,15 +22,10 @@ import { inputsSelectors, State, inputsModel } from '../../../common/store';
 import { timelineActions, timelineSelectors } from '../../../timelines/store/timeline';
 import { TimelineModel } from '../../../timelines/store/timeline/model';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
-import {
-  useManageTimeline,
-  TimelineRowActionArgs,
-} from '../../../timelines/components/manage_timeline';
-import { useApolloClient } from '../../../common/utils/apollo_context';
+import { useManageTimeline } from '../../../timelines/components/manage_timeline';
 
 import { updateAlertStatusAction } from './actions';
 import {
-  getAlertActions,
   requiredFieldsForActions,
   alertsDefaultModel,
   buildAlertStatusFilter,
@@ -39,23 +34,16 @@ import { FILTER_OPEN, AlertsTableFilterGroup } from './alerts_filter_group';
 import { AlertsUtilityBar } from './alerts_utility_bar';
 import * as i18n from './translations';
 import {
-  CreateTimelineProps,
   SetEventsDeletedProps,
   SetEventsLoadingProps,
   UpdateAlertsStatusCallback,
   UpdateAlertsStatusProps,
 } from './types';
-import { dispatchUpdateTimeline } from '../../../timelines/components/open_timeline/helpers';
 import {
   useStateToaster,
   displaySuccessToast,
   displayErrorToast,
 } from '../../../common/components/toasters';
-import { getInvestigateInResolverAction } from '../../../timelines/components/timeline/body/helpers';
-import {
-  AddExceptionModal,
-  AddExceptionModalBaseProps,
-} from '../../../common/components/exceptions/add_exception_modal';
 
 interface OwnProps {
   timelineId: TimelineIdLiteral;
@@ -72,14 +60,6 @@ interface OwnProps {
 
 type AlertsTableComponentProps = OwnProps & PropsFromRedux;
 
-const addExceptionModalInitialState: AddExceptionModalBaseProps = {
-  ruleName: '',
-  ruleId: '',
-  ruleIndices: [],
-  exceptionListType: 'detection',
-  alertData: undefined,
-};
-
 export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   timelineId,
   canUserCRUD,
@@ -101,30 +81,16 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   onShowBuildingBlockAlertsChanged,
   signalsIndex,
   to,
-  updateTimeline,
-  updateTimelineIsLoading,
 }) => {
-  const dispatch = useDispatch();
-  const apolloClient = useApolloClient();
-
   const [showClearSelectionAction, setShowClearSelectionAction] = useState(false);
   const [filterGroup, setFilterGroup] = useState<Status>(FILTER_OPEN);
-  const [shouldShowAddExceptionModal, setShouldShowAddExceptionModal] = useState(false);
-  const [addExceptionModalState, setAddExceptionModalState] = useState<AddExceptionModalBaseProps>(
-    addExceptionModalInitialState
-  );
   const [{ browserFields, indexPatterns, isLoading: indexPatternsLoading }] = useFetchIndexPatterns(
     signalsIndex !== '' ? [signalsIndex] : [],
     'alerts_table'
   );
   const kibana = useKibana();
   const [, dispatchToaster] = useStateToaster();
-  const {
-    initializeTimeline,
-    setSelectAll,
-    setTimelineRowActions,
-    setIndexToAdd,
-  } = useManageTimeline();
+  const { initializeTimeline, setSelectAll, setIndexToAdd } = useManageTimeline();
 
   const getGlobalQuery = useCallback(
     (customFilters: Filter[]) => {
@@ -149,27 +115,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     [browserFields, defaultFilters, globalFilters, globalQuery, indexPatterns, kibana, to, from]
   );
 
-  // Callback for creating a new timeline -- utilized by row/batch actions
-  const createTimelineCallback = useCallback(
-    ({ from: fromTimeline, timeline, to: toTimeline, ruleNote, notes }: CreateTimelineProps) => {
-      updateTimelineIsLoading({ id: 'timeline-1', isLoading: false });
-      updateTimeline({
-        duplicate: true,
-        forceNotes: true,
-        from: fromTimeline,
-        id: 'timeline-1',
-        notes,
-        timeline: {
-          ...timeline,
-          show: true,
-        },
-        to: toTimeline,
-        ruleNote,
-      })();
-    },
-    [updateTimeline, updateTimelineIsLoading]
-  );
-
   const setEventsLoadingCallback = useCallback(
     ({ eventIds, isLoading }: SetEventsLoadingProps) => {
       setEventsLoading!({ id: timelineId, eventIds, isLoading });
@@ -220,28 +165,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     [dispatchToaster]
   );
 
-  const openAddExceptionModalCallback = useCallback(
-    ({
-      ruleName,
-      ruleIndices,
-      ruleId,
-      exceptionListType,
-      alertData,
-    }: AddExceptionModalBaseProps) => {
-      if (alertData != null) {
-        setShouldShowAddExceptionModal(true);
-        setAddExceptionModalState({
-          ruleName,
-          ruleId,
-          ruleIndices,
-          exceptionListType,
-          alertData,
-        });
-      }
-    },
-    [setShouldShowAddExceptionModal, setAddExceptionModalState]
-  );
-
   // Catches state change isSelectAllChecked->false upon user selection change to reset utility bar
   useEffect(() => {
     if (isSelectAllChecked) {
@@ -297,7 +220,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
           ? getGlobalQuery(currentStatusFilter)?.filterQuery
           : undefined,
         alertIds: Object.keys(selectedEventIds),
-        status,
         selectedStatus,
         setEventsDeleted: setEventsDeletedCallback,
         setEventsLoading: setEventsLoadingCallback,
@@ -352,42 +274,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     ]
   );
 
-  // Send to Timeline / Update Alert Status Actions for each table row
-  const additionalActions = useMemo(
-    () => ({ ecsData, nonEcsData }: TimelineRowActionArgs) =>
-      getAlertActions({
-        apolloClient,
-        canUserCRUD,
-        createTimeline: createTimelineCallback,
-        ecsRowData: ecsData,
-        nonEcsRowData: nonEcsData,
-        dispatch,
-        hasIndexWrite,
-        onAlertStatusUpdateFailure,
-        onAlertStatusUpdateSuccess,
-        setEventsDeleted: setEventsDeletedCallback,
-        setEventsLoading: setEventsLoadingCallback,
-        status: filterGroup,
-        timelineId,
-        updateTimelineIsLoading,
-        openAddExceptionModal: openAddExceptionModalCallback,
-      }),
-    [
-      apolloClient,
-      canUserCRUD,
-      createTimelineCallback,
-      dispatch,
-      hasIndexWrite,
-      filterGroup,
-      setEventsLoadingCallback,
-      setEventsDeletedCallback,
-      timelineId,
-      updateTimelineIsLoading,
-      onAlertStatusUpdateSuccess,
-      onAlertStatusUpdateFailure,
-      openAddExceptionModalCallback,
-    ]
-  );
   const defaultIndices = useMemo(() => [signalsIndex], [signalsIndex]);
   const defaultFiltersMemo = useMemo(() => {
     if (isEmpty(defaultFilters)) {
@@ -408,21 +294,12 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
       indexToAdd: defaultIndices,
       loadingText: i18n.LOADING_ALERTS,
       selectAll: false,
-      timelineRowActions: () => [getInvestigateInResolverAction({ dispatch, timelineId })],
+      queryFields: requiredFieldsForActions,
       title: '',
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  useEffect(() => {
-    setTimelineRowActions({
-      id: timelineId,
-      queryFields: requiredFieldsForActions,
-      timelineRowActions: additionalActions,
-    });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [additionalActions]);
-
   useEffect(() => {
     setIndexToAdd({ id: timelineId, indexToAdd: defaultIndices });
   }, [timelineId, defaultIndices, setIndexToAdd]);
@@ -432,53 +309,6 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     [onFilterGroupChangedCallback]
   );
 
-  const closeAddExceptionModal = useCallback(() => {
-    setShouldShowAddExceptionModal(false);
-    setAddExceptionModalState(addExceptionModalInitialState);
-  }, [setShouldShowAddExceptionModal, setAddExceptionModalState]);
-
-  const onAddExceptionCancel = 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 (
       <EuiPanel>
@@ -489,19 +319,16 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
   }
 
   return (
-    <>
-      <StatefulEventsViewer
-        defaultIndices={defaultIndices}
-        pageFilters={defaultFiltersMemo}
-        defaultModel={alertsDefaultModel}
-        end={to}
-        headerFilterGroup={headerFilterGroup}
-        id={timelineId}
-        start={from}
-        utilityBar={utilityBarCallback}
-        exceptionsModal={exceptionModalCallback}
-      />
-    </>
+    <StatefulEventsViewer
+      defaultIndices={defaultIndices}
+      pageFilters={defaultFiltersMemo}
+      defaultModel={alertsDefaultModel}
+      end={to}
+      headerFilterGroup={headerFilterGroup}
+      id={timelineId}
+      start={from}
+      utilityBar={utilityBarCallback}
+    />
   );
 };
 
@@ -551,9 +378,6 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({
   }) => dispatch(timelineActions.setEventsDeleted({ id, eventIds, isDeleted })),
   clearEventsDeleted: ({ id }: { id: string }) =>
     dispatch(timelineActions.clearEventsDeleted({ id })),
-  updateTimelineIsLoading: ({ id, isLoading }: { id: string; isLoading: boolean }) =>
-    dispatch(timelineActions.updateIsLoading({ id, isLoading })),
-  updateTimeline: dispatchUpdateTimeline(dispatch),
 });
 
 const connector = connect(makeMapStateToProps, mapDispatchToProps);
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
new file mode 100644
index 00000000000000..589116c901c303
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
@@ -0,0 +1,484 @@
+/*
+ * 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, { useCallback, useMemo, useState } from 'react';
+import { useDispatch } from 'react-redux';
+import {
+  EuiText,
+  EuiButtonIcon,
+  EuiContextMenuPanel,
+  EuiPopover,
+  EuiContextMenuItem,
+} from '@elastic/eui';
+import styled from 'styled-components';
+
+import { TimelineId } from '../../../../../common/types/timeline';
+import { DEFAULT_INDEX_PATTERN } from '../../../../../common/constants';
+import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
+import { isThresholdRule } from '../../../../../common/detection_engine/utils';
+import { RuleType } from '../../../../../common/detection_engine/types';
+import { isMlRule } from '../../../../../common/machine_learning/helpers';
+import { timelineActions } from '../../../../timelines/store/timeline';
+import { EventsTd, EventsTdContent } from '../../../../timelines/components/timeline/styles';
+import { DEFAULT_ICON_BUTTON_WIDTH } from '../../../../timelines/components/timeline/helpers';
+import { FILTER_OPEN, FILTER_CLOSED, FILTER_IN_PROGRESS } from '../alerts_filter_group';
+import { updateAlertStatusAction } from '../actions';
+import { SetEventsDeletedProps, SetEventsLoadingProps } from '../types';
+import { Ecs, TimelineNonEcsData } from '../../../../graphql/types';
+import {
+  AddExceptionModal as AddExceptionModalComponent,
+  AddExceptionModalBaseProps,
+} from '../../../../common/components/exceptions/add_exception_modal';
+import { getMappedNonEcsValue } from '../../../../common/components/exceptions/helpers';
+import * as i18n from '../translations';
+import {
+  useStateToaster,
+  displaySuccessToast,
+  displayErrorToast,
+} from '../../../../common/components/toasters';
+import { inputsModel } from '../../../../common/store';
+import { useUserData } from '../../user_info';
+
+interface AlertContextMenuProps {
+  disabled: boolean;
+  ecsRowData: Ecs;
+  nonEcsRowData: TimelineNonEcsData[];
+  refetch: inputsModel.Refetch;
+  timelineId: string;
+}
+
+const addExceptionModalInitialState: AddExceptionModalBaseProps = {
+  ruleName: '',
+  ruleId: '',
+  ruleIndices: [],
+  exceptionListType: 'detection',
+  alertData: undefined,
+};
+
+const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
+  disabled,
+  ecsRowData,
+  nonEcsRowData,
+  refetch,
+  timelineId,
+}) => {
+  const dispatch = useDispatch();
+  const [, dispatchToaster] = useStateToaster();
+  const [isPopoverOpen, setPopover] = useState(false);
+  const [alertStatus, setAlertStatus] = useState<Status | undefined>(
+    (ecsRowData.signal?.status && (ecsRowData.signal.status[0] as Status)) ?? undefined
+  );
+  const eventId = ecsRowData._id;
+
+  const onButtonClick = useCallback(() => {
+    setPopover(!isPopoverOpen);
+  }, [isPopoverOpen]);
+
+  const closePopover = useCallback(() => {
+    setPopover(false);
+  }, []);
+  const [shouldShowAddExceptionModal, setShouldShowAddExceptionModal] = useState(false);
+  const [addExceptionModalState, setAddExceptionModalState] = useState<AddExceptionModalBaseProps>(
+    addExceptionModalInitialState
+  );
+  const [{ canUserCRUD, hasIndexWrite }] = useUserData();
+
+  const isEndpointAlert = useMemo(() => {
+    if (!nonEcsRowData) {
+      return false;
+    }
+
+    const [module] = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.original_event.module',
+    });
+    const [kind] = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.original_event.kind',
+    });
+    return module === 'endpoint' && kind === 'alert';
+  }, [nonEcsRowData]);
+
+  const closeAddExceptionModal = useCallback(() => {
+    setShouldShowAddExceptionModal(false);
+    setAddExceptionModalState(addExceptionModalInitialState);
+  }, [setShouldShowAddExceptionModal, setAddExceptionModalState]);
+
+  const onAddExceptionCancel = useCallback(() => {
+    closeAddExceptionModal();
+  }, [closeAddExceptionModal]);
+
+  const onAddExceptionConfirm = useCallback(
+    (didCloseAlert: boolean, didBulkCloseAlert) => {
+      closeAddExceptionModal();
+      if (didCloseAlert) {
+        setAlertStatus('closed');
+      }
+      if (timelineId !== TimelineId.active || didBulkCloseAlert) {
+        refetch();
+      }
+    },
+    [closeAddExceptionModal, timelineId, refetch]
+  );
+
+  const onAlertStatusUpdateSuccess = useCallback(
+    (count: number, newStatus: Status) => {
+      let title: string;
+      switch (newStatus) {
+        case 'closed':
+          title = i18n.CLOSED_ALERT_SUCCESS_TOAST(count);
+          break;
+        case 'open':
+          title = i18n.OPENED_ALERT_SUCCESS_TOAST(count);
+          break;
+        case 'in-progress':
+          title = i18n.IN_PROGRESS_ALERT_SUCCESS_TOAST(count);
+      }
+      displaySuccessToast(title, dispatchToaster);
+      setAlertStatus(newStatus);
+    },
+    [dispatchToaster]
+  );
+
+  const onAlertStatusUpdateFailure = useCallback(
+    (newStatus: Status, error: Error) => {
+      let title: string;
+      switch (newStatus) {
+        case 'closed':
+          title = i18n.CLOSED_ALERT_FAILED_TOAST;
+          break;
+        case 'open':
+          title = i18n.OPENED_ALERT_FAILED_TOAST;
+          break;
+        case 'in-progress':
+          title = i18n.IN_PROGRESS_ALERT_FAILED_TOAST;
+      }
+      displayErrorToast(title, [error.message], dispatchToaster);
+    },
+    [dispatchToaster]
+  );
+
+  const setEventsLoading = useCallback(
+    ({ eventIds, isLoading }: SetEventsLoadingProps) => {
+      dispatch(timelineActions.setEventsLoading({ id: timelineId, eventIds, isLoading }));
+    },
+    [dispatch, timelineId]
+  );
+
+  const setEventsDeleted = useCallback(
+    ({ eventIds, isDeleted }: SetEventsDeletedProps) => {
+      dispatch(timelineActions.setEventsDeleted({ id: timelineId, eventIds, isDeleted }));
+    },
+    [dispatch, timelineId]
+  );
+
+  const openAlertActionOnClick = useCallback(() => {
+    updateAlertStatusAction({
+      alertIds: [eventId],
+      onAlertStatusUpdateFailure,
+      onAlertStatusUpdateSuccess,
+      setEventsDeleted,
+      setEventsLoading,
+      selectedStatus: FILTER_OPEN,
+    });
+    closePopover();
+  }, [
+    closePopover,
+    eventId,
+    onAlertStatusUpdateFailure,
+    onAlertStatusUpdateSuccess,
+    setEventsDeleted,
+    setEventsLoading,
+  ]);
+
+  const openAlertActionComponent = (
+    <EuiContextMenuItem
+      key="open-alert"
+      aria-label="Open alert"
+      data-test-subj="open-alert-status"
+      id={FILTER_OPEN}
+      onClick={openAlertActionOnClick}
+      disabled={!canUserCRUD || !hasIndexWrite}
+    >
+      <EuiText size="m">{i18n.ACTION_OPEN_ALERT}</EuiText>
+    </EuiContextMenuItem>
+  );
+
+  const closeAlertActionClick = useCallback(() => {
+    updateAlertStatusAction({
+      alertIds: [eventId],
+      onAlertStatusUpdateFailure,
+      onAlertStatusUpdateSuccess,
+      setEventsDeleted,
+      setEventsLoading,
+      selectedStatus: FILTER_CLOSED,
+    });
+    closePopover();
+  }, [
+    closePopover,
+    eventId,
+    onAlertStatusUpdateFailure,
+    onAlertStatusUpdateSuccess,
+    setEventsDeleted,
+    setEventsLoading,
+  ]);
+
+  const closeAlertActionComponent = (
+    <EuiContextMenuItem
+      key="close-alert"
+      aria-label="Close alert"
+      data-test-subj="close-alert-status"
+      id={FILTER_CLOSED}
+      onClick={closeAlertActionClick}
+      disabled={!canUserCRUD || !hasIndexWrite}
+    >
+      <EuiText size="m">{i18n.ACTION_CLOSE_ALERT}</EuiText>
+    </EuiContextMenuItem>
+  );
+
+  const inProgressAlertActionClick = useCallback(() => {
+    updateAlertStatusAction({
+      alertIds: [eventId],
+      onAlertStatusUpdateFailure,
+      onAlertStatusUpdateSuccess,
+      setEventsDeleted,
+      setEventsLoading,
+      selectedStatus: FILTER_IN_PROGRESS,
+    });
+    closePopover();
+  }, [
+    closePopover,
+    eventId,
+    onAlertStatusUpdateFailure,
+    onAlertStatusUpdateSuccess,
+    setEventsDeleted,
+    setEventsLoading,
+  ]);
+
+  const inProgressAlertActionComponent = (
+    <EuiContextMenuItem
+      key="in-progress-alert"
+      aria-label="Mark alert in progress"
+      data-test-subj="in-progress-alert-status"
+      id={FILTER_IN_PROGRESS}
+      onClick={inProgressAlertActionClick}
+      disabled={!canUserCRUD || !hasIndexWrite}
+    >
+      <EuiText size="m">{i18n.ACTION_IN_PROGRESS_ALERT}</EuiText>
+    </EuiContextMenuItem>
+  );
+
+  const openAddExceptionModal = useCallback(
+    ({
+      ruleName,
+      ruleIndices,
+      ruleId,
+      exceptionListType,
+      alertData,
+    }: AddExceptionModalBaseProps) => {
+      if (alertData !== null && alertData !== undefined) {
+        setShouldShowAddExceptionModal(true);
+        setAddExceptionModalState({
+          ruleName,
+          ruleId,
+          ruleIndices,
+          exceptionListType,
+          alertData,
+        });
+      }
+    },
+    [setShouldShowAddExceptionModal, setAddExceptionModalState]
+  );
+
+  const AddExceptionModal = useCallback(
+    () =>
+      shouldShowAddExceptionModal === true && addExceptionModalState.alertData !== null ? (
+        <AddExceptionModalComponent
+          ruleName={addExceptionModalState.ruleName}
+          ruleId={addExceptionModalState.ruleId}
+          ruleIndices={addExceptionModalState.ruleIndices}
+          exceptionListType={addExceptionModalState.exceptionListType}
+          alertData={addExceptionModalState.alertData}
+          onCancel={onAddExceptionCancel}
+          onConfirm={onAddExceptionConfirm}
+          alertStatus={alertStatus}
+        />
+      ) : null,
+    [
+      shouldShowAddExceptionModal,
+      addExceptionModalState.alertData,
+      addExceptionModalState.ruleName,
+      addExceptionModalState.ruleId,
+      addExceptionModalState.ruleIndices,
+      addExceptionModalState.exceptionListType,
+      onAddExceptionCancel,
+      onAddExceptionConfirm,
+      alertStatus,
+    ]
+  );
+
+  const button = (
+    <EuiButtonIcon
+      aria-label="context menu"
+      data-test-subj="timeline-context-menu-button"
+      size="s"
+      iconType="boxesHorizontal"
+      onClick={onButtonClick}
+      disabled={disabled}
+    />
+  );
+
+  const handleAddEndpointExceptionClick = useCallback(() => {
+    const [ruleName] = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.name',
+    });
+    const [ruleId] = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.id',
+    });
+    const ruleIndices = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.index',
+    });
+
+    closePopover();
+
+    if (ruleId !== undefined) {
+      openAddExceptionModal({
+        ruleName: ruleName ?? '',
+        ruleId,
+        ruleIndices: ruleIndices.length > 0 ? ruleIndices : DEFAULT_INDEX_PATTERN,
+        exceptionListType: 'endpoint',
+        alertData: {
+          ecsData: ecsRowData,
+          nonEcsData: nonEcsRowData,
+        },
+      });
+    }
+  }, [closePopover, ecsRowData, nonEcsRowData, openAddExceptionModal]);
+
+  const addEndpointExceptionComponent = (
+    <EuiContextMenuItem
+      key="add-endpoint-exception-menu-item"
+      aria-label="Add Endpoint Exception"
+      data-test-subj="add-endpoint-exception-menu-item"
+      id="addEndpointException"
+      onClick={handleAddEndpointExceptionClick}
+      disabled={!canUserCRUD || !hasIndexWrite || !isEndpointAlert}
+    >
+      <EuiText size="m">{i18n.ACTION_ADD_ENDPOINT_EXCEPTION}</EuiText>
+    </EuiContextMenuItem>
+  );
+
+  const handleAddExceptionClick = useCallback(() => {
+    const [ruleName] = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.name',
+    });
+    const [ruleId] = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.id',
+    });
+    const ruleIndices = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.index',
+    });
+
+    closePopover();
+
+    if (ruleId !== undefined) {
+      openAddExceptionModal({
+        ruleName: ruleName ?? '',
+        ruleId,
+        ruleIndices: ruleIndices.length > 0 ? ruleIndices : DEFAULT_INDEX_PATTERN,
+        exceptionListType: 'detection',
+        alertData: {
+          ecsData: ecsRowData,
+          nonEcsData: nonEcsRowData,
+        },
+      });
+    }
+  }, [closePopover, ecsRowData, nonEcsRowData, openAddExceptionModal]);
+
+  const areExceptionsAllowed = useMemo(() => {
+    const ruleTypes = getMappedNonEcsValue({
+      data: nonEcsRowData,
+      fieldName: 'signal.rule.type',
+    });
+    const [ruleType] = ruleTypes as RuleType[];
+    return !isMlRule(ruleType) && !isThresholdRule(ruleType);
+  }, [nonEcsRowData]);
+
+  const addExceptionComponent = (
+    <EuiContextMenuItem
+      key="add-exception-menu-item"
+      aria-label="Add Exception"
+      data-test-subj="add-exception-menu-item"
+      id="addException"
+      onClick={handleAddExceptionClick}
+      disabled={!canUserCRUD || !hasIndexWrite || !areExceptionsAllowed}
+    >
+      <EuiText size="m">{i18n.ACTION_ADD_EXCEPTION}</EuiText>
+    </EuiContextMenuItem>
+  );
+
+  const statusFilters = useMemo(() => {
+    if (!alertStatus) {
+      return [];
+    }
+
+    switch (alertStatus) {
+      case 'open':
+        return [inProgressAlertActionComponent, closeAlertActionComponent];
+      case 'in-progress':
+        return [openAlertActionComponent, closeAlertActionComponent];
+      case 'closed':
+        return [openAlertActionComponent, inProgressAlertActionComponent];
+      default:
+        return [];
+    }
+  }, [
+    alertStatus,
+    closeAlertActionComponent,
+    inProgressAlertActionComponent,
+    openAlertActionComponent,
+  ]);
+
+  const items = useMemo(
+    () => [...statusFilters, addEndpointExceptionComponent, addExceptionComponent],
+    [addEndpointExceptionComponent, addExceptionComponent, statusFilters]
+  );
+
+  return (
+    <>
+      <EventsTd key="actions-context-menu">
+        <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
+          <EuiPopover
+            id="singlePanel"
+            button={button}
+            isOpen={isPopoverOpen}
+            closePopover={closePopover}
+            panelPaddingSize="none"
+            anchorPosition="downLeft"
+            repositionOnScroll
+          >
+            <ContextMenuPanel items={items} />
+          </EuiPopover>
+        </EventsTdContent>
+      </EventsTd>
+      <AddExceptionModal />
+    </>
+  );
+};
+
+const ContextMenuPanel = styled(EuiContextMenuPanel)`
+  font-size: ${({ theme }) => theme.eui.euiFontSizeS};
+`;
+
+ContextMenuPanel.displayName = 'ContextMenuPanel';
+
+export const AlertContextMenu = React.memo(AlertContextMenuComponent);
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx
new file mode 100644
index 00000000000000..f4080de5b4ba1f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/investigate_in_timeline_action.tsx
@@ -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 React, { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+
+import { TimelineId } from '../../../../../common/types/timeline';
+import { TimelineNonEcsData, Ecs } from '../../../../../public/graphql/types';
+import { timelineActions } from '../../../../timelines/store/timeline';
+import { useApolloClient } from '../../../../common/utils/apollo_context';
+import { sendAlertToTimelineAction } from '../actions';
+import { dispatchUpdateTimeline } from '../../../../timelines/components/open_timeline/helpers';
+import { ActionIconItem } from '../../../../timelines/components/timeline/body/actions/action_icon_item';
+
+import { CreateTimelineProps } from '../types';
+import {
+  ACTION_INVESTIGATE_IN_TIMELINE,
+  ACTION_INVESTIGATE_IN_TIMELINE_ARIA_LABEL,
+} from '../translations';
+
+interface InvestigateInTimelineActionProps {
+  ecsRowData: Ecs;
+  nonEcsRowData: TimelineNonEcsData[];
+}
+
+const InvestigateInTimelineActionComponent: React.FC<InvestigateInTimelineActionProps> = ({
+  ecsRowData,
+  nonEcsRowData,
+}) => {
+  const dispatch = useDispatch();
+  const apolloClient = useApolloClient();
+
+  const updateTimelineIsLoading = useCallback(
+    (payload) => dispatch(timelineActions.updateIsLoading(payload)),
+    [dispatch]
+  );
+
+  const createTimeline = useCallback(
+    ({ from: fromTimeline, timeline, to: toTimeline, ruleNote }: CreateTimelineProps) => {
+      updateTimelineIsLoading({ id: TimelineId.active, isLoading: false });
+      dispatchUpdateTimeline(dispatch)({
+        duplicate: true,
+        from: fromTimeline,
+        id: TimelineId.active,
+        notes: [],
+        timeline: {
+          ...timeline,
+          show: true,
+        },
+        to: toTimeline,
+        ruleNote,
+      })();
+    },
+    [dispatch, updateTimelineIsLoading]
+  );
+
+  const investigateInTimelineAlertClick = useCallback(
+    () =>
+      sendAlertToTimelineAction({
+        apolloClient,
+        createTimeline,
+        ecsData: ecsRowData,
+        nonEcsData: nonEcsRowData,
+        updateTimelineIsLoading,
+      }),
+    [apolloClient, createTimeline, ecsRowData, nonEcsRowData, updateTimelineIsLoading]
+  );
+
+  return (
+    <ActionIconItem
+      ariaLabel={ACTION_INVESTIGATE_IN_TIMELINE_ARIA_LABEL}
+      content={ACTION_INVESTIGATE_IN_TIMELINE}
+      dataTestSubj="send-alert-to-timeline"
+      iconType="timeline"
+      id="sendAlertToTimeline"
+      onClick={investigateInTimelineAlertClick}
+      isDisabled={false}
+    />
+  );
+};
+
+export const InvestigateInTimelineAction = React.memo(InvestigateInTimelineActionComponent);
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
index 3d6c3dc0a7a8e5..b4da0267d2ea5d 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
@@ -115,6 +115,13 @@ export const ACTION_INVESTIGATE_IN_TIMELINE = i18n.translate(
   }
 );
 
+export const ACTION_INVESTIGATE_IN_TIMELINE_ARIA_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionEngine.alerts.actions.investigateInTimelineAriaLabel',
+  {
+    defaultMessage: 'Send alert to timeline',
+  }
+);
+
 export const ACTION_ADD_EXCEPTION = i18n.translate(
   'xpack.securitySolution.detectionEngine.alerts.actions.addException',
   {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
index 2e77e77f6b3d50..d8ba0ab2d40b9e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/types.ts
@@ -41,7 +41,6 @@ export type UpdateAlertsStatus = ({
 export interface UpdateAlertStatusActionProps {
   query?: string;
   alertIds: string[];
-  status: Status;
   selectedStatus: Status;
   setEventsLoading: ({ eventIds, isLoading }: SetEventsLoadingProps) => void;
   setEventsDeleted: ({ eventIds, isDeleted }: SetEventsDeletedProps) => void;
diff --git a/x-pack/plugins/security_solution/public/detections/components/user_info/index.tsx b/x-pack/plugins/security_solution/public/detections/components/user_info/index.tsx
index 50348578cb039a..e1a29c3575d95c 100644
--- a/x-pack/plugins/security_solution/public/detections/components/user_info/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/user_info/index.tsx
@@ -121,7 +121,7 @@ export const userInfoReducer = (state: State, action: Action): State => {
 
 const StateUserInfoContext = createContext<[State, Dispatch<Action>]>([initialState, () => noop]);
 
-const useUserData = () => useContext(StateUserInfoContext);
+export const useUserData = () => useContext(StateUserInfoContext);
 
 interface ManageUserInfoProps {
   children: React.ReactNode;
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
index 982712cbe97975..8c21f6a1e8cb78 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.test.tsx
@@ -19,7 +19,7 @@ import {
 } from '../../../common/mock';
 import { setAbsoluteRangeDatePicker } from '../../../common/store/inputs/actions';
 import { DetectionEnginePageComponent } from './detection_engine';
-import { useUserInfo } from '../../components/user_info';
+import { useUserData } from '../../components/user_info';
 import { useWithSource } from '../../../common/containers/source';
 import { createStore, State } from '../../../common/store';
 import { mockHistory, Router } from '../../../cases/components/__mock__/router';
@@ -73,7 +73,7 @@ const store = createStore(
 describe('DetectionEnginePageComponent', () => {
   beforeAll(() => {
     (useParams as jest.Mock).mockReturnValue({});
-    (useUserInfo as jest.Mock).mockReturnValue({});
+    (useUserData as jest.Mock).mockReturnValue([{}]);
     (useWithSource as jest.Mock).mockReturnValue({
       indicesExist: true,
       indexPattern: {},
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
index d76da592e1c811..3a3854f145db3d 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/detection_engine.tsx
@@ -30,7 +30,7 @@ import { NoApiIntegrationKeyCallOut } from '../../components/no_api_integration_
 import { NoWriteAlertsCallOut } from '../../components/no_write_alerts_callout';
 import { AlertsHistogramPanel } from '../../components/alerts_histogram_panel';
 import { alertsHistogramOptions } from '../../components/alerts_histogram_panel/config';
-import { useUserInfo } from '../../components/user_info';
+import { useUserData } from '../../components/user_info';
 import { OverviewEmpty } from '../../../overview/components/overview_empty';
 import { DetectionEngineNoIndex } from './detection_engine_no_index';
 import { DetectionEngineHeaderPage } from '../../components/detection_engine_header_page';
@@ -55,15 +55,17 @@ export const DetectionEnginePageComponent: React.FC<PropsFromRedux> = ({
 }) => {
   const { to, from, deleteQuery, setQuery } = useGlobalTime();
   const { globalFullScreen } = useFullScreen();
-  const {
-    loading: userInfoLoading,
-    isSignalIndexExists,
-    isAuthenticated: isUserAuthenticated,
-    hasEncryptionKey,
-    canUserCRUD,
-    signalIndexName,
-    hasIndexWrite,
-  } = useUserInfo();
+  const [
+    {
+      loading: userInfoLoading,
+      isSignalIndexExists,
+      isAuthenticated: isUserAuthenticated,
+      hasEncryptionKey,
+      canUserCRUD,
+      signalIndexName,
+      hasIndexWrite,
+    },
+  ] = useUserData();
   const {
     loading: listsConfigLoading,
     needsConfiguration: needsListsConfiguration,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.test.tsx
index d4e654321ef988..045e7d402fd2b3 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.test.tsx
@@ -12,8 +12,8 @@ import { DetectionEngineContainer } from './index';
 
 describe('DetectionEngineContainer', () => {
   it('renders correctly', () => {
-    const wrapper = shallow(<DetectionEngineContainer url="url" />);
+    const wrapper = shallow(<DetectionEngineContainer />);
 
-    expect(wrapper.find('ManageUserInfo')).toHaveLength(1);
+    expect(wrapper.find('Switch')).toHaveLength(1);
   });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.tsx
index 914734aba4ec62..5f379f7dbb70e3 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/index.tsx
@@ -5,37 +5,32 @@
  */
 
 import React from 'react';
-import { Route, Switch, RouteComponentProps } from 'react-router-dom';
+import { Route, Switch } from 'react-router-dom';
 
-import { ManageUserInfo } from '../../components/user_info';
 import { CreateRulePage } from './rules/create';
 import { DetectionEnginePage } from './detection_engine';
 import { EditRulePage } from './rules/edit';
 import { RuleDetailsPage } from './rules/details';
 import { RulesPage } from './rules';
 
-type Props = Partial<RouteComponentProps<{}>> & { url: string };
-
-const DetectionEngineContainerComponent: React.FC<Props> = () => (
-  <ManageUserInfo>
-    <Switch>
-      <Route path="/rules/id/:detailName/edit">
-        <EditRulePage />
-      </Route>
-      <Route path="/rules/id/:detailName">
-        <RuleDetailsPage />
-      </Route>
-      <Route path="/rules/create">
-        <CreateRulePage />
-      </Route>
-      <Route path="/rules">
-        <RulesPage />
-      </Route>
-      <Route exact path="" strict>
-        <DetectionEnginePage />
-      </Route>
-    </Switch>
-  </ManageUserInfo>
+const DetectionEngineContainerComponent: React.FC = () => (
+  <Switch>
+    <Route path="/rules/id/:detailName/edit">
+      <EditRulePage />
+    </Route>
+    <Route path="/rules/id/:detailName">
+      <RuleDetailsPage />
+    </Route>
+    <Route path="/rules/create">
+      <CreateRulePage />
+    </Route>
+    <Route path="/rules">
+      <RulesPage />
+    </Route>
+    <Route exact path="" strict>
+      <DetectionEnginePage />
+    </Route>
+  </Switch>
 );
 
 export const DetectionEngineContainer = React.memo(DetectionEngineContainerComponent);
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
index 50407c5eb219b2..deffee5a56d46d 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 import '../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../common/mock';
 import { CreateRulePage } from './index';
-import { useUserInfo } from '../../../../components/user_info';
+import { useUserData } from '../../../../components/user_info';
 
 jest.mock('react-router-dom', () => {
   const original = jest.requireActual('react-router-dom');
@@ -29,7 +29,7 @@ jest.mock('../../../../components/user_info');
 
 describe('CreateRulePage', () => {
   it('renders correctly', () => {
-    (useUserInfo as jest.Mock).mockReturnValue({});
+    (useUserData as jest.Mock).mockReturnValue([{}]);
     const wrapper = shallow(<CreateRulePage />, { wrappingComponent: TestProviders });
 
     expect(wrapper.find('[title="Create new rule"]')).toHaveLength(1);
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx
index 70f278197b0051..d2eb3228cbbf36 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx
@@ -19,7 +19,7 @@ import {
 import { WrapperPage } from '../../../../../common/components/wrapper_page';
 import { displaySuccessToast, useStateToaster } from '../../../../../common/components/toasters';
 import { SpyRoute } from '../../../../../common/utils/route/spy_routes';
-import { useUserInfo } from '../../../../components/user_info';
+import { useUserData } from '../../../../components/user_info';
 import { AccordionTitle } from '../../../../components/rules/accordion_title';
 import { FormData, FormHook } from '../../../../../shared_imports';
 import { StepAboutRule } from '../../../../components/rules/step_about_rule';
@@ -84,13 +84,15 @@ const StepDefineRuleAccordion: StyledComponent<
 StepDefineRuleAccordion.displayName = 'StepDefineRuleAccordion';
 
 const CreateRulePageComponent: React.FC = () => {
-  const {
-    loading: userInfoLoading,
-    isSignalIndexExists,
-    isAuthenticated,
-    hasEncryptionKey,
-    canUserCRUD,
-  } = useUserInfo();
+  const [
+    {
+      loading: userInfoLoading,
+      isSignalIndexExists,
+      isAuthenticated,
+      hasEncryptionKey,
+      canUserCRUD,
+    },
+  ] = useUserData();
   const {
     loading: listsConfigLoading,
     needsConfiguration: needsListsConfiguration,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
index 5e6587dab1736a..f8f9da78b2a062 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/details/index.test.tsx
@@ -19,7 +19,7 @@ import {
 import { RuleDetailsPageComponent } from './index';
 import { createStore, State } from '../../../../../common/store';
 import { setAbsoluteRangeDatePicker } from '../../../../../common/store/inputs/actions';
-import { useUserInfo } from '../../../../components/user_info';
+import { useUserData } from '../../../../components/user_info';
 import { useWithSource } from '../../../../../common/containers/source';
 import { useParams } from 'react-router-dom';
 import { mockHistory, Router } from '../../../../../cases/components/__mock__/router';
@@ -69,7 +69,7 @@ const store = createStore(
 
 describe('RuleDetailsPageComponent', () => {
   beforeAll(() => {
-    (useUserInfo as jest.Mock).mockReturnValue({});
+    (useUserData as jest.Mock).mockReturnValue([{}]);
     (useParams as jest.Mock).mockReturnValue({});
     (useWithSource as jest.Mock).mockReturnValue({
       indicesExist: true,
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 f48dc64966bfc6..2988e031c4dd6d 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
@@ -44,7 +44,7 @@ import { StepAboutRuleToggleDetails } from '../../../../components/rules/step_ab
 import { DetectionEngineHeaderPage } from '../../../../components/detection_engine_header_page';
 import { AlertsHistogramPanel } from '../../../../components/alerts_histogram_panel';
 import { AlertsTable } from '../../../../components/alerts_table';
-import { useUserInfo } from '../../../../components/user_info';
+import { useUserData } from '../../../../components/user_info';
 import { OverviewEmpty } from '../../../../../overview/components/overview_empty';
 import { useAlertInfo } from '../../../../components/alerts_info';
 import { StepDefineRule } from '../../../../components/rules/step_define_rule';
@@ -124,15 +124,17 @@ export const RuleDetailsPageComponent: FC<PropsFromRedux> = ({
   setAbsoluteRangeDatePicker,
 }) => {
   const { to, from, deleteQuery, setQuery } = useGlobalTime();
-  const {
-    loading: userInfoLoading,
-    isSignalIndexExists,
-    isAuthenticated,
-    hasEncryptionKey,
-    canUserCRUD,
-    hasIndexWrite,
-    signalIndexName,
-  } = useUserInfo();
+  const [
+    {
+      loading: userInfoLoading,
+      isSignalIndexExists,
+      isAuthenticated,
+      hasEncryptionKey,
+      canUserCRUD,
+      hasIndexWrite,
+      signalIndexName,
+    },
+  ] = useUserData();
   const {
     loading: listsConfigLoading,
     needsConfiguration: needsListsConfiguration,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
index 2e45dbc6521b70..e89c899b12c392 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.test.tsx
@@ -10,7 +10,7 @@ import { shallow } from 'enzyme';
 import '../../../../../common/mock/match_media';
 import { TestProviders } from '../../../../../common/mock';
 import { EditRulePage } from './index';
-import { useUserInfo } from '../../../../components/user_info';
+import { useUserData } from '../../../../components/user_info';
 import { useParams } from 'react-router-dom';
 
 jest.mock('../../../../containers/detection_engine/lists/use_lists_config');
@@ -28,7 +28,7 @@ jest.mock('react-router-dom', () => {
 
 describe('EditRulePage', () => {
   it('renders correctly', () => {
-    (useUserInfo as jest.Mock).mockReturnValue({});
+    (useUserData as jest.Mock).mockReturnValue([{}]);
     (useParams as jest.Mock).mockReturnValue({});
     const wrapper = shallow(<EditRulePage />, { wrappingComponent: TestProviders });
 
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 4033d247c4ecba..530222ee19624e 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
@@ -26,7 +26,7 @@ import {
 } from '../../../../../common/components/link_to/redirect_to_detection_engine';
 import { displaySuccessToast, useStateToaster } from '../../../../../common/components/toasters';
 import { SpyRoute } from '../../../../../common/utils/route/spy_routes';
-import { useUserInfo } from '../../../../components/user_info';
+import { useUserData } from '../../../../components/user_info';
 import { DetectionEngineHeaderPage } from '../../../../components/detection_engine_header_page';
 import { FormHook, FormData } from '../../../../../shared_imports';
 import { StepPanel } from '../../../../components/rules/step_panel';
@@ -72,13 +72,15 @@ interface ActionsStepRuleForm extends StepRuleForm {
 const EditRulePageComponent: FC = () => {
   const history = useHistory();
   const [, dispatchToaster] = useStateToaster();
-  const {
-    loading: userInfoLoading,
-    isSignalIndexExists,
-    isAuthenticated,
-    hasEncryptionKey,
-    canUserCRUD,
-  } = useUserInfo();
+  const [
+    {
+      loading: userInfoLoading,
+      isSignalIndexExists,
+      isAuthenticated,
+      hasEncryptionKey,
+      canUserCRUD,
+    },
+  ] = useUserData();
   const {
     loading: listsConfigLoading,
     needsConfiguration: needsListsConfiguration,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
index 95ef85ec1317a1..886a24dd7cbe82 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.test.tsx
@@ -9,7 +9,7 @@ import { shallow } from 'enzyme';
 
 import '../../../../common/mock/match_media';
 import { RulesPage } from './index';
-import { useUserInfo } from '../../../components/user_info';
+import { useUserData } from '../../../components/user_info';
 import { usePrePackagedRules } from '../../../containers/detection_engine/rules';
 
 jest.mock('react-router-dom', () => {
@@ -30,7 +30,7 @@ jest.mock('../../../containers/detection_engine/rules');
 
 describe('RulesPage', () => {
   beforeAll(() => {
-    (useUserInfo as jest.Mock).mockReturnValue({});
+    (useUserData as jest.Mock).mockReturnValue([{}]);
     (usePrePackagedRules as jest.Mock).mockReturnValue({});
   });
   it('renders correctly', () => {
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
index 92ec0bb5a72cd6..53c82569f94aeb 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
@@ -18,7 +18,7 @@ import { DetectionEngineHeaderPage } from '../../../components/detection_engine_
 import { WrapperPage } from '../../../../common/components/wrapper_page';
 import { SpyRoute } from '../../../../common/utils/route/spy_routes';
 
-import { useUserInfo } from '../../../components/user_info';
+import { useUserData } from '../../../components/user_info';
 import { AllRules } from './all';
 import { ImportDataModal } from '../../../../common/components/import_data_modal';
 import { ReadOnlyCallOut } from '../../../components/rules/read_only_callout';
@@ -42,14 +42,16 @@ const RulesPageComponent: React.FC = () => {
   const [showImportModal, setShowImportModal] = useState(false);
   const [showValueListsModal, setShowValueListsModal] = useState(false);
   const refreshRulesData = useRef<null | Func>(null);
-  const {
-    loading: userInfoLoading,
-    isSignalIndexExists,
-    isAuthenticated,
-    hasEncryptionKey,
-    canUserCRUD,
-    hasIndexWrite,
-  } = useUserInfo();
+  const [
+    {
+      loading: userInfoLoading,
+      isSignalIndexExists,
+      isAuthenticated,
+      hasEncryptionKey,
+      canUserCRUD,
+      hasIndexWrite,
+    },
+  ] = useUserData();
   const {
     loading: listsConfigLoading,
     canWriteIndex: canWriteListsIndex,
diff --git a/x-pack/plugins/security_solution/public/detections/routes.tsx b/x-pack/plugins/security_solution/public/detections/routes.tsx
index 8f542d1f886704..b5f7bc6983752e 100644
--- a/x-pack/plugins/security_solution/public/detections/routes.tsx
+++ b/x-pack/plugins/security_solution/public/detections/routes.tsx
@@ -12,12 +12,11 @@ import { NotFoundPage } from '../app/404';
 
 export const AlertsRoutes: React.FC = () => (
   <Switch>
-    <Route
-      path="/"
-      render={({ location, match }) => (
-        <DetectionEngineContainer location={location} url={match.url} />
-      )}
-    />
-    <Route render={() => <NotFoundPage />} />
+    <Route path="/">
+      <DetectionEngineContainer />
+    </Route>
+    <Route>
+      <NotFoundPage />
+    </Route>
   </Switch>
 );
diff --git a/x-pack/plugins/security_solution/public/graphql/introspection.json b/x-pack/plugins/security_solution/public/graphql/introspection.json
index 7b20873bf63ccb..b32083fec1b5e3 100644
--- a/x-pack/plugins/security_solution/public/graphql/introspection.json
+++ b/x-pack/plugins/security_solution/public/graphql/introspection.json
@@ -4719,6 +4719,14 @@
             "type": { "kind": "SCALAR", "name": "ToStringArray", "ofType": null },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "status",
+            "description": "",
+            "args": [],
+            "type": { "kind": "SCALAR", "name": "ToStringArray", "ofType": null },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
diff --git a/x-pack/plugins/security_solution/public/graphql/types.ts b/x-pack/plugins/security_solution/public/graphql/types.ts
index f7d2c81f536be1..65d9212f77dcc3 100644
--- a/x-pack/plugins/security_solution/public/graphql/types.ts
+++ b/x-pack/plugins/security_solution/public/graphql/types.ts
@@ -1020,6 +1020,8 @@ export interface SignalField {
   rule?: Maybe<RuleField>;
 
   original_time?: Maybe<string[]>;
+
+  status?: Maybe<string[]>;
 }
 
 export interface RuleField {
@@ -5098,6 +5100,8 @@ export namespace GetTimelineQuery {
   export type Signal = {
     __typename?: 'SignalField';
 
+    status: Maybe<string[]>;
+
     original_time: Maybe<string[]>;
 
     rule: Maybe<_Rule>;
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx b/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx
index 88886a874a9494..6c8eb9eb04941c 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx
@@ -14,7 +14,7 @@ import { hostsModel } from '../../store';
 import {
   MatrixHistogramOption,
   MatrixHistogramMappingTypes,
-  MatrixHisrogramConfigs,
+  MatrixHistogramConfigs,
 } from '../../../common/components/matrix_histogram/types';
 import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram';
 import { KpiHostsChartColors } from '../../components/kpi_hosts/types';
@@ -49,7 +49,7 @@ export const authMatrixDataMappingFields: MatrixHistogramMappingTypes = {
   },
 };
 
-const histogramConfigs: MatrixHisrogramConfigs = {
+const histogramConfigs: MatrixHistogramConfigs = {
   defaultStackByOption:
     authStackByOptions.find((o) => o.text === DEFAULT_STACK_BY) ?? authStackByOptions[0],
   errorMessage: i18n.ERROR_FETCHING_AUTHENTICATIONS_DATA,
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx b/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx
index cea987db485f4b..f28c3dfa1ad779 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/navigation/events_query_tab_body.tsx
@@ -14,14 +14,13 @@ import { hostsModel } from '../../store';
 import { eventsDefaultModel } from '../../../common/components/events_viewer/default_model';
 import {
   MatrixHistogramOption,
-  MatrixHisrogramConfigs,
+  MatrixHistogramConfigs,
 } from '../../../common/components/matrix_histogram/types';
 import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram';
 import { useFullScreen } from '../../../common/containers/use_full_screen';
 import * as i18n from '../translations';
 import { HistogramType } from '../../../graphql/types';
 import { useManageTimeline } from '../../../timelines/components/manage_timeline';
-import { getInvestigateInResolverAction } from '../../../timelines/components/timeline/body/helpers';
 
 const EVENTS_HISTOGRAM_ID = 'eventsOverTimeQuery';
 
@@ -42,7 +41,7 @@ export const eventsStackByOptions: MatrixHistogramOption[] = [
 
 const DEFAULT_STACK_BY = 'event.action';
 
-export const histogramConfigs: MatrixHisrogramConfigs = {
+export const histogramConfigs: MatrixHistogramConfigs = {
   defaultStackByOption:
     eventsStackByOptions.find((o) => o.text === DEFAULT_STACK_BY) ?? eventsStackByOptions[0],
   errorMessage: i18n.ERROR_FETCHING_EVENTS_DATA,
@@ -52,14 +51,14 @@ export const histogramConfigs: MatrixHisrogramConfigs = {
   title: i18n.NAVIGATION_EVENTS_TITLE,
 };
 
-export const EventsQueryTabBody = ({
+const EventsQueryTabBodyComponent: React.FC<HostsComponentsQueryProps> = ({
   deleteQuery,
   endDate,
   filterQuery,
   pageFilters,
   setQuery,
   startDate,
-}: HostsComponentsQueryProps) => {
+}) => {
   const { initializeTimeline } = useManageTimeline();
   const dispatch = useDispatch();
   const { globalFullScreen } = useFullScreen();
@@ -67,9 +66,6 @@ export const EventsQueryTabBody = ({
     initializeTimeline({
       id: TimelineId.hostsPageEvents,
       defaultModel: eventsDefaultModel,
-      timelineRowActions: () => [
-        getInvestigateInResolverAction({ dispatch, timelineId: TimelineId.hostsPageEvents }),
-      ],
     });
   }, [dispatch, initializeTimeline]);
 
@@ -106,4 +102,8 @@ export const EventsQueryTabBody = ({
   );
 };
 
+EventsQueryTabBodyComponent.displayName = 'EventsQueryTabBodyComponent';
+
+export const EventsQueryTabBody = React.memo(EventsQueryTabBodyComponent);
+
 EventsQueryTabBody.displayName = 'EventsQueryTabBody';
diff --git a/x-pack/plugins/security_solution/public/network/pages/navigation/dns_query_tab_body.tsx b/x-pack/plugins/security_solution/public/network/pages/navigation/dns_query_tab_body.tsx
index 77283dc330257b..2886089a1eb99e 100644
--- a/x-pack/plugins/security_solution/public/network/pages/navigation/dns_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/navigation/dns_query_tab_body.tsx
@@ -16,7 +16,7 @@ import { networkModel } from '../../store';
 
 import {
   MatrixHistogramOption,
-  MatrixHisrogramConfigs,
+  MatrixHistogramConfigs,
 } from '../../../common/components/matrix_histogram/types';
 import * as i18n from '../translations';
 import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram';
@@ -33,7 +33,7 @@ const dnsStackByOptions: MatrixHistogramOption[] = [
 
 const DEFAULT_STACK_BY = 'dns.question.registered_domain';
 
-export const histogramConfigs: Omit<MatrixHisrogramConfigs, 'title'> = {
+export const histogramConfigs: Omit<MatrixHistogramConfigs, 'title'> = {
   defaultStackByOption:
     dnsStackByOptions.find((o) => o.text === DEFAULT_STACK_BY) ?? dnsStackByOptions[0],
   errorMessage: i18n.ERROR_FETCHING_DNS_DATA,
@@ -64,7 +64,7 @@ export const DnsQueryTabBody = ({
     []
   );
 
-  const dnsHistogramConfigs: MatrixHisrogramConfigs = useMemo(
+  const dnsHistogramConfigs: MatrixHistogramConfigs = useMemo(
     () => ({
       ...histogramConfigs,
       title: getTitle,
diff --git a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
index 6e59d81a1eae91..111935782949bf 100644
--- a/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/alerts_by_category/index.tsx
@@ -26,7 +26,7 @@ import {
   alertsStackByOptions,
   histogramConfigs,
 } from '../../../common/components/alerts_viewer/histogram_configs';
-import { MatrixHisrogramConfigs } from '../../../common/components/matrix_histogram/types';
+import { MatrixHistogramConfigs } from '../../../common/components/matrix_histogram/types';
 import { getTabsOnHostsUrl } from '../../../common/components/link_to/redirect_to_hosts';
 import { GlobalTimeArgs } from '../../../common/containers/use_global_time';
 import { SecurityPageName } from '../../../app/types';
@@ -93,7 +93,7 @@ const AlertsByCategoryComponent: React.FC<Props> = ({
     [goToHostAlerts, formatUrl]
   );
 
-  const alertsByCategoryHistogramConfigs: MatrixHisrogramConfigs = useMemo(
+  const alertsByCategoryHistogramConfigs: MatrixHistogramConfigs = useMemo(
     () => ({
       ...histogramConfigs,
       defaultStackByOption:
diff --git a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
index f18fccee50e22b..2e9c25f01b3c1c 100644
--- a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
@@ -14,7 +14,7 @@ import { SHOWING, UNIT } from '../../../common/components/events_viewer/translat
 import { getTabsOnHostsUrl } from '../../../common/components/link_to/redirect_to_hosts';
 import { MatrixHistogramContainer } from '../../../common/components/matrix_histogram';
 import {
-  MatrixHisrogramConfigs,
+  MatrixHistogramConfigs,
   MatrixHistogramOption,
 } from '../../../common/components/matrix_histogram/types';
 import { eventsStackByOptions } from '../../../hosts/pages/navigation';
@@ -127,7 +127,7 @@ const EventsByDatasetComponent: React.FC<Props> = ({
     [combinedQueries, kibana, indexPattern, query, filters]
   );
 
-  const eventsByDatasetHistogramConfigs: MatrixHisrogramConfigs = useMemo(
+  const eventsByDatasetHistogramConfigs: MatrixHistogramConfigs = useMemo(
     () => ({
       ...histogramConfigs,
       stackByOptions:
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_browser.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_browser.tsx
index 07c4893e4550b4..3c9101878be8d2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_browser.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/field_browser.tsx
@@ -46,13 +46,7 @@ PanesFlexGroup.displayName = 'PanesFlexGroup';
 
 type Props = Pick<
   FieldBrowserProps,
-  | 'browserFields'
-  | 'isEventViewer'
-  | 'height'
-  | 'onFieldSelected'
-  | 'onUpdateColumns'
-  | 'timelineId'
-  | 'width'
+  'browserFields' | 'height' | 'onFieldSelected' | 'onUpdateColumns' | 'timelineId' | 'width'
 > & {
   /**
    * The current timeline column headers
@@ -106,7 +100,6 @@ const FieldsBrowserComponent: React.FC<Props> = ({
   browserFields,
   columnHeaders,
   filteredBrowserFields,
-  isEventViewer,
   isSearching,
   onCategorySelected,
   onFieldSelected,
@@ -193,7 +186,6 @@ const FieldsBrowserComponent: React.FC<Props> = ({
         <Header
           data-test-subj="header"
           filteredBrowserFields={filteredBrowserFields}
-          isEventViewer={isEventViewer}
           isSearching={isSearching}
           onOutsideClick={onOutsideClick}
           onSearchInputChange={onInputChange}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/header.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/header.tsx
index 9ad460db4c7b75..916240ac411e5f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/header.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/header.tsx
@@ -54,7 +54,6 @@ SearchContainer.displayName = 'SearchContainer';
 
 interface Props {
   filteredBrowserFields: BrowserFields;
-  isEventViewer?: boolean;
   isSearching: boolean;
   onOutsideClick: () => void;
   onSearchInputChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
@@ -93,7 +92,6 @@ CountRow.displayName = 'CountRow';
 
 const TitleRow = React.memo<{
   id: string;
-  isEventViewer?: boolean;
   onOutsideClick: () => void;
   onUpdateColumns: OnUpdateColumns;
 }>(({ id, onOutsideClick, onUpdateColumns }) => {
@@ -130,7 +128,6 @@ TitleRow.displayName = 'TitleRow';
 
 export const Header = React.memo<Props>(
   ({
-    isEventViewer,
     isSearching,
     filteredBrowserFields,
     onOutsideClick,
@@ -140,12 +137,7 @@ export const Header = React.memo<Props>(
     timelineId,
   }) => (
     <HeaderContainer>
-      <TitleRow
-        id={timelineId}
-        isEventViewer={isEventViewer}
-        onUpdateColumns={onUpdateColumns}
-        onOutsideClick={onOutsideClick}
-      />
+      <TitleRow id={timelineId} onUpdateColumns={onUpdateColumns} onOutsideClick={onOutsideClick} />
       <SearchContainer>
         <EuiFieldSearch
           className={getFieldBrowserSearchInputClassName(timelineId)}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
index f4e39ff8227c75..f197d241cc4223 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/fields_browser/index.tsx
@@ -36,7 +36,6 @@ export const StatefulFieldsBrowserComponent: React.FC<FieldBrowserProps> = ({
   columnHeaders,
   browserFields,
   height,
-  isEventViewer = false,
   onFieldSelected,
   onUpdateColumns,
   timelineId,
@@ -164,7 +163,6 @@ export const StatefulFieldsBrowserComponent: React.FC<FieldBrowserProps> = ({
             filteredBrowserFields != null ? filteredBrowserFields : browserFieldsWithDefaultCategory
           }
           height={height}
-          isEventViewer={isEventViewer}
           isSearching={isSearching}
           onCategorySelected={updateSelectedCategoryId}
           onFieldSelected={onFieldSelected}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.test.tsx
index b918e5abc652b3..fe0f0c8f8b91f5 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.test.tsx
@@ -8,7 +8,6 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import { getTimelineDefaults, useTimelineManager, UseTimelineManager } from './';
 import { FilterManager } from '../../../../../../../src/plugins/data/public/query/filter_manager';
 import { coreMock } from '../../../../../../../src/core/public/mocks';
-import { TimelineRowAction } from '../timeline/body/actions';
 
 const isStringifiedComparisonEqual = (a: {}, b: {}): boolean =>
   JSON.stringify(a) === JSON.stringify(b);
@@ -17,13 +16,14 @@ describe('useTimelineManager', () => {
   const setupMock = coreMock.createSetup();
   const testId = 'coolness';
   const timelineDefaults = getTimelineDefaults(testId);
-  const timelineRowActions = () => [];
   const mockFilterManager = new FilterManager(setupMock.uiSettings);
+
   beforeEach(() => {
     jest.clearAllMocks();
     jest.restoreAllMocks();
   });
-  it('initilizes an undefined timeline', async () => {
+
+  it('initializes an undefined timeline', async () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<string, UseTimelineManager>(() =>
         useTimelineManager()
@@ -33,6 +33,7 @@ describe('useTimelineManager', () => {
       expect(isStringifiedComparisonEqual(uninitializedTimeline, timelineDefaults)).toBeTruthy();
     });
   });
+
   it('getIndexToAddById', async () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<string, UseTimelineManager>(() =>
@@ -43,6 +44,7 @@ describe('useTimelineManager', () => {
       expect(data).toEqual(timelineDefaults.indexToAdd);
     });
   });
+
   it('setIndexToAdd', async () => {
     await act(async () => {
       const indexToAddArgs = { id: testId, indexToAdd: ['example'] };
@@ -52,13 +54,13 @@ describe('useTimelineManager', () => {
       await waitForNextUpdate();
       result.current.initializeTimeline({
         id: testId,
-        timelineRowActions,
       });
       result.current.setIndexToAdd(indexToAddArgs);
       const data = result.current.getIndexToAddById(testId);
       expect(data).toEqual(indexToAddArgs.indexToAdd);
     });
   });
+
   it('setIsTimelineLoading', async () => {
     await act(async () => {
       const isLoadingArgs = { id: testId, isLoading: true };
@@ -68,7 +70,6 @@ describe('useTimelineManager', () => {
       await waitForNextUpdate();
       result.current.initializeTimeline({
         id: testId,
-        timelineRowActions,
       });
       let timeline = result.current.getManageTimelineById(testId);
       expect(timeline.isLoading).toBeFalsy();
@@ -77,29 +78,7 @@ describe('useTimelineManager', () => {
       expect(timeline.isLoading).toBeTruthy();
     });
   });
-  it('setTimelineRowActions', async () => {
-    await act(async () => {
-      const timelineRowActionsEx = () => [
-        { id: 'wow', content: 'hey', displayType: 'icon', onClick: () => {} } as TimelineRowAction,
-      ];
-      const { result, waitForNextUpdate } = renderHook<string, UseTimelineManager>(() =>
-        useTimelineManager()
-      );
-      await waitForNextUpdate();
-      result.current.initializeTimeline({
-        id: testId,
-        timelineRowActions,
-      });
-      let timeline = result.current.getManageTimelineById(testId);
-      expect(timeline.timelineRowActions).toEqual(timelineRowActions);
-      result.current.setTimelineRowActions({
-        id: testId,
-        timelineRowActions: timelineRowActionsEx,
-      });
-      timeline = result.current.getManageTimelineById(testId);
-      expect(timeline.timelineRowActions).toEqual(timelineRowActionsEx);
-    });
-  });
+
   it('getTimelineFilterManager undefined on uninitialized', async () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<string, UseTimelineManager>(() =>
@@ -110,6 +89,7 @@ describe('useTimelineManager', () => {
       expect(data).toEqual(undefined);
     });
   });
+
   it('getTimelineFilterManager defined at initialize', async () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<string, UseTimelineManager>(() =>
@@ -118,13 +98,13 @@ describe('useTimelineManager', () => {
       await waitForNextUpdate();
       result.current.initializeTimeline({
         id: testId,
-        timelineRowActions,
         filterManager: mockFilterManager,
       });
       const data = result.current.getTimelineFilterManager(testId);
       expect(data).toEqual(mockFilterManager);
     });
   });
+
   it('isManagedTimeline returns false when unset and then true when set', async () => {
     await act(async () => {
       const { result, waitForNextUpdate } = renderHook<string, UseTimelineManager>(() =>
@@ -135,7 +115,6 @@ describe('useTimelineManager', () => {
       expect(data).toBeFalsy();
       result.current.initializeTimeline({
         id: testId,
-        timelineRowActions,
         filterManager: mockFilterManager,
       });
       data = result.current.isManagedTimeline(testId);
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 560d4c6928e4e4..f82158fe65c11b 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
@@ -9,12 +9,10 @@ import { noop } from 'lodash/fp';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FilterManager } from '../../../../../../../src/plugins/data/public/query/filter_manager';
-import { TimelineRowAction } from '../timeline/body/actions';
 import { SubsetTimelineModel } from '../../store/timeline/model';
 import * as i18n from '../../../common/components/events_viewer/translations';
 import * as i18nF from '../timeline/footer/translations';
 import { timelineDefaults as timelineDefaultModel } from '../../store/timeline/defaults';
-import { Ecs, TimelineNonEcsData } from '../../../graphql/types';
 
 interface ManageTimelineInit {
   documentType?: string;
@@ -25,16 +23,11 @@ interface ManageTimelineInit {
   indexToAdd?: string[] | null;
   loadingText?: string;
   selectAll?: boolean;
-  timelineRowActions: ({ ecsData, nonEcsData }: TimelineRowActionArgs) => TimelineRowAction[];
+  queryFields?: string[];
   title?: string;
   unit?: (totalCount: number) => string;
 }
 
-export interface TimelineRowActionArgs {
-  ecsData: Ecs;
-  nonEcsData: TimelineNonEcsData[];
-}
-
 interface ManageTimeline {
   documentType: string;
   defaultModel: SubsetTimelineModel;
@@ -46,7 +39,6 @@ interface ManageTimeline {
   loadingText: string;
   queryFields: string[];
   selectAll: boolean;
-  timelineRowActions: ({ ecsData, nonEcsData }: TimelineRowActionArgs) => TimelineRowAction[];
   title: string;
   unit: (totalCount: number) => string;
 }
@@ -75,14 +67,6 @@ type ActionManageTimeline =
       type: 'SET_SELECT_ALL';
       id: string;
       payload: boolean;
-    }
-  | {
-      type: 'SET_TIMELINE_ACTIONS';
-      id: string;
-      payload: {
-        queryFields?: string[];
-        timelineRowActions: ({ ecsData, nonEcsData }: TimelineRowActionArgs) => TimelineRowAction[];
-      };
     };
 
 export const getTimelineDefaults = (id: string) => ({
@@ -95,7 +79,6 @@ export const getTimelineDefaults = (id: string) => ({
   id,
   isLoading: false,
   queryFields: [],
-  timelineRowActions: () => [],
   title: i18n.EVENTS,
   unit: (n: number) => i18n.UNIT(n),
 });
@@ -129,14 +112,7 @@ const reducerManageTimeline = (
           selectAll: action.payload,
         },
       } as ManageTimelineById;
-    case 'SET_TIMELINE_ACTIONS':
-      return {
-        ...state,
-        [action.id]: {
-          ...state[action.id],
-          ...action.payload,
-        },
-      } as ManageTimelineById;
+
     case 'SET_IS_LOADING':
       return {
         ...state,
@@ -159,11 +135,6 @@ export interface UseTimelineManager {
   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[];
-    timelineRowActions: ({ ecsData, nonEcsData }: TimelineRowActionArgs) => TimelineRowAction[];
-  }) => void;
 }
 
 export const useTimelineManager = (
@@ -181,25 +152,6 @@ export const useTimelineManager = (
     });
   }, []);
 
-  const setTimelineRowActions = useCallback(
-    ({
-      id,
-      queryFields,
-      timelineRowActions,
-    }: {
-      id: string;
-      queryFields?: string[];
-      timelineRowActions: ({ ecsData, nonEcsData }: TimelineRowActionArgs) => TimelineRowAction[];
-    }) => {
-      dispatch({
-        type: 'SET_TIMELINE_ACTIONS',
-        id,
-        payload: { queryFields, timelineRowActions },
-      });
-    },
-    []
-  );
-
   const setIsTimelineLoading = useCallback(
     ({ id, isLoading }: { id: string; isLoading: boolean }) => {
       dispatch({
@@ -236,7 +188,7 @@ export const useTimelineManager = (
       if (state[id] != null) {
         return state[id];
       }
-      initializeTimeline({ id, timelineRowActions: () => [] });
+      initializeTimeline({ id });
       return getTimelineDefaults(id);
     },
     [initializeTimeline, state]
@@ -261,7 +213,6 @@ export const useTimelineManager = (
     setIndexToAdd,
     setIsTimelineLoading,
     setSelectAll,
-    setTimelineRowActions,
   };
 };
 
@@ -274,7 +225,6 @@ const init = {
   setIndexToAdd: () => undefined,
   setIsTimelineLoading: () => noop,
   setSelectAll: () => noop,
-  setTimelineRowActions: () => noop,
 };
 
 const ManageTimelineContext = createContext<UseTimelineManager>(init);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
index ac6c61b33b35ec..ed44fc14e3efae 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.test.ts
@@ -36,7 +36,7 @@ import { KueryFilterQueryKind } from '../../../common/store/model';
 import { Note } from '../../../common/lib/note';
 import moment from 'moment';
 import sinon from 'sinon';
-import { TimelineType, TimelineStatus } from '../../../../common/types/timeline';
+import { TimelineId, TimelineType, TimelineStatus } from '../../../../common/types/timeline';
 
 jest.mock('../../../common/store/inputs/actions');
 jest.mock('../../../common/components/url_state/normalize_time_range.ts');
@@ -942,7 +942,7 @@ describe('helpers', () => {
     test('it invokes date range picker dispatch', () => {
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -958,7 +958,7 @@ describe('helpers', () => {
     test('it invokes add timeline dispatch', () => {
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -966,7 +966,7 @@ describe('helpers', () => {
       })();
 
       expect(dispatchAddTimeline).toHaveBeenCalledWith({
-        id: 'timeline-1',
+        id: TimelineId.active,
         savedTimeline: true,
         timeline: mockTimelineModel,
       });
@@ -975,7 +975,7 @@ describe('helpers', () => {
     test('it does not invoke kql filter query dispatches if timeline.kqlQuery.filterQuery is null', () => {
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -989,7 +989,7 @@ describe('helpers', () => {
     test('it does not invoke notes dispatch if duplicate is true', () => {
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -1012,7 +1012,7 @@ describe('helpers', () => {
       };
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -1036,7 +1036,7 @@ describe('helpers', () => {
       };
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -1044,14 +1044,14 @@ describe('helpers', () => {
       })();
 
       expect(dispatchSetKqlFilterQueryDraft).toHaveBeenCalledWith({
-        id: 'timeline-1',
+        id: TimelineId.active,
         filterQueryDraft: {
           kind: 'kuery',
           expression: 'expression',
         },
       });
       expect(dispatchApplyKqlFilterQuery).toHaveBeenCalledWith({
-        id: 'timeline-1',
+        id: TimelineId.active,
         filterQuery: {
           kuery: {
             kind: 'kuery',
@@ -1065,7 +1065,7 @@ describe('helpers', () => {
     test('it invokes dispatchAddNotes if duplicate is false', () => {
       timelineDispatch({
         duplicate: false,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [
@@ -1099,7 +1099,7 @@ describe('helpers', () => {
     test('it invokes dispatch to create a timeline note if duplicate is true and ruleNote exists', () => {
       timelineDispatch({
         duplicate: true,
-        id: 'timeline-1',
+        id: TimelineId.active,
         from: '2020-03-26T14:35:56.356Z',
         to: '2020-03-26T14:41:56.356Z',
         notes: [],
@@ -1119,7 +1119,7 @@ describe('helpers', () => {
       expect(dispatchAddNotes).not.toHaveBeenCalled();
       expect(dispatchUpdateNote).toHaveBeenCalledWith({ note: expectedNote });
       expect(dispatchAddGlobalTimelineNote).toHaveBeenLastCalledWith({
-        id: 'timeline-1',
+        id: TimelineId.active,
         noteId: 'uuid.v4()',
       });
     });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
index c2e23cc19d89e2..b6b6148340a4a9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/helpers.ts
@@ -22,7 +22,12 @@ import {
   DataProviderResult,
 } from '../../../graphql/types';
 
-import { DataProviderType, TimelineStatus, TimelineType } from '../../../../common/types/timeline';
+import {
+  DataProviderType,
+  TimelineId,
+  TimelineStatus,
+  TimelineType,
+} from '../../../../common/types/timeline';
 
 import {
   addNotes as dispatchAddNotes,
@@ -315,7 +320,7 @@ export const queryTimelineById = <TCache>({
   updateIsLoading,
   updateTimeline,
 }: QueryTimelineById<TCache>) => {
-  updateIsLoading({ id: 'timeline-1', isLoading: true });
+  updateIsLoading({ id: TimelineId.active, isLoading: true });
   if (apolloClient) {
     apolloClient
       .query<GetOneTimeline.Query, GetOneTimeline.Variables>({
@@ -343,7 +348,7 @@ export const queryTimelineById = <TCache>({
           updateTimeline({
             duplicate,
             from,
-            id: 'timeline-1',
+            id: TimelineId.active,
             notes,
             timeline: {
               ...timeline,
@@ -355,7 +360,7 @@ export const queryTimelineById = <TCache>({
         }
       })
       .finally(() => {
-        updateIsLoading({ id: 'timeline-1', isLoading: false });
+        updateIsLoading({ id: TimelineId.active, isLoading: false });
       });
   }
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
index 4c5db80a6c916a..f681043a9047d9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/index.tsx
@@ -11,6 +11,7 @@ import { Dispatch } from 'redux';
 
 import { DeleteTimelineMutation, SortFieldTimeline, Direction } from '../../../graphql/types';
 import { State } from '../../../common/store';
+import { TimelineId } from '../../../../common/types/timeline';
 import { ColumnHeaderOptions, TimelineModel } from '../../../timelines/store/timeline/model';
 import { timelineSelectors } from '../../../timelines/store/timeline';
 import { timelineDefaults } from '../../../timelines/store/timeline/defaults';
@@ -192,7 +193,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
     const deleteTimelines: DeleteTimelines = useCallback(
       async (timelineIds: string[]) => {
         if (timelineIds.includes(timeline.savedObjectId || '')) {
-          createNewTimeline({ id: 'timeline-1', columns: defaultHeaders, show: false });
+          createNewTimeline({ id: TimelineId.active, columns: defaultHeaders, show: false });
         }
 
         await apolloClient.mutate<
@@ -369,7 +370,7 @@ export const StatefulOpenTimelineComponent = React.memo<OpenTimelineOwnProps>(
 const makeMapStateToProps = () => {
   const getTimeline = timelineSelectors.getTimelineByIdSelector();
   const mapStateToProps = (state: State) => {
-    const timeline = getTimeline(state, 'timeline-1') ?? timelineDefaults;
+    const timeline = getTimeline(state, TimelineId.active) ?? timelineDefaults;
     return {
       timeline,
     };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
new file mode 100644
index 00000000000000..64f8ce3727f39a
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.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, { MouseEvent } from 'react';
+import { EuiButtonIcon, EuiToolTip } from '@elastic/eui';
+
+import { EventsTd, EventsTdContent } from '../../styles';
+import { DEFAULT_ICON_BUTTON_WIDTH } from '../../helpers';
+
+interface ActionIconItemProps {
+  ariaLabel?: string;
+  id: string;
+  width?: number;
+  dataTestSubj?: string;
+  content?: string;
+  iconType?: string;
+  isDisabled?: boolean;
+  onClick?: (event: MouseEvent) => void;
+  children?: React.ReactNode;
+}
+
+const ActionIconItemComponent: React.FC<ActionIconItemProps> = ({
+  id,
+  width = DEFAULT_ICON_BUTTON_WIDTH,
+  dataTestSubj,
+  content,
+  ariaLabel,
+  iconType,
+  isDisabled = false,
+  onClick,
+  children,
+}) => (
+  <EventsTd key={id}>
+    <EventsTdContent textAlign="center" width={width}>
+      {children ?? (
+        <EuiToolTip data-test-subj={`${dataTestSubj}-tool-tip`} content={content}>
+          <EuiButtonIcon
+            aria-label={ariaLabel}
+            data-test-subj={`${dataTestSubj}-button`}
+            iconType={iconType}
+            isDisabled={isDisabled}
+            onClick={onClick}
+          />
+        </EuiToolTip>
+      )}
+    </EventsTdContent>
+  </EventsTd>
+);
+
+ActionIconItemComponent.displayName = 'ActionIconItemComponent';
+
+export const ActionIconItem = React.memo(ActionIconItemComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/add_note_icon_item.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/add_note_icon_item.tsx
new file mode 100644
index 00000000000000..a82821675d9565
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/add_note_icon_item.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 from 'react';
+
+import { TimelineType, TimelineStatus } from '../../../../../../common/types/timeline';
+import { AssociateNote, UpdateNote } from '../../../notes/helpers';
+import * as i18n from '../translations';
+import { NotesButton } from '../../properties/helpers';
+import { Note } from '../../../../../common/lib/note';
+import { ActionIconItem } from './action_icon_item';
+
+interface AddEventNoteActionProps {
+  associateNote: AssociateNote;
+  getNotesByIds: (noteIds: string[]) => Note[];
+  noteIds: string[];
+  showNotes: boolean;
+  status: TimelineStatus;
+  timelineType: TimelineType;
+  toggleShowNotes: () => void;
+  updateNote: UpdateNote;
+}
+
+const AddEventNoteActionComponent: React.FC<AddEventNoteActionProps> = ({
+  associateNote,
+  getNotesByIds,
+  noteIds,
+  showNotes,
+  status,
+  timelineType,
+  toggleShowNotes,
+  updateNote,
+}) => (
+  <ActionIconItem id="add-note">
+    <NotesButton
+      animate={false}
+      associateNote={associateNote}
+      data-test-subj="add-note"
+      getNotesByIds={getNotesByIds}
+      noteIds={noteIds}
+      showNotes={showNotes}
+      size="s"
+      status={status}
+      timelineType={timelineType}
+      toggleShowNotes={toggleShowNotes}
+      toolTip={
+        timelineType === TimelineType.template ? i18n.NOTES_DISABLE_TOOLTIP : i18n.NOTES_TOOLTIP
+      }
+      updateNote={updateNote}
+    />
+  </ActionIconItem>
+);
+
+AddEventNoteActionComponent.displayName = 'AddEventNoteActionComponent';
+
+export const AddEventNoteAction = React.memo(AddEventNoteActionComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
index 78ee9bdd053b20..fb1709df013205 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.test.tsx
@@ -9,10 +9,7 @@ import { useSelector } from 'react-redux';
 
 import { TestProviders, mockTimelineModel } from '../../../../../common/mock';
 import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../constants';
-import * as i18n from '../translations';
-
 import { Actions } from '.';
-import { TimelineType } from '../../../../../../common/types/timeline';
 
 jest.mock('react-redux', () => {
   const origin = jest.requireActual('react-redux');
@@ -30,22 +27,14 @@ describe('Actions', () => {
       <TestProviders>
         <Actions
           actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
           checked={false}
           expanded={false}
           eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
           loading={false}
           loadingEventIds={[]}
-          noteIds={[]}
           onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
           onRowSelected={jest.fn()}
           showCheckboxes={true}
-          showNotes={false}
-          toggleShowNotes={jest.fn()}
-          updateNote={jest.fn()}
         />
       </TestProviders>
     );
@@ -58,22 +47,14 @@ describe('Actions', () => {
       <TestProviders>
         <Actions
           actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
           checked={false}
           expanded={false}
           eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
           loading={false}
           loadingEventIds={[]}
-          noteIds={[]}
           onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
           onRowSelected={jest.fn()}
           showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={jest.fn()}
-          updateNote={jest.fn()}
         />
       </TestProviders>
     );
@@ -86,22 +67,14 @@ describe('Actions', () => {
       <TestProviders>
         <Actions
           actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
           checked={false}
           expanded={false}
           eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
           loading={false}
           loadingEventIds={[]}
-          noteIds={[]}
           onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
           onRowSelected={jest.fn()}
           showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={jest.fn()}
-          updateNote={jest.fn()}
         />
       </TestProviders>
     );
@@ -116,22 +89,14 @@ describe('Actions', () => {
       <TestProviders>
         <Actions
           actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
           checked={false}
           expanded={false}
           eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
           loading={false}
           loadingEventIds={[]}
-          noteIds={[]}
           onEventToggled={onEventToggled}
-          onPinClicked={jest.fn()}
           onRowSelected={jest.fn()}
           showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={jest.fn()}
-          updateNote={jest.fn()}
         />
       </TestProviders>
     );
@@ -140,197 +105,4 @@ describe('Actions', () => {
 
     expect(onEventToggled).toBeCalled();
   });
-
-  test('it does NOT render a notes button when isEventsViewer is true', () => {
-    const toggleShowNotes = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <Actions
-          actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
-          checked={false}
-          expanded={false}
-          eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
-          isEventViewer={true}
-          loading={false}
-          loadingEventIds={[]}
-          noteIds={[]}
-          onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
-          onRowSelected={jest.fn()}
-          showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={toggleShowNotes}
-          updateNote={jest.fn()}
-        />
-      </TestProviders>
-    );
-
-    expect(wrapper.find('[data-test-subj="timeline-notes-button-small"]').exists()).toBe(false);
-  });
-
-  test('it invokes toggleShowNotes when the button for adding notes is clicked', () => {
-    const toggleShowNotes = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <Actions
-          actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
-          checked={false}
-          expanded={false}
-          eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
-          loading={false}
-          loadingEventIds={[]}
-          noteIds={[]}
-          onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
-          onRowSelected={jest.fn()}
-          showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={toggleShowNotes}
-          updateNote={jest.fn()}
-        />
-      </TestProviders>
-    );
-
-    wrapper.find('[data-test-subj="timeline-notes-button-small"]').first().simulate('click');
-
-    expect(toggleShowNotes).toBeCalled();
-  });
-
-  test('it renders correct tooltip for NotesButton - timeline', () => {
-    const toggleShowNotes = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <Actions
-          actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
-          checked={false}
-          expanded={false}
-          eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
-          loading={false}
-          loadingEventIds={[]}
-          noteIds={[]}
-          onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
-          onRowSelected={jest.fn()}
-          showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={toggleShowNotes}
-          updateNote={jest.fn()}
-        />
-      </TestProviders>
-    );
-
-    expect(wrapper.find('[data-test-subj="add-note"]').prop('toolTip')).toEqual(i18n.NOTES_TOOLTIP);
-  });
-
-  test('it renders correct tooltip for NotesButton - timeline template', () => {
-    (useSelector as jest.Mock).mockReturnValue({
-      ...mockTimelineModel,
-      timelineType: TimelineType.template,
-    });
-    const toggleShowNotes = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <Actions
-          actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
-          checked={false}
-          expanded={false}
-          eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
-          loading={false}
-          loadingEventIds={[]}
-          noteIds={[]}
-          onEventToggled={jest.fn()}
-          onPinClicked={jest.fn()}
-          onRowSelected={jest.fn()}
-          showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={toggleShowNotes}
-          updateNote={jest.fn()}
-        />
-      </TestProviders>
-    );
-
-    expect(wrapper.find('[data-test-subj="add-note"]').prop('toolTip')).toEqual(
-      i18n.NOTES_DISABLE_TOOLTIP
-    );
-    (useSelector as jest.Mock).mockReturnValue(mockTimelineModel);
-  });
-
-  test('it does NOT render a pin button when isEventViewer is true', () => {
-    const onPinClicked = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <Actions
-          actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
-          checked={false}
-          expanded={false}
-          eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
-          isEventViewer={true}
-          loading={false}
-          loadingEventIds={[]}
-          noteIds={[]}
-          onEventToggled={jest.fn()}
-          onPinClicked={onPinClicked}
-          onRowSelected={jest.fn()}
-          showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={jest.fn()}
-          updateNote={jest.fn()}
-        />
-      </TestProviders>
-    );
-
-    expect(wrapper.find('[data-test-subj="pin"]').exists()).toBe(false);
-  });
-
-  test('it invokes onPinClicked when the button for pinning events is clicked', () => {
-    const onPinClicked = jest.fn();
-
-    const wrapper = mount(
-      <TestProviders>
-        <Actions
-          actionsColumnWidth={DEFAULT_ACTIONS_COLUMN_WIDTH}
-          associateNote={jest.fn()}
-          checked={false}
-          expanded={false}
-          eventId="abc"
-          eventIsPinned={false}
-          getNotesByIds={jest.fn()}
-          loading={false}
-          loadingEventIds={[]}
-          noteIds={[]}
-          onEventToggled={jest.fn()}
-          onPinClicked={onPinClicked}
-          onRowSelected={jest.fn()}
-          showCheckboxes={false}
-          showNotes={false}
-          toggleShowNotes={jest.fn()}
-          updateNote={jest.fn()}
-        />
-      </TestProviders>
-    );
-
-    wrapper.find('[data-test-subj="pin"]').first().simulate('click');
-
-    expect(onPinClicked).toHaveBeenCalled();
-  });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
index c9c8250922161c..3d08d56d6fb195 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/index.tsx
@@ -3,203 +3,90 @@
  * 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 { useSelector } from 'react-redux';
-import { EuiButtonIcon, EuiCheckbox, EuiLoadingSpinner, EuiToolTip } from '@elastic/eui';
+import React, { useCallback } from 'react';
+import { EuiButtonIcon, EuiLoadingSpinner, EuiCheckbox } from '@elastic/eui';
 
-import { Note } from '../../../../../common/lib/note';
-import { StoreState } from '../../../../../common/store/types';
-import { TimelineType } from '../../../../../../common/types/timeline';
-
-import { TimelineModel } from '../../../../store/timeline/model';
-
-import { AssociateNote, UpdateNote } from '../../../notes/helpers';
-import { Pin } from '../../pin';
-import { NotesButton } from '../../properties/helpers';
 import { EventsLoading, EventsTd, EventsTdContent, EventsTdGroupActions } from '../../styles';
-import { eventHasNotes, getPinTooltip } from '../helpers';
 import * as i18n from '../translations';
 import { OnRowSelected } from '../../events';
-import { Ecs, TimelineNonEcsData } from '../../../../../graphql/types';
 import { DEFAULT_ICON_BUTTON_WIDTH } from '../../helpers';
 
-export interface TimelineRowActionOnClick {
-  eventId: string;
-  ecsData: Ecs;
-  data: TimelineNonEcsData[];
-}
-
-export interface TimelineRowAction {
-  ariaLabel?: string;
-  dataTestSubj?: string;
-  displayType: 'icon' | 'contextMenu';
-  iconType?: string;
-  id: string;
-  isActionDisabled?: (ecsData?: Ecs) => boolean;
-  onClick: ({ eventId, ecsData }: TimelineRowActionOnClick) => void;
-  content: string | JSX.Element;
-  width?: number;
-}
-
 interface Props {
   actionsColumnWidth: number;
   additionalActions?: JSX.Element[];
-  associateNote: AssociateNote;
   checked: boolean;
   onRowSelected: OnRowSelected;
   expanded: boolean;
   eventId: string;
-  eventIsPinned: boolean;
-  getNotesByIds: (noteIds: string[]) => Note[];
-  isEventViewer?: boolean;
   loading: boolean;
   loadingEventIds: Readonly<string[]>;
-  noteIds: string[];
   onEventToggled: () => void;
-  onPinClicked: () => void;
-  showNotes: boolean;
   showCheckboxes: boolean;
-  toggleShowNotes: () => void;
-  updateNote: UpdateNote;
 }
 
-const emptyNotes: string[] = [];
-
-export const Actions = React.memo<Props>(
-  ({
-    actionsColumnWidth,
-    additionalActions,
-    associateNote,
-    checked,
-    expanded,
-    eventId,
-    eventIsPinned,
-    getNotesByIds,
-    isEventViewer = false,
-    loading = false,
-    loadingEventIds,
-    noteIds,
-    onEventToggled,
-    onPinClicked,
-    onRowSelected,
-    showCheckboxes,
-    showNotes,
-    toggleShowNotes,
-    updateNote,
-  }) => {
-    const timeline = useSelector<StoreState, TimelineModel>((state) => {
-      return state.timeline.timelineById['timeline-1'];
-    });
-    return (
-      <EventsTdGroupActions
-        actionsColumnWidth={actionsColumnWidth}
-        data-test-subj="event-actions-container"
-      >
-        {showCheckboxes && (
-          <EventsTd key="select-event-container" data-test-subj="select-event-container">
-            <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-              {loadingEventIds.includes(eventId) ? (
-                <EuiLoadingSpinner size="m" data-test-subj="event-loader" />
-              ) : (
-                <EuiCheckbox
-                  data-test-subj="select-event"
-                  id={eventId}
-                  checked={checked}
-                  onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                    onRowSelected({
-                      eventIds: [eventId],
-                      isSelected: event.currentTarget.checked,
-                    });
-                  }}
-                />
-              )}
-            </EventsTdContent>
-          </EventsTd>
-        )}
+const ActionsComponent: React.FC<Props> = ({
+  actionsColumnWidth,
+  additionalActions,
+  checked,
+  expanded,
+  eventId,
+  loading = false,
+  loadingEventIds,
+  onEventToggled,
+  onRowSelected,
+  showCheckboxes,
+}) => {
+  const handleSelectEvent = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) =>
+      onRowSelected({
+        eventIds: [eventId],
+        isSelected: event.currentTarget.checked,
+      }),
+    [eventId, onRowSelected]
+  );
 
-        <EventsTd key="expand-event">
+  return (
+    <EventsTdGroupActions
+      actionsColumnWidth={actionsColumnWidth}
+      data-test-subj="event-actions-container"
+    >
+      {showCheckboxes && (
+        <EventsTd key="select-event-container" data-test-subj="select-event-container">
           <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-            {loading ? (
-              <EventsLoading />
+            {loadingEventIds.includes(eventId) ? (
+              <EuiLoadingSpinner size="m" data-test-subj="event-loader" />
             ) : (
-              <EuiButtonIcon
-                aria-label={expanded ? i18n.COLLAPSE : i18n.EXPAND}
-                data-test-subj="expand-event"
-                iconType={expanded ? 'arrowDown' : 'arrowRight'}
+              <EuiCheckbox
+                data-test-subj="select-event"
                 id={eventId}
-                onClick={onEventToggled}
+                checked={checked}
+                onChange={handleSelectEvent}
               />
             )}
           </EventsTdContent>
         </EventsTd>
+      )}
+      <EventsTd key="expand-event">
+        <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
+          {loading ? (
+            <EventsLoading />
+          ) : (
+            <EuiButtonIcon
+              aria-label={expanded ? i18n.COLLAPSE : i18n.EXPAND}
+              data-test-subj="expand-event"
+              iconType={expanded ? 'arrowDown' : 'arrowRight'}
+              id={eventId}
+              onClick={onEventToggled}
+            />
+          )}
+        </EventsTdContent>
+      </EventsTd>
 
-        <>{additionalActions}</>
+      <>{additionalActions}</>
+    </EventsTdGroupActions>
+  );
+};
 
-        {!isEventViewer && (
-          <>
-            <EventsTd key="timeline-action-pin-tool-tip">
-              <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-                <EuiToolTip
-                  data-test-subj="timeline-action-pin-tool-tip"
-                  content={getPinTooltip({
-                    isPinned: eventIsPinned,
-                    eventHasNotes: eventHasNotes(noteIds),
-                    timelineType: timeline.timelineType,
-                  })}
-                >
-                  <Pin
-                    allowUnpinning={!eventHasNotes(noteIds)}
-                    data-test-subj="pin-event"
-                    onClick={onPinClicked}
-                    pinned={eventIsPinned}
-                    timelineType={timeline.timelineType}
-                  />
-                </EuiToolTip>
-              </EventsTdContent>
-            </EventsTd>
+ActionsComponent.displayName = 'ActionsComponent';
 
-            <EventsTd key="add-note">
-              <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-                <NotesButton
-                  animate={false}
-                  associateNote={associateNote}
-                  data-test-subj="add-note"
-                  getNotesByIds={getNotesByIds}
-                  noteIds={noteIds || emptyNotes}
-                  showNotes={showNotes}
-                  size="s"
-                  status={timeline.status}
-                  timelineType={timeline.timelineType}
-                  toggleShowNotes={toggleShowNotes}
-                  toolTip={
-                    timeline.timelineType === TimelineType.template
-                      ? i18n.NOTES_DISABLE_TOOLTIP
-                      : i18n.NOTES_TOOLTIP
-                  }
-                  updateNote={updateNote}
-                />
-              </EventsTdContent>
-            </EventsTd>
-          </>
-        )}
-      </EventsTdGroupActions>
-    );
-  },
-  (nextProps, prevProps) => {
-    return (
-      prevProps.actionsColumnWidth === nextProps.actionsColumnWidth &&
-      prevProps.additionalActions === nextProps.additionalActions &&
-      prevProps.checked === nextProps.checked &&
-      prevProps.expanded === nextProps.expanded &&
-      prevProps.eventId === nextProps.eventId &&
-      prevProps.eventIsPinned === nextProps.eventIsPinned &&
-      prevProps.loading === nextProps.loading &&
-      prevProps.loadingEventIds === nextProps.loadingEventIds &&
-      prevProps.noteIds === nextProps.noteIds &&
-      prevProps.onRowSelected === nextProps.onRowSelected &&
-      prevProps.showCheckboxes === nextProps.showCheckboxes &&
-      prevProps.showNotes === nextProps.showNotes
-    );
-  }
-);
-Actions.displayName = 'Actions';
+export const Actions = React.memo(ActionsComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
new file mode 100644
index 00000000000000..2f9f15938cad66
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/pin_event_action.tsx
@@ -0,0 +1,58 @@
+/*
+ * 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 { EuiToolTip } from '@elastic/eui';
+
+import { EventsTd, EventsTdContent } from '../../styles';
+import { DEFAULT_ICON_BUTTON_WIDTH } from '../../helpers';
+import { eventHasNotes, getPinTooltip } from '../helpers';
+import { Pin } from '../../pin';
+import { TimelineType } from '../../../../../../common/types/timeline';
+
+interface PinEventActionProps {
+  noteIds: string[];
+  onPinClicked: () => void;
+  eventIsPinned: boolean;
+  timelineType: TimelineType;
+}
+
+const PinEventActionComponent: React.FC<PinEventActionProps> = ({
+  noteIds,
+  onPinClicked,
+  eventIsPinned,
+  timelineType,
+}) => {
+  const tooltipContent = useMemo(
+    () =>
+      getPinTooltip({
+        isPinned: eventIsPinned,
+        eventHasNotes: eventHasNotes(noteIds),
+        timelineType,
+      }),
+    [eventIsPinned, noteIds, timelineType]
+  );
+
+  return (
+    <EventsTd key="timeline-action-pin-tool-tip">
+      <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
+        <EuiToolTip data-test-subj="timeline-action-pin-tool-tip" content={tooltipContent}>
+          <Pin
+            allowUnpinning={!eventHasNotes(noteIds)}
+            data-test-subj="pin-event"
+            onClick={onPinClicked}
+            pinned={eventIsPinned}
+            timelineType={timelineType}
+          />
+        </EuiToolTip>
+      </EventsTdContent>
+    </EventsTd>
+  );
+};
+
+PinEventActionComponent.displayName = 'PinEventActionComponent';
+
+export const PinEventAction = React.memo(PinEventActionComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
index a3e177604fbd47..120fc12b425f4a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/index.tsx
@@ -235,7 +235,6 @@ export const ColumnHeadersComponent = ({
               columnHeaders={columnHeaders}
               data-test-subj="field-browser"
               height={FIELD_BROWSER_HEIGHT}
-              isEventViewer={isEventViewer}
               onUpdateColumns={onUpdateColumns}
               timelineId={timelineId}
               toggleColumn={toggleColumn}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.tsx
new file mode 100644
index 00000000000000..ae552ade665cbc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.test.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 { mount } from 'enzyme';
+import React from 'react';
+import { useSelector } from 'react-redux';
+
+import { TestProviders, mockTimelineModel } from '../../../../../common/mock';
+import { DEFAULT_ACTIONS_COLUMN_WIDTH } from '../constants';
+import * as i18n from '../translations';
+
+import { EventColumnView } from './event_column_view';
+import { TimelineType } from '../../../../../../common/types/timeline';
+
+jest.mock('react-redux', () => {
+  const origin = jest.requireActual('react-redux');
+  return {
+    ...origin,
+    useSelector: jest.fn(),
+  };
+});
+
+describe('EventColumnView', () => {
+  (useSelector as jest.Mock).mockReturnValue(mockTimelineModel);
+
+  const props = {
+    id: 'event-id',
+    actionsColumnWidth: DEFAULT_ACTIONS_COLUMN_WIDTH,
+    associateNote: jest.fn(),
+    columnHeaders: [],
+    columnRenderers: [],
+    data: [
+      {
+        field: 'host.name',
+      },
+    ],
+    ecsData: {
+      _id: 'id',
+    },
+    eventIdToNoteIds: {},
+    expanded: false,
+    getNotesByIds: jest.fn(),
+    loading: false,
+    loadingEventIds: [],
+    onColumnResized: jest.fn(),
+    onEventToggled: jest.fn(),
+    onPinEvent: jest.fn(),
+    onRowSelected: jest.fn(),
+    onUnPinEvent: jest.fn(),
+    refetch: jest.fn(),
+    selectedEventIds: {},
+    showCheckboxes: false,
+    showNotes: false,
+    timelineId: 'timeline-1',
+    toggleShowNotes: jest.fn(),
+    updateNote: jest.fn(),
+    isEventPinned: false,
+  };
+
+  test('it does NOT render a notes button when isEventsViewer is true', () => {
+    const wrapper = mount(<EventColumnView {...props} isEventViewer={true} />, {
+      wrappingComponent: TestProviders,
+    });
+
+    expect(wrapper.find('[data-test-subj="timeline-notes-button-small"]').exists()).toBe(false);
+  });
+
+  test('it invokes toggleShowNotes when the button for adding notes is clicked', () => {
+    const wrapper = mount(<EventColumnView {...props} />, { wrappingComponent: TestProviders });
+
+    expect(props.toggleShowNotes).not.toHaveBeenCalled();
+
+    wrapper.find('[data-test-subj="timeline-notes-button-small"]').first().simulate('click');
+
+    expect(props.toggleShowNotes).toHaveBeenCalled();
+  });
+
+  test('it renders correct tooltip for NotesButton - timeline', () => {
+    const wrapper = mount(<EventColumnView {...props} />, { wrappingComponent: TestProviders });
+
+    expect(wrapper.find('[data-test-subj="add-note"]').prop('toolTip')).toEqual(i18n.NOTES_TOOLTIP);
+  });
+
+  test('it renders correct tooltip for NotesButton - timeline template', () => {
+    (useSelector as jest.Mock).mockReturnValue({
+      ...mockTimelineModel,
+      timelineType: TimelineType.template,
+    });
+
+    const wrapper = mount(<EventColumnView {...props} />, { wrappingComponent: TestProviders });
+
+    expect(wrapper.find('[data-test-subj="add-note"]').prop('toolTip')).toEqual(
+      i18n.NOTES_DISABLE_TOOLTIP
+    );
+    (useSelector as jest.Mock).mockReturnValue(mockTimelineModel);
+  });
+
+  test('it does NOT render a pin button when isEventViewer is true', () => {
+    const wrapper = mount(<EventColumnView {...props} isEventViewer={true} />, {
+      wrappingComponent: TestProviders,
+    });
+
+    expect(wrapper.find('[data-test-subj="pin"]').exists()).toBe(false);
+  });
+
+  test('it invokes onPinClicked when the button for pinning events is clicked', () => {
+    const wrapper = mount(<EventColumnView {...props} />, { wrappingComponent: TestProviders });
+
+    expect(props.onPinEvent).not.toHaveBeenCalled();
+
+    wrapper.find('[data-test-subj="pin"]').first().simulate('click');
+
+    expect(props.onPinEvent).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
index e7462188001e99..f1d45d5458554e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/event_column_view.tsx
@@ -4,29 +4,34 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import uuid from 'uuid';
+import { useSelector, shallowEqual } from 'react-redux';
 
-import {
-  EuiButtonIcon,
-  EuiToolTip,
-  EuiContextMenuPanel,
-  EuiPopover,
-  EuiContextMenuItem,
-} from '@elastic/eui';
-import styled from 'styled-components';
 import { TimelineNonEcsData, Ecs } from '../../../../../graphql/types';
-import { DEFAULT_ICON_BUTTON_WIDTH } from '../../helpers';
 import { Note } from '../../../../../common/lib/note';
 import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model';
 import { AssociateNote, UpdateNote } from '../../../notes/helpers';
 import { OnColumnResized, OnPinEvent, OnRowSelected, OnUnPinEvent } from '../../events';
-import { EventsTd, EventsTdContent, EventsTrData } from '../../styles';
+import { EventsTrData } from '../../styles';
 import { Actions } from '../actions';
 import { DataDrivenColumns } from '../data_driven_columns';
-import { eventHasNotes, getPinOnClick } from '../helpers';
+import {
+  eventHasNotes,
+  getEventType,
+  getPinOnClick,
+  InvestigateInResolverAction,
+} from '../helpers';
 import { ColumnRenderer } from '../renderers/column_renderer';
-import { useManageTimeline } from '../../../manage_timeline';
+import { AlertContextMenu } from '../../../../../detections/components/alerts_table/timeline_actions/alert_context_menu';
+import { InvestigateInTimelineAction } from '../../../../../detections/components/alerts_table/timeline_actions/investigate_in_timeline_action';
+import { AddEventNoteAction } from '../actions/add_note_icon_item';
+import { PinEventAction } from '../actions/pin_event_action';
+import { StoreState } from '../../../../../common/store/types';
+import { inputsModel } from '../../../../../common/store';
+import { TimelineId } from '../../../../../../common/types/timeline';
+
+import { TimelineModel } from '../../../../store/timeline/model';
 
 interface Props {
   id: string;
@@ -48,6 +53,7 @@ interface Props {
   onPinEvent: OnPinEvent;
   onRowSelected: OnRowSelected;
   onUnPinEvent: OnUnPinEvent;
+  refetch: inputsModel.Refetch;
   selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
   showCheckboxes: boolean;
   showNotes: boolean;
@@ -81,6 +87,7 @@ export const EventColumnView = React.memo<Props>(
     onPinEvent,
     onRowSelected,
     onUnPinEvent,
+    refetch,
     selectedEventIds,
     showCheckboxes,
     showNotes,
@@ -88,114 +95,10 @@ export const EventColumnView = React.memo<Props>(
     toggleShowNotes,
     updateNote,
   }) => {
-    const { getManageTimelineById } = useManageTimeline();
-    const timelineActions = useMemo(
-      () => getManageTimelineById(timelineId).timelineRowActions({ nonEcsData: data, ecsData }),
-      [data, ecsData, getManageTimelineById, timelineId]
+    const { timelineType, status } = useSelector<StoreState, TimelineModel>(
+      (state) => state.timeline.timelineById[timelineId],
+      shallowEqual
     );
-    const [isPopoverOpen, setPopover] = useState(false);
-
-    const onButtonClick = useCallback(() => {
-      setPopover(!isPopoverOpen);
-    }, [isPopoverOpen]);
-
-    const closePopover = useCallback(() => {
-      setPopover(false);
-    }, []);
-
-    const button = (
-      <EuiButtonIcon
-        aria-label="context menu"
-        data-test-subj="timeline-context-menu-button"
-        size="s"
-        iconType="boxesHorizontal"
-        onClick={onButtonClick}
-      />
-    );
-
-    const onClickCb = useCallback((cb: () => void) => {
-      cb();
-      closePopover();
-      // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
-    const additionalActions = useMemo<JSX.Element[]>(() => {
-      const grouped = timelineActions.reduce(
-        (
-          acc: {
-            contextMenu: JSX.Element[];
-            icon: JSX.Element[];
-          },
-          action
-        ) => {
-          if (action.displayType === 'icon') {
-            return {
-              ...acc,
-              icon: [
-                ...acc.icon,
-                <EventsTd key={action.id}>
-                  <EventsTdContent textAlign="center" width={action.width}>
-                    <EuiToolTip
-                      data-test-subj={`${action.dataTestSubj}-tool-tip`}
-                      content={action.content}
-                    >
-                      <EuiButtonIcon
-                        aria-label={action.ariaLabel}
-                        data-test-subj={`${action.dataTestSubj}-button`}
-                        iconType={action.iconType}
-                        isDisabled={
-                          action.isActionDisabled != null ? action.isActionDisabled(ecsData) : false
-                        }
-                        onClick={() => action.onClick({ eventId: id, ecsData, data })}
-                      />
-                    </EuiToolTip>
-                  </EventsTdContent>
-                </EventsTd>,
-              ],
-            };
-          }
-          return {
-            ...acc,
-            contextMenu: [
-              ...acc.contextMenu,
-              <EuiContextMenuItem
-                aria-label={action.ariaLabel}
-                data-test-subj={action.dataTestSubj}
-                disabled={
-                  action.isActionDisabled != null ? action.isActionDisabled(ecsData) : false
-                }
-                icon={action.iconType}
-                key={action.id}
-                onClick={() => onClickCb(() => action.onClick({ eventId: id, ecsData, data }))}
-              >
-                {action.content}
-              </EuiContextMenuItem>,
-            ],
-          };
-        },
-        { icon: [], contextMenu: [] }
-      );
-      return grouped.contextMenu.length > 0
-        ? [
-            ...grouped.icon,
-            <EventsTd key="actions-context-menu">
-              <EventsTdContent textAlign="center" width={DEFAULT_ICON_BUTTON_WIDTH}>
-                <EuiPopover
-                  id="singlePanel"
-                  button={button}
-                  isOpen={isPopoverOpen}
-                  closePopover={closePopover}
-                  panelPaddingSize="none"
-                  anchorPosition="downLeft"
-                  repositionOnScroll
-                >
-                  <ContextMenuPanel items={grouped.contextMenu} />
-                </EuiPopover>
-              </EventsTdContent>
-            </EventsTd>,
-          ]
-        : grouped.icon;
-    }, [button, closePopover, id, onClickCb, data, ecsData, timelineActions, isPopoverOpen]);
 
     const handlePinClicked = useCallback(
       () =>
@@ -209,29 +112,90 @@ export const EventColumnView = React.memo<Props>(
       [eventIdToNoteIds, id, isEventPinned, onPinEvent, onUnPinEvent]
     );
 
+    const eventType = getEventType(ecsData);
+
+    const additionalActions = useMemo<JSX.Element[]>(
+      () => [
+        <InvestigateInResolverAction
+          key="investigate-in-resolver"
+          timelineId={timelineId}
+          ecsData={ecsData}
+        />,
+        ...(timelineId !== TimelineId.active && eventType === 'signal'
+          ? [
+              <InvestigateInTimelineAction
+                key="investigate-in-timeline"
+                ecsRowData={ecsData}
+                nonEcsRowData={data}
+              />,
+            ]
+          : []),
+        ...(!isEventViewer
+          ? [
+              <AddEventNoteAction
+                key="add-event-note"
+                associateNote={associateNote}
+                getNotesByIds={getNotesByIds}
+                noteIds={eventIdToNoteIds[id] || emptyNotes}
+                showNotes={showNotes}
+                toggleShowNotes={toggleShowNotes}
+                updateNote={updateNote}
+                status={status}
+                timelineType={timelineType}
+              />,
+              <PinEventAction
+                key="pin-event"
+                onPinClicked={handlePinClicked}
+                noteIds={eventIdToNoteIds[id] || emptyNotes}
+                eventIsPinned={isEventPinned}
+                timelineType={timelineType}
+              />,
+            ]
+          : []),
+        <AlertContextMenu
+          key="alert-context-menu"
+          ecsRowData={ecsData}
+          nonEcsRowData={data}
+          timelineId={timelineId}
+          disabled={eventType !== 'signal'}
+          refetch={refetch}
+        />,
+      ],
+      [
+        associateNote,
+        data,
+        ecsData,
+        eventIdToNoteIds,
+        eventType,
+        getNotesByIds,
+        handlePinClicked,
+        id,
+        isEventPinned,
+        isEventViewer,
+        refetch,
+        showNotes,
+        status,
+        timelineId,
+        timelineType,
+        toggleShowNotes,
+        updateNote,
+      ]
+    );
+
     return (
       <EventsTrData data-test-subj="event-column-view">
         <Actions
           actionsColumnWidth={actionsColumnWidth}
           additionalActions={additionalActions}
-          associateNote={associateNote}
           checked={Object.keys(selectedEventIds).includes(id)}
           onRowSelected={onRowSelected}
           expanded={expanded}
           data-test-subj="actions"
           eventId={id}
-          eventIsPinned={isEventPinned}
-          getNotesByIds={getNotesByIds}
-          isEventViewer={isEventViewer}
           loading={loading}
           loadingEventIds={loadingEventIds}
-          noteIds={eventIdToNoteIds[id] || emptyNotes}
           onEventToggled={onEventToggled}
-          onPinClicked={handlePinClicked}
           showCheckboxes={showCheckboxes}
-          showNotes={showNotes}
-          toggleShowNotes={toggleShowNotes}
-          updateNote={updateNote}
         />
 
         <DataDrivenColumns
@@ -245,29 +209,7 @@ export const EventColumnView = React.memo<Props>(
         />
       </EventsTrData>
     );
-  },
-  (prevProps, nextProps) => {
-    return (
-      prevProps.id === nextProps.id &&
-      prevProps.actionsColumnWidth === nextProps.actionsColumnWidth &&
-      prevProps.columnHeaders === nextProps.columnHeaders &&
-      prevProps.columnRenderers === nextProps.columnRenderers &&
-      prevProps.data === nextProps.data &&
-      prevProps.eventIdToNoteIds === nextProps.eventIdToNoteIds &&
-      prevProps.expanded === nextProps.expanded &&
-      prevProps.loading === nextProps.loading &&
-      prevProps.loadingEventIds === nextProps.loadingEventIds &&
-      prevProps.isEventPinned === nextProps.isEventPinned &&
-      prevProps.onRowSelected === nextProps.onRowSelected &&
-      prevProps.selectedEventIds === nextProps.selectedEventIds &&
-      prevProps.showCheckboxes === nextProps.showCheckboxes &&
-      prevProps.showNotes === nextProps.showNotes &&
-      prevProps.timelineId === nextProps.timelineId
-    );
   }
 );
-const ContextMenuPanel = styled(EuiContextMenuPanel)`
-  font-size: ${({ theme }) => theme.eui.euiFontSizeS};
-`;
 
-ContextMenuPanel.displayName = 'ContextMenuPanel';
+EventColumnView.displayName = 'EventColumnView';
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
index ca7a64db58c957..64d55f8cf6c6a2 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/index.tsx
@@ -6,6 +6,7 @@
 
 import React from 'react';
 
+import { inputsModel } from '../../../../../common/store';
 import { BrowserFields, DocValueFields } from '../../../../../common/containers/source';
 import { TimelineItem, TimelineNonEcsData } from '../../../../../graphql/types';
 import { ColumnHeaderOptions } from '../../../../../timelines/store/timeline/model';
@@ -44,6 +45,7 @@ interface Props {
   onUpdateColumns: OnUpdateColumns;
   onUnPinEvent: OnUnPinEvent;
   pinnedEventIds: Readonly<Record<string, boolean>>;
+  refetch: inputsModel.Refetch;
   rowRenderers: RowRenderer[];
   selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
   showCheckboxes: boolean;
@@ -71,6 +73,7 @@ const EventsComponent: React.FC<Props> = ({
   onUpdateColumns,
   onUnPinEvent,
   pinnedEventIds,
+  refetch,
   rowRenderers,
   selectedEventIds,
   showCheckboxes,
@@ -78,7 +81,7 @@ const EventsComponent: React.FC<Props> = ({
   updateNote,
 }) => (
   <EventsTbody data-test-subj="events">
-    {data.map((event, i) => (
+    {data.map((event) => (
       <StatefulEvent
         actionsColumnWidth={actionsColumnWidth}
         addNoteToEvent={addNoteToEvent}
@@ -100,6 +103,7 @@ const EventsComponent: React.FC<Props> = ({
         onRowSelected={onRowSelected}
         onUnPinEvent={onUnPinEvent}
         onUpdateColumns={onUpdateColumns}
+        refetch={refetch}
         rowRenderers={rowRenderers}
         selectedEventIds={selectedEventIds}
         showCheckboxes={showCheckboxes}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index 3236482e6bc273..c91fc473708e2f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -9,6 +9,7 @@ import { useSelector } from 'react-redux';
 import uuid from 'uuid';
 import VisibilitySensor from 'react-visibility-sensor';
 
+import { TimelineId } from '../../../../../../common/types/timeline';
 import { BrowserFields, DocValueFields } from '../../../../../common/containers/source';
 import { TimelineDetailsQuery } from '../../../../containers/details';
 import { TimelineItem, DetailItem, TimelineNonEcsData } from '../../../../../graphql/types';
@@ -33,7 +34,7 @@ import { getEventType } from '../helpers';
 import { NoteCards } from '../../../notes/note_cards';
 import { useEventDetailsWidthContext } from '../../../../../common/components/events_viewer/event_details_width_context';
 import { EventColumnView } from './event_column_view';
-import { StoreState } from '../../../../../common/store';
+import { inputsModel, StoreState } from '../../../../../common/store';
 
 interface Props {
   actionsColumnWidth: number;
@@ -55,6 +56,7 @@ interface Props {
   onUnPinEvent: OnUnPinEvent;
   onUpdateColumns: OnUpdateColumns;
   isEventPinned: boolean;
+  refetch: inputsModel.Refetch;
   rowRenderers: RowRenderer[];
   selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
   showCheckboxes: boolean;
@@ -121,6 +123,7 @@ const StatefulEventComponent: React.FC<Props> = ({
   onRowSelected,
   onUnPinEvent,
   onUpdateColumns,
+  refetch,
   rowRenderers,
   selectedEventIds,
   showCheckboxes,
@@ -130,9 +133,9 @@ const StatefulEventComponent: React.FC<Props> = ({
 }) => {
   const [expanded, setExpanded] = useState<{ [eventId: string]: boolean }>({});
   const [showNotes, setShowNotes] = useState<{ [eventId: string]: boolean }>({});
-  const timeline = useSelector<StoreState, TimelineModel>((state) => {
-    return state.timeline.timelineById['timeline-1'];
-  });
+  const { status: timelineStatus } = useSelector<StoreState, TimelineModel>(
+    (state) => state.timeline.timelineById[TimelineId.active]
+  );
   const divElement = useRef<HTMLDivElement | null>(null);
 
   const onToggleShowNotes = useCallback(() => {
@@ -206,6 +209,7 @@ const StatefulEventComponent: React.FC<Props> = ({
                     onPinEvent={onPinEvent}
                     onRowSelected={onRowSelected}
                     onUnPinEvent={onUnPinEvent}
+                    refetch={refetch}
                     selectedEventIds={selectedEventIds}
                     showCheckboxes={showCheckboxes}
                     showNotes={!!showNotes[event._id]}
@@ -226,7 +230,7 @@ const StatefulEventComponent: React.FC<Props> = ({
                         getNotesByIds={getNotesByIds}
                         noteIds={eventIdToNoteIds[event._id] || emptyNotes}
                         showAddNote={!!showNotes[event._id]}
-                        status={timeline.status}
+                        status={timelineStatus}
                         toggleShowAddNote={onToggleShowNotes}
                         updateNote={updateNote}
                       />
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx
similarity index 67%
rename from x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts
rename to x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx
index b62888fbf84272..5753efa2bf1bb4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/helpers.tsx
@@ -4,16 +4,15 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import React, { useCallback, useMemo } from 'react';
 import { get, isEmpty } from 'lodash/fp';
-import { Dispatch } from 'redux';
+import { useDispatch } from 'react-redux';
 
 import { Ecs, TimelineItem, TimelineNonEcsData } from '../../../../graphql/types';
-import { DEFAULT_ICON_BUTTON_WIDTH } from '../helpers';
 import { updateTimelineGraphEventId } from '../../../store/timeline/actions';
-import { EventType } from '../../../../timelines/store/timeline/model';
+import { EventType } from '../../../store/timeline/model';
 import { OnPinEvent, OnUnPinEvent } from '../events';
-
-import { TimelineRowAction, TimelineRowActionOnClick } from './actions';
+import { ActionIconItem } from './actions/action_icon_item';
 
 import * as i18n from './translations';
 import { TimelineTypeLiteral, TimelineType } from '../../../../../common/types/timeline';
@@ -89,8 +88,8 @@ export const getEventIdToDataMapping = (
   timelineData: TimelineItem[],
   eventIds: string[],
   fieldsToKeep: string[]
-): Record<string, TimelineNonEcsData[]> => {
-  return timelineData.reduce((acc, v) => {
+): Record<string, TimelineNonEcsData[]> =>
+  timelineData.reduce((acc, v) => {
     const fvm = eventIds.includes(v._id)
       ? { [v._id]: v.data.filter((ti) => fieldsToKeep.includes(ti.field)) }
       : {};
@@ -99,7 +98,6 @@ export const getEventIdToDataMapping = (
       ...fvm,
     };
   }, {});
-};
 
 /** Return eventType raw or signal */
 export const getEventType = (event: Ecs): Omit<EventType, 'all'> => {
@@ -109,29 +107,40 @@ export const getEventType = (event: Ecs): Omit<EventType, 'all'> => {
   return 'raw';
 };
 
-export const isInvestigateInResolverActionEnabled = (ecsData?: Ecs) => {
+export const isInvestigateInResolverActionEnabled = (ecsData?: Ecs) =>
+  get(['agent', 'type', 0], ecsData) === 'endpoint' &&
+  get(['process', 'entity_id'], ecsData)?.length === 1 &&
+  get(['process', 'entity_id', 0], ecsData) !== '';
+
+interface InvestigateInResolverActionProps {
+  timelineId: string;
+  ecsData: Ecs;
+}
+
+const InvestigateInResolverActionComponent: React.FC<InvestigateInResolverActionProps> = ({
+  timelineId,
+  ecsData,
+}) => {
+  const dispatch = useDispatch();
+  const isDisabled = useMemo(() => !isInvestigateInResolverActionEnabled(ecsData), [ecsData]);
+  const handleClick = useCallback(
+    () => dispatch(updateTimelineGraphEventId({ id: timelineId, graphEventId: ecsData._id })),
+    [dispatch, ecsData._id, timelineId]
+  );
+
   return (
-    get(['agent', 'type', 0], ecsData) === 'endpoint' &&
-    get(['process', 'entity_id'], ecsData)?.length === 1 &&
-    get(['process', 'entity_id', 0], ecsData) !== ''
+    <ActionIconItem
+      ariaLabel={i18n.ACTION_INVESTIGATE_IN_RESOLVER}
+      content={i18n.ACTION_INVESTIGATE_IN_RESOLVER}
+      dataTestSubj="investigate-in-resolver"
+      iconType="node"
+      id="investigateInResolver"
+      isDisabled={isDisabled}
+      onClick={handleClick}
+    />
   );
 };
 
-export const getInvestigateInResolverAction = ({
-  dispatch,
-  timelineId,
-}: {
-  dispatch: Dispatch;
-  timelineId: string;
-}): TimelineRowAction => ({
-  ariaLabel: i18n.ACTION_INVESTIGATE_IN_RESOLVER,
-  content: i18n.ACTION_INVESTIGATE_IN_RESOLVER,
-  dataTestSubj: 'investigate-in-resolver',
-  displayType: 'icon',
-  iconType: 'node',
-  id: 'investigateInResolver',
-  isActionDisabled: (ecsData?: Ecs) => !isInvestigateInResolverActionEnabled(ecsData),
-  onClick: ({ eventId }: TimelineRowActionOnClick) =>
-    dispatch(updateTimelineGraphEventId({ id: timelineId, graphEventId: eventId })),
-  width: DEFAULT_ICON_BUTTON_WIDTH,
-});
+InvestigateInResolverActionComponent.displayName = 'InvestigateInResolverActionComponent';
+
+export const InvestigateInResolverAction = React.memo(InvestigateInResolverActionComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
index 4eac5360321c14..657e1617e8d24e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.test.tsx
@@ -64,7 +64,6 @@ describe('Body', () => {
     data: mockTimelineData,
     docValueFields: [],
     eventIdToNoteIds: {},
-    id: 'timeline-test',
     isSelectAllChecked: false,
     getNotesByIds: mockGetNotesByIds,
     loadingEventIds: [],
@@ -78,11 +77,13 @@ describe('Body', () => {
     onUnPinEvent: jest.fn(),
     onUpdateColumns: jest.fn(),
     pinnedEventIds: {},
+    refetch: jest.fn(),
     rowRenderers,
     selectedEventIds: {},
     show: true,
     sort: mockSort,
     showCheckboxes: false,
+    timelineId: 'timeline-test',
     timelineType: TimelineType.default,
     toggleColumn: jest.fn(),
     updateNote: jest.fn(),
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
index 6f578ffe3e9568..40cc12afde51dc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
@@ -6,10 +6,11 @@
 
 import React, { useMemo, useRef } from 'react';
 
+import { inputsModel } from '../../../../common/store';
 import { BrowserFields, DocValueFields } from '../../../../common/containers/source';
 import { TimelineItem, TimelineNonEcsData } from '../../../../graphql/types';
 import { Note } from '../../../../common/lib/note';
-import { ColumnHeaderOptions } from '../../../../timelines/store/timeline/model';
+import { ColumnHeaderOptions, EventType } from '../../../../timelines/store/timeline/model';
 import { AddNoteToEvent, UpdateNote } from '../../notes/helpers';
 import {
   OnColumnRemoved,
@@ -42,10 +43,10 @@ export interface BodyProps {
   docValueFields: DocValueFields[];
   getNotesByIds: (noteIds: string[]) => Note[];
   graphEventId?: string;
-  id: string;
   isEventViewer?: boolean;
   isSelectAllChecked: boolean;
   eventIdToNoteIds: Readonly<Record<string, string[]>>;
+  eventType?: EventType;
   loadingEventIds: Readonly<string[]>;
   onColumnRemoved: OnColumnRemoved;
   onColumnResized: OnColumnResized;
@@ -57,18 +58,23 @@ export interface BodyProps {
   onUpdateColumns: OnUpdateColumns;
   onUnPinEvent: OnUnPinEvent;
   pinnedEventIds: Readonly<Record<string, boolean>>;
+  refetch: inputsModel.Refetch;
   rowRenderers: RowRenderer[];
   selectedEventIds: Readonly<Record<string, TimelineNonEcsData[]>>;
   show: boolean;
   showCheckboxes: boolean;
   sort: Sort;
+  timelineId: string;
   timelineType: TimelineType;
   toggleColumn: (column: ColumnHeaderOptions) => void;
   updateNote: UpdateNote;
 }
 
-export const hasAdditonalActions = (id: string): boolean =>
-  id === TimelineId.detectionsPage || id === TimelineId.detectionsRulesDetailsPage;
+export const hasAdditionalActions = (id: string, eventType?: EventType): boolean =>
+  id === TimelineId.detectionsPage ||
+  id === TimelineId.detectionsRulesDetailsPage ||
+  ((id === TimelineId.active && eventType && ['all', 'signal', 'alert'].includes(eventType)) ??
+    false);
 
 const EXTRA_WIDTH = 4; // px
 
@@ -82,9 +88,9 @@ export const Body = React.memo<BodyProps>(
     data,
     docValueFields,
     eventIdToNoteIds,
+    eventType,
     getNotesByIds,
     graphEventId,
-    id,
     isEventViewer = false,
     isSelectAllChecked,
     loadingEventIds,
@@ -99,11 +105,13 @@ export const Body = React.memo<BodyProps>(
     onUnPinEvent,
     pinnedEventIds,
     rowRenderers,
+    refetch,
     selectedEventIds,
     show,
     showCheckboxes,
     sort,
     toggleColumn,
+    timelineId,
     timelineType,
     updateNote,
   }) => {
@@ -113,9 +121,9 @@ export const Body = React.memo<BodyProps>(
         getActionsColumnWidth(
           isEventViewer,
           showCheckboxes,
-          hasAdditonalActions(id) ? DEFAULT_ICON_BUTTON_WIDTH + EXTRA_WIDTH : 0
+          hasAdditionalActions(timelineId, eventType) ? DEFAULT_ICON_BUTTON_WIDTH + EXTRA_WIDTH : 0
         ),
-      [isEventViewer, showCheckboxes, id]
+      [isEventViewer, showCheckboxes, timelineId, eventType]
     );
 
     const columnWidths = useMemo(
@@ -127,11 +135,15 @@ export const Body = React.memo<BodyProps>(
     return (
       <>
         {graphEventId && (
-          <GraphOverlay graphEventId={graphEventId} timelineId={id} timelineType={timelineType} />
+          <GraphOverlay
+            graphEventId={graphEventId}
+            timelineId={timelineId}
+            timelineType={timelineType}
+          />
         )}
         <TimelineBody
           data-test-subj="timeline-body"
-          data-timeline-id={id}
+          data-timeline-id={timelineId}
           ref={containerElementRef}
           visible={show && !graphEventId}
         >
@@ -151,7 +163,7 @@ export const Body = React.memo<BodyProps>(
               showEventsSelect={false}
               showSelectAllCheckbox={showCheckboxes}
               sort={sort}
-              timelineId={id}
+              timelineId={timelineId}
               toggleColumn={toggleColumn}
             />
 
@@ -166,7 +178,7 @@ export const Body = React.memo<BodyProps>(
               docValueFields={docValueFields}
               eventIdToNoteIds={eventIdToNoteIds}
               getNotesByIds={getNotesByIds}
-              id={id}
+              id={timelineId}
               isEventViewer={isEventViewer}
               loadingEventIds={loadingEventIds}
               onColumnResized={onColumnResized}
@@ -175,6 +187,7 @@ export const Body = React.memo<BodyProps>(
               onUpdateColumns={onUpdateColumns}
               onUnPinEvent={onUnPinEvent}
               pinnedEventIds={pinnedEventIds}
+              refetch={refetch}
               rowRenderers={rowRenderers}
               selectedEventIds={selectedEventIds}
               showCheckboxes={showCheckboxes}
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 8deda03ece70eb..9b7b896a2ec691 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
@@ -14,7 +14,7 @@ import { RowRendererId, TimelineId } from '../../../../../common/types/timeline'
 import { BrowserFields, DocValueFields } from '../../../../common/containers/source';
 import { TimelineItem } from '../../../../graphql/types';
 import { Note } from '../../../../common/lib/note';
-import { appSelectors, State } from '../../../../common/store';
+import { appSelectors, inputsModel, State } from '../../../../common/store';
 import { appActions } from '../../../../common/store/actions';
 import { useManageTimeline } from '../../manage_timeline';
 import { ColumnHeaderOptions, TimelineModel } from '../../../store/timeline/model';
@@ -46,6 +46,7 @@ interface OwnProps {
   isEventViewer?: boolean;
   sort: Sort;
   toggleColumn: (column: ColumnHeaderOptions) => void;
+  refetch: inputsModel.Refetch;
 }
 
 type StatefulBodyComponentProps = OwnProps & PropsFromRedux;
@@ -61,6 +62,7 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     data,
     docValueFields,
     eventIdToNoteIds,
+    eventType,
     excludedRowRendererIds,
     id,
     isEventViewer = false,
@@ -76,6 +78,7 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     show,
     showCheckboxes,
     graphEventId,
+    refetch,
     sort,
     timelineType,
     toggleColumn,
@@ -195,9 +198,9 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
         data={data}
         docValueFields={docValueFields}
         eventIdToNoteIds={eventIdToNoteIds}
+        eventType={eventType}
         getNotesByIds={getNotesByIds}
         graphEventId={graphEventId}
-        id={id}
         isEventViewer={isEventViewer}
         isSelectAllChecked={isSelectAllChecked}
         loadingEventIds={loadingEventIds}
@@ -211,11 +214,13 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
         onUnPinEvent={onUnPinEvent}
         onUpdateColumns={onUpdateColumns}
         pinnedEventIds={pinnedEventIds}
+        refetch={refetch}
         rowRenderers={enabledRowRenderers}
         selectedEventIds={selectedEventIds}
         show={id === TimelineId.active ? show : true}
         showCheckboxes={showCheckboxes}
         sort={sort}
+        timelineId={id}
         timelineType={timelineType}
         toggleColumn={toggleColumn}
         updateNote={onUpdateNote}
@@ -229,6 +234,7 @@ const StatefulBodyComponent = React.memo<StatefulBodyComponentProps>(
     deepEqual(prevProps.excludedRowRendererIds, nextProps.excludedRowRendererIds) &&
     deepEqual(prevProps.docValueFields, nextProps.docValueFields) &&
     prevProps.eventIdToNoteIds === nextProps.eventIdToNoteIds &&
+    prevProps.eventType === nextProps.eventType &&
     prevProps.graphEventId === nextProps.graphEventId &&
     deepEqual(prevProps.notesById, nextProps.notesById) &&
     prevProps.id === nextProps.id &&
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 8f18a173f3beda..4ab05af5dd6d46 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
@@ -331,26 +331,23 @@ const LargeNotesButton = React.memo<LargeNotesButtonProps>(({ noteIds, text, tog
 LargeNotesButton.displayName = 'LargeNotesButton';
 
 interface SmallNotesButtonProps {
-  noteIds: string[];
   toggleShowNotes: () => void;
   timelineType: TimelineTypeLiteral;
 }
 
-const SmallNotesButton = React.memo<SmallNotesButtonProps>(
-  ({ noteIds, toggleShowNotes, timelineType }) => {
-    const isTemplate = timelineType === TimelineType.template;
-
-    return (
-      <EuiButtonIcon
-        aria-label={i18n.NOTES}
-        data-test-subj="timeline-notes-button-small"
-        iconType="editorComment"
-        onClick={() => toggleShowNotes()}
-        isDisabled={isTemplate}
-      />
-    );
-  }
-);
+const SmallNotesButton = React.memo<SmallNotesButtonProps>(({ toggleShowNotes, timelineType }) => {
+  const isTemplate = timelineType === TimelineType.template;
+
+  return (
+    <EuiButtonIcon
+      aria-label={i18n.NOTES}
+      data-test-subj="timeline-notes-button-small"
+      iconType="editorComment"
+      onClick={() => toggleShowNotes()}
+      isDisabled={isTemplate}
+    />
+  );
+});
 SmallNotesButton.displayName = 'SmallNotesButton';
 
 /**
@@ -375,11 +372,7 @@ const NotesButtonComponent = React.memo<NotesButtonProps>(
         {size === 'l' ? (
           <LargeNotesButton noteIds={noteIds} text={text} toggleShowNotes={toggleShowNotes} />
         ) : (
-          <SmallNotesButton
-            noteIds={noteIds}
-            toggleShowNotes={toggleShowNotes}
-            timelineType={timelineType}
-          />
+          <SmallNotesButton toggleShowNotes={toggleShowNotes} timelineType={timelineType} />
         )}
         {size === 'l' && showNotes ? (
           <EuiOverlayMask>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.tsx
index e88ecee81d364f..b5aadaa6f1ef8e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/properties/new_template_timeline.tsx
@@ -6,7 +6,7 @@
 
 import React from 'react';
 
-import { TimelineType } from '../../../../../common/types/timeline';
+import { TimelineId, TimelineType } from '../../../../../common/types/timeline';
 
 import { useKibana } from '../../../../common/lib/kibana';
 import { useCreateTimelineButton } from './use_create_timeline';
@@ -22,7 +22,7 @@ export const NewTemplateTimelineComponent: React.FC<OwnProps> = ({
   closeGearMenu,
   outline,
   title,
-  timelineId = 'timeline-1',
+  timelineId = TimelineId.active,
 }) => {
   const uiCapabilities = useKibana().services.application.capabilities;
   const capabilitiesCanUserCRUD: boolean = !!uiCapabilities.siem.crud;
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
index a2ee1e56306b53..7b1c1bd2119cd3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/timeline.tsx
@@ -7,7 +7,6 @@
 import { EuiFlyoutHeader, EuiFlyoutBody, EuiFlyoutFooter, EuiProgress } from '@elastic/eui';
 import { getOr, isEmpty } from 'lodash/fp';
 import React, { useState, useMemo, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
 import { FlyoutHeaderWithCloseButton } from '../flyout/header_with_close_button';
@@ -17,7 +16,6 @@ import { Direction } from '../../../graphql/types';
 import { useKibana } from '../../../common/lib/kibana';
 import { ColumnHeaderOptions, KqlMode, EventType } from '../../../timelines/store/timeline/model';
 import { defaultHeaders } from './body/column_headers/default_headers';
-import { getInvestigateInResolverAction } from './body/helpers';
 import { Sort } from './body/sort';
 import { StatefulBody } from './body/stateful_body';
 import { DataProvider } from './data_providers/data_provider';
@@ -43,6 +41,7 @@ import {
 } from '../../../../../../../src/plugins/data/public';
 import { useManageTimeline } from '../manage_timeline';
 import { TimelineType, TimelineStatusLiteral } from '../../../../common/types/timeline';
+import { requiredFieldsForActions } from '../../../detections/components/alerts_table/default_config';
 
 const TimelineContainer = styled.div`
   height: 100%;
@@ -168,7 +167,6 @@ export const TimelineComponent: React.FC<Props> = ({
   toggleColumn,
   usersViewing,
 }) => {
-  const dispatch = useDispatch();
   const kibana = useKibana();
   const [filterManager] = useState<FilterManager>(new FilterManager(kibana.services.uiSettings));
   const esQueryConfig = useMemo(() => esQuery.getEsQueryConfig(kibana.services.uiSettings), [
@@ -213,7 +211,10 @@ export const TimelineComponent: React.FC<Props> = ({
     [isLoadingSource, combinedQueries, start, end]
   );
   const columnsHeader = isEmpty(columns) ? defaultHeaders : columns;
-  const timelineQueryFields = useMemo(() => columnsHeader.map((c) => c.id), [columnsHeader]);
+  const timelineQueryFields = useMemo(() => {
+    const columnFields = columnsHeader.map((c) => c.id);
+    return [...columnFields, ...requiredFieldsForActions];
+  }, [columnsHeader]);
   const timelineQuerySortField = useMemo(
     () => ({
       sortFieldId: sort.columnId,
@@ -228,7 +229,6 @@ export const TimelineComponent: React.FC<Props> = ({
       filterManager,
       id,
       indexToAdd,
-      timelineRowActions: () => [getInvestigateInResolverAction({ dispatch, timelineId: id })],
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -317,6 +317,7 @@ export const TimelineComponent: React.FC<Props> = ({
                     data={events}
                     docValueFields={docValueFields}
                     id={id}
+                    refetch={refetch}
                     sort={sort}
                     toggleColumn={toggleColumn}
                   />
diff --git a/x-pack/plugins/security_solution/public/timelines/containers/index.gql_query.ts b/x-pack/plugins/security_solution/public/timelines/containers/index.gql_query.ts
index 5a162fd2206a1b..c67ad45bede94a 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/index.gql_query.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/index.gql_query.ts
@@ -200,6 +200,7 @@ export const timelineQuery = gql`
                 country_iso_code
               }
               signal {
+                status
                 original_time
                 rule {
                   id
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 1d2e16b3fe5b8b..79d0f909c7d592 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
@@ -9,7 +9,7 @@ import React, { useCallback, useState } from 'react';
 import styled from 'styled-components';
 import { useParams } from 'react-router-dom';
 
-import { TimelineType } from '../../../common/types/timeline';
+import { TimelineId, TimelineType } from '../../../common/types/timeline';
 import { HeaderPage } from '../../common/components/header_page';
 import { WrapperPage } from '../../common/components/wrapper_page';
 import { useKibana } from '../../common/lib/kibana';
@@ -65,7 +65,7 @@ export const TimelinesPageComponent: React.FC = () => {
                 {tabName === TimelineType.default ? (
                   <EuiFlexItem>
                     <NewTimeline
-                      timelineId="timeline-1"
+                      timelineId={TimelineId.active}
                       outline={true}
                       data-test-subj="create-default-btn"
                     />
diff --git a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
index 06dd6f44bea94a..8c3f30c75c35b7 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/store/timeline/epic_local_storage.test.tsx
@@ -42,7 +42,7 @@ import { Direction } from '../../../graphql/types';
 
 import { addTimelineInStorage } from '../../containers/local_storage';
 import { isPageTimeline } from './epic_local_storage';
-import { TimelineStatus, TimelineType } from '../../../../common/types/timeline';
+import { TimelineId, TimelineStatus, TimelineType } from '../../../../common/types/timeline';
 
 jest.mock('../../containers/local_storage');
 
@@ -115,7 +115,7 @@ describe('epicLocalStorage', () => {
   });
 
   it('filters correctly page timelines', () => {
-    expect(isPageTimeline('timeline-1')).toBe(false);
+    expect(isPageTimeline(TimelineId.active)).toBe(false);
     expect(isPageTimeline('hosts-page-alerts')).toBe(true);
   });
 
diff --git a/x-pack/plugins/security_solution/server/graphql/ecs/schema.gql.ts b/x-pack/plugins/security_solution/server/graphql/ecs/schema.gql.ts
index bdc69f85d35429..60c2ce8ceca64f 100644
--- a/x-pack/plugins/security_solution/server/graphql/ecs/schema.gql.ts
+++ b/x-pack/plugins/security_solution/server/graphql/ecs/schema.gql.ts
@@ -424,6 +424,7 @@ export const ecsSchema = gql`
   type SignalField {
     rule: RuleField
     original_time: ToStringArray
+    status: ToStringArray
   }
 
   type RuleEcsField {
diff --git a/x-pack/plugins/security_solution/server/graphql/types.ts b/x-pack/plugins/security_solution/server/graphql/types.ts
index fa55af351651e7..7638ebd03f6b16 100644
--- a/x-pack/plugins/security_solution/server/graphql/types.ts
+++ b/x-pack/plugins/security_solution/server/graphql/types.ts
@@ -1022,6 +1022,8 @@ export interface SignalField {
   rule?: Maybe<RuleField>;
 
   original_time?: Maybe<string[] | string>;
+
+  status?: Maybe<string[] | string>;
 }
 
 export interface RuleField {
@@ -4930,6 +4932,8 @@ export namespace SignalFieldResolvers {
     rule?: RuleResolver<Maybe<RuleField>, TypeParent, TContext>;
 
     original_time?: OriginalTimeResolver<Maybe<string[] | string>, TypeParent, TContext>;
+
+    status?: StatusResolver<Maybe<string[] | string>, TypeParent, TContext>;
   }
 
   export type RuleResolver<
@@ -4942,6 +4946,11 @@ export namespace SignalFieldResolvers {
     Parent = SignalField,
     TContext = SiemContext
   > = Resolver<R, Parent, TContext>;
+  export type StatusResolver<
+    R = Maybe<string[] | string>,
+    Parent = SignalField,
+    TContext = SiemContext
+  > = Resolver<R, Parent, TContext>;
 }
 
 export namespace RuleFieldResolvers {
diff --git a/x-pack/plugins/security_solution/server/lib/ecs_fields/index.ts b/x-pack/plugins/security_solution/server/lib/ecs_fields/index.ts
index 19b16bd4bc6d24..d1c8290b3462d7 100644
--- a/x-pack/plugins/security_solution/server/lib/ecs_fields/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/ecs_fields/index.ts
@@ -324,6 +324,7 @@ export const signalFieldsMap: Readonly<Record<string, string>> = {
   'signal.rule.note': 'signal.rule.note',
   'signal.rule.threshold': 'signal.rule.threshold',
   'signal.rule.exceptions_list': 'signal.rule.exceptions_list',
+  'signal.status': 'signal.status',
 };
 
 export const ruleFieldsMap: Readonly<Record<string, string>> = {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts
index 245146dda183fe..90d5b538a52000 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/import_timelines.ts
@@ -5,7 +5,7 @@
  */
 
 import { omit } from 'lodash/fp';
-import { TimelineType, TimelineStatus } from '../../../../../common/types/timeline';
+import { TimelineId, TimelineType, TimelineStatus } from '../../../../../common/types/timeline';
 
 export const mockDuplicateIdErrors = [];
 
@@ -332,8 +332,7 @@ export const mockCheckTimelinesStatusBeforeInstallResult = {
             value: '3c322ed995865f642c1a269d54cbd177bd4b0e6efcf15a589f4f8582efbe7509',
             operator: ':',
           },
-          id:
-            'send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-signal-id-3c322ed995865f642c1a269d54cbd177bd4b0e6efcf15a589f4f8582efbe7509',
+          id: `send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-signal-id-3c322ed995865f642c1a269d54cbd177bd4b0e6efcf15a589f4f8582efbe7509`,
           enabled: true,
         },
       ],
@@ -496,8 +495,7 @@ export const mockCheckTimelinesStatusBeforeInstallResult = {
             value: '30d47c8a1b179ae435058e5b23b96118125a451fe58efd77be288f00456ff77d',
             operator: ':',
           },
-          id:
-            'send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-signal-id-30d47c8a1b179ae435058e5b23b96118125a451fe58efd77be288f00456ff77d',
+          id: `send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-signal-id-30d47c8a1b179ae435058e5b23b96118125a451fe58efd77be288f00456ff77d`,
           enabled: true,
         },
       ],
@@ -675,8 +673,7 @@ export const mockCheckTimelinesStatusBeforeInstallResult = {
             value: '590eb946a7fdbacaa587ed0f6b1a16f5ad3d659ec47ef35ad0826c47af133bde',
             operator: ':',
           },
-          id:
-            'send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-signal-id-590eb946a7fdbacaa587ed0f6b1a16f5ad3d659ec47ef35ad0826c47af133bde',
+          id: `send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-signal-id-590eb946a7fdbacaa587ed0f6b1a16f5ad3d659ec47ef35ad0826c47af133bde`,
           enabled: true,
         },
       ],
@@ -848,8 +845,7 @@ export const mockCheckTimelinesStatusAfterInstallResult = {
             value: '30d47c8a1b179ae435058e5b23b96118125a451fe58efd77be288f00456ff77d',
             operator: ':',
           },
-          id:
-            'send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-signal-id-30d47c8a1b179ae435058e5b23b96118125a451fe58efd77be288f00456ff77d',
+          id: `send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-signal-id-30d47c8a1b179ae435058e5b23b96118125a451fe58efd77be288f00456ff77d`,
           enabled: true,
         },
       ],
@@ -1031,8 +1027,7 @@ export const mockCheckTimelinesStatusAfterInstallResult = {
             value: '590eb946a7fdbacaa587ed0f6b1a16f5ad3d659ec47ef35ad0826c47af133bde',
             operator: ':',
           },
-          id:
-            'send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-signal-id-590eb946a7fdbacaa587ed0f6b1a16f5ad3d659ec47ef35ad0826c47af133bde',
+          id: `send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-signal-id-590eb946a7fdbacaa587ed0f6b1a16f5ad3d659ec47ef35ad0826c47af133bde`,
           enabled: true,
         },
       ],
@@ -1152,8 +1147,7 @@ export const mockCheckTimelinesStatusAfterInstallResult = {
             value: '3c322ed995865f642c1a269d54cbd177bd4b0e6efcf15a589f4f8582efbe7509',
             operator: ':',
           },
-          id:
-            'send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-timeline-1-signal-id-3c322ed995865f642c1a269d54cbd177bd4b0e6efcf15a589f4f8582efbe7509',
+          id: `send-signal-to-timeline-action-default-draggable-event-details-value-formatted-field-value-${TimelineId.active}-signal-id-3c322ed995865f642c1a269d54cbd177bd4b0e6efcf15a589f4f8582efbe7509`,
           enabled: true,
         },
       ],

From 1c234bfd25124cfa2b7af5a47f7c595623f5dac9 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Tue, 1 Sep 2020 15:33:23 -0400
Subject: [PATCH 156/216] [SECURITY_SOLUTION][ENDPOINT] Trusted Apps Create API
 (#76178)

* Create Trusted App API
---
 .../common/endpoint/constants.ts              |   1 +
 .../endpoint/schema/trusted_apps.test.ts      | 178 +++++++++++++++++-
 .../common/endpoint/schema/trusted_apps.ts    |  17 ++
 .../common/endpoint/types/trusted_apps.ts     |  11 +-
 .../endpoint/routes/trusted_apps/handlers.ts  |  34 +++-
 .../endpoint/routes/trusted_apps/index.ts     |  22 ++-
 .../routes/trusted_apps/trusted_apps.test.ts  | 119 +++++++++++-
 .../endpoint/routes/trusted_apps/utils.ts     |  32 +++-
 8 files changed, 404 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts
index 507ce63c7b815f..b72a52f0a0eb72 100644
--- a/x-pack/plugins/security_solution/common/endpoint/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/constants.ts
@@ -13,3 +13,4 @@ export const LIMITED_CONCURRENCY_ENDPOINT_ROUTE_TAG = 'endpoint:limited-concurre
 export const LIMITED_CONCURRENCY_ENDPOINT_COUNT = 100;
 
 export const TRUSTED_APPS_LIST_API = '/api/endpoint/trusted_apps';
+export const TRUSTED_APPS_CREATE_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
index 7aec8e15c317ca..b0c769216732d2 100644
--- 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
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { GetTrustedAppsRequestSchema } from './trusted_apps';
+import { GetTrustedAppsRequestSchema, PostTrustedAppCreateRequestSchema } from './trusted_apps';
 
 describe('When invoking Trusted Apps Schema', () => {
   describe('for GET List', () => {
@@ -68,4 +68,180 @@ describe('When invoking Trusted Apps Schema', () => {
       });
     });
   });
+
+  describe('for POST Create', () => {
+    const getCreateTrustedAppItem = () => ({
+      name: 'Some Anti-Virus App',
+      description: 'this one is ok',
+      os: 'windows',
+      entries: [
+        {
+          field: 'path',
+          type: 'match',
+          operator: 'included',
+          value: 'c:/programs files/Anti-Virus',
+        },
+      ],
+    });
+    const body = PostTrustedAppCreateRequestSchema.body;
+
+    it('should not error on a valid message', () => {
+      const bodyMsg = getCreateTrustedAppItem();
+      expect(body.validate(bodyMsg)).toStrictEqual(bodyMsg);
+    });
+
+    it('should validate `name` is required', () => {
+      const bodyMsg = {
+        ...getCreateTrustedAppItem(),
+        name: undefined,
+      };
+      expect(() => body.validate(bodyMsg)).toThrow();
+    });
+
+    it('should validate `name` value to be non-empty', () => {
+      const bodyMsg = {
+        ...getCreateTrustedAppItem(),
+        name: '',
+      };
+      expect(() => body.validate(bodyMsg)).toThrow();
+    });
+
+    it('should validate `description` as optional', () => {
+      const { description, ...bodyMsg } = getCreateTrustedAppItem();
+      expect(body.validate(bodyMsg)).toStrictEqual(bodyMsg);
+    });
+
+    it('should validate `description` to be non-empty if defined', () => {
+      const bodyMsg = {
+        ...getCreateTrustedAppItem(),
+        description: '',
+      };
+      expect(() => body.validate(bodyMsg)).toThrow();
+    });
+
+    it('should validate `os` to to only accept known values', () => {
+      const bodyMsg = {
+        ...getCreateTrustedAppItem(),
+        os: undefined,
+      };
+      expect(() => body.validate(bodyMsg)).toThrow();
+
+      const bodyMsg2 = {
+        ...bodyMsg,
+        os: '',
+      };
+      expect(() => body.validate(bodyMsg2)).toThrow();
+
+      const bodyMsg3 = {
+        ...bodyMsg,
+        os: 'winz',
+      };
+      expect(() => body.validate(bodyMsg3)).toThrow();
+
+      ['linux', 'macos', 'windows'].forEach((os) => {
+        expect(() => {
+          body.validate({
+            ...bodyMsg,
+            os,
+          });
+        }).not.toThrow();
+      });
+    });
+
+    it('should validate `entries` as required', () => {
+      const bodyMsg = {
+        ...getCreateTrustedAppItem(),
+        entries: undefined,
+      };
+      expect(() => body.validate(bodyMsg)).toThrow();
+
+      const { entries, ...bodyMsg2 } = getCreateTrustedAppItem();
+      expect(() => body.validate(bodyMsg2)).toThrow();
+    });
+
+    it('should validate `entries` to have at least 1 item', () => {
+      const bodyMsg = {
+        ...getCreateTrustedAppItem(),
+        entries: [],
+      };
+      expect(() => body.validate(bodyMsg)).toThrow();
+    });
+
+    describe('when `entries` are defined', () => {
+      const getTrustedAppItemEntryItem = () => getCreateTrustedAppItem().entries[0];
+
+      it('should validate `entry.field` is required', () => {
+        const { field, ...entry } = getTrustedAppItemEntryItem();
+        const bodyMsg = {
+          ...getCreateTrustedAppItem(),
+          entries: [entry],
+        };
+        expect(() => body.validate(bodyMsg)).toThrow();
+      });
+
+      it('should validate `entry.field` is limited to known values', () => {
+        const bodyMsg = {
+          ...getCreateTrustedAppItem(),
+          entries: [
+            {
+              ...getTrustedAppItemEntryItem(),
+              field: '',
+            },
+          ],
+        };
+        expect(() => body.validate(bodyMsg)).toThrow();
+
+        const bodyMsg2 = {
+          ...getCreateTrustedAppItem(),
+          entries: [
+            {
+              ...getTrustedAppItemEntryItem(),
+              field: 'invalid value',
+            },
+          ],
+        };
+        expect(() => body.validate(bodyMsg2)).toThrow();
+
+        ['hash', 'path'].forEach((field) => {
+          const bodyMsg3 = {
+            ...getCreateTrustedAppItem(),
+            entries: [
+              {
+                ...getTrustedAppItemEntryItem(),
+                field,
+              },
+            ],
+          };
+
+          expect(() => body.validate(bodyMsg3)).not.toThrow();
+        });
+      });
+
+      it.todo('should validate `entry.type` is limited to known values');
+
+      it.todo('should validate `entry.operator` is limited to known values');
+
+      it('should validate `entry.value` required', () => {
+        const { value, ...entry } = getTrustedAppItemEntryItem();
+        const bodyMsg = {
+          ...getCreateTrustedAppItem(),
+          entries: [entry],
+        };
+        expect(() => body.validate(bodyMsg)).toThrow();
+      });
+
+      it('should validate `entry.value` is non-empty', () => {
+        const bodyMsg = {
+          ...getCreateTrustedAppItem(),
+          entries: [
+            {
+              ...getTrustedAppItemEntryItem(),
+              value: '',
+            },
+          ],
+        };
+        expect(() => body.validate(bodyMsg)).toThrow();
+      });
+    });
+  });
 });
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
index 20fab93aaf304a..7535b23a10e8af 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
@@ -12,3 +12,20 @@ export const GetTrustedAppsRequestSchema = {
     per_page: schema.maybe(schema.number({ defaultValue: 20, min: 1 })),
   }),
 };
+
+export const PostTrustedAppCreateRequestSchema = {
+  body: schema.object({
+    name: schema.string({ minLength: 1 }),
+    description: schema.maybe(schema.string({ minLength: 1 })),
+    os: schema.oneOf([schema.literal('linux'), schema.literal('macos'), schema.literal('windows')]),
+    entries: schema.arrayOf(
+      schema.object({
+        field: schema.oneOf([schema.literal('hash'), schema.literal('path')]),
+        type: schema.literal('match'),
+        operator: schema.literal('included'),
+        value: schema.string({ minLength: 1 }),
+      }),
+      { minSize: 1 }
+    ),
+  }),
+};
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
index 2905274bef1cb0..7aeb6c6024b993 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
@@ -5,7 +5,10 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { GetTrustedAppsRequestSchema } from '../schema/trusted_apps';
+import {
+  GetTrustedAppsRequestSchema,
+  PostTrustedAppCreateRequestSchema,
+} from '../schema/trusted_apps';
 
 /** API request params for retrieving a list of Trusted Apps */
 export type GetTrustedAppsListRequest = TypeOf<typeof GetTrustedAppsRequestSchema.query>;
@@ -16,6 +19,12 @@ export interface GetTrustedListAppsResponse {
   data: TrustedApp[];
 }
 
+/** API Request body for creating a new Trusted App entry */
+export type PostTrustedAppCreateRequest = TypeOf<typeof PostTrustedAppCreateRequestSchema.body>;
+export interface PostTrustedAppCreateResponse {
+  data: TrustedApp;
+}
+
 interface MacosLinuxConditionEntry {
   field: 'hash' | 'path';
   type: 'match';
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
index 6c29a2244c203d..977683ab55495a 100644
--- 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
@@ -8,9 +8,10 @@ import { RequestHandler } from 'kibana/server';
 import {
   GetTrustedAppsListRequest,
   GetTrustedListAppsResponse,
+  PostTrustedAppCreateRequest,
 } from '../../../../common/endpoint/types';
 import { EndpointAppContext } from '../../types';
-import { exceptionItemToTrustedAppItem } from './utils';
+import { exceptionItemToTrustedAppItem, newTrustedAppItemToExceptionItem } from './utils';
 import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../lists/common/constants';
 
 export const getTrustedAppsListRouteHandler = (
@@ -24,7 +25,7 @@ export const getTrustedAppsListRouteHandler = (
 
     try {
       // Ensure list is created if it does not exist
-      await exceptionsListService?.createTrustedAppsList();
+      await exceptionsListService.createTrustedAppsList();
       const results = await exceptionsListService.findExceptionListItem({
         listId: ENDPOINT_TRUSTED_APPS_LIST_ID,
         page,
@@ -47,3 +48,32 @@ export const getTrustedAppsListRouteHandler = (
     }
   };
 };
+
+export const getTrustedAppsCreateRouteHandler = (
+  endpointAppContext: EndpointAppContext
+): RequestHandler<undefined, undefined, PostTrustedAppCreateRequest> => {
+  const logger = endpointAppContext.logFactory.get('trusted_apps');
+
+  return async (constext, req, res) => {
+    const exceptionsListService = endpointAppContext.service.getExceptionsList();
+    const newTrustedApp = req.body;
+
+    try {
+      // Ensure list is created if it does not exist
+      await exceptionsListService.createTrustedAppsList();
+
+      const createdTrustedAppExceptionItem = await exceptionsListService.createExceptionListItem(
+        newTrustedAppItemToExceptionItem(newTrustedApp)
+      );
+
+      return res.ok({
+        body: {
+          data: exceptionItemToTrustedAppItem(createdTrustedAppExceptionItem),
+        },
+      });
+    } 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
index 178aa06eee8775..1302b10533ccf6 100644
--- 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
@@ -5,9 +5,15 @@
  */
 
 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 {
+  GetTrustedAppsRequestSchema,
+  PostTrustedAppCreateRequestSchema,
+} from '../../../../common/endpoint/schema/trusted_apps';
+import {
+  TRUSTED_APPS_CREATE_API,
+  TRUSTED_APPS_LIST_API,
+} from '../../../../common/endpoint/constants';
+import { getTrustedAppsCreateRouteHandler, getTrustedAppsListRouteHandler } from './handlers';
 import { EndpointAppContext } from '../../types';
 
 export const registerTrustedAppsRoutes = (
@@ -23,4 +29,14 @@ export const registerTrustedAppsRoutes = (
     },
     getTrustedAppsListRouteHandler(endpointAppContext)
   );
+
+  // CREATE
+  router.post(
+    {
+      path: TRUSTED_APPS_CREATE_API,
+      validate: PostTrustedAppCreateRequestSchema,
+      options: { authRequired: true },
+    },
+    getTrustedAppsCreateRouteHandler(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
index 1d4a7919b89f53..488c8390411b04 100644
--- 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
@@ -12,12 +12,20 @@ import {
 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 {
+  TRUSTED_APPS_CREATE_API,
+  TRUSTED_APPS_LIST_API,
+} from '../../../../common/endpoint/constants';
+import {
+  GetTrustedAppsListRequest,
+  PostTrustedAppCreateRequest,
+} 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';
+import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+import { ExceptionListItemSchema } from '../../../../../lists/common/schemas/response';
 
 describe('when invoking endpoint trusted apps route handlers', () => {
   let routerMock: jest.Mocked<IRouter>;
@@ -105,4 +113,111 @@ describe('when invoking endpoint trusted apps route handlers', () => {
       expect(endpointAppContext.logFactory.get('trusted_apps').error).toHaveBeenCalled();
     });
   });
+
+  describe('when creating a trusted app', () => {
+    let routeHandler: RequestHandler<undefined, PostTrustedAppCreateRequest>;
+    const createNewTrustedAppBody = (): PostTrustedAppCreateRequest => ({
+      name: 'Some Anti-Virus App',
+      description: 'this one is ok',
+      os: 'windows',
+      entries: [
+        {
+          field: 'path',
+          type: 'match',
+          operator: 'included',
+          value: 'c:/programs files/Anti-Virus',
+        },
+      ],
+    });
+    const createPostRequest = () => {
+      return httpServerMock.createKibanaRequest<undefined, PostTrustedAppCreateRequest>({
+        path: TRUSTED_APPS_LIST_API,
+        method: 'post',
+        body: createNewTrustedAppBody(),
+      });
+    };
+
+    beforeEach(() => {
+      // Get the registered POST handler from the IRouter instance
+      [, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
+        path.startsWith(TRUSTED_APPS_CREATE_API)
+      )!;
+
+      // Mock the impelementation of `createExceptionListItem()` so that the return value
+      // merges in the provided input
+      exceptionsListClient.createExceptionListItem.mockImplementation(async (newExceptionItem) => {
+        return ({
+          ...getExceptionListItemSchemaMock(),
+          ...newExceptionItem,
+        } as unknown) as ExceptionListItemSchema;
+      });
+    });
+
+    it('should create trusted app list first', async () => {
+      const request = createPostRequest();
+      await routeHandler(context, request, response);
+      expect(exceptionsListClient.createTrustedAppsList).toHaveBeenCalled();
+      expect(response.ok).toHaveBeenCalled();
+    });
+
+    it('should map new trusted app item to an exception list item', async () => {
+      const request = createPostRequest();
+      await routeHandler(context, request, response);
+      expect(exceptionsListClient.createExceptionListItem.mock.calls[0][0]).toEqual({
+        _tags: ['os:windows'],
+        comments: [],
+        description: 'this one is ok',
+        entries: [
+          {
+            field: 'path',
+            operator: 'included',
+            type: 'match',
+            value: 'c:/programs files/Anti-Virus',
+          },
+        ],
+        itemId: expect.stringMatching(/.*/),
+        listId: 'endpoint_trusted_apps',
+        meta: undefined,
+        name: 'Some Anti-Virus App',
+        namespaceType: 'agnostic',
+        tags: [],
+        type: 'simple',
+      });
+    });
+
+    it('should return new trusted app item', async () => {
+      const request = createPostRequest();
+      await routeHandler(context, request, response);
+      expect(response.ok.mock.calls[0][0]).toEqual({
+        body: {
+          data: {
+            created_at: '2020-04-20T15:25:31.830Z',
+            created_by: 'some user',
+            description: 'this one is ok',
+            entries: [
+              {
+                field: 'path',
+                operator: 'included',
+                type: 'match',
+                value: 'c:/programs files/Anti-Virus',
+              },
+            ],
+            id: '1',
+            name: 'Some Anti-Virus App',
+            os: 'windows',
+          },
+        },
+      });
+    });
+
+    it('should log unexpected error if one occurs', async () => {
+      exceptionsListClient.createExceptionListItem.mockImplementation(() => {
+        throw new Error('expected error for create');
+      });
+      const request = createPostRequest();
+      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
index 2b417a4c6a8e16..794c1db4b49aa8 100644
--- 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
@@ -4,8 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import uuid from 'uuid';
 import { ExceptionListItemSchema } from '../../../../../lists/common/shared_exports';
-import { TrustedApp } from '../../../../common/endpoint/types';
+import { NewTrustedApp, TrustedApp } from '../../../../common/endpoint/types';
+import { ExceptionListClient } from '../../../../../lists/server';
+import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../lists/common/constants';
+
+type NewExecptionItem = Parameters<ExceptionListClient['createExceptionListItem']>[0];
 
 /**
  * Map an ExcptionListItem to a TrustedApp item
@@ -40,3 +45,28 @@ const osFromTagsList = (tags: string[]): TrustedApp['os'] | 'unknown' => {
   }
   return 'unknown';
 };
+
+export const newTrustedAppItemToExceptionItem = ({
+  os,
+  entries,
+  name,
+  description = '',
+}: NewTrustedApp): NewExecptionItem => {
+  return {
+    _tags: tagsListFromOs(os),
+    comments: [],
+    description,
+    entries,
+    itemId: uuid.v4(),
+    listId: ENDPOINT_TRUSTED_APPS_LIST_ID,
+    meta: undefined,
+    name,
+    namespaceType: 'agnostic',
+    tags: [],
+    type: 'simple',
+  };
+};
+
+const tagsListFromOs = (os: NewTrustedApp['os']): NewExecptionItem['_tags'] => {
+  return [`os:${os}`];
+};

From 4705755b3b5bf2a1d303406091be1e572d6c751b Mon Sep 17 00:00:00 2001
From: Justin Kambic <justin.kambic@elastic.co>
Date: Tue, 1 Sep 2020 15:51:55 -0400
Subject: [PATCH 157/216] Delete unused file. (#76386)

---
 x-pack/plugins/uptime/public/breadcrumbs.ts | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 x-pack/plugins/uptime/public/breadcrumbs.ts

diff --git a/x-pack/plugins/uptime/public/breadcrumbs.ts b/x-pack/plugins/uptime/public/breadcrumbs.ts
deleted file mode 100644
index 41bc2aa2588073..00000000000000
--- a/x-pack/plugins/uptime/public/breadcrumbs.ts
+++ /dev/null
@@ -1,5 +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.
- */

From 2ed920021e83e9809b3697960a7be94d7c9918a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Louv-Jansen?= <sorenlouv@gmail.com>
Date: Tue, 1 Sep 2020 21:55:14 +0200
Subject: [PATCH 158/216] Create APM issue template (#76362)

---
 .github/ISSUE_TEMPLATE/APM.md | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/APM.md

diff --git a/.github/ISSUE_TEMPLATE/APM.md b/.github/ISSUE_TEMPLATE/APM.md
new file mode 100644
index 00000000000000..983806f70bc3fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/APM.md
@@ -0,0 +1,11 @@
+---
+name: APM Issue
+about: Issues related to the APM solution in Kibana
+labels: Team:apm
+title: [APM] 
+---
+
+**Versions**
+Kibana: (if relevant)
+APM Server: (if relevant)
+Elasticsearch: (if relevant)

From f6aa79853556e863e9323c26fc57fa2ef06da380 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Tue, 1 Sep 2020 15:50:29 -0500
Subject: [PATCH 159/216] remove dupe tinymath section (#76093)

---
 .../canvas/canvas-tinymath-functions.asciidoc | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/docs/canvas/canvas-tinymath-functions.asciidoc b/docs/canvas/canvas-tinymath-functions.asciidoc
index 73808fc6625d12..f92f7c642a2ee3 100644
--- a/docs/canvas/canvas-tinymath-functions.asciidoc
+++ b/docs/canvas/canvas-tinymath-functions.asciidoc
@@ -492,37 +492,6 @@ find the mean by index.
 |one or more numbers or arrays of numbers
 |===
 
-*Returns*: `number` | `Array.<number>`. The maximum value of all numbers if
-`args` contains only numbers. Returns an array with the the maximum values at each
-index, including all scalar numbers in `args` in the calculation at each index if
-`args` contains at least one array.
-
-*Throws*: `'Array length mismatch'` if `args` contains arrays of different lengths
-
-*Example*
-[source, js]
-------------
-max(1, 2, 3) // returns 3
-max([10, 20, 30, 40], 15) // returns [15, 20, 30, 40]
-max([1, 9], 4, [3, 5]) // returns [max([1, 4, 3]), max([9, 4, 5])] = [4, 9]
-------------
-
-[float]
-=== mean( ...args )
-
-Finds the mean value of one of more numbers/arrays of numbers passed into the function.
-If at least one array of numbers is passed into the function, the function will
-find the mean by index.
-
-[cols="3*^<"]
-|===
-|Param |Type |Description
-
-|...args
-|number \| Array.<number>
-|one or more numbers or arrays of numbers
-|===
-
 *Returns*: `number` | `Array.<number>`. The mean value of all numbers if `args`
 contains only numbers. Returns an array with the the mean values of each index,
 including all scalar numbers in `args` in the calculation at each index if `args`

From b5faf41b04201fc3081efea15480df7bbc1a1789 Mon Sep 17 00:00:00 2001
From: Brandon Kobel <brandon.kobel@elastic.co>
Date: Tue, 1 Sep 2020 13:59:11 -0700
Subject: [PATCH 160/216] Manually building `KueryNode` for Fleet's routes
 (#75693)

* Simple benchmark tests for kuery

* Building manually is "better" still not free

* Building the KueryNode manually

* Removing benchmark tests

* Another query is building the KueryNode manually

* Empty strings are inherently falsy

* No longer reaching into the data plugin, import from the "root" indexes

* Using AGENT_ACTION_SAVED_OBJECT_TYPE everywhere

* Adding SavedObjectsRepository#find unit test for KueryNode

* Adding KQL KueryNode test for validateConvertFilterToKueryNode

* /s/KQL string/KQL expression

* Updating API docs

* Adding micro benchmark

* Revert "Adding micro benchmark"

This reverts commit 97e19c0bf37b03f3740fe7c00e0613fbbfe4600a.

* Adding an empty string filters test

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...e-public.savedobjectsfindoptions.filter.md |  2 +-
 ...gin-core-public.savedobjectsfindoptions.md |  2 +-
 ...e-server.savedobjectsfindoptions.filter.md |  2 +-
 ...gin-core-server.savedobjectsfindoptions.md |  2 +-
 src/core/public/public.api.md                 |  4 +-
 .../service/lib/filter_utils.test.ts          | 14 +++++-
 .../saved_objects/service/lib/filter_utils.ts |  7 +--
 .../service/lib/repository.test.js            | 45 ++++++++++++++++++-
 src/core/server/saved_objects/types.ts        |  5 ++-
 src/core/server/server.api.md                 |  4 +-
 .../server/services/agents/actions.ts         | 37 ++++++++++++++-
 11 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.filter.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.filter.md
index 900f8e333f3376..2c20fe2dab00f8 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.filter.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.filter.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-filter?: string;
+filter?: string | KueryNode;
 ```
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 ebd0a99531755b..903462ac3039d5 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
@@ -17,7 +17,7 @@ export interface SavedObjectsFindOptions
 |  --- | --- | --- |
 |  [defaultSearchOperator](./kibana-plugin-core-public.savedobjectsfindoptions.defaultsearchoperator.md) | <code>'AND' &#124; 'OR'</code> |  |
 |  [fields](./kibana-plugin-core-public.savedobjectsfindoptions.fields.md) | <code>string[]</code> | An array of fields to include in the results |
-|  [filter](./kibana-plugin-core-public.savedobjectsfindoptions.filter.md) | <code>string</code> |  |
+|  [filter](./kibana-plugin-core-public.savedobjectsfindoptions.filter.md) | <code>string &#124; KueryNode</code> |  |
 |  [hasReference](./kibana-plugin-core-public.savedobjectsfindoptions.hasreference.md) | <code>{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }</code> |  |
 |  [namespaces](./kibana-plugin-core-public.savedobjectsfindoptions.namespaces.md) | <code>string[]</code> |  |
 |  [page](./kibana-plugin-core-public.savedobjectsfindoptions.page.md) | <code>number</code> |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.filter.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.filter.md
index ae7b7a28bcd09a..c98a4fe5e8796f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.filter.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.filter.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-filter?: string;
+filter?: string | KueryNode;
 ```
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 15a9d99b3d062e..804c83f7c1b48f 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
@@ -17,7 +17,7 @@ export interface SavedObjectsFindOptions
 |  --- | --- | --- |
 |  [defaultSearchOperator](./kibana-plugin-core-server.savedobjectsfindoptions.defaultsearchoperator.md) | <code>'AND' &#124; 'OR'</code> |  |
 |  [fields](./kibana-plugin-core-server.savedobjectsfindoptions.fields.md) | <code>string[]</code> | An array of fields to include in the results |
-|  [filter](./kibana-plugin-core-server.savedobjectsfindoptions.filter.md) | <code>string</code> |  |
+|  [filter](./kibana-plugin-core-server.savedobjectsfindoptions.filter.md) | <code>string &#124; KueryNode</code> |  |
 |  [hasReference](./kibana-plugin-core-server.savedobjectsfindoptions.hasreference.md) | <code>{</code><br/><code>        type: string;</code><br/><code>        id: string;</code><br/><code>    }</code> |  |
 |  [namespaces](./kibana-plugin-core-server.savedobjectsfindoptions.namespaces.md) | <code>string[]</code> |  |
 |  [page](./kibana-plugin-core-server.savedobjectsfindoptions.page.md) | <code>number</code> |  |
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 570732fa6e5d66..bacbd6e757114a 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -1189,8 +1189,10 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     defaultSearchOperator?: 'AND' | 'OR';
     fields?: string[];
+    // Warning: (ae-forgotten-export) The symbol "KueryNode" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    filter?: string;
+    filter?: string | KueryNode;
     // (undocumented)
     hasReference?: {
         type: string;
diff --git a/src/core/server/saved_objects/service/lib/filter_utils.test.ts b/src/core/server/saved_objects/service/lib/filter_utils.test.ts
index 4d9bcdda3c8ae9..60e8aa0afdda4c 100644
--- a/src/core/server/saved_objects/service/lib/filter_utils.test.ts
+++ b/src/core/server/saved_objects/service/lib/filter_utils.test.ts
@@ -83,7 +83,19 @@ const mockMappings = {
 
 describe('Filter Utils', () => {
   describe('#validateConvertFilterToKueryNode', () => {
-    test('Validate a simple filter', () => {
+    test('Empty string filters are ignored', () => {
+      expect(validateConvertFilterToKueryNode(['foo'], '', mockMappings)).toBeUndefined();
+    });
+    test('Validate a simple KQL KueryNode filter', () => {
+      expect(
+        validateConvertFilterToKueryNode(
+          ['foo'],
+          esKuery.nodeTypes.function.buildNode('is', `foo.attributes.title`, 'best', true),
+          mockMappings
+        )
+      ).toEqual(esKuery.fromKueryExpression('foo.title: "best"'));
+    });
+    test('Validate a simple KQL expression filter', () => {
       expect(
         validateConvertFilterToKueryNode(['foo'], 'foo.attributes.title: "best"', mockMappings)
       ).toEqual(esKuery.fromKueryExpression('foo.title: "best"'));
diff --git a/src/core/server/saved_objects/service/lib/filter_utils.ts b/src/core/server/saved_objects/service/lib/filter_utils.ts
index 5fbe62a074b29b..d19f06d74e4193 100644
--- a/src/core/server/saved_objects/service/lib/filter_utils.ts
+++ b/src/core/server/saved_objects/service/lib/filter_utils.ts
@@ -28,11 +28,12 @@ const astFunctionType = ['is', 'range', 'nested'];
 
 export const validateConvertFilterToKueryNode = (
   allowedTypes: string[],
-  filter: string,
+  filter: string | KueryNode,
   indexMapping: IndexMapping
 ): KueryNode | undefined => {
-  if (filter && filter.length > 0 && indexMapping) {
-    const filterKueryNode = esKuery.fromKueryExpression(filter);
+  if (filter && indexMapping) {
+    const filterKueryNode =
+      typeof filter === 'string' ? esKuery.fromKueryExpression(filter) : filter;
 
     const validationFilterKuery = validateFilterKueryNode({
       astFilter: filterKueryNode,
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 39433981dfd596..b1d6028465713f 100644
--- a/src/core/server/saved_objects/service/lib/repository.test.js
+++ b/src/core/server/saved_objects/service/lib/repository.test.js
@@ -25,6 +25,8 @@ import { encodeHitVersion } from '../../version';
 import { SavedObjectTypeRegistry } from '../../saved_objects_type_registry';
 import { DocumentMigrator } from '../../migrations/core/document_migrator';
 import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { nodeTypes } from '../../../../../plugins/data/common/es_query';
 
 jest.mock('./search_dsl/search_dsl', () => ({ getSearchDsl: jest.fn() }));
 
@@ -2529,7 +2531,7 @@ describe('SavedObjectsRepository', () => {
         expect(getSearchDslNS.getSearchDsl).toHaveBeenCalledWith(mappings, registry, relevantOpts);
       });
 
-      it(`accepts KQL filter and passes kueryNode to getSearchDsl`, async () => {
+      it(`accepts KQL expression filter and passes KueryNode to getSearchDsl`, async () => {
         const findOpts = {
           namespace,
           search: 'foo*',
@@ -2570,6 +2572,47 @@ describe('SavedObjectsRepository', () => {
         `);
       });
 
+      it(`accepts KQL KueryNode filter and passes KueryNode to getSearchDsl`, async () => {
+        const findOpts = {
+          namespace,
+          search: 'foo*',
+          searchFields: ['foo'],
+          type: ['dashboard'],
+          sortField: 'name',
+          sortOrder: 'desc',
+          defaultSearchOperator: 'AND',
+          hasReference: {
+            type: 'foo',
+            id: '1',
+          },
+          indexPattern: undefined,
+          filter: nodeTypes.function.buildNode('is', `dashboard.attributes.otherField`, '*'),
+        };
+
+        await findSuccess(findOpts, namespace);
+        const { kueryNode } = getSearchDslNS.getSearchDsl.mock.calls[0][2];
+        expect(kueryNode).toMatchInlineSnapshot(`
+          Object {
+            "arguments": Array [
+              Object {
+                "type": "literal",
+                "value": "dashboard.otherField",
+              },
+              Object {
+                "type": "wildcard",
+                "value": "@kuery-wildcard@",
+              },
+              Object {
+                "type": "literal",
+                "value": false,
+              },
+            ],
+            "function": "is",
+            "type": "function",
+          }
+        `);
+      });
+
       it(`supports multiple types`, async () => {
         const types = ['config', 'index-pattern'];
         await findSuccess({ type: types });
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index edbdbe4d167848..000153cd542fa9 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -39,6 +39,9 @@ import { SavedObjectUnsanitizedDoc } from './serialization';
 import { SavedObjectsMigrationLogger } from './migrations/core/migration_logger';
 import { SavedObject } from '../../types';
 
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KueryNode } from '../../../plugins/data/common';
+
 export {
   SavedObjectAttributes,
   SavedObjectAttribute,
@@ -89,7 +92,7 @@ export interface SavedObjectsFindOptions {
   rootSearchFields?: string[];
   hasReference?: { type: string; id: string };
   defaultSearchOperator?: 'AND' | 'OR';
-  filter?: string;
+  filter?: string | KueryNode;
   namespaces?: string[];
   /** An optional ES preference value to be used for the query **/
   preference?: string;
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index fb4e4494801ed6..05afad5a4f7a41 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -2320,8 +2320,10 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     defaultSearchOperator?: 'AND' | 'OR';
     fields?: string[];
+    // Warning: (ae-forgotten-export) The symbol "KueryNode" needs to be exported by the entry point index.d.ts
+    //
     // (undocumented)
-    filter?: string;
+    filter?: string | KueryNode;
     // (undocumented)
     hasReference?: {
         type: string;
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/actions.ts b/x-pack/plugins/ingest_manager/server/services/agents/actions.ts
index 8d1b320c89ae62..cd0dd921312306 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/actions.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/actions.ts
@@ -9,6 +9,7 @@ import { Agent, AgentAction, AgentActionSOAttributes } from '../../../common/typ
 import { AGENT_ACTION_SAVED_OBJECT_TYPE } from '../../../common/constants';
 import { savedObjectToAgentAction } from './saved_objects';
 import { appContextService } from '../app_context';
+import { nodeTypes } from '../../../../../../src/plugins/data/common';
 
 export async function createAgentAction(
   soClient: SavedObjectsClientContract,
@@ -29,9 +30,24 @@ export async function getAgentActionsForCheckin(
   soClient: SavedObjectsClientContract,
   agentId: string
 ): Promise<AgentAction[]> {
+  const filter = nodeTypes.function.buildNode('and', [
+    nodeTypes.function.buildNode(
+      'not',
+      nodeTypes.function.buildNode(
+        'is',
+        `${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.sent_at`,
+        '*'
+      )
+    ),
+    nodeTypes.function.buildNode(
+      'is',
+      `${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.agent_id`,
+      agentId
+    ),
+  ]);
   const res = await soClient.find<AgentActionSOAttributes>({
     type: AGENT_ACTION_SAVED_OBJECT_TYPE,
-    filter: `not ${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.sent_at: * and ${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.agent_id:${agentId}`,
+    filter,
   });
 
   return Promise.all(
@@ -78,9 +94,26 @@ export async function getAgentActionByIds(
 }
 
 export async function getNewActionsSince(soClient: SavedObjectsClientContract, timestamp: string) {
+  const filter = nodeTypes.function.buildNode('and', [
+    nodeTypes.function.buildNode(
+      'not',
+      nodeTypes.function.buildNode(
+        'is',
+        `${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.sent_at`,
+        '*'
+      )
+    ),
+    nodeTypes.function.buildNode(
+      'range',
+      `${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.created_at`,
+      {
+        gte: timestamp,
+      }
+    ),
+  ]);
   const res = await soClient.find<AgentActionSOAttributes>({
     type: AGENT_ACTION_SAVED_OBJECT_TYPE,
-    filter: `not ${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.sent_at: * AND ${AGENT_ACTION_SAVED_OBJECT_TYPE}.attributes.created_at >= "${timestamp}"`,
+    filter,
   });
 
   return res.saved_objects.map(savedObjectToAgentAction);

From 030d5e1390c87f3e35e47ae6a597e5d68cedc26e Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Tue, 1 Sep 2020 17:28:23 -0400
Subject: [PATCH 161/216] [Ingest Manager] Improve agent vs kibana version
 checks (#76238)

* Add logic spec'd in issue comments. Tests pass.

* Change fn to accept 1 (opt 2) string vs object

* Add tests based on issue comments

* Change expected error message in test

* Capitalize Kibana in error message

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../server/services/agents/enroll.test.ts     | 70 ++++++++-----------
 .../server/services/agents/enroll.ts          | 61 +++++++++++-----
 .../apis/fleet/agents/enroll.ts               |  2 +-
 3 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.test.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.test.ts
index 764564cfa49f5b..44473bf2d8d793 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/enroll.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/enroll.test.ts
@@ -5,62 +5,52 @@
  */
 
 import { validateAgentVersion } from './enroll';
-import { appContextService } from '../app_context';
-import { IngestManagerAppContext } from '../../plugin';
 
 describe('validateAgentVersion', () => {
   it('should throw with agent > kibana version', () => {
-    appContextService.start(({
-      kibanaVersion: '8.0.0',
-    } as unknown) as IngestManagerAppContext);
-    expect(() =>
-      validateAgentVersion({
-        local: { elastic: { agent: { version: '8.8.0' } } },
-        userProvided: {},
-      })
-    ).toThrowError(/Agent version is not compatible with kibana version/);
+    expect(() => validateAgentVersion('8.8.0', '8.0.0')).toThrowError('not compatible');
   });
   it('should work with agent < kibana version', () => {
-    appContextService.start(({
-      kibanaVersion: '8.0.0',
-    } as unknown) as IngestManagerAppContext);
-    validateAgentVersion({ local: { elastic: { agent: { version: '7.8.0' } } }, userProvided: {} });
+    validateAgentVersion('7.8.0', '8.0.0');
   });
 
   it('should work with agent = kibana version', () => {
-    appContextService.start(({
-      kibanaVersion: '8.0.0',
-    } as unknown) as IngestManagerAppContext);
-    validateAgentVersion({ local: { elastic: { agent: { version: '8.0.0' } } }, userProvided: {} });
+    validateAgentVersion('8.0.0', '8.0.0');
   });
 
   it('should work with SNAPSHOT version', () => {
-    appContextService.start(({
-      kibanaVersion: '8.0.0-SNAPSHOT',
-    } as unknown) as IngestManagerAppContext);
-    validateAgentVersion({
-      local: { elastic: { agent: { version: '8.0.0-SNAPSHOT' } } },
-      userProvided: {},
-    });
+    validateAgentVersion('8.0.0-SNAPSHOT', '8.0.0-SNAPSHOT');
   });
 
   it('should work with a agent using SNAPSHOT version', () => {
-    appContextService.start(({
-      kibanaVersion: '7.8.0',
-    } as unknown) as IngestManagerAppContext);
-    validateAgentVersion({
-      local: { elastic: { agent: { version: '7.8.0-SNAPSHOT' } } },
-      userProvided: {},
-    });
+    validateAgentVersion('7.8.0-SNAPSHOT', '7.8.0');
   });
 
   it('should work with a kibana using SNAPSHOT version', () => {
-    appContextService.start(({
-      kibanaVersion: '7.8.0-SNAPSHOT',
-    } as unknown) as IngestManagerAppContext);
-    validateAgentVersion({
-      local: { elastic: { agent: { version: '7.8.0' } } },
-      userProvided: {},
-    });
+    validateAgentVersion('7.8.0', '7.8.0-SNAPSHOT');
+  });
+
+  it('very close versions, e.g. patch/prerelease - all combos should work', () => {
+    validateAgentVersion('7.9.1', '7.9.2');
+    validateAgentVersion('7.8.1', '7.8.2');
+    validateAgentVersion('7.6.99', '7.6.2');
+    validateAgentVersion('7.6.2', '7.6.99');
+    validateAgentVersion('5.94.3', '5.94.1234-SNAPSHOT');
+    validateAgentVersion('5.94.3-SNAPSHOT', '5.94.1');
+  });
+
+  it('somewhat close versions, minor release is 1 or 2 versions back and is older than the stack', () => {
+    validateAgentVersion('7.9.1', '7.10.2');
+    validateAgentVersion('7.9.9', '7.11.1');
+    validateAgentVersion('7.6.99', '7.6.2');
+    validateAgentVersion('7.6.2', '7.6.99');
+    expect(() => validateAgentVersion('5.94.3-SNAPSHOT', '5.93.1')).toThrowError('not compatible');
+    expect(() => validateAgentVersion('5.94.3', '5.92.99-SNAPSHOT')).toThrowError('not compatible');
+  });
+
+  it('versions where Agent is a minor version or major version greater (newer) than the stack should not work', () => {
+    expect(() => validateAgentVersion('7.10.1', '7.9.99')).toThrowError('not compatible');
+    expect(() => validateAgentVersion('7.9.9', '6.11.1')).toThrowError('not compatible');
+    expect(() => validateAgentVersion('5.94.3', '5.92.99-SNAPSHOT')).toThrowError('not compatible');
   });
 });
diff --git a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
index 606d5c4dcbb90a..3c5850c722e971 100644
--- a/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agents/enroll.ts
@@ -20,7 +20,8 @@ export async function enroll(
   metadata?: { local: any; userProvided: any },
   sharedId?: string
 ): Promise<Agent> {
-  validateAgentVersion(metadata);
+  const agentVersion = metadata?.local?.elastic?.agent?.version;
+  validateAgentVersion(agentVersion);
 
   const existingAgent = sharedId ? await getAgentBySharedId(soClient, sharedId) : null;
 
@@ -89,24 +90,50 @@ async function getAgentBySharedId(soClient: SavedObjectsClientContract, sharedId
   return null;
 }
 
-export function validateAgentVersion(metadata?: { local: any; userProvided: any }) {
-  const kibanaVersion = semver.parse(appContextService.getKibanaVersion());
-  if (!kibanaVersion) {
-    throw Boom.badRequest('Kibana version is not set');
-  }
-  const version = semver.parse(metadata?.local?.elastic?.agent?.version);
-  if (!version) {
-    throw Boom.badRequest('Agent version not provided in metadata.');
+export function validateAgentVersion(
+  agentVersion: string,
+  kibanaVersion = appContextService.getKibanaVersion()
+) {
+  const agentVersionParsed = semver.parse(agentVersion);
+  if (!agentVersionParsed) {
+    throw Boom.badRequest('Agent version not provided');
   }
 
-  if (!version || !semver.lte(formatVersion(version), formatVersion(kibanaVersion))) {
-    throw Boom.badRequest('Agent version is not compatible with kibana version');
+  const kibanaVersionParsed = semver.parse(kibanaVersion);
+  if (!kibanaVersionParsed) {
+    throw Boom.badRequest('Kibana version is not set or provided');
   }
-}
 
-/**
- * used to remove prelease from version as includePrerelease in not working as expected
- */
-function formatVersion(version: semver.SemVer) {
-  return `${version.major}.${version.minor}.${version.patch}`;
+  const diff = semver.diff(agentVersion, kibanaVersion);
+  switch (diff) {
+    // section 1) very close versions, only patch release differences - all combos should work
+    // Agent a.b.1 < Kibana a.b.2
+    // Agent a.b.2 > Kibana a.b.1
+    case null:
+    case 'prerelease':
+    case 'prepatch':
+    case 'patch':
+      return; // OK
+
+    // section 2) somewhat close versions, Agent minor release is 1 or 2 versions back and is older than the stack:
+    // Agent a.9.x < Kibana a.10.x
+    // Agent a.9.x < Kibana a.11.x
+    case 'preminor':
+    case 'minor':
+      if (
+        agentVersionParsed.minor < kibanaVersionParsed.minor &&
+        kibanaVersionParsed.minor - agentVersionParsed.minor <= 2
+      )
+        return;
+
+    // section 3) versions where Agent is a minor version or major version greater (newer) than the stack should not work:
+    // Agent 7.10.x > Kibana 7.9.x
+    // Agent 8.0.x > Kibana 7.9.x
+    default:
+      if (semver.lte(agentVersionParsed, kibanaVersionParsed)) return;
+      else
+        throw Boom.badRequest(
+          `Agent version ${agentVersion} is not compatible with Kibana version ${kibanaVersion}`
+        );
+  }
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
index ce356dbd081c88..93f656ea952d22 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
@@ -115,7 +115,7 @@ export default function (providerContext: FtrProviderContext) {
           },
         })
         .expect(400);
-      expect(apiResponse.message).to.match(/Agent version is not compatible with kibana/);
+      expect(apiResponse.message).to.match(/is not compatible/);
     });
 
     it('should allow to enroll an agent with a valid enrollment token', async () => {

From 9a7c418327f32f69b9dc708d0ae48861a2fb4d64 Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Tue, 1 Sep 2020 17:29:19 -0400
Subject: [PATCH 162/216] [Ingest Manager] Support both zip & tar archives from
 Registry (#76197)

* Quick pass at restoring support for both zip & tar

Restored unzip functions from https://github.com/elastic/kibana/pull/43764

Persist the `download` value returned by EPR (e.g. `/epr/system/system-0.5.3.zip` or  `/epr/system/system-0.5.3.tar.gz`) as "archive key" for a package name/version combo.

The same name&version should return the same archive. The value initially given by the registry.

Based on that value, we decide which decompression to use.

* Use template literal vs JSON.stringify for keygen

* Factor unzip/untar logic out to getBufferExtractor

 * Add tests for getBufferExtractor
 * Replace `[aA]rchiveKey*` with `[aA]rchiveLocation*`

* Include given name & version in error message

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 package.json                                  |  1 +
 .../server/services/epm/registry/cache.ts     |  9 +++-
 .../server/services/epm/registry/extract.ts   | 38 ++++++++++++++++
 .../services/epm/registry/index.test.ts       | 30 ++++++++++++-
 .../server/services/epm/registry/index.ts     | 45 ++++++++++---------
 5 files changed, 99 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 3485ce5d7a7fc2..28f2025300f395 100644
--- a/package.json
+++ b/package.json
@@ -144,6 +144,7 @@
     "@kbn/test-subj-selector": "0.2.1",
     "@kbn/ui-framework": "1.0.0",
     "@kbn/ui-shared-deps": "1.0.0",
+    "@types/yauzl": "^2.9.1",
     "JSONStream": "1.3.5",
     "abortcontroller-polyfill": "^1.4.0",
     "accept": "3.0.2",
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts
index af11bc7f6c8311..e9c8317a6251d8 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/cache.ts
@@ -3,6 +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 { pkgToPkgKey } from './index';
 
 const cache: Map<string, Buffer> = new Map();
 export const cacheGet = (key: string) => cache.get(key);
@@ -10,4 +11,10 @@ export const cacheSet = (key: string, value: Buffer) => cache.set(key, value);
 export const cacheHas = (key: string) => cache.has(key);
 export const cacheClear = () => cache.clear();
 export const cacheDelete = (key: string) => cache.delete(key);
-export const getCacheKey = (key: string) => key + '.tar.gz';
+
+const archiveLocationCache: Map<string, string> = new Map();
+export const getArchiveLocation = (name: string, version: string) =>
+  archiveLocationCache.get(pkgToPkgKey({ name, version }));
+
+export const setArchiveLocation = (name: string, version: string, location: string) =>
+  archiveLocationCache.set(pkgToPkgKey({ name, version }), location);
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/extract.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/extract.ts
index 1f708c5edbcc7f..6d029b54a63171 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/extract.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/extract.ts
@@ -5,6 +5,7 @@
  */
 
 import tar from 'tar';
+import yauzl from 'yauzl';
 import { bufferToStream, streamToBuffer } from './streams';
 
 export interface ArchiveEntry {
@@ -30,3 +31,40 @@ export async function untarBuffer(
     deflatedStream.pipe(inflateStream);
   });
 }
+
+export async function unzipBuffer(
+  buffer: Buffer,
+  filter = (entry: ArchiveEntry): boolean => true,
+  onEntry = (entry: ArchiveEntry): void => {}
+): Promise<void> {
+  const zipfile = await yauzlFromBuffer(buffer, { lazyEntries: true });
+  zipfile.readEntry();
+  zipfile.on('entry', async (entry: yauzl.Entry) => {
+    const path = entry.fileName;
+    if (!filter({ path })) return zipfile.readEntry();
+
+    const entryBuffer = await getZipReadStream(zipfile, entry).then(streamToBuffer);
+    onEntry({ buffer: entryBuffer, path });
+    zipfile.readEntry();
+  });
+  return new Promise((resolve, reject) => zipfile.on('end', resolve).on('error', reject));
+}
+
+function yauzlFromBuffer(buffer: Buffer, opts: yauzl.Options): Promise<yauzl.ZipFile> {
+  return new Promise((resolve, reject) =>
+    yauzl.fromBuffer(buffer, opts, (err?: Error, handle?: yauzl.ZipFile) =>
+      err ? reject(err) : resolve(handle)
+    )
+  );
+}
+
+function getZipReadStream(
+  zipfile: yauzl.ZipFile,
+  entry: yauzl.Entry
+): Promise<NodeJS.ReadableStream> {
+  return new Promise((resolve, reject) =>
+    zipfile.openReadStream(entry, (err?: Error, readStream?: NodeJS.ReadableStream) =>
+      err ? reject(err) : resolve(readStream)
+    )
+  );
+}
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/index.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/index.test.ts
index 085dc990fa376e..b40638eefbae2f 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/index.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/index.test.ts
@@ -5,7 +5,17 @@
  */
 
 import { AssetParts } from '../../../types';
-import { pathParts, splitPkgKey } from './index';
+import { getBufferExtractor, pathParts, splitPkgKey } from './index';
+import { getArchiveLocation } from './cache';
+import { untarBuffer, unzipBuffer } from './extract';
+
+jest.mock('./cache', () => {
+  return {
+    getArchiveLocation: jest.fn(),
+  };
+});
+
+const mockedGetArchiveLocation = getArchiveLocation as jest.Mock;
 
 const testPaths = [
   {
@@ -80,3 +90,21 @@ describe('splitPkgKey tests', () => {
     expect(pkgVersion).toBe('0.13.0-alpha.1+abcd');
   });
 });
+
+describe('getBufferExtractor', () => {
+  it('throws if the archive has not been downloaded/cached yet', () => {
+    expect(() => getBufferExtractor('missing', '1.2.3')).toThrow('no archive location');
+  });
+
+  it('returns unzipBuffer if the archive key ends in .zip', () => {
+    mockedGetArchiveLocation.mockImplementation(() => '.zip');
+    const extractor = getBufferExtractor('will-use-mocked-key', 'a.b.c');
+    expect(extractor).toBe(unzipBuffer);
+  });
+
+  it('returns untarBuffer if the key ends in anything else', () => {
+    mockedGetArchiveLocation.mockImplementation(() => 'xyz');
+    const extractor = getBufferExtractor('will-use-mocked-key', 'a.b.c');
+    expect(extractor).toBe(untarBuffer);
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts
index b6353789604689..61c8cd4aabb7b4 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/index.ts
@@ -17,8 +17,8 @@ import {
   RegistrySearchResults,
   RegistrySearchResult,
 } from '../../../types';
-import { cacheGet, cacheSet, getCacheKey, cacheHas } from './cache';
-import { ArchiveEntry, untarBuffer } from './extract';
+import { cacheGet, cacheSet, cacheHas, getArchiveLocation, setArchiveLocation } from './cache';
+import { ArchiveEntry, untarBuffer, unzipBuffer } from './extract';
 import { fetchUrl, getResponse, getResponseStream } from './requests';
 import { streamToBuffer } from './streams';
 import { getRegistryUrl } from './registry_url';
@@ -130,7 +130,9 @@ export async function getArchiveInfo(
   filter = (entry: ArchiveEntry): boolean => true
 ): Promise<string[]> {
   const paths: string[] = [];
-  const onEntry = (entry: ArchiveEntry) => {
+  const archiveBuffer = await getOrFetchArchiveBuffer(pkgName, pkgVersion);
+  const bufferExtractor = getBufferExtractor(pkgName, pkgVersion);
+  await bufferExtractor(archiveBuffer, filter, (entry: ArchiveEntry) => {
     const { path, buffer } = entry;
     const { file } = pathParts(path);
     if (!file) return;
@@ -138,9 +140,7 @@ export async function getArchiveInfo(
       cacheSet(path, buffer);
       paths.push(path);
     }
-  };
-
-  await extract(pkgName, pkgVersion, filter, onEntry);
+  });
 
   return paths;
 }
@@ -175,24 +175,20 @@ export function pathParts(path: string): AssetParts {
   } as AssetParts;
 }
 
-async function extract(
-  pkgName: string,
-  pkgVersion: string,
-  filter = (entry: ArchiveEntry): boolean => true,
-  onEntry: (entry: ArchiveEntry) => void
-) {
-  const archiveBuffer = await getOrFetchArchiveBuffer(pkgName, pkgVersion);
+export function getBufferExtractor(pkgName: string, pkgVersion: string) {
+  const archiveLocation = getArchiveLocation(pkgName, pkgVersion);
+  if (!archiveLocation) throw new Error(`no archive location for ${pkgName} ${pkgVersion}`);
+  const isZip = archiveLocation.endsWith('.zip');
+  const bufferExtractor = isZip ? unzipBuffer : untarBuffer;
 
-  return untarBuffer(archiveBuffer, filter, onEntry);
+  return bufferExtractor;
 }
 
 async function getOrFetchArchiveBuffer(pkgName: string, pkgVersion: string): Promise<Buffer> {
-  // assume .tar.gz for now. add support for .zip if/when we need it
-  const key = getCacheKey(`${pkgName}-${pkgVersion}`);
-  let buffer = cacheGet(key);
+  const key = getArchiveLocation(pkgName, pkgVersion);
+  let buffer = key && cacheGet(key);
   if (!buffer) {
     buffer = await fetchArchiveBuffer(pkgName, pkgVersion);
-    cacheSet(key, buffer);
   }
 
   if (buffer) {
@@ -203,16 +199,21 @@ async function getOrFetchArchiveBuffer(pkgName: string, pkgVersion: string): Pro
 }
 
 export async function ensureCachedArchiveInfo(name: string, version: string) {
-  const pkgkey = getCacheKey(`${name}-${version}`);
-  if (!cacheHas(pkgkey)) {
+  const pkgkey = getArchiveLocation(name, version);
+  if (!pkgkey || !cacheHas(pkgkey)) {
     await getArchiveInfo(name, version);
   }
 }
 
 async function fetchArchiveBuffer(pkgName: string, pkgVersion: string): Promise<Buffer> {
   const { download: archivePath } = await fetchInfo(pkgName, pkgVersion);
-  const registryUrl = getRegistryUrl();
-  return getResponseStream(`${registryUrl}${archivePath}`).then(streamToBuffer);
+  const archiveUrl = `${getRegistryUrl()}${archivePath}`;
+  const buffer = await getResponseStream(archiveUrl).then(streamToBuffer);
+
+  setArchiveLocation(pkgName, pkgVersion, archivePath);
+  cacheSet(archivePath, buffer);
+
+  return buffer;
 }
 
 export function getAsset(key: string) {

From ac8e9367f7e354dcce1ad7e72d7877e30c01bf85 Mon Sep 17 00:00:00 2001
From: Robert Austin <robert.austin@elastic.co>
Date: Tue, 1 Sep 2020 17:39:04 -0400
Subject: [PATCH 163/216] [Resolver] generator uses setup_node_env (#76422)

---
 x-pack/plugins/security_solution/package.json             | 2 +-
 .../plugins/security_solution/scripts/endpoint/README.md  | 4 ----
 .../security_solution/scripts/endpoint/cli_tsconfig.json  | 7 -------
 .../scripts/endpoint/resolver_generator.js                | 8 ++++++++
 ...resolver_generator.ts => resolver_generator_script.ts} | 0
 5 files changed, 9 insertions(+), 12 deletions(-)
 delete mode 100644 x-pack/plugins/security_solution/scripts/endpoint/cli_tsconfig.json
 create mode 100644 x-pack/plugins/security_solution/scripts/endpoint/resolver_generator.js
 rename x-pack/plugins/security_solution/scripts/endpoint/{resolver_generator.ts => resolver_generator_script.ts} (100%)

diff --git a/x-pack/plugins/security_solution/package.json b/x-pack/plugins/security_solution/package.json
index 687099541b3d28..4d2602d1498eef 100644
--- a/x-pack/plugins/security_solution/package.json
+++ b/x-pack/plugins/security_solution/package.json
@@ -10,7 +10,7 @@
     "cypress:open": "cypress open --config-file ./cypress/cypress.json",
     "cypress:run": "cypress run --browser chrome --headless --spec ./cypress/integration/**/*.spec.ts --config-file ./cypress/cypress.json --reporter ../../node_modules/cypress-multi-reporters --reporter-options configFile=./cypress/reporter_config.json; status=$?; ../../node_modules/.bin/mochawesome-merge --reportDir ../../../target/kibana-security-solution/cypress/results > ../../../target/kibana-security-solution/cypress/results/output.json; ../../../node_modules/.bin/marge ../../../target/kibana-security-solution/cypress/results/output.json --reportDir ../../../target/kibana-security-solution/cypress/results; mkdir -p ../../../target/junit && cp ../../../target/kibana-security-solution/cypress/results/*.xml ../../../target/junit/ && exit $status;",
     "cypress:run-as-ci": "node ../../../scripts/functional_tests --config ../../test/security_solution_cypress/config.ts",
-    "test:generate": "ts-node --project scripts/endpoint/cli_tsconfig.json scripts/endpoint/resolver_generator.ts"
+    "test:generate": "node scripts/endpoint/resolver_generator"
   },
   "devDependencies": {
     "@types/md5": "^2.2.0",
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/README.md b/x-pack/plugins/security_solution/scripts/endpoint/README.md
index bd9502f2f59e03..2827ab065504b5 100644
--- a/x-pack/plugins/security_solution/scripts/endpoint/README.md
+++ b/x-pack/plugins/security_solution/scripts/endpoint/README.md
@@ -5,10 +5,6 @@ The default behavior is to create 1 endpoint with 1 alert and a moderate number
 A seed value can be provided as a string for the random number generator for repeatable behavior, useful for demos etc.
 Use the `-d` option if you want to delete and remake the indices, otherwise it will add documents to existing indices.
 
-The sample data generator script depends on ts-node, install with npm:
-
-`npm install -g ts-node`
-
 Example command sequence to get ES and kibana running with sample data after installing ts-node:
 
 `yarn es snapshot` -> starts ES
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/cli_tsconfig.json b/x-pack/plugins/security_solution/scripts/endpoint/cli_tsconfig.json
deleted file mode 100644
index 5c68f8ee0abf26..00000000000000
--- a/x-pack/plugins/security_solution/scripts/endpoint/cli_tsconfig.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "../../../../tsconfig.json",
-    "compilerOptions": {
-      "target": "es2019",
-      "resolveJsonModule": true
-    }
-  }
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator.js b/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator.js
new file mode 100644
index 00000000000000..fb5a865439bc2d
--- /dev/null
+++ b/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator.js
@@ -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.
+ */
+
+require('../../../../../src/setup_node_env');
+require('./resolver_generator_script');
diff --git a/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator.ts b/x-pack/plugins/security_solution/scripts/endpoint/resolver_generator_script.ts
similarity index 100%
rename from x-pack/plugins/security_solution/scripts/endpoint/resolver_generator.ts
rename to x-pack/plugins/security_solution/scripts/endpoint/resolver_generator_script.ts

From 7d82e273a681c1ff685bea913dbcb96950a00aa0 Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Wed, 2 Sep 2020 01:12:17 +0300
Subject: [PATCH 164/216] Add `auto` interval to histogram AggConfig (#76001)

* Add `auto` interval to histogram AggConfig

Closes: #75438

* fix JEST

* update UI

* add tests

* some changes

* small changes

* cleanup code

* fix PR comment

* fix PR comments

* fix PR comment

* Update src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts

Co-authored-by: Wylie Conlon <wylieconlon@gmail.com>

* Change algorithm for auto interval

* Update src/plugins/data/common/search/aggs/buckets/histogram.ts

Co-authored-by: Luke Elmers <lukeelmers@gmail.com>

* added some comments

* Update src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts

Co-authored-by: Wylie Conlon <wylieconlon@gmail.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Wylie Conlon <wylieconlon@gmail.com>
Co-authored-by: Luke Elmers <lukeelmers@gmail.com>
---
 .../search/aggs/buckets/_interval_options.ts  |   5 +-
 .../create_filter/date_histogram.test.ts      |   7 +-
 .../search/aggs/buckets/date_histogram.ts     |   8 +-
 .../search/aggs/buckets/histogram.test.ts     |  21 +++
 .../common/search/aggs/buckets/histogram.ts   |  65 +++-----
 .../search/aggs/buckets/histogram_fn.test.ts  |   7 +-
 .../search/aggs/buckets/histogram_fn.ts       |   6 +
 .../lib/histogram_calculate_interval.test.ts  | 144 ++++++++++++++++++
 .../lib/histogram_calculate_interval.ts       | 143 +++++++++++++++++
 .../lib/time_buckets/time_buckets.test.ts     |   3 +-
 .../buckets/lib/time_buckets/time_buckets.ts  |   5 +-
 .../utils/calculate_auto_time_expression.ts   |   3 +-
 .../public/components/agg_params_map.ts       |   1 +
 .../public/components/controls/index.ts       |   1 +
 .../public/components/controls/max_bars.tsx   | 108 +++++++++++++
 .../components/controls/number_interval.tsx   |  93 ++++++++---
 .../page_objects/visualize_editor_page.ts     |   9 ++
 17 files changed, 553 insertions(+), 76 deletions(-)
 create mode 100644 src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts
 create mode 100644 src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts
 create mode 100644 src/plugins/vis_default_editor/public/components/controls/max_bars.tsx

diff --git a/src/plugins/data/common/search/aggs/buckets/_interval_options.ts b/src/plugins/data/common/search/aggs/buckets/_interval_options.ts
index 00cf50c272fa04..f94484a6edc2e4 100644
--- a/src/plugins/data/common/search/aggs/buckets/_interval_options.ts
+++ b/src/plugins/data/common/search/aggs/buckets/_interval_options.ts
@@ -20,12 +20,15 @@
 import { i18n } from '@kbn/i18n';
 import { IBucketAggConfig } from './bucket_agg_type';
 
+export const autoInterval = 'auto';
+export const isAutoInterval = (value: unknown) => value === autoInterval;
+
 export const intervalOptions = [
   {
     display: i18n.translate('data.search.aggs.buckets.intervalOptions.autoDisplayName', {
       defaultMessage: 'Auto',
     }),
-    val: 'auto',
+    val: autoInterval,
     enabled(agg: IBucketAggConfig) {
       // not only do we need a time field, but the selected field needs
       // to be the time field. (see #3028)
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/date_histogram.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/date_histogram.test.ts
index 143d5498369003..3d0224b213e8d8 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/date_histogram.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/date_histogram.test.ts
@@ -19,7 +19,7 @@
 
 import moment from 'moment';
 import { createFilterDateHistogram } from './date_histogram';
-import { intervalOptions } from '../_interval_options';
+import { intervalOptions, autoInterval } from '../_interval_options';
 import { AggConfigs } from '../../agg_configs';
 import { mockAggTypesRegistry } from '../../test_helpers';
 import { IBucketDateHistogramAggConfig } from '../date_histogram';
@@ -33,7 +33,10 @@ describe('AggConfig Filters', () => {
     let bucketStart: any;
     let field: any;
 
-    const init = (interval: string = 'auto', duration: any = moment.duration(15, 'minutes')) => {
+    const init = (
+      interval: string = autoInterval,
+      duration: any = moment.duration(15, 'minutes')
+    ) => {
       field = {
         name: 'date',
       };
diff --git a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
index fdf9c456b38760..c273ca53a5fed4 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 
 import { KBN_FIELD_TYPES, TimeRange, TimeRangeBounds, UI_SETTINGS } from '../../../../common';
 
-import { intervalOptions } from './_interval_options';
+import { intervalOptions, autoInterval, isAutoInterval } from './_interval_options';
 import { createFilterDateHistogram } from './create_filter/date_histogram';
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
@@ -44,7 +44,7 @@ const updateTimeBuckets = (
   customBuckets?: IBucketDateHistogramAggConfig['buckets']
 ) => {
   const bounds =
-    agg.params.timeRange && (agg.fieldIsTimeField() || agg.params.interval === 'auto')
+    agg.params.timeRange && (agg.fieldIsTimeField() || isAutoInterval(agg.params.interval))
       ? calculateBounds(agg.params.timeRange)
       : undefined;
   const buckets = customBuckets || agg.buckets;
@@ -149,7 +149,7 @@ export const getDateHistogramBucketAgg = ({
           return agg.getIndexPattern().timeFieldName;
         },
         onChange(agg: IBucketDateHistogramAggConfig) {
-          if (get(agg, 'params.interval') === 'auto' && !agg.fieldIsTimeField()) {
+          if (isAutoInterval(get(agg, 'params.interval')) && !agg.fieldIsTimeField()) {
             delete agg.params.interval;
           }
         },
@@ -187,7 +187,7 @@ export const getDateHistogramBucketAgg = ({
           }
           return state;
         },
-        default: 'auto',
+        default: autoInterval,
         options: intervalOptions,
         write(agg, output, aggs) {
           updateTimeBuckets(agg, calculateBounds);
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram.test.ts b/src/plugins/data/common/search/aggs/buckets/histogram.test.ts
index 3727747984d3e1..a8ac72c174c726 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram.test.ts
@@ -103,7 +103,28 @@ describe('Histogram Agg', () => {
       });
     });
 
+    describe('maxBars', () => {
+      test('should not be written to the DSL', () => {
+        const aggConfigs = getAggConfigs({
+          maxBars: 50,
+          field: {
+            name: 'field',
+          },
+        });
+        const { [BUCKET_TYPES.HISTOGRAM]: params } = aggConfigs.aggs[0].toDsl();
+
+        expect(params).not.toHaveProperty('maxBars');
+      });
+    });
+
     describe('interval', () => {
+      test('accepts "auto" value', () => {
+        const params = getParams({
+          interval: 'auto',
+        });
+
+        expect(params).toHaveProperty('interval', 1);
+      });
       test('accepts a whole number', () => {
         const params = getParams({
           interval: 100,
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram.ts b/src/plugins/data/common/search/aggs/buckets/histogram.ts
index 2b263013e55a2a..4b631e1fd7cd7e 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram.ts
@@ -28,6 +28,8 @@ import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { createFilterHistogram } from './create_filter/histogram';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { ExtendedBounds } from './lib/extended_bounds';
+import { isAutoInterval, autoInterval } from './_interval_options';
+import { calculateHistogramInterval } from './lib/histogram_calculate_interval';
 
 export interface AutoBounds {
   min: number;
@@ -47,6 +49,7 @@ export interface IBucketHistogramAggConfig extends IBucketAggConfig {
 export interface AggParamsHistogram extends BaseAggParams {
   field: string;
   interval: string;
+  maxBars?: number;
   intervalBase?: number;
   min_doc_count?: boolean;
   has_extended_bounds?: boolean;
@@ -102,6 +105,7 @@ export const getHistogramBucketAgg = ({
       },
       {
         name: 'interval',
+        default: autoInterval,
         modifyAggConfigOnSearchRequestStart(
           aggConfig: IBucketHistogramAggConfig,
           searchSource: any,
@@ -127,9 +131,12 @@ export const getHistogramBucketAgg = ({
           return childSearchSource
             .fetch(options)
             .then((resp: any) => {
+              const min = resp.aggregations?.minAgg?.value ?? 0;
+              const max = resp.aggregations?.maxAgg?.value ?? 0;
+
               aggConfig.setAutoBounds({
-                min: get(resp, 'aggregations.minAgg.value'),
-                max: get(resp, 'aggregations.maxAgg.value'),
+                min,
+                max,
               });
             })
             .catch((e: Error) => {
@@ -143,46 +150,24 @@ export const getHistogramBucketAgg = ({
             });
         },
         write(aggConfig, output) {
-          let interval = parseFloat(aggConfig.params.interval);
-          if (interval <= 0) {
-            interval = 1;
-          }
-          const autoBounds = aggConfig.getAutoBounds();
-
-          // ensure interval does not create too many buckets and crash browser
-          if (autoBounds) {
-            const range = autoBounds.max - autoBounds.min;
-            const bars = range / interval;
-
-            if (bars > getConfig(UI_SETTINGS.HISTOGRAM_MAX_BARS)) {
-              const minInterval = range / getConfig(UI_SETTINGS.HISTOGRAM_MAX_BARS);
-
-              // Round interval by order of magnitude to provide clean intervals
-              // Always round interval up so there will always be less buckets than histogram:maxBars
-              const orderOfMagnitude = Math.pow(10, Math.floor(Math.log10(minInterval)));
-              let roundInterval = orderOfMagnitude;
-
-              while (roundInterval < minInterval) {
-                roundInterval += orderOfMagnitude;
-              }
-              interval = roundInterval;
-            }
-          }
-          const base = aggConfig.params.intervalBase;
-
-          if (base) {
-            if (interval < base) {
-              // In case the specified interval is below the base, just increase it to it's base
-              interval = base;
-            } else if (interval % base !== 0) {
-              // In case the interval is not a multiple of the base round it to the next base
-              interval = Math.round(interval / base) * base;
-            }
-          }
-
-          output.params.interval = interval;
+          const values = aggConfig.getAutoBounds();
+
+          output.params.interval = calculateHistogramInterval({
+            values,
+            interval: aggConfig.params.interval,
+            maxBucketsUiSettings: getConfig(UI_SETTINGS.HISTOGRAM_MAX_BARS),
+            maxBucketsUserInput: aggConfig.params.maxBars,
+            intervalBase: aggConfig.params.intervalBase,
+          });
         },
       },
+      {
+        name: 'maxBars',
+        shouldShow(agg) {
+          return isAutoInterval(get(agg, 'params.interval'));
+        },
+        write: () => {},
+      },
       {
         name: 'min_doc_count',
         default: false,
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram_fn.test.ts b/src/plugins/data/common/search/aggs/buckets/histogram_fn.test.ts
index 34b6fa1a6dcd6d..354946f99a2f58 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram_fn.test.ts
@@ -43,6 +43,7 @@ describe('agg_expression_functions', () => {
               "interval": "10",
               "intervalBase": undefined,
               "json": undefined,
+              "maxBars": undefined,
               "min_doc_count": undefined,
             },
             "schema": undefined,
@@ -55,8 +56,9 @@ describe('agg_expression_functions', () => {
     test('includes optional params when they are provided', () => {
       const actual = fn({
         field: 'field',
-        interval: '10',
+        interval: 'auto',
         intervalBase: 1,
+        maxBars: 25,
         min_doc_count: false,
         has_extended_bounds: false,
         extended_bounds: JSON.stringify({
@@ -77,9 +79,10 @@ describe('agg_expression_functions', () => {
             },
             "field": "field",
             "has_extended_bounds": false,
-            "interval": "10",
+            "interval": "auto",
             "intervalBase": 1,
             "json": undefined,
+            "maxBars": 25,
             "min_doc_count": false,
           },
           "schema": undefined,
diff --git a/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts b/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
index 877fd13e59f879..2e833bbe0a3ebb 100644
--- a/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
+++ b/src/plugins/data/common/search/aggs/buckets/histogram_fn.ts
@@ -85,6 +85,12 @@ export const aggHistogram = (): FunctionDefinition => ({
         defaultMessage: 'Specifies whether to use min_doc_count for this aggregation',
       }),
     },
+    maxBars: {
+      types: ['number'],
+      help: i18n.translate('data.search.aggs.buckets.histogram.maxBars.help', {
+        defaultMessage: 'Calculate interval to get approximately this many bars',
+      }),
+    },
     has_extended_bounds: {
       types: ['boolean'],
       help: i18n.translate('data.search.aggs.buckets.histogram.hasExtendedBounds.help', {
diff --git a/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts
new file mode 100644
index 00000000000000..fd788d33392951
--- /dev/null
+++ b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.test.ts
@@ -0,0 +1,144 @@
+/*
+ * 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 {
+  calculateHistogramInterval,
+  CalculateHistogramIntervalParams,
+} from './histogram_calculate_interval';
+
+describe('calculateHistogramInterval', () => {
+  describe('auto calculating mode', () => {
+    let params: CalculateHistogramIntervalParams;
+
+    beforeEach(() => {
+      params = {
+        interval: 'auto',
+        intervalBase: undefined,
+        maxBucketsUiSettings: 100,
+        maxBucketsUserInput: undefined,
+        values: {
+          min: 0,
+          max: 1,
+        },
+      };
+    });
+
+    describe('maxBucketsUserInput is defined', () => {
+      test('should not set interval which more than largest possible', () => {
+        const p = {
+          ...params,
+          maxBucketsUserInput: 200,
+          values: {
+            min: 150,
+            max: 250,
+          },
+        };
+        expect(calculateHistogramInterval(p)).toEqual(1);
+      });
+
+      test('should correctly work for float numbers (small numbers)', () => {
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            maxBucketsUserInput: 50,
+            values: {
+              min: 0.1,
+              max: 0.9,
+            },
+          })
+        ).toBe(0.02);
+      });
+
+      test('should correctly work for float numbers (big numbers)', () => {
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            maxBucketsUserInput: 10,
+            values: {
+              min: 10.45,
+              max: 1000.05,
+            },
+          })
+        ).toBe(100);
+      });
+    });
+
+    describe('maxBucketsUserInput is not defined', () => {
+      test('should not set interval which more than largest possible', () => {
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            values: {
+              min: 0,
+              max: 100,
+            },
+          })
+        ).toEqual(1);
+      });
+
+      test('should set intervals for integer numbers (diff less than maxBucketsUiSettings)', () => {
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            values: {
+              min: 1,
+              max: 10,
+            },
+          })
+        ).toEqual(0.1);
+      });
+
+      test('should set intervals for integer numbers (diff more than maxBucketsUiSettings)', () => {
+        // diff === 44445; interval === 500; buckets === 89
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            values: {
+              min: 45678,
+              max: 90123,
+            },
+          })
+        ).toEqual(500);
+      });
+
+      test('should set intervals the same for the same interval', () => {
+        // both diffs are the same
+        // diff === 1.655; interval === 0.02; buckets === 82
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            values: {
+              min: 1.245,
+              max: 2.9,
+            },
+          })
+        ).toEqual(0.02);
+        expect(
+          calculateHistogramInterval({
+            ...params,
+            values: {
+              min: 0.5,
+              max: 2.3,
+            },
+          })
+        ).toEqual(0.02);
+      });
+    });
+  });
+});
diff --git a/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts
new file mode 100644
index 00000000000000..f4e42fa8881ef5
--- /dev/null
+++ b/src/plugins/data/common/search/aggs/buckets/lib/histogram_calculate_interval.ts
@@ -0,0 +1,143 @@
+/*
+ * 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 { isAutoInterval } from '../_interval_options';
+
+interface IntervalValuesRange {
+  min: number;
+  max: number;
+}
+
+export interface CalculateHistogramIntervalParams {
+  interval: string;
+  maxBucketsUiSettings: number;
+  maxBucketsUserInput?: number;
+  intervalBase?: number;
+  values?: IntervalValuesRange;
+}
+
+/**
+ * Round interval by order of magnitude to provide clean intervals
+ */
+const roundInterval = (minInterval: number) => {
+  const orderOfMagnitude = Math.pow(10, Math.floor(Math.log10(minInterval)));
+  let interval = orderOfMagnitude;
+
+  while (interval < minInterval) {
+    interval += orderOfMagnitude;
+  }
+
+  return interval;
+};
+
+const calculateForGivenInterval = (
+  diff: number,
+  interval: number,
+  maxBucketsUiSettings: CalculateHistogramIntervalParams['maxBucketsUiSettings']
+) => {
+  const bars = diff / interval;
+
+  if (bars > maxBucketsUiSettings) {
+    const minInterval = diff / maxBucketsUiSettings;
+
+    return roundInterval(minInterval);
+  }
+
+  return interval;
+};
+
+/**
+ * Algorithm for determining auto-interval
+
+   1. Define maxBars as Math.min(<user input>, <max buckets setting>)
+   2. Find the min and max values in the data
+   3. Subtract the min from max to get diff
+   4. Set exactInterval to diff / maxBars
+   5. Based on exactInterval, find the power of 10 that's lower and higher
+   6. Find the number of expected buckets that lowerPower would create: diff / lowerPower
+   7. Find the number of expected buckets that higherPower would create: diff / higherPower
+   8. There are three possible final intervals, pick the one that's closest to maxBars:
+     - The lower power of 10
+     - The lower power of 10, times 2
+     - The lower power of 10, times 5
+ **/
+const calculateAutoInterval = (
+  diff: number,
+  maxBucketsUiSettings: CalculateHistogramIntervalParams['maxBucketsUiSettings'],
+  maxBucketsUserInput: CalculateHistogramIntervalParams['maxBucketsUserInput']
+) => {
+  const maxBars = Math.min(maxBucketsUiSettings, maxBucketsUserInput ?? maxBucketsUiSettings);
+  const exactInterval = diff / maxBars;
+
+  const lowerPower = Math.pow(10, Math.floor(Math.log10(exactInterval)));
+
+  const autoBuckets = diff / lowerPower;
+
+  if (autoBuckets > maxBars) {
+    if (autoBuckets / 2 <= maxBars) {
+      return lowerPower * 2;
+    } else if (autoBuckets / 5 <= maxBars) {
+      return lowerPower * 5;
+    } else {
+      return lowerPower * 10;
+    }
+  }
+
+  return lowerPower;
+};
+
+export const calculateHistogramInterval = ({
+  interval,
+  maxBucketsUiSettings,
+  maxBucketsUserInput,
+  intervalBase,
+  values,
+}: CalculateHistogramIntervalParams) => {
+  const isAuto = isAutoInterval(interval);
+  let calculatedInterval = isAuto ? 0 : parseFloat(interval);
+
+  // should return NaN on non-numeric or invalid values
+  if (Number.isNaN(calculatedInterval)) {
+    return calculatedInterval;
+  }
+
+  if (values) {
+    const diff = values.max - values.min;
+
+    if (diff) {
+      calculatedInterval = isAuto
+        ? calculateAutoInterval(diff, maxBucketsUiSettings, maxBucketsUserInput)
+        : calculateForGivenInterval(diff, calculatedInterval, maxBucketsUiSettings);
+    }
+  }
+
+  if (intervalBase) {
+    if (calculatedInterval < intervalBase) {
+      // In case the specified interval is below the base, just increase it to it's base
+      calculatedInterval = intervalBase;
+    } else if (calculatedInterval % intervalBase !== 0) {
+      // In case the interval is not a multiple of the base round it to the next base
+      calculatedInterval = Math.round(calculatedInterval / intervalBase) * intervalBase;
+    }
+  }
+
+  const defaultValueForUnspecifiedInterval = 1;
+
+  return calculatedInterval || defaultValueForUnspecifiedInterval;
+};
diff --git a/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.test.ts b/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.test.ts
index ae7630ecd3dac0..04e64233ce1965 100644
--- a/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.test.ts
@@ -20,6 +20,7 @@
 import moment from 'moment';
 
 import { TimeBuckets, TimeBucketsConfig } from './time_buckets';
+import { autoInterval } from '../../_interval_options';
 
 describe('TimeBuckets', () => {
   const timeBucketConfig: TimeBucketsConfig = {
@@ -103,7 +104,7 @@ describe('TimeBuckets', () => {
 
   test('setInterval/getInterval - intreval is a "auto"', () => {
     const timeBuckets = new TimeBuckets(timeBucketConfig);
-    timeBuckets.setInterval('auto');
+    timeBuckets.setInterval(autoInterval);
     const interval = timeBuckets.getInterval();
 
     expect(interval.description).toEqual('0 milliseconds');
diff --git a/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.ts b/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.ts
index 6402a6e83ead9a..d054df0c9274ed 100644
--- a/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.ts
+++ b/src/plugins/data/common/search/aggs/buckets/lib/time_buckets/time_buckets.ts
@@ -28,6 +28,7 @@ import {
   convertIntervalToEsInterval,
   EsInterval,
 } from './calc_es_interval';
+import { autoInterval } from '../../_interval_options';
 
 interface TimeBucketsInterval extends moment.Duration {
   // TODO double-check whether all of these are needed
@@ -189,8 +190,8 @@ export class TimeBuckets {
       interval = input.val;
     }
 
-    if (!interval || interval === 'auto') {
-      this._i = 'auto';
+    if (!interval || interval === autoInterval) {
+      this._i = autoInterval;
       return;
     }
 
diff --git a/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts b/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
index 622e8101f34aba..3637ded44c50ab 100644
--- a/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
+++ b/src/plugins/data/common/search/aggs/utils/calculate_auto_time_expression.ts
@@ -21,6 +21,7 @@ import { UI_SETTINGS } from '../../../../common/constants';
 import { TimeRange } from '../../../../common/query';
 import { TimeBuckets } from '../buckets/lib/time_buckets';
 import { toAbsoluteDates } from './date_interval_utils';
+import { autoInterval } from '../buckets/_interval_options';
 
 export function getCalculateAutoTimeExpression(getConfig: (key: string) => any) {
   return function calculateAutoTimeExpression(range: TimeRange) {
@@ -36,7 +37,7 @@ export function getCalculateAutoTimeExpression(getConfig: (key: string) => any)
       'dateFormat:scaled': getConfig('dateFormat:scaled'),
     });
 
-    buckets.setInterval('auto');
+    buckets.setInterval(autoInterval);
     buckets.setBounds({
       min: moment(dates.from),
       max: moment(dates.to),
diff --git a/src/plugins/vis_default_editor/public/components/agg_params_map.ts b/src/plugins/vis_default_editor/public/components/agg_params_map.ts
index 9bc3146b9903bb..e9019e479f92fe 100644
--- a/src/plugins/vis_default_editor/public/components/agg_params_map.ts
+++ b/src/plugins/vis_default_editor/public/components/agg_params_map.ts
@@ -43,6 +43,7 @@ const buckets = {
   },
   [BUCKET_TYPES.HISTOGRAM]: {
     interval: controls.NumberIntervalParamEditor,
+    maxBars: controls.MaxBarsParamEditor,
     min_doc_count: controls.MinDocCountParamEditor,
     has_extended_bounds: controls.HasExtendedBoundsParamEditor,
     extended_bounds: controls.ExtendedBoundsParamEditor,
diff --git a/src/plugins/vis_default_editor/public/components/controls/index.ts b/src/plugins/vis_default_editor/public/components/controls/index.ts
index cfb236e5e22e37..26e6609c7711d2 100644
--- a/src/plugins/vis_default_editor/public/components/controls/index.ts
+++ b/src/plugins/vis_default_editor/public/components/controls/index.ts
@@ -52,3 +52,4 @@ export { TopSizeParamEditor } from './top_size';
 export { TopSortFieldParamEditor } from './top_sort_field';
 export { OrderParamEditor } from './order';
 export { UseGeocentroidParamEditor } from './use_geocentroid';
+export { MaxBarsParamEditor } from './max_bars';
diff --git a/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx b/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
new file mode 100644
index 00000000000000..b0d517e0928dff
--- /dev/null
+++ b/src/plugins/vis_default_editor/public/components/controls/max_bars.tsx
@@ -0,0 +1,108 @@
+/*
+ * 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, { useCallback, useEffect } from 'react';
+import { EuiFormRow, EuiFieldNumber, EuiFieldNumberProps, EuiIconTip } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { useKibana } from '../../../../kibana_react/public';
+import { AggParamEditorProps } from '../agg_param_props';
+import { UI_SETTINGS } from '../../../../data/public';
+
+export interface SizeParamEditorProps extends AggParamEditorProps<number | ''> {
+  iconTip?: React.ReactNode;
+  disabled?: boolean;
+}
+
+const autoPlaceholder = i18n.translate('visDefaultEditor.controls.maxBars.autoPlaceholder', {
+  defaultMessage: 'Auto',
+});
+
+const label = (
+  <>
+    <FormattedMessage
+      id="visDefaultEditor.controls.maxBars.maxBarsLabel"
+      defaultMessage="Max bars"
+    />{' '}
+    <EuiIconTip
+      position="right"
+      content={
+        <FormattedMessage
+          id="visDefaultEditor.controls.maxBars.maxBarsHelpText"
+          defaultMessage="Intervals will be selected automatically based on the available data. The maximum number of bars can never be greater than the Advanced Setting's {histogramMaxBars}"
+          values={{ histogramMaxBars: UI_SETTINGS.HISTOGRAM_MAX_BARS }}
+        />
+      }
+      type="questionInCircle"
+    />
+  </>
+);
+
+function MaxBarsParamEditor({
+  disabled,
+  iconTip,
+  value,
+  setValue,
+  showValidation,
+  setValidity,
+  setTouched,
+}: SizeParamEditorProps) {
+  const { services } = useKibana();
+  const uiSettingMaxBars = services.uiSettings?.get(UI_SETTINGS.HISTOGRAM_MAX_BARS);
+  const isValid =
+    disabled ||
+    value === undefined ||
+    value === '' ||
+    Number(value) > 0 ||
+    value < uiSettingMaxBars;
+
+  useEffect(() => {
+    setValidity(isValid);
+  }, [isValid, setValidity]);
+
+  const onChange: EuiFieldNumberProps['onChange'] = useCallback(
+    (ev) => setValue(ev.target.value === '' ? '' : parseFloat(ev.target.value)),
+    [setValue]
+  );
+
+  return (
+    <EuiFormRow
+      label={label}
+      fullWidth={true}
+      isInvalid={showValidation ? !isValid : false}
+      compressed
+    >
+      <EuiFieldNumber
+        value={value || ''}
+        placeholder={autoPlaceholder}
+        onChange={onChange}
+        min={1}
+        fullWidth
+        compressed
+        max={uiSettingMaxBars}
+        isInvalid={showValidation ? !isValid : false}
+        onBlur={setTouched}
+        disabled={disabled}
+        data-test-subj="maxBarsParamEditor"
+      />
+    </EuiFormRow>
+  );
+}
+
+export { MaxBarsParamEditor };
diff --git a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
index f6354027ab01b8..8cdc92581cefbf 100644
--- a/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/number_interval.tsx
@@ -20,7 +20,16 @@
 import { get } from 'lodash';
 import React, { useEffect, useCallback } from 'react';
 
-import { EuiFieldNumber, EuiFormRow, EuiIconTip } from '@elastic/eui';
+import {
+  EuiFieldNumber,
+  EuiFormRow,
+  EuiIconTip,
+  EuiSwitch,
+  EuiSwitchProps,
+  EuiFieldNumberProps,
+  EuiFlexGroup,
+  EuiFlexItem,
+} from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { UI_SETTINGS } from '../../../../data/public';
@@ -47,6 +56,25 @@ const label = (
   </>
 );
 
+const autoInterval = 'auto';
+const isAutoInterval = (value: unknown) => value === autoInterval;
+
+const selectIntervalPlaceholder = i18n.translate(
+  'visDefaultEditor.controls.numberInterval.selectIntervalPlaceholder',
+  {
+    defaultMessage: 'Enter an interval',
+  }
+);
+const autoIntervalIsUsedPlaceholder = i18n.translate(
+  'visDefaultEditor.controls.numberInterval.autoInteralIsUsed',
+  {
+    defaultMessage: 'Auto interval is used',
+  }
+);
+const useAutoIntervalLabel = i18n.translate('visDefaultEditor.controls.useAutoInterval', {
+  defaultMessage: 'Use auto interval',
+});
+
 function NumberIntervalParamEditor({
   agg,
   editorConfig,
@@ -55,18 +83,28 @@ function NumberIntervalParamEditor({
   setTouched,
   setValidity,
   setValue,
-}: AggParamEditorProps<number | undefined>) {
+}: AggParamEditorProps<string | undefined>) {
+  const isAutoChecked = isAutoInterval(value);
   const base: number = get(editorConfig, 'interval.base') as number;
   const min = base || 0;
-  const isValid = value !== undefined && value >= min;
+  const isValid =
+    value !== '' && value !== undefined && (isAutoInterval(value) || Number(value) >= min);
 
   useEffect(() => {
     setValidity(isValid);
   }, [isValid, setValidity]);
 
-  const onChange = useCallback(
-    ({ target }: React.ChangeEvent<HTMLInputElement>) =>
-      setValue(isNaN(target.valueAsNumber) ? undefined : target.valueAsNumber),
+  const onChange: EuiFieldNumberProps['onChange'] = useCallback(
+    ({ target }) => setValue(isNaN(target.valueAsNumber) ? '' : target.valueAsNumber),
+    [setValue]
+  );
+
+  const onAutoSwitchChange: EuiSwitchProps['onChange'] = useCallback(
+    (e) => {
+      const isAutoSwitchChecked = e.target.checked;
+
+      setValue(isAutoSwitchChecked ? autoInterval : '');
+    },
     [setValue]
   );
 
@@ -78,23 +116,32 @@ function NumberIntervalParamEditor({
       isInvalid={showValidation && !isValid}
       helpText={get(editorConfig, 'interval.help')}
     >
-      <EuiFieldNumber
-        value={value === undefined ? '' : value}
-        min={min}
-        step={base}
-        data-test-subj={`visEditorInterval${agg.id}`}
-        isInvalid={showValidation && !isValid}
-        onChange={onChange}
-        onBlur={setTouched}
-        fullWidth={true}
-        compressed
-        placeholder={i18n.translate(
-          'visDefaultEditor.controls.numberInterval.selectIntervalPlaceholder',
-          {
-            defaultMessage: 'Enter an interval',
-          }
-        )}
-      />
+      <EuiFlexGroup gutterSize="s" responsive={false} direction={'column'}>
+        <EuiFlexItem>
+          <EuiSwitch
+            label={useAutoIntervalLabel}
+            onChange={onAutoSwitchChange}
+            checked={isAutoChecked}
+            compressed
+            data-test-subj={`visEditorIntervalSwitch${agg.id}`}
+          />
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFieldNumber
+            value={!isAutoChecked ? value : ''}
+            min={min}
+            step={base || 'any'}
+            data-test-subj={`visEditorInterval${agg.id}`}
+            isInvalid={showValidation && !isValid}
+            onChange={onChange}
+            onBlur={setTouched}
+            disabled={isAutoChecked}
+            fullWidth
+            compressed
+            placeholder={isAutoChecked ? autoIntervalIsUsedPlaceholder : selectIntervalPlaceholder}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
     </EuiFormRow>
   );
 }
diff --git a/test/functional/page_objects/visualize_editor_page.ts b/test/functional/page_objects/visualize_editor_page.ts
index 9fcb38efce0db9..8cac43d97317b3 100644
--- a/test/functional/page_objects/visualize_editor_page.ts
+++ b/test/functional/page_objects/visualize_editor_page.ts
@@ -445,6 +445,15 @@ export function VisualizeEditorPageProvider({ getService, getPageObjects }: FtrP
       } else if (type === 'custom') {
         await comboBox.setCustom('visEditorInterval', newValue);
       } else {
+        if (type === 'numeric') {
+          const autoMode = await testSubjects.getAttribute(
+            `visEditorIntervalSwitch${aggNth}`,
+            'aria-checked'
+          );
+          if (autoMode === 'true') {
+            await testSubjects.click(`visEditorIntervalSwitch${aggNth}`);
+          }
+        }
         if (append) {
           await testSubjects.append(`visEditorInterval${aggNth}`, String(newValue));
         } else {

From 298a7899bcb2c2bae87be2fcf380e9784348e953 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tylersmalley@me.com>
Date: Tue, 1 Sep 2020 15:40:51 -0700
Subject: [PATCH 165/216] skip flaky suite (#76245)

---
 test/functional/apps/dashboard/embeddable_rendering.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/functional/apps/dashboard/embeddable_rendering.js b/test/functional/apps/dashboard/embeddable_rendering.js
index 73c36c7562e8be..b7b795ae11c967 100644
--- a/test/functional/apps/dashboard/embeddable_rendering.js
+++ b/test/functional/apps/dashboard/embeddable_rendering.js
@@ -99,7 +99,8 @@ export default function ({ getService, getPageObjects }) {
     await dashboardExpect.vegaTextsDoNotExist(['5,000']);
   };
 
-  describe('dashboard embeddable rendering', function describeIndexTests() {
+  // Failing: See https://github.com/elastic/kibana/issues/76245
+  describe.skip('dashboard embeddable rendering', function describeIndexTests() {
     before(async () => {
       await security.testUser.setRoles(['kibana_admin', 'animals', 'test_logstash_reader']);
       await esArchiver.load('dashboard/current/kibana');

From d4a9ea2fff07d4b9a2e66880f4c0005d080c6d4b Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Tue, 1 Sep 2020 16:21:49 -0700
Subject: [PATCH 166/216] [Enterprise Search] Fix various icons in dark mode
 (#76430)

* Update Home catalogue icons to use new 28.0 EUI app icons

* Fix App Search engine icons in dark mode

- Convert to React SVG element in order to be able to inherit correct fill in dark mode
- Fix vertical centering (taking advantage of SVG centering for us)
- Move icons directly to the engines overview component instead of having to reach upwards to a shared assets folder for them

* [Cleanup] Move Setup Guide images

- to be nested within their own component views that use them, instead of having to grab them upwards from a shared assets folder
---
 .../applications/app_search/assets/engine.svg |   3 --
 .../applications/app_search/assets/logo.svg   |   4 ---
 .../app_search/assets/meta_engine.svg         |   4 ---
 .../engine_overview/assets/engine_icon.tsx    |  24 +++++++++++++++
 .../assets/meta_engine_icon.tsx               |  29 ++++++++++++++++++
 .../engine_overview/engine_overview.scss      |   4 ++-
 .../engine_overview/engine_overview.tsx       |   8 ++---
 .../setup_guide}/assets/getting_started.png   | Bin
 .../components/setup_guide/setup_guide.tsx    |   2 +-
 .../workplace_search/assets/logo.svg          |   5 ---
 .../setup_guide}/assets/getting_started.png   | Bin
 .../views/setup_guide/setup_guide.tsx         |   2 +-
 .../enterprise_search/public/plugin.ts        |   6 ++--
 13 files changed, 64 insertions(+), 27 deletions(-)
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/assets/engine.svg
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/assets/logo.svg
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/assets/meta_engine.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/engine_icon.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/meta_engine_icon.tsx
 rename x-pack/plugins/enterprise_search/public/applications/app_search/{ => components/setup_guide}/assets/getting_started.png (100%)
 delete mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/assets/logo.svg
 rename x-pack/plugins/enterprise_search/public/applications/workplace_search/{ => views/setup_guide}/assets/getting_started.png (100%)

diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/engine.svg b/x-pack/plugins/enterprise_search/public/applications/app_search/assets/engine.svg
deleted file mode 100644
index ceab918e92e702..00000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/engine.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="18" height="18">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M9.776 1.389a7.66 7.66 0 00-.725-.04v.001H9a7.65 7.65 0 00-.051 15.301v-.001H9a7.65 7.65 0 00.776-15.261zm-1.52 1.254a6.401 6.401 0 00.02 12.716l2.333-3.791a.875.875 0 00-.354-1.242l-3.07-1.534a2.125 2.125 0 01-.859-3.015l1.93-3.134zm1.489 12.714l1.929-3.134a2.125 2.125 0 00-.86-3.015l-3.07-1.534a.875.875 0 01-.353-1.242L9.724 2.64a6.401 6.401 0 01.02 12.717z" fill="#000"/>
-</svg>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/logo.svg b/x-pack/plugins/enterprise_search/public/applications/app_search/assets/logo.svg
deleted file mode 100644
index 2284a425b5add2..00000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/logo.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" fill="none">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M15.5 11.915L27 5.277 19.5.937a7.002 7.002 0 00-7 0l-8 4.62A7 7 0 001 11.62v9.237a7 7 0 003.5 6.062l7.5 4.33V17.979a7 7 0 013.5-6.063zM10 27.785v-9.808a9 9 0 014.5-7.793l8.503-4.91L18.5 2.67a5.003 5.003 0 00-5 0l-8 4.619a5 5 0 00-2.5 4.33v9.238a5 5 0 002.5 4.33l4.5 2.598z" fill="#343741" />
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M18.409 13.55a7.09 7.09 0 011.035 1.711A6.93 6.93 0 0120 17.978v13.27l7.5-4.33a7 7 0 003.5-6.061v-9.238a6.992 6.992 0 00-1.587-4.422L18.409 13.55zm2.777.705A8.933 8.933 0 0122 17.978v9.807l4.5-2.598a5 5 0 002.5-4.33v-9.238c0-.588-.106-1.161-.303-1.7l-7.51 4.336z" fill="#017D73" />
-</svg>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/meta_engine.svg b/x-pack/plugins/enterprise_search/public/applications/app_search/assets/meta_engine.svg
deleted file mode 100644
index 4e01e9a0b34fb9..00000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/meta_engine.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18" width="18" height="18">
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M4 9a5.002 5.002 0 005 5 5 5 0 10-5-5zm5.506 1.653L8.37 12.697a3.751 3.751 0 01-.003-7.394L7.402 7.04a1.625 1.625 0 00.519 2.142l1.465.976a.375.375 0 01.12.495zm1.092.607l-.777 1.4a3.751 3.751 0 00-.04-7.329L8.494 7.647a.375.375 0 00.12.495l1.465.976c.705.47.93 1.402.52 2.142z" fill="#000"/>
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M6.5 1.375A5.125 5.125 0 001.375 6.5v5A5.125 5.125 0 006.5 16.625h5a5.125 5.125 0 005.125-5.125v-5A5.125 5.125 0 0011.5 1.375h-5zM2.625 6.5A3.875 3.875 0 016.5 2.625h5A3.875 3.875 0 0115.375 6.5v5a3.875 3.875 0 01-3.875 3.875h-5A3.875 3.875 0 012.625 11.5v-5z" fill="#000"/>
-  </svg>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/engine_icon.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/engine_icon.tsx
new file mode 100644
index 00000000000000..64494bfaa7949f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/engine_icon.tsx
@@ -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 React from 'react';
+
+export const EngineIcon: React.FC = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 18 18"
+    width="18"
+    height="18"
+    className="euiIcon engineIcon"
+    aria-hidden="true"
+  >
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M9.776 1.389a7.66 7.66 0 00-.725-.04v.001H9a7.65 7.65 0 00-.051 15.301v-.001H9a7.65 7.65 0 00.776-15.261zm-1.52 1.254a6.401 6.401 0 00.02 12.716l2.333-3.791a.875.875 0 00-.354-1.242l-3.07-1.534a2.125 2.125 0 01-.859-3.015l1.93-3.134zm1.489 12.714l1.929-3.134a2.125 2.125 0 00-.86-3.015l-3.07-1.534a.875.875 0 01-.353-1.242L9.724 2.64a6.401 6.401 0 01.02 12.717z"
+    />
+  </svg>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/meta_engine_icon.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/meta_engine_icon.tsx
new file mode 100644
index 00000000000000..e2939ddcde9d79
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/assets/meta_engine_icon.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';
+
+export const MetaEngineIcon: React.FC = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 18 18"
+    width="18"
+    height="18"
+    className="euiIcon engineIcon"
+    aria-hidden="true"
+  >
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M4 9a5.002 5.002 0 005 5 5 5 0 10-5-5zm5.506 1.653L8.37 12.697a3.751 3.751 0 01-.003-7.394L7.402 7.04a1.625 1.625 0 00.519 2.142l1.465.976a.375.375 0 01.12.495zm1.092.607l-.777 1.4a3.751 3.751 0 00-.04-7.329L8.494 7.647a.375.375 0 00.12.495l1.465.976c.705.47.93 1.402.52 2.142z"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M6.5 1.375A5.125 5.125 0 001.375 6.5v5A5.125 5.125 0 006.5 16.625h5a5.125 5.125 0 005.125-5.125v-5A5.125 5.125 0 0011.5 1.375h-5zM2.625 6.5A3.875 3.875 0 016.5 2.625h5A3.875 3.875 0 0115.375 6.5v5a3.875 3.875 0 01-3.875 3.875h-5A3.875 3.875 0 012.625 11.5v-5z"
+    />
+  </svg>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.scss b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.scss
index e39bbbc95564b4..5e8a20ba425add 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.scss
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/engine_overview.scss
@@ -15,6 +15,8 @@
 .engineIcon {
   display: inline-block;
   width: $euiSize;
-  height: $euiSize;
+  // Use line-height of EuiTitle - SVG will vertically center accordingly
+  height: map-get(map-get($euiTitles, 's'), 'line-height');
+  vertical-align: top;
   margin-right: $euiSizeXS;
 }
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 c3b47b2b585bd4..9703fde7e140af 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
@@ -20,8 +20,8 @@ import { FlashMessages } from '../../../shared/flash_messages';
 import { LicenseContext, ILicenseContext, hasPlatinumLicense } from '../../../shared/licensing';
 import { KibanaContext, IKibanaContext } from '../../../index';
 
-import EnginesIcon from '../../assets/engine.svg';
-import MetaEnginesIcon from '../../assets/meta_engine.svg';
+import { EngineIcon } from './assets/engine_icon';
+import { MetaEngineIcon } from './assets/meta_engine_icon';
 
 import { EngineOverviewHeader, LoadingState, EmptyState } from './components';
 import { EngineTable } from './engine_table';
@@ -93,7 +93,7 @@ export const EngineOverview: React.FC = () => {
         <EuiPageContentHeader>
           <EuiTitle size="s">
             <h2>
-              <img src={EnginesIcon} alt="" className="engineIcon" />
+              <EngineIcon />
               <FormattedMessage
                 id="xpack.enterpriseSearch.appSearch.enginesOverview.engines"
                 defaultMessage="Engines"
@@ -118,7 +118,7 @@ export const EngineOverview: React.FC = () => {
             <EuiPageContentHeader>
               <EuiTitle size="s">
                 <h2>
-                  <img src={MetaEnginesIcon} alt="" className="engineIcon" />
+                  <MetaEngineIcon />
                   <FormattedMessage
                     id="xpack.enterpriseSearch.appSearch.enginesOverview.metaEngines"
                     defaultMessage="Meta Engines"
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/assets/getting_started.png b/x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/assets/getting_started.png
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/app_search/assets/getting_started.png
rename to x-pack/plugins/enterprise_search/public/applications/app_search/components/setup_guide/assets/getting_started.png
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 204f355c7a31a9..12a1be3b3e4bd6 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
@@ -13,7 +13,7 @@ import { APP_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { SetupGuide as SetupGuideLayout } from '../../../shared/setup_guide';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendAppSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import GettingStarted from '../../assets/getting_started.png';
+import GettingStarted from './assets/getting_started.png';
 
 export const SetupGuide: React.FC = () => (
   <SetupGuideLayout
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/assets/logo.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/assets/logo.svg
deleted file mode 100644
index e6b987c3982686..00000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/assets/logo.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-  <path d="M21.1882 8.03747L18.8672 5.09605C18.9491 5.00964 19.0388 4.91586 19.1365 4.81452C19.6347 4.29902 20.4324 3.57073 21.3224 2.9792C22.242 2.368 23.1165 2 23.801 2H29V30H23.8C22.2799 30 20.5224 28.8398 19.2054 27.2777L18.9076 26.8678L21.1873 23.9854C21.1873 23.9854 21.1873 23.9854 21.1873 23.9853C24.9367 19.2461 24.9381 12.7767 21.1886 8.03797C21.1885 8.0378 21.1883 8.03763 21.1882 8.03747Z" stroke="#017D73" stroke-width="2"/>
-  <path d="M17.267 11.1395L17.2678 11.1406C19.5779 14.0598 19.5782 17.9609 17.2659 20.8824L17.2657 20.8827L11.4107 28.2856C11.4107 28.2856 11.4107 28.2857 11.4107 28.2857C10.5677 29.3513 9.22146 30 7.815 30H3V2H7.81C9.22095 2 10.5689 2.65129 11.412 3.71946C11.412 3.71947 11.412 3.71949 11.412 3.71951L17.267 11.1395Z" stroke="#343741" stroke-width="2"/>
-  <path d="M17.2105 21.1254L15.31 23.4123L12.8814 21.0168C10.3527 18.0627 10.3903 13.7569 12.884 11.0593C13.898 9.97667 14.6939 9.15785 15.2809 8.58921L17.2714 11.0032C19.6073 14.0114 19.5622 18.094 17.2105 21.1254Z" stroke="#343741" stroke-width="2"/>
-</svg>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/assets/getting_started.png b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/assets/getting_started.png
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/workplace_search/assets/getting_started.png
rename to x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/assets/getting_started.png
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
index f9b00bdf29642d..d632792f2a666f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/setup_guide/setup_guide.tsx
@@ -13,7 +13,7 @@ import { WORKPLACE_SEARCH_PLUGIN } from '../../../../../common/constants';
 import { SetupGuide as SetupGuideLayout } from '../../../shared/setup_guide';
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { SendWorkplaceSearchTelemetry as SendTelemetry } from '../../../shared/telemetry';
-import GettingStarted from '../../assets/getting_started.png';
+import GettingStarted from './assets/getting_started.png';
 
 const GETTING_STARTED_LINK_URL =
   'https://www.elastic.co/guide/en/workplace-search/current/workplace-search-getting-started.html';
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 1ce6bae8ff6031..83598a0dc971dc 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -27,8 +27,6 @@ import {
   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';
 
 export interface ClientConfigType {
   host?: string;
@@ -117,7 +115,7 @@ export class EnterpriseSearchPlugin implements Plugin {
       plugins.home.featureCatalogue.register({
         id: APP_SEARCH_PLUGIN.ID,
         title: APP_SEARCH_PLUGIN.NAME,
-        icon: AppSearchLogo,
+        icon: 'appSearchApp',
         description: APP_SEARCH_PLUGIN.DESCRIPTION,
         path: APP_SEARCH_PLUGIN.URL,
         category: FeatureCatalogueCategory.DATA,
@@ -127,7 +125,7 @@ export class EnterpriseSearchPlugin implements Plugin {
       plugins.home.featureCatalogue.register({
         id: WORKPLACE_SEARCH_PLUGIN.ID,
         title: WORKPLACE_SEARCH_PLUGIN.NAME,
-        icon: WorkplaceSearchLogo,
+        icon: 'workplaceSearchApp',
         description: WORKPLACE_SEARCH_PLUGIN.DESCRIPTION,
         path: WORKPLACE_SEARCH_PLUGIN.URL,
         category: FeatureCatalogueCategory.DATA,

From a3af33ddaf32cfbfb53f66478bf20649a998a06b Mon Sep 17 00:00:00 2001
From: Tim Sullivan <tsullivan@users.noreply.github.com>
Date: Tue, 1 Sep 2020 16:55:04 -0700
Subject: [PATCH 167/216] [Reporting] Add functional test for Reports in
 non-default spaces (#76053)

* [Reporting] Add functional test for Download CSV in non-default space

* skip tests

* unskip

* rm comment

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../ecommerce_kibana_spaces/data.json.gz      |  Bin 0 -> 1752 bytes
 .../ecommerce_kibana_spaces/mappings.json     | 2635 +++++++++++++++++
 .../reporting_and_security.config.ts          |    1 -
 .../reporting_and_security/index.ts           |    3 +-
 .../reporting_and_security/network_policy.ts  |    2 +-
 .../reporting_and_security/spaces.ts          |   76 +
 .../reporting_and_security/usage.ts           |    2 +-
 7 files changed, 2715 insertions(+), 4 deletions(-)
 create mode 100644 x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json.gz
 create mode 100644 x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
 create mode 100644 x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts

diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json.gz b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..06e83f8c267d6618669bd8641c79c3dda19c1679
GIT binary patch
literal 1752
zcmV;}1}FI+iwFpY>qcJ!17u-zVJ>QOZ*Bn9TU&3VI23;GuZVbDH3$f~z}srNm1d>s
ztftv{n6^R=IElA_Gsbk9t@7XZ*jxgHWXQDJ#8Rt}<J))c$Bucq==C(dUSZAcX#w@M
zOF?)-VJavu@CCk-K(xj*_5wUdX~?}~g?#LiIKa>S72+JT*fmDu0Q-*7$7789rioD>
zjR!_Q7*4Q*(Res9XL5QmqZlbB)gQ?W#i*bsG-dvF<)UY?Mx_Co<^+d9B4)XJxz~J}
z#{6D$jmvv2MiGX`d(9)ky#@rqp(G@nk$53#IGF-90rFkm@d2ob&&Y~n_~y=0m|#J|
zi1|x23&j+irGkbQ3x*en*QpGn;F{6siuzxL2$N!#&E<ZCg2ApJv%V+6nfR39I?gza
zW|&FZ&)^iq2A+caOMs-U)DcyQb<q_K52pc}A?&2&tj9a)*sP-T5yuP4*4=<|{LEj2
z^A+MOfa;HU{e!ZOK3;bIUu2s%CFyLM0Riw4#7dGqt`NhLk*b(Cn*+*78I17P=fc|o
zZKMgO5oX?uFuwExV6P6kq|_j1)c3(_w&I-=mT)hlpS#8HVpi1n+k}7E4~hY47^<eM
z0<!A5+KRrRs&>8?7z!1pP~;+kLSRFrT+}KdEA9vt(RXr$)sn{e{7oxBYmd&o9~eI>
z1=b^bHzYN<B!-GhG@Jk~jt~jYU#bgC$x8PLUmp=#&HyltIf=nf6+;b8Z0(VRdOi)5
z!5vcAyAT@J@j{!oqC^a8LasEO3^YsykQK3y2*v3f`8;J^>!%Z@_bOO56MJ3Uhf+GA
zg?xUFd)pS6DwMM;MuXJniQXCQ2`#+}R!vK<i~EqJmpx}F!QP4yA9t&=mMENi^N=Eb
zT7#0f)0l7-!7FnHyMtJ9zu0>!yN7F777%;QV(85BL5VjYiR|E^DC?(^Q<UIWnE9YN
zv{1~el`896Q7i7<-3z_#5E84HK$L_mA9f1CeYis^Z0;NoD{%_jidu1ht}CFEKYveA
z%n4tg|B+z{IeAPK+Q@PAtYmcoxaVo8Vyp+`Ax;t%q09Z5ibd(U`ef}#^W3C4<><@}
zy9ry`vvRm4-m^|HEqK8Nzo+7aCv(a3&x_qJ(Va3MrpXyyeR#-k*2)XBoJ9CqT$;TB
ztm5A6_E5Xtjfb)s`!tHgj{7$)Z`~B#w1_O2{4MA!W(j=MujV#y?P_Cvq#L`l2%*Wl
z#H|;MOHjby9E;m<SX}qL%c&1#b8&&WzHHf?t^#>hgShBq8J5vECVgu(wJg_mT+7mp
ziSaE%x497in~RH=*W8TuX*?$jccL4>_0e~pv(a^l&Qbz;OCz8<hA}oB#~RvW+i)DS
zqB_CnHDwXvF8^1o_4o8cRkb<Fj|G%YceanzeTg2F?!1H2^YyxEd*s>^eQcVq&~~Qb
zeYlTM^H2CIL{t$i)JwwegKLb$Nk(;CWn?bmcIobDqhPur{DV>)x&uoeSk|khm}5I$
zb}hp3Kp>bsVKKc7i&eAFqHAWW+H^^h9{lko?&S!2b@qQn)>rvVw{ItB+Z~wtWHNZu
z*c6~-IirXL?!b329*o}jjg4~thV9mMP!;u(a3Nl!Ldq7oMWD{lvwyJ9KVgn)6N<HE
ze!P_k{=EHsBj$yy3`LDN#&;`^_nOSUA&M8NJUj-<W7f6-`kaJZByIQZVWX8RY$|xD
z1fEn@fi(XKu?2}MCm2f-;J;9e!>LH2+oPE(vn$bFP9)x3dCH=w1SK<u#JXT4xPm;N
zG4h;O8SDJ>2YlKSv81T&!~>Dz2Zm+Zwu$;f8=HOGo{jqs0)q;iv4N0dIf3nGJWCuO
zvlmJ_4-^#))P+GHT;qcbyaHc2-xoZ;DYtrp-~luBA_Sryc+>JD)R7D<wyDz<0>SQh
zaK*ZfR{hA*1`43eiA<+&jQXZAH3qIZcCCp%F(AP=`hUR*r)+mI**K-!sm6WNo|;f7
z3|(WS4<^HJt>w}mP%ibZ3hVFP(70ER36()lW#%-GOs`e<f($!&^9<XoD<lgemNmmO
zY;_40jj))TLA|jIhSGy8F1I(!Z`tk^Iw!8_=mXn%)6kj0b&n9n5pnad+H*-so!jrD
z^CMp9Yv{Z+dh5+_t!J`nHH>;Cf51LUxzsAqFpc6me}bI<!dqXl<%NWO9g17<4al|4
ze_LB)quuDTd*-pzp>dYe#FxD&q_tKj@0WI$WU&n4pZ^|)+myIXZaLvq*;(W{VHwpt
ubBwXUgzfn~p^WdX@ahr%HnX^n!MqXay6#DbmTp<i;PoFom$HnlI{*N~Ms-L4

literal 0
HcmV?d00001

diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
new file mode 100644
index 00000000000000..1de04a64398c4d
--- /dev/null
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/mappings.json
@@ -0,0 +1,2635 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {
+      }
+    },
+    "index": ".kibana_1",
+    "mappings": {
+      "_meta": {
+        "migrationMappingPropertyHashes": {
+          "action": "6e96ac5e648f57523879661ea72525b7",
+          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
+          "alert": "7b44fba6773e37c806ce290ea9b7024e",
+          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
+          "apm-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "app_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
+          "application_usage_transactional": "43b8830d5d0df85a6823d290885fc9fd",
+          "canvas-element": "7390014e1091044523666d97247392fc",
+          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
+          "canvas-workpad-template": "ae2673f678281e2c055d764b153e9715",
+          "cases": "32aa96a6d3855ddda53010ae2048ac22",
+          "cases-comments": "c2061fb929f585df57425102fa928b4b",
+          "cases-configure": "42711cbb311976c0687853f4c1354572",
+          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
+          "config": "c63748b75f39d0c54de12d12c1ccbc20",
+          "dashboard": "74eb4b909f81222fa1ddeaba2881a37e",
+          "endpoint:user-artifact": "4a11183eee21e6fbad864f7a30b39ad0",
+          "endpoint:user-artifact-manifest": "4b9c0e7cfaf86d82a7ee9ed68065e50d",
+          "epm-packages": "386dc9996a3b74607de64c2ab2171582",
+          "exception-list": "497afa2f881a675d72d58e20057f3d8b",
+          "exception-list-agnostic": "497afa2f881a675d72d58e20057f3d8b",
+          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
+          "fleet-agent-actions": "e520c855577170c24481be05c3ae14ec",
+          "fleet-agent-events": "e20a508b6e805189356be381dbfac8db",
+          "fleet-agents": "6012d61d15e72564e47fc3402332756e",
+          "fleet-enrollment-api-keys": "a69ef7ae661dab31561d6c6f052ef2a7",
+          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
+          "index-pattern": "45915a1ad866812242df474eb0479052",
+          "infrastructure-ui-source": "2b2809653635caf490c93f090502d04c",
+          "ingest-agent-policies": "8b0733cce189659593659dad8db426f0",
+          "ingest-outputs": "8aa988c376e65443fefc26f1075e93a3",
+          "ingest-package-policies": "f74dfe498e1849267cda41580b2be110",
+          "ingest_manager_settings": "012cf278ec84579495110bb827d1ed09",
+          "inventory-view": "88fc7e12fd1b45b6f0787323ce4f18d2",
+          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
+          "lens": "52346cfec69ff7b47d5f0c12361a2797",
+          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
+          "map": "4a05b35c3a3a58fbc72dd0202dc3487f",
+          "maps-telemetry": "5ef305b18111b77789afefbd36b66171",
+          "metrics-explorer-view": "a8df1d270ee48c969d22d23812d08187",
+          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
+          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
+          "namespace": "2f4316de49999235636386fe51dc06c1",
+          "namespaces": "2f4316de49999235636386fe51dc06c1",
+          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
+          "references": "7997cf5a56cc02bdc9c93361bde732b0",
+          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
+          "search": "7f9e077078cab612f6a58e3bfdedb71a",
+          "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
+          "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
+          "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
+          "siem-ui-timeline": "94bc38c7a421d15fbfe8ea565370a421",
+          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
+          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
+          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
+          "telemetry": "36a616f7026dfa617d6655df850fe16d",
+          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
+          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
+          "type": "2f4316de49999235636386fe51dc06c1",
+          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
+          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
+          "upgrade-assistant-reindex-operation": "215107c281839ea9b3ad5f6419819763",
+          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
+          "uptime-dynamic-settings": "3d1b76c39bfb2cc8296b024d73854724",
+          "url": "c7f66a0df8b1b52f17c28c4adb111105",
+          "visualization": "44d6bd48a1a653bcb60ea01614b9e3c9",
+          "workplace_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724"
+        }
+      },
+      "dynamic": "strict",
+      "properties": {
+        "action": {
+          "properties": {
+            "actionTypeId": {
+              "type": "keyword"
+            },
+            "config": {
+              "enabled": false,
+              "type": "object"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "secrets": {
+              "type": "binary"
+            }
+          }
+        },
+        "action_task_params": {
+          "properties": {
+            "actionId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            }
+          }
+        },
+        "agent_actions": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "agent_configs": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "agent_events": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "agents": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "alert": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "actionRef": {
+                  "type": "keyword"
+                },
+                "actionTypeId": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              },
+              "type": "nested"
+            },
+            "alertTypeId": {
+              "type": "keyword"
+            },
+            "apiKey": {
+              "type": "binary"
+            },
+            "apiKeyOwner": {
+              "type": "keyword"
+            },
+            "consumer": {
+              "type": "keyword"
+            },
+            "createdAt": {
+              "type": "date"
+            },
+            "createdBy": {
+              "type": "keyword"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "muteAll": {
+              "type": "boolean"
+            },
+            "mutedInstanceIds": {
+              "type": "keyword"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "params": {
+              "enabled": false,
+              "type": "object"
+            },
+            "schedule": {
+              "properties": {
+                "interval": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "scheduledTaskId": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "throttle": {
+              "type": "keyword"
+            },
+            "updatedBy": {
+              "type": "keyword"
+            }
+          }
+        },
+        "apm-indices": {
+          "properties": {
+            "apm_oss": {
+              "properties": {
+                "errorIndices": {
+                  "type": "keyword"
+                },
+                "metricsIndices": {
+                  "type": "keyword"
+                },
+                "onboardingIndices": {
+                  "type": "keyword"
+                },
+                "sourcemapIndices": {
+                  "type": "keyword"
+                },
+                "spanIndices": {
+                  "type": "keyword"
+                },
+                "transactionIndices": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "apm-services-telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "apm-telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "app_search_telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "application_usage_totals": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "application_usage_transactional": {
+          "dynamic": "false",
+          "properties": {
+            "timestamp": {
+              "type": "date"
+            }
+          }
+        },
+        "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"
+            }
+          }
+        },
+        "canvas-workpad-template": {
+          "dynamic": "false",
+          "properties": {
+            "help": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "name": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "tags": {
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "template_key": {
+              "type": "keyword"
+            }
+          }
+        },
+        "cases": {
+          "properties": {
+            "closed_at": {
+              "type": "date"
+            },
+            "closed_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "connector_id": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "external_service": {
+              "properties": {
+                "connector_id": {
+                  "type": "keyword"
+                },
+                "connector_name": {
+                  "type": "keyword"
+                },
+                "external_id": {
+                  "type": "keyword"
+                },
+                "external_title": {
+                  "type": "text"
+                },
+                "external_url": {
+                  "type": "text"
+                },
+                "pushed_at": {
+                  "type": "date"
+                },
+                "pushed_by": {
+                  "properties": {
+                    "email": {
+                      "type": "keyword"
+                    },
+                    "full_name": {
+                      "type": "keyword"
+                    },
+                    "username": {
+                      "type": "keyword"
+                    }
+                  }
+                }
+              }
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-comments": {
+          "properties": {
+            "comment": {
+              "type": "text"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "pushed_at": {
+              "type": "date"
+            },
+            "pushed_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-configure": {
+          "properties": {
+            "closure_type": {
+              "type": "keyword"
+            },
+            "connector_id": {
+              "type": "keyword"
+            },
+            "connector_name": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "cases-user-actions": {
+          "properties": {
+            "action": {
+              "type": "keyword"
+            },
+            "action_at": {
+              "type": "date"
+            },
+            "action_by": {
+              "properties": {
+                "email": {
+                  "type": "keyword"
+                },
+                "full_name": {
+                  "type": "keyword"
+                },
+                "username": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "action_field": {
+              "type": "keyword"
+            },
+            "new_value": {
+              "type": "text"
+            },
+            "old_value": {
+              "type": "text"
+            }
+          }
+        },
+        "config": {
+          "dynamic": "false",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "doc_values": false,
+              "index": false,
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "index": false,
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "index": false,
+              "type": "text"
+            },
+            "panelsJSON": {
+              "index": false,
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "doc_values": false,
+                  "index": false,
+                  "type": "keyword"
+                },
+                "pause": {
+                  "doc_values": false,
+                  "index": false,
+                  "type": "boolean"
+                },
+                "section": {
+                  "doc_values": false,
+                  "index": false,
+                  "type": "integer"
+                },
+                "value": {
+                  "doc_values": false,
+                  "index": false,
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "doc_values": false,
+              "index": false,
+              "type": "boolean"
+            },
+            "timeTo": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "datasources": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "endpoint:user-artifact": {
+          "properties": {
+            "body": {
+              "type": "binary"
+            },
+            "compressionAlgorithm": {
+              "index": false,
+              "type": "keyword"
+            },
+            "created": {
+              "index": false,
+              "type": "date"
+            },
+            "decodedSha256": {
+              "index": false,
+              "type": "keyword"
+            },
+            "decodedSize": {
+              "index": false,
+              "type": "long"
+            },
+            "encodedSha256": {
+              "type": "keyword"
+            },
+            "encodedSize": {
+              "index": false,
+              "type": "long"
+            },
+            "encryptionAlgorithm": {
+              "index": false,
+              "type": "keyword"
+            },
+            "identifier": {
+              "type": "keyword"
+            }
+          }
+        },
+        "endpoint:user-artifact-manifest": {
+          "properties": {
+            "created": {
+              "index": false,
+              "type": "date"
+            },
+            "ids": {
+              "index": false,
+              "type": "keyword"
+            },
+            "schemaVersion": {
+              "type": "keyword"
+            },
+            "semanticVersion": {
+              "index": false,
+              "type": "keyword"
+            }
+          }
+        },
+        "enrollment_api_keys": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "epm-package": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "epm-packages": {
+          "properties": {
+            "es_index_patterns": {
+              "enabled": false,
+              "type": "object"
+            },
+            "install_started_at": {
+              "type": "date"
+            },
+            "install_status": {
+              "type": "keyword"
+            },
+            "install_version": {
+              "type": "keyword"
+            },
+            "installed_es": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "installed_kibana": {
+              "properties": {
+                "id": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "internal": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "removable": {
+              "type": "boolean"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "exception-list": {
+          "properties": {
+            "_tags": {
+              "type": "keyword"
+            },
+            "comments": {
+              "properties": {
+                "comment": {
+                  "type": "keyword"
+                },
+                "created_at": {
+                  "type": "keyword"
+                },
+                "created_by": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "updated_at": {
+                  "type": "keyword"
+                },
+                "updated_by": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created_at": {
+              "type": "keyword"
+            },
+            "created_by": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "keyword"
+            },
+            "entries": {
+              "properties": {
+                "entries": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "operator": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "fields": {
+                        "text": {
+                          "type": "text"
+                        }
+                      },
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "list": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "operator": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "value": {
+                  "fields": {
+                    "text": {
+                      "type": "text"
+                    }
+                  },
+                  "type": "keyword"
+                }
+              }
+            },
+            "immutable": {
+              "type": "boolean"
+            },
+            "item_id": {
+              "type": "keyword"
+            },
+            "list_id": {
+              "type": "keyword"
+            },
+            "list_type": {
+              "type": "keyword"
+            },
+            "meta": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "tie_breaker_id": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "updated_by": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "exception-list-agnostic": {
+          "properties": {
+            "_tags": {
+              "type": "keyword"
+            },
+            "comments": {
+              "properties": {
+                "comment": {
+                  "type": "keyword"
+                },
+                "created_at": {
+                  "type": "keyword"
+                },
+                "created_by": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "updated_at": {
+                  "type": "keyword"
+                },
+                "updated_by": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "created_at": {
+              "type": "keyword"
+            },
+            "created_by": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "keyword"
+            },
+            "entries": {
+              "properties": {
+                "entries": {
+                  "properties": {
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "operator": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "fields": {
+                        "text": {
+                          "type": "text"
+                        }
+                      },
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "list": {
+                  "properties": {
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    }
+                  }
+                },
+                "operator": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "value": {
+                  "fields": {
+                    "text": {
+                      "type": "text"
+                    }
+                  },
+                  "type": "keyword"
+                }
+              }
+            },
+            "immutable": {
+              "type": "boolean"
+            },
+            "item_id": {
+              "type": "keyword"
+            },
+            "list_id": {
+              "type": "keyword"
+            },
+            "list_type": {
+              "type": "keyword"
+            },
+            "meta": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "tags": {
+              "type": "keyword"
+            },
+            "tie_breaker_id": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "updated_by": {
+              "type": "keyword"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "file-upload-telemetry": {
+          "properties": {
+            "filesUploadedTotalCount": {
+              "type": "long"
+            }
+          }
+        },
+        "fleet-agent-actions": {
+          "properties": {
+            "agent_id": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "data": {
+              "type": "binary"
+            },
+            "sent_at": {
+              "type": "date"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "fleet-agent-events": {
+          "properties": {
+            "action_id": {
+              "type": "keyword"
+            },
+            "agent_id": {
+              "type": "keyword"
+            },
+            "data": {
+              "type": "text"
+            },
+            "message": {
+              "type": "text"
+            },
+            "payload": {
+              "type": "text"
+            },
+            "policy_id": {
+              "type": "keyword"
+            },
+            "stream_id": {
+              "type": "keyword"
+            },
+            "subtype": {
+              "type": "keyword"
+            },
+            "timestamp": {
+              "type": "date"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "fleet-agents": {
+          "properties": {
+            "access_api_key_id": {
+              "type": "keyword"
+            },
+            "active": {
+              "type": "boolean"
+            },
+            "current_error_events": {
+              "index": false,
+              "type": "text"
+            },
+            "default_api_key": {
+              "type": "binary"
+            },
+            "default_api_key_id": {
+              "type": "keyword"
+            },
+            "enrolled_at": {
+              "type": "date"
+            },
+            "last_checkin": {
+              "type": "date"
+            },
+            "last_checkin_status": {
+              "type": "keyword"
+            },
+            "last_updated": {
+              "type": "date"
+            },
+            "local_metadata": {
+              "type": "flattened"
+            },
+            "packages": {
+              "type": "keyword"
+            },
+            "policy_id": {
+              "type": "keyword"
+            },
+            "policy_revision": {
+              "type": "integer"
+            },
+            "shared_id": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "unenrolled_at": {
+              "type": "date"
+            },
+            "unenrollment_started_at": {
+              "type": "date"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "user_provided_metadata": {
+              "type": "flattened"
+            },
+            "version": {
+              "type": "keyword"
+            }
+          }
+        },
+        "fleet-enrollment-api-keys": {
+          "properties": {
+            "active": {
+              "type": "boolean"
+            },
+            "api_key": {
+              "type": "binary"
+            },
+            "api_key_id": {
+              "type": "keyword"
+            },
+            "created_at": {
+              "type": "date"
+            },
+            "expire_at": {
+              "type": "date"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "policy_id": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            }
+          }
+        },
+        "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": {
+          "dynamic": "false",
+          "properties": {
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "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"
+                }
+              }
+            },
+            "inventoryDefaultView": {
+              "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"
+            },
+            "metricsExplorerDefaultView": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text"
+            }
+          }
+        },
+        "ingest-agent-policies": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "is_default": {
+              "type": "boolean"
+            },
+            "monitoring_enabled": {
+              "index": false,
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "namespace": {
+              "type": "keyword"
+            },
+            "package_policies": {
+              "type": "keyword"
+            },
+            "revision": {
+              "type": "integer"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "type": "keyword"
+            }
+          }
+        },
+        "ingest-outputs": {
+          "properties": {
+            "ca_sha256": {
+              "index": false,
+              "type": "keyword"
+            },
+            "config": {
+              "type": "flattened"
+            },
+            "fleet_enroll_password": {
+              "type": "binary"
+            },
+            "fleet_enroll_username": {
+              "type": "binary"
+            },
+            "hosts": {
+              "type": "keyword"
+            },
+            "is_default": {
+              "type": "boolean"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "ingest-package-policies": {
+          "properties": {
+            "created_at": {
+              "type": "date"
+            },
+            "created_by": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "inputs": {
+              "enabled": false,
+              "properties": {
+                "config": {
+                  "type": "flattened"
+                },
+                "enabled": {
+                  "type": "boolean"
+                },
+                "streams": {
+                  "properties": {
+                    "compiled_stream": {
+                      "type": "flattened"
+                    },
+                    "config": {
+                      "type": "flattened"
+                    },
+                    "data_stream": {
+                      "properties": {
+                        "dataset": {
+                          "type": "keyword"
+                        },
+                        "type": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "enabled": {
+                      "type": "boolean"
+                    },
+                    "id": {
+                      "type": "keyword"
+                    },
+                    "vars": {
+                      "type": "flattened"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "type": {
+                  "type": "keyword"
+                },
+                "vars": {
+                  "type": "flattened"
+                }
+              },
+              "type": "nested"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "namespace": {
+              "type": "keyword"
+            },
+            "output_id": {
+              "type": "keyword"
+            },
+            "package": {
+              "properties": {
+                "name": {
+                  "type": "keyword"
+                },
+                "title": {
+                  "type": "keyword"
+                },
+                "version": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "policy_id": {
+              "type": "keyword"
+            },
+            "revision": {
+              "type": "integer"
+            },
+            "updated_at": {
+              "type": "date"
+            },
+            "updated_by": {
+              "type": "keyword"
+            }
+          }
+        },
+        "ingest_manager_settings": {
+          "properties": {
+            "agent_auto_upgrade": {
+              "type": "keyword"
+            },
+            "has_seen_add_data_notice": {
+              "index": false,
+              "type": "boolean"
+            },
+            "kibana_ca_sha256": {
+              "type": "keyword"
+            },
+            "kibana_url": {
+              "type": "keyword"
+            },
+            "package_auto_upgrade": {
+              "type": "keyword"
+            }
+          }
+        },
+        "inventory-view": {
+          "properties": {
+            "accountId": {
+              "type": "keyword"
+            },
+            "autoBounds": {
+              "type": "boolean"
+            },
+            "autoReload": {
+              "type": "boolean"
+            },
+            "boundsOverride": {
+              "properties": {
+                "max": {
+                  "type": "integer"
+                },
+                "min": {
+                  "type": "integer"
+                }
+              }
+            },
+            "customMetrics": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              },
+              "type": "nested"
+            },
+            "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"
+            },
+            "legend": {
+              "properties": {
+                "palette": {
+                  "type": "keyword"
+                },
+                "reverseColors": {
+                  "type": "boolean"
+                },
+                "steps": {
+                  "type": "long"
+                }
+              }
+            },
+            "metric": {
+              "properties": {
+                "aggregation": {
+                  "type": "keyword"
+                },
+                "field": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "label": {
+                  "type": "keyword"
+                },
+                "type": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "nodeType": {
+              "type": "keyword"
+            },
+            "region": {
+              "type": "keyword"
+            },
+            "sort": {
+              "properties": {
+                "by": {
+                  "type": "keyword"
+                },
+                "direction": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "time": {
+              "type": "long"
+            },
+            "view": {
+              "type": "keyword"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "lens": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "expression": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "state": {
+              "type": "flattened"
+            },
+            "title": {
+              "type": "text"
+            },
+            "visualizationType": {
+              "type": "keyword"
+            }
+          }
+        },
+        "lens-ui-telemetry": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            },
+            "date": {
+              "type": "date"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "maps-telemetry": {
+          "enabled": false,
+          "type": "object"
+        },
+        "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"
+                },
+                "forceInterval": {
+                  "type": "boolean"
+                },
+                "groupBy": {
+                  "type": "keyword"
+                },
+                "limit": {
+                  "type": "integer"
+                },
+                "metrics": {
+                  "properties": {
+                    "aggregation": {
+                      "type": "keyword"
+                    },
+                    "color": {
+                      "type": "keyword"
+                    },
+                    "field": {
+                      "type": "keyword"
+                    },
+                    "label": {
+                      "type": "keyword"
+                    }
+                  },
+                  "type": "nested"
+                },
+                "source": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "config": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "dashboard": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "index-pattern": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "search": {
+              "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"
+        },
+        "namespaces": {
+          "type": "keyword"
+        },
+        "outputs": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "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": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "doc_values": false,
+              "index": false,
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "index": false,
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "search-telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "server": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "siem-detection-engine-rule-actions": {
+          "properties": {
+            "actions": {
+              "properties": {
+                "action_type_id": {
+                  "type": "keyword"
+                },
+                "group": {
+                  "type": "keyword"
+                },
+                "id": {
+                  "type": "keyword"
+                },
+                "params": {
+                  "enabled": false,
+                  "type": "object"
+                }
+              }
+            },
+            "alertThrottle": {
+              "type": "keyword"
+            },
+            "ruleAlertId": {
+              "type": "keyword"
+            },
+            "ruleThrottle": {
+              "type": "keyword"
+            }
+          }
+        },
+        "siem-detection-engine-rule-status": {
+          "properties": {
+            "alertId": {
+              "type": "keyword"
+            },
+            "bulkCreateTimeDurations": {
+              "type": "float"
+            },
+            "gap": {
+              "type": "text"
+            },
+            "lastFailureAt": {
+              "type": "date"
+            },
+            "lastFailureMessage": {
+              "type": "text"
+            },
+            "lastLookBackDate": {
+              "type": "date"
+            },
+            "lastSuccessAt": {
+              "type": "date"
+            },
+            "lastSuccessMessage": {
+              "type": "text"
+            },
+            "searchAfterTimeDurations": {
+              "type": "float"
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "statusDate": {
+              "type": "date"
+            }
+          }
+        },
+        "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"
+                        }
+                      }
+                    },
+                    "type": {
+                      "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"
+                    }
+                  }
+                },
+                "type": {
+                  "type": "text"
+                }
+              }
+            },
+            "dateRange": {
+              "properties": {
+                "end": {
+                  "type": "date"
+                },
+                "start": {
+                  "type": "date"
+                }
+              }
+            },
+            "description": {
+              "type": "text"
+            },
+            "eventType": {
+              "type": "keyword"
+            },
+            "excludedRowRendererIds": {
+              "type": "text"
+            },
+            "favorite": {
+              "properties": {
+                "favoriteDate": {
+                  "type": "date"
+                },
+                "fullName": {
+                  "type": "text"
+                },
+                "keySearch": {
+                  "type": "text"
+                },
+                "userName": {
+                  "type": "text"
+                }
+              }
+            },
+            "filters": {
+              "properties": {
+                "exists": {
+                  "type": "text"
+                },
+                "match_all": {
+                  "type": "text"
+                },
+                "meta": {
+                  "properties": {
+                    "alias": {
+                      "type": "text"
+                    },
+                    "controlledBy": {
+                      "type": "text"
+                    },
+                    "disabled": {
+                      "type": "boolean"
+                    },
+                    "field": {
+                      "type": "text"
+                    },
+                    "formattedValue": {
+                      "type": "text"
+                    },
+                    "index": {
+                      "type": "keyword"
+                    },
+                    "key": {
+                      "type": "keyword"
+                    },
+                    "negate": {
+                      "type": "boolean"
+                    },
+                    "params": {
+                      "type": "text"
+                    },
+                    "type": {
+                      "type": "keyword"
+                    },
+                    "value": {
+                      "type": "text"
+                    }
+                  }
+                },
+                "missing": {
+                  "type": "text"
+                },
+                "query": {
+                  "type": "text"
+                },
+                "range": {
+                  "type": "text"
+                },
+                "script": {
+                  "type": "text"
+                }
+              }
+            },
+            "kqlMode": {
+              "type": "keyword"
+            },
+            "kqlQuery": {
+              "properties": {
+                "filterQuery": {
+                  "properties": {
+                    "kuery": {
+                      "properties": {
+                        "expression": {
+                          "type": "text"
+                        },
+                        "kind": {
+                          "type": "keyword"
+                        }
+                      }
+                    },
+                    "serializedQuery": {
+                      "type": "text"
+                    }
+                  }
+                }
+              }
+            },
+            "savedQueryId": {
+              "type": "keyword"
+            },
+            "sort": {
+              "properties": {
+                "columnId": {
+                  "type": "keyword"
+                },
+                "sortDirection": {
+                  "type": "keyword"
+                }
+              }
+            },
+            "status": {
+              "type": "keyword"
+            },
+            "templateTimelineId": {
+              "type": "text"
+            },
+            "templateTimelineVersion": {
+              "type": "integer"
+            },
+            "timelineType": {
+              "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"
+            }
+          }
+        },
+        "telemetry": {
+          "properties": {
+            "allowChangingOptInStatus": {
+              "type": "boolean"
+            },
+            "enabled": {
+              "type": "boolean"
+            },
+            "lastReported": {
+              "type": "date"
+            },
+            "lastVersionChecked": {
+              "type": "keyword"
+            },
+            "reportFailureCount": {
+              "type": "integer"
+            },
+            "reportFailureVersion": {
+              "type": "keyword"
+            },
+            "sendUsageFrom": {
+              "type": "keyword"
+            },
+            "userHasSeenNotice": {
+              "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"
+            }
+          }
+        },
+        "tsvb-validation-telemetry": {
+          "properties": {
+            "failedRequests": {
+              "type": "long"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "ui-metric": {
+          "properties": {
+            "count": {
+              "type": "integer"
+            }
+          }
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "upgrade-assistant-reindex-operation": {
+          "properties": {
+            "errorMessage": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "indexName": {
+              "type": "keyword"
+            },
+            "lastCompletedStep": {
+              "type": "long"
+            },
+            "locked": {
+              "type": "date"
+            },
+            "newIndexName": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "reindexOptions": {
+              "properties": {
+                "openAndClose": {
+                  "type": "boolean"
+                },
+                "queueSettings": {
+                  "properties": {
+                    "queuedAt": {
+                      "type": "long"
+                    },
+                    "startedAt": {
+                      "type": "long"
+                    }
+                  }
+                }
+              }
+            },
+            "reindexTaskId": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 256,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            },
+            "reindexTaskPercComplete": {
+              "type": "float"
+            },
+            "runningReindexCount": {
+              "type": "integer"
+            },
+            "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"
+                }
+              }
+            }
+          }
+        },
+        "uptime-dynamic-settings": {
+          "dynamic": "false",
+          "type": "object"
+        },
+        "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": {
+                  "index": false,
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchRefName": {
+              "doc_values": false,
+              "index": false,
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "index": false,
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "index": false,
+              "type": "text"
+            }
+          }
+        },
+        "workplace_search_telemetry": {
+          "dynamic": "false",
+          "type": "object"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security.config.ts b/x-pack/test/reporting_api_integration/reporting_and_security.config.ts
index dc5aaba69604f5..ee165bf45fc7ed 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security.config.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security.config.ts
@@ -44,7 +44,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         `--xpack.reporting.csv.maxSizeBytes=2850`,
         `--xpack.reporting.queue.pollInterval=3000`,
         `--xpack.security.session.idleTimeout=3600000`,
-        `--xpack.spaces.enabled=false`,
         `--xpack.reporting.capture.networkPolicy.rules=${JSON.stringify(testPolicyRules)}`,
       ],
     },
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
index 18ef28150c42d7..8bf4d2448498c5 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
@@ -12,7 +12,8 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     this.tags('ciGroup2');
     loadTestFile(require.resolve('./csv_job_params'));
     loadTestFile(require.resolve('./csv_saved_search'));
-    loadTestFile(require.resolve('./usage'));
     loadTestFile(require.resolve('./network_policy'));
+    loadTestFile(require.resolve('./spaces'));
+    loadTestFile(require.resolve('./usage'));
   });
 }
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
index 9f9800cafb99a9..8692f79d5aea9b 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
@@ -20,7 +20,7 @@ export default function ({ getService }: FtrProviderContext) {
    * The Reporting API Functional Test config implements a network policy that
    * is designed to disallow the following Canvas worksheet
    */
-  describe('reporting network policy', () => {
+  describe('Network Policy', () => {
     before(async () => {
       await esArchiver.load(archive); // includes a canvas worksheet with an offending image URL
     });
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
new file mode 100644
index 00000000000000..0145ca2a180927
--- /dev/null
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
@@ -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 expect from '@kbn/expect';
+import * as Rx from 'rxjs';
+import { filter, first, map, switchMap, tap, timeout } from 'rxjs/operators';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const reportingAPI = getService('reportingAPI');
+  const supertest = getService('supertest');
+  const log = getService('log');
+
+  const getCompleted$ = (downloadPath: string) => {
+    return Rx.interval(2000).pipe(
+      tap(() => log.debug(`checking report status at ${downloadPath}...`)),
+      switchMap(() => supertest.get(downloadPath)),
+      filter(({ status: statusCode }) => statusCode === 200),
+      map((response) => response.text),
+      first(),
+      timeout(15000)
+    );
+  };
+
+  describe('Exports from Non-default Space', () => {
+    before(async () => {
+      await esArchiver.load('reporting/ecommerce');
+      await esArchiver.load('reporting/ecommerce_kibana_spaces'); // dashboard in non default space
+    });
+
+    after(async () => {
+      await esArchiver.unload('reporting/ecommerce');
+      await esArchiver.unload('reporting/ecommerce_kibana_spaces');
+    });
+
+    afterEach(async () => {
+      await reportingAPI.deleteAllReports();
+    });
+
+    it('should complete a job of CSV saved search export in non-default space', async () => {
+      const downloadPath = await reportingAPI.postJob(
+        `/s/non_default_space/api/reporting/generate/csv?jobParams=%28browserTimezone%3AUTC%2CconflictedTypesFields%3A%21%28%29%2Cfields%3A%21%28order_date%2Ccategory%2Ccustomer_first_name%2Ccustomer_full_name%2Ctotal_quantity%2Ctotal_unique_products%2Ctaxless_total_price%2Ctaxful_total_price%2Ccurrency%29%2CindexPatternId%3A%27067dec90-e7ee-11ea-a730-d58e9ea7581b%27%2CmetaFields%3A%21%28_source%2C_id%2C_type%2C_index%2C_score%29%2CobjectType%3Asearch%2CsearchRequest%3A%28body%3A%28_source%3A%28includes%3A%21%28order_date%2Ccategory%2Ccustomer_first_name%2Ccustomer_full_name%2Ctotal_quantity%2Ctotal_unique_products%2Ctaxless_total_price%2Ctaxful_total_price%2Ccurrency%29%29%2Cdocvalue_fields%3A%21%28%28field%3Aorder_date%2Cformat%3Adate_time%29%29%2Cquery%3A%28bool%3A%28filter%3A%21%28%28match_all%3A%28%29%29%2C%28range%3A%28order_date%3A%28format%3Astrict_date_optional_time%2Cgte%3A%272019-06-11T08%3A24%3A16.425Z%27%2Clte%3A%272019-07-13T09%3A31%3A07.520Z%27%29%29%29%29%2Cmust%3A%21%28%29%2Cmust_not%3A%21%28%29%2Cshould%3A%21%28%29%29%29%2Cscript_fields%3A%28%29%2Csort%3A%21%28%28order_date%3A%28order%3Adesc%2Cunmapped_type%3Aboolean%29%29%29%2Cstored_fields%3A%21%28order_date%2Ccategory%2Ccustomer_first_name%2Ccustomer_full_name%2Ctotal_quantity%2Ctotal_unique_products%2Ctaxless_total_price%2Ctaxful_total_price%2Ccurrency%29%2Cversion%3A%21t%29%2Cindex%3A%27ecommerce%2A%27%29%2Ctitle%3A%27Ecom%20Search%27%29`
+      );
+
+      // Retry the download URL until a "completed" response status is returned
+      const completed$ = getCompleted$(downloadPath);
+      const reportCompleted = await completed$.toPromise();
+      expect(reportCompleted).to.match(/^"order_date",/);
+    });
+
+    it('should complete a job of PNG export of a dashboard in non-default space', async () => {
+      const downloadPath = await reportingAPI.postJob(
+        `/s/non_default_space/api/reporting/generate/png?jobParams=%28browserTimezone%3AUTC%2Clayout%3A%28dimensions%3A%28height%3A512%2Cwidth%3A2402%29%2Cid%3Apng%29%2CobjectType%3Adashboard%2CrelativeUrl%3A%27%2Fs%2Fnon_default_space%2Fapp%2Fdashboards%23%2Fview%2F3c9ee360-e7ee-11ea-a730-d58e9ea7581b%3F_g%3D%28filters%3A%21%21%28%29%2CrefreshInterval%3A%28pause%3A%21%21t%2Cvalue%3A0%29%2Ctime%3A%28from%3A%21%272019-06-10T03%3A17%3A28.800Z%21%27%2Cto%3A%21%272019-07-14T19%3A25%3A06.385Z%21%27%29%29%26_a%3D%28description%3A%21%27%21%27%2Cfilters%3A%21%21%28%29%2CfullScreenMode%3A%21%21f%2Coptions%3A%28hidePanelTitles%3A%21%21f%2CuseMargins%3A%21%21t%29%2Cquery%3A%28language%3Akuery%2Cquery%3A%21%27%21%27%29%2CtimeRestore%3A%21%21t%2Ctitle%3A%21%27Ecom%2520Dashboard%2520Non%2520Default%2520Space%21%27%2CviewMode%3Aview%29%27%2Ctitle%3A%27Ecom%20Dashboard%20Non%20Default%20Space%27%29`
+      );
+
+      const completed$: Rx.Observable<string> = getCompleted$(downloadPath);
+      const reportCompleted = await completed$.toPromise();
+      expect(reportCompleted).to.not.be(null);
+    });
+
+    it('should complete a job of PDF export of a dashboard in non-default space', async () => {
+      const downloadPath = await reportingAPI.postJob(
+        `/s/non_default_space/api/reporting/generate/printablePdf?jobParams=%28browserTimezone%3AUTC%2Clayout%3A%28dimensions%3A%28height%3A512%2Cwidth%3A2402%29%2Cid%3Apreserve_layout%29%2CobjectType%3Adashboard%2CrelativeUrls%3A%21%28%27%2Fs%2Fnon_default_space%2Fapp%2Fdashboards%23%2Fview%2F3c9ee360-e7ee-11ea-a730-d58e9ea7581b%3F_g%3D%28filters%3A%21%21%28%29%2CrefreshInterval%3A%28pause%3A%21%21t%2Cvalue%3A0%29%2Ctime%3A%28from%3A%21%272019-06-10T03%3A17%3A28.800Z%21%27%2Cto%3A%21%272019-07-14T19%3A25%3A06.385Z%21%27%29%29%26_a%3D%28description%3A%21%27%21%27%2Cfilters%3A%21%21%28%29%2CfullScreenMode%3A%21%21f%2Coptions%3A%28hidePanelTitles%3A%21%21f%2CuseMargins%3A%21%21t%29%2Cquery%3A%28language%3Akuery%2Cquery%3A%21%27%21%27%29%2CtimeRestore%3A%21%21t%2Ctitle%3A%21%27Ecom%2520Dashboard%2520Non%2520Default%2520Space%21%27%2CviewMode%3Aview%29%27%29%2Ctitle%3A%27Ecom%20Dashboard%20Non%20Default%20Space%27%29`
+      );
+
+      const completed$ = getCompleted$(downloadPath);
+      const reportCompleted = await completed$.toPromise();
+      expect(reportCompleted).to.not.be(null);
+    });
+  });
+}
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
index 24e68b3917d6cd..feda5c1386e98d 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
@@ -21,7 +21,7 @@ export default function ({ getService }: FtrProviderContext) {
   const reportingAPI = getService('reportingAPI');
   const usageAPI = getService('usageAPI');
 
-  describe('reporting usage', () => {
+  describe('Usage', () => {
     before(async () => {
       await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH);
       await esArchiver.load(OSS_DATA_ARCHIVE_PATH);

From 03002453d3d90831670c5215a613a52bd0306f00 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Tue, 1 Sep 2020 21:03:43 -0700
Subject: [PATCH 168/216] skip flaky suite (#75724)

---
 x-pack/test/functional/apps/infra/home_page.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts
index 04f289b69bb71d..82aba0503fb9d0 100644
--- a/x-pack/test/functional/apps/infra/home_page.ts
+++ b/x-pack/test/functional/apps/infra/home_page.ts
@@ -21,7 +21,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'infraHome']);
   const supertest = getService('supertest');
 
-  describe('Home page', function () {
+  // FLAKY: https://github.com/elastic/kibana/issues/75724
+  describe.skip('Home page', function () {
     this.tags('includeFirefox');
     before(async () => {
       await esArchiver.load('empty_kibana');

From 6686cffe01ab5ec667bcb612b27fa9cd3443e19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yulia=20=C4=8Cech?=
 <6585477+yuliacech@users.noreply.github.com>
Date: Wed, 2 Sep 2020 11:17:30 +0200
Subject: [PATCH 169/216] [ILM] TS conversion of policies table (#76006)

* [ILM] TS conversion of policies table

* [ILM] Fix type check errors

* [ILM] Fix i18n check errors

* [ILM] Add types to linkedIndices

* [ILM] Add PR review fixes

* [ILM] Add PR review fixes (filter fn)

* [ILM] Fix i18n errors

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...est.js.snap => policy_table.test.tsx.snap} |  88 ++-
 ...cy_table.test.js => policy_table.test.tsx} | 103 ++--
 .../public/application/index.tsx              |   6 +-
 .../edit_policy/edit_policy.container.tsx     |  40 +-
 ... add_policy_to_template_confirm_modal.tsx} |  38 +-
 .../confirm_delete.js => confirm_delete.tsx}  |  15 +-
 .../no_match/components/no_match/index.js     |   7 -
 .../no_match/components/no_match/no_match.js  |  17 -
 .../policy_table/components/no_match/index.js |   7 -
 .../policy_table/policy_table.container.js    |  59 --
 .../components/policy_table/policy_table.js   | 530 ------------------
 .../policy_table/components/table_content.tsx | 376 +++++++++++++
 .../sections/policy_table/index.d.ts          |   7 -
 .../sections/policy_table/index.js            |   7 -
 .../policy_table/index.js => index.ts}        |   0
 .../policy_table/policy_table.container.tsx   |  75 +++
 .../sections/policy_table/policy_table.tsx    | 183 ++++++
 .../application/services/filter_items.js      |  17 -
 .../application/services/filter_items.ts      |  13 +
 .../services/flatten_panel_tree.js            |  20 -
 .../services/{index.js => index.ts}           |   0
 .../application/services/policies/types.ts    |   1 +
 .../public/application/services/sort_table.js |  21 -
 .../public/application/services/sort_table.ts |  23 +
 .../public/application/store/actions/index.js |   7 -
 .../application/store/actions/policies.js     |  42 --
 .../public/application/store/index.d.ts       |   7 -
 .../public/application/store/index.js         |   7 -
 .../application/store/reducers/index.js       |  12 -
 .../application/store/reducers/policies.js    |  76 ---
 .../application/store/selectors/index.js      |   7 -
 .../application/store/selectors/policies.js   |  42 --
 .../public/application/store/store.js         |  17 -
 .../translations/translations/ja-JP.json      |   2 -
 .../translations/translations/zh-CN.json      |   2 -
 35 files changed, 820 insertions(+), 1054 deletions(-)
 rename x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/{policy_table.test.js.snap => policy_table.test.tsx.snap} (70%)
 rename x-pack/plugins/index_lifecycle_management/__jest__/components/{policy_table.test.js => policy_table.test.tsx} (68%)
 rename x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/{policy_table/add_policy_to_template_confirm_modal.js => add_policy_to_template_confirm_modal.tsx} (89%)
 rename x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/{policy_table/confirm_delete.js => confirm_delete.tsx} (85%)
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/no_match.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.container.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/table_content.tsx
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.d.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.js
 rename x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/{components/policy_table/index.js => index.ts} (100%)
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.container.tsx
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.tsx
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.js
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/flatten_panel_tree.js
 rename x-pack/plugins/index_lifecycle_management/public/application/services/{index.js => index.ts} (100%)
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.js
 create mode 100644 x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/index.d.ts
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
 delete mode 100644 x-pack/plugins/index_lifecycle_management/public/application/store/store.js

diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap b/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap
similarity index 70%
rename from x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
rename to x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap
index ad3e0956fcf259..cbb9f828887018 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.js.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap
@@ -52,68 +52,60 @@ exports[`policy table should show empty state when there are not any policies 1`
   <div
     class="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter"
   >
-    <div>
+    <div
+      class="euiEmptyPrompt"
+    >
       <div
-        class="euiSpacer euiSpacer--l"
+        color="subdued"
+        data-euiicon-type="managementApp"
       />
       <div
-        class="euiEmptyPrompt"
+        class="euiSpacer euiSpacer--s"
+      />
+      <span
+        class="euiTextColor euiTextColor--subdued"
       >
+        <h1
+          class="euiTitle euiTitle--medium"
+        >
+          Create your first index lifecycle policy
+        </h1>
         <div
-          color="subdued"
-          data-euiicon-type="managementApp"
+          class="euiSpacer euiSpacer--m"
         />
         <div
-          class="euiSpacer euiSpacer--s"
-        />
+          class="euiText euiText--medium"
+        >
+          <p>
+             An index lifecycle policy helps you manage your indices as they age.
+          </p>
+        </div>
+      </span>
+      <div
+        class="euiSpacer euiSpacer--l"
+      />
+      <div
+        class="euiSpacer euiSpacer--s"
+      />
+      <button
+        class="euiButton euiButton--primary euiButton--fill"
+        data-test-subj="createPolicyButton"
+        type="button"
+      >
         <span
-          class="euiTextColor euiTextColor--subdued"
+          class="euiButtonContent euiButton__content"
         >
-          <h1
-            class="euiTitle euiTitle--medium"
-          >
-            Create your first index lifecycle policy
-          </h1>
           <div
-            class="euiSpacer euiSpacer--m"
+            class="euiButtonContent__icon"
+            data-euiicon-type="plusInCircle"
           />
-          <div
-            class="euiText euiText--medium"
-          >
-            <p>
-               An index lifecycle policy helps you manage your indices as they age.
-            </p>
-          </div>
-        </span>
-        <div
-          class="euiSpacer euiSpacer--l"
-        />
-        <div
-          class="euiSpacer euiSpacer--s"
-        />
-        <button
-          class="euiButton euiButton--primary euiButton--fill"
-          data-test-subj="createPolicyButton"
-          type="button"
-        >
           <span
-            class="euiButtonContent euiButton__content"
+            class="euiButton__text"
           >
-            <div
-              class="euiButtonContent__icon"
-              data-euiicon-type="plusInCircle"
-            />
-            <span
-              class="euiButton__text"
-            >
-              Create policy
-            </span>
+            Create policy
           </span>
-        </button>
-      </div>
-      <div
-        class="euiSpacer euiSpacer--m"
-      />
+        </span>
+      </button>
     </div>
   </div>
 </main>
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js b/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.tsx
similarity index 68%
rename from x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
rename to x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.tsx
index 60e3e9443bec98..d95b4503c266b0 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.js
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/policy_table.test.tsx
@@ -4,54 +4,62 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import moment from 'moment-timezone';
-import React from 'react';
-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';
-import sinon from 'sinon';
+import React, { ReactElement } from 'react';
+import { ReactWrapper } from 'enzyme';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { findTestSubject, takeMountedSnapshot } from '@elastic/eui/lib/test';
 
-import { scopedHistoryMock } from '../../../../../src/core/public/mocks';
-import { mountWithIntl } from '../../../../test_utils/enzyme_helpers';
-import { fetchedPolicies } from '../../public/application/store/actions';
-import { indexLifecycleManagementStore } from '../../public/application/store';
-import { PolicyTable } from '../../public/application/sections/policy_table';
+import {
+  fatalErrorsServiceMock,
+  injectedMetadataServiceMock,
+  scopedHistoryMock,
+} from '../../../../../src/core/public/mocks';
+import { HttpService } from '../../../../../src/core/public/http';
+import { usageCollectionPluginMock } from '../../../../../src/plugins/usage_collection/public/mocks';
+
+import { PolicyTable } from '../../public/application/sections/policy_table/policy_table';
 import { init as initHttp } from '../../public/application/services/http';
 import { init as initUiMetric } from '../../public/application/services/ui_metric';
+import { PolicyFromES } from '../../public/application/services/policies/types';
 
-initHttp(axios.create({ adapter: axiosXhrAdapter }), (path) => path);
-initUiMetric({ reportUiStats: () => {} });
-
-let server = null;
+initHttp(
+  new HttpService().setup({
+    injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
+    fatalErrors: fatalErrorsServiceMock.createSetupContract(),
+  })
+);
+initUiMetric(usageCollectionPluginMock.createSetupContract());
 
-let store = null;
-const policies = [];
+const policies: PolicyFromES[] = [];
 for (let i = 0; i < 105; i++) {
   policies.push({
     version: i,
-    modified_date: moment().subtract(i, 'days').valueOf(),
-    linkedIndices: i % 2 === 0 ? [`index${i}`] : null,
+    modified_date: moment().subtract(i, 'days').toISOString(),
+    linkedIndices: i % 2 === 0 ? [`index${i}`] : undefined,
     name: `testy${i}`,
+    policy: {
+      name: `testy${i}`,
+      phases: {},
+    },
   });
 }
 jest.mock('');
-let component = null;
+let component: ReactElement;
 
-const snapshot = (rendered) => {
+const snapshot = (rendered: string[]) => {
   expect(rendered).toMatchSnapshot();
 };
-const mountedSnapshot = (rendered) => {
+const mountedSnapshot = (rendered: ReactWrapper) => {
   expect(takeMountedSnapshot(rendered)).toMatchSnapshot();
 };
-const names = (rendered) => {
+const names = (rendered: ReactWrapper) => {
   return findTestSubject(rendered, 'policyTablePolicyNameLink');
 };
-const namesText = (rendered) => {
-  return names(rendered).map((button) => button.text());
+const namesText = (rendered: ReactWrapper): string[] => {
+  return (names(rendered) as ReactWrapper).map((button) => button.text());
 };
 
-const testSort = (headerName) => {
+const testSort = (headerName: string) => {
   const rendered = mountWithIntl(component);
   const nameHeader = findTestSubject(rendered, `policyTableHeaderCell-${headerName}`).find(
     'button'
@@ -63,7 +71,7 @@ const testSort = (headerName) => {
   rendered.update();
   snapshot(namesText(rendered));
 };
-const openContextMenu = (buttonIndex) => {
+const openContextMenu = (buttonIndex: number) => {
   const rendered = mountWithIntl(component);
   const actionsButton = findTestSubject(rendered, 'policyActionsContextMenuButton');
   actionsButton.at(buttonIndex).simulate('click');
@@ -73,33 +81,26 @@ const openContextMenu = (buttonIndex) => {
 
 describe('policy table', () => {
   beforeEach(() => {
-    store = indexLifecycleManagementStore();
     component = (
-      <Provider store={store}>
-        <PolicyTable history={scopedHistoryMock.create()} navigateToApp={() => {}} />
-      </Provider>
+      <PolicyTable
+        policies={policies}
+        history={scopedHistoryMock.create()}
+        navigateToApp={jest.fn()}
+        updatePolicies={jest.fn()}
+      />
     );
-    store.dispatch(fetchedPolicies(policies));
-    server = sinon.fakeServer.create();
-    server.respondWith('/api/index_lifecycle_management/policies', [
-      200,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify(policies),
-    ]);
   });
-  test('should show spinner when policies are loading', () => {
-    store = indexLifecycleManagementStore();
+
+  test('should show empty state when there are not any policies', () => {
     component = (
-      <Provider store={store}>
-        <PolicyTable history={scopedHistoryMock.create()} navigateToApp={() => {}} />
-      </Provider>
+      <PolicyTable
+        policies={[]}
+        history={scopedHistoryMock.create()}
+        navigateToApp={jest.fn()}
+        updatePolicies={jest.fn()}
+      />
     );
     const rendered = mountWithIntl(component);
-    expect(rendered.find('.euiLoadingSpinner').exists()).toBeTruthy();
-  });
-  test('should show empty state when there are not any policies', () => {
-    store.dispatch(fetchedPolicies([]));
-    const rendered = mountWithIntl(component);
     mountedSnapshot(rendered);
   });
   test('should change pages when a pagination link is clicked on', () => {
@@ -123,7 +124,7 @@ describe('policy table', () => {
   test('should filter based on content of search input', () => {
     const rendered = mountWithIntl(component);
     const searchInput = rendered.find('.euiFieldSearch').first();
-    searchInput.instance().value = 'testy0';
+    ((searchInput.instance() as unknown) as HTMLInputElement).value = 'testy0';
     searchInput.simulate('keyup', { key: 'Enter', keyCode: 13, which: 13 });
     rendered.update();
     snapshot(namesText(rendered));
@@ -147,7 +148,7 @@ describe('policy table', () => {
     expect(buttons.at(0).text()).toBe('View indices linked to policy');
     expect(buttons.at(1).text()).toBe('Add policy to index template');
     expect(buttons.at(2).text()).toBe('Delete policy');
-    expect(buttons.at(2).getDOMNode().disabled).toBeTruthy();
+    expect((buttons.at(2).getDOMNode() as HTMLButtonElement).disabled).toBeTruthy();
   });
   test('should have proper actions in context menu when there are not linked indices', () => {
     const rendered = openContextMenu(1);
@@ -155,7 +156,7 @@ describe('policy table', () => {
     expect(buttons.length).toBe(2);
     expect(buttons.at(0).text()).toBe('Add policy to index template');
     expect(buttons.at(1).text()).toBe('Delete policy');
-    expect(buttons.at(1).getDOMNode().disabled).toBeFalsy();
+    expect((buttons.at(1).getDOMNode() as HTMLButtonElement).disabled).toBeFalsy();
   });
   test('confirmation modal should show when delete button is pressed', () => {
     const rendered = openContextMenu(1);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
index 31a9abdc7145ee..d7812f186a03fc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/index.tsx
@@ -6,12 +6,10 @@
 
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
-import { Provider } from 'react-redux';
 import { I18nStart, ScopedHistory, ApplicationStart } from 'kibana/public';
 import { UnmountCallback } from 'src/core/public';
 
 import { App } from './app';
-import { indexLifecycleManagementStore } from './store';
 
 export const renderApp = (
   element: Element,
@@ -22,9 +20,7 @@ export const renderApp = (
 ): UnmountCallback => {
   render(
     <I18nContext>
-      <Provider store={indexLifecycleManagementStore()}>
-        <App history={history} navigateToApp={navigateToApp} getUrlForApp={getUrlForApp} />
-      </Provider>
+      <App history={history} navigateToApp={navigateToApp} getUrlForApp={getUrlForApp} />
     </I18nContext>,
     element
   );
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
index 359134e015f7f2..f4697693b86c6f 100644
--- 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
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { RouteComponentProps } from 'react-router-dom';
-import { EuiButton, EuiCallOut, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
+import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { useLoadPoliciesList } from '../../services/api';
 
@@ -50,25 +50,29 @@ export const EditPolicy: React.FunctionComponent<Props & RouteComponentProps<Rou
   if (error || !policies) {
     const { statusCode, message } = error ? error : { statusCode: '', message: '' };
     return (
-      <EuiCallOut
+      <EuiEmptyPrompt
         title={
-          <FormattedMessage
-            id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesLoadingFailedTitle"
-            defaultMessage="Unable to load existing lifecycle policies"
-          />
+          <h2>
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesLoadingFailedTitle"
+              defaultMessage="Unable to load existing lifecycle policies"
+            />
+          </h2>
         }
-        color="danger"
-      >
-        <p>
-          {message} ({statusCode})
-        </p>
-        <EuiButton onClick={sendRequest} iconType="refresh" color="danger">
-          <FormattedMessage
-            id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesReloadButton"
-            defaultMessage="Try again"
-          />
-        </EuiButton>
-      </EuiCallOut>
+        body={
+          <p>
+            {message} ({statusCode})
+          </p>
+        }
+        actions={
+          <EuiButton onClick={sendRequest} iconType="refresh" color="danger">
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.editPolicy.lifecyclePoliciesReloadButton"
+              defaultMessage="Try again"
+            />
+          </EuiButton>
+        }
+      />
     );
   }
 
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/add_policy_to_template_confirm_modal.tsx
similarity index 89%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/add_policy_to_template_confirm_modal.tsx
index 47134ad0977209..90ac3c03856dea 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/add_policy_to_template_confirm_modal.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/add_policy_to_template_confirm_modal.tsx
@@ -20,21 +20,35 @@ import {
   EuiText,
 } from '@elastic/eui';
 
-import { toasts } from '../../../../services/notification';
-import { addLifecyclePolicyToTemplate, loadIndexTemplates } from '../../../../services/api';
-import { showApiError } from '../../../../services/api_errors';
-import { LearnMoreLink } from '../../../edit_policy/components';
+import { LearnMoreLink } from '../../edit_policy/components';
+import { PolicyFromES } from '../../../services/policies/types';
+import { addLifecyclePolicyToTemplate, loadIndexTemplates } from '../../../services/api';
+import { toasts } from '../../../services/notification';
+import { showApiError } from '../../../services/api_errors';
 
-export class AddPolicyToTemplateConfirmModal extends Component {
-  state = {
-    templates: [],
-  };
+interface Props {
+  policy: PolicyFromES;
+  onCancel: () => void;
+}
+interface State {
+  templates: Array<{ name: string }>;
+  templateName?: string;
+  aliasName?: string;
+  templateError?: string;
+}
+export class AddPolicyToTemplateConfirmModal extends Component<Props, State> {
+  constructor(props: Props) {
+    super(props);
+    this.state = {
+      templates: [],
+    };
+  }
   async componentDidMount() {
     const templates = await loadIndexTemplates();
     this.setState({ templates });
   }
   addPolicyToTemplate = async () => {
-    const { policy, callback, onCancel } = this.props;
+    const { policy, onCancel } = this.props;
     const { templateName, aliasName } = this.state;
     const policyName = policy.name;
     if (!templateName) {
@@ -71,9 +85,6 @@ export class AddPolicyToTemplateConfirmModal extends Component {
       );
       showApiError(e, title);
     }
-    if (callback) {
-      callback();
-    }
   };
   renderTemplateHasPolicyWarning() {
     const selectedTemplate = this.getSelectedTemplate();
@@ -144,7 +155,7 @@ export class AddPolicyToTemplateConfirmModal extends Component {
             options={options}
             value={templateName}
             onChange={(e) => {
-              this.setState({ templateError: null, templateName: e.target.value });
+              this.setState({ templateError: undefined, templateName: e.target.value });
             }}
           />
         </EuiFormRow>
@@ -204,7 +215,6 @@ export class AddPolicyToTemplateConfirmModal extends Component {
               defaultMessage: 'Add policy',
             }
           )}
-          onClose={onCancel}
         >
           <EuiText>
             <p>
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/confirm_delete.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/confirm_delete.tsx
similarity index 85%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/confirm_delete.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/confirm_delete.tsx
index 0ecc9cc13ecd0a..8d8e5ac2a24728 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/confirm_delete.js
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/confirm_delete.tsx
@@ -9,11 +9,17 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiOverlayMask, EuiConfirmModal } from '@elastic/eui';
 
-import { toasts } from '../../../../services/notification';
-import { deletePolicy } from '../../../../services/api';
-import { showApiError } from '../../../../services/api_errors';
+import { PolicyFromES } from '../../../services/policies/types';
+import { toasts } from '../../../services/notification';
+import { showApiError } from '../../../services/api_errors';
+import { deletePolicy } from '../../../services/api';
 
-export class ConfirmDelete extends Component {
+interface Props {
+  policyToDelete: PolicyFromES;
+  callback: () => void;
+  onCancel: () => void;
+}
+export class ConfirmDelete extends Component<Props> {
   deletePolicy = async () => {
     const { policyToDelete, callback } = this.props;
     const policyName = policyToDelete.name;
@@ -61,7 +67,6 @@ export class ConfirmDelete extends Component {
             />
           }
           buttonColor="danger"
-          onClose={onCancel}
         >
           <div>
             <FormattedMessage
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/index.js
deleted file mode 100644
index 2cdbc4a7094a89..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/index.js
+++ /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 { NoMatch } from './no_match';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/no_match.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/no_match.js
deleted file mode 100644
index 45eaaab8a82ae4..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/components/no_match/no_match.js
+++ /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 React from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export const NoMatch = () => (
-  <div>
-    <FormattedMessage
-      id="xpack.indexLifecycleMgmt.noMatch.noPolicicesDescription"
-      defaultMessage="No policies to show"
-    />
-  </div>
-);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/index.js
deleted file mode 100644
index 63e8cdebd97716..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/no_match/index.js
+++ /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 { NoMatch } from './components/no_match';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.container.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.container.js
deleted file mode 100644
index 8bd78774d2d55a..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.container.js
+++ /dev/null
@@ -1,59 +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 {
-  fetchPolicies,
-  policyFilterChanged,
-  policyPageChanged,
-  policyPageSizeChanged,
-  policySortChanged,
-} from '../../../../store/actions';
-
-import {
-  getPolicies,
-  getPageOfPolicies,
-  getPolicyPager,
-  getPolicyFilter,
-  getPolicySort,
-  isPolicyListLoaded,
-} from '../../../../store/selectors';
-
-import { PolicyTable as PresentationComponent } from './policy_table';
-
-const mapDispatchToProps = (dispatch) => {
-  return {
-    policyFilterChanged: (filter) => {
-      dispatch(policyFilterChanged({ filter }));
-    },
-    policyPageChanged: (pageNumber) => {
-      dispatch(policyPageChanged({ pageNumber }));
-    },
-    policyPageSizeChanged: (pageSize) => {
-      dispatch(policyPageSizeChanged({ pageSize }));
-    },
-    policySortChanged: (sortField, isSortAscending) => {
-      dispatch(policySortChanged({ sortField, isSortAscending }));
-    },
-    fetchPolicies: (withIndices) => {
-      dispatch(fetchPolicies(withIndices));
-    },
-  };
-};
-
-export const PolicyTable = connect(
-  (state) => ({
-    totalNumberOfPolicies: getPolicies(state).length,
-    policies: getPageOfPolicies(state),
-    pager: getPolicyPager(state),
-    filter: getPolicyFilter(state),
-    sortField: getPolicySort(state).sortField,
-    isSortAscending: getPolicySort(state).isSortAscending,
-    policyListLoaded: isPolicyListLoaded(state),
-  }),
-  mapDispatchToProps
-)(PresentationComponent);
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
deleted file mode 100644
index ec1cdb987f4b32..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/policy_table.js
+++ /dev/null
@@ -1,530 +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 moment from 'moment-timezone';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import {
-  EuiButton,
-  EuiButtonEmpty,
-  EuiLink,
-  EuiEmptyPrompt,
-  EuiFieldSearch,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiLoadingSpinner,
-  EuiPopover,
-  EuiContextMenu,
-  EuiSpacer,
-  EuiTable,
-  EuiTableBody,
-  EuiTableHeader,
-  EuiTableHeaderCell,
-  EuiTablePagination,
-  EuiTableRow,
-  EuiTableRowCell,
-  EuiTitle,
-  EuiText,
-  EuiPageBody,
-  EuiPageContent,
-  EuiScreenReaderOnly,
-} from '@elastic/eui';
-
-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/ui_metric';
-import { getPolicyPath } from '../../../../services/navigation';
-import { flattenPanelTree } from '../../../../services/flatten_panel_tree';
-import { trackUiMetric } from '../../../../services/ui_metric';
-import { NoMatch } from '../no_match';
-import { ConfirmDelete } from './confirm_delete';
-import { AddPolicyToTemplateConfirmModal } from './add_policy_to_template_confirm_modal';
-
-const COLUMNS = {
-  name: {
-    label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.nameHeader', {
-      defaultMessage: 'Name',
-    }),
-    width: 200,
-  },
-  linkedIndices: {
-    label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.linkedIndicesHeader', {
-      defaultMessage: 'Linked indices',
-    }),
-    width: 120,
-  },
-  version: {
-    label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.versionHeader', {
-      defaultMessage: 'Version',
-    }),
-    width: 120,
-  },
-  modified_date: {
-    label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.modifiedDateHeader', {
-      defaultMessage: 'Modified date',
-    }),
-    width: 200,
-  },
-};
-
-export class PolicyTable extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      selectedPoliciesMap: {},
-      renderConfirmModal: null,
-    };
-  }
-  componentDidMount() {
-    this.props.fetchPolicies(true);
-  }
-  renderEmpty() {
-    return (
-      <EuiEmptyPrompt
-        iconType="managementApp"
-        title={
-          <h1>
-            <FormattedMessage
-              id="xpack.indexLifecycleMgmt.policyTable.emptyPromptTitle"
-              defaultMessage="Create your first index lifecycle policy"
-            />
-          </h1>
-        }
-        body={
-          <Fragment>
-            <p>
-              <FormattedMessage
-                id="xpack.indexLifecycleMgmt.policyTable.emptyPromptDescription"
-                defaultMessage=" An index lifecycle policy helps you manage your indices as they age."
-              />
-            </p>
-          </Fragment>
-        }
-        actions={this.renderCreatePolicyButton()}
-      />
-    );
-  }
-  renderDeleteConfirmModal = () => {
-    const { policyToDelete } = this.state;
-    if (!policyToDelete) {
-      return null;
-    }
-    return (
-      <ConfirmDelete
-        policyToDelete={policyToDelete}
-        callback={this.handleDelete}
-        onCancel={() => this.setState({ renderConfirmModal: null, policyToDelete: null })}
-      />
-    );
-  };
-  renderAddPolicyToTemplateConfirmModal = () => {
-    const { policyToAddToTemplate } = this.state;
-    if (!policyToAddToTemplate) {
-      return null;
-    }
-    return (
-      <AddPolicyToTemplateConfirmModal
-        policy={policyToAddToTemplate}
-        onCancel={() => this.setState({ renderConfirmModal: null, policyToAddToTemplate: null })}
-      />
-    );
-  };
-  handleDelete = () => {
-    this.props.fetchPolicies(true);
-    this.setState({ renderDeleteConfirmModal: null, policyToDelete: null });
-  };
-  onSort = (column) => {
-    const { sortField, isSortAscending, policySortChanged } = this.props;
-    const newIsSortAscending = sortField === column ? !isSortAscending : true;
-    policySortChanged(column, newIsSortAscending);
-  };
-
-  buildHeader() {
-    const { sortField, isSortAscending } = this.props;
-    const headers = Object.entries(COLUMNS).map(([fieldName, { label, width }]) => {
-      const isSorted = sortField === fieldName;
-      return (
-        <EuiTableHeaderCell
-          key={fieldName}
-          onSort={() => this.onSort(fieldName)}
-          isSorted={isSorted}
-          isSortAscending={isSortAscending}
-          data-test-subj={`policyTableHeaderCell-${fieldName}`}
-          className={'policyTable__header--' + fieldName}
-          width={width}
-        >
-          {label}
-        </EuiTableHeaderCell>
-      );
-    });
-    headers.push(
-      <EuiTableHeaderCell
-        key="deleteHeader"
-        data-test-subj="policyTableHeaderCell-delete"
-        width={150}
-      />
-    );
-    return headers;
-  }
-
-  buildRowCell(fieldName, value) {
-    if (fieldName === 'name') {
-      return (
-        /* eslint-disable-next-line @elastic/eui/href-or-on-click */
-        <EuiLink
-          data-test-subj="policyTablePolicyNameLink"
-          {...reactRouterNavigate(this.props.history, getPolicyPath(value), () =>
-            trackUiMetric('click', UIM_EDIT_CLICK)
-          )}
-        >
-          {value}
-        </EuiLink>
-      );
-    } else if (fieldName === 'linkedIndices') {
-      return (
-        <EuiText>
-          <b>{value ? value.length : '0'}</b>
-        </EuiText>
-      );
-    } else if (fieldName === 'modified_date' && value) {
-      return moment(value).format('YYYY-MM-DD HH:mm:ss');
-    }
-    return value;
-  }
-  renderCreatePolicyButton() {
-    return (
-      <EuiButton
-        {...reactRouterNavigate(this.props.history, '/policies/edit')}
-        fill
-        iconType="plusInCircle"
-        data-test-subj="createPolicyButton"
-      >
-        <FormattedMessage
-          id="xpack.indexLifecycleMgmt.policyTable.emptyPrompt.createButtonLabel"
-          defaultMessage="Create policy"
-        />
-      </EuiButton>
-    );
-  }
-  renderConfirmModal() {
-    const { renderConfirmModal } = this.state;
-    if (renderConfirmModal) {
-      return renderConfirmModal();
-    } else {
-      return null;
-    }
-  }
-  buildActionPanelTree(policy) {
-    const hasLinkedIndices = Boolean(policy.linkedIndices && policy.linkedIndices.length);
-
-    const viewIndicesLabel = i18n.translate(
-      'xpack.indexLifecycleMgmt.policyTable.viewIndicesButtonText',
-      {
-        defaultMessage: 'View indices linked to policy',
-      }
-    );
-    const addPolicyToTemplateLabel = i18n.translate(
-      'xpack.indexLifecycleMgmt.policyTable.addPolicyToTemplateButtonText',
-      {
-        defaultMessage: 'Add policy to index template',
-      }
-    );
-    const deletePolicyLabel = i18n.translate(
-      'xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonText',
-      {
-        defaultMessage: 'Delete policy',
-      }
-    );
-    const deletePolicyTooltip = hasLinkedIndices
-      ? i18n.translate('xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonDisabledTooltip', {
-          defaultMessage: 'You cannot delete a policy that is being used by an index',
-        })
-      : null;
-    const items = [];
-    if (hasLinkedIndices) {
-      items.push({
-        name: viewIndicesLabel,
-        icon: 'list',
-        onClick: () => {
-          this.props.navigateToApp('management', {
-            path: `/data/index_management${getIndexListUri(`ilm.policy:${policy.name}`, true)}`,
-          });
-        },
-      });
-    }
-    items.push({
-      name: addPolicyToTemplateLabel,
-      icon: 'plusInCircle',
-      onClick: () =>
-        this.setState({
-          renderConfirmModal: this.renderAddPolicyToTemplateConfirmModal,
-          policyToAddToTemplate: policy,
-        }),
-    });
-    items.push({
-      name: deletePolicyLabel,
-      disabled: hasLinkedIndices,
-      icon: 'trash',
-      toolTipContent: deletePolicyTooltip,
-      onClick: () =>
-        this.setState({
-          renderConfirmModal: this.renderDeleteConfirmModal,
-          policyToDelete: policy,
-        }),
-    });
-    const panelTree = {
-      id: 0,
-      title: i18n.translate('xpack.indexLifecycleMgmt.policyTable.policyActionsMenu.panelTitle', {
-        defaultMessage: 'Policy options',
-      }),
-      items,
-    };
-    return flattenPanelTree(panelTree);
-  }
-  togglePolicyPopover = (policy) => {
-    if (this.isPolicyPopoverOpen(policy)) {
-      this.closePolicyPopover(policy);
-    } else {
-      this.openPolicyPopover(policy);
-    }
-  };
-  isPolicyPopoverOpen = (policy) => {
-    return this.state.policyPopover === policy.name;
-  };
-  closePolicyPopover = (policy) => {
-    if (this.isPolicyPopoverOpen(policy)) {
-      this.setState({ policyPopover: null });
-    }
-  };
-  openPolicyPopover = (policy) => {
-    this.setState({ policyPopover: policy.name });
-  };
-  buildRowCells(policy) {
-    const { name } = policy;
-    const cells = Object.entries(COLUMNS).map(([fieldName, { width }]) => {
-      const value = policy[fieldName];
-
-      if (fieldName === 'name') {
-        return (
-          <th
-            key={`${fieldName}-${name}`}
-            className="euiTableRowCell"
-            scope="row"
-            data-test-subj={`policyTableCell-${fieldName}`}
-          >
-            <div className={`euiTableCellContent policyTable__content--${fieldName}`}>
-              {this.buildRowCell(fieldName, value)}
-            </div>
-          </th>
-        );
-      }
-
-      return (
-        <EuiTableRowCell
-          key={`${fieldName}-${name}`}
-          truncateText={false}
-          data-test-subj={`policyTableCell-${fieldName}`}
-          className={'policyTable__content--' + fieldName}
-          width={width}
-        >
-          {this.buildRowCell(fieldName, value)}
-        </EuiTableRowCell>
-      );
-    });
-    const button = (
-      <EuiButtonEmpty
-        data-test-subj="policyActionsContextMenuButton"
-        onClick={() => this.togglePolicyPopover(policy)}
-        color="primary"
-      >
-        {i18n.translate('xpack.indexLifecycleMgmt.policyTable.actionsButtonText', {
-          defaultMessage: 'Actions',
-        })}
-      </EuiButtonEmpty>
-    );
-    cells.push(
-      <EuiTableRowCell
-        align={RIGHT_ALIGNMENT}
-        key={`delete-${name}`}
-        truncateText={false}
-        data-test-subj={`policyTableCell-actions-${name}`}
-        style={{ width: 150 }}
-      >
-        <EuiPopover
-          id="contextMenuPolicy"
-          button={button}
-          isOpen={this.isPolicyPopoverOpen(policy)}
-          closePopover={() => this.closePolicyPopover(policy)}
-          panelPaddingSize="none"
-          withTitle
-          anchorPosition="rightUp"
-          repositionOnScroll
-        >
-          <EuiContextMenu initialPanelId={0} panels={this.buildActionPanelTree(policy)} />
-        </EuiPopover>
-      </EuiTableRowCell>
-    );
-    return cells;
-  }
-
-  buildRows() {
-    const { policies = [] } = this.props;
-    return policies.map((policy) => {
-      const { name } = policy;
-      return <EuiTableRow key={`${name}-row`}>{this.buildRowCells(policy)}</EuiTableRow>;
-    });
-  }
-
-  renderPager() {
-    const { pager, policyPageChanged, policyPageSizeChanged } = this.props;
-    return (
-      <EuiTablePagination
-        activePage={pager.getCurrentPageIndex()}
-        itemsPerPage={pager.itemsPerPage}
-        itemsPerPageOptions={[10, 50, 100]}
-        pageCount={pager.getTotalPages()}
-        onChangeItemsPerPage={policyPageSizeChanged}
-        onChangePage={policyPageChanged}
-      />
-    );
-  }
-
-  onItemSelectionChanged = (selectedPolicies) => {
-    this.setState({ selectedPolicies });
-  };
-
-  render() {
-    const {
-      totalNumberOfPolicies,
-      policyFilterChanged,
-      filter,
-      policyListLoaded,
-      policies,
-    } = this.props;
-    const { selectedPoliciesMap } = this.state;
-    const numSelected = Object.keys(selectedPoliciesMap).length;
-    let content;
-    let tableContent;
-    if (totalNumberOfPolicies || !policyListLoaded) {
-      if (!policyListLoaded) {
-        tableContent = <EuiLoadingSpinner size="m" />;
-      } else if (totalNumberOfPolicies > 0) {
-        tableContent = (
-          <EuiTable>
-            <EuiScreenReaderOnly>
-              <caption role="status" aria-relevant="text" aria-live="polite">
-                <FormattedMessage
-                  id="xpack.indexLifecycleMgmt.policyTable.captionText"
-                  defaultMessage="Below is the index lifecycle policy table
-                    containing {count, plural, one {# row} other {# rows}} out of {total}."
-                  values={{ count: policies.length, total: totalNumberOfPolicies }}
-                />
-              </caption>
-            </EuiScreenReaderOnly>
-            <EuiTableHeader>{this.buildHeader()}</EuiTableHeader>
-            <EuiTableBody>{this.buildRows()}</EuiTableBody>
-          </EuiTable>
-        );
-      } else {
-        tableContent = <NoMatch />;
-      }
-      content = (
-        <Fragment>
-          <EuiFlexGroup gutterSize="l" alignItems="center">
-            {numSelected > 0 ? (
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  data-test-subj="deletePolicyButton"
-                  color="danger"
-                  onClick={() => this.setState({ showDeleteConfirmation: true })}
-                >
-                  <FormattedMessage
-                    id="xpack.indexLifecycleMgmt.policyTable.deletedPoliciesText"
-                    defaultMessage="Deleted {numSelected} {numSelected, plural, one {policy} other {policies}}"
-                    values={{ numSelected }}
-                  />
-                </EuiButton>
-              </EuiFlexItem>
-            ) : null}
-            <EuiFlexItem>
-              <EuiFieldSearch
-                fullWidth
-                value={filter}
-                onChange={(event) => {
-                  policyFilterChanged(event.target.value);
-                }}
-                data-test-subj="policyTableFilterInput"
-                placeholder={i18n.translate(
-                  'xpack.indexLifecycleMgmt.policyTable.systempoliciesSearchInputPlaceholder',
-                  {
-                    defaultMessage: 'Search',
-                  }
-                )}
-                aria-label={i18n.translate(
-                  'xpack.indexLifecycleMgmt.policyTable.systempoliciesSearchInputAriaLabel',
-                  {
-                    defaultMessage: 'Search policies',
-                  }
-                )}
-              />
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer size="m" />
-          {tableContent}
-        </Fragment>
-      );
-    } else {
-      content = this.renderEmpty();
-    }
-
-    return (
-      <EuiPageBody>
-        <EuiPageContent verticalPosition="center" horizontalPosition="center">
-          <div>
-            {this.renderConfirmModal()}
-            {totalNumberOfPolicies || !policyListLoaded ? (
-              <Fragment>
-                <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
-                  <EuiFlexItem grow={false}>
-                    <EuiTitle size="l">
-                      <h1 data-test-subj="sectionHeading">
-                        <FormattedMessage
-                          id="xpack.indexLifecycleMgmt.policyTable.sectionHeading"
-                          defaultMessage="Index Lifecycle Policies"
-                        />
-                      </h1>
-                    </EuiTitle>
-                  </EuiFlexItem>
-                  {totalNumberOfPolicies ? (
-                    <EuiFlexItem grow={false}>{this.renderCreatePolicyButton()}</EuiFlexItem>
-                  ) : null}
-                </EuiFlexGroup>
-                <EuiSpacer size="s" />
-                <EuiText>
-                  <p>
-                    <FormattedMessage
-                      id="xpack.indexLifecycleMgmt.policyTable.sectionDescription"
-                      defaultMessage="Manage your indices as they age.  Attach a policy to automate
-                        when and how to transition an index through its lifecycle."
-                    />
-                  </p>
-                </EuiText>
-              </Fragment>
-            ) : null}
-            <EuiSpacer />
-            {content}
-            <EuiSpacer size="m" />
-            {totalNumberOfPolicies && totalNumberOfPolicies > 10 ? this.renderPager() : null}
-          </div>
-        </EuiPageContent>
-      </EuiPageBody>
-    );
-  }
-}
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/table_content.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/table_content.tsx
new file mode 100644
index 00000000000000..da36ff4df98f5c
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/table_content.tsx
@@ -0,0 +1,376 @@
+/*
+ * 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, { ReactElement, useState, Fragment, ReactNode } from 'react';
+import {
+  EuiButtonEmpty,
+  EuiContextMenu,
+  EuiLink,
+  EuiPopover,
+  EuiScreenReaderOnly,
+  EuiSpacer,
+  EuiTable,
+  EuiTableBody,
+  EuiTableHeader,
+  EuiTableHeaderCell,
+  EuiTablePagination,
+  EuiTableRow,
+  EuiTableRowCell,
+  EuiText,
+  Pager,
+  EuiContextMenuPanelDescriptor,
+} from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { RIGHT_ALIGNMENT } from '@elastic/eui/lib/services';
+
+import moment from 'moment';
+import { ApplicationStart } from 'kibana/public';
+import { METRIC_TYPE } from '@kbn/analytics';
+import { RouteComponentProps } from 'react-router-dom';
+import { reactRouterNavigate } from '../../../../../../../../src/plugins/kibana_react/public';
+import { getIndexListUri } from '../../../../../../index_management/public';
+import { PolicyFromES } from '../../../services/policies/types';
+import { getPolicyPath } from '../../../services/navigation';
+import { sortTable } from '../../../services';
+import { trackUiMetric } from '../../../services/ui_metric';
+
+import { UIM_EDIT_CLICK } from '../../../constants';
+import { AddPolicyToTemplateConfirmModal } from './add_policy_to_template_confirm_modal';
+import { ConfirmDelete } from './confirm_delete';
+
+type PolicyProperty = Extract<
+  keyof PolicyFromES,
+  'version' | 'name' | 'linkedIndices' | 'modified_date'
+>;
+const COLUMNS: Array<[PolicyProperty, { label: string; width: number }]> = [
+  [
+    'name',
+    {
+      label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.nameHeader', {
+        defaultMessage: 'Name',
+      }),
+      width: 200,
+    },
+  ],
+  [
+    'linkedIndices',
+    {
+      label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.linkedIndicesHeader', {
+        defaultMessage: 'Linked indices',
+      }),
+      width: 120,
+    },
+  ],
+  [
+    'version',
+    {
+      label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.versionHeader', {
+        defaultMessage: 'Version',
+      }),
+      width: 120,
+    },
+  ],
+  [
+    'modified_date',
+    {
+      label: i18n.translate('xpack.indexLifecycleMgmt.policyTable.headers.modifiedDateHeader', {
+        defaultMessage: 'Modified date',
+      }),
+      width: 200,
+    },
+  ],
+];
+
+interface Props {
+  policies: PolicyFromES[];
+  totalNumber: number;
+  navigateToApp: ApplicationStart['navigateToApp'];
+  setConfirmModal: (modal: ReactElement | null) => void;
+  handleDelete: () => void;
+  history: RouteComponentProps['history'];
+}
+export const TableContent: React.FunctionComponent<Props> = ({
+  policies,
+  totalNumber,
+  navigateToApp,
+  setConfirmModal,
+  handleDelete,
+  history,
+}) => {
+  const [popoverPolicy, setPopoverPolicy] = useState<string>();
+  const [sort, setSort] = useState<{ sortField: PolicyProperty; isSortAscending: boolean }>({
+    sortField: 'name',
+    isSortAscending: true,
+  });
+  const [pageSize, setPageSize] = useState<number>(10);
+  const [currentPage, setCurrentPage] = useState<number>(0);
+
+  let sortedPolicies = sortTable(policies, sort.sortField, sort.isSortAscending);
+  const pager = new Pager(totalNumber, pageSize, currentPage);
+  const { firstItemIndex, lastItemIndex } = pager;
+  sortedPolicies = sortedPolicies.slice(firstItemIndex, lastItemIndex + 1);
+
+  const isPolicyPopoverOpen = (policyName: string): boolean => popoverPolicy === policyName;
+  const closePolicyPopover = (): void => {
+    setPopoverPolicy('');
+  };
+  const openPolicyPopover = (policyName: string): void => {
+    setPopoverPolicy(policyName);
+  };
+  const togglePolicyPopover = (policyName: string): void => {
+    if (isPolicyPopoverOpen(policyName)) {
+      closePolicyPopover();
+    } else {
+      openPolicyPopover(policyName);
+    }
+  };
+
+  const onSort = (column: PolicyProperty) => {
+    const newIsSortAscending = sort.sortField === column ? !sort.isSortAscending : true;
+    setSort({ sortField: column, isSortAscending: newIsSortAscending });
+  };
+
+  const headers = [];
+  COLUMNS.forEach(([fieldName, { label, width }]) => {
+    const isSorted = sort.sortField === fieldName;
+    headers.push(
+      <EuiTableHeaderCell
+        key={fieldName}
+        onSort={() => onSort(fieldName)}
+        isSorted={isSorted}
+        isSortAscending={sort.isSortAscending}
+        data-test-subj={`policyTableHeaderCell-${fieldName}`}
+        className={'policyTable__header--' + fieldName}
+        width={width}
+      >
+        {label}
+      </EuiTableHeaderCell>
+    );
+  });
+  headers.push(
+    <EuiTableHeaderCell
+      key="deleteHeader"
+      data-test-subj="policyTableHeaderCell-delete"
+      width={150}
+    />
+  );
+
+  const buildActionPanelTree = (policy: PolicyFromES): EuiContextMenuPanelDescriptor[] => {
+    const hasLinkedIndices = Boolean(policy.linkedIndices && policy.linkedIndices.length);
+
+    const viewIndicesLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.policyTable.viewIndicesButtonText',
+      {
+        defaultMessage: 'View indices linked to policy',
+      }
+    );
+    const addPolicyToTemplateLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.policyTable.addPolicyToTemplateButtonText',
+      {
+        defaultMessage: 'Add policy to index template',
+      }
+    );
+    const deletePolicyLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonText',
+      {
+        defaultMessage: 'Delete policy',
+      }
+    );
+    const deletePolicyTooltip = hasLinkedIndices
+      ? i18n.translate('xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonDisabledTooltip', {
+          defaultMessage: 'You cannot delete a policy that is being used by an index',
+        })
+      : null;
+    const items = [];
+    if (hasLinkedIndices) {
+      items.push({
+        name: viewIndicesLabel,
+        icon: 'list',
+        onClick: () => {
+          navigateToApp('management', {
+            path: `/data/index_management${getIndexListUri(`ilm.policy:${policy.name}`, true)}`,
+          });
+        },
+      });
+    }
+    items.push({
+      name: addPolicyToTemplateLabel,
+      icon: 'plusInCircle',
+      onClick: () => {
+        setConfirmModal(renderAddPolicyToTemplateConfirmModal(policy));
+      },
+    });
+    items.push({
+      name: deletePolicyLabel,
+      disabled: hasLinkedIndices,
+      icon: 'trash',
+      toolTipContent: deletePolicyTooltip,
+      onClick: () => {
+        setConfirmModal(renderDeleteConfirmModal(policy));
+      },
+    });
+    const panelTree = {
+      id: 0,
+      title: i18n.translate('xpack.indexLifecycleMgmt.policyTable.policyActionsMenu.panelTitle', {
+        defaultMessage: 'Policy options',
+      }),
+      items,
+    };
+    return [panelTree];
+  };
+
+  const renderRowCell = (fieldName: string, value: string | number | string[]): ReactNode => {
+    if (fieldName === 'name') {
+      return (
+        <EuiLink
+          data-test-subj="policyTablePolicyNameLink"
+          {...reactRouterNavigate(history, getPolicyPath(value as string), () =>
+            trackUiMetric(METRIC_TYPE.CLICK, UIM_EDIT_CLICK)
+          )}
+        >
+          {value}
+        </EuiLink>
+      );
+    } else if (fieldName === 'linkedIndices') {
+      return (
+        <EuiText>
+          <b>{value ? (value as string[]).length : '0'}</b>
+        </EuiText>
+      );
+    } else if (fieldName === 'modified_date' && value) {
+      return moment(value).format('YYYY-MM-DD HH:mm:ss');
+    }
+    return value;
+  };
+
+  const renderRowCells = (policy: PolicyFromES): ReactElement[] => {
+    const { name } = policy;
+    const cells = [];
+    COLUMNS.forEach(([fieldName, { width }]) => {
+      const value: any = policy[fieldName];
+
+      if (fieldName === 'name') {
+        cells.push(
+          <th
+            key={`${fieldName}-${name}`}
+            className="euiTableRowCell"
+            scope="row"
+            data-test-subj={`policyTableCell-${fieldName}`}
+          >
+            <div className={`euiTableCellContent policyTable__content--${fieldName}`}>
+              {renderRowCell(fieldName, value)}
+            </div>
+          </th>
+        );
+      } else {
+        cells.push(
+          <EuiTableRowCell
+            key={`${fieldName}-${name}`}
+            truncateText={false}
+            data-test-subj={`policyTableCell-${fieldName}`}
+            className={'policyTable__content--' + fieldName}
+            width={width}
+          >
+            {renderRowCell(fieldName, value)}
+          </EuiTableRowCell>
+        );
+      }
+    });
+    const button = (
+      <EuiButtonEmpty
+        data-test-subj="policyActionsContextMenuButton"
+        onClick={() => togglePolicyPopover(policy.name)}
+        color="primary"
+      >
+        {i18n.translate('xpack.indexLifecycleMgmt.policyTable.actionsButtonText', {
+          defaultMessage: 'Actions',
+        })}
+      </EuiButtonEmpty>
+    );
+    cells.push(
+      <EuiTableRowCell
+        align={RIGHT_ALIGNMENT}
+        key={`delete-${name}`}
+        truncateText={false}
+        data-test-subj={`policyTableCell-actions-${name}`}
+        style={{ width: 150 }}
+      >
+        <EuiPopover
+          id="contextMenuPolicy"
+          button={button}
+          isOpen={isPolicyPopoverOpen(policy.name)}
+          closePopover={closePolicyPopover}
+          panelPaddingSize="none"
+          withTitle
+          anchorPosition="rightUp"
+          repositionOnScroll
+        >
+          <EuiContextMenu initialPanelId={0} panels={buildActionPanelTree(policy)} />
+        </EuiPopover>
+      </EuiTableRowCell>
+    );
+    return cells;
+  };
+
+  const rows = sortedPolicies.map((policy) => {
+    const { name } = policy;
+    return <EuiTableRow key={`${name}-row`}>{renderRowCells(policy)}</EuiTableRow>;
+  });
+
+  const renderAddPolicyToTemplateConfirmModal = (policy: PolicyFromES): ReactElement => {
+    return (
+      <AddPolicyToTemplateConfirmModal policy={policy} onCancel={() => setConfirmModal(null)} />
+    );
+  };
+
+  const renderDeleteConfirmModal = (policy: PolicyFromES): ReactElement => {
+    return (
+      <ConfirmDelete
+        policyToDelete={policy}
+        callback={handleDelete}
+        onCancel={() => {
+          setConfirmModal(null);
+        }}
+      />
+    );
+  };
+
+  const renderPager = (): ReactNode => {
+    return (
+      <EuiTablePagination
+        activePage={pager.getCurrentPageIndex()}
+        itemsPerPage={pager.itemsPerPage}
+        itemsPerPageOptions={[10, 50, 100]}
+        pageCount={pager.getTotalPages()}
+        onChangeItemsPerPage={setPageSize}
+        onChangePage={setCurrentPage}
+      />
+    );
+  };
+
+  return (
+    <Fragment>
+      <EuiTable>
+        <EuiScreenReaderOnly>
+          <caption role="status" aria-relevant="text" aria-live="polite">
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.policyTable.captionText"
+              defaultMessage="Below is the index lifecycle policy table
+                    containing {count, plural, one {# row} other {# rows}} out of {total}."
+              values={{ count: sortedPolicies.length, total: totalNumber }}
+            />
+          </caption>
+        </EuiScreenReaderOnly>
+        <EuiTableHeader>{headers}</EuiTableHeader>
+        <EuiTableBody>{rows}</EuiTableBody>
+      </EuiTable>
+      <EuiSpacer size="m" />
+      {policies.length > 10 ? renderPager() : null}
+    </Fragment>
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.d.ts
deleted file mode 100644
index fa1b1129523eb4..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/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 PolicyTable: any;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.js
deleted file mode 100644
index c4aa32f1f7dc28..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.js
+++ /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 { PolicyTable } from './components/policy_table';
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/index.js b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.ts
similarity index 100%
rename from x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/components/policy_table/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/index.ts
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.container.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.container.tsx
new file mode 100644
index 00000000000000..f6471ff2da4d3b
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.container.tsx
@@ -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 React from 'react';
+import { ApplicationStart } from 'kibana/public';
+import { RouteComponentProps } from 'react-router-dom';
+import { EuiButton, EuiEmptyPrompt, EuiLoadingSpinner } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { PolicyTable as PresentationComponent } from './policy_table';
+import { useLoadPoliciesList } from '../../services/api';
+
+interface Props {
+  navigateToApp: ApplicationStart['navigateToApp'];
+}
+
+export const PolicyTable: React.FunctionComponent<Props & RouteComponentProps> = ({
+  navigateToApp,
+  history,
+}) => {
+  const { data: policies, isLoading, error, sendRequest } = useLoadPoliciesList(true);
+
+  if (isLoading) {
+    return (
+      <EuiEmptyPrompt
+        title={<EuiLoadingSpinner size="xl" />}
+        body={
+          <FormattedMessage
+            id="xpack.indexLifecycleMgmt.policyTable.policiesLoading"
+            defaultMessage="Loading policies..."
+          />
+        }
+      />
+    );
+  }
+  if (error) {
+    const { statusCode, message } = error ? error : { statusCode: '', message: '' };
+    return (
+      <EuiEmptyPrompt
+        title={
+          <h2>
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.policyTable.policiesLoadingFailedTitle"
+              defaultMessage="Unable to load existing lifecycle policies"
+            />
+          </h2>
+        }
+        body={
+          <p>
+            {message} ({statusCode})
+          </p>
+        }
+        actions={
+          <EuiButton onClick={sendRequest} iconType="refresh" color="danger">
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.policyTable.policiesReloadButton"
+              defaultMessage="Try again"
+            />
+          </EuiButton>
+        }
+      />
+    );
+  }
+
+  return (
+    <PresentationComponent
+      policies={policies || []}
+      history={history}
+      navigateToApp={navigateToApp}
+      updatePolicies={sendRequest}
+    />
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.tsx
new file mode 100644
index 00000000000000..048ab922a65b59
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/policy_table/policy_table.tsx
@@ -0,0 +1,183 @@
+/*
+ * 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, ReactElement, ReactNode, useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import {
+  EuiButton,
+  EuiEmptyPrompt,
+  EuiFieldSearch,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiTitle,
+  EuiText,
+  EuiPageBody,
+  EuiPageContent,
+} from '@elastic/eui';
+import { ApplicationStart } from 'kibana/public';
+import { RouteComponentProps } from 'react-router-dom';
+import { reactRouterNavigate } from '../../../../../../../src/plugins/kibana_react/public';
+import { PolicyFromES } from '../../services/policies/types';
+import { filterItems } from '../../services';
+import { TableContent } from './components/table_content';
+
+interface Props {
+  policies: PolicyFromES[];
+  history: RouteComponentProps['history'];
+  navigateToApp: ApplicationStart['navigateToApp'];
+  updatePolicies: () => void;
+}
+
+export const PolicyTable: React.FunctionComponent<Props> = ({
+  policies,
+  history,
+  navigateToApp,
+  updatePolicies,
+}) => {
+  const [confirmModal, setConfirmModal] = useState<ReactNode | null>();
+  const [filter, setFilter] = useState<string>('');
+
+  const createPolicyButton = (
+    <EuiButton
+      {...reactRouterNavigate(history, '/policies/edit')}
+      fill
+      iconType="plusInCircle"
+      data-test-subj="createPolicyButton"
+    >
+      <FormattedMessage
+        id="xpack.indexLifecycleMgmt.policyTable.emptyPrompt.createButtonLabel"
+        defaultMessage="Create policy"
+      />
+    </EuiButton>
+  );
+
+  let content: ReactElement;
+
+  if (policies.length > 0) {
+    const filteredPolicies = filterItems('name', filter, policies);
+    let tableContent: ReactElement;
+    if (filteredPolicies.length > 0) {
+      tableContent = (
+        <TableContent
+          policies={filteredPolicies}
+          totalNumber={policies.length}
+          navigateToApp={navigateToApp}
+          setConfirmModal={setConfirmModal}
+          handleDelete={() => {
+            updatePolicies();
+            setConfirmModal(null);
+          }}
+          history={history}
+        />
+      );
+    } else {
+      tableContent = (
+        <FormattedMessage
+          id="xpack.indexLifecycleMgmt.noMatch.noPolicicesDescription"
+          defaultMessage="No policies to show"
+        />
+      );
+    }
+
+    content = (
+      <Fragment>
+        <EuiFlexGroup gutterSize="l" alignItems="center">
+          <EuiFlexItem>
+            <EuiFieldSearch
+              fullWidth
+              value={filter}
+              onChange={(event) => {
+                setFilter(event.target.value);
+              }}
+              data-test-subj="policyTableFilterInput"
+              placeholder={i18n.translate(
+                'xpack.indexLifecycleMgmt.policyTable.systempoliciesSearchInputPlaceholder',
+                {
+                  defaultMessage: 'Search',
+                }
+              )}
+              aria-label={i18n.translate(
+                'xpack.indexLifecycleMgmt.policyTable.systempoliciesSearchInputAriaLabel',
+                {
+                  defaultMessage: 'Search policies',
+                }
+              )}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiSpacer size="m" />
+        {tableContent}
+      </Fragment>
+    );
+  } else {
+    return (
+      <EuiPageBody>
+        <EuiPageContent verticalPosition="center" horizontalPosition="center">
+          <EuiEmptyPrompt
+            iconType="managementApp"
+            title={
+              <h1>
+                <FormattedMessage
+                  id="xpack.indexLifecycleMgmt.policyTable.emptyPromptTitle"
+                  defaultMessage="Create your first index lifecycle policy"
+                />
+              </h1>
+            }
+            body={
+              <Fragment>
+                <p>
+                  <FormattedMessage
+                    id="xpack.indexLifecycleMgmt.policyTable.emptyPromptDescription"
+                    defaultMessage=" An index lifecycle policy helps you manage your indices as they age."
+                  />
+                </p>
+              </Fragment>
+            }
+            actions={createPolicyButton}
+          />
+        </EuiPageContent>
+      </EuiPageBody>
+    );
+  }
+
+  return (
+    <EuiPageBody>
+      <EuiPageContent verticalPosition="center" horizontalPosition="center">
+        {confirmModal}
+
+        <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
+          <EuiFlexItem grow={false}>
+            <EuiTitle size="l">
+              <h1 data-test-subj="sectionHeading">
+                <FormattedMessage
+                  id="xpack.indexLifecycleMgmt.policyTable.sectionHeading"
+                  defaultMessage="Index Lifecycle Policies"
+                />
+              </h1>
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>{createPolicyButton}</EuiFlexItem>
+        </EuiFlexGroup>
+        <EuiSpacer size="s" />
+        <EuiText>
+          <p>
+            <FormattedMessage
+              id="xpack.indexLifecycleMgmt.policyTable.sectionDescription"
+              defaultMessage="Manage your indices as they age.  Attach a policy to automate
+                        when and how to transition an index through its lifecycle."
+            />
+          </p>
+        </EuiText>
+
+        <EuiSpacer />
+        {content}
+      </EuiPageContent>
+    </EuiPageBody>
+  );
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.js b/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.js
deleted file mode 100644
index dcc9036463b821..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.js
+++ /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.
- */
-
-export const filterItems = (fields, filter = '', items = []) => {
-  const lowerFilter = filter.toLowerCase();
-  return items.filter((item) => {
-    const actualFields = fields || Object.keys(item);
-    const indexOfMatch = actualFields.findIndex((field) => {
-      const normalizedField = String(item[field]).toLowerCase();
-      return normalizedField.includes(lowerFilter);
-    });
-    return indexOfMatch !== -1;
-  });
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.ts
new file mode 100644
index 00000000000000..237ce567707bbe
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/filter_items.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 const filterItems = <T>(field: keyof T, filter: string, items: T[] = []): T[] => {
+  const lowerFilter = filter.toLowerCase();
+  return items.filter((item: T) => {
+    const normalizedValue = String(item[field]).toLowerCase();
+    return normalizedValue.includes(lowerFilter);
+  });
+};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/flatten_panel_tree.js b/x-pack/plugins/index_lifecycle_management/public/application/services/flatten_panel_tree.js
deleted file mode 100644
index 2bb3903a6ef45a..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/flatten_panel_tree.js
+++ /dev/null
@@ -1,20 +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 flattenPanelTree = (tree, array = []) => {
-  array.push(tree);
-
-  if (tree.items) {
-    tree.items.forEach((item) => {
-      if (item.panel) {
-        flattenPanelTree(item.panel, array);
-        item.panel = item.panel.id;
-      }
-    });
-  }
-
-  return array;
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/index.js b/x-pack/plugins/index_lifecycle_management/public/application/services/index.ts
similarity index 100%
rename from x-pack/plugins/index_lifecycle_management/public/application/services/index.js
rename to x-pack/plugins/index_lifecycle_management/public/application/services/index.ts
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 3d4c73cf4a82cf..c191f82cf05cc1 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
@@ -22,6 +22,7 @@ export interface PolicyFromES {
   name: string;
   policy: SerializedPolicy;
   version: number;
+  linkedIndices?: string[];
 }
 
 export interface SerializedPhase {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.js b/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.js
deleted file mode 100644
index 1b1446bb735c13..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.js
+++ /dev/null
@@ -1,21 +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 { sortBy } from 'lodash';
-
-const stringSort = (fieldName) => (item) => item[fieldName];
-const arraySort = (fieldName) => (item) => (item[fieldName] || []).length;
-
-const sorters = {
-  version: stringSort('version'),
-  name: stringSort('name'),
-  linkedIndices: arraySort('linkedIndices'),
-  modified_date: stringSort('modified_date'),
-};
-export const sortTable = (array = [], sortField, isSortAscending) => {
-  const sorted = sortBy(array, sorters[sortField]);
-  return isSortAscending ? sorted : sorted.reverse();
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.ts b/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.ts
new file mode 100644
index 00000000000000..6b41d671b673f3
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/public/application/services/sort_table.ts
@@ -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 { sortBy } from 'lodash';
+import { PolicyFromES } from './policies/types';
+
+export const sortTable = (
+  array: PolicyFromES[] = [],
+  sortField: Extract<keyof PolicyFromES, 'version' | 'name' | 'linkedIndices' | 'modified_date'>,
+  isSortAscending: boolean
+): PolicyFromES[] => {
+  let sorter;
+  if (sortField === 'linkedIndices') {
+    sorter = (item: PolicyFromES) => (item[sortField] || []).length;
+  } else {
+    sorter = (item: PolicyFromES) => item[sortField];
+  }
+  const sorted = sortBy(array, sorter);
+  return isSortAscending ? sorted : sorted.reverse();
+};
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
deleted file mode 100644
index fef79c7782bb05..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/index.js
+++ /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 * from './policies';
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
deleted file mode 100644
index d47136679604fd..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/actions/policies.js
+++ /dev/null
@@ -1,42 +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 { createAction } from 'redux-actions';
-
-import { showApiError } from '../../services/api_errors';
-import { loadPolicies } from '../../services/api';
-
-export const fetchedPolicies = createAction('FETCHED_POLICIES');
-export const setSelectedPolicy = createAction('SET_SELECTED_POLICY');
-export const unsetSelectedPolicy = createAction('UNSET_SELECTED_POLICY');
-export const setSelectedPolicyName = createAction('SET_SELECTED_POLICY_NAME');
-export const setSaveAsNewPolicy = createAction('SET_SAVE_AS_NEW_POLICY');
-export const policySortChanged = createAction('POLICY_SORT_CHANGED');
-export const policyPageSizeChanged = createAction('POLICY_PAGE_SIZE_CHANGED');
-export const policyPageChanged = createAction('POLICY_PAGE_CHANGED');
-export const policySortDirectionChanged = createAction('POLICY_SORT_DIRECTION_CHANGED');
-export const policyFilterChanged = createAction('POLICY_FILTER_CHANGED');
-
-export const fetchPolicies = (withIndices, callback) => async (dispatch) => {
-  let policies;
-  try {
-    policies = await loadPolicies(withIndices);
-  } catch (err) {
-    const title = i18n.translate('xpack.indexLifecycleMgmt.editPolicy.loadPolicyErrorMessage', {
-      defaultMessage: 'Error loading policies',
-    });
-    showApiError(err, title);
-    return false;
-  }
-
-  dispatch(fetchedPolicies(policies));
-  if (policies.length === 0) {
-    dispatch(setSelectedPolicy());
-  }
-  callback && callback();
-  return policies;
-};
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/index.d.ts b/x-pack/plugins/index_lifecycle_management/public/application/store/index.d.ts
deleted file mode 100644
index 8617a7045a5c34..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/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 indexLifecycleManagementStore: any;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/index.js b/x-pack/plugins/index_lifecycle_management/public/application/store/index.js
deleted file mode 100644
index 808eb489bf9137..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/index.js
+++ /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 { indexLifecycleManagementStore } from './store';
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
deleted file mode 100644
index 7fe7134f5f5db6..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/index.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.
- */
-
-import { combineReducers } from 'redux';
-import { policies } from './policies';
-
-export const indexLifecycleManagement = combineReducers({
-  policies,
-});
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
deleted file mode 100644
index ca9d59e295a29d..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/reducers/policies.js
+++ /dev/null
@@ -1,76 +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 {
-  fetchedPolicies,
-  policyFilterChanged,
-  policyPageChanged,
-  policyPageSizeChanged,
-  policySortChanged,
-} from '../actions';
-
-const defaultState = {
-  isLoading: false,
-  isLoaded: false,
-  originalPolicyName: undefined,
-  selectedPolicySet: false,
-  policies: [],
-  sort: {
-    sortField: 'name',
-    isSortAscending: true,
-  },
-  pageSize: 10,
-  currentPage: 0,
-  filter: '',
-};
-
-export const policies = handleActions(
-  {
-    [fetchedPolicies](state, { payload: policies }) {
-      return {
-        ...state,
-        isLoading: false,
-        isLoaded: true,
-        policies,
-      };
-    },
-    [policyFilterChanged](state, action) {
-      const { filter } = action.payload;
-      return {
-        ...state,
-        filter,
-        currentPage: 0,
-      };
-    },
-    [policySortChanged](state, action) {
-      const { sortField, isSortAscending } = action.payload;
-
-      return {
-        ...state,
-        sort: {
-          sortField,
-          isSortAscending,
-        },
-      };
-    },
-    [policyPageChanged](state, action) {
-      const { pageNumber } = action.payload;
-      return {
-        ...state,
-        currentPage: pageNumber,
-      };
-    },
-    [policyPageSizeChanged](state, action) {
-      const { pageSize } = action.payload;
-      return {
-        ...state,
-        pageSize,
-      };
-    },
-  },
-  defaultState
-);
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
deleted file mode 100644
index fef79c7782bb05..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/index.js
+++ /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 * from './policies';
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
deleted file mode 100644
index e1c89314a2ec56..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/selectors/policies.js
+++ /dev/null
@@ -1,42 +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 { createSelector } from 'reselect';
-import { Pager } from '@elastic/eui';
-
-import { filterItems, sortTable } from '../../services';
-
-export const getPolicies = (state) => state.policies.policies;
-export const getPolicyFilter = (state) => state.policies.filter;
-export const getPolicySort = (state) => state.policies.sort;
-export const getPolicyCurrentPage = (state) => state.policies.currentPage;
-export const getPolicyPageSize = (state) => state.policies.pageSize;
-export const isPolicyListLoaded = (state) => state.policies.isLoaded;
-
-const getFilteredPolicies = createSelector(getPolicies, getPolicyFilter, (policies, filter) => {
-  return filterItems(['name'], filter, policies);
-});
-export const getTotalPolicies = createSelector(getFilteredPolicies, (filteredPolicies) => {
-  return filteredPolicies.length;
-});
-export const getPolicyPager = createSelector(
-  getPolicyCurrentPage,
-  getPolicyPageSize,
-  getTotalPolicies,
-  (currentPage, pageSize, totalPolicies) => {
-    return new Pager(totalPolicies, pageSize, currentPage);
-  }
-);
-export const getPageOfPolicies = createSelector(
-  getFilteredPolicies,
-  getPolicySort,
-  getPolicyPager,
-  (filteredPolicies, sort, pager) => {
-    const sortedPolicies = sortTable(filteredPolicies, sort.sortField, sort.isSortAscending);
-    const { firstItemIndex, lastItemIndex } = pager;
-    return sortedPolicies.slice(firstItemIndex, lastItemIndex + 1);
-  }
-);
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/store/store.js b/x-pack/plugins/index_lifecycle_management/public/application/store/store.js
deleted file mode 100644
index c5774a3da238a5..00000000000000
--- a/x-pack/plugins/index_lifecycle_management/public/application/store/store.js
+++ /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 { createStore, applyMiddleware, compose } from 'redux';
-import thunk from 'redux-thunk';
-
-import { indexLifecycleManagement } from './reducers/';
-
-export const indexLifecycleManagementStore = (initialState = {}) => {
-  const enhancers = [applyMiddleware(thunk)];
-
-  window.__REDUX_DEVTOOLS_EXTENSION__ && enhancers.push(window.__REDUX_DEVTOOLS_EXTENSION__());
-  return createStore(indexLifecycleManagement, initialState, compose(...enhancers));
-};
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index df78975d21b075..093ef4d6f1873d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8100,7 +8100,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutShardAllocationLink": "シャード割り当ての詳細をご覧ください",
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutTimingText": "タイミングの詳細をご覧ください",
     "xpack.indexLifecycleMgmt.editPolicy.lifecyclePolicyDescriptionText": "インデックスへのアクティブな書き込みから削除までの、インデックスライフサイクルの 4 つのフェーズを自動化するには、インデックスポリシーを使用します。",
-    "xpack.indexLifecycleMgmt.editPolicy.loadPolicyErrorMessage": "ポリシーの読み込み中にエラーが発生しました",
     "xpack.indexLifecycleMgmt.editPolicy.maximumAgeMissingError": "最高年齢が必要です。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumDocumentsMissingError": "最高ドキュメント数が必要です。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumIndexSizeMissingError": "最大インデックスサイズが必要です。",
@@ -8239,7 +8238,6 @@
     "xpack.indexLifecycleMgmt.policyTable.addLifecyclePolicyToTemplateConfirmModal.title": "インデックステンプレートにポリシー「{name}」 を追加",
     "xpack.indexLifecycleMgmt.policyTable.addPolicyToTemplateButtonText": "インデックステンプレートにポリシーを追加",
     "xpack.indexLifecycleMgmt.policyTable.captionText": "以下は {total} 列中 {count, plural, one {# 列} other {# 列}} を含むインデックスライフサイクルポリシー表です。",
-    "xpack.indexLifecycleMgmt.policyTable.deletedPoliciesText": "{numSelected} 件の{numSelected, plural, one {ポリシー} other {ポリシー}}が削除されました",
     "xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonDisabledTooltip": "インデックスが使用中のポリシーは削除できません",
     "xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonText": "ポリシーを削除",
     "xpack.indexLifecycleMgmt.policyTable.emptyPrompt.createButtonLabel": "ポリシーを作成",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index cfee565a1da933..ea04b1e14d9591 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8103,7 +8103,6 @@
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutShardAllocationLink": "了解分片分配",
     "xpack.indexLifecycleMgmt.editPolicy.learnAboutTimingText": "了解计时",
     "xpack.indexLifecycleMgmt.editPolicy.lifecyclePolicyDescriptionText": "使用索引策略自动化索引生命周期的四个阶段，从频繁地写入到索引到删除索引。",
-    "xpack.indexLifecycleMgmt.editPolicy.loadPolicyErrorMessage": "加载策略时出错",
     "xpack.indexLifecycleMgmt.editPolicy.maximumAgeMissingError": "最大存在时间必填。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumDocumentsMissingError": "最大文档数必填。",
     "xpack.indexLifecycleMgmt.editPolicy.maximumIndexSizeMissingError": "最大索引大小必填。",
@@ -8242,7 +8241,6 @@
     "xpack.indexLifecycleMgmt.policyTable.addLifecyclePolicyToTemplateConfirmModal.title": "将策略 “{name}” 添加到索引模板",
     "xpack.indexLifecycleMgmt.policyTable.addPolicyToTemplateButtonText": "将策略添加到索引模板",
     "xpack.indexLifecycleMgmt.policyTable.captionText": "下面是包含 {count, plural, one {# 行} other {# 行}}（共 {total} 行）的索引生命周期策略表。",
-    "xpack.indexLifecycleMgmt.policyTable.deletedPoliciesText": "已删除 {numSelected} 个{numSelected, plural, one {策略} other {策略}}",
     "xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonDisabledTooltip": "您无法删除索引正在使用的策略",
     "xpack.indexLifecycleMgmt.policyTable.deletePolicyButtonText": "删除策略",
     "xpack.indexLifecycleMgmt.policyTable.emptyPrompt.createButtonLabel": "创建策略",

From febeb478757204da7b2088f91fa1c3be43e28af5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patryk=20Kopyci=C5=84ski?= <patryk.kopycinski@elastic.co>
Date: Wed, 2 Sep 2020 11:30:17 +0200
Subject: [PATCH 170/216] [Security Solution] Refactor Network HTTP to use
 Search Strategy (#76243)

---
 .../security_solution/index.ts                |  17 +-
 .../security_solution/network/http/index.ts   |  58 ++++
 .../security_solution/network/index.ts        |   2 +
 .../network/containers/network_http/index.tsx | 286 ++++++++++--------
 .../containers/network_http/translations.ts   |  21 ++
 .../ip_details/network_http_query_table.tsx   |  70 ++---
 .../pages/navigation/http_query_tab_body.tsx  |  68 ++---
 .../factory/network/http/helpers.ts           |  34 +++
 .../factory/network/http/index.ts             |  59 ++++
 .../network/http/query.http_network.dsl.ts    | 116 +++++++
 .../factory/network/index.ts                  |   2 +
 11 files changed, 532 insertions(+), 201 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
 create mode 100644 x-pack/plugins/security_solution/public/network/containers/network_http/translations.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/query.http_network.dsl.ts

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 175784bc5ade57..6905f2be38966d 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
@@ -15,7 +15,13 @@ import {
   HostsRequestOptions,
   HostsStrategyResponse,
 } from './hosts';
-import { NetworkQueries, NetworkTlsStrategyResponse, NetworkTlsRequestOptions } from './network';
+import {
+  NetworkQueries,
+  NetworkTlsStrategyResponse,
+  NetworkTlsRequestOptions,
+  NetworkHttpStrategyResponse,
+  NetworkHttpRequestOptions,
+} from './network';
 
 export * from './hosts';
 export * from './network';
@@ -116,6 +122,8 @@ export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQ
   ? HostFirstLastSeenStrategyResponse
   : T extends NetworkQueries.tls
   ? NetworkTlsStrategyResponse
+  : T extends NetworkQueries.http
+  ? NetworkHttpStrategyResponse
   : never;
 
 export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQueries.hosts
@@ -126,4 +134,11 @@ export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQu
   ? HostFirstLastSeenRequestOptions
   : T extends NetworkQueries.tls
   ? NetworkTlsRequestOptions
+  : T extends NetworkQueries.http
+  ? NetworkHttpRequestOptions
   : never;
+
+export interface GenericBuckets {
+  key: string;
+  doc_count: number;
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
new file mode 100644
index 00000000000000..c42b3d2ab8db30
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/http/index.ts
@@ -0,0 +1,58 @@
+/*
+ * 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 {
+  Maybe,
+  CursorType,
+  Inspect,
+  RequestOptionsPaginated,
+  PageInfoPaginated,
+  GenericBuckets,
+} from '../..';
+
+export interface NetworkHttpRequestOptions extends RequestOptionsPaginated {
+  ip?: string;
+  defaultIndex: string[];
+}
+
+export interface NetworkHttpStrategyResponse extends IEsSearchResponse {
+  edges: NetworkHttpEdges[];
+  totalCount: number;
+  pageInfo: PageInfoPaginated;
+  inspect?: Maybe<Inspect>;
+}
+
+export interface NetworkHttpEdges {
+  node: NetworkHttpItem;
+  cursor: CursorType;
+}
+
+export interface NetworkHttpItem {
+  _id?: Maybe<string>;
+  domains: string[];
+  lastHost?: Maybe<string>;
+  lastSourceIp?: Maybe<string>;
+  methods: string[];
+  path?: Maybe<string>;
+  requestCount?: Maybe<number>;
+  statuses: string[];
+}
+
+export interface NetworkHttpBuckets {
+  key: string;
+  doc_count: number;
+  domains: {
+    buckets: GenericBuckets[];
+  };
+  methods: {
+    buckets: GenericBuckets[];
+  };
+  source: object;
+  status: {
+    buckets: GenericBuckets[];
+  };
+}
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts
index 680a3697ef0bd5..194bb5d057e3fc 100644
--- a/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/network/index.ts
@@ -5,7 +5,9 @@
  */
 
 export * from './tls';
+export * from './http';
 
 export enum NetworkQueries {
+  http = 'http',
   tls = 'tls',
 }
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
index 60845d452d69e4..ae50f6919dce1f 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
@@ -4,29 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getOr } from 'lodash/fp';
-import React from 'react';
-import { Query } from 'react-apollo';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
+import { noop } from 'lodash/fp';
+import { useState, useEffect, useCallback, useRef } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+import deepEqual from 'fast-deep-equal';
 
+import { ESTermQuery } from '../../../../common/typed_json';
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
-import {
-  GetNetworkHttpQuery,
-  NetworkHttpEdges,
-  NetworkHttpSortField,
-  PageInfoPaginated,
-} from '../../../graphql/types';
-import { inputsModel, inputsSelectors, State } from '../../../common/store';
-import { withKibana, WithKibanaProps } from '../../../common/lib/kibana';
+import { inputsModel, State } from '../../../common/store';
+import { useKibana } from '../../../common/lib/kibana';
+import { createFilter } from '../../../common/containers/helpers';
+import { NetworkHttpEdges, PageInfoPaginated } from '../../../graphql/types';
 import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers';
-import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers';
-import {
-  QueryTemplatePaginated,
-  QueryTemplatePaginatedProps,
-} from '../../../common/containers/query_template_paginated';
 import { networkModel, networkSelectors } from '../../store';
-import { networkHttpQuery } from './index.gql_query';
+import {
+  NetworkQueries,
+  NetworkHttpRequestOptions,
+  NetworkHttpStrategyResponse,
+  SortField,
+} from '../../../../common/search_strategy/security_solution';
+import { AbortError } from '../../../../../../../src/plugins/data/common';
+import * as i18n from './translations';
 
 const ID = 'networkHttpQuery';
 
@@ -35,7 +33,6 @@ export interface NetworkHttpArgs {
   ip?: string;
   inspect: inputsModel.InspectQuery;
   isInspected: boolean;
-  loading: boolean;
   loadPage: (newActivePage: number) => void;
   networkHttp: NetworkHttpEdges[];
   pageInfo: PageInfoPaginated;
@@ -43,118 +40,161 @@ export interface NetworkHttpArgs {
   totalCount: number;
 }
 
-export interface OwnProps extends QueryTemplatePaginatedProps {
-  children: (args: NetworkHttpArgs) => React.ReactNode;
+interface UseNetworkHttp {
+  id?: string;
   ip?: string;
   type: networkModel.NetworkType;
+  filterQuery?: ESTermQuery | string;
+  endDate: string;
+  startDate: string;
+  skip: boolean;
 }
 
-export interface NetworkHttpComponentReduxProps {
-  activePage: number;
-  isInspected: boolean;
-  limit: number;
-  sort: NetworkHttpSortField;
-}
+export const useNetworkHttp = ({
+  endDate,
+  filterQuery,
+  id = ID,
+  ip,
+  skip,
+  startDate,
+  type,
+}: UseNetworkHttp): [boolean, NetworkHttpArgs] => {
+  const getHttpSelector = networkSelectors.httpSelector();
+  const { activePage, limit, sort } = useSelector(
+    (state: State) => getHttpSelector(state, type),
+    shallowEqual
+  );
+  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 [networkHttpRequest, setHostRequest] = useState<NetworkHttpRequestOptions>({
+    defaultIndex,
+    factoryQueryType: NetworkQueries.http,
+    filterQuery: createFilter(filterQuery),
+    ip,
+    pagination: generateTablePaginationOptions(activePage, limit),
+    sort: sort as SortField,
+    timerange: {
+      interval: '12h',
+      from: startDate ? startDate : '',
+      to: endDate ? endDate : new Date(Date.now()).toISOString(),
+    },
+  });
+
+  const wrappedLoadMore = useCallback(
+    (newActivePage: number) => {
+      setHostRequest((prevRequest) => {
+        return {
+          ...prevRequest,
+          pagination: generateTablePaginationOptions(newActivePage, limit),
+        };
+      });
+    },
+    [limit]
+  );
 
-type NetworkHttpProps = OwnProps & NetworkHttpComponentReduxProps & WithKibanaProps;
+  const [networkHttpResponse, setNetworkHttpResponse] = useState<NetworkHttpArgs>({
+    networkHttp: [],
+    id: ID,
+    inspect: {
+      dsl: [],
+      response: [],
+    },
+    isInspected: false,
+    loadPage: wrappedLoadMore,
+    pageInfo: {
+      activePage: 0,
+      fakeTotalCount: 0,
+      showMorePagesIndicator: false,
+    },
+    refetch: refetch.current,
+    totalCount: -1,
+  });
 
-class NetworkHttpComponentQuery extends QueryTemplatePaginated<
-  NetworkHttpProps,
-  GetNetworkHttpQuery.Query,
-  GetNetworkHttpQuery.Variables
-> {
-  public render() {
-    const {
-      activePage,
-      children,
-      endDate,
-      filterQuery,
-      id = ID,
-      ip,
-      isInspected,
-      kibana,
-      limit,
-      skip,
-      sourceId,
-      sort,
-      startDate,
-    } = this.props;
-    const variables: GetNetworkHttpQuery.Variables = {
-      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
-      filterQuery: createFilter(filterQuery),
-      inspect: isInspected,
-      ip,
-      pagination: generateTablePaginationOptions(activePage, limit),
-      sort,
-      sourceId,
-      timerange: {
-        interval: '12h',
-        from: startDate!,
-        to: endDate!,
-      },
-    };
-    return (
-      <Query<GetNetworkHttpQuery.Query, GetNetworkHttpQuery.Variables>
-        fetchPolicy={getDefaultFetchPolicy()}
-        notifyOnNetworkStatusChange
-        query={networkHttpQuery}
-        skip={skip}
-        variables={variables}
-      >
-        {({ data, loading, fetchMore, networkStatus, refetch }) => {
-          const networkHttp = getOr([], `source.NetworkHttp.edges`, data);
-          this.setFetchMore(fetchMore);
-          this.setFetchMoreOptions((newActivePage: number) => ({
-            variables: {
-              pagination: generateTablePaginationOptions(newActivePage, limit),
+  const networkHttpSearch = useCallback(
+    (request: NetworkHttpRequestOptions) => {
+      let didCancel = false;
+      const asyncSearch = async () => {
+        abortCtrl.current = new AbortController();
+        setLoading(true);
+
+        const searchSubscription$ = data.search
+          .search<NetworkHttpRequestOptions, NetworkHttpStrategyResponse>(request, {
+            strategy: 'securitySolutionSearchStrategy',
+            signal: abortCtrl.current.signal,
+          })
+          .subscribe({
+            next: (response) => {
+              if (!response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                  setNetworkHttpResponse((prevResponse) => ({
+                    ...prevResponse,
+                    networkHttp: response.edges,
+                    inspect: response.inspect ?? prevResponse.inspect,
+                    pageInfo: response.pageInfo,
+                    refetch: refetch.current,
+                    totalCount: response.totalCount,
+                  }));
+                }
+                searchSubscription$.unsubscribe();
+              } else if (response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                }
+                // TODO: Make response error status clearer
+                notifications.toasts.addWarning(i18n.ERROR_NETWORK_HTTP);
+                searchSubscription$.unsubscribe();
+              }
             },
-            updateQuery: (prev, { fetchMoreResult }) => {
-              if (!fetchMoreResult) {
-                return prev;
+            error: (msg) => {
+              if (!(msg instanceof AbortError)) {
+                notifications.toasts.addDanger({
+                  title: i18n.FAIL_NETWORK_HTTP,
+                  text: msg.message,
+                });
               }
-              return {
-                ...fetchMoreResult,
-                source: {
-                  ...fetchMoreResult.source,
-                  NetworkHttp: {
-                    ...fetchMoreResult.source.NetworkHttp,
-                    edges: [...fetchMoreResult.source.NetworkHttp.edges],
-                  },
-                },
-              };
             },
-          }));
-          const isLoading = this.isItAValidLoading(loading, variables, networkStatus);
-          return children({
-            id,
-            inspect: getOr(null, 'source.NetworkHttp.inspect', data),
-            isInspected,
-            loading: isLoading,
-            loadPage: this.wrappedLoadMore,
-            networkHttp,
-            pageInfo: getOr({}, 'source.NetworkHttp.pageInfo', data),
-            refetch: this.memoizedRefetchQuery(variables, limit, refetch),
-            totalCount: getOr(-1, 'source.NetworkHttp.totalCount', data),
           });
-        }}
-      </Query>
-    );
-  }
-}
+      };
+      abortCtrl.current.abort();
+      asyncSearch();
+      refetch.current = asyncSearch;
+      return () => {
+        didCancel = true;
+        abortCtrl.current.abort();
+      };
+    },
+    [data.search, notifications.toasts]
+  );
 
-const makeMapStateToProps = () => {
-  const getHttpSelector = networkSelectors.httpSelector();
-  const getQuery = inputsSelectors.globalQueryByIdSelector();
-  return (state: State, { id = ID, type }: OwnProps) => {
-    const { isInspected } = getQuery(state, id);
-    return {
-      ...getHttpSelector(state, type),
-      isInspected,
-    };
-  };
-};
+  useEffect(() => {
+    setHostRequest((prevRequest) => {
+      const myRequest = {
+        ...prevRequest,
+        defaultIndex,
+        filterQuery: createFilter(filterQuery),
+        pagination: generateTablePaginationOptions(activePage, limit),
+        sort: sort as SortField,
+        timerange: {
+          interval: '12h',
+          from: startDate,
+          to: endDate,
+        },
+      };
+      if (!skip && !deepEqual(prevRequest, myRequest)) {
+        return myRequest;
+      }
+      return prevRequest;
+    });
+  }, [activePage, defaultIndex, endDate, filterQuery, limit, startDate, sort, skip]);
+
+  useEffect(() => {
+    networkHttpSearch(networkHttpRequest);
+  }, [networkHttpRequest, networkHttpSearch]);
 
-export const NetworkHttpQuery = compose<React.ComponentClass<OwnProps>>(
-  connect(makeMapStateToProps),
-  withKibana
-)(NetworkHttpComponentQuery);
+  return [loading, networkHttpResponse];
+};
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/translations.ts b/x-pack/plugins/security_solution/public/network/containers/network_http/translations.ts
new file mode 100644
index 00000000000000..7909a5e48b8c4e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/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_NETWORK_HTTP = i18n.translate(
+  'xpack.securitySolution.networkHttp.errorSearchDescription',
+  {
+    defaultMessage: `An error has occurred on network http search`,
+  }
+);
+
+export const FAIL_NETWORK_HTTP = i18n.translate(
+  'xpack.securitySolution.networkHttp.failSearchDescription',
+  {
+    defaultMessage: `Failed to run search on network http`,
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/network/pages/ip_details/network_http_query_table.tsx b/x-pack/plugins/security_solution/public/network/pages/ip_details/network_http_query_table.tsx
index 551de698cfa08d..1b1b2b5f4f46e2 100644
--- a/x-pack/plugins/security_solution/public/network/pages/ip_details/network_http_query_table.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/ip_details/network_http_query_table.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { getOr } from 'lodash/fp';
 import { manageQuery } from '../../../common/components/page/manage_query';
 import { OwnProps } from './types';
-import { NetworkHttpQuery } from '../../containers/network_http';
+import { useNetworkHttp } from '../../containers/network_http';
 import { NetworkHttpTable } from '../../components/network_http_table';
 
 const NetworkHttpTableManage = manageQuery(NetworkHttpTable);
@@ -21,43 +21,35 @@ export const NetworkHttpQueryTable = ({
   skip,
   startDate,
   type,
-}: OwnProps) => (
-  <NetworkHttpQuery
-    endDate={endDate}
-    filterQuery={filterQuery}
-    ip={ip}
-    skip={skip}
-    sourceId="default"
-    startDate={startDate}
-    type={type}
-  >
-    {({
-      id,
-      inspect,
-      isInspected,
-      loading,
-      loadPage,
-      networkHttp,
-      pageInfo,
-      refetch,
-      totalCount,
-    }) => (
-      <NetworkHttpTableManage
-        data={networkHttp}
-        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
-        id={id}
-        inspect={inspect}
-        isInspect={isInspected}
-        loading={loading}
-        loadPage={loadPage}
-        refetch={refetch}
-        setQuery={setQuery}
-        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
-        totalCount={totalCount}
-        type={type}
-      />
-    )}
-  </NetworkHttpQuery>
-);
+}: OwnProps) => {
+  const [
+    loading,
+    { id, inspect, isInspected, loadPage, networkHttp, pageInfo, refetch, totalCount },
+  ] = useNetworkHttp({
+    endDate,
+    filterQuery,
+    ip,
+    skip,
+    startDate,
+    type,
+  });
+
+  return (
+    <NetworkHttpTableManage
+      data={networkHttp}
+      fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+      id={id}
+      inspect={inspect}
+      isInspect={isInspected}
+      loading={loading}
+      loadPage={loadPage}
+      refetch={refetch}
+      setQuery={setQuery}
+      showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+      totalCount={totalCount}
+      type={type}
+    />
+  );
+};
 
 NetworkHttpQueryTable.displayName = 'NetworkHttpQueryTable';
diff --git a/x-pack/plugins/security_solution/public/network/pages/navigation/http_query_tab_body.tsx b/x-pack/plugins/security_solution/public/network/pages/navigation/http_query_tab_body.tsx
index 7e0c4025d6cac1..3caff05734c1e4 100644
--- a/x-pack/plugins/security_solution/public/network/pages/navigation/http_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/network/pages/navigation/http_query_tab_body.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { getOr } from 'lodash/fp';
 
 import { NetworkHttpTable } from '../../components/network_http_table';
-import { NetworkHttpQuery } from '../../containers/network_http';
+import { useNetworkHttp } from '../../containers/network_http';
 import { networkModel } from '../../store';
 import { manageQuery } from '../../../common/components/page/manage_query';
 
@@ -22,42 +22,34 @@ export const HttpQueryTabBody = ({
   skip,
   startDate,
   setQuery,
-}: HttpQueryTabBodyProps) => (
-  <NetworkHttpQuery
-    endDate={endDate}
-    filterQuery={filterQuery}
-    skip={skip}
-    sourceId="default"
-    startDate={startDate}
-    type={networkModel.NetworkType.page}
-  >
-    {({
-      id,
-      inspect,
-      isInspected,
-      loading,
-      loadPage,
-      networkHttp,
-      pageInfo,
-      refetch,
-      totalCount,
-    }) => (
-      <NetworkHttpTableManage
-        data={networkHttp}
-        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
-        id={id}
-        inspect={inspect}
-        isInspect={isInspected}
-        loading={loading}
-        loadPage={loadPage}
-        refetch={refetch}
-        setQuery={setQuery}
-        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
-        totalCount={totalCount}
-        type={networkModel.NetworkType.page}
-      />
-    )}
-  </NetworkHttpQuery>
-);
+}: HttpQueryTabBodyProps) => {
+  const [
+    loading,
+    { id, inspect, isInspected, loadPage, networkHttp, pageInfo, refetch, totalCount },
+  ] = useNetworkHttp({
+    endDate,
+    filterQuery,
+    skip,
+    startDate,
+    type: networkModel.NetworkType.page,
+  });
+
+  return (
+    <NetworkHttpTableManage
+      data={networkHttp}
+      fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+      id={id}
+      inspect={inspect}
+      isInspect={isInspected}
+      loading={loading}
+      loadPage={loadPage}
+      refetch={refetch}
+      setQuery={setQuery}
+      showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+      totalCount={totalCount}
+      type={networkModel.NetworkType.page}
+    />
+  );
+};
 
 HttpQueryTabBody.displayName = 'HttpQueryTabBody';
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
new file mode 100644
index 00000000000000..b8a28441337c7b
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/helpers.ts
@@ -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 { get, getOr } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+import {
+  NetworkHttpBuckets,
+  NetworkHttpEdges,
+} from '../../../../../../common/search_strategy/security_solution/network';
+
+export const getHttpEdges = (response: IEsSearchResponse<unknown>): NetworkHttpEdges[] =>
+  formatHttpEdges(getOr([], `aggregations.url.buckets`, response.rawResponse));
+
+const formatHttpEdges = (buckets: NetworkHttpBuckets[]): NetworkHttpEdges[] =>
+  buckets.map((bucket: NetworkHttpBuckets) => ({
+    node: {
+      _id: bucket.key,
+      domains: bucket.domains.buckets.map(({ key }) => key),
+      methods: bucket.methods.buckets.map(({ key }) => key),
+      statuses: bucket.status.buckets.map(({ key }) => `${key}`),
+      lastHost: get('source.hits.hits[0]._source.host.name', bucket),
+      lastSourceIp: get('source.hits.hits[0]._source.source.ip', bucket),
+      path: bucket.key,
+      requestCount: bucket.doc_count,
+    },
+    cursor: {
+      value: bucket.key,
+      tiebreaker: null,
+    },
+  }));
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
new file mode 100644
index 00000000000000..b6c26cd533de23
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
@@ -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 { getOr } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+
+import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
+import {
+  NetworkHttpStrategyResponse,
+  NetworkQueries,
+  NetworkHttpRequestOptions,
+  NetworkHttpEdges,
+} from '../../../../../../common/search_strategy/security_solution/network';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import { SecuritySolutionFactory } from '../../types';
+
+import { getHttpEdges } from './helpers';
+import { buildHttpQuery } from './query.http_network.dsl';
+
+export const networkHttp: SecuritySolutionFactory<NetworkQueries.http> = {
+  buildDsl: (options: NetworkHttpRequestOptions) => {
+    if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
+      throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
+    }
+    return buildHttpQuery(options);
+  },
+  parse: async (
+    options: NetworkHttpRequestOptions,
+    response: IEsSearchResponse<unknown>
+  ): Promise<NetworkHttpStrategyResponse> => {
+    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
+    const totalCount = getOr(0, 'aggregations.http_count.value', response.rawResponse);
+    const networkHttpEdges: NetworkHttpEdges[] = getHttpEdges(response);
+    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
+    const edges = networkHttpEdges.splice(cursorStart, querySize - cursorStart);
+    const inspect = {
+      dsl: [inspectStringifyObject(buildHttpQuery(options))],
+      response: [inspectStringifyObject(response)],
+    };
+    const showMorePagesIndicator = totalCount > fakeTotalCount;
+
+    return {
+      ...response,
+      edges,
+      inspect,
+      pageInfo: {
+        activePage: activePage ? activePage : 0,
+        fakeTotalCount,
+        showMorePagesIndicator,
+      },
+      totalCount,
+    };
+  },
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/query.http_network.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/query.http_network.dsl.ts
new file mode 100644
index 00000000000000..31d695d6a05910
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/query.http_network.dsl.ts
@@ -0,0 +1,116 @@
+/*
+ * 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 { createQueryFilterClauses } from '../../../../../utils/build_query';
+
+import {
+  NetworkHttpRequestOptions,
+  SortField,
+} from '../../../../../../common/search_strategy/security_solution';
+
+const getCountAgg = () => ({
+  http_count: {
+    cardinality: {
+      field: 'url.path',
+    },
+  },
+});
+
+export const buildHttpQuery = ({
+  defaultIndex,
+  filterQuery,
+  sort,
+  pagination: { querySize },
+  timerange: { from, to },
+  ip,
+}: NetworkHttpRequestOptions) => {
+  const filter = [
+    ...createQueryFilterClauses(filterQuery),
+    {
+      range: {
+        '@timestamp': { gte: from, lte: to, format: 'strict_date_optional_time' },
+      },
+    },
+    { exists: { field: 'http.request.method' } },
+  ];
+
+  const dslQuery = {
+    allowNoIndices: true,
+    index: defaultIndex,
+    ignoreUnavailable: true,
+    body: {
+      aggregations: {
+        ...getCountAgg(),
+        ...getHttpAggs(sort, querySize),
+      },
+      query: {
+        bool: ip
+          ? {
+              filter,
+              should: [
+                {
+                  term: {
+                    'source.ip': ip,
+                  },
+                },
+                {
+                  term: {
+                    'destination.ip': ip,
+                  },
+                },
+              ],
+              minimum_should_match: 1,
+            }
+          : {
+              filter,
+            },
+      },
+    },
+    size: 0,
+    track_total_hits: false,
+  };
+  return dslQuery;
+};
+
+const getHttpAggs = (sortField: SortField, querySize: number) => ({
+  url: {
+    terms: {
+      field: `url.path`,
+      size: querySize,
+      order: {
+        _count: sortField.direction,
+      },
+    },
+    aggs: {
+      methods: {
+        terms: {
+          field: 'http.request.method',
+          size: 4,
+        },
+      },
+      domains: {
+        terms: {
+          field: 'url.domain',
+          size: 4,
+        },
+      },
+      status: {
+        terms: {
+          field: 'http.response.status_code',
+          size: 4,
+        },
+      },
+      source: {
+        top_hits: {
+          size: 1,
+          _source: {
+            includes: ['host.name', 'source.ip'],
+          },
+        },
+      },
+    },
+  },
+});
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts
index 2c21d9741d648f..7d40b034c66bb0 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/index.ts
@@ -8,8 +8,10 @@ import { FactoryQueryTypes } from '../../../../../common/search_strategy/securit
 import { NetworkQueries } from '../../../../../common/search_strategy/security_solution/network';
 
 import { SecuritySolutionFactory } from '../types';
+import { networkHttp } from './http';
 import { networkTls } from './tls';
 
 export const networkFactory: Record<NetworkQueries, SecuritySolutionFactory<FactoryQueryTypes>> = {
+  [NetworkQueries.http]: networkHttp,
   [NetworkQueries.tls]: networkTls,
 };

From a656b96e25be33c17620d99425777f7ff4a4ad1f Mon Sep 17 00:00:00 2001
From: Sandra Gonzales <neptunian@users.noreply.github.com>
Date: Wed, 2 Sep 2020 06:22:20 -0400
Subject: [PATCH 171/216] [Ingest Manager] support multiple kibana urls
 (#75712)

* let the user specify multiple kibana urls

* add validation to kibana urls so paths and protocols cannot differ

* update i18n message

* only send the first url to the instructions

* udpate all agent configs' revision when settings is updated

* fix jest test

* update endpoint full agent policy test

* fix type

* dont add settings if standalone mode

* fix ui not handling errors from /{agentPolicyId}/full endpoint

* fix formatted message id

* only return needed fields

* fill in updated_by and updated_at attributes of the ingest-agent-policies when revision is bumped

* throw error if kibana_urls not set and update tests

* change ingest_manager_settings SO attribute kibana_url: string to kibana_urls: string[] and add migration

* leave instructions single kibana url

* make kibana_url and other attributes created during setup required, fix types
---
 .../ingest_manager/common/services/index.ts   |  1 +
 .../services/is_diff_path_protocol.test.ts    | 39 ++++++++++++++
 .../common/services/is_diff_path_protocol.ts  | 24 +++++++++
 .../ingest_manager/common/types/index.ts      |  2 +-
 .../common/types/models/agent_policy.ts       |  5 ++
 .../common/types/models/settings.ts           |  8 +--
 .../components/settings_flyout.tsx            | 37 ++++++++-----
 .../components/agent_policy_yaml_flyout.tsx   | 32 +++++++----
 .../managed_instructions.tsx                  |  7 ++-
 x-pack/plugins/ingest_manager/server/index.ts |  7 ++-
 .../server/routes/install_script/index.ts     |  8 +--
 .../server/routes/settings/index.ts           |  6 ++-
 .../server/saved_objects/index.ts             |  6 ++-
 .../saved_objects/migrations/to_v7_10_0.ts    | 22 +++++++-
 .../server/services/agent_policy.test.ts      | 35 +++++++++++-
 .../server/services/agent_policy.ts           | 39 +++++++++++++-
 .../server/services/settings.ts               | 44 ++++++++++++---
 .../ingest_manager/server/services/setup.ts   | 26 ++-------
 .../server/types/rest_spec/settings.ts        | 11 +++-
 .../apis/index.js                             |  3 ++
 .../apis/settings/index.js                    | 11 ++++
 .../apis/settings/update.ts                   | 53 +++++++++++++++++++
 .../apps/endpoint/policy_details.ts           | 15 ++++++
 23 files changed, 371 insertions(+), 70 deletions(-)
 create mode 100644 x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.test.ts
 create mode 100644 x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.ts
 create mode 100644 x-pack/test/ingest_manager_api_integration/apis/settings/index.js
 create mode 100644 x-pack/test/ingest_manager_api_integration/apis/settings/update.ts

diff --git a/x-pack/plugins/ingest_manager/common/services/index.ts b/x-pack/plugins/ingest_manager/common/services/index.ts
index ad739bf9ff844d..46a1c65872d1b6 100644
--- a/x-pack/plugins/ingest_manager/common/services/index.ts
+++ b/x-pack/plugins/ingest_manager/common/services/index.ts
@@ -11,3 +11,4 @@ export { fullAgentPolicyToYaml } from './full_agent_policy_to_yaml';
 export { isPackageLimited, doesAgentPolicyAlreadyIncludePackage } from './limited_package';
 export { decodeCloudId } from './decode_cloud_id';
 export { isValidNamespace } from './is_valid_namespace';
+export { isDiffPathProtocol } from './is_diff_path_protocol';
diff --git a/x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.test.ts b/x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.test.ts
new file mode 100644
index 00000000000000..c488d552d7676a
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.test.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.
+ */
+import { isDiffPathProtocol } from './is_diff_path_protocol';
+
+describe('Ingest Manager - isDiffPathProtocol', () => {
+  it('returns true for different paths', () => {
+    expect(
+      isDiffPathProtocol([
+        'http://localhost:8888/abc',
+        'http://localhost:8888/abc',
+        'http://localhost:8888/efg',
+      ])
+    ).toBe(true);
+  });
+  it('returns true for different protocols', () => {
+    expect(
+      isDiffPathProtocol([
+        'http://localhost:8888/abc',
+        'https://localhost:8888/abc',
+        'http://localhost:8888/abc',
+      ])
+    ).toBe(true);
+  });
+  it('returns false for same paths and protocols and different host or port', () => {
+    expect(
+      isDiffPathProtocol([
+        'http://localhost:8888/abc',
+        'http://localhost2:8888/abc',
+        'http://localhost:8883/abc',
+      ])
+    ).toBe(false);
+  });
+  it('returns false for one url', () => {
+    expect(isDiffPathProtocol(['http://localhost:8888/abc'])).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.ts b/x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.ts
new file mode 100644
index 00000000000000..666e886d745b15
--- /dev/null
+++ b/x-pack/plugins/ingest_manager/common/services/is_diff_path_protocol.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.
+ */
+
+/*
+ * 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.
+ */
+
+// validates an array of urls have the same path and protocol
+export function isDiffPathProtocol(kibanaUrls: string[]) {
+  const urlCompare = new URL(kibanaUrls[0]);
+  const compareProtocol = urlCompare.protocol;
+  const comparePathname = urlCompare.pathname;
+  return kibanaUrls.some((v) => {
+    const url = new URL(v);
+    const protocol = url.protocol;
+    const pathname = url.pathname;
+    return compareProtocol !== protocol || comparePathname !== pathname;
+  });
+}
diff --git a/x-pack/plugins/ingest_manager/common/types/index.ts b/x-pack/plugins/ingest_manager/common/types/index.ts
index cafd0f03f66e29..d62f4fbb023dc0 100644
--- a/x-pack/plugins/ingest_manager/common/types/index.ts
+++ b/x-pack/plugins/ingest_manager/common/types/index.ts
@@ -15,7 +15,7 @@ export interface IngestManagerConfigType {
     pollingRequestTimeout: number;
     maxConcurrentConnections: number;
     kibana: {
-      host?: string;
+      host?: string[] | string;
       ca_sha256?: string;
     };
     elasticsearch: {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts b/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
index c626c85d3fb24f..263e10e9d34b14 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/agent_policy.ts
@@ -60,6 +60,11 @@ export interface FullAgentPolicy {
       [key: string]: any;
     };
   };
+  fleet?: {
+    kibana: {
+      hosts: string[];
+    };
+  };
   inputs: FullAgentPolicyInput[];
   revision?: number;
   agent?: {
diff --git a/x-pack/plugins/ingest_manager/common/types/models/settings.ts b/x-pack/plugins/ingest_manager/common/types/models/settings.ts
index 98d99911f1b3fc..f554f4b392ad6e 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/settings.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/settings.ts
@@ -5,10 +5,10 @@
  */
 import { SavedObjectAttributes } from 'src/core/public';
 
-interface BaseSettings {
-  agent_auto_upgrade?: boolean;
-  package_auto_upgrade?: boolean;
-  kibana_url?: string;
+export interface BaseSettings {
+  agent_auto_upgrade: boolean;
+  package_auto_upgrade: boolean;
+  kibana_urls: string[];
   kibana_ca_sha256?: string;
   has_seen_add_data_notice?: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
index 9a9557f77c40c3..e0d843ad773b86 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/settings_flyout.tsx
@@ -18,14 +18,14 @@ import {
   EuiFlyoutFooter,
   EuiForm,
   EuiFormRow,
-  EuiFieldText,
   EuiRadioGroup,
   EuiComboBox,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiText } from '@elastic/eui';
-import { useInput, useComboInput, useCore, useGetSettings, sendPutSettings } from '../hooks';
+import { useComboInput, useCore, useGetSettings, sendPutSettings } from '../hooks';
 import { useGetOutputs, sendPutOutput } from '../hooks/use_request/outputs';
+import { isDiffPathProtocol } from '../../../../common/';
 
 const URL_REGEX = /^(https?):\/\/[^\s$.?#].[^\s]*$/gm;
 
@@ -36,14 +36,28 @@ interface Props {
 function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
   const [isLoading, setIsloading] = React.useState(false);
   const { notifications } = useCore();
-  const kibanaUrlInput = useInput('', (value) => {
-    if (!value.match(URL_REGEX)) {
+  const kibanaUrlsInput = useComboInput([], (value) => {
+    if (value.length === 0) {
+      return [
+        i18n.translate('xpack.ingestManager.settings.kibanaUrlEmptyError', {
+          defaultMessage: 'At least one URL is required',
+        }),
+      ];
+    }
+    if (value.some((v) => !v.match(URL_REGEX))) {
       return [
         i18n.translate('xpack.ingestManager.settings.kibanaUrlError', {
           defaultMessage: 'Invalid URL',
         }),
       ];
     }
+    if (isDiffPathProtocol(value)) {
+      return [
+        i18n.translate('xpack.ingestManager.settings.kibanaUrlDifferentPathOrProtocolError', {
+          defaultMessage: 'Protocol and path must be the same for each URL',
+        }),
+      ];
+    }
   });
   const elasticsearchUrlInput = useComboInput([], (value) => {
     if (value.some((v) => !v.match(URL_REGEX))) {
@@ -58,7 +72,7 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
   return {
     isLoading,
     onSubmit: async () => {
-      if (!kibanaUrlInput.validate() || !elasticsearchUrlInput.validate()) {
+      if (!kibanaUrlsInput.validate() || !elasticsearchUrlInput.validate()) {
         return;
       }
 
@@ -74,7 +88,7 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
           throw outputResponse.error;
         }
         const settingsResponse = await sendPutSettings({
-          kibana_url: kibanaUrlInput.value,
+          kibana_urls: kibanaUrlsInput.value,
         });
         if (settingsResponse.error) {
           throw settingsResponse.error;
@@ -94,14 +108,13 @@ function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
       }
     },
     inputs: {
-      kibanaUrl: kibanaUrlInput,
+      kibanaUrls: kibanaUrlsInput,
       elasticsearchUrl: elasticsearchUrlInput,
     },
   };
 }
 
 export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
-  const core = useCore();
   const settingsRequest = useGetSettings();
   const settings = settingsRequest?.data?.item;
   const outputsRequest = useGetOutputs();
@@ -117,9 +130,7 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
 
   useEffect(() => {
     if (settings) {
-      inputs.kibanaUrl.setValue(
-        settings.kibana_url || `${window.location.origin}${core.http.basePath.get()}`
-      );
+      inputs.kibanaUrls.setValue(settings.kibana_urls);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [settings]);
@@ -220,9 +231,9 @@ export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
           label={i18n.translate('xpack.ingestManager.settings.kibanaUrlLabel', {
             defaultMessage: 'Kibana URL',
           })}
-          {...inputs.kibanaUrl.formRowProps}
+          {...inputs.kibanaUrls.formRowProps}
         >
-          <EuiFieldText required={true} {...inputs.kibanaUrl.props} name="kibanaUrl" />
+          <EuiComboBox noSuggestions {...inputs.kibanaUrls.props} />
         </EuiFormRow>
       </EuiFormRow>
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
index 919bb49f69aaee..5d485a6e210865 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_yaml_flyout.tsx
@@ -18,6 +18,7 @@ import {
   EuiFlyoutFooter,
   EuiButtonEmpty,
   EuiButton,
+  EuiCallOut,
 } from '@elastic/eui';
 import { useGetOneAgentPolicyFull, useGetOneAgentPolicy, useCore } from '../../../hooks';
 import { Loading } from '../../../components';
@@ -32,17 +33,28 @@ const FlyoutBody = styled(EuiFlyoutBody)`
 export const AgentPolicyYamlFlyout = memo<{ policyId: string; onClose: () => void }>(
   ({ policyId, onClose }) => {
     const core = useCore();
-    const { isLoading: isLoadingYaml, data: yamlData } = useGetOneAgentPolicyFull(policyId);
+    const { isLoading: isLoadingYaml, data: yamlData, error } = useGetOneAgentPolicyFull(policyId);
     const { data: agentPolicyData } = useGetOneAgentPolicy(policyId);
-
-    const body =
-      isLoadingYaml && !yamlData ? (
-        <Loading />
-      ) : (
-        <EuiCodeBlock language="yaml" isCopyable fontSize="m">
-          {fullAgentPolicyToYaml(yamlData!.item)}
-        </EuiCodeBlock>
-      );
+    const body = isLoadingYaml ? (
+      <Loading />
+    ) : error ? (
+      <EuiCallOut
+        title={
+          <FormattedMessage
+            id="xpack.ingestManager.policyDetails.ErrorGettingFullAgentPolicy"
+            defaultMessage="Error loading agent policy"
+          />
+        }
+        color="danger"
+        iconType="alert"
+      >
+        {error.message}
+      </EuiCallOut>
+    ) : (
+      <EuiCodeBlock language="yaml" isCopyable fontSize="m">
+        {fullAgentPolicyToYaml(yamlData!.item)}
+      </EuiCodeBlock>
+    );
 
     const downloadLink = core.http.basePath.prepend(
       agentPolicyRouteService.getInfoFullDownloadPath(policyId)
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
index b02893057c9c33..9307229cdc2582 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -34,8 +34,11 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
   const settings = useGetSettings();
   const apiKey = useGetOneEnrollmentAPIKey(selectedAPIKeyId);
 
-  const kibanaUrl =
-    settings.data?.item?.kibana_url ?? `${window.location.origin}${core.http.basePath.get()}`;
+  const kibanaUrlsSettings = settings.data?.item?.kibana_urls;
+  const kibanaUrl = kibanaUrlsSettings
+    ? kibanaUrlsSettings[0]
+    : `${window.location.origin}${core.http.basePath.get()}`;
+
   const kibanaCASha256 = settings.data?.item?.kibana_ca_sha256;
 
   const steps: EuiContainedStepProps[] = [
diff --git a/x-pack/plugins/ingest_manager/server/index.ts b/x-pack/plugins/ingest_manager/server/index.ts
index 962cddb2e411e6..f7b923aebb48bd 100644
--- a/x-pack/plugins/ingest_manager/server/index.ts
+++ b/x-pack/plugins/ingest_manager/server/index.ts
@@ -32,7 +32,12 @@ export const config = {
       pollingRequestTimeout: schema.number({ defaultValue: 60000 }),
       maxConcurrentConnections: schema.number({ defaultValue: 0 }),
       kibana: schema.object({
-        host: schema.maybe(schema.string()),
+        host: schema.maybe(
+          schema.oneOf([
+            schema.uri({ scheme: ['http', 'https'] }),
+            schema.arrayOf(schema.uri({ scheme: ['http', 'https'] }), { minSize: 1 }),
+          ])
+        ),
         ca_sha256: schema.maybe(schema.string()),
       }),
       elasticsearch: schema.object({
diff --git a/x-pack/plugins/ingest_manager/server/routes/install_script/index.ts b/x-pack/plugins/ingest_manager/server/routes/install_script/index.ts
index c2a5d77a39eb16..c767d3e80d2b7d 100644
--- a/x-pack/plugins/ingest_manager/server/routes/install_script/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/install_script/index.ts
@@ -38,16 +38,16 @@ export const registerRoutes = ({
       const http = appContextService.getHttpSetup();
       const serverInfo = http.getServerInfo();
       const basePath = http.basePath;
-      const kibanaUrl =
-        (await settingsService.getSettings(soClient)).kibana_url ||
+      const kibanaUrls = (await settingsService.getSettings(soClient)).kibana_urls || [
         url.format({
           protocol: serverInfo.protocol,
           hostname: serverInfo.hostname,
           port: serverInfo.port,
           pathname: basePath.serverBasePath,
-        });
+        }),
+      ];
 
-      const script = getScript(request.params.osType, kibanaUrl);
+      const script = getScript(request.params.osType, kibanaUrls[0]);
 
       return response.ok({ body: script });
     }
diff --git a/x-pack/plugins/ingest_manager/server/routes/settings/index.ts b/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
index 56e666056e8d0a..aabb85dadabc20 100644
--- a/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
@@ -8,7 +8,7 @@ import { TypeOf } from '@kbn/config-schema';
 import { PLUGIN_ID, SETTINGS_API_ROUTES } from '../../constants';
 import { PutSettingsRequestSchema, GetSettingsRequestSchema } from '../../types';
 
-import { settingsService } from '../../services';
+import { settingsService, agentPolicyService, appContextService } from '../../services';
 
 export const getSettingsHandler: RequestHandler = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
@@ -40,8 +40,12 @@ export const putSettingsHandler: RequestHandler<
   TypeOf<typeof PutSettingsRequestSchema.body>
 > = async (context, request, response) => {
   const soClient = context.core.savedObjects.client;
+  const user = await appContextService.getSecurity()?.authc.getCurrentUser(request);
   try {
     const settings = await settingsService.saveSettings(soClient, request.body);
+    await agentPolicyService.bumpAllAgentPolicies(soClient, {
+      user: user || undefined,
+    });
     const body = {
       success: true,
       item: settings,
diff --git a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
index 1bbe3b71bf9191..aff8e607622d47 100644
--- a/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
+++ b/x-pack/plugins/ingest_manager/server/saved_objects/index.ts
@@ -23,6 +23,7 @@ import {
   migrateAgentPolicyToV7100,
   migrateEnrollmentApiKeysToV7100,
   migratePackagePolicyToV7100,
+  migrateSettingsToV7100,
 } from './migrations/to_v7_10_0';
 
 /*
@@ -43,11 +44,14 @@ const savedObjectTypes: { [key: string]: SavedObjectsType } = {
       properties: {
         agent_auto_upgrade: { type: 'keyword' },
         package_auto_upgrade: { type: 'keyword' },
-        kibana_url: { type: 'keyword' },
+        kibana_urls: { type: 'keyword' },
         kibana_ca_sha256: { type: 'keyword' },
         has_seen_add_data_notice: { type: 'boolean', index: false },
       },
     },
+    migrations: {
+      '7.10.0': migrateSettingsToV7100,
+    },
   },
   [AGENT_SAVED_OBJECT_TYPE]: {
     name: AGENT_SAVED_OBJECT_TYPE,
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 b60903dbd2bd06..5e36ce46c099be 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
@@ -5,7 +5,14 @@
  */
 
 import { SavedObjectMigrationFn } from 'kibana/server';
-import { Agent, AgentEvent, AgentPolicy, PackagePolicy, EnrollmentAPIKey } from '../../types';
+import {
+  Agent,
+  AgentEvent,
+  AgentPolicy,
+  PackagePolicy,
+  EnrollmentAPIKey,
+  Settings,
+} from '../../types';
 
 export const migrateAgentToV7100: SavedObjectMigrationFn<
   Exclude<Agent, 'policy_id' | 'policy_revision'> & {
@@ -72,3 +79,16 @@ export const migratePackagePolicyToV7100: SavedObjectMigrationFn<
 
   return packagePolicyDoc;
 };
+
+export const migrateSettingsToV7100: SavedObjectMigrationFn<
+  Exclude<Settings, 'kibana_urls'> & {
+    kibana_url: string;
+  },
+  Settings
+> = (settingsDoc) => {
+  settingsDoc.attributes.kibana_urls = [settingsDoc.attributes.kibana_url];
+  // @ts-expect-error
+  delete settingsDoc.attributes.kibana_url;
+
+  return settingsDoc;
+};
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
index dc2a89c661ac3d..d9dffa03b2290f 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.test.ts
@@ -19,6 +19,24 @@ function getSavedObjectMock(agentPolicyAttributes: any) {
       attributes: agentPolicyAttributes,
     };
   });
+  mock.find.mockImplementation(async (options) => {
+    return {
+      saved_objects: [
+        {
+          id: '93f74c0-e876-11ea-b7d3-8b2acec6f75c',
+          attributes: {
+            kibana_urls: ['http://localhost:5603'],
+          },
+          type: 'ingest_manager_settings',
+          score: 1,
+          references: [],
+        },
+      ],
+      total: 1,
+      page: 1,
+      per_page: 1,
+    };
+  });
 
   return mock;
 }
@@ -43,7 +61,7 @@ jest.mock('./output', () => {
 
 describe('agent policy', () => {
   describe('getFullAgentPolicy', () => {
-    it('should return a policy without monitoring if not monitoring is not enabled', async () => {
+    it('should return a policy without monitoring if monitoring is not enabled', async () => {
       const soClient = getSavedObjectMock({
         revision: 1,
       });
@@ -61,6 +79,11 @@ describe('agent policy', () => {
         },
         inputs: [],
         revision: 1,
+        fleet: {
+          kibana: {
+            hosts: ['http://localhost:5603'],
+          },
+        },
         agent: {
           monitoring: {
             enabled: false,
@@ -90,6 +113,11 @@ describe('agent policy', () => {
         },
         inputs: [],
         revision: 1,
+        fleet: {
+          kibana: {
+            hosts: ['http://localhost:5603'],
+          },
+        },
         agent: {
           monitoring: {
             use_output: 'default',
@@ -120,6 +148,11 @@ describe('agent policy', () => {
         },
         inputs: [],
         revision: 1,
+        fleet: {
+          kibana: {
+            hosts: ['http://localhost:5603'],
+          },
+        },
         agent: {
           monitoring: {
             use_output: 'default',
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
index 21bc7b021e83a2..2c97bba0cac459 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { uniq } from 'lodash';
-import { SavedObjectsClientContract } from 'src/core/server';
+import { SavedObjectsClientContract, SavedObjectsBulkUpdateResponse } from 'src/core/server';
 import { AuthenticatedUser } from '../../../security/server';
 import {
   DEFAULT_AGENT_POLICY,
@@ -25,6 +25,7 @@ import { listAgents } from './agents';
 import { packagePolicyService } from './package_policy';
 import { outputService } from './output';
 import { agentPolicyUpdateEventHandler } from './agent_policy_update';
+import { getSettings } from './settings';
 
 const SAVED_OBJECT_TYPE = AGENT_POLICY_SAVED_OBJECT_TYPE;
 
@@ -260,6 +261,25 @@ class AgentPolicyService {
   ): Promise<AgentPolicy> {
     return this._update(soClient, id, {}, options?.user);
   }
+  public async bumpAllAgentPolicies(
+    soClient: SavedObjectsClientContract,
+    options?: { user?: AuthenticatedUser }
+  ): Promise<Promise<SavedObjectsBulkUpdateResponse<AgentPolicy>>> {
+    const currentPolicies = await soClient.find<AgentPolicySOAttributes>({
+      type: SAVED_OBJECT_TYPE,
+      fields: ['revision'],
+    });
+    const bumpedPolicies = currentPolicies.saved_objects.map((policy) => {
+      policy.attributes = {
+        ...policy.attributes,
+        revision: policy.attributes.revision + 1,
+        updated_at: new Date().toISOString(),
+        updated_by: options?.user ? options.user.username : 'system',
+      };
+      return policy;
+    });
+    return soClient.bulkUpdate<AgentPolicySOAttributes>(bumpedPolicies);
+  }
 
   public async assignPackagePolicies(
     soClient: SavedObjectsClientContract,
@@ -370,6 +390,7 @@ class AgentPolicyService {
     options?: { standalone: boolean }
   ): Promise<FullAgentPolicy | null> {
     let agentPolicy;
+    const standalone = options?.standalone;
 
     try {
       agentPolicy = await this.get(soClient, id);
@@ -435,6 +456,22 @@ class AgentPolicyService {
           }),
     };
 
+    // only add settings if not in standalone
+    if (!standalone) {
+      let settings;
+      try {
+        settings = await getSettings(soClient);
+      } catch (error) {
+        throw new Error('Default settings is not setup');
+      }
+      if (!settings.kibana_urls) throw new Error('kibana_urls is missing');
+      fullAgentPolicy.fleet = {
+        kibana: {
+          hosts: settings.kibana_urls,
+        },
+      };
+    }
+
     return fullAgentPolicy;
   }
 }
diff --git a/x-pack/plugins/ingest_manager/server/services/settings.ts b/x-pack/plugins/ingest_manager/server/services/settings.ts
index f1c09746d9abd1..25223fbc08535a 100644
--- a/x-pack/plugins/ingest_manager/server/services/settings.ts
+++ b/x-pack/plugins/ingest_manager/server/services/settings.ts
@@ -5,7 +5,15 @@
  */
 import Boom from 'boom';
 import { SavedObjectsClientContract } from 'kibana/server';
-import { GLOBAL_SETTINGS_SAVED_OBJECT_TYPE, SettingsSOAttributes, Settings } from '../../common';
+import url from 'url';
+import {
+  GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
+  SettingsSOAttributes,
+  Settings,
+  decodeCloudId,
+  BaseSettings,
+} from '../../common';
+import { appContextService } from './app_context';
 
 export async function getSettings(soClient: SavedObjectsClientContract): Promise<Settings> {
   const res = await soClient.find<SettingsSOAttributes>({
@@ -25,7 +33,7 @@ export async function getSettings(soClient: SavedObjectsClientContract): Promise
 export async function saveSettings(
   soClient: SavedObjectsClientContract,
   newData: Partial<Omit<Settings, 'id'>>
-): Promise<Settings> {
+): Promise<Partial<Settings> & Pick<Settings, 'id'>> {
   try {
     const settings = await getSettings(soClient);
 
@@ -41,10 +49,11 @@ export async function saveSettings(
     };
   } catch (e) {
     if (e.isBoom && e.output.statusCode === 404) {
-      const res = await soClient.create<SettingsSOAttributes>(
-        GLOBAL_SETTINGS_SAVED_OBJECT_TYPE,
-        newData
-      );
+      const defaultSettings = createDefaultSettings();
+      const res = await soClient.create<SettingsSOAttributes>(GLOBAL_SETTINGS_SAVED_OBJECT_TYPE, {
+        ...defaultSettings,
+        ...newData,
+      });
 
       return {
         id: res.id,
@@ -55,3 +64,26 @@ export async function saveSettings(
     throw e;
   }
 }
+
+export function createDefaultSettings(): BaseSettings {
+  const http = appContextService.getHttpSetup();
+  const serverInfo = http.getServerInfo();
+  const basePath = http.basePath;
+
+  const cloud = appContextService.getCloud();
+  const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
+  const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
+  const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
+  const defaultUrl = url.format({
+    protocol: serverInfo.protocol,
+    hostname: serverInfo.hostname,
+    port: serverInfo.port,
+    pathname: basePath.serverBasePath,
+  });
+
+  return {
+    agent_auto_upgrade: true,
+    package_auto_upgrade: true,
+    kibana_urls: [cloudUrl || flagsUrl || defaultUrl].flat(),
+  };
+}
diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
index fd5d94a71d672c..ec3a05a4fa390d 100644
--- a/x-pack/plugins/ingest_manager/server/services/setup.ts
+++ b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import url from 'url';
 import uuid from 'uuid';
 import { SavedObjectsClientContract } from 'src/core/server';
 import { CallESAsCurrentUser } from '../types';
@@ -22,14 +21,13 @@ import {
   Installation,
   Output,
   DEFAULT_AGENT_POLICIES_PACKAGES,
-  decodeCloudId,
 } from '../../common';
 import { getPackageInfo } from './epm/packages';
 import { packagePolicyService } from './package_policy';
 import { generateEnrollmentAPIKey } from './api_keys';
 import { settingsService } from '.';
-import { appContextService } from './app_context';
 import { awaitIfPending } from './setup_utils';
+import { createDefaultSettings } from './settings';
 
 const FLEET_ENROLL_USERNAME = 'fleet_enroll';
 const FLEET_ENROLL_ROLE = 'fleet_enroll';
@@ -58,26 +56,8 @@ async function createSetupSideEffects(
     ensureDefaultIndices(callCluster),
     settingsService.getSettings(soClient).catch((e: any) => {
       if (e.isBoom && e.output.statusCode === 404) {
-        const http = appContextService.getHttpSetup();
-        const serverInfo = http.getServerInfo();
-        const basePath = http.basePath;
-
-        const cloud = appContextService.getCloud();
-        const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
-        const cloudUrl = cloudId && decodeCloudId(cloudId)?.kibanaUrl;
-        const flagsUrl = appContextService.getConfig()?.fleet?.kibana?.host;
-        const defaultUrl = url.format({
-          protocol: serverInfo.protocol,
-          hostname: serverInfo.hostname,
-          port: serverInfo.port,
-          pathname: basePath.serverBasePath,
-        });
-
-        return settingsService.saveSettings(soClient, {
-          agent_auto_upgrade: true,
-          package_auto_upgrade: true,
-          kibana_url: cloudUrl || flagsUrl || defaultUrl,
-        });
+        const defaultSettings = createDefaultSettings();
+        return settingsService.saveSettings(soClient, defaultSettings);
       }
 
       return Promise.reject(e);
diff --git a/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts b/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts
index baee9f79d9317d..35718491c92247 100644
--- a/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts
+++ b/x-pack/plugins/ingest_manager/server/types/rest_spec/settings.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { schema } from '@kbn/config-schema';
+import { isDiffPathProtocol } from '../../../common';
 
 export const GetSettingsRequestSchema = {};
 
@@ -11,7 +12,15 @@ export const PutSettingsRequestSchema = {
   body: schema.object({
     agent_auto_upgrade: schema.maybe(schema.boolean()),
     package_auto_upgrade: schema.maybe(schema.boolean()),
-    kibana_url: schema.maybe(schema.uri({ scheme: ['http', 'https'] })),
+    kibana_urls: schema.maybe(
+      schema.arrayOf(schema.uri({ scheme: ['http', 'https'] }), {
+        validate: (value) => {
+          if (isDiffPathProtocol(value)) {
+            return 'Protocol and path must be the same for each URL';
+          }
+        },
+      })
+    ),
     kibana_ca_sha256: schema.maybe(schema.string()),
     has_seen_add_data_notice: schema.maybe(schema.boolean()),
   }),
diff --git a/x-pack/test/ingest_manager_api_integration/apis/index.js b/x-pack/test/ingest_manager_api_integration/apis/index.js
index fac8a26fd6aec4..7c1ebef337baa2 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/index.js
+++ b/x-pack/test/ingest_manager_api_integration/apis/index.js
@@ -22,5 +22,8 @@ export default function ({ loadTestFile }) {
 
     // Agent policies
     loadTestFile(require.resolve('./agent_policy/index'));
+
+    // Settings
+    loadTestFile(require.resolve('./settings/index'));
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/settings/index.js b/x-pack/test/ingest_manager_api_integration/apis/settings/index.js
new file mode 100644
index 00000000000000..99346fcabeff4f
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/settings/index.js
@@ -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 default function loadTests({ loadTestFile }) {
+  describe('Settings Endpoints', () => {
+    loadTestFile(require.resolve('./update'));
+  });
+}
diff --git a/x-pack/test/ingest_manager_api_integration/apis/settings/update.ts b/x-pack/test/ingest_manager_api_integration/apis/settings/update.ts
new file mode 100644
index 00000000000000..86292b535db2d4
--- /dev/null
+++ b/x-pack/test/ingest_manager_api_integration/apis/settings/update.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 '../../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../../helpers';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('Settings - update', async function () {
+    skipIfNoDockerRegistry(providerContext);
+
+    it("should bump all agent policy's revision", async function () {
+      const { body: testPolicy1PostRes } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({
+          name: 'test',
+          description: '',
+          namespace: 'default',
+        });
+      const { body: testPolicy2PostRes } = await supertest
+        .post(`/api/ingest_manager/agent_policies`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({
+          name: 'test2',
+          description: '',
+          namespace: 'default',
+        });
+      await supertest
+        .put(`/api/ingest_manager/settings`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ kibana_urls: ['http://localhost:1232/abc', 'http://localhost:1232/abc'] });
+
+      const getTestPolicy1Res = await kibanaServer.savedObjects.get({
+        type: 'ingest-agent-policies',
+        id: testPolicy1PostRes.item.id,
+      });
+      const getTestPolicy2Res = await kibanaServer.savedObjects.get({
+        type: 'ingest-agent-policies',
+        id: testPolicy2PostRes.item.id,
+      });
+      expect(getTestPolicy1Res.attributes.revision).equal(2);
+      expect(getTestPolicy2Res.attributes.revision).equal(2);
+    });
+  });
+}
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
index a0998f1a838baf..9a3489e9309bfb 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/policy_details.ts
@@ -5,6 +5,7 @@
  */
 
 import expect from '@kbn/expect';
+import Url from 'url';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
 
@@ -18,6 +19,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   ]);
   const testSubjects = getService('testSubjects');
   const policyTestResources = getService('policyTestResources');
+  const config = getService('config');
+  const kbnTestServer = config.get('servers.kibana');
+  const { protocol, hostname, port } = kbnTestServer;
+
+  const kibanaUrl = Url.format({
+    protocol,
+    hostname,
+    port,
+  });
 
   describe('When on the Endpoint Policy Details Page', function () {
     this.tags(['ciGroup7']);
@@ -222,6 +232,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
               type: 'elasticsearch',
             },
           },
+          fleet: {
+            kibana: {
+              hosts: [kibanaUrl],
+            },
+          },
           revision: 3,
           agent: {
             monitoring: {

From 4a4d7ce5a414891f9b46879d4dfdb5cc088772cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Casper=20H=C3=BCbertz?= <casper@elastic.co>
Date: Wed, 2 Sep 2020 13:15:32 +0200
Subject: [PATCH 172/216] [APM] Minor style improvements to stacktraces
 (#76375)

- Added some more spacing for the indention inside a nested accordion
- Added additional spacing to the CausedBy accordions that created some space between the content and the containers.
---
 .../public/components/shared/Stacktrace/CauseStacktrace.tsx    | 3 ++-
 .../apm/public/components/shared/Stacktrace/Stackframe.tsx     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 977bf2dd09cc09..8cabb820ed7f3b 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/CauseStacktrace.tsx
@@ -8,13 +8,14 @@ import React from 'react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import { EuiAccordion, EuiTitle } from '@elastic/eui';
-import { px, unit } from '../../../style/variables';
+import { px, unit, units } from '../../../style/variables';
 import { Stacktrace } from '.';
 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)`
   border-top: ${({ theme }) => theme.eui.euiBorderThin};
+  margin-top: ${px(units.half)};
 `;
 
 const CausedByContainer = styled('h5')`
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 a552491297d550..f72eb209f23299 100644
--- a/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
+++ b/x-pack/plugins/apm/public/components/shared/Stacktrace/Stackframe.tsx
@@ -35,7 +35,7 @@ const ContextContainer = styled.div<{ isLibraryFrame: boolean }>`
 
 // 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)};
+  margin-left: ${px(units.unit + units.half + units.quarter)};
 `;
 
 interface Props {

From 946e9f09140ac7b5683eb3c85e78c2a39851212f Mon Sep 17 00:00:00 2001
From: Thomas Neirynck <thomas@elastic.co>
Date: Wed, 2 Sep 2020 08:56:23 -0400
Subject: [PATCH 173/216] [Maps] Remove obsolete link (#76419)

---
 .../routing/routes/list/maps_list_view.js     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/maps/public/routing/routes/list/maps_list_view.js b/x-pack/plugins/maps/public/routing/routes/list/maps_list_view.js
index e9229883d708d2..8fe6866cd78348 100644
--- a/x-pack/plugins/maps/public/routing/routes/list/maps_list_view.js
+++ b/x-pack/plugins/maps/public/routing/routes/list/maps_list_view.js
@@ -12,6 +12,7 @@ import {
   getUiSettings,
   getToasts,
   getCoreChrome,
+  getNavigateToApp,
 } from '../../../kibana_services';
 import {
   EuiTitle,
@@ -32,11 +33,18 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { addHelpMenuToAppChrome } from '../../../help_menu_util';
-import { Link } from 'react-router-dom';
 import { goToSpecifiedPath } from '../../maps_router';
+import { APP_ID, MAP_PATH } from '../../../../common/constants';
 
 export const EMPTY_FILTER = '';
 
+function navigateToNewMap() {
+  const navigateToApp = getNavigateToApp();
+  navigateToApp(APP_ID, {
+    path: MAP_PATH,
+  });
+}
+
 export class MapsListView extends React.Component {
   state = {
     hasInitialFetchReturned: false,
@@ -388,14 +396,12 @@ export class MapsListView extends React.Component {
     let createButton;
     if (!this.state.readOnly) {
       createButton = (
-        <Link to={'/map'}>
-          <EuiButton data-test-subj="newMapLink" fill>
-            <FormattedMessage
-              id="xpack.maps.mapListing.createMapButtonLabel"
-              defaultMessage="Create map"
-            />
-          </EuiButton>
-        </Link>
+        <EuiButton data-test-subj="newMapLink" fill onClick={navigateToNewMap}>
+          <FormattedMessage
+            id="xpack.maps.mapListing.createMapButtonLabel"
+            defaultMessage="Create map"
+          />
+        </EuiButton>
       );
     }
     return (

From 4762cf56f54b5f6fba17dbe4cdc8b18607b2dc61 Mon Sep 17 00:00:00 2001
From: James Gowdy <jgowdy@elastic.co>
Date: Wed, 2 Sep 2020 14:07:57 +0100
Subject: [PATCH 174/216] [ML] Switching to new es client (#74965)

* [ML] Switching to new es client

* further conversions

* fixing tests

* updating responses

* test commit

* refactoring shared services to removed context parameter

* removing last scoped clients

* removing ml js client

* udating file data viz errors

* fixing jest tests

* fixing types after merge with master

* error response changes

* adding default sizes to some requests

* adding custom error types for license checks

* tidying up shared function checks

* removing test data

* removing need for DummyKibanaRequest

* updating comment

* fixing functional api tests

* removing comments

* fixing types after master merge

* throw error rather than return it

* removing placeholder error

* changes based on review comments

* fixing types after merge with master

* fixing missing return

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...transaction_duration_anomaly_alert_type.ts |   7 +-
 .../apm/server/lib/helpers/setup_request.ts   |  11 +-
 x-pack/plugins/infra/server/plugin.ts         |   5 +-
 .../components/import_errors/errors.tsx       |  18 +-
 .../common/chart_loader/chart_loader.ts       |   8 +-
 .../ml/server/client/elasticsearch_ml.test.ts |  60 --
 .../ml/server/client/elasticsearch_ml.ts      | 929 ------------------
 .../capabilities/check_capabilities.test.ts   |  30 +-
 .../lib/capabilities/check_capabilities.ts    |   6 +-
 .../ml/server/lib/capabilities/upgrade.ts     |   8 +-
 .../ml/server/lib/check_annotations/index.ts  |  12 +-
 .../server/lib/license/ml_server_license.ts   |   3 -
 .../annotation_service/annotation.test.ts     |  43 +-
 .../models/annotation_service/annotation.ts   |  24 +-
 .../server/models/annotation_service/index.ts |   6 +-
 .../bucket_span_estimator.d.ts                |   8 +-
 .../bucket_span_estimator.js                  |  90 +-
 .../bucket_span_estimator.test.ts             |  17 +-
 .../polled_data_checker.js                    |  11 +-
 .../single_series_checker.js                  |  11 +-
 .../calculate_model_memory_limit.ts           |  23 +-
 .../models/calendar/calendar_manager.ts       |  39 +-
 .../server/models/calendar/event_manager.ts   |  29 +-
 .../analytics_audit_messages.ts               |  38 +-
 .../data_recognizer/data_recognizer.test.ts   |  11 +-
 .../models/data_recognizer/data_recognizer.ts | 105 +-
 .../models/data_visualizer/data_visualizer.ts | 100 +-
 .../models/fields_service/fields_service.ts   |  46 +-
 .../file_data_visualizer.ts                   |  12 +-
 .../file_data_visualizer/import_data.ts       |  19 +-
 .../ml/server/models/filter/filter_manager.ts |  47 +-
 .../job_audit_messages.d.ts                   |   4 +-
 .../job_audit_messages/job_audit_messages.js  | 248 +++--
 .../ml/server/models/job_service/datafeeds.ts |  41 +-
 .../server/models/job_service/error_utils.ts  |   6 +-
 .../ml/server/models/job_service/groups.ts    |  19 +-
 .../ml/server/models/job_service/index.ts     |  18 +-
 .../ml/server/models/job_service/jobs.ts      | 135 ++-
 .../models/job_service/model_snapshots.ts     |  34 +-
 .../new_job/categorization/examples.ts        |  16 +-
 .../new_job/categorization/top_categories.ts  |  19 +-
 .../categorization/validation_results.ts      |   4 +-
 .../models/job_service/new_job/charts.ts      |   8 +-
 .../models/job_service/new_job/line_chart.ts  |   8 +-
 .../job_service/new_job/population_chart.ts   |  18 +-
 .../job_service/new_job_caps/field_service.ts |  15 +-
 .../new_job_caps/new_job_caps.test.ts         |  31 +-
 .../job_service/new_job_caps/new_job_caps.ts  |  11 +-
 .../models/job_service/new_job_caps/rollup.ts |   8 +-
 .../job_validation/job_validation.test.ts     |  47 +-
 .../models/job_validation/job_validation.ts   |  18 +-
 .../job_validation/validate_bucket_span.js    |   4 +-
 .../validate_bucket_span.test.ts              |   6 +-
 .../validate_cardinality.test.ts              |  28 +-
 .../job_validation/validate_cardinality.ts    |  17 +-
 .../validate_model_memory_limit.test.ts       |  44 +-
 .../validate_model_memory_limit.ts            |  14 +-
 .../validate_time_range.test.ts               |  19 +-
 .../job_validation/validate_time_range.ts     |  11 +-
 .../get_partition_fields_values.ts            |  12 +-
 .../models/results_service/results_service.ts |  48 +-
 x-pack/plugins/ml/server/plugin.ts            |  38 +-
 .../plugins/ml/server/routes/annotations.ts   |  16 +-
 .../ml/server/routes/anomaly_detectors.ts     | 159 ++-
 x-pack/plugins/ml/server/routes/calendars.ts  |  52 +-
 .../ml/server/routes/data_frame_analytics.ts  | 133 +--
 .../ml/server/routes/data_visualizer.ts       |  26 +-
 x-pack/plugins/ml/server/routes/datafeeds.ts  |  99 +-
 .../ml/server/routes/fields_service.ts        |  18 +-
 .../ml/server/routes/file_data_visualizer.ts  |  22 +-
 x-pack/plugins/ml/server/routes/filters.ts    |  54 +-
 x-pack/plugins/ml/server/routes/indices.ts    |   6 +-
 .../ml/server/routes/job_audit_messages.ts    |   8 +-
 .../plugins/ml/server/routes/job_service.ts   |  80 +-
 .../ml/server/routes/job_validation.ts        |  22 +-
 x-pack/plugins/ml/server/routes/modules.ts    |  38 +-
 .../ml/server/routes/notification_settings.ts |  13 +-
 .../ml/server/routes/results_service.ts       |  66 +-
 x-pack/plugins/ml/server/routes/system.ts     |  64 +-
 .../ml/server/shared_services/errors.ts       |  12 +
 .../shared_services/license_checks/errors.ts  |  21 +
 .../shared_services/license_checks/index.ts   |   8 +
 .../{ => license_checks}/license_checks.ts    |   7 +-
 .../providers/anomaly_detectors.ts            |  35 +-
 .../shared_services/providers/job_service.ts  |  30 +-
 .../shared_services/providers/modules.ts      | 103 +-
 .../providers/results_service.ts              |  31 +-
 .../shared_services/providers/system.ts       |  95 +-
 .../server/shared_services/shared_services.ts | 105 +-
 .../signals/find_ml_signals.ts                |   6 +-
 .../signals/signal_rule_alert_type.ts         |   9 +-
 .../server/lib/machine_learning/authz.ts      |   3 +-
 .../server/lib/machine_learning/index.ts      |   5 +-
 .../usage/detections/detections_helpers.ts    |  14 +-
 .../server/routes/api/field_histograms.ts     |   2 +-
 .../server/lib/alerts/duration_anomaly.ts     |  23 +-
 .../apis/ml/data_frame_analytics/update.ts    |   2 +-
 .../data_visualizer/get_field_histograms.ts   |   3 +-
 .../ml/data_visualizer/get_field_stats.ts     |   3 +-
 .../ml/data_visualizer/get_overall_stats.ts   |   3 +-
 .../ml/fields_service/field_cardinality.ts    |   3 +-
 .../ml/fields_service/time_field_range.ts     |   3 +-
 .../apis/ml/filters/create_filters.ts         |   2 +-
 .../apis/ml/filters/get_filters.ts            |   2 +-
 .../apis/ml/filters/update_filters.ts         |   2 +-
 .../apis/ml/jobs/close_jobs.ts                |   8 +-
 106 files changed, 1573 insertions(+), 2568 deletions(-)
 delete mode 100644 x-pack/plugins/ml/server/client/elasticsearch_ml.test.ts
 delete mode 100644 x-pack/plugins/ml/server/client/elasticsearch_ml.ts
 create mode 100644 x-pack/plugins/ml/server/shared_services/errors.ts
 create mode 100644 x-pack/plugins/ml/server/shared_services/license_checks/errors.ts
 create mode 100644 x-pack/plugins/ml/server/shared_services/license_checks/index.ts
 rename x-pack/plugins/ml/server/shared_services/{ => license_checks}/license_checks.ts (66%)

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
index 3abc89c470b21e..e7eb7b8de65e35 100644
--- 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
@@ -73,10 +73,9 @@ export function registerTransactionDurationAnomalyAlertType({
         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 request = {} as KibanaRequest;
+      const { mlAnomalySearch } = ml.mlSystemProvider(request);
+      const anomalyDetectors = ml.anomalyDetectorsProvider(request);
 
       const mlJobIds = await getMLJobIds(
         anomalyDetectors,
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 a242a0adb6d4c7..6b69e57389dffd 100644
--- a/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.ts
@@ -122,13 +122,10 @@ function getMlSetup(
   if (!ml) {
     return;
   }
-  const mlClient = ml.mlClient.asScoped(request);
-  const mlSystem = ml.mlSystemProvider(mlClient, request);
+
   return {
-    mlClient,
-    mlSystem,
-    modules: ml.modulesProvider(mlClient, request, savedObjectsClient),
-    anomalyDetectors: ml.anomalyDetectorsProvider(mlClient, request),
-    mlAnomalySearch: mlSystem.mlAnomalySearch,
+    mlSystem: ml.mlSystemProvider(request),
+    anomalyDetectors: ml.anomalyDetectorsProvider(request),
+    modules: ml.modulesProvider(request, savedObjectsClient),
   };
 }
diff --git a/x-pack/plugins/infra/server/plugin.ts b/x-pack/plugins/infra/server/plugin.ts
index 7cd6383a9b2e5e..51f91d7189db70 100644
--- a/x-pack/plugins/infra/server/plugin.ts
+++ b/x-pack/plugins/infra/server/plugin.ts
@@ -152,9 +152,8 @@ export class InfraServerPlugin {
     core.http.registerRouteHandlerContext(
       'infra',
       (context, request): InfraRequestHandlerContext => {
-        const mlSystem = context.ml && plugins.ml?.mlSystemProvider(context.ml?.mlClient, request);
-        const mlAnomalyDetectors =
-          context.ml && plugins.ml?.anomalyDetectorsProvider(context.ml?.mlClient, request);
+        const mlSystem = plugins.ml?.mlSystemProvider(request);
+        const mlAnomalyDetectors = plugins.ml?.anomalyDetectorsProvider(request);
         const spaceId = plugins.spaces?.spacesService.getSpaceId(request) || 'default';
 
         return {
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx
index f723ad1a752bf4..bcbba67e9cc60c 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/file_based/components/import_errors/errors.tsx
@@ -93,11 +93,11 @@ function title(statuses: Statuses) {
   }
 }
 
-function ImportError(error: any, key: number) {
+const ImportError: FC<{ error: any }> = ({ error }) => {
   const errorObj = toString(error);
   return (
-    <React.Fragment>
-      <p key={key}>{errorObj.msg}</p>
+    <>
+      <p>{errorObj.msg}</p>
 
       {errorObj.more !== undefined && (
         <EuiAccordion
@@ -113,9 +113,9 @@ function ImportError(error: any, key: number) {
           {errorObj.more}
         </EuiAccordion>
       )}
-    </React.Fragment>
+    </>
   );
-}
+};
 
 function toString(error: any): ImportError {
   if (typeof error === 'string') {
@@ -127,11 +127,11 @@ function toString(error: any): ImportError {
       return { msg: error.msg };
     } else if (error.error !== undefined) {
       if (typeof error.error === 'object') {
-        if (error.error.msg !== undefined) {
+        if (error.error.reason !== undefined) {
           // this will catch a bulk ingest failure
-          const errorObj: ImportError = { msg: error.error.msg };
-          if (error.error.body !== undefined) {
-            errorObj.more = error.error.response;
+          const errorObj: ImportError = { msg: error.error.reason };
+          if (error.error.root_cause !== undefined) {
+            errorObj.more = JSON.stringify(error.error.root_cause);
           }
           return errorObj;
         }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
index 328cd1a5ef8d7d..d61e75fd21b5a6 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/chart_loader/chart_loader.ts
@@ -71,9 +71,7 @@ export class ChartLoader {
         splitFieldName,
         splitFieldValue
       );
-      if (resp.error !== undefined) {
-        throw resp.error;
-      }
+
       return resp.results;
     }
     return {};
@@ -105,9 +103,7 @@ export class ChartLoader {
         aggFieldPairNames,
         splitFieldName
       );
-      if (resp.error !== undefined) {
-        throw resp.error;
-      }
+
       return resp.results;
     }
     return {};
diff --git a/x-pack/plugins/ml/server/client/elasticsearch_ml.test.ts b/x-pack/plugins/ml/server/client/elasticsearch_ml.test.ts
deleted file mode 100644
index 5ad0db3c58ce41..00000000000000
--- a/x-pack/plugins/ml/server/client/elasticsearch_ml.test.ts
+++ /dev/null
@@ -1,60 +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 { elasticsearchJsPlugin } from './elasticsearch_ml';
-
-interface Endpoint {
-  fmt: string;
-}
-
-interface ClientAction {
-  urls?: Endpoint[];
-  url: Endpoint;
-}
-
-describe('ML - Endpoints', () => {
-  // Check all paths in the ML elasticsearchJsPlugin start with a leading forward slash
-  // so they work if Kibana is run behind a reverse proxy
-  const PATH_START: string = '/';
-  const urls: string[] = [];
-
-  // Stub objects
-  const Client = {
-    prototype: {},
-  };
-
-  const components = {
-    clientAction: {
-      factory(obj: ClientAction) {
-        // add each endpoint URL to a list
-        if (obj.urls) {
-          obj.urls.forEach((url) => {
-            urls.push(url.fmt);
-          });
-        }
-        if (obj.url) {
-          urls.push(obj.url.fmt);
-        }
-      },
-      namespaceFactory() {
-        return {
-          prototype: {},
-        };
-      },
-    },
-  };
-
-  // Stub elasticsearchJsPlugin
-  elasticsearchJsPlugin(Client, null, components);
-
-  describe('paths', () => {
-    it(`should start with ${PATH_START}`, () => {
-      urls.forEach((url) => {
-        expect(url[0]).toEqual(PATH_START);
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/ml/server/client/elasticsearch_ml.ts b/x-pack/plugins/ml/server/client/elasticsearch_ml.ts
deleted file mode 100644
index 63153d18cb10b9..00000000000000
--- a/x-pack/plugins/ml/server/client/elasticsearch_ml.ts
+++ /dev/null
@@ -1,929 +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 elasticsearchJsPlugin = (Client: any, config: any, components: any) => {
-  const ca = components.clientAction.factory;
-
-  Client.prototype.ml = components.clientAction.namespaceFactory();
-  const ml = Client.prototype.ml.prototype;
-
-  /**
-   * Perform a [ml.authenticate](Retrieve details about the currently authenticated user) request
-   *
-   * @param {Object} params - An object with parameters used to carry out this action
-   */
-  ml.jobs = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>',
-        req: {
-          jobId: {
-            type: 'list',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.jobStats = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_stats',
-        req: {
-          jobId: {
-            type: 'list',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/_stats',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.addJob = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ml.openJob = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_open',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.closeJob = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_close?force=<%=force%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          force: {
-            type: 'boolean',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_close',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  // Currently the endpoint uses a default size of 100 unless a size is supplied.
-  // So until paging is supported in the UI, explicitly supply a size of 1000
-  // to match the max number of docs that the endpoint can return.
-  ml.getDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/data_frame/analytics/_all?size=1000',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.getDataFrameAnalyticsStats = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>/_stats',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        // Currently the endpoint uses a default size of 100 unless a size is supplied.
-        // So until paging is supported in the UI, explicitly supply a size of 1000
-        // to match the max number of docs that the endpoint can return.
-        fmt: '/_ml/data_frame/analytics/_all/_stats?size=1000',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.createDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ml.evaluateDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/_evaluate',
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.explainDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/_explain',
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.deleteDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'DELETE',
-  });
-
-  ml.startDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>/_start',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.stopDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>/_stop?&force=<%=force%>',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-          force: {
-            type: 'boolean',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.updateDataFrameAnalytics = ca({
-    urls: [
-      {
-        fmt: '/_ml/data_frame/analytics/<%=analyticsId%>/_update',
-        req: {
-          analyticsId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.deleteJob = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>?&force=<%=force%>&wait_for_completion=false',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          force: {
-            type: 'boolean',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>?&wait_for_completion=false',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'DELETE',
-  });
-
-  ml.updateJob = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_update',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.datafeeds = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>',
-        req: {
-          datafeedId: {
-            type: 'list',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/datafeeds/',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.datafeedStats = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_stats',
-        req: {
-          datafeedId: {
-            type: 'list',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/datafeeds/_stats',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.addDatafeed = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ml.updateDatafeed = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_update',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.deleteDatafeed = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>?force=<%=force%>',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-          force: {
-            type: 'boolean',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'DELETE',
-  });
-
-  ml.startDatafeed = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_start?&start=<%=start%>&end=<%=end%>',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-          start: {
-            type: 'string',
-          },
-          end: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_start?&start=<%=start%>',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-          start: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_start',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.stopDatafeed = ca({
-    urls: [
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_stop?force=<%=force%>',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-          force: {
-            type: 'boolean',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/datafeeds/<%=datafeedId%>/_stop',
-        req: {
-          datafeedId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.validateDetector = ca({
-    url: {
-      fmt: '/_ml/anomaly_detectors/_validate/detector',
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.estimateModelMemory = ca({
-    url: {
-      fmt: '/_ml/anomaly_detectors/_estimate_model_memory',
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.datafeedPreview = ca({
-    url: {
-      fmt: '/_ml/datafeeds/<%=datafeedId%>/_preview',
-      req: {
-        datafeedId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'GET',
-  });
-
-  ml.forecast = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_forecast?&duration=<%=duration%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          duration: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/_forecast',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.records = ca({
-    url: {
-      fmt: '/_ml/anomaly_detectors/<%=jobId%>/results/records',
-      req: {
-        jobId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'POST',
-  });
-
-  ml.buckets = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/results/buckets',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/results/buckets/<%=timestamp%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          timestamp: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ml.overallBuckets = ca({
-    url: {
-      fmt: '/_ml/anomaly_detectors/<%=jobId%>/results/overall_buckets',
-      req: {
-        jobId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'POST',
-  });
-
-  ml.privilegeCheck = ca({
-    url: {
-      fmt: '/_security/user/_has_privileges',
-    },
-    needBody: true,
-    method: 'POST',
-  });
-  // Currently the endpoint uses a default size of 100 unless a size is supplied. So until paging is supported in the UI, explicitly supply a size of 1000
-  ml.calendars = ca({
-    urls: [
-      {
-        fmt: '/_ml/calendars/<%=calendarId%>',
-        req: {
-          calendarId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/calendars?size=1000',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.deleteCalendar = ca({
-    url: {
-      fmt: '/_ml/calendars/<%=calendarId%>',
-      req: {
-        calendarId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'DELETE',
-  });
-
-  ml.addCalendar = ca({
-    url: {
-      fmt: '/_ml/calendars/<%=calendarId%>',
-      req: {
-        calendarId: {
-          type: 'string',
-        },
-      },
-    },
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ml.addJobToCalendar = ca({
-    url: {
-      fmt: '/_ml/calendars/<%=calendarId%>/jobs/<%=jobId%>',
-      req: {
-        calendarId: {
-          type: 'string',
-        },
-        jobId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'PUT',
-  });
-
-  ml.removeJobFromCalendar = ca({
-    url: {
-      fmt: '/_ml/calendars/<%=calendarId%>/jobs/<%=jobId%>',
-      req: {
-        calendarId: {
-          type: 'string',
-        },
-        jobId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'DELETE',
-  });
-
-  ml.events = ca({
-    urls: [
-      {
-        fmt: '/_ml/calendars/<%=calendarId%>/events',
-        req: {
-          calendarId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/calendars/<%=calendarId%>/events?&job_id=<%=jobId%>',
-        req: {
-          calendarId: {
-            type: 'string',
-          },
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/calendars/<%=calendarId%>/events?&after=<%=start%>&before=<%=end%>',
-        req: {
-          calendarId: {
-            type: 'string',
-          },
-          start: {
-            type: 'string',
-          },
-          end: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt:
-          '/_ml/calendars/<%=calendarId%>/events?&after=<%=start%>&before=<%=end%>&job_id=<%=jobId%>',
-        req: {
-          calendarId: {
-            type: 'string',
-          },
-          start: {
-            type: 'string',
-          },
-          end: {
-            type: 'string',
-          },
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.addEvent = ca({
-    url: {
-      fmt: '/_ml/calendars/<%=calendarId%>/events',
-      req: {
-        calendarId: {
-          type: 'string',
-        },
-      },
-    },
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.deleteEvent = ca({
-    url: {
-      fmt: '/_ml/calendars/<%=calendarId%>/events/<%=eventId%>',
-      req: {
-        calendarId: {
-          type: 'string',
-        },
-        eventId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'DELETE',
-  });
-  // Currently the endpoint uses a default size of 100 unless a size is supplied. So until paging is supported in the UI, explicitly supply a size of 1000
-  ml.filters = ca({
-    urls: [
-      {
-        fmt: '/_ml/filters/<%=filterId%>',
-        req: {
-          filterId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/filters?size=1000',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.addFilter = ca({
-    url: {
-      fmt: '/_ml/filters/<%=filterId%>',
-      req: {
-        filterId: {
-          type: 'string',
-        },
-      },
-    },
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ml.updateFilter = ca({
-    urls: [
-      {
-        fmt: '/_ml/filters/<%=filterId%>/_update',
-        req: {
-          filterId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.deleteFilter = ca({
-    url: {
-      fmt: '/_ml/filters/<%=filterId%>',
-      req: {
-        filterId: {
-          type: 'string',
-        },
-      },
-    },
-    method: 'DELETE',
-  });
-
-  ml.info = ca({
-    url: {
-      fmt: '/_ml/info',
-    },
-    method: 'GET',
-  });
-
-  ml.fileStructure = ca({
-    urls: [
-      {
-        fmt:
-          '/_ml/find_file_structure?&explain=true&charset=<%=charset%>&format=<%=format%>&has_header_row=<%=has_header_row%>&column_names=<%=column_names%>&delimiter=<%=delimiter%>&quote=<%=quote%>&should_trim_fields=<%=should_trim_fields%>&grok_pattern=<%=grok_pattern%>&timestamp_field=<%=timestamp_field%>&timestamp_format=<%=timestamp_format%>&lines_to_sample=<%=lines_to_sample%>',
-        req: {
-          charset: {
-            type: 'string',
-          },
-          format: {
-            type: 'string',
-          },
-          has_header_row: {
-            type: 'string',
-          },
-          column_names: {
-            type: 'string',
-          },
-          delimiter: {
-            type: 'string',
-          },
-          quote: {
-            type: 'string',
-          },
-          should_trim_fields: {
-            type: 'string',
-          },
-          grok_pattern: {
-            type: 'string',
-          },
-          timestamp_field: {
-            type: 'string',
-          },
-          timestamp_format: {
-            type: 'string',
-          },
-          lines_to_sample: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/find_file_structure?&explain=true',
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ml.rollupIndexCapabilities = ca({
-    urls: [
-      {
-        fmt: '/<%=indexPattern%>/_rollup/data',
-        req: {
-          indexPattern: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.categories = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/results/categories/<%=categoryId%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          categoryId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/results/categories',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.modelSnapshots = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/model_snapshots/<%=snapshotId%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          snapshotId: {
-            type: 'string',
-          },
-        },
-      },
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/model_snapshots',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ml.updateModelSnapshot = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/model_snapshots/<%=snapshotId%>/_update',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          snapshotId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-    needBody: true,
-  });
-
-  ml.deleteModelSnapshot = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/model_snapshots/<%=snapshotId%>',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          snapshotId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'DELETE',
-  });
-
-  ml.revertModelSnapshot = ca({
-    urls: [
-      {
-        fmt: '/_ml/anomaly_detectors/<%=jobId%>/model_snapshots/<%=snapshotId%>/_revert',
-        req: {
-          jobId: {
-            type: 'string',
-          },
-          snapshotId: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-};
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
index 21d32813c0d511..4dd17f8cf48896 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { getAdminCapabilities, getUserCapabilities } from './__mocks__/ml_capabilities';
 import { capabilitiesProvider } from './check_capabilities';
 import { MlLicense } from '../../../common/license';
@@ -24,16 +24,28 @@ const mlIsEnabled = async () => true;
 const mlIsNotEnabled = async () => false;
 
 const mlClusterClientNonUpgrade = ({
-  callAsInternalUser: async () => ({
-    upgrade_mode: false,
-  }),
-} as unknown) as ILegacyScopedClusterClient;
+  asInternalUser: {
+    ml: {
+      info: async () => ({
+        body: {
+          upgrade_mode: false,
+        },
+      }),
+    },
+  },
+} as unknown) as IScopedClusterClient;
 
 const mlClusterClientUpgrade = ({
-  callAsInternalUser: async () => ({
-    upgrade_mode: true,
-  }),
-} as unknown) as ILegacyScopedClusterClient;
+  asInternalUser: {
+    ml: {
+      info: async () => ({
+        body: {
+          upgrade_mode: true,
+        },
+      }),
+    },
+  },
+} as unknown) as IScopedClusterClient;
 
 describe('check_capabilities', () => {
   describe('getCapabilities() - right number of capabilities', () => {
diff --git a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
index c976ab598b28c6..c591ec07c7c3bd 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/check_capabilities.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient, KibanaRequest } from 'kibana/server';
+import { IScopedClusterClient, KibanaRequest } from 'kibana/server';
 import { mlLog } from '../../client/log';
 import {
   MlCapabilities,
@@ -22,12 +22,12 @@ import {
 } from './errors';
 
 export function capabilitiesProvider(
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   capabilities: MlCapabilities,
   mlLicense: MlLicense,
   isMlEnabledInSpace: () => Promise<boolean>
 ) {
-  const { isUpgradeInProgress } = upgradeCheckProvider(mlClusterClient);
+  const { isUpgradeInProgress } = upgradeCheckProvider(client);
   async function getCapabilities(): Promise<MlCapabilitiesResponse> {
     const upgradeInProgress = await isUpgradeInProgress();
     const isPlatinumOrTrialLicense = mlLicense.isFullLicense();
diff --git a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
index 6df4d0c87ecf54..defb70429fa0c7 100644
--- a/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
+++ b/x-pack/plugins/ml/server/lib/capabilities/upgrade.ts
@@ -4,17 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { mlLog } from '../../client/log';
 
-export function upgradeCheckProvider({ callAsInternalUser }: ILegacyScopedClusterClient) {
+export function upgradeCheckProvider({ asInternalUser }: IScopedClusterClient) {
   async function isUpgradeInProgress(): Promise<boolean> {
     let upgradeInProgress = false;
     try {
-      const info = await callAsInternalUser('ml.info');
+      const { body } = await asInternalUser.ml.info();
       // if ml indices are currently being migrated, upgrade_mode will be set to true
       // pass this back with the privileges to allow for the disabling of UI controls.
-      upgradeInProgress = info.upgrade_mode === true;
+      upgradeInProgress = body.upgrade_mode === true;
     } catch (error) {
       // if the ml.info check fails, it could be due to the user having insufficient privileges
       // most likely they do not have the ml_user role and therefore will be blocked from using
diff --git a/x-pack/plugins/ml/server/lib/check_annotations/index.ts b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
index de19f0ead67910..964f9d0b922612 100644
--- a/x-pack/plugins/ml/server/lib/check_annotations/index.ts
+++ b/x-pack/plugins/ml/server/lib/check_annotations/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { mlLog } from '../../client/log';
 
 import {
@@ -17,18 +17,16 @@ import {
 // - ML_ANNOTATIONS_INDEX_PATTERN index is present
 // - ML_ANNOTATIONS_INDEX_ALIAS_READ alias is present
 // - ML_ANNOTATIONS_INDEX_ALIAS_WRITE alias is present
-export async function isAnnotationsFeatureAvailable({
-  callAsInternalUser,
-}: ILegacyScopedClusterClient) {
+export async function isAnnotationsFeatureAvailable({ asInternalUser }: IScopedClusterClient) {
   try {
     const indexParams = { index: ML_ANNOTATIONS_INDEX_PATTERN };
 
-    const annotationsIndexExists = await callAsInternalUser('indices.exists', indexParams);
+    const { body: annotationsIndexExists } = await asInternalUser.indices.exists(indexParams);
     if (!annotationsIndexExists) {
       return false;
     }
 
-    const annotationsReadAliasExists = await callAsInternalUser('indices.existsAlias', {
+    const { body: annotationsReadAliasExists } = await asInternalUser.indices.existsAlias({
       index: ML_ANNOTATIONS_INDEX_ALIAS_READ,
       name: ML_ANNOTATIONS_INDEX_ALIAS_READ,
     });
@@ -37,7 +35,7 @@ export async function isAnnotationsFeatureAvailable({
       return false;
     }
 
-    const annotationsWriteAliasExists = await callAsInternalUser('indices.existsAlias', {
+    const { body: annotationsWriteAliasExists } = await asInternalUser.indices.existsAlias({
       index: ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
       name: ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
     });
diff --git a/x-pack/plugins/ml/server/lib/license/ml_server_license.ts b/x-pack/plugins/ml/server/lib/license/ml_server_license.ts
index bd0a29721248a1..6e3019b303b887 100644
--- a/x-pack/plugins/ml/server/lib/license/ml_server_license.ts
+++ b/x-pack/plugins/ml/server/lib/license/ml_server_license.ts
@@ -7,7 +7,6 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   RequestHandlerContext,
-  ILegacyScopedClusterClient,
   IScopedClusterClient,
   RequestHandler,
 } from 'kibana/server';
@@ -15,7 +14,6 @@ import {
 import { MlLicense } from '../../../common/license';
 
 type Handler = (handlerParams: {
-  legacyClient: ILegacyScopedClusterClient;
   client: IScopedClusterClient;
   request: KibanaRequest<any, any, any, any>;
   response: KibanaResponseFactory;
@@ -42,7 +40,6 @@ function guard(check: () => boolean, handler: Handler) {
     }
 
     return handler({
-      legacyClient: context.ml!.mlClient,
       client: context.core.elasticsearch.client,
       request,
       response,
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
index 5be443266ffe1c..4c511b567615de 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.test.ts
@@ -22,19 +22,15 @@ describe('annotation_service', () => {
   let mlClusterClientSpy = {} as any;
 
   beforeEach(() => {
-    const callAs = jest.fn((action: string) => {
-      switch (action) {
-        case 'delete':
-        case 'index':
-          return Promise.resolve(acknowledgedResponseMock);
-        case 'search':
-          return Promise.resolve(getAnnotationsResponseMock);
-      }
-    });
+    const callAs = {
+      delete: jest.fn(() => Promise.resolve({ body: acknowledgedResponseMock })),
+      index: jest.fn(() => Promise.resolve({ body: acknowledgedResponseMock })),
+      search: jest.fn(() => Promise.resolve({ body: getAnnotationsResponseMock })),
+    };
 
     mlClusterClientSpy = {
-      callAsCurrentUser: callAs,
-      callAsInternalUser: callAs,
+      asCurrentUser: callAs,
+      asInternalUser: callAs,
     };
   });
 
@@ -52,8 +48,7 @@ describe('annotation_service', () => {
 
       const response = await deleteAnnotation(annotationMockId);
 
-      expect(mockFunct.callAsInternalUser.mock.calls[0][0]).toBe('delete');
-      expect(mockFunct.callAsInternalUser.mock.calls[0][1]).toEqual(deleteParamsMock);
+      expect(mockFunct.asInternalUser.delete.mock.calls[0][0]).toStrictEqual(deleteParamsMock);
       expect(response).toBe(acknowledgedResponseMock);
       done();
     });
@@ -73,8 +68,9 @@ describe('annotation_service', () => {
 
       const response: GetResponse = await getAnnotations(indexAnnotationArgsMock);
 
-      expect(mockFunct.callAsInternalUser.mock.calls[0][0]).toBe('search');
-      expect(mockFunct.callAsInternalUser.mock.calls[0][1]).toEqual(getAnnotationsRequestMock);
+      expect(mockFunct.asInternalUser.search.mock.calls[0][0]).toStrictEqual(
+        getAnnotationsRequestMock
+      );
       expect(Object.keys(response.annotations)).toHaveLength(1);
       expect(response.annotations[jobIdMock]).toHaveLength(2);
       expect(isAnnotations(response.annotations[jobIdMock])).toBeTruthy();
@@ -89,9 +85,9 @@ describe('annotation_service', () => {
       };
 
       const mlClusterClientSpyError: any = {
-        callAsInternalUser: jest.fn(() => {
-          return Promise.resolve(mockEsError);
-        }),
+        asInternalUser: {
+          search: jest.fn(() => Promise.resolve({ body: mockEsError })),
+        },
       };
 
       const { getAnnotations } = annotationServiceProvider(mlClusterClientSpyError);
@@ -124,10 +120,8 @@ describe('annotation_service', () => {
 
       const response = await indexAnnotation(annotationMock, usernameMock);
 
-      expect(mockFunct.callAsInternalUser.mock.calls[0][0]).toBe('index');
-
       // test if the annotation has been correctly augmented
-      const indexParamsCheck = mockFunct.callAsInternalUser.mock.calls[0][1];
+      const indexParamsCheck = mockFunct.asInternalUser.index.mock.calls[0][0];
       const annotation = indexParamsCheck.body;
       expect(annotation.create_username).toBe(usernameMock);
       expect(annotation.modified_username).toBe(usernameMock);
@@ -154,10 +148,8 @@ describe('annotation_service', () => {
 
       const response = await indexAnnotation(annotationMock, usernameMock);
 
-      expect(mockFunct.callAsInternalUser.mock.calls[0][0]).toBe('index');
-
       // test if the annotation has been correctly augmented
-      const indexParamsCheck = mockFunct.callAsInternalUser.mock.calls[0][1];
+      const indexParamsCheck = mockFunct.asInternalUser.index.mock.calls[0][0];
       const annotation = indexParamsCheck.body;
       expect(annotation.create_username).toBe(usernameMock);
       expect(annotation.modified_username).toBe(usernameMock);
@@ -196,9 +188,8 @@ describe('annotation_service', () => {
 
       await indexAnnotation(annotation, modifiedUsernameMock);
 
-      expect(mockFunct.callAsInternalUser.mock.calls[1][0]).toBe('index');
       // test if the annotation has been correctly updated
-      const indexParamsCheck = mockFunct.callAsInternalUser.mock.calls[1][1];
+      const indexParamsCheck = mockFunct.asInternalUser.index.mock.calls[0][0];
       const modifiedAnnotation = indexParamsCheck.body;
       expect(modifiedAnnotation.annotation).toBe(modifiedAnnotationText);
       expect(modifiedAnnotation.create_username).toBe(originalUsernameMock);
diff --git a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
index a585449db0a255..24f1d6951c9400 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/annotation.ts
@@ -7,7 +7,7 @@
 import Boom from 'boom';
 import each from 'lodash/each';
 import get from 'lodash/get';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 import { ANNOTATION_EVENT_USER, ANNOTATION_TYPE } from '../../../common/constants/annotations';
 import { PARTITION_FIELDS } from '../../../common/constants/anomalies';
@@ -67,17 +67,17 @@ export interface GetResponse {
 export interface IndexParams {
   index: string;
   body: Annotation;
-  refresh?: string;
+  refresh: boolean | 'wait_for' | undefined;
   id?: string;
 }
 
 export interface DeleteParams {
   index: string;
-  refresh?: string;
+  refresh: boolean | 'wait_for' | undefined;
   id: string;
 }
 
-export function annotationProvider({ callAsInternalUser }: ILegacyScopedClusterClient) {
+export function annotationProvider({ asInternalUser }: IScopedClusterClient) {
   async function indexAnnotation(annotation: Annotation, username: string) {
     if (isAnnotation(annotation) === false) {
       // No need to translate, this will not be exposed in the UI.
@@ -104,7 +104,8 @@ export function annotationProvider({ callAsInternalUser }: ILegacyScopedClusterC
       delete params.body.key;
     }
 
-    return await callAsInternalUser('index', params);
+    const { body } = await asInternalUser.index(params);
+    return body;
   }
 
   async function getAnnotations({
@@ -287,14 +288,14 @@ export function annotationProvider({ callAsInternalUser }: ILegacyScopedClusterC
     };
 
     try {
-      const resp = await callAsInternalUser('search', params);
+      const { body } = await asInternalUser.search(params);
 
-      if (resp.error !== undefined && resp.message !== undefined) {
+      if (body.error !== undefined && body.message !== undefined) {
         // No need to translate, this will not be exposed in the UI.
         throw new Error(`Annotations couldn't be retrieved from Elasticsearch.`);
       }
 
-      const docs: Annotations = get(resp, ['hits', 'hits'], []).map((d: EsResult) => {
+      const docs: Annotations = get(body, ['hits', 'hits'], []).map((d: EsResult) => {
         // get the original source document and the document id, we need it
         // to identify the annotation when editing/deleting it.
         // if original `event` is undefined then substitute with 'user` by default
@@ -306,7 +307,7 @@ export function annotationProvider({ callAsInternalUser }: ILegacyScopedClusterC
         } as Annotation;
       });
 
-      const aggregations = get(resp, ['aggregations'], {}) as EsAggregationResult;
+      const aggregations = get(body, ['aggregations'], {}) as EsAggregationResult;
       if (fields) {
         obj.aggregations = aggregations;
       }
@@ -330,13 +331,14 @@ export function annotationProvider({ callAsInternalUser }: ILegacyScopedClusterC
   }
 
   async function deleteAnnotation(id: string) {
-    const param: DeleteParams = {
+    const params: DeleteParams = {
       index: ML_ANNOTATIONS_INDEX_ALIAS_WRITE,
       id,
       refresh: 'wait_for',
     };
 
-    return await callAsInternalUser('delete', param);
+    const { body } = await asInternalUser.delete(params);
+    return body;
   }
 
   return {
diff --git a/x-pack/plugins/ml/server/models/annotation_service/index.ts b/x-pack/plugins/ml/server/models/annotation_service/index.ts
index e17af2a154b876..9fcb84e2938ae3 100644
--- a/x-pack/plugins/ml/server/models/annotation_service/index.ts
+++ b/x-pack/plugins/ml/server/models/annotation_service/index.ts
@@ -4,11 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { annotationProvider } from './annotation';
 
-export function annotationServiceProvider(mlClusterClient: ILegacyScopedClusterClient) {
+export function annotationServiceProvider(client: IScopedClusterClient) {
   return {
-    ...annotationProvider(mlClusterClient),
+    ...annotationProvider(client),
   };
 }
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
index eeabb24d9be3b7..5b52414d6753a2 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.d.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 
 export interface BucketSpanEstimatorData {
@@ -21,6 +21,6 @@ export interface BucketSpanEstimatorData {
 }
 
 export function estimateBucketSpanFactory({
-  callAsCurrentUser,
-  callAsInternalUser,
-}: ILegacyScopedClusterClient): (config: BucketSpanEstimatorData) => Promise<any>;
+  asCurrentUser,
+  asInternalUser,
+}: IScopedClusterClient): (config: BucketSpanEstimatorData) => Promise<any>;
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js
index 381c615051e3b3..1d59db8fa564f4 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.js
@@ -16,10 +16,10 @@ import { INTERVALS } from './intervals';
 import { singleSeriesCheckerFactory } from './single_series_checker';
 import { polledDataCheckerFactory } from './polled_data_checker';
 
-export function estimateBucketSpanFactory(mlClusterClient) {
-  const { callAsCurrentUser, callAsInternalUser } = mlClusterClient;
-  const PolledDataChecker = polledDataCheckerFactory(mlClusterClient);
-  const SingleSeriesChecker = singleSeriesCheckerFactory(mlClusterClient);
+export function estimateBucketSpanFactory(client) {
+  const { asCurrentUser, asInternalUser } = client;
+  const PolledDataChecker = polledDataCheckerFactory(client);
+  const SingleSeriesChecker = singleSeriesCheckerFactory(client);
 
   class BucketSpanEstimator {
     constructor(
@@ -246,21 +246,22 @@ export function estimateBucketSpanFactory(mlClusterClient) {
 
   const getFieldCardinality = function (index, field) {
     return new Promise((resolve, reject) => {
-      callAsCurrentUser('search', {
-        index,
-        size: 0,
-        body: {
-          aggs: {
-            field_count: {
-              cardinality: {
-                field,
+      asCurrentUser
+        .search({
+          index,
+          size: 0,
+          body: {
+            aggs: {
+              field_count: {
+                cardinality: {
+                  field,
+                },
               },
             },
           },
-        },
-      })
-        .then((resp) => {
-          const value = get(resp, ['aggregations', 'field_count', 'value'], 0);
+        })
+        .then(({ body }) => {
+          const value = get(body, ['aggregations', 'field_count', 'value'], 0);
           resolve(value);
         })
         .catch((resp) => {
@@ -278,28 +279,29 @@ export function estimateBucketSpanFactory(mlClusterClient) {
       getFieldCardinality(index, field)
         .then((value) => {
           const numPartitions = Math.floor(value / NUM_PARTITIONS) || 1;
-          callAsCurrentUser('search', {
-            index,
-            size: 0,
-            body: {
-              query,
-              aggs: {
-                fields_bucket_counts: {
-                  terms: {
-                    field,
-                    include: {
-                      partition: 0,
-                      num_partitions: numPartitions,
+          asCurrentUser
+            .search({
+              index,
+              size: 0,
+              body: {
+                query,
+                aggs: {
+                  fields_bucket_counts: {
+                    terms: {
+                      field,
+                      include: {
+                        partition: 0,
+                        num_partitions: numPartitions,
+                      },
                     },
                   },
                 },
               },
-            },
-          })
-            .then((partitionResp) => {
+            })
+            .then(({ body }) => {
               // eslint-disable-next-line camelcase
-              if (partitionResp.aggregations?.fields_bucket_counts?.buckets !== undefined) {
-                const buckets = partitionResp.aggregations.fields_bucket_counts.buckets;
+              if (body.aggregations?.fields_bucket_counts?.buckets !== undefined) {
+                const buckets = body.aggregations.fields_bucket_counts.buckets;
                 fieldValues = buckets.map((b) => b.key);
               }
               resolve(fieldValues);
@@ -338,21 +340,21 @@ export function estimateBucketSpanFactory(mlClusterClient) {
     return new Promise((resolve, reject) => {
       // fetch the `search.max_buckets` cluster setting so we're able to
       // adjust aggregations to not exceed that limit.
-      callAsInternalUser('cluster.getSettings', {
-        flatSettings: true,
-        includeDefaults: true,
-        filterPath: '*.*max_buckets',
-      })
-        .then((settings) => {
-          if (typeof settings !== 'object') {
+      asInternalUser.cluster
+        .getSettings({
+          flat_settings: true,
+          include_defaults: true,
+          filter_path: '*.*max_buckets',
+        })
+        .then(({ body }) => {
+          if (typeof body !== 'object') {
             reject('Unable to retrieve cluster settings');
           }
 
           // search.max_buckets could exist in default, persistent or transient cluster settings
-          const maxBucketsSetting = (settings.defaults ||
-            settings.persistent ||
-            settings.transient ||
-            {})['search.max_buckets'];
+          const maxBucketsSetting = (body.defaults || body.persistent || body.transient || {})[
+            'search.max_buckets'
+          ];
 
           if (maxBucketsSetting === undefined) {
             reject('Unable to retrieve cluster setting search.max_buckets');
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
index f7c7dd8172ea5a..35c4f1a0a741b4 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/bucket_span_estimator.test.ts
@@ -4,22 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 import { ES_AGGREGATION } from '../../../common/constants/aggregation_types';
 
 import { estimateBucketSpanFactory, BucketSpanEstimatorData } from './bucket_span_estimator';
 
-const callAs = () => {
-  return new Promise((resolve) => {
-    resolve({});
-  }) as Promise<any>;
+const callAs = {
+  search: () => Promise.resolve({ body: {} }),
+  cluster: { getSettings: () => Promise.resolve({ body: {} }) },
 };
 
-const mlClusterClient: ILegacyScopedClusterClient = {
-  callAsCurrentUser: callAs,
-  callAsInternalUser: callAs,
-};
+const mlClusterClient = ({
+  asCurrentUser: callAs,
+  asInternalUser: callAs,
+} as unknown) as IScopedClusterClient;
 
 // mock configuration to be passed to the estimator
 const formConfig: BucketSpanEstimatorData = {
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/polled_data_checker.js b/x-pack/plugins/ml/server/models/bucket_span_estimator/polled_data_checker.js
index d3bbd59f3cf9bc..fd0cab7c0625d7 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/polled_data_checker.js
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/polled_data_checker.js
@@ -12,7 +12,7 @@
 
 import get from 'lodash/get';
 
-export function polledDataCheckerFactory({ callAsCurrentUser }) {
+export function polledDataCheckerFactory({ asCurrentUser }) {
   class PolledDataChecker {
     constructor(index, timeField, duration, query) {
       this.index = index;
@@ -65,14 +65,15 @@ export function polledDataCheckerFactory({ callAsCurrentUser }) {
       return search;
     }
 
-    performSearch(intervalMs) {
-      const body = this.createSearch(intervalMs);
+    async performSearch(intervalMs) {
+      const searchBody = this.createSearch(intervalMs);
 
-      return callAsCurrentUser('search', {
+      const { body } = await asCurrentUser.search({
         index: this.index,
         size: 0,
-        body,
+        body: searchBody,
       });
+      return body;
     }
 
     // test that the coefficient of variation of time difference between non-empty buckets is small
diff --git a/x-pack/plugins/ml/server/models/bucket_span_estimator/single_series_checker.js b/x-pack/plugins/ml/server/models/bucket_span_estimator/single_series_checker.js
index a5449395501dcb..750f0cfc0b4a87 100644
--- a/x-pack/plugins/ml/server/models/bucket_span_estimator/single_series_checker.js
+++ b/x-pack/plugins/ml/server/models/bucket_span_estimator/single_series_checker.js
@@ -13,7 +13,7 @@
 import { mlLog } from '../../client/log';
 import { INTERVALS, LONG_INTERVALS } from './intervals';
 
-export function singleSeriesCheckerFactory({ callAsCurrentUser }) {
+export function singleSeriesCheckerFactory({ asCurrentUser }) {
   const REF_DATA_INTERVAL = { name: '1h', ms: 3600000 };
 
   class SingleSeriesChecker {
@@ -184,14 +184,15 @@ export function singleSeriesCheckerFactory({ callAsCurrentUser }) {
       return search;
     }
 
-    performSearch(intervalMs) {
-      const body = this.createSearch(intervalMs);
+    async performSearch(intervalMs) {
+      const searchBody = this.createSearch(intervalMs);
 
-      return callAsCurrentUser('search', {
+      const { body } = await asCurrentUser.search({
         index: this.index,
         size: 0,
-        body,
+        body: searchBody,
       });
+      return body;
     }
 
     getFullBuckets(buckets) {
diff --git a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
index bc3c326e7d0705..2a2c30601e2ca7 100644
--- a/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/calculate_model_memory_limit/calculate_model_memory_limit.ts
@@ -5,13 +5,13 @@
  */
 
 import numeral from '@elastic/numeral';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { MLCATEGORY } from '../../../common/constants/field_types';
 import { AnalysisConfig } from '../../../common/types/anomaly_detection_jobs';
 import { fieldsServiceProvider } from '../fields_service';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 
-interface ModelMemoryEstimationResult {
+export interface ModelMemoryEstimationResult {
   /**
    * Result model memory limit
    */
@@ -29,15 +29,15 @@ interface ModelMemoryEstimationResult {
 /**
  * Response of the _estimate_model_memory endpoint.
  */
-export interface ModelMemoryEstimate {
+export interface ModelMemoryEstimateResponse {
   model_memory_estimate: string;
 }
 
 /**
  * Retrieves overall and max bucket cardinalities.
  */
-const cardinalityCheckProvider = (mlClusterClient: ILegacyScopedClusterClient) => {
-  const fieldsService = fieldsServiceProvider(mlClusterClient);
+const cardinalityCheckProvider = (client: IScopedClusterClient) => {
+  const fieldsService = fieldsServiceProvider(client);
 
   return async (
     analysisConfig: AnalysisConfig,
@@ -123,9 +123,9 @@ const cardinalityCheckProvider = (mlClusterClient: ILegacyScopedClusterClient) =
   };
 };
 
-export function calculateModelMemoryLimitProvider(mlClusterClient: ILegacyScopedClusterClient) {
-  const { callAsInternalUser } = mlClusterClient;
-  const getCardinalities = cardinalityCheckProvider(mlClusterClient);
+export function calculateModelMemoryLimitProvider(client: IScopedClusterClient) {
+  const { asInternalUser } = client;
+  const getCardinalities = cardinalityCheckProvider(client);
 
   /**
    * Retrieves an estimated size of the model memory limit used in the job config
@@ -141,7 +141,7 @@ export function calculateModelMemoryLimitProvider(mlClusterClient: ILegacyScoped
     latestMs: number,
     allowMMLGreaterThanMax = false
   ): Promise<ModelMemoryEstimationResult> {
-    const info = (await callAsInternalUser('ml.info')) as MlInfoResponse;
+    const { body: info } = await asInternalUser.ml.info<MlInfoResponse>();
     const maxModelMemoryLimit = info.limits.max_model_memory_limit?.toUpperCase();
     const effectiveMaxModelMemoryLimit = info.limits.effective_max_model_memory_limit?.toUpperCase();
 
@@ -154,13 +154,14 @@ export function calculateModelMemoryLimitProvider(mlClusterClient: ILegacyScoped
       latestMs
     );
 
-    const estimatedModelMemoryLimit = ((await callAsInternalUser('ml.estimateModelMemory', {
+    const { body } = await asInternalUser.ml.estimateModelMemory<ModelMemoryEstimateResponse>({
       body: {
         analysis_config: analysisConfig,
         overall_cardinality: overallCardinality,
         max_bucket_cardinality: maxBucketCardinality,
       },
-    })) as ModelMemoryEstimate).model_memory_estimate.toUpperCase();
+    });
+    const estimatedModelMemoryLimit = body.model_memory_estimate.toUpperCase();
 
     let modelMemoryLimit = estimatedModelMemoryLimit;
     let mmlCappedAtMax = false;
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 b461e71c006ff0..95684e790636ff 100644
--- a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
@@ -5,7 +5,7 @@
  */
 
 import { difference } from 'lodash';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { EventManager, CalendarEvent } from './event_manager';
 
 interface BasicCalendar {
@@ -23,30 +23,30 @@ export interface FormCalendar extends BasicCalendar {
 }
 
 export class CalendarManager {
-  private _callAsInternalUser: ILegacyScopedClusterClient['callAsInternalUser'];
+  private _asInternalUser: IScopedClusterClient['asInternalUser'];
   private _eventManager: EventManager;
 
-  constructor(mlClusterClient: ILegacyScopedClusterClient) {
-    this._callAsInternalUser = mlClusterClient.callAsInternalUser;
-    this._eventManager = new EventManager(mlClusterClient);
+  constructor(client: IScopedClusterClient) {
+    this._asInternalUser = client.asInternalUser;
+    this._eventManager = new EventManager(client);
   }
 
   async getCalendar(calendarId: string) {
-    const resp = await this._callAsInternalUser('ml.calendars', {
-      calendarId,
+    const { body } = await this._asInternalUser.ml.getCalendars({
+      calendar_id: calendarId,
     });
 
-    const calendars = resp.calendars;
+    const calendars = body.calendars;
     const calendar = calendars[0]; // Endpoint throws a 404 if calendar is not found.
     calendar.events = await this._eventManager.getCalendarEvents(calendarId);
     return calendar;
   }
 
   async getAllCalendars() {
-    const calendarsResp = await this._callAsInternalUser('ml.calendars');
+    const { body } = await this._asInternalUser.ml.getCalendars({ size: 1000 });
 
     const events: CalendarEvent[] = await this._eventManager.getAllEvents();
-    const calendars: Calendar[] = calendarsResp.calendars;
+    const calendars: Calendar[] = body.calendars;
     calendars.forEach((cal) => (cal.events = []));
 
     // loop events and combine with related calendars
@@ -71,8 +71,8 @@ export class CalendarManager {
 
   async newCalendar(calendar: FormCalendar) {
     const { calendarId, events, ...newCalendar } = calendar;
-    await this._callAsInternalUser('ml.addCalendar', {
-      calendarId,
+    await this._asInternalUser.ml.putCalendar({
+      calendar_id: calendarId,
       body: newCalendar,
     });
 
@@ -106,17 +106,17 @@ export class CalendarManager {
 
     // add all new jobs
     if (jobsToAdd.length) {
-      await this._callAsInternalUser('ml.addJobToCalendar', {
-        calendarId,
-        jobId: jobsToAdd.join(','),
+      await this._asInternalUser.ml.putCalendarJob({
+        calendar_id: calendarId,
+        job_id: jobsToAdd.join(','),
       });
     }
 
     // remove all removed jobs
     if (jobsToRemove.length) {
-      await this._callAsInternalUser('ml.removeJobFromCalendar', {
-        calendarId,
-        jobId: jobsToRemove.join(','),
+      await this._asInternalUser.ml.deleteCalendarJob({
+        calendar_id: calendarId,
+        job_id: jobsToRemove.join(','),
       });
     }
 
@@ -137,6 +137,7 @@ export class CalendarManager {
   }
 
   async deleteCalendar(calendarId: string) {
-    return this._callAsInternalUser('ml.deleteCalendar', { calendarId });
+    const { body } = await this._asInternalUser.ml.deleteCalendar({ calendar_id: calendarId });
+    return body;
   }
 }
diff --git a/x-pack/plugins/ml/server/models/calendar/event_manager.ts b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
index b670bbe187544c..b42068e748394d 100644
--- a/x-pack/plugins/ml/server/models/calendar/event_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
 
 export interface CalendarEvent {
@@ -16,39 +16,42 @@ export interface CalendarEvent {
 }
 
 export class EventManager {
-  private _callAsInternalUser: ILegacyScopedClusterClient['callAsInternalUser'];
-  constructor({ callAsInternalUser }: ILegacyScopedClusterClient) {
-    this._callAsInternalUser = callAsInternalUser;
+  private _asInternalUser: IScopedClusterClient['asInternalUser'];
+  constructor({ asInternalUser }: IScopedClusterClient) {
+    this._asInternalUser = asInternalUser;
   }
 
   async getCalendarEvents(calendarId: string) {
-    const resp = await this._callAsInternalUser('ml.events', { calendarId });
+    const { body } = await this._asInternalUser.ml.getCalendarEvents({ calendar_id: calendarId });
 
-    return resp.events;
+    return body.events;
   }
 
   // jobId is optional
   async getAllEvents(jobId?: string) {
     const calendarId = GLOBAL_CALENDAR;
-    const resp = await this._callAsInternalUser('ml.events', {
-      calendarId,
-      jobId,
+    const { body } = await this._asInternalUser.ml.getCalendarEvents({
+      calendar_id: calendarId,
+      job_id: jobId,
     });
 
-    return resp.events;
+    return body.events;
   }
 
   async addEvents(calendarId: string, events: CalendarEvent[]) {
     const body = { events };
 
-    return await this._callAsInternalUser('ml.addEvent', {
-      calendarId,
+    return await this._asInternalUser.ml.postCalendarEvents({
+      calendar_id: calendarId,
       body,
     });
   }
 
   async deleteEvent(calendarId: string, eventId: string) {
-    return this._callAsInternalUser('ml.deleteEvent', { calendarId, eventId });
+    return this._asInternalUser.ml.deleteCalendarEvent({
+      calendar_id: calendarId,
+      event_id: eventId,
+    });
   }
 
   isEqual(ev1: CalendarEvent, ev2: CalendarEvent) {
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
index 1cb0656e88a0bb..0f4cac37d2e8f8 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/analytics_audit_messages.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { ML_NOTIFICATION_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { JobMessage } from '../../../common/types/audit_message';
 
@@ -23,7 +23,7 @@ interface BoolQuery {
   bool: { [key: string]: any };
 }
 
-export function analyticsAuditMessagesProvider({ callAsInternalUser }: ILegacyScopedClusterClient) {
+export function analyticsAuditMessagesProvider({ asInternalUser }: IScopedClusterClient) {
   // search for audit messages,
   // analyticsId is optional. without it, all analytics will be listed.
   async function getAnalyticsAuditMessages(analyticsId: string) {
@@ -68,27 +68,23 @@ export function analyticsAuditMessagesProvider({ callAsInternalUser }: ILegacySc
       });
     }
 
-    try {
-      const resp = await callAsInternalUser('search', {
-        index: ML_NOTIFICATION_INDEX_PATTERN,
-        ignore_unavailable: true,
-        rest_total_hits_as_int: true,
-        size: SIZE,
-        body: {
-          sort: [{ timestamp: { order: 'desc' } }, { job_id: { order: 'asc' } }],
-          query,
-        },
-      });
+    const { body } = await asInternalUser.search({
+      index: ML_NOTIFICATION_INDEX_PATTERN,
+      ignore_unavailable: true,
+      rest_total_hits_as_int: true,
+      size: SIZE,
+      body: {
+        sort: [{ timestamp: { order: 'desc' } }, { job_id: { order: 'asc' } }],
+        query,
+      },
+    });
 
-      let messages = [];
-      if (resp.hits.total !== 0) {
-        messages = resp.hits.hits.map((hit: Message) => hit._source);
-        messages.reverse();
-      }
-      return messages;
-    } catch (e) {
-      throw e;
+    let messages = [];
+    if (body.hits.total !== 0) {
+      messages = body.hits.hits.map((hit: Message) => hit._source);
+      messages.reverse();
     }
+    return messages;
   }
 
   return {
diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
index 82d7707464308a..ab879d4c93b292 100644
--- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
+++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.test.ts
@@ -4,13 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SavedObjectsClientContract, KibanaRequest } from 'kibana/server';
+import { SavedObjectsClientContract, KibanaRequest, IScopedClusterClient } from 'kibana/server';
 import { Module } from '../../../common/types/modules';
 import { DataRecognizer } from '../data_recognizer';
 
+const callAs = () => Promise.resolve({ body: {} });
+
+const mlClusterClient = ({
+  asCurrentUser: callAs,
+  asInternalUser: callAs,
+} as unknown) as IScopedClusterClient;
+
 describe('ML - data recognizer', () => {
   const dr = new DataRecognizer(
-    { callAsCurrentUser: jest.fn(), callAsInternalUser: jest.fn() },
+    mlClusterClient,
     ({
       find: jest.fn(),
       bulkCreate: jest.fn(),
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 206baacd983223..820fcfa9253b63 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
@@ -7,15 +7,11 @@
 import fs from 'fs';
 import Boom from 'boom';
 import numeral from '@elastic/numeral';
-import {
-  KibanaRequest,
-  ILegacyScopedClusterClient,
-  SavedObjectsClientContract,
-} from 'kibana/server';
+import { KibanaRequest, IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
 import moment from 'moment';
 import { IndexPatternAttributes } from 'src/plugins/data/server';
 import { merge } from 'lodash';
-import { AnalysisLimits, CombinedJobWithStats } from '../../../common/types/anomaly_detection_jobs';
+import { AnalysisLimits } from '../../../common/types/anomaly_detection_jobs';
 import { getAuthorizationHeader } from '../../lib/request_authorization';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import {
@@ -46,6 +42,7 @@ import { fieldsServiceProvider } from '../fields_service';
 import { jobServiceProvider } from '../job_service';
 import { resultsServiceProvider } from '../results_service';
 import { JobExistResult, JobStat } from '../../../common/types/data_recognizer';
+import { MlJobsStatsResponse } from '../job_service/jobs';
 
 const ML_DIR = 'ml';
 const KIBANA_DIR = 'kibana';
@@ -74,10 +71,6 @@ interface RawModuleConfig {
   };
 }
 
-interface MlJobStats {
-  jobs: CombinedJobWithStats[];
-}
-
 interface Config {
   dirName: any;
   json: RawModuleConfig;
@@ -111,9 +104,9 @@ interface SaveResults {
 }
 
 export class DataRecognizer {
-  private _callAsCurrentUser: ILegacyScopedClusterClient['callAsCurrentUser'];
-  private _callAsInternalUser: ILegacyScopedClusterClient['callAsInternalUser'];
-  private _mlClusterClient: ILegacyScopedClusterClient;
+  private _asCurrentUser: IScopedClusterClient['asCurrentUser'];
+  private _asInternalUser: IScopedClusterClient['asInternalUser'];
+  private _client: IScopedClusterClient;
   private _authorizationHeader: object;
   private _modulesDir = `${__dirname}/modules`;
   private _indexPatternName: string = '';
@@ -124,13 +117,13 @@ export class DataRecognizer {
   jobsForModelMemoryEstimation: Array<{ job: ModuleJob; query: any }> = [];
 
   constructor(
-    mlClusterClient: ILegacyScopedClusterClient,
+    mlClusterClient: IScopedClusterClient,
     private savedObjectsClient: SavedObjectsClientContract,
     request: KibanaRequest
   ) {
-    this._mlClusterClient = mlClusterClient;
-    this._callAsCurrentUser = mlClusterClient.callAsCurrentUser;
-    this._callAsInternalUser = mlClusterClient.callAsInternalUser;
+    this._client = mlClusterClient;
+    this._asCurrentUser = mlClusterClient.asCurrentUser;
+    this._asInternalUser = mlClusterClient.asInternalUser;
     this._authorizationHeader = getAuthorizationHeader(request);
   }
 
@@ -249,18 +242,18 @@ export class DataRecognizer {
 
     const index = indexPattern;
     const size = 0;
-    const body = {
+    const searchBody = {
       query: moduleConfig.query,
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       rest_total_hits_as_int: true,
       size,
-      body,
+      body: searchBody,
     });
 
-    return resp.hits.total !== 0;
+    return body.hits.total !== 0;
   }
 
   async listModules() {
@@ -518,7 +511,7 @@ export class DataRecognizer {
       // Add a wildcard at the front of each of the job IDs in the module,
       // as a prefix may have been supplied when creating the jobs in the module.
       const jobIds = module.jobs.map((job) => `*${job.id}`);
-      const { jobsExist } = jobServiceProvider(this._mlClusterClient);
+      const { jobsExist } = jobServiceProvider(this._client);
       const jobInfo = await jobsExist(jobIds);
 
       // Check if the value for any of the jobs is false.
@@ -527,16 +520,16 @@ export class DataRecognizer {
 
       if (doJobsExist === true) {
         // Get the IDs of the jobs created from the module, and their earliest / latest timestamps.
-        const jobStats: MlJobStats = await this._callAsInternalUser('ml.jobStats', {
-          jobId: jobIds,
+        const { body } = await this._asInternalUser.ml.getJobStats<MlJobsStatsResponse>({
+          job_id: jobIds.join(),
         });
         const jobStatsJobs: JobStat[] = [];
-        if (jobStats.jobs && jobStats.jobs.length > 0) {
-          const foundJobIds = jobStats.jobs.map((job) => job.job_id);
-          const { getLatestBucketTimestampByJob } = resultsServiceProvider(this._mlClusterClient);
+        if (body.jobs && body.jobs.length > 0) {
+          const foundJobIds = body.jobs.map((job) => job.job_id);
+          const { getLatestBucketTimestampByJob } = resultsServiceProvider(this._client);
           const latestBucketTimestampsByJob = await getLatestBucketTimestampByJob(foundJobIds);
 
-          jobStats.jobs.forEach((job) => {
+          body.jobs.forEach((job) => {
             const jobStat = {
               id: job.job_id,
             } as JobStat;
@@ -704,16 +697,15 @@ export class DataRecognizer {
           job.id = jobId;
           await this.saveJob(job);
           return { id: jobId, success: true };
-        } catch (error) {
-          return { id: jobId, success: false, error };
+        } catch ({ body }) {
+          return { id: jobId, success: false, error: body };
         }
       })
     );
   }
 
   async saveJob(job: ModuleJob) {
-    const { id: jobId, config: body } = job;
-    return this._callAsInternalUser('ml.addJob', { jobId, body });
+    return this._asInternalUser.ml.putJob({ job_id: job.id, body: job.config });
   }
 
   // save the datafeeds.
@@ -725,20 +717,21 @@ export class DataRecognizer {
         try {
           await this.saveDatafeed(datafeed);
           return { id: datafeed.id, success: true, started: false };
-        } catch (error) {
-          return { id: datafeed.id, success: false, started: false, error };
+        } catch ({ body }) {
+          return { id: datafeed.id, success: false, started: false, error: body };
         }
       })
     );
   }
 
   async saveDatafeed(datafeed: ModuleDataFeed) {
-    const { id: datafeedId, config: body } = datafeed;
-    return this._callAsInternalUser('ml.addDatafeed', {
-      datafeedId,
-      body,
-      ...this._authorizationHeader,
-    });
+    return this._asInternalUser.ml.putDatafeed(
+      {
+        datafeed_id: datafeed.id,
+        body: datafeed.config,
+      },
+      this._authorizationHeader
+    );
   }
 
   async startDatafeeds(
@@ -761,10 +754,10 @@ export class DataRecognizer {
     const result = { started: false } as DatafeedResponse;
     let opened = false;
     try {
-      const openResult = await this._callAsInternalUser('ml.openJob', {
-        jobId: datafeed.config.job_id,
+      const { body } = await this._asInternalUser.ml.openJob({
+        job_id: datafeed.config.job_id,
       });
-      opened = openResult.opened;
+      opened = body.opened;
     } catch (error) {
       // if the job is already open, a 409 will be returned.
       if (error.statusCode === 409) {
@@ -772,27 +765,27 @@ export class DataRecognizer {
       } else {
         opened = false;
         result.started = false;
-        result.error = error;
+        result.error = error.body;
       }
     }
     if (opened) {
       try {
-        const duration: { start: number; end?: number } = { start: 0 };
+        const duration: { start: string; end?: string } = { start: '0' };
         if (start !== undefined) {
-          duration.start = start;
+          duration.start = (start as unknown) as string;
         }
         if (end !== undefined) {
-          duration.end = end;
+          duration.end = (end as unknown) as string;
         }
 
-        await this._callAsInternalUser('ml.startDatafeed', {
-          datafeedId: datafeed.id,
+        await this._asInternalUser.ml.startDatafeed({
+          datafeed_id: datafeed.id,
           ...duration,
         });
         result.started = true;
-      } catch (error) {
+      } catch ({ body }) {
         result.started = false;
-        result.error = error;
+        result.error = body;
       }
     }
     return result;
@@ -995,7 +988,7 @@ export class DataRecognizer {
     timeField: string,
     query?: any
   ): Promise<{ start: number; end: number }> {
-    const fieldsService = fieldsServiceProvider(this._mlClusterClient);
+    const fieldsService = fieldsServiceProvider(this._client);
 
     const timeFieldRange = await fieldsService.getTimeFieldRange(
       this._indexPatternName,
@@ -1025,7 +1018,7 @@ export class DataRecognizer {
 
     if (estimateMML && this.jobsForModelMemoryEstimation.length > 0) {
       try {
-        const calculateModelMemoryLimit = calculateModelMemoryLimitProvider(this._mlClusterClient);
+        const calculateModelMemoryLimit = calculateModelMemoryLimitProvider(this._client);
 
         // Checks if all jobs in the module have the same time field configured
         const firstJobTimeField = this.jobsForModelMemoryEstimation[0].job.config.data_description
@@ -1074,11 +1067,13 @@ export class DataRecognizer {
           job.config.analysis_limits.model_memory_limit = modelMemoryLimit;
         }
       } catch (error) {
-        mlLog.warn(`Data recognizer could not estimate model memory limit ${error}`);
+        mlLog.warn(`Data recognizer could not estimate model memory limit ${error.body}`);
       }
     }
 
-    const { limits } = (await this._callAsInternalUser('ml.info')) as MlInfoResponse;
+    const {
+      body: { limits },
+    } = await this._asInternalUser.ml.info<MlInfoResponse>();
     const maxMml = limits.max_model_memory_limit;
 
     if (!maxMml) {
diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
index 838315d8d272ca..dbfa4b5656e5f9 100644
--- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import get from 'lodash/get';
 import each from 'lodash/each';
 import last from 'lodash/last';
@@ -183,7 +183,7 @@ type BatchStats =
   | FieldExamples;
 
 const getAggIntervals = async (
-  { callAsCurrentUser }: ILegacyScopedClusterClient,
+  { asCurrentUser }: IScopedClusterClient,
   indexPatternTitle: string,
   query: any,
   fields: HistogramField[],
@@ -207,7 +207,7 @@ const getAggIntervals = async (
     return aggs;
   }, {} as Record<string, object>);
 
-  const respStats = await callAsCurrentUser('search', {
+  const { body } = await asCurrentUser.search({
     index: indexPatternTitle,
     size: 0,
     body: {
@@ -218,8 +218,7 @@ const getAggIntervals = async (
   });
 
   const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
-  const aggregations =
-    aggsPath.length > 0 ? get(respStats.aggregations, aggsPath) : respStats.aggregations;
+  const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations;
 
   return Object.keys(aggregations).reduce((p, aggName) => {
     const stats = [aggregations[aggName].min, aggregations[aggName].max];
@@ -241,15 +240,15 @@ const getAggIntervals = async (
 
 // export for re-use by transforms plugin
 export const getHistogramsForFields = async (
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   indexPatternTitle: string,
   query: any,
   fields: HistogramField[],
   samplerShardSize: number
 ) => {
-  const { callAsCurrentUser } = mlClusterClient;
+  const { asCurrentUser } = client;
   const aggIntervals = await getAggIntervals(
-    mlClusterClient,
+    client,
     indexPatternTitle,
     query,
     fields,
@@ -291,7 +290,7 @@ export const getHistogramsForFields = async (
     return [];
   }
 
-  const respChartsData = await callAsCurrentUser('search', {
+  const { body } = await asCurrentUser.search({
     index: indexPatternTitle,
     size: 0,
     body: {
@@ -302,8 +301,7 @@ export const getHistogramsForFields = async (
   });
 
   const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
-  const aggregations =
-    aggsPath.length > 0 ? get(respChartsData.aggregations, aggsPath) : respChartsData.aggregations;
+  const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations;
 
   const chartsData: ChartData[] = fields.map(
     (field): ChartData => {
@@ -350,12 +348,12 @@ export const getHistogramsForFields = async (
 };
 
 export class DataVisualizer {
-  private _mlClusterClient: ILegacyScopedClusterClient;
-  private _callAsCurrentUser: ILegacyScopedClusterClient['callAsCurrentUser'];
+  private _client: IScopedClusterClient;
+  private _asCurrentUser: IScopedClusterClient['asCurrentUser'];
 
-  constructor(mlClusterClient: ILegacyScopedClusterClient) {
-    this._callAsCurrentUser = mlClusterClient.callAsCurrentUser;
-    this._mlClusterClient = mlClusterClient;
+  constructor(client: IScopedClusterClient) {
+    this._asCurrentUser = client.asCurrentUser;
+    this._client = client;
   }
 
   // Obtains overall stats on the fields in the supplied index pattern, returning an object
@@ -451,7 +449,7 @@ export class DataVisualizer {
     samplerShardSize: number
   ): Promise<any> {
     return await getHistogramsForFields(
-      this._mlClusterClient,
+      this._client,
       indexPatternTitle,
       query,
       fields,
@@ -621,7 +619,7 @@ export class DataVisualizer {
       };
     });
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -630,14 +628,14 @@ export class DataVisualizer {
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       rest_total_hits_as_int: true,
       size,
-      body,
+      body: searchBody,
     });
-    const aggregations = resp.aggregations;
-    const totalCount = get(resp, ['hits', 'total'], 0);
+    const aggregations = body.aggregations;
+    const totalCount = get(body, ['hits', 'total'], 0);
     const stats = {
       totalCount,
       aggregatableExistsFields: [] as FieldData[],
@@ -688,7 +686,7 @@ export class DataVisualizer {
     const size = 0;
     const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -697,13 +695,13 @@ export class DataVisualizer {
     };
     filterCriteria.push({ exists: { field } });
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       rest_total_hits_as_int: true,
       size,
-      body,
+      body: searchBody,
     });
-    return resp.hits.total > 0;
+    return body.hits.total > 0;
   }
 
   async getDocumentCountStats(
@@ -730,7 +728,7 @@ export class DataVisualizer {
       },
     };
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -739,15 +737,15 @@ export class DataVisualizer {
       aggs,
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       size,
-      body,
+      body: searchBody,
     });
 
     const buckets: { [key: string]: number } = {};
     const dataByTimeBucket: Array<{ key: string; doc_count: number }> = get(
-      resp,
+      body,
       ['aggregations', 'eventRate', 'buckets'],
       []
     );
@@ -833,7 +831,7 @@ export class DataVisualizer {
       }
     });
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -842,12 +840,12 @@ export class DataVisualizer {
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       size,
-      body,
+      body: searchBody,
     });
-    const aggregations = resp.aggregations;
+    const aggregations = body.aggregations;
     const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
     const batchStats: NumericFieldStats[] = [];
     fields.forEach((field, i) => {
@@ -954,7 +952,7 @@ export class DataVisualizer {
       }
     });
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -963,12 +961,12 @@ export class DataVisualizer {
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       size,
-      body,
+      body: searchBody,
     });
-    const aggregations = resp.aggregations;
+    const aggregations = body.aggregations;
     const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
     const batchStats: StringFieldStats[] = [];
     fields.forEach((field, i) => {
@@ -1028,7 +1026,7 @@ export class DataVisualizer {
       };
     });
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -1037,12 +1035,12 @@ export class DataVisualizer {
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       size,
-      body,
+      body: searchBody,
     });
-    const aggregations = resp.aggregations;
+    const aggregations = body.aggregations;
     const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
     const batchStats: DateFieldStats[] = [];
     fields.forEach((field, i) => {
@@ -1095,7 +1093,7 @@ export class DataVisualizer {
       };
     });
 
-    const body = {
+    const searchBody = {
       query: {
         bool: {
           filter: filterCriteria,
@@ -1104,12 +1102,12 @@ export class DataVisualizer {
       aggs: buildSamplerAggregation(aggs, samplerShardSize),
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       size,
-      body,
+      body: searchBody,
     });
-    const aggregations = resp.aggregations;
+    const aggregations = body.aggregations;
     const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
     const batchStats: BooleanFieldStats[] = [];
     fields.forEach((field, i) => {
@@ -1157,7 +1155,7 @@ export class DataVisualizer {
       exists: { field },
     });
 
-    const body = {
+    const searchBody = {
       _source: field,
       query: {
         bool: {
@@ -1166,18 +1164,18 @@ export class DataVisualizer {
       },
     };
 
-    const resp = await this._callAsCurrentUser('search', {
+    const { body } = await this._asCurrentUser.search({
       index,
       rest_total_hits_as_int: true,
       size,
-      body,
+      body: searchBody,
     });
     const stats = {
       fieldName: field,
       examples: [] as any[],
     };
-    if (resp.hits.total !== 0) {
-      const hits = resp.hits.hits;
+    if (body.hits.total !== 0) {
+      const hits = body.hits.hits;
       for (let i = 0; i < hits.length; i++) {
         // Look in the _source for the field value.
         // If the field is not in the _source (as will happen if the
diff --git a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
index 43a6876f76c49e..68427e98750ebb 100644
--- a/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
+++ b/x-pack/plugins/ml/server/models/fields_service/fields_service.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { duration } from 'moment';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { initCardinalityFieldsCache } from './fields_aggs_cache';
@@ -14,7 +14,7 @@ import { initCardinalityFieldsCache } from './fields_aggs_cache';
  * Service for carrying out queries to obtain data
  * specific to fields in Elasticsearch indices.
  */
-export function fieldsServiceProvider({ callAsCurrentUser }: ILegacyScopedClusterClient) {
+export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
   const fieldsAggsCache = initCardinalityFieldsCache();
 
   /**
@@ -37,13 +37,13 @@ export function fieldsServiceProvider({ callAsCurrentUser }: ILegacyScopedCluste
     index: string | string[],
     fieldNames: string[]
   ): Promise<string[]> {
-    const fieldCapsResp = await callAsCurrentUser('fieldCaps', {
+    const { body } = await asCurrentUser.fieldCaps({
       index,
       fields: fieldNames,
     });
     const aggregatableFields: string[] = [];
     fieldNames.forEach((fieldName) => {
-      const fieldInfo = fieldCapsResp.fields[fieldName];
+      const fieldInfo = body.fields[fieldName];
       const typeKeys = fieldInfo !== undefined ? Object.keys(fieldInfo) : [];
       if (typeKeys.length > 0) {
         const fieldType = typeKeys[0];
@@ -130,12 +130,12 @@ export function fieldsServiceProvider({ callAsCurrentUser }: ILegacyScopedCluste
       aggs,
     };
 
-    const aggregations = (
-      await callAsCurrentUser('search', {
-        index,
-        body,
-      })
-    )?.aggregations;
+    const {
+      body: { aggregations },
+    } = await asCurrentUser.search({
+      index,
+      body,
+    });
 
     if (!aggregations) {
       return {};
@@ -170,7 +170,9 @@ export function fieldsServiceProvider({ callAsCurrentUser }: ILegacyScopedCluste
   }> {
     const obj = { success: true, start: { epoch: 0, string: '' }, end: { epoch: 0, string: '' } };
 
-    const resp = await callAsCurrentUser('search', {
+    const {
+      body: { aggregations },
+    } = await asCurrentUser.search({
       index,
       size: 0,
       body: {
@@ -190,12 +192,12 @@ export function fieldsServiceProvider({ callAsCurrentUser }: ILegacyScopedCluste
       },
     });
 
-    if (resp.aggregations && resp.aggregations.earliest && resp.aggregations.latest) {
-      obj.start.epoch = resp.aggregations.earliest.value;
-      obj.start.string = resp.aggregations.earliest.value_as_string;
+    if (aggregations && aggregations.earliest && aggregations.latest) {
+      obj.start.epoch = aggregations.earliest.value;
+      obj.start.string = aggregations.earliest.value_as_string;
 
-      obj.end.epoch = resp.aggregations.latest.value;
-      obj.end.string = resp.aggregations.latest.value_as_string;
+      obj.end.epoch = aggregations.latest.value;
+      obj.end.string = aggregations.latest.value_as_string;
     }
     return obj;
   }
@@ -338,12 +340,12 @@ export function fieldsServiceProvider({ callAsCurrentUser }: ILegacyScopedCluste
       },
     };
 
-    const aggregations = (
-      await callAsCurrentUser('search', {
-        index,
-        body,
-      })
-    )?.aggregations;
+    const {
+      body: { aggregations },
+    } = await asCurrentUser.search({
+      index,
+      body,
+    });
 
     if (!aggregations) {
       return cachedValues;
diff --git a/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts b/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts
index 9cd71c046b66c7..9e502c04fbb7ba 100644
--- a/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/file_data_visualizer/file_data_visualizer.ts
@@ -4,18 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import {
   AnalysisResult,
   FormattedOverrides,
   InputOverrides,
+  FindFileStructureResponse,
 } from '../../../common/types/file_datavisualizer';
 
 export type InputData = any[];
 
-export function fileDataVisualizerProvider({ callAsInternalUser }: ILegacyScopedClusterClient) {
-  async function analyzeFile(data: any, overrides: any): Promise<AnalysisResult> {
-    const results = await callAsInternalUser('ml.fileStructure', {
+export function fileDataVisualizerProvider({ asInternalUser }: IScopedClusterClient) {
+  async function analyzeFile(data: InputData, overrides: InputOverrides): Promise<AnalysisResult> {
+    overrides.explain = overrides.explain === undefined ? 'true' : overrides.explain;
+    const { body } = await asInternalUser.ml.findFileStructure<FindFileStructureResponse>({
       body: data,
       ...overrides,
     });
@@ -24,7 +26,7 @@ export function fileDataVisualizerProvider({ callAsInternalUser }: ILegacyScoped
 
     return {
       ...(hasOverrides && { overrides: reducedOverrides }),
-      results,
+      results: body,
     };
   }
 
diff --git a/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts b/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts
index fc9b333298c9dd..6108454c08aa75 100644
--- a/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts
+++ b/x-pack/plugins/ml/server/models/file_data_visualizer/import_data.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { INDEX_META_DATA_CREATED_BY } from '../../../common/constants/file_datavisualizer';
 import {
   ImportResponse,
@@ -15,7 +15,7 @@ import {
 } from '../../../common/types/file_datavisualizer';
 import { InputData } from './file_data_visualizer';
 
-export function importDataProvider({ callAsCurrentUser }: ILegacyScopedClusterClient) {
+export function importDataProvider({ asCurrentUser }: IScopedClusterClient) {
   async function importData(
     id: string,
     index: string,
@@ -40,9 +40,9 @@ export function importDataProvider({ callAsCurrentUser }: ILegacyScopedClusterCl
 
         // create the pipeline if one has been supplied
         if (pipelineId !== undefined) {
-          const success = await createPipeline(pipelineId, pipeline);
-          if (success.acknowledged !== true) {
-            throw success;
+          const resp = await createPipeline(pipelineId, pipeline);
+          if (resp.acknowledged !== true) {
+            throw resp;
           }
         }
         createdPipelineId = pipelineId;
@@ -80,7 +80,7 @@ export function importDataProvider({ callAsCurrentUser }: ILegacyScopedClusterCl
         id,
         index: createdIndex,
         pipelineId: createdPipelineId,
-        error: error.error !== undefined ? error.error : error,
+        error: error.body !== undefined ? error.body : error,
         docCount,
         ingestError: error.ingestError,
         failures: error.failures || [],
@@ -102,7 +102,7 @@ export function importDataProvider({ callAsCurrentUser }: ILegacyScopedClusterCl
       body.settings = settings;
     }
 
-    await callAsCurrentUser('indices.create', { index, body });
+    await asCurrentUser.indices.create({ index, body });
   }
 
   async function indexData(index: string, pipelineId: string, data: InputData) {
@@ -118,7 +118,7 @@ export function importDataProvider({ callAsCurrentUser }: ILegacyScopedClusterCl
         settings.pipeline = pipelineId;
       }
 
-      const resp = await callAsCurrentUser('bulk', settings);
+      const { body: resp } = await asCurrentUser.bulk(settings);
       if (resp.errors) {
         throw resp;
       } else {
@@ -151,7 +151,8 @@ export function importDataProvider({ callAsCurrentUser }: ILegacyScopedClusterCl
   }
 
   async function createPipeline(id: string, pipeline: any) {
-    return await callAsCurrentUser('ingest.putPipeline', { id, body: pipeline });
+    const { body } = await asCurrentUser.ingest.putPipeline({ id, body: pipeline });
+    return body;
   }
 
   function getFailures(items: any[], data: InputData): ImportFailure[] {
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 768ca1f893b68a..19ba1b76f8a600 100644
--- a/x-pack/plugins/ml/server/models/filter/filter_manager.ts
+++ b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 import { DetectorRule, DetectorRuleScope } from '../../../common/types/detector_rules';
 
@@ -58,26 +58,26 @@ interface PartialJob {
 }
 
 export class FilterManager {
-  private _callAsInternalUser: ILegacyScopedClusterClient['callAsInternalUser'];
-  constructor({ callAsInternalUser }: ILegacyScopedClusterClient) {
-    this._callAsInternalUser = callAsInternalUser;
+  private _asInternalUser: IScopedClusterClient['asInternalUser'];
+  constructor({ asInternalUser }: IScopedClusterClient) {
+    this._asInternalUser = asInternalUser;
   }
 
   async getFilter(filterId: string) {
     try {
       const [JOBS, FILTERS] = [0, 1];
       const results = await Promise.all([
-        this._callAsInternalUser('ml.jobs'),
-        this._callAsInternalUser('ml.filters', { filterId }),
+        this._asInternalUser.ml.getJobs(),
+        this._asInternalUser.ml.getFilters({ filter_id: filterId }),
       ]);
 
-      if (results[FILTERS] && results[FILTERS].filters.length) {
+      if (results[FILTERS] && results[FILTERS].body.filters.length) {
         let filtersInUse: FiltersInUse = {};
-        if (results[JOBS] && results[JOBS].jobs) {
-          filtersInUse = this.buildFiltersInUse(results[JOBS].jobs);
+        if (results[JOBS] && results[JOBS].body.jobs) {
+          filtersInUse = this.buildFiltersInUse(results[JOBS].body.jobs);
         }
 
-        const filter = results[FILTERS].filters[0];
+        const filter = results[FILTERS].body.filters[0];
         filter.used_by = filtersInUse[filter.filter_id];
         return filter;
       } else {
@@ -90,8 +90,8 @@ export class FilterManager {
 
   async getAllFilters() {
     try {
-      const filtersResp = await this._callAsInternalUser('ml.filters');
-      return filtersResp.filters;
+      const { body } = await this._asInternalUser.ml.getFilters({ size: 1000 });
+      return body.filters;
     } catch (error) {
       throw Boom.badRequest(error);
     }
@@ -101,14 +101,14 @@ export class FilterManager {
     try {
       const [JOBS, FILTERS] = [0, 1];
       const results = await Promise.all([
-        this._callAsInternalUser('ml.jobs'),
-        this._callAsInternalUser('ml.filters'),
+        this._asInternalUser.ml.getJobs(),
+        this._asInternalUser.ml.getFilters({ size: 1000 }),
       ]);
 
       // Build a map of filter_ids against jobs and detectors using that filter.
       let filtersInUse: FiltersInUse = {};
-      if (results[JOBS] && results[JOBS].jobs) {
-        filtersInUse = this.buildFiltersInUse(results[JOBS].jobs);
+      if (results[JOBS] && results[JOBS].body.jobs) {
+        filtersInUse = this.buildFiltersInUse(results[JOBS].body.jobs);
       }
 
       // For each filter, return just
@@ -117,8 +117,8 @@ export class FilterManager {
       //  item_count
       //  jobs using the filter
       const filterStats: FilterStats[] = [];
-      if (results[FILTERS] && results[FILTERS].filters) {
-        results[FILTERS].filters.forEach((filter: Filter) => {
+      if (results[FILTERS] && results[FILTERS].body.filters) {
+        results[FILTERS].body.filters.forEach((filter: Filter) => {
           const stats: FilterStats = {
             filter_id: filter.filter_id,
             description: filter.description,
@@ -139,7 +139,8 @@ export class FilterManager {
     const { filterId, ...body } = filter;
     try {
       // Returns the newly created filter.
-      return await this._callAsInternalUser('ml.addFilter', { filterId, body });
+      const { body: resp } = await this._asInternalUser.ml.putFilter({ filter_id: filterId, body });
+      return resp;
     } catch (error) {
       throw Boom.badRequest(error);
     }
@@ -159,17 +160,19 @@ export class FilterManager {
       }
 
       // Returns the newly updated filter.
-      return await this._callAsInternalUser('ml.updateFilter', {
-        filterId,
+      const { body: resp } = await this._asInternalUser.ml.updateFilter({
+        filter_id: filterId,
         body,
       });
+      return resp;
     } catch (error) {
       throw Boom.badRequest(error);
     }
   }
 
   async deleteFilter(filterId: string) {
-    return this._callAsInternalUser('ml.deleteFilter', { filterId });
+    const { body } = await this._asInternalUser.ml.deleteFilter({ filter_id: filterId });
+    return body;
   }
 
   buildFiltersInUse(jobsList: PartialJob[]) {
diff --git a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts
index d72552b548b827..afdd3e9bb8ce90 100644
--- a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts
+++ b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.d.ts
@@ -4,10 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 export function jobAuditMessagesProvider(
-  mlClusterClient: ILegacyScopedClusterClient
+  client: IScopedClusterClient
 ): {
   getJobAuditMessages: (jobId?: string, from?: string) => any;
   getAuditMessagesSummary: (jobIds?: string[]) => any;
diff --git a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.js b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.js
index 86d80c394137f8..3fd5ebf3f68f40 100644
--- a/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.js
+++ b/x-pack/plugins/ml/server/models/job_audit_messages/job_audit_messages.js
@@ -34,14 +34,14 @@ const anomalyDetectorTypeFilter = {
   },
 };
 
-export function jobAuditMessagesProvider({ callAsInternalUser }) {
+export function jobAuditMessagesProvider({ asInternalUser }) {
   // search for audit messages,
   // jobId is optional. without it, all jobs will be listed.
   // from is optional and should be a string formatted in ES time units. e.g. 12h, 1d, 7d
   async function getJobAuditMessages(jobId, from) {
     let gte = null;
     if (jobId !== undefined && from === undefined) {
-      const jobs = await callAsInternalUser('ml.jobs', { jobId });
+      const jobs = await asInternalUser.ml.getJobs({ job_id: jobId });
       if (jobs.count > 0 && jobs.jobs !== undefined) {
         gte = moment(jobs.jobs[0].create_time).valueOf();
       }
@@ -99,26 +99,22 @@ export function jobAuditMessagesProvider({ callAsInternalUser }) {
       });
     }
 
-    try {
-      const resp = await callAsInternalUser('search', {
-        index: ML_NOTIFICATION_INDEX_PATTERN,
-        ignore_unavailable: true,
-        rest_total_hits_as_int: true,
-        size: SIZE,
-        body: {
-          sort: [{ timestamp: { order: 'desc' } }, { job_id: { order: 'asc' } }],
-          query,
-        },
-      });
+    const { body } = await asInternalUser.search({
+      index: ML_NOTIFICATION_INDEX_PATTERN,
+      ignore_unavailable: true,
+      rest_total_hits_as_int: true,
+      size: SIZE,
+      body: {
+        sort: [{ timestamp: { order: 'desc' } }, { job_id: { order: 'asc' } }],
+        query,
+      },
+    });
 
-      let messages = [];
-      if (resp.hits.total !== 0) {
-        messages = resp.hits.hits.map((hit) => hit._source);
-      }
-      return messages;
-    } catch (e) {
-      throw e;
+    let messages = [];
+    if (body.hits.total !== 0) {
+      messages = body.hits.hits.map((hit) => hit._source);
     }
+    return messages;
   }
 
   // search highest, most recent audit messages for all jobs for the last 24hrs.
@@ -128,65 +124,63 @@ export function jobAuditMessagesProvider({ callAsInternalUser }) {
     const maxBuckets = 10000;
     let levelsPerJobAggSize = maxBuckets;
 
-    try {
-      const query = {
-        bool: {
-          filter: [
-            {
-              range: {
-                timestamp: {
-                  gte: 'now-1d',
-                },
+    const query = {
+      bool: {
+        filter: [
+          {
+            range: {
+              timestamp: {
+                gte: 'now-1d',
               },
             },
-            anomalyDetectorTypeFilter,
-          ],
-        },
-      };
-
-      // If the jobIds arg is supplied, add a query filter
-      // to only include those jobIds in the aggregations.
-      if (Array.isArray(jobIds) && jobIds.length > 0) {
-        query.bool.filter.push({
-          terms: {
-            job_id: jobIds,
           },
-        });
-        levelsPerJobAggSize = jobIds.length;
-      }
+          anomalyDetectorTypeFilter,
+        ],
+      },
+    };
 
-      const resp = await callAsInternalUser('search', {
-        index: ML_NOTIFICATION_INDEX_PATTERN,
-        ignore_unavailable: true,
-        rest_total_hits_as_int: true,
-        size: 0,
-        body: {
-          query,
-          aggs: {
-            levelsPerJob: {
-              terms: {
-                field: 'job_id',
-                size: levelsPerJobAggSize,
-              },
-              aggs: {
-                levels: {
-                  terms: {
-                    field: 'level',
-                  },
-                  aggs: {
-                    latestMessage: {
-                      terms: {
-                        field: 'message.raw',
-                        size: 1,
-                        order: {
-                          latestMessage: 'desc',
-                        },
+    // If the jobIds arg is supplied, add a query filter
+    // to only include those jobIds in the aggregations.
+    if (Array.isArray(jobIds) && jobIds.length > 0) {
+      query.bool.filter.push({
+        terms: {
+          job_id: jobIds,
+        },
+      });
+      levelsPerJobAggSize = jobIds.length;
+    }
+
+    const { body } = await asInternalUser.search({
+      index: ML_NOTIFICATION_INDEX_PATTERN,
+      ignore_unavailable: true,
+      rest_total_hits_as_int: true,
+      size: 0,
+      body: {
+        query,
+        aggs: {
+          levelsPerJob: {
+            terms: {
+              field: 'job_id',
+              size: levelsPerJobAggSize,
+            },
+            aggs: {
+              levels: {
+                terms: {
+                  field: 'level',
+                },
+                aggs: {
+                  latestMessage: {
+                    terms: {
+                      field: 'message.raw',
+                      size: 1,
+                      order: {
+                        latestMessage: 'desc',
                       },
-                      aggs: {
-                        latestMessage: {
-                          max: {
-                            field: 'timestamp',
-                          },
+                    },
+                    aggs: {
+                      latestMessage: {
+                        max: {
+                          field: 'timestamp',
                         },
                       },
                     },
@@ -196,67 +190,65 @@ export function jobAuditMessagesProvider({ callAsInternalUser }) {
             },
           },
         },
-      });
+      },
+    });
 
-      let messagesPerJob = [];
-      const jobMessages = [];
-      if (
-        resp.hits.total !== 0 &&
-        resp.aggregations &&
-        resp.aggregations.levelsPerJob &&
-        resp.aggregations.levelsPerJob.buckets &&
-        resp.aggregations.levelsPerJob.buckets.length
-      ) {
-        messagesPerJob = resp.aggregations.levelsPerJob.buckets;
-      }
+    let messagesPerJob = [];
+    const jobMessages = [];
+    if (
+      body.hits.total !== 0 &&
+      body.aggregations &&
+      body.aggregations.levelsPerJob &&
+      body.aggregations.levelsPerJob.buckets &&
+      body.aggregations.levelsPerJob.buckets.length
+    ) {
+      messagesPerJob = body.aggregations.levelsPerJob.buckets;
+    }
 
-      messagesPerJob.forEach((job) => {
-        // ignore system messages (id==='')
-        if (job.key !== '' && job.levels && job.levels.buckets && job.levels.buckets.length) {
-          let highestLevel = 0;
-          let highestLevelText = '';
-          let msgTime = 0;
+    messagesPerJob.forEach((job) => {
+      // ignore system messages (id==='')
+      if (job.key !== '' && job.levels && job.levels.buckets && job.levels.buckets.length) {
+        let highestLevel = 0;
+        let highestLevelText = '';
+        let msgTime = 0;
 
-          job.levels.buckets.forEach((level) => {
-            const label = level.key;
-            // note the highest message level
-            if (LEVEL[label] > highestLevel) {
-              highestLevel = LEVEL[label];
-              if (
-                level.latestMessage &&
-                level.latestMessage.buckets &&
-                level.latestMessage.buckets.length
-              ) {
-                level.latestMessage.buckets.forEach((msg) => {
-                  // there should only be one result here.
-                  highestLevelText = msg.key;
+        job.levels.buckets.forEach((level) => {
+          const label = level.key;
+          // note the highest message level
+          if (LEVEL[label] > highestLevel) {
+            highestLevel = LEVEL[label];
+            if (
+              level.latestMessage &&
+              level.latestMessage.buckets &&
+              level.latestMessage.buckets.length
+            ) {
+              level.latestMessage.buckets.forEach((msg) => {
+                // there should only be one result here.
+                highestLevelText = msg.key;
 
-                  // note the time in ms for the highest level
-                  // so we can filter them out later if they're earlier than the
-                  // job's create time.
-                  if (msg.latestMessage && msg.latestMessage.value_as_string) {
-                    const time = moment(msg.latestMessage.value_as_string);
-                    msgTime = time.valueOf();
-                  }
-                });
-              }
+                // note the time in ms for the highest level
+                // so we can filter them out later if they're earlier than the
+                // job's create time.
+                if (msg.latestMessage && msg.latestMessage.value_as_string) {
+                  const time = moment(msg.latestMessage.value_as_string);
+                  msgTime = time.valueOf();
+                }
+              });
             }
-          });
-
-          if (msgTime !== 0 && highestLevel !== 0) {
-            jobMessages.push({
-              job_id: job.key,
-              highestLevelText,
-              highestLevel: levelToText(highestLevel),
-              msgTime,
-            });
           }
+        });
+
+        if (msgTime !== 0 && highestLevel !== 0) {
+          jobMessages.push({
+            job_id: job.key,
+            highestLevelText,
+            highestLevel: levelToText(highestLevel),
+            msgTime,
+          });
         }
-      });
-      return jobMessages;
-    } catch (e) {
-      throw e;
-    }
+      }
+    });
+    return jobMessages;
   }
 
   function levelToText(level) {
diff --git a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
index 98e1be48bb766e..c0eb1b72825df8 100644
--- a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
+++ b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { i18n } from '@kbn/i18n';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 import { fillResultsWithTimeouts, isRequestTimeout } from './error_utils';
@@ -26,7 +26,7 @@ interface Results {
   };
 }
 
-export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterClient) {
+export function datafeedsProvider({ asInternalUser }: IScopedClusterClient) {
   async function forceStartDatafeeds(datafeedIds: string[], start?: number, end?: number) {
     const jobIds = await getJobIdsByDatafeedId();
     const doStartsCalled = datafeedIds.reduce((acc, cur) => {
@@ -42,8 +42,8 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
         try {
           await startDatafeed(datafeedId, start, end);
           return { started: true };
-        } catch (error) {
-          return { started: false, error };
+        } catch ({ body }) {
+          return { started: false, error: body };
         }
       } else {
         return { started: true };
@@ -66,7 +66,7 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
             results[datafeedId] = await doStart(datafeedId);
             return fillResultsWithTimeouts(results, datafeedId, datafeedIds, JOB_STATE.OPENED);
           }
-          results[datafeedId] = { started: false, error };
+          results[datafeedId] = { started: false, error: error.body };
         }
       } else {
         results[datafeedId] = {
@@ -84,8 +84,8 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
   async function openJob(jobId: string) {
     let opened = false;
     try {
-      const resp = await callAsInternalUser('ml.openJob', { jobId });
-      opened = resp.opened;
+      const { body } = await asInternalUser.ml.openJob({ job_id: jobId });
+      opened = body.opened;
     } catch (error) {
       if (error.statusCode === 409) {
         opened = true;
@@ -97,7 +97,11 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
   }
 
   async function startDatafeed(datafeedId: string, start?: number, end?: number) {
-    return callAsInternalUser('ml.startDatafeed', { datafeedId, start, end });
+    return asInternalUser.ml.startDatafeed({
+      datafeed_id: datafeedId,
+      start: (start as unknown) as string,
+      end: (end as unknown) as string,
+    });
   }
 
   async function stopDatafeeds(datafeedIds: string[]) {
@@ -105,7 +109,12 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
 
     for (const datafeedId of datafeedIds) {
       try {
-        results[datafeedId] = await callAsInternalUser('ml.stopDatafeed', { datafeedId });
+        const { body } = await asInternalUser.ml.stopDatafeed<{
+          started: boolean;
+        }>({
+          datafeed_id: datafeedId,
+        });
+        results[datafeedId] = body;
       } catch (error) {
         if (isRequestTimeout(error)) {
           return fillResultsWithTimeouts(results, datafeedId, datafeedIds, DATAFEED_STATE.STOPPED);
@@ -117,11 +126,17 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
   }
 
   async function forceDeleteDatafeed(datafeedId: string) {
-    return callAsInternalUser('ml.deleteDatafeed', { datafeedId, force: true });
+    const { body } = await asInternalUser.ml.deleteDatafeed({
+      datafeed_id: datafeedId,
+      force: true,
+    });
+    return body;
   }
 
   async function getDatafeedIdsByJobId() {
-    const { datafeeds } = (await callAsInternalUser('ml.datafeeds')) as MlDatafeedsResponse;
+    const {
+      body: { datafeeds },
+    } = await asInternalUser.ml.getDatafeeds<MlDatafeedsResponse>();
     return datafeeds.reduce((acc, cur) => {
       acc[cur.job_id] = cur.datafeed_id;
       return acc;
@@ -129,7 +144,9 @@ export function datafeedsProvider({ callAsInternalUser }: ILegacyScopedClusterCl
   }
 
   async function getJobIdsByDatafeedId() {
-    const { datafeeds } = (await callAsInternalUser('ml.datafeeds')) as MlDatafeedsResponse;
+    const {
+      body: { datafeeds },
+    } = await asInternalUser.ml.getDatafeeds<MlDatafeedsResponse>();
     return datafeeds.reduce((acc, cur) => {
       acc[cur.datafeed_id] = cur.job_id;
       return acc;
diff --git a/x-pack/plugins/ml/server/models/job_service/error_utils.ts b/x-pack/plugins/ml/server/models/job_service/error_utils.ts
index 8a47993546fb85..dc871a9dce8057 100644
--- a/x-pack/plugins/ml/server/models/job_service/error_utils.ts
+++ b/x-pack/plugins/ml/server/models/job_service/error_utils.ts
@@ -7,11 +7,11 @@
 import { i18n } from '@kbn/i18n';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 
-const REQUEST_TIMEOUT = 'RequestTimeout';
+const REQUEST_TIMEOUT_NAME = 'RequestTimeout';
 type ACTION_STATE = DATAFEED_STATE | JOB_STATE;
 
-export function isRequestTimeout(error: { displayName: string }) {
-  return error.displayName === REQUEST_TIMEOUT;
+export function isRequestTimeout(error: { name: string }) {
+  return error.name === REQUEST_TIMEOUT_NAME;
 }
 
 interface Results {
diff --git a/x-pack/plugins/ml/server/models/job_service/groups.ts b/x-pack/plugins/ml/server/models/job_service/groups.ts
index c4ea854c14f872..0f53d27f2eddf4 100644
--- a/x-pack/plugins/ml/server/models/job_service/groups.ts
+++ b/x-pack/plugins/ml/server/models/job_service/groups.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { CalendarManager } from '../calendar';
 import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
 import { Job } from '../../../common/types/anomaly_detection_jobs';
@@ -23,18 +23,19 @@ interface Results {
   };
 }
 
-export function groupsProvider(mlClusterClient: ILegacyScopedClusterClient) {
-  const calMngr = new CalendarManager(mlClusterClient);
-  const { callAsInternalUser } = mlClusterClient;
+export function groupsProvider(client: IScopedClusterClient) {
+  const calMngr = new CalendarManager(client);
+  const { asInternalUser } = client;
 
   async function getAllGroups() {
     const groups: { [id: string]: Group } = {};
     const jobIds: { [id: string]: undefined | null } = {};
-    const [{ jobs }, calendars] = await Promise.all([
-      callAsInternalUser('ml.jobs') as Promise<MlJobsResponse>,
+    const [{ body }, calendars] = await Promise.all([
+      asInternalUser.ml.getJobs<MlJobsResponse>(),
       calMngr.getAllCalendars(),
     ]);
 
+    const { jobs } = body;
     if (jobs) {
       jobs.forEach((job) => {
         jobIds[job.job_id] = null;
@@ -80,10 +81,10 @@ export function groupsProvider(mlClusterClient: ILegacyScopedClusterClient) {
     for (const job of jobs) {
       const { job_id: jobId, groups } = job;
       try {
-        await callAsInternalUser('ml.updateJob', { jobId, body: { groups } });
+        await asInternalUser.ml.updateJob({ job_id: jobId, body: { groups } });
         results[jobId] = { success: true };
-      } catch (error) {
-        results[jobId] = { success: false, error };
+      } catch ({ body }) {
+        results[jobId] = { success: false, error: body };
       }
     }
     return results;
diff --git a/x-pack/plugins/ml/server/models/job_service/index.ts b/x-pack/plugins/ml/server/models/job_service/index.ts
index 1ff33a7b00f0b5..6fea5d3b5a491b 100644
--- a/x-pack/plugins/ml/server/models/job_service/index.ts
+++ b/x-pack/plugins/ml/server/models/job_service/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { datafeedsProvider } from './datafeeds';
 import { jobsProvider } from './jobs';
 import { groupsProvider } from './groups';
@@ -12,14 +12,14 @@ import { newJobCapsProvider } from './new_job_caps';
 import { newJobChartsProvider, topCategoriesProvider } from './new_job';
 import { modelSnapshotProvider } from './model_snapshots';
 
-export function jobServiceProvider(mlClusterClient: ILegacyScopedClusterClient) {
+export function jobServiceProvider(client: IScopedClusterClient) {
   return {
-    ...datafeedsProvider(mlClusterClient),
-    ...jobsProvider(mlClusterClient),
-    ...groupsProvider(mlClusterClient),
-    ...newJobCapsProvider(mlClusterClient),
-    ...newJobChartsProvider(mlClusterClient),
-    ...topCategoriesProvider(mlClusterClient),
-    ...modelSnapshotProvider(mlClusterClient),
+    ...datafeedsProvider(client),
+    ...jobsProvider(client),
+    ...groupsProvider(client),
+    ...newJobCapsProvider(client),
+    ...newJobChartsProvider(client),
+    ...topCategoriesProvider(client),
+    ...modelSnapshotProvider(client),
   };
 }
diff --git a/x-pack/plugins/ml/server/models/job_service/jobs.ts b/x-pack/plugins/ml/server/models/job_service/jobs.ts
index 0aa1cfdae13c7f..e047d31ba6eb79 100644
--- a/x-pack/plugins/ml/server/models/job_service/jobs.ts
+++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -7,7 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
 import Boom from 'boom';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { parseTimeIntervalForJob } from '../../../common/util/job_utils';
 import { JOB_STATE, DATAFEED_STATE } from '../../../common/constants/states';
 import {
@@ -22,7 +22,7 @@ import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
 import { datafeedsProvider, MlDatafeedsResponse, MlDatafeedsStatsResponse } from './datafeeds';
 import { jobAuditMessagesProvider } from '../job_audit_messages';
 import { resultsServiceProvider } from '../results_service';
-import { CalendarManager, Calendar } from '../calendar';
+import { CalendarManager } from '../calendar';
 import { fillResultsWithTimeouts, isRequestTimeout } from './error_utils';
 import {
   getEarliestDatafeedStartTime,
@@ -47,16 +47,16 @@ interface Results {
   };
 }
 
-export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
-  const { callAsInternalUser } = mlClusterClient;
+export function jobsProvider(client: IScopedClusterClient) {
+  const { asInternalUser } = client;
 
-  const { forceDeleteDatafeed, getDatafeedIdsByJobId } = datafeedsProvider(mlClusterClient);
-  const { getAuditMessagesSummary } = jobAuditMessagesProvider(mlClusterClient);
-  const { getLatestBucketTimestampByJob } = resultsServiceProvider(mlClusterClient);
-  const calMngr = new CalendarManager(mlClusterClient);
+  const { forceDeleteDatafeed, getDatafeedIdsByJobId } = datafeedsProvider(client);
+  const { getAuditMessagesSummary } = jobAuditMessagesProvider(client);
+  const { getLatestBucketTimestampByJob } = resultsServiceProvider(client);
+  const calMngr = new CalendarManager(client);
 
   async function forceDeleteJob(jobId: string) {
-    return callAsInternalUser('ml.deleteJob', { jobId, force: true });
+    return asInternalUser.ml.deleteJob({ job_id: jobId, force: true, wait_for_completion: false });
   }
 
   async function deleteJobs(jobIds: string[]) {
@@ -78,7 +78,7 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
             if (isRequestTimeout(error)) {
               return fillResultsWithTimeouts(results, jobId, jobIds, DATAFEED_STATE.DELETED);
             }
-            results[jobId] = { deleted: false, error };
+            results[jobId] = { deleted: false, error: error.body };
           }
         }
       } catch (error) {
@@ -90,7 +90,7 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
             DATAFEED_STATE.DELETED
           );
         }
-        results[jobId] = { deleted: false, error };
+        results[jobId] = { deleted: false, error: error.body };
       }
     }
     return results;
@@ -100,7 +100,7 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
     const results: Results = {};
     for (const jobId of jobIds) {
       try {
-        await callAsInternalUser('ml.closeJob', { jobId });
+        await asInternalUser.ml.closeJob({ job_id: jobId });
         results[jobId] = { closed: true };
       } catch (error) {
         if (isRequestTimeout(error)) {
@@ -109,23 +109,23 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
 
         if (
           error.statusCode === 409 &&
-          error.response &&
-          error.response.includes('datafeed') === false
+          error.body.error?.reason &&
+          error.body.error.reason.includes('datafeed') === false
         ) {
           // the close job request may fail (409) if the job has failed or if the datafeed hasn't been stopped.
           // if the job has failed we want to attempt a force close.
           // however, if we received a 409 due to the datafeed being started we should not attempt a force close.
           try {
-            await callAsInternalUser('ml.closeJob', { jobId, force: true });
+            await asInternalUser.ml.closeJob({ job_id: jobId, force: true });
             results[jobId] = { closed: true };
           } catch (error2) {
-            if (isRequestTimeout(error)) {
+            if (isRequestTimeout(error2)) {
               return fillResultsWithTimeouts(results, jobId, jobIds, JOB_STATE.CLOSED);
             }
-            results[jobId] = { closed: false, error: error2 };
+            results[jobId] = { closed: false, error: error2.body };
           }
         } else {
-          results[jobId] = { closed: false, error };
+          results[jobId] = { closed: false, error: error.body };
         }
       }
     }
@@ -139,12 +139,12 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
       throw Boom.notFound(`Cannot find datafeed for job ${jobId}`);
     }
 
-    const dfResult = await callAsInternalUser('ml.stopDatafeed', { datafeedId, force: true });
-    if (!dfResult || dfResult.stopped !== true) {
+    const { body } = await asInternalUser.ml.stopDatafeed({ datafeed_id: datafeedId, force: true });
+    if (body.stopped !== true) {
       return { success: false };
     }
 
-    await callAsInternalUser('ml.closeJob', { jobId, force: true });
+    await asInternalUser.ml.closeJob({ job_id: jobId, force: true });
 
     return { success: true };
   }
@@ -256,41 +256,26 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
     const calendarsByJobId: { [jobId: string]: string[] } = {};
     const globalCalendars: string[] = [];
 
-    const requests: [
-      Promise<MlJobsResponse>,
-      Promise<MlJobsStatsResponse>,
-      Promise<MlDatafeedsResponse>,
-      Promise<MlDatafeedsStatsResponse>,
-      Promise<Calendar[]>,
-      Promise<{ [id: string]: number | undefined }>
-    ] = [
-      jobIds.length > 0
-        ? (callAsInternalUser('ml.jobs', { jobId: jobIds }) as Promise<MlJobsResponse>) // move length check in  side call
-        : (callAsInternalUser('ml.jobs') as Promise<MlJobsResponse>),
-      jobIds.length > 0
-        ? (callAsInternalUser('ml.jobStats', { jobId: jobIds }) as Promise<MlJobsStatsResponse>)
-        : (callAsInternalUser('ml.jobStats') as Promise<MlJobsStatsResponse>),
-      callAsInternalUser('ml.datafeeds') as Promise<MlDatafeedsResponse>,
-      callAsInternalUser('ml.datafeedStats') as Promise<MlDatafeedsStatsResponse>,
-      calMngr.getAllCalendars(),
-      getLatestBucketTimestampByJob(),
-    ];
-
+    const jobIdsString = jobIds.join();
     const [
-      jobResults,
-      jobStatsResults,
-      datafeedResults,
-      datafeedStatsResults,
+      { body: jobResults },
+      { body: jobStatsResults },
+      { body: datafeedResults },
+      { body: datafeedStatsResults },
       calendarResults,
       latestBucketTimestampByJob,
-    ] = await Promise.all<
-      MlJobsResponse,
-      MlJobsStatsResponse,
-      MlDatafeedsResponse,
-      MlDatafeedsStatsResponse,
-      Calendar[],
-      { [id: string]: number | undefined }
-    >(requests);
+    ] = await Promise.all([
+      asInternalUser.ml.getJobs<MlJobsResponse>(
+        jobIds.length > 0 ? { job_id: jobIdsString } : undefined
+      ),
+      asInternalUser.ml.getJobStats<MlJobsStatsResponse>(
+        jobIds.length > 0 ? { job_id: jobIdsString } : undefined
+      ),
+      asInternalUser.ml.getDatafeeds<MlDatafeedsResponse>(),
+      asInternalUser.ml.getDatafeedStats<MlDatafeedsStatsResponse>(),
+      calMngr.getAllCalendars(),
+      getLatestBucketTimestampByJob(),
+    ]);
 
     if (datafeedResults && datafeedResults.datafeeds) {
       datafeedResults.datafeeds.forEach((datafeed) => {
@@ -400,9 +385,9 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
     const detailed = true;
     const jobIds = [];
     try {
-      const tasksList = await callAsInternalUser('tasks.list', { actions, detailed });
-      Object.keys(tasksList.nodes).forEach((nodeId) => {
-        const tasks = tasksList.nodes[nodeId].tasks;
+      const { body } = await asInternalUser.tasks.list({ actions, detailed });
+      Object.keys(body.nodes).forEach((nodeId) => {
+        const tasks = body.nodes[nodeId].tasks;
         Object.keys(tasks).forEach((taskId) => {
           jobIds.push(tasks[taskId].description.replace(/^delete-job-/, ''));
         });
@@ -410,7 +395,9 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
     } catch (e) {
       // if the user doesn't have permission to load the task list,
       // use the jobs list to get the ids of deleting jobs
-      const { jobs } = (await callAsInternalUser('ml.jobs')) as MlJobsResponse;
+      const {
+        body: { jobs },
+      } = await asInternalUser.ml.getJobs<MlJobsResponse>();
       jobIds.push(...jobs.filter((j) => j.deleting === true).map((j) => j.job_id));
     }
     return { jobIds };
@@ -421,13 +408,13 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
   // e.g. *_low_request_rate_ecs
   async function jobsExist(jobIds: string[] = []) {
     // Get the list of job IDs.
-    const jobsInfo = (await callAsInternalUser('ml.jobs', {
-      jobId: jobIds,
-    })) as MlJobsResponse;
+    const { body } = await asInternalUser.ml.getJobs<MlJobsResponse>({
+      job_id: jobIds.join(),
+    });
 
     const results: { [id: string]: boolean } = {};
-    if (jobsInfo.count > 0) {
-      const allJobIds = jobsInfo.jobs.map((job) => job.job_id);
+    if (body.count > 0) {
+      const allJobIds = body.jobs.map((job) => job.job_id);
 
       // Check if each of the supplied IDs match existing jobs.
       jobIds.forEach((jobId) => {
@@ -446,9 +433,9 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
   }
 
   async function getAllJobAndGroupIds() {
-    const { getAllGroups } = groupsProvider(mlClusterClient);
-    const jobs = (await callAsInternalUser('ml.jobs')) as MlJobsResponse;
-    const jobIds = jobs.jobs.map((job) => job.job_id);
+    const { getAllGroups } = groupsProvider(client);
+    const { body } = await asInternalUser.ml.getJobs<MlJobsResponse>();
+    const jobIds = body.jobs.map((job) => job.job_id);
     const groups = await getAllGroups();
     const groupIds = groups.map((group) => group.id);
 
@@ -460,13 +447,13 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
 
   async function getLookBackProgress(jobId: string, start: number, end: number) {
     const datafeedId = `datafeed-${jobId}`;
-    const [jobStats, isRunning] = await Promise.all([
-      callAsInternalUser('ml.jobStats', { jobId: [jobId] }) as Promise<MlJobsStatsResponse>,
+    const [{ body }, isRunning] = await Promise.all([
+      asInternalUser.ml.getJobStats<MlJobsStatsResponse>({ job_id: jobId }),
       isDatafeedRunning(datafeedId),
     ]);
 
-    if (jobStats.jobs.length) {
-      const statsForJob = jobStats.jobs[0];
+    if (body.jobs.length) {
+      const statsForJob = body.jobs[0];
       const time = statsForJob.data_counts.latest_record_timestamp;
       const progress = (time - start) / (end - start);
       const isJobClosed = statsForJob.state === JOB_STATE.CLOSED;
@@ -480,11 +467,11 @@ export function jobsProvider(mlClusterClient: ILegacyScopedClusterClient) {
   }
 
   async function isDatafeedRunning(datafeedId: string) {
-    const stats = (await callAsInternalUser('ml.datafeedStats', {
-      datafeedId: [datafeedId],
-    })) as MlDatafeedsStatsResponse;
-    if (stats.datafeeds.length) {
-      const state = stats.datafeeds[0].state;
+    const { body } = await asInternalUser.ml.getDatafeedStats<MlDatafeedsStatsResponse>({
+      datafeed_id: datafeedId,
+    });
+    if (body.datafeeds.length) {
+      const state = body.datafeeds[0].state;
       return (
         state === DATAFEED_STATE.STARTED ||
         state === DATAFEED_STATE.STARTING ||
diff --git a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
index 576d6f8cbb1600..34206a68ffeb9e 100644
--- a/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
+++ b/x-pack/plugins/ml/server/models/job_service/model_snapshots.ts
@@ -6,7 +6,7 @@
 
 import Boom from 'boom';
 import { i18n } from '@kbn/i18n';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { ModelSnapshot } from '../../../common/types/anomaly_detection_jobs';
 import { datafeedsProvider } from './datafeeds';
 import { FormCalendar, CalendarManager } from '../calendar';
@@ -19,9 +19,9 @@ export interface RevertModelSnapshotResponse {
   model: ModelSnapshot;
 }
 
-export function modelSnapshotProvider(mlClusterClient: ILegacyScopedClusterClient) {
-  const { callAsInternalUser } = mlClusterClient;
-  const { forceStartDatafeeds, getDatafeedIdsByJobId } = datafeedsProvider(mlClusterClient);
+export function modelSnapshotProvider(client: IScopedClusterClient) {
+  const { asInternalUser } = client;
+  const { forceStartDatafeeds, getDatafeedIdsByJobId } = datafeedsProvider(client);
 
   async function revertModelSnapshot(
     jobId: string,
@@ -33,13 +33,13 @@ export function modelSnapshotProvider(mlClusterClient: ILegacyScopedClusterClien
   ) {
     let datafeedId = `datafeed-${jobId}`;
     // ensure job exists
-    await callAsInternalUser('ml.jobs', { jobId: [jobId] });
+    await asInternalUser.ml.getJobs({ job_id: jobId });
 
     try {
       // ensure the datafeed exists
       // the datafeed is probably called datafeed-<jobId>
-      await callAsInternalUser('ml.datafeeds', {
-        datafeedId: [datafeedId],
+      await asInternalUser.ml.getDatafeeds({
+        datafeed_id: datafeedId,
       });
     } catch (e) {
       // if the datafeed isn't called datafeed-<jobId>
@@ -52,19 +52,21 @@ export function modelSnapshotProvider(mlClusterClient: ILegacyScopedClusterClien
     }
 
     // ensure the snapshot exists
-    const snapshot = (await callAsInternalUser('ml.modelSnapshots', {
-      jobId,
-      snapshotId,
-    })) as ModelSnapshotsResponse;
+    const { body: snapshot } = await asInternalUser.ml.getModelSnapshots<ModelSnapshotsResponse>({
+      job_id: jobId,
+      snapshot_id: snapshotId,
+    });
 
     // apply the snapshot revert
-    const { model } = (await callAsInternalUser('ml.revertModelSnapshot', {
-      jobId,
-      snapshotId,
+    const {
+      body: { model },
+    } = await asInternalUser.ml.revertModelSnapshot<RevertModelSnapshotResponse>({
+      job_id: jobId,
+      snapshot_id: snapshotId,
       body: {
         delete_intervening_results: deleteInterveningResults,
       },
-    })) as RevertModelSnapshotResponse;
+    });
 
     // create calendar (if specified) and replay datafeed
     if (replay && model.snapshot_id === snapshotId && snapshot.model_snapshots.length) {
@@ -85,7 +87,7 @@ export function modelSnapshotProvider(mlClusterClient: ILegacyScopedClusterClien
             end_time: s.end,
           })),
         };
-        const cm = new CalendarManager(mlClusterClient);
+        const cm = new CalendarManager(client);
         await cm.newCalendar(calendar);
       }
 
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
index ca3e0cef21049a..6b9f30b2ae00bb 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/examples.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { chunk } from 'lodash';
 import { SearchResponse } from 'elasticsearch';
 import { CATEGORY_EXAMPLES_SAMPLE_SIZE } from '../../../../../common/constants/categorization_job';
@@ -18,9 +18,9 @@ import { ValidationResults } from './validation_results';
 const CHUNK_SIZE = 100;
 
 export function categorizationExamplesProvider({
-  callAsCurrentUser,
-  callAsInternalUser,
-}: ILegacyScopedClusterClient) {
+  asCurrentUser,
+  asInternalUser,
+}: IScopedClusterClient) {
   const validationResults = new ValidationResults();
 
   async function categorizationExamples(
@@ -57,7 +57,7 @@ export function categorizationExamplesProvider({
       }
     }
 
-    const results: SearchResponse<{ [id: string]: string }> = await callAsCurrentUser('search', {
+    const { body } = await asCurrentUser.search<SearchResponse<{ [id: string]: string }>>({
       index: indexPatternTitle,
       size,
       body: {
@@ -67,7 +67,7 @@ export function categorizationExamplesProvider({
       },
     });
 
-    const tempExamples = results.hits.hits.map(({ _source }) => _source[categorizationFieldName]);
+    const tempExamples = body.hits.hits.map(({ _source }) => _source[categorizationFieldName]);
 
     validationResults.createNullValueResult(tempExamples);
 
@@ -112,7 +112,9 @@ export function categorizationExamplesProvider({
   }
 
   async function loadTokens(examples: string[], analyzer: CategorizationAnalyzer) {
-    const { tokens }: { tokens: Token[] } = await callAsInternalUser('indices.analyze', {
+    const {
+      body: { tokens },
+    } = await asInternalUser.indices.analyze<{ tokens: Token[] }>({
       body: {
         ...getAnalyzer(analyzer),
         text: examples,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts
index 5ade86806f3839..347afec8ef73cc 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/top_categories.ts
@@ -5,13 +5,13 @@
  */
 
 import { SearchResponse } from 'elasticsearch';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../../../common/constants/index_patterns';
 import { CategoryId, Category } from '../../../../../common/types/categories';
 
-export function topCategoriesProvider({ callAsInternalUser }: ILegacyScopedClusterClient) {
-  async function getTotalCategories(jobId: string): Promise<{ total: number }> {
-    const totalResp = await callAsInternalUser('search', {
+export function topCategoriesProvider({ asInternalUser }: IScopedClusterClient) {
+  async function getTotalCategories(jobId: string): Promise<number> {
+    const { body } = await asInternalUser.search<SearchResponse<any>>({
       index: ML_RESULTS_INDEX_PATTERN,
       size: 0,
       body: {
@@ -33,11 +33,12 @@ export function topCategoriesProvider({ callAsInternalUser }: ILegacyScopedClust
         },
       },
     });
-    return totalResp?.hits?.total?.value ?? 0;
+    // @ts-ignore total is an object here
+    return body?.hits?.total?.value ?? 0;
   }
 
   async function getTopCategoryCounts(jobId: string, numberOfCategories: number) {
-    const top: SearchResponse<any> = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search<SearchResponse<any>>({
       index: ML_RESULTS_INDEX_PATTERN,
       size: 0,
       body: {
@@ -76,7 +77,7 @@ export function topCategoriesProvider({ callAsInternalUser }: ILegacyScopedClust
     const catCounts: Array<{
       id: CategoryId;
       count: number;
-    }> = top.aggregations?.cat_count?.buckets.map((c: any) => ({
+    }> = body.aggregations?.cat_count?.buckets.map((c: any) => ({
       id: c.key,
       count: c.doc_count,
     }));
@@ -99,7 +100,7 @@ export function topCategoriesProvider({ callAsInternalUser }: ILegacyScopedClust
             field: 'category_id',
           },
         };
-    const result: SearchResponse<any> = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search<SearchResponse<any>>({
       index: ML_RESULTS_INDEX_PATTERN,
       size,
       body: {
@@ -118,7 +119,7 @@ export function topCategoriesProvider({ callAsInternalUser }: ILegacyScopedClust
       },
     });
 
-    return result.hits.hits?.map((c: { _source: Category }) => c._source) || [];
+    return body.hits.hits?.map((c: { _source: Category }) => c._source) || [];
   }
 
   async function topCategories(jobId: string, numberOfCategories: number) {
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/validation_results.ts b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/validation_results.ts
index 4b90283a3a966f..60595ccedff45e 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/categorization/validation_results.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/categorization/validation_results.ts
@@ -144,7 +144,7 @@ export class ValidationResults {
       this.createPrivilegesErrorResult(error);
       return;
     }
-    const message: string = error.message;
+    const message: string = error.body.error?.reason;
     if (message) {
       const rxp = /exceeded the allowed maximum of \[(\d+?)\]/;
       const match = rxp.exec(message);
@@ -170,7 +170,7 @@ export class ValidationResults {
   }
 
   public createPrivilegesErrorResult(error: any) {
-    const message: string = error.message;
+    const message: string = error.body.error?.reason;
     if (message) {
       this._results.push({
         id: VALIDATION_RESULT.INSUFFICIENT_PRIVILEGES,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts b/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
index 63ae2c624ac381..da7d8d0577e4e6 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/charts.ts
@@ -4,13 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { newJobLineChartProvider } from './line_chart';
 import { newJobPopulationChartProvider } from './population_chart';
 
-export function newJobChartsProvider(mlClusterClient: ILegacyScopedClusterClient) {
-  const { newJobLineChart } = newJobLineChartProvider(mlClusterClient);
-  const { newJobPopulationChart } = newJobPopulationChartProvider(mlClusterClient);
+export function newJobChartsProvider(client: IScopedClusterClient) {
+  const { newJobLineChart } = newJobLineChartProvider(client);
+  const { newJobPopulationChart } = newJobPopulationChartProvider(client);
 
   return {
     newJobLineChart,
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
index 3080b37867de52..9eea1ea2a28ae9 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/line_chart.ts
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { AggFieldNamePair, EVENT_RATE_FIELD_ID } from '../../../../common/types/fields';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 
@@ -23,7 +23,7 @@ interface ProcessedResults {
   totalResults: number;
 }
 
-export function newJobLineChartProvider({ callAsCurrentUser }: ILegacyScopedClusterClient) {
+export function newJobLineChartProvider({ asCurrentUser }: IScopedClusterClient) {
   async function newJobLineChart(
     indexPatternTitle: string,
     timeField: string,
@@ -47,9 +47,9 @@ export function newJobLineChartProvider({ callAsCurrentUser }: ILegacyScopedClus
       splitFieldValue
     );
 
-    const results = await callAsCurrentUser('search', json);
+    const { body } = await asCurrentUser.search(json);
     return processSearchResults(
-      results,
+      body,
       aggFieldNamePairs.map((af) => af.field)
     );
   }
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
index ab75787a0069f0..567afec8094054 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job/population_chart.ts
@@ -5,7 +5,7 @@
  */
 
 import { get } from 'lodash';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { AggFieldNamePair, EVENT_RATE_FIELD_ID } from '../../../../common/types/fields';
 import { ML_MEDIAN_PERCENTS } from '../../../../common/util/job_utils';
 
@@ -29,7 +29,7 @@ interface ProcessedResults {
   totalResults: number;
 }
 
-export function newJobPopulationChartProvider({ callAsCurrentUser }: ILegacyScopedClusterClient) {
+export function newJobPopulationChartProvider({ asCurrentUser }: IScopedClusterClient) {
   async function newJobPopulationChart(
     indexPatternTitle: string,
     timeField: string,
@@ -51,15 +51,11 @@ export function newJobPopulationChartProvider({ callAsCurrentUser }: ILegacyScop
       splitFieldName
     );
 
-    try {
-      const results = await callAsCurrentUser('search', json);
-      return processSearchResults(
-        results,
-        aggFieldNamePairs.map((af) => af.field)
-      );
-    } catch (error) {
-      return { error };
-    }
+    const { body } = await asCurrentUser.search(json);
+    return processSearchResults(
+      body,
+      aggFieldNamePairs.map((af) => af.field)
+    );
   }
 
   return {
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
index fd20610450cc17..c3b1de64c3eb5e 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/field_service.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { cloneDeep } from 'lodash';
 import { SavedObjectsClientContract } from 'kibana/server';
 import {
@@ -40,35 +40,36 @@ const supportedTypes: string[] = [
 export function fieldServiceProvider(
   indexPattern: string,
   isRollup: boolean,
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract
 ) {
-  return new FieldsService(indexPattern, isRollup, mlClusterClient, savedObjectsClient);
+  return new FieldsService(indexPattern, isRollup, client, savedObjectsClient);
 }
 
 class FieldsService {
   private _indexPattern: string;
   private _isRollup: boolean;
-  private _mlClusterClient: ILegacyScopedClusterClient;
+  private _mlClusterClient: IScopedClusterClient;
   private _savedObjectsClient: SavedObjectsClientContract;
 
   constructor(
     indexPattern: string,
     isRollup: boolean,
-    mlClusterClient: ILegacyScopedClusterClient,
+    client: IScopedClusterClient,
     savedObjectsClient: SavedObjectsClientContract
   ) {
     this._indexPattern = indexPattern;
     this._isRollup = isRollup;
-    this._mlClusterClient = mlClusterClient;
+    this._mlClusterClient = client;
     this._savedObjectsClient = savedObjectsClient;
   }
 
   private async loadFieldCaps(): Promise<any> {
-    return this._mlClusterClient.callAsCurrentUser('fieldCaps', {
+    const { body } = await this._mlClusterClient.asCurrentUser.fieldCaps({
       index: this._indexPattern,
       fields: '*',
     });
+    return body;
   }
 
   // create field object from the results from _field_caps
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
index 38d6481e02a742..891cb2e0d1e64b 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.test.ts
@@ -21,28 +21,23 @@ describe('job_service - job_caps', () => {
   let savedObjectsClientMock: any;
 
   beforeEach(() => {
-    const callAsNonRollupMock = jest.fn((action: string) => {
-      switch (action) {
-        case 'fieldCaps':
-          return farequoteFieldCaps;
-      }
-    });
+    const asNonRollupMock = {
+      fieldCaps: jest.fn(() => ({ body: farequoteFieldCaps })),
+    };
+
     mlClusterClientNonRollupMock = {
-      callAsCurrentUser: callAsNonRollupMock,
-      callAsInternalUser: callAsNonRollupMock,
+      asCurrentUser: asNonRollupMock,
+      asInternalUser: asNonRollupMock,
+    };
+
+    const callAsRollupMock = {
+      fieldCaps: jest.fn(() => ({ body: cloudwatchFieldCaps })),
+      rollup: { getRollupIndexCaps: jest.fn(() => Promise.resolve({ body: rollupCaps })) },
     };
 
-    const callAsRollupMock = jest.fn((action: string) => {
-      switch (action) {
-        case 'fieldCaps':
-          return cloudwatchFieldCaps;
-        case 'ml.rollupIndexCapabilities':
-          return Promise.resolve(rollupCaps);
-      }
-    });
     mlClusterClientRollupMock = {
-      callAsCurrentUser: callAsRollupMock,
-      callAsInternalUser: callAsRollupMock,
+      asCurrentUser: callAsRollupMock,
+      asInternalUser: callAsRollupMock,
     };
 
     savedObjectsClientMock = {
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
index 5616dade53a787..7559111d012d0d 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/new_job_caps.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
+import { IScopedClusterClient, SavedObjectsClientContract } from 'kibana/server';
 import { Aggregation, Field, NewJobCaps } from '../../../../common/types/fields';
 import { fieldServiceProvider } from './field_service';
 
@@ -12,18 +12,13 @@ interface NewJobCapsResponse {
   [indexPattern: string]: NewJobCaps;
 }
 
-export function newJobCapsProvider(mlClusterClient: ILegacyScopedClusterClient) {
+export function newJobCapsProvider(client: IScopedClusterClient) {
   async function newJobCaps(
     indexPattern: string,
     isRollup: boolean = false,
     savedObjectsClient: SavedObjectsClientContract
   ): Promise<NewJobCapsResponse> {
-    const fieldService = fieldServiceProvider(
-      indexPattern,
-      isRollup,
-      mlClusterClient,
-      savedObjectsClient
-    );
+    const fieldService = fieldServiceProvider(indexPattern, isRollup, client, savedObjectsClient);
     const { aggs, fields } = await fieldService.getData();
     convertForStringify(aggs, fields);
 
diff --git a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
index f3a9bd49c27d6e..b7f4c8af62283d 100644
--- a/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
+++ b/x-pack/plugins/ml/server/models/job_service/new_job_caps/rollup.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { SavedObject } from 'kibana/server';
 import { IndexPatternAttributes } from 'src/plugins/data/server';
 import { SavedObjectsClientContract } from 'kibana/server';
@@ -22,7 +22,7 @@ export interface RollupJob {
 
 export async function rollupServiceProvider(
   indexPattern: string,
-  { callAsCurrentUser }: ILegacyScopedClusterClient,
+  { asCurrentUser }: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract
 ) {
   const rollupIndexPatternObject = await loadRollupIndexPattern(indexPattern, savedObjectsClient);
@@ -32,8 +32,8 @@ export async function rollupServiceProvider(
     if (rollupIndexPatternObject !== null) {
       const parsedTypeMetaData = JSON.parse(rollupIndexPatternObject.attributes.typeMeta);
       const rollUpIndex: string = parsedTypeMetaData.params.rollup_index;
-      const rollupCaps = await callAsCurrentUser('ml.rollupIndexCapabilities', {
-        indexPattern: rollUpIndex,
+      const { body: rollupCaps } = await asCurrentUser.rollup.getRollupIndexCaps({
+        index: rollUpIndex,
       });
 
       const indexRollupCaps = rollupCaps[rollUpIndex];
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
index 1c74953e4dda94..810d0ae9dcd871 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.test.ts
@@ -4,48 +4,31 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 import { validateJob, ValidateJobPayload } from './job_validation';
 import { JobValidationMessage } from '../../../common/constants/messages';
 
-const mlClusterClient = ({
-  // mock callAsCurrentUser
-  callAsCurrentUser: (method: string) => {
-    return new Promise((resolve) => {
-      if (method === 'fieldCaps') {
-        resolve({ fields: [] });
-        return;
-      } else if (method === 'ml.info') {
-        resolve({
+const callAs = {
+  fieldCaps: () => Promise.resolve({ body: { fields: [] } }),
+  ml: {
+    info: () =>
+      Promise.resolve({
+        body: {
           limits: {
             effective_max_model_memory_limit: '100MB',
             max_model_memory_limit: '1GB',
           },
-        });
-      }
-      resolve({});
-    }) as Promise<any>;
+        },
+      }),
   },
+  search: () => Promise.resolve({ body: {} }),
+};
 
-  // mock callAsInternalUser
-  callAsInternalUser: (method: string) => {
-    return new Promise((resolve) => {
-      if (method === 'fieldCaps') {
-        resolve({ fields: [] });
-        return;
-      } else if (method === 'ml.info') {
-        resolve({
-          limits: {
-            effective_max_model_memory_limit: '100MB',
-            max_model_memory_limit: '1GB',
-          },
-        });
-      }
-      resolve({});
-    }) as Promise<any>;
-  },
-} as unknown) as ILegacyScopedClusterClient;
+const mlClusterClient = ({
+  asCurrentUser: callAs,
+  asInternalUser: callAs,
+} as unknown) as IScopedClusterClient;
 
 // Note: The tests cast `payload` as any
 // so we can simulate possible runtime payloads
diff --git a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
index 6692ecb22bd9e6..9e272f1f770fcd 100644
--- a/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/job_validation.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import Boom from 'boom';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { TypeOf } from '@kbn/config-schema';
 import { fieldsServiceProvider } from '../fields_service';
 import { renderTemplate } from '../../../common/util/string_utils';
@@ -34,7 +34,7 @@ export type ValidateJobPayload = TypeOf<typeof validateJobSchema>;
  * @kbn/config-schema has checked the payload {@link validateJobSchema}.
  */
 export async function validateJob(
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   payload: ValidateJobPayload,
   kbnVersion = 'current',
   isSecurityDisabled?: boolean
@@ -63,8 +63,8 @@ export async function validateJob(
       // if no duration was part of the request, fall back to finding out
       // the time range of the time field of the index, but also check first
       // if the time field is a valid field of type 'date' using isValidTimeField()
-      if (typeof duration === 'undefined' && (await isValidTimeField(mlClusterClient, job))) {
-        const fs = fieldsServiceProvider(mlClusterClient);
+      if (typeof duration === 'undefined' && (await isValidTimeField(client, job))) {
+        const fs = fieldsServiceProvider(client);
         const index = job.datafeed_config.indices.join(',');
         const timeField = job.data_description.time_field;
         const timeRange = await fs.getTimeFieldRange(index, timeField, job.datafeed_config.query);
@@ -79,24 +79,22 @@ export async function validateJob(
 
       // next run only the cardinality tests to find out if they trigger an error
       // so we can decide later whether certain additional tests should be run
-      const cardinalityMessages = await validateCardinality(mlClusterClient, job);
+      const cardinalityMessages = await validateCardinality(client, job);
       validationMessages.push(...cardinalityMessages);
       const cardinalityError = cardinalityMessages.some((m) => {
         return messages[m.id as MessageId].status === VALIDATION_STATUS.ERROR;
       });
 
       validationMessages.push(
-        ...(await validateBucketSpan(mlClusterClient, job, duration, isSecurityDisabled))
+        ...(await validateBucketSpan(client, job, duration, isSecurityDisabled))
       );
-      validationMessages.push(...(await validateTimeRange(mlClusterClient, job, duration)));
+      validationMessages.push(...(await validateTimeRange(client, job, duration)));
 
       // only run the influencer and model memory limit checks
       // if cardinality checks didn't return a message with an error level
       if (cardinalityError === false) {
         validationMessages.push(...(await validateInfluencers(job)));
-        validationMessages.push(
-          ...(await validateModelMemoryLimit(mlClusterClient, job, duration))
-        );
+        validationMessages.push(...(await validateModelMemoryLimit(client, job, duration)));
       }
     } else {
       validationMessages = basicValidation.messages;
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
index 11f8d8967c4e0b..315ad09176571e 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.js
@@ -45,7 +45,7 @@ const pickBucketSpan = (bucketSpans) => {
   return bucketSpans[i];
 };
 
-export async function validateBucketSpan(mlClusterClient, job, duration) {
+export async function validateBucketSpan(client, job, duration) {
   validateJobObject(job);
 
   // if there is no duration, do not run the estimate test
@@ -117,7 +117,7 @@ export async function validateBucketSpan(mlClusterClient, job, duration) {
   try {
     const estimations = estimatorConfigs.map((data) => {
       return new Promise((resolve) => {
-        estimateBucketSpanFactory(mlClusterClient)(data)
+        estimateBucketSpanFactory(client)(data)
           .then(resolve)
           // this catch gets triggered when the estimation code runs without error
           // but isn't able to come up with a bucket span estimation.
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.test.ts
index f9145ab576d71e..80418d590af764 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_bucket_span.test.ts
@@ -24,12 +24,12 @@ import mockItSearchResponse from './__mocks__/mock_it_search_response.json';
 const mlClusterClientFactory = (mockSearchResponse: any) => {
   const callAs = () => {
     return new Promise((resolve) => {
-      resolve(mockSearchResponse);
+      resolve({ body: mockSearchResponse });
     });
   };
   return {
-    callAsCurrentUser: callAs,
-    callAsInternalUser: callAs,
+    asCurrentUser: callAs,
+    asInternalUser: callAs,
   };
 };
 
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
index 16ee70ad9efde6..1be0751e15f227 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.test.ts
@@ -6,7 +6,7 @@
 
 import cloneDeep from 'lodash/cloneDeep';
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
@@ -24,21 +24,21 @@ const mockResponses = {
 const mlClusterClientFactory = (
   responses: Record<string, any>,
   fail = false
-): ILegacyScopedClusterClient => {
-  const callAs = (requestName: string) => {
-    return new Promise((resolve, reject) => {
-      const response = responses[requestName];
-      if (fail) {
-        reject(response);
-      } else {
-        resolve(response);
-      }
-    }) as Promise<any>;
+): IScopedClusterClient => {
+  const callAs = {
+    search: () => Promise.resolve({ body: responses.search }),
+    fieldCaps: () => Promise.resolve({ body: responses.fieldCaps }),
   };
-  return {
-    callAsCurrentUser: callAs,
-    callAsInternalUser: callAs,
+
+  const callAsFail = {
+    search: () => Promise.reject({ body: {} }),
+    fieldCaps: () => Promise.reject({ body: {} }),
   };
+
+  return ({
+    asCurrentUser: fail === false ? callAs : callAsFail,
+    asInternalUser: fail === false ? callAs : callAsFail,
+  } as unknown) as IScopedClusterClient;
 };
 
 describe('ML - validateCardinality', () => {
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
index 1545c4c0062ec8..c5822b863c83da 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_cardinality.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { DataVisualizer } from '../data_visualizer';
 
 import { validateJobObject } from './validate_job_object';
@@ -43,12 +43,9 @@ type Validator = (obj: {
   messages: Messages;
 }>;
 
-const validateFactory = (
-  mlClusterClient: ILegacyScopedClusterClient,
-  job: CombinedJob
-): Validator => {
-  const { callAsCurrentUser } = mlClusterClient;
-  const dv = new DataVisualizer(mlClusterClient);
+const validateFactory = (client: IScopedClusterClient, job: CombinedJob): Validator => {
+  const { asCurrentUser } = client;
+  const dv = new DataVisualizer(client);
 
   const modelPlotConfigTerms = job?.model_plot_config?.terms ?? '';
   const modelPlotConfigFieldCount =
@@ -77,7 +74,7 @@ const validateFactory = (
         ] as string[];
 
         // use fieldCaps endpoint to get data about whether fields are aggregatable
-        const fieldCaps = await callAsCurrentUser('fieldCaps', {
+        const { body: fieldCaps } = await asCurrentUser.fieldCaps({
           index: job.datafeed_config.indices.join(','),
           fields: uniqueFieldNames,
         });
@@ -154,7 +151,7 @@ const validateFactory = (
 };
 
 export async function validateCardinality(
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   job?: CombinedJob
 ): Promise<Messages> | never {
   const messages: Messages = [];
@@ -174,7 +171,7 @@ export async function validateCardinality(
   }
 
   // validate({ type, isInvalid }) asynchronously returns an array of validation messages
-  const validate = validateFactory(mlClusterClient, job);
+  const validate = validateFactory(client, job);
 
   const modelPlotEnabled = job.model_plot_config?.enabled ?? false;
 
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 6ffb0e320982bc..35792c66e66ece 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
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { CombinedJob, Detector } from '../../../common/types/anomaly_detection_jobs';
-import { ModelMemoryEstimate } from '../calculate_model_memory_limit/calculate_model_memory_limit';
+import { ModelMemoryEstimateResponse } from '../calculate_model_memory_limit/calculate_model_memory_limit';
 import { validateModelMemoryLimit } from './validate_model_memory_limit';
 
 describe('ML - validateModelMemoryLimit', () => {
@@ -65,44 +65,36 @@ describe('ML - validateModelMemoryLimit', () => {
   };
 
   // mock estimate model memory
-  const modelMemoryEstimateResponse: ModelMemoryEstimate = {
+  const modelMemoryEstimateResponse: ModelMemoryEstimateResponse = {
     model_memory_estimate: '40mb',
   };
 
   interface MockAPICallResponse {
-    'ml.estimateModelMemory'?: ModelMemoryEstimate;
+    'ml.estimateModelMemory'?: ModelMemoryEstimateResponse;
   }
 
-  // mock callAsCurrentUser
+  // mock asCurrentUser
   // used in three places:
   // - to retrieve the info endpoint
   // - to search for cardinality of split field
   // - to retrieve field capabilities used in search for split field cardinality
   const getMockMlClusterClient = ({
     'ml.estimateModelMemory': estimateModelMemory,
-  }: MockAPICallResponse = {}): ILegacyScopedClusterClient => {
-    const callAs = (call: string) => {
-      if (typeof call === undefined) {
-        return Promise.reject();
-      }
-
-      let response = {};
-      if (call === 'ml.info') {
-        response = mlInfoResponse;
-      } else if (call === 'search') {
-        response = cardinalitySearchResponse;
-      } else if (call === 'fieldCaps') {
-        response = fieldCapsResponse;
-      } else if (call === 'ml.estimateModelMemory') {
-        response = estimateModelMemory || modelMemoryEstimateResponse;
-      }
-      return Promise.resolve(response);
+  }: MockAPICallResponse = {}): IScopedClusterClient => {
+    const callAs = {
+      ml: {
+        info: () => Promise.resolve({ body: mlInfoResponse }),
+        estimateModelMemory: () =>
+          Promise.resolve({ body: estimateModelMemory || modelMemoryEstimateResponse }),
+      },
+      search: () => Promise.resolve({ body: cardinalitySearchResponse }),
+      fieldCaps: () => Promise.resolve({ body: fieldCapsResponse }),
     };
 
-    return {
-      callAsCurrentUser: callAs,
-      callAsInternalUser: callAs,
-    };
+    return ({
+      asCurrentUser: callAs,
+      asInternalUser: callAs,
+    } as unknown) as IScopedClusterClient;
   };
 
   function getJobConfig(influencers: string[] = [], detectors: Detector[] = []) {
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
index 728342294c4247..9733e17e0f379b 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_model_memory_limit.ts
@@ -5,7 +5,7 @@
  */
 
 import numeral from '@elastic/numeral';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 import { validateJobObject } from './validate_job_object';
 import { calculateModelMemoryLimitProvider } from '../calculate_model_memory_limit';
@@ -16,11 +16,11 @@ import { MlInfoResponse } from '../../../common/types/ml_server_info';
 const MODEL_MEMORY_LIMIT_MINIMUM_BYTES = 1048576;
 
 export async function validateModelMemoryLimit(
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   job: CombinedJob,
   duration?: { start?: number; end?: number }
 ) {
-  const { callAsInternalUser } = mlClusterClient;
+  const { asInternalUser } = client;
   validateJobObject(job);
 
   // retrieve the model memory limit specified by the user in the job config.
@@ -52,12 +52,12 @@ export async function validateModelMemoryLimit(
 
   // retrieve the max_model_memory_limit value from the server
   // this will be unset unless the user has set this on their cluster
-  const info = (await callAsInternalUser('ml.info')) as MlInfoResponse;
-  const maxModelMemoryLimit = info.limits.max_model_memory_limit?.toUpperCase();
-  const effectiveMaxModelMemoryLimit = info.limits.effective_max_model_memory_limit?.toUpperCase();
+  const { body } = await asInternalUser.ml.info<MlInfoResponse>();
+  const maxModelMemoryLimit = body.limits.max_model_memory_limit?.toUpperCase();
+  const effectiveMaxModelMemoryLimit = body.limits.effective_max_model_memory_limit?.toUpperCase();
 
   if (runCalcModelMemoryTest) {
-    const { modelMemoryLimit } = await calculateModelMemoryLimitProvider(mlClusterClient)(
+    const { modelMemoryLimit } = await calculateModelMemoryLimitProvider(client)(
       job.analysis_config,
       job.datafeed_config.indices.join(','),
       job.datafeed_config.query,
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
index a45be189ba3d8f..12458af0521a9a 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.test.ts
@@ -6,7 +6,7 @@
 
 import cloneDeep from 'lodash/cloneDeep';
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
 
@@ -21,16 +21,15 @@ const mockSearchResponse = {
   search: mockTimeRange,
 };
 
-const mlClusterClientFactory = (resp: any): ILegacyScopedClusterClient => {
-  const callAs = (path: string) => {
-    return new Promise((resolve) => {
-      resolve(resp[path]);
-    }) as Promise<any>;
-  };
-  return {
-    callAsCurrentUser: callAs,
-    callAsInternalUser: callAs,
+const mlClusterClientFactory = (response: any): IScopedClusterClient => {
+  const callAs = {
+    fieldCaps: () => Promise.resolve({ body: response.fieldCaps }),
+    search: () => Promise.resolve({ body: response.search }),
   };
+  return ({
+    asCurrentUser: callAs,
+    asInternalUser: callAs,
+  } as unknown) as IScopedClusterClient;
 };
 
 function getMinimalValidJob() {
diff --git a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
index a94ceffa902732..83d9621898f96e 100644
--- a/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
+++ b/x-pack/plugins/ml/server/models/job_validation/validate_time_range.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { ES_FIELD_TYPES } from '../../../../../../src/plugins/data/server';
 import { parseInterval } from '../../../common/util/parse_interval';
 import { CombinedJob } from '../../../common/types/anomaly_detection_jobs';
@@ -26,15 +26,12 @@ const BUCKET_SPAN_COMPARE_FACTOR = 25;
 const MIN_TIME_SPAN_MS = 7200000;
 const MIN_TIME_SPAN_READABLE = '2 hours';
 
-export async function isValidTimeField(
-  { callAsCurrentUser }: ILegacyScopedClusterClient,
-  job: CombinedJob
-) {
+export async function isValidTimeField({ asCurrentUser }: IScopedClusterClient, job: CombinedJob) {
   const index = job.datafeed_config.indices.join(',');
   const timeField = job.data_description.time_field;
 
   // check if time_field is of type 'date' or 'date_nanos'
-  const fieldCaps = await callAsCurrentUser('fieldCaps', {
+  const { body: fieldCaps } = await asCurrentUser.fieldCaps({
     index,
     fields: [timeField],
   });
@@ -47,7 +44,7 @@ export async function isValidTimeField(
 }
 
 export async function validateTimeRange(
-  mlClientCluster: ILegacyScopedClusterClient,
+  mlClientCluster: IScopedClusterClient,
   job: CombinedJob,
   timeRange?: Partial<TimeRange>
 ) {
diff --git a/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts b/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts
index 9c0efe259844c1..76dc68d2b59e3d 100644
--- a/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts
+++ b/x-pack/plugins/ml/server/models/results_service/get_partition_fields_values.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { PARTITION_FIELDS } from '../../../common/constants/anomalies';
 import { PartitionFieldsType } from '../../../common/types/anomalies';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
@@ -74,9 +74,7 @@ function getFieldObject(fieldType: PartitionFieldsType, aggs: any) {
     : {};
 }
 
-export const getPartitionFieldsValuesFactory = ({
-  callAsInternalUser,
-}: ILegacyScopedClusterClient) =>
+export const getPartitionFieldsValuesFactory = ({ asInternalUser }: IScopedClusterClient) =>
   /**
    * Gets the record of partition fields with possible values that fit the provided queries.
    * @param jobId - Job ID
@@ -92,7 +90,7 @@ export const getPartitionFieldsValuesFactory = ({
     earliestMs: number,
     latestMs: number
   ) {
-    const jobsResponse = await callAsInternalUser('ml.jobs', { jobId: [jobId] });
+    const { body: jobsResponse } = await asInternalUser.ml.getJobs({ job_id: jobId });
     if (jobsResponse.count === 0 || jobsResponse.jobs === undefined) {
       throw Boom.notFound(`Job with the id "${jobId}" not found`);
     }
@@ -101,7 +99,7 @@ export const getPartitionFieldsValuesFactory = ({
 
     const isModelPlotEnabled = job?.model_plot_config?.enabled;
 
-    const resp = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search({
       index: ML_RESULTS_INDEX_PATTERN,
       size: 0,
       body: {
@@ -151,7 +149,7 @@ export const getPartitionFieldsValuesFactory = ({
     return PARTITION_FIELDS.reduce((acc, key) => {
       return {
         ...acc,
-        ...getFieldObject(key, resp.aggregations),
+        ...getFieldObject(key, body.aggregations),
       };
     }, {});
   };
diff --git a/x-pack/plugins/ml/server/models/results_service/results_service.ts b/x-pack/plugins/ml/server/models/results_service/results_service.ts
index 7be8bac61e69d1..190b5d99309d7d 100644
--- a/x-pack/plugins/ml/server/models/results_service/results_service.ts
+++ b/x-pack/plugins/ml/server/models/results_service/results_service.ts
@@ -9,7 +9,7 @@ import slice from 'lodash/slice';
 import get from 'lodash/get';
 import moment from 'moment';
 import { SearchResponse } from 'elasticsearch';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import Boom from 'boom';
 import { buildAnomalyTableItems } from './build_anomaly_table_items';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
@@ -40,8 +40,8 @@ interface Influencer {
   fieldValue: any;
 }
 
-export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClient) {
-  const { callAsInternalUser } = mlClusterClient;
+export function resultsServiceProvider(client: IScopedClusterClient) {
+  const { asInternalUser } = client;
   // Obtains data for the anomalies table, aggregating anomalies by day or hour as requested.
   // Return an Object with properties 'anomalies' and 'interval' (interval used to aggregate anomalies,
   // one of day, hour or second. Note 'auto' can be provided as the aggregationInterval in the request,
@@ -144,7 +144,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
       });
     }
 
-    const resp: SearchResponse<any> = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search<SearchResponse<any>>({
       index: ML_RESULTS_INDEX_PATTERN,
       rest_total_hits_as_int: true,
       size: maxRecords,
@@ -178,9 +178,9 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
       anomalies: [],
       interval: 'second',
     };
-    if (resp.hits.total !== 0) {
+    if (body.hits.total !== 0) {
       let records: AnomalyRecordDoc[] = [];
-      resp.hits.hits.forEach((hit) => {
+      body.hits.hits.forEach((hit) => {
         records.push(hit._source);
       });
 
@@ -298,8 +298,8 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
       },
     };
 
-    const resp = await callAsInternalUser('search', query);
-    const maxScore = get(resp, ['aggregations', 'max_score', 'value'], null);
+    const { body } = await asInternalUser.search(query);
+    const maxScore = get(body, ['aggregations', 'max_score', 'value'], null);
 
     return { maxScore };
   }
@@ -336,7 +336,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     // Size of job terms agg, consistent with maximum number of jobs supported by Java endpoints.
     const maxJobs = 10000;
 
-    const resp = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search({
       index: ML_RESULTS_INDEX_PATTERN,
       size: 0,
       body: {
@@ -364,7 +364,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     });
 
     const bucketsByJobId: Array<{ key: string; maxTimestamp: { value?: number } }> = get(
-      resp,
+      body,
       ['aggregations', 'byJobId', 'buckets'],
       []
     );
@@ -380,7 +380,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
   // from the given index and job ID.
   // Returned response consists of a list of examples against category ID.
   async function getCategoryExamples(jobId: string, categoryIds: any, maxExamples: number) {
-    const resp = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search({
       index: ML_RESULTS_INDEX_PATTERN,
       rest_total_hits_as_int: true,
       size: ANOMALIES_TABLE_DEFAULT_QUERY_SIZE, // Matches size of records in anomaly summary table.
@@ -394,8 +394,8 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     });
 
     const examplesByCategoryId: { [key: string]: any } = {};
-    if (resp.hits.total !== 0) {
-      resp.hits.hits.forEach((hit: any) => {
+    if (body.hits.total !== 0) {
+      body.hits.hits.forEach((hit: any) => {
         if (maxExamples) {
           examplesByCategoryId[hit._source.category_id] = slice(
             hit._source.examples,
@@ -415,7 +415,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
   // Returned response contains four properties - categoryId, regex, examples
   // and terms (space delimited String of the common tokens matched in values of the category).
   async function getCategoryDefinition(jobId: string, categoryId: string) {
-    const resp = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search({
       index: ML_RESULTS_INDEX_PATTERN,
       rest_total_hits_as_int: true,
       size: 1,
@@ -429,8 +429,8 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     });
 
     const definition = { categoryId, terms: null, regex: null, examples: [] };
-    if (resp.hits.total !== 0) {
-      const source = resp.hits.hits[0]._source;
+    if (body.hits.total !== 0) {
+      const source = body.hits.hits[0]._source;
       definition.categoryId = source.category_id;
       definition.regex = source.regex;
       definition.terms = source.terms;
@@ -456,7 +456,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
         },
       });
     }
-    const results: SearchResponse<AnomalyCategorizerStatsDoc> = await callAsInternalUser('search', {
+    const { body } = await asInternalUser.search<SearchResponse<AnomalyCategorizerStatsDoc>>({
       index: ML_RESULTS_INDEX_PATTERN,
       body: {
         query: {
@@ -473,7 +473,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
         },
       },
     });
-    return results ? results.hits.hits.map((r) => r._source) : [];
+    return body ? body.hits.hits.map((r) => r._source) : [];
   }
 
   async function getCategoryStoppedPartitions(
@@ -485,15 +485,15 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     };
     // first determine from job config if stop_on_warn is true
     // if false return []
-    const jobConfigResponse: MlJobsResponse = await callAsInternalUser('ml.jobs', {
-      jobId: jobIds,
+    const { body } = await asInternalUser.ml.getJobs<MlJobsResponse>({
+      job_id: jobIds.join(),
     });
 
-    if (!jobConfigResponse || jobConfigResponse.jobs.length < 1) {
+    if (!body || body.jobs.length < 1) {
       throw Boom.notFound(`Unable to find anomaly detector jobs ${jobIds.join(', ')}`);
     }
 
-    const jobIdsWithStopOnWarnSet = jobConfigResponse.jobs
+    const jobIdsWithStopOnWarnSet = body.jobs
       .filter(
         (jobConfig) =>
           jobConfig.analysis_config?.per_partition_categorization?.stop_on_warn === true
@@ -543,7 +543,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
           },
         },
       ];
-      const results: SearchResponse<any> = await callAsInternalUser('search', {
+      const { body: results } = await asInternalUser.search<SearchResponse<any>>({
         index: ML_RESULTS_INDEX_PATTERN,
         size: 0,
         body: {
@@ -594,7 +594,7 @@ export function resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClie
     getCategoryExamples,
     getLatestBucketTimestampByJob,
     getMaxAnomalyScore,
-    getPartitionFieldsValues: getPartitionFieldsValuesFactory(mlClusterClient),
+    getPartitionFieldsValues: getPartitionFieldsValuesFactory(client),
     getCategorizerStats,
     getCategoryStoppedPartitions,
   };
diff --git a/x-pack/plugins/ml/server/plugin.ts b/x-pack/plugins/ml/server/plugin.ts
index 76128341e6ddc8..39672f5b188bcf 100644
--- a/x-pack/plugins/ml/server/plugin.ts
+++ b/x-pack/plugins/ml/server/plugin.ts
@@ -9,18 +9,16 @@ import {
   CoreSetup,
   CoreStart,
   Plugin,
-  ILegacyScopedClusterClient,
   KibanaRequest,
   Logger,
   PluginInitializerContext,
-  ILegacyCustomClusterClient,
   CapabilitiesStart,
+  IClusterClient,
 } from 'kibana/server';
 import { PluginsSetup, RouteInitialization } from './types';
 import { PLUGIN_ID, PLUGIN_ICON } from '../common/constants/app';
 import { MlCapabilities } from '../common/types/capabilities';
 
-import { elasticsearchJsPlugin } from './client/elasticsearch_ml';
 import { initMlTelemetry } from './lib/telemetry';
 import { initMlServerLog } from './client/log';
 import { initSampleDataSets } from './lib/sample_data_sets';
@@ -50,17 +48,7 @@ import { setupCapabilitiesSwitcher } from './lib/capabilities';
 import { registerKibanaSettings } from './lib/register_settings';
 import { inferenceRoutes } from './routes/inference';
 
-declare module 'kibana/server' {
-  interface RequestHandlerContext {
-    [PLUGIN_ID]?: {
-      mlClient: ILegacyScopedClusterClient;
-    };
-  }
-}
-
-export interface MlPluginSetup extends SharedServices {
-  mlClient: ILegacyCustomClusterClient;
-}
+export type MlPluginSetup = SharedServices;
 export type MlPluginStart = void;
 
 export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, PluginsSetup> {
@@ -68,6 +56,7 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
   private version: string;
   private mlLicense: MlServerLicense;
   private capabilities: CapabilitiesStart | null = null;
+  private clusterClient: IClusterClient | null = null;
 
   constructor(ctx: PluginInitializerContext) {
     this.log = ctx.logger.get();
@@ -125,17 +114,6 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
     // initialize capabilities switcher to add license filter to ml capabilities
     setupCapabilitiesSwitcher(coreSetup, plugins.licensing.license$, this.log);
 
-    // Can access via router's handler function 'context' parameter - context.ml.mlClient
-    const mlClient = coreSetup.elasticsearch.legacy.createClient(PLUGIN_ID, {
-      plugins: [elasticsearchJsPlugin],
-    });
-
-    coreSetup.http.registerRouteHandlerContext(PLUGIN_ID, (context, request) => {
-      return {
-        mlClient: mlClient.asScoped(request),
-      };
-    });
-
     const routeInit: RouteInitialization = {
       router: coreSetup.http.createRouter(),
       mlLicense: this.mlLicense,
@@ -176,13 +154,19 @@ export class MlServerPlugin implements Plugin<MlPluginSetup, MlPluginStart, Plug
     inferenceRoutes(routeInit);
 
     return {
-      ...createSharedServices(this.mlLicense, plugins.spaces, plugins.cloud, resolveMlCapabilities),
-      mlClient,
+      ...createSharedServices(
+        this.mlLicense,
+        plugins.spaces,
+        plugins.cloud,
+        resolveMlCapabilities,
+        () => this.clusterClient
+      ),
     };
   }
 
   public start(coreStart: CoreStart): MlPluginStart {
     this.capabilities = coreStart.capabilities;
+    this.clusterClient = coreStart.elasticsearch.client;
   }
 
   public stop() {
diff --git a/x-pack/plugins/ml/server/routes/annotations.ts b/x-pack/plugins/ml/server/routes/annotations.ts
index a6de80bb7e5e26..5c4b36164fbb0c 100644
--- a/x-pack/plugins/ml/server/routes/annotations.ts
+++ b/x-pack/plugins/ml/server/routes/annotations.ts
@@ -58,9 +58,9 @@ export function annotationRoutes(
         tags: ['access:ml:canGetAnnotations'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { getAnnotations } = annotationServiceProvider(legacyClient);
+        const { getAnnotations } = annotationServiceProvider(client);
         const resp = await getAnnotations(request.body);
 
         return response.ok({
@@ -91,14 +91,14 @@ export function annotationRoutes(
         tags: ['access:ml:canCreateAnnotation'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const annotationsFeatureAvailable = await isAnnotationsFeatureAvailable(legacyClient);
+        const annotationsFeatureAvailable = await isAnnotationsFeatureAvailable(client);
         if (annotationsFeatureAvailable === false) {
           throw getAnnotationsFeatureUnavailableErrorMessage();
         }
 
-        const { indexAnnotation } = annotationServiceProvider(legacyClient);
+        const { indexAnnotation } = annotationServiceProvider(client);
 
         const currentUser =
           securityPlugin !== undefined ? securityPlugin.authc.getCurrentUser(request) : {};
@@ -134,15 +134,15 @@ export function annotationRoutes(
         tags: ['access:ml:canDeleteAnnotation'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const annotationsFeatureAvailable = await isAnnotationsFeatureAvailable(legacyClient);
+        const annotationsFeatureAvailable = await isAnnotationsFeatureAvailable(client);
         if (annotationsFeatureAvailable === false) {
           throw getAnnotationsFeatureUnavailableErrorMessage();
         }
 
         const annotationId = request.params.annotationId;
-        const { deleteAnnotation } = annotationServiceProvider(legacyClient);
+        const { deleteAnnotation } = annotationServiceProvider(client);
         const resp = await deleteAnnotation(annotationId);
 
         return response.ok({
diff --git a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
index 0027bec910134d..251e465eafccc8 100644
--- a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
@@ -5,6 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { RequestParams } from '@elastic/elasticsearch';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import {
@@ -20,6 +21,7 @@ import {
   getModelSnapshotsSchema,
   updateModelSnapshotSchema,
 } from './schemas/anomaly_detectors_schema';
+
 /**
  * Routes for the anomaly detectors
  */
@@ -42,11 +44,11 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ response, client }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.jobs');
+        const { body } = await client.asInternalUser.ml.getJobs();
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -73,12 +75,12 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { jobId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.jobs', { jobId });
+        const { body } = await client.asInternalUser.ml.getJobs({ job_id: jobId });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -104,11 +106,11 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.jobStats');
+        const { body } = await client.asInternalUser.ml.getJobStats();
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -135,12 +137,12 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { jobId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.jobStats', { jobId });
+        const { body } = await client.asInternalUser.ml.getJobStats({ job_id: jobId });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -171,15 +173,15 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { jobId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.addJob', {
-          jobId,
+        const { body } = await client.asInternalUser.ml.putJob({
+          job_id: jobId,
           body: request.body,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -208,15 +210,15 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canUpdateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { jobId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.updateJob', {
-          jobId,
+        const { body } = await client.asInternalUser.ml.updateJob({
+          job_id: jobId,
           body: request.body,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -243,14 +245,12 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canOpenJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { jobId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.openJob', {
-          jobId,
-        });
+        const { body } = await client.asInternalUser.ml.openJob({ job_id: jobId });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -277,18 +277,18 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCloseJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const options: { jobId: string; force?: boolean } = {
-          jobId: request.params.jobId,
+        const options: RequestParams.MlCloseJob = {
+          job_id: request.params.jobId,
         };
         const force = request.query.force;
         if (force !== undefined) {
           options.force = force;
         }
-        const results = await legacyClient.callAsInternalUser('ml.closeJob', options);
+        const { body } = await client.asInternalUser.ml.closeJob(options);
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -315,18 +315,19 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canDeleteJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const options: { jobId: string; force?: boolean } = {
-          jobId: request.params.jobId,
+        const options: RequestParams.MlDeleteJob = {
+          job_id: request.params.jobId,
+          wait_for_completion: false,
         };
         const force = request.query.force;
         if (force !== undefined) {
           options.force = force;
         }
-        const results = await legacyClient.callAsInternalUser('ml.deleteJob', options);
+        const { body } = await client.asInternalUser.ml.deleteJob(options);
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -351,13 +352,11 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.validateDetector', {
-          body: request.body,
-        });
+        const { body } = await client.asInternalUser.ml.validateDetector({ body: request.body });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -386,16 +385,16 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canForecastJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const jobId = request.params.jobId;
         const duration = request.body.duration;
-        const results = await legacyClient.callAsInternalUser('ml.forecast', {
-          jobId,
+        const { body } = await client.asInternalUser.ml.forecast({
+          job_id: jobId,
           duration,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -427,14 +426,14 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.records', {
-          jobId: request.params.jobId,
+        const { body } = await client.asInternalUser.ml.getRecords({
+          job_id: request.params.jobId,
           body: request.body,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -466,15 +465,15 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.buckets', {
-          jobId: request.params.jobId,
+        const { body } = await client.asInternalUser.ml.getBuckets({
+          job_id: request.params.jobId,
           timestamp: request.params.timestamp,
           body: request.body,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -506,17 +505,17 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.overallBuckets', {
-          jobId: request.params.jobId,
+        const { body } = await client.asInternalUser.ml.getOverallBuckets({
+          job_id: request.params.jobId,
           top_n: request.body.topN,
           bucket_span: request.body.bucketSpan,
           start: request.body.start,
           end: request.body.end,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -543,14 +542,14 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.categories', {
-          jobId: request.params.jobId,
-          categoryId: request.params.categoryId,
+        const { body } = await client.asInternalUser.ml.getCategories({
+          job_id: request.params.jobId,
+          category_id: request.params.categoryId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -577,13 +576,13 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.modelSnapshots', {
-          jobId: request.params.jobId,
+        const { body } = await client.asInternalUser.ml.getModelSnapshots({
+          job_id: request.params.jobId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -610,14 +609,14 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.modelSnapshots', {
-          jobId: request.params.jobId,
-          snapshotId: request.params.snapshotId,
+        const { body } = await client.asInternalUser.ml.getModelSnapshots({
+          job_id: request.params.jobId,
+          snapshot_id: request.params.snapshotId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -646,15 +645,15 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.updateModelSnapshot', {
-          jobId: request.params.jobId,
-          snapshotId: request.params.snapshotId,
+        const { body } = await client.asInternalUser.ml.updateModelSnapshot({
+          job_id: request.params.jobId,
+          snapshot_id: request.params.snapshotId,
           body: request.body,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -681,14 +680,14 @@ export function jobRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.deleteModelSnapshot', {
-          jobId: request.params.jobId,
-          snapshotId: request.params.snapshotId,
+        const { body } = await client.asInternalUser.ml.deleteModelSnapshot({
+          job_id: request.params.jobId,
+          snapshot_id: request.params.snapshotId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
diff --git a/x-pack/plugins/ml/server/routes/calendars.ts b/x-pack/plugins/ml/server/routes/calendars.ts
index 3beb6e437b2eed..2c95ce6fb59ece 100644
--- a/x-pack/plugins/ml/server/routes/calendars.ts
+++ b/x-pack/plugins/ml/server/routes/calendars.ts
@@ -4,43 +4,39 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import { calendarSchema, calendarIdSchema, calendarIdsSchema } from './schemas/calendars_schema';
 import { CalendarManager, Calendar, FormCalendar } from '../models/calendar';
 
-function getAllCalendars(legacyClient: ILegacyScopedClusterClient) {
-  const cal = new CalendarManager(legacyClient);
+function getAllCalendars(client: IScopedClusterClient) {
+  const cal = new CalendarManager(client);
   return cal.getAllCalendars();
 }
 
-function getCalendar(legacyClient: ILegacyScopedClusterClient, calendarId: string) {
-  const cal = new CalendarManager(legacyClient);
+function getCalendar(client: IScopedClusterClient, calendarId: string) {
+  const cal = new CalendarManager(client);
   return cal.getCalendar(calendarId);
 }
 
-function newCalendar(legacyClient: ILegacyScopedClusterClient, calendar: FormCalendar) {
-  const cal = new CalendarManager(legacyClient);
+function newCalendar(client: IScopedClusterClient, calendar: FormCalendar) {
+  const cal = new CalendarManager(client);
   return cal.newCalendar(calendar);
 }
 
-function updateCalendar(
-  legacyClient: ILegacyScopedClusterClient,
-  calendarId: string,
-  calendar: Calendar
-) {
-  const cal = new CalendarManager(legacyClient);
+function updateCalendar(client: IScopedClusterClient, calendarId: string, calendar: Calendar) {
+  const cal = new CalendarManager(client);
   return cal.updateCalendar(calendarId, calendar);
 }
 
-function deleteCalendar(legacyClient: ILegacyScopedClusterClient, calendarId: string) {
-  const cal = new CalendarManager(legacyClient);
+function deleteCalendar(client: IScopedClusterClient, calendarId: string) {
+  const cal = new CalendarManager(client);
   return cal.deleteCalendar(calendarId);
 }
 
-function getCalendarsByIds(legacyClient: ILegacyScopedClusterClient, calendarIds: string) {
-  const cal = new CalendarManager(legacyClient);
+function getCalendarsByIds(client: IScopedClusterClient, calendarIds: string) {
+  const cal = new CalendarManager(client);
   return cal.getCalendarsByIds(calendarIds);
 }
 
@@ -60,9 +56,9 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetCalendars'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const resp = await getAllCalendars(legacyClient);
+        const resp = await getAllCalendars(client);
 
         return response.ok({
           body: resp,
@@ -92,15 +88,15 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetCalendars'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       let returnValue;
       try {
         const calendarIds = request.params.calendarIds.split(',');
 
         if (calendarIds.length === 1) {
-          returnValue = await getCalendar(legacyClient, calendarIds[0]);
+          returnValue = await getCalendar(client, calendarIds[0]);
         } else {
-          returnValue = await getCalendarsByIds(legacyClient, calendarIds);
+          returnValue = await getCalendarsByIds(client, calendarIds);
         }
 
         return response.ok({
@@ -131,10 +127,10 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateCalendar'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const body = request.body;
-        const resp = await newCalendar(legacyClient, body);
+        const resp = await newCalendar(client, body);
 
         return response.ok({
           body: resp,
@@ -166,11 +162,11 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateCalendar'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { calendarId } = request.params;
         const body = request.body;
-        const resp = await updateCalendar(legacyClient, calendarId, body);
+        const resp = await updateCalendar(client, calendarId, body);
 
         return response.ok({
           body: resp,
@@ -200,10 +196,10 @@ export function calendars({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canDeleteCalendar'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { calendarId } = request.params;
-        const resp = await deleteCalendar(legacyClient, calendarId);
+        const resp = await deleteCalendar(client, calendarId);
 
         return response.ok({
           body: resp,
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 75d48056cf4584..dea4803e8275e9 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandlerContext, ILegacyScopedClusterClient } from 'kibana/server';
+import { RequestHandlerContext, IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { analyticsAuditMessagesProvider } from '../models/data_frame_analytics/analytics_audit_messages';
 import { RouteInitialization } from '../types';
@@ -36,13 +36,14 @@ function deleteDestIndexPatternById(context: RequestHandlerContext, indexPattern
  */
 export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitialization) {
   async function userCanDeleteIndex(
-    legacyClient: ILegacyScopedClusterClient,
+    client: IScopedClusterClient,
     destinationIndex: string
   ): Promise<boolean> {
     if (!mlLicense.isSecurityEnabled()) {
       return true;
     }
-    const privilege = await legacyClient.callAsCurrentUser('ml.privilegeCheck', {
+
+    const { body } = await client.asCurrentUser.security.hasPrivileges({
       body: {
         index: [
           {
@@ -52,10 +53,8 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         ],
       },
     });
-    if (!privilege) {
-      return false;
-    }
-    return privilege.has_all_requested === true;
+
+    return body?.has_all_requested === true;
   }
 
   /**
@@ -76,11 +75,11 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canGetDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.getDataFrameAnalytics');
+        const { body } = await client.asInternalUser.ml.getDataFrameAnalytics({ size: 1000 });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -107,14 +106,14 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canGetDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { analyticsId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.getDataFrameAnalytics', {
-          analyticsId,
+        const { body } = await client.asInternalUser.ml.getDataFrameAnalytics({
+          id: analyticsId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -137,11 +136,11 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canGetDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.getDataFrameAnalyticsStats');
+        const { body } = await client.asInternalUser.ml.getDataFrameAnalyticsStats({ size: 1000 });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -168,14 +167,14 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canGetDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { analyticsId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.getDataFrameAnalyticsStats', {
-          analyticsId,
+        const { body } = await client.asInternalUser.ml.getDataFrameAnalyticsStats({
+          id: analyticsId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -205,16 +204,18 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canCreateDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { analyticsId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.createDataFrameAnalytics', {
-          body: request.body,
-          analyticsId,
-          ...getAuthorizationHeader(request),
-        });
+        const { body } = await client.asInternalUser.ml.putDataFrameAnalytics(
+          {
+            id: analyticsId,
+            body: request.body,
+          },
+          getAuthorizationHeader(request)
+        );
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -241,14 +242,16 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canGetDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.evaluateDataFrameAnalytics', {
-          body: request.body,
-          ...getAuthorizationHeader(request),
-        });
+        const { body } = await client.asInternalUser.ml.evaluateDataFrame(
+          {
+            body: request.body,
+          },
+          getAuthorizationHeader(request)
+        );
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -276,13 +279,13 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canCreateDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const results = await legacyClient.callAsInternalUser('ml.explainDataFrameAnalytics', {
+        const { body } = await client.asInternalUser.ml.explainDataFrameAnalytics({
           body: request.body,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -310,7 +313,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canDeleteDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response, context }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
       try {
         const { analyticsId } = request.params;
         const { deleteDestIndex, deleteDestIndexPattern } = request.query;
@@ -324,11 +327,11 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         // Check if analyticsId is valid and get destination index
         if (deleteDestIndex || deleteDestIndexPattern) {
           try {
-            const dfa = await legacyClient.callAsInternalUser('ml.getDataFrameAnalytics', {
-              analyticsId,
+            const { body } = await client.asInternalUser.ml.getDataFrameAnalytics({
+              id: analyticsId,
             });
-            if (Array.isArray(dfa.data_frame_analytics) && dfa.data_frame_analytics.length > 0) {
-              destinationIndex = dfa.data_frame_analytics[0].dest.index;
+            if (Array.isArray(body.data_frame_analytics) && body.data_frame_analytics.length > 0) {
+              destinationIndex = body.data_frame_analytics[0].dest.index;
             }
           } catch (e) {
             return response.customError(wrapError(e));
@@ -337,11 +340,11 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
           // If user checks box to delete the destinationIndex associated with the job
           if (destinationIndex && deleteDestIndex) {
             // Verify if user has privilege to delete the destination index
-            const userCanDeleteDestIndex = await userCanDeleteIndex(legacyClient, destinationIndex);
+            const userCanDeleteDestIndex = await userCanDeleteIndex(client, destinationIndex);
             // If user does have privilege to delete the index, then delete the index
             if (userCanDeleteDestIndex) {
               try {
-                await legacyClient.callAsCurrentUser('indices.delete', {
+                await client.asCurrentUser.indices.delete({
                   index: destinationIndex,
                 });
                 destIndexDeleted.success = true;
@@ -370,8 +373,8 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         // Delete the data frame analytics
 
         try {
-          await legacyClient.callAsInternalUser('ml.deleteDataFrameAnalytics', {
-            analyticsId,
+          await client.asInternalUser.ml.deleteDataFrameAnalytics({
+            id: analyticsId,
           });
           analyticsJobDeleted.success = true;
         } catch (deleteDFAError) {
@@ -413,14 +416,14 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canStartStopDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { analyticsId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.startDataFrameAnalytics', {
-          analyticsId,
+        const { body } = await client.asInternalUser.ml.startDataFrameAnalytics({
+          id: analyticsId,
         });
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -449,10 +452,10 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canStartStopDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const options: { analyticsId: string; force?: boolean | undefined } = {
-          analyticsId: request.params.analyticsId,
+        const options: { id: string; force?: boolean | undefined } = {
+          id: request.params.analyticsId,
         };
         // @ts-expect-error TODO: update types
         if (request.url?.query?.force !== undefined) {
@@ -460,9 +463,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
           options.force = request.url.query.force;
         }
 
-        const results = await legacyClient.callAsInternalUser('ml.stopDataFrameAnalytics', options);
+        const { body } = await client.asInternalUser.ml.stopDataFrameAnalytics(options);
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -490,16 +493,18 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canCreateDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { analyticsId } = request.params;
-        const results = await legacyClient.callAsInternalUser('ml.updateDataFrameAnalytics', {
-          body: request.body,
-          analyticsId,
-          ...getAuthorizationHeader(request),
-        });
+        const { body } = await client.asInternalUser.ml.updateDataFrameAnalytics(
+          {
+            id: analyticsId,
+            body: request.body,
+          },
+          getAuthorizationHeader(request)
+        );
         return response.ok({
-          body: results,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -526,10 +531,10 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canGetDataFrameAnalytics'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { analyticsId } = request.params;
-        const { getAnalyticsAuditMessages } = analyticsAuditMessagesProvider(legacyClient);
+        const { getAnalyticsAuditMessages } = analyticsAuditMessagesProvider(client);
 
         const results = await getAnalyticsAuditMessages(analyticsId);
         return response.ok({
diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts
index 6355285127f06c..a697fe017f1920 100644
--- a/x-pack/plugins/ml/server/routes/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { DataVisualizer } from '../models/data_visualizer';
 import { Field, HistogramField } from '../models/data_visualizer/data_visualizer';
@@ -17,7 +17,7 @@ import {
 import { RouteInitialization } from '../types';
 
 function getOverallStats(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   indexPatternTitle: string,
   query: object,
   aggregatableFields: string[],
@@ -27,7 +27,7 @@ function getOverallStats(
   earliestMs: number,
   latestMs: number
 ) {
-  const dv = new DataVisualizer(legacyClient);
+  const dv = new DataVisualizer(client);
   return dv.getOverallStats(
     indexPatternTitle,
     query,
@@ -41,7 +41,7 @@ function getOverallStats(
 }
 
 function getStatsForFields(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   indexPatternTitle: string,
   query: any,
   fields: Field[],
@@ -52,7 +52,7 @@ function getStatsForFields(
   interval: number,
   maxExamples: number
 ) {
-  const dv = new DataVisualizer(legacyClient);
+  const dv = new DataVisualizer(client);
   return dv.getStatsForFields(
     indexPatternTitle,
     query,
@@ -67,13 +67,13 @@ function getStatsForFields(
 }
 
 function getHistogramsForFields(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   indexPatternTitle: string,
   query: any,
   fields: HistogramField[],
   samplerShardSize: number
 ) {
-  const dv = new DataVisualizer(legacyClient);
+  const dv = new DataVisualizer(client);
   return dv.getHistogramsForFields(indexPatternTitle, query, fields, samplerShardSize);
 }
 
@@ -104,7 +104,7 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const {
           params: { indexPatternTitle },
@@ -112,7 +112,7 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
         } = request;
 
         const results = await getHistogramsForFields(
-          legacyClient,
+          client,
           indexPatternTitle,
           query,
           fields,
@@ -151,7 +151,7 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const {
           params: { indexPatternTitle },
@@ -168,7 +168,7 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
         } = request;
 
         const results = await getStatsForFields(
-          legacyClient,
+          client,
           indexPatternTitle,
           query,
           fields,
@@ -216,7 +216,7 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const {
           params: { indexPatternTitle },
@@ -232,7 +232,7 @@ export function dataVisualizerRoutes({ router, mlLicense }: RouteInitialization)
         } = request;
 
         const results = await getOverallStats(
-          legacyClient,
+          client,
           indexPatternTitle,
           query,
           aggregatableFields,
diff --git a/x-pack/plugins/ml/server/routes/datafeeds.ts b/x-pack/plugins/ml/server/routes/datafeeds.ts
index 47a9afc2244d96..df2aa9e79d71b2 100644
--- a/x-pack/plugins/ml/server/routes/datafeeds.ts
+++ b/x-pack/plugins/ml/server/routes/datafeeds.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { RequestParams } from '@elastic/elasticsearch';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import {
@@ -33,12 +34,12 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetDatafeeds'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const resp = await legacyClient.callAsInternalUser('ml.datafeeds');
+        const { body } = await client.asInternalUser.ml.getDatafeeds();
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -65,13 +66,13 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetDatafeeds'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
-        const resp = await legacyClient.callAsInternalUser('ml.datafeeds', { datafeedId });
+        const { body } = await client.asInternalUser.ml.getDatafeeds({ datafeed_id: datafeedId });
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -94,12 +95,12 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetDatafeeds'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await legacyClient.callAsInternalUser('ml.datafeedStats');
+        const { body } = await client.asInternalUser.ml.getDatafeedStats();
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -126,15 +127,15 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetDatafeeds'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
-        const resp = await legacyClient.callAsInternalUser('ml.datafeedStats', {
-          datafeedId,
+        const { body } = await client.asInternalUser.ml.getDatafeedStats({
+          datafeed_id: datafeedId,
         });
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -163,17 +164,19 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
-        const resp = await legacyClient.callAsInternalUser('ml.addDatafeed', {
-          datafeedId,
-          body: request.body,
-          ...getAuthorizationHeader(request),
-        });
+        const { body } = await client.asInternalUser.ml.putDatafeed(
+          {
+            datafeed_id: datafeedId,
+            body: request.body,
+          },
+          getAuthorizationHeader(request)
+        );
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -202,17 +205,19 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canUpdateDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
-        const resp = await legacyClient.callAsInternalUser('ml.updateDatafeed', {
-          datafeedId,
-          body: request.body,
-          ...getAuthorizationHeader(request),
-        });
+        const { body } = await client.asInternalUser.ml.updateDatafeed(
+          {
+            datafeed_id: datafeedId,
+            body: request.body,
+          },
+          getAuthorizationHeader(request)
+        );
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -241,20 +246,20 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canDeleteDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const options: { datafeedId: string; force?: boolean } = {
-          datafeedId: request.params.jobId,
+        const options: RequestParams.MlDeleteDatafeed = {
+          datafeed_id: request.params.jobId,
         };
         const force = request.query.force;
         if (force !== undefined) {
           options.force = force;
         }
 
-        const resp = await legacyClient.callAsInternalUser('ml.deleteDatafeed', options);
+        const { body } = await client.asInternalUser.ml.deleteDatafeed(options);
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -283,19 +288,19 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canStartStopDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
         const { start, end } = request.body;
 
-        const resp = await legacyClient.callAsInternalUser('ml.startDatafeed', {
-          datafeedId,
+        const { body } = await client.asInternalUser.ml.startDatafeed({
+          datafeed_id: datafeedId,
           start,
           end,
         });
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -322,16 +327,16 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canStartStopDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
 
-        const resp = await legacyClient.callAsInternalUser('ml.stopDatafeed', {
-          datafeedId,
+        const { body } = await client.asInternalUser.ml.stopDatafeed({
+          datafeed_id: datafeedId,
         });
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -358,16 +363,18 @@ export function dataFeedRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canPreviewDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const datafeedId = request.params.datafeedId;
-        const resp = await legacyClient.callAsInternalUser('ml.datafeedPreview', {
-          datafeedId,
-          ...getAuthorizationHeader(request),
-        });
+        const { body } = await client.asInternalUser.ml.previewDatafeed(
+          {
+            datafeed_id: datafeedId,
+          },
+          getAuthorizationHeader(request)
+        );
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
diff --git a/x-pack/plugins/ml/server/routes/fields_service.ts b/x-pack/plugins/ml/server/routes/fields_service.ts
index 0595b31d5bbbce..e1bd8a5736d828 100644
--- a/x-pack/plugins/ml/server/routes/fields_service.ts
+++ b/x-pack/plugins/ml/server/routes/fields_service.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import {
@@ -13,14 +13,14 @@ import {
 } from './schemas/fields_service_schema';
 import { fieldsServiceProvider } from '../models/fields_service';
 
-function getCardinalityOfFields(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const fs = fieldsServiceProvider(legacyClient);
+function getCardinalityOfFields(client: IScopedClusterClient, payload: any) {
+  const fs = fieldsServiceProvider(client);
   const { index, fieldNames, query, timeFieldName, earliestMs, latestMs } = payload;
   return fs.getCardinalityOfFields(index, fieldNames, query, timeFieldName, earliestMs, latestMs);
 }
 
-function getTimeFieldRange(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const fs = fieldsServiceProvider(legacyClient);
+function getTimeFieldRange(client: IScopedClusterClient, payload: any) {
+  const fs = fieldsServiceProvider(client);
   const { index, timeFieldName, query } = payload;
   return fs.getTimeFieldRange(index, timeFieldName, query);
 }
@@ -50,9 +50,9 @@ export function fieldsService({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getCardinalityOfFields(legacyClient, request.body);
+        const resp = await getCardinalityOfFields(client, request.body);
 
         return response.ok({
           body: resp,
@@ -85,9 +85,9 @@ export function fieldsService({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getTimeFieldRange(legacyClient, request.body);
+        const resp = await getTimeFieldRange(client, request.body);
 
         return response.ok({
           body: resp,
diff --git a/x-pack/plugins/ml/server/routes/file_data_visualizer.ts b/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
index 88949fecbc7df5..4c1ee87e96fc56 100644
--- a/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/file_data_visualizer.ts
@@ -5,7 +5,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { MAX_FILE_SIZE_BYTES } from '../../common/constants/file_datavisualizer';
 import {
   InputOverrides,
@@ -28,17 +28,13 @@ import {
   importFileQuerySchema,
 } from './schemas/file_data_visualizer_schema';
 
-function analyzeFiles(
-  legacyClient: ILegacyScopedClusterClient,
-  data: InputData,
-  overrides: InputOverrides
-) {
-  const { analyzeFile } = fileDataVisualizerProvider(legacyClient);
+function analyzeFiles(client: IScopedClusterClient, data: InputData, overrides: InputOverrides) {
+  const { analyzeFile } = fileDataVisualizerProvider(client);
   return analyzeFile(data, overrides);
 }
 
 function importData(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   id: string,
   index: string,
   settings: Settings,
@@ -46,7 +42,7 @@ function importData(
   ingestPipeline: IngestPipelineWrapper,
   data: InputData
 ) {
-  const { importData: importDataFunc } = importDataProvider(legacyClient);
+  const { importData: importDataFunc } = importDataProvider(client);
   return importDataFunc(id, index, settings, mappings, ingestPipeline, data);
 }
 
@@ -78,9 +74,9 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canFindFileStructure'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const result = await analyzeFiles(legacyClient, request.body, request.query);
+        const result = await analyzeFiles(client, request.body, request.query);
         return response.ok({ body: result });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -113,7 +109,7 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
         tags: ['access:ml:canFindFileStructure'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { id } = request.query;
         const { index, data, settings, mappings, ingestPipeline } = request.body;
@@ -126,7 +122,7 @@ export function fileDataVisualizerRoutes({ router, mlLicense }: RouteInitializat
         }
 
         const result = await importData(
-          legacyClient,
+          client,
           id,
           index,
           settings,
diff --git a/x-pack/plugins/ml/server/routes/filters.ts b/x-pack/plugins/ml/server/routes/filters.ts
index bb4f8a2bebaa98..efb4acfa432f99 100644
--- a/x-pack/plugins/ml/server/routes/filters.ts
+++ b/x-pack/plugins/ml/server/routes/filters.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
 import { createFilterSchema, filterIdSchema, updateFilterSchema } from './schemas/filters_schema';
@@ -12,37 +12,33 @@ import { FilterManager, FormFilter } from '../models/filter';
 
 // TODO - add function for returning a list of just the filter IDs.
 // TODO - add function for returning a list of filter IDs plus item count.
-function getAllFilters(legacyClient: ILegacyScopedClusterClient) {
-  const mgr = new FilterManager(legacyClient);
+function getAllFilters(client: IScopedClusterClient) {
+  const mgr = new FilterManager(client);
   return mgr.getAllFilters();
 }
 
-function getAllFilterStats(legacyClient: ILegacyScopedClusterClient) {
-  const mgr = new FilterManager(legacyClient);
+function getAllFilterStats(client: IScopedClusterClient) {
+  const mgr = new FilterManager(client);
   return mgr.getAllFilterStats();
 }
 
-function getFilter(legacyClient: ILegacyScopedClusterClient, filterId: string) {
-  const mgr = new FilterManager(legacyClient);
+function getFilter(client: IScopedClusterClient, filterId: string) {
+  const mgr = new FilterManager(client);
   return mgr.getFilter(filterId);
 }
 
-function newFilter(legacyClient: ILegacyScopedClusterClient, filter: FormFilter) {
-  const mgr = new FilterManager(legacyClient);
+function newFilter(client: IScopedClusterClient, filter: FormFilter) {
+  const mgr = new FilterManager(client);
   return mgr.newFilter(filter);
 }
 
-function updateFilter(
-  legacyClient: ILegacyScopedClusterClient,
-  filterId: string,
-  filter: FormFilter
-) {
-  const mgr = new FilterManager(legacyClient);
+function updateFilter(client: IScopedClusterClient, filterId: string, filter: FormFilter) {
+  const mgr = new FilterManager(client);
   return mgr.updateFilter(filterId, filter);
 }
 
-function deleteFilter(legacyClient: ILegacyScopedClusterClient, filterId: string) {
-  const mgr = new FilterManager(legacyClient);
+function deleteFilter(client: IScopedClusterClient, filterId: string) {
+  const mgr = new FilterManager(client);
   return mgr.deleteFilter(filterId);
 }
 
@@ -65,9 +61,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetFilters'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const resp = await getAllFilters(legacyClient);
+        const resp = await getAllFilters(client);
 
         return response.ok({
           body: resp,
@@ -100,9 +96,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetFilters'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getFilter(legacyClient, request.params.filterId);
+        const resp = await getFilter(client, request.params.filterId);
         return response.ok({
           body: resp,
         });
@@ -134,10 +130,10 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateFilter'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const body = request.body;
-        const resp = await newFilter(legacyClient, body);
+        const resp = await newFilter(client, body);
 
         return response.ok({
           body: resp,
@@ -172,11 +168,11 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateFilter'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { filterId } = request.params;
         const body = request.body;
-        const resp = await updateFilter(legacyClient, filterId, body);
+        const resp = await updateFilter(client, filterId, body);
 
         return response.ok({
           body: resp,
@@ -206,10 +202,10 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canDeleteFilter'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { filterId } = request.params;
-        const resp = await deleteFilter(legacyClient, filterId);
+        const resp = await deleteFilter(client, filterId);
 
         return response.ok({
           body: resp,
@@ -239,9 +235,9 @@ export function filtersRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetFilters'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const resp = await getAllFilterStats(legacyClient);
+        const resp = await getAllFilterStats(client);
 
         return response.ok({
           body: resp,
diff --git a/x-pack/plugins/ml/server/routes/indices.ts b/x-pack/plugins/ml/server/routes/indices.ts
index 6a759cb97f3086..ee817c492dbd4e 100644
--- a/x-pack/plugins/ml/server/routes/indices.ts
+++ b/x-pack/plugins/ml/server/routes/indices.ts
@@ -31,7 +31,7 @@ export function indicesRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const {
           body: { index, fields: requestFields },
@@ -40,8 +40,8 @@ export function indicesRoutes({ router, mlLicense }: RouteInitialization) {
           requestFields !== undefined && Array.isArray(requestFields)
             ? requestFields.join(',')
             : '*';
-        const result = await legacyClient.callAsCurrentUser('fieldCaps', { index, fields });
-        return response.ok({ body: result });
+        const { body } = await client.asInternalUser.fieldCaps({ index, fields });
+        return response.ok({ body });
       } catch (e) {
         return response.customError(wrapError(e));
       }
diff --git a/x-pack/plugins/ml/server/routes/job_audit_messages.ts b/x-pack/plugins/ml/server/routes/job_audit_messages.ts
index 2313decfabd5b9..0c90081f8e755f 100644
--- a/x-pack/plugins/ml/server/routes/job_audit_messages.ts
+++ b/x-pack/plugins/ml/server/routes/job_audit_messages.ts
@@ -37,9 +37,9 @@ export function jobAuditMessagesRoutes({ router, mlLicense }: RouteInitializatio
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { getJobAuditMessages } = jobAuditMessagesProvider(legacyClient);
+        const { getJobAuditMessages } = jobAuditMessagesProvider(client);
         const { jobId } = request.params;
         const { from } = request.query;
         const resp = await getJobAuditMessages(jobId, from);
@@ -72,9 +72,9 @@ export function jobAuditMessagesRoutes({ router, mlLicense }: RouteInitializatio
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { getJobAuditMessages } = jobAuditMessagesProvider(legacyClient);
+        const { getJobAuditMessages } = jobAuditMessagesProvider(client);
         const { from } = request.query;
         const resp = await getJobAuditMessages(undefined, from);
 
diff --git a/x-pack/plugins/ml/server/routes/job_service.ts b/x-pack/plugins/ml/server/routes/job_service.ts
index 3d560fc857e954..3c7f35b871b101 100644
--- a/x-pack/plugins/ml/server/routes/job_service.ts
+++ b/x-pack/plugins/ml/server/routes/job_service.ts
@@ -48,9 +48,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canStartStopDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { forceStartDatafeeds } = jobServiceProvider(legacyClient);
+        const { forceStartDatafeeds } = jobServiceProvider(client);
         const { datafeedIds, start, end } = request.body;
         const resp = await forceStartDatafeeds(datafeedIds, start, end);
 
@@ -82,9 +82,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canStartStopDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { stopDatafeeds } = jobServiceProvider(legacyClient);
+        const { stopDatafeeds } = jobServiceProvider(client);
         const { datafeedIds } = request.body;
         const resp = await stopDatafeeds(datafeedIds);
 
@@ -116,9 +116,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canDeleteJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { deleteJobs } = jobServiceProvider(legacyClient);
+        const { deleteJobs } = jobServiceProvider(client);
         const { jobIds } = request.body;
         const resp = await deleteJobs(jobIds);
 
@@ -150,9 +150,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCloseJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { closeJobs } = jobServiceProvider(legacyClient);
+        const { closeJobs } = jobServiceProvider(client);
         const { jobIds } = request.body;
         const resp = await closeJobs(jobIds);
 
@@ -184,9 +184,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCloseJob', 'access:ml:canStartStopDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { forceStopAndCloseJob } = jobServiceProvider(legacyClient);
+        const { forceStopAndCloseJob } = jobServiceProvider(client);
         const { jobId } = request.body;
         const resp = await forceStopAndCloseJob(jobId);
 
@@ -223,9 +223,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { jobsSummary } = jobServiceProvider(legacyClient);
+        const { jobsSummary } = jobServiceProvider(client);
         const { jobIds } = request.body;
         const resp = await jobsSummary(jobIds);
 
@@ -257,9 +257,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const { jobsWithTimerange } = jobServiceProvider(legacyClient);
+        const { jobsWithTimerange } = jobServiceProvider(client);
         const resp = await jobsWithTimerange();
 
         return response.ok({
@@ -290,9 +290,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { createFullJobsList } = jobServiceProvider(legacyClient);
+        const { createFullJobsList } = jobServiceProvider(client);
         const { jobIds } = request.body;
         const resp = await createFullJobsList(jobIds);
 
@@ -320,9 +320,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const { getAllGroups } = jobServiceProvider(legacyClient);
+        const { getAllGroups } = jobServiceProvider(client);
         const resp = await getAllGroups();
 
         return response.ok({
@@ -353,9 +353,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canUpdateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { updateGroups } = jobServiceProvider(legacyClient);
+        const { updateGroups } = jobServiceProvider(client);
         const { jobs } = request.body;
         const resp = await updateGroups(jobs);
 
@@ -383,9 +383,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const { deletingJobTasks } = jobServiceProvider(legacyClient);
+        const { deletingJobTasks } = jobServiceProvider(client);
         const resp = await deletingJobTasks();
 
         return response.ok({
@@ -416,9 +416,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { jobsExist } = jobServiceProvider(legacyClient);
+        const { jobsExist } = jobServiceProvider(client);
         const { jobIds } = request.body;
         const resp = await jobsExist(jobIds);
 
@@ -449,12 +449,12 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response, context }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
       try {
         const { indexPattern } = request.params;
         const isRollup = request.query.rollup === 'true';
         const savedObjectsClient = context.core.savedObjects.client;
-        const { newJobCaps } = jobServiceProvider(legacyClient);
+        const { newJobCaps } = jobServiceProvider(client);
         const resp = await newJobCaps(indexPattern, isRollup, savedObjectsClient);
 
         return response.ok({
@@ -485,7 +485,7 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const {
           indexPatternTitle,
@@ -499,7 +499,7 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
           splitFieldValue,
         } = request.body;
 
-        const { newJobLineChart } = jobServiceProvider(legacyClient);
+        const { newJobLineChart } = jobServiceProvider(client);
         const resp = await newJobLineChart(
           indexPatternTitle,
           timeField,
@@ -540,7 +540,7 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const {
           indexPatternTitle,
@@ -553,7 +553,7 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
           splitFieldName,
         } = request.body;
 
-        const { newJobPopulationChart } = jobServiceProvider(legacyClient);
+        const { newJobPopulationChart } = jobServiceProvider(client);
         const resp = await newJobPopulationChart(
           indexPatternTitle,
           timeField,
@@ -589,9 +589,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const { getAllJobAndGroupIds } = jobServiceProvider(legacyClient);
+        const { getAllJobAndGroupIds } = jobServiceProvider(client);
         const resp = await getAllJobAndGroupIds();
 
         return response.ok({
@@ -622,9 +622,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { getLookBackProgress } = jobServiceProvider(legacyClient);
+        const { getLookBackProgress } = jobServiceProvider(client);
         const { jobId, start, end } = request.body;
         const resp = await getLookBackProgress(jobId, start, end);
 
@@ -656,9 +656,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { validateCategoryExamples } = categorizationExamplesProvider(legacyClient);
+        const { validateCategoryExamples } = categorizationExamplesProvider(client);
         const {
           indexPatternTitle,
           timeField,
@@ -709,9 +709,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { topCategories } = jobServiceProvider(legacyClient);
+        const { topCategories } = jobServiceProvider(client);
         const { jobId, count } = request.body;
         const resp = await topCategories(jobId, count);
 
@@ -743,9 +743,9 @@ export function jobServiceRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob', 'access:ml:canStartStopDatafeed'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { revertModelSnapshot } = jobServiceProvider(legacyClient);
+        const { revertModelSnapshot } = jobServiceProvider(client);
         const {
           jobId,
           snapshotId,
diff --git a/x-pack/plugins/ml/server/routes/job_validation.ts b/x-pack/plugins/ml/server/routes/job_validation.ts
index 6da052663a002b..b52043595327be 100644
--- a/x-pack/plugins/ml/server/routes/job_validation.ts
+++ b/x-pack/plugins/ml/server/routes/job_validation.ts
@@ -5,7 +5,7 @@
  */
 
 import Boom from 'boom';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { TypeOf } from '@kbn/config-schema';
 import { AnalysisConfig } from '../../common/types/anomaly_detection_jobs';
 import { wrapError } from '../client/error_wrapper';
@@ -27,12 +27,12 @@ type CalculateModelMemoryLimitPayload = TypeOf<typeof modelMemoryLimitSchema>;
  */
 export function jobValidationRoutes({ router, mlLicense }: RouteInitialization, version: string) {
   function calculateModelMemoryLimit(
-    legacyClient: ILegacyScopedClusterClient,
+    client: IScopedClusterClient,
     payload: CalculateModelMemoryLimitPayload
   ) {
     const { analysisConfig, indexPattern, query, timeFieldName, earliestMs, latestMs } = payload;
 
-    return calculateModelMemoryLimitProvider(legacyClient)(
+    return calculateModelMemoryLimitProvider(client)(
       analysisConfig as AnalysisConfig,
       indexPattern,
       query,
@@ -61,10 +61,10 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         let errorResp;
-        const resp = await estimateBucketSpanFactory(legacyClient)(request.body)
+        const resp = await estimateBucketSpanFactory(client)(request.body)
           // this catch gets triggered when the estimation code runs without error
           // but isn't able to come up with a bucket span estimation.
           // this doesn't return a HTTP error but an object with an error message
@@ -109,9 +109,9 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await calculateModelMemoryLimit(legacyClient, request.body);
+        const resp = await calculateModelMemoryLimit(client, request.body);
 
         return response.ok({
           body: resp,
@@ -141,9 +141,9 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await validateCardinality(legacyClient, request.body);
+        const resp = await validateCardinality(client, request.body);
 
         return response.ok({
           body: resp,
@@ -173,11 +173,11 @@ export function jobValidationRoutes({ router, mlLicense }: RouteInitialization,
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         // version corresponds to the version used in documentation links.
         const resp = await validateJob(
-          legacyClient,
+          client,
           request.body,
           version,
           mlLicense.isSecurityEnabled() === false
diff --git a/x-pack/plugins/ml/server/routes/modules.ts b/x-pack/plugins/ml/server/routes/modules.ts
index 23e37d22130292..72a4c5e428c2b8 100644
--- a/x-pack/plugins/ml/server/routes/modules.ts
+++ b/x-pack/plugins/ml/server/routes/modules.ts
@@ -6,11 +6,7 @@
 
 import { TypeOf } from '@kbn/config-schema';
 
-import {
-  ILegacyScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from 'kibana/server';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
 import { DatafeedOverride, JobOverride } from '../../common/types/modules';
 import { wrapError } from '../client/error_wrapper';
 import { DataRecognizer } from '../models/data_recognizer';
@@ -23,22 +19,22 @@ import {
 import { RouteInitialization } from '../types';
 
 function recognize(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract,
   request: KibanaRequest,
   indexPatternTitle: string
 ) {
-  const dr = new DataRecognizer(legacyClient, savedObjectsClient, request);
+  const dr = new DataRecognizer(client, savedObjectsClient, request);
   return dr.findMatches(indexPatternTitle);
 }
 
 function getModule(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract,
   request: KibanaRequest,
   moduleId: string
 ) {
-  const dr = new DataRecognizer(legacyClient, savedObjectsClient, request);
+  const dr = new DataRecognizer(client, savedObjectsClient, request);
   if (moduleId === undefined) {
     return dr.listModules();
   } else {
@@ -47,7 +43,7 @@ function getModule(
 }
 
 function setup(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract,
   request: KibanaRequest,
   moduleId: string,
@@ -63,7 +59,7 @@ function setup(
   datafeedOverrides?: DatafeedOverride | DatafeedOverride[],
   estimateModelMemory?: boolean
 ) {
-  const dr = new DataRecognizer(legacyClient, savedObjectsClient, request);
+  const dr = new DataRecognizer(client, savedObjectsClient, request);
   return dr.setup(
     moduleId,
     prefix,
@@ -81,12 +77,12 @@ function setup(
 }
 
 function dataRecognizerJobsExist(
-  legacyClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract,
   request: KibanaRequest,
   moduleId: string
 ) {
-  const dr = new DataRecognizer(legacyClient, savedObjectsClient, request);
+  const dr = new DataRecognizer(client, savedObjectsClient, request);
   return dr.dataRecognizerJobsExist(moduleId);
 }
 
@@ -131,11 +127,11 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response, context }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
       try {
         const { indexPatternTitle } = request.params;
         const results = await recognize(
-          legacyClient,
+          client,
           context.core.savedObjects.client,
           request,
           indexPatternTitle
@@ -266,7 +262,7 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response, context }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
       try {
         let { moduleId } = request.params;
         if (moduleId === '') {
@@ -275,7 +271,7 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
           moduleId = undefined;
         }
         const results = await getModule(
-          legacyClient,
+          client,
           context.core.savedObjects.client,
           request,
           moduleId
@@ -439,7 +435,7 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canCreateJob'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response, context }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
       try {
         const { moduleId } = request.params;
 
@@ -458,7 +454,7 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
         } = request.body as TypeOf<typeof setupModuleBodySchema>;
 
         const result = await setup(
-          legacyClient,
+          client,
           context.core.savedObjects.client,
           request,
           moduleId,
@@ -544,11 +540,11 @@ export function dataRecognizer({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response, context }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response, context }) => {
       try {
         const { moduleId } = request.params;
         const result = await dataRecognizerJobsExist(
-          legacyClient,
+          client,
           context.core.savedObjects.client,
           request,
           moduleId
diff --git a/x-pack/plugins/ml/server/routes/notification_settings.ts b/x-pack/plugins/ml/server/routes/notification_settings.ts
index 09c145d6257a85..5bb51bf9e596cc 100644
--- a/x-pack/plugins/ml/server/routes/notification_settings.ts
+++ b/x-pack/plugins/ml/server/routes/notification_settings.ts
@@ -26,16 +26,15 @@ export function notificationRoutes({ router, mlLicense }: RouteInitialization) {
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, response }) => {
       try {
-        const params = {
-          includeDefaults: true,
-          filterPath: '**.xpack.notification',
-        };
-        const resp = await legacyClient.callAsCurrentUser('cluster.getSettings', params);
+        const { body } = await client.asCurrentUser.cluster.getSettings({
+          include_defaults: true,
+          filter_path: '**.xpack.notification',
+        });
 
         return response.ok({
-          body: resp,
+          body,
         });
       } catch (e) {
         return response.customError(wrapError(e));
diff --git a/x-pack/plugins/ml/server/routes/results_service.ts b/x-pack/plugins/ml/server/routes/results_service.ts
index 2af37c17f714a1..4e34320d513339 100644
--- a/x-pack/plugins/ml/server/routes/results_service.ts
+++ b/x-pack/plugins/ml/server/routes/results_service.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
 import { wrapError } from '../client/error_wrapper';
 import { RouteInitialization } from '../types';
@@ -23,8 +23,8 @@ import {
   getCategorizerStoppedPartitionsSchema,
 } from './schemas/results_service_schema';
 
-function getAnomaliesTableData(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const rs = resultsServiceProvider(legacyClient);
+function getAnomaliesTableData(client: IScopedClusterClient, payload: any) {
+  const rs = resultsServiceProvider(client);
   const {
     jobIds,
     criteriaFields,
@@ -53,39 +53,39 @@ function getAnomaliesTableData(legacyClient: ILegacyScopedClusterClient, payload
   );
 }
 
-function getCategoryDefinition(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const rs = resultsServiceProvider(legacyClient);
+function getCategoryDefinition(client: IScopedClusterClient, payload: any) {
+  const rs = resultsServiceProvider(client);
   return rs.getCategoryDefinition(payload.jobId, payload.categoryId);
 }
 
-function getCategoryExamples(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const rs = resultsServiceProvider(legacyClient);
+function getCategoryExamples(client: IScopedClusterClient, payload: any) {
+  const rs = resultsServiceProvider(client);
   const { jobId, categoryIds, maxExamples } = payload;
   return rs.getCategoryExamples(jobId, categoryIds, maxExamples);
 }
 
-function getMaxAnomalyScore(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const rs = resultsServiceProvider(legacyClient);
+function getMaxAnomalyScore(client: IScopedClusterClient, payload: any) {
+  const rs = resultsServiceProvider(client);
   const { jobIds, earliestMs, latestMs } = payload;
   return rs.getMaxAnomalyScore(jobIds, earliestMs, latestMs);
 }
 
-function getPartitionFieldsValues(legacyClient: ILegacyScopedClusterClient, payload: any) {
-  const rs = resultsServiceProvider(legacyClient);
+function getPartitionFieldsValues(client: IScopedClusterClient, payload: any) {
+  const rs = resultsServiceProvider(client);
   const { jobId, searchTerm, criteriaFields, earliestMs, latestMs } = payload;
   return rs.getPartitionFieldsValues(jobId, searchTerm, criteriaFields, earliestMs, latestMs);
 }
 
-function getCategorizerStats(legacyClient: ILegacyScopedClusterClient, params: any, query: any) {
+function getCategorizerStats(client: IScopedClusterClient, params: any, query: any) {
   const { jobId } = params;
   const { partitionByValue } = query;
-  const rs = resultsServiceProvider(legacyClient);
+  const rs = resultsServiceProvider(client);
   return rs.getCategorizerStats(jobId, partitionByValue);
 }
 
-function getCategoryStoppedPartitions(legacyClient: ILegacyScopedClusterClient, payload: any) {
+function getCategoryStoppedPartitions(client: IScopedClusterClient, payload: any) {
   const { jobIds, fieldToBucket } = payload;
-  const rs = resultsServiceProvider(legacyClient);
+  const rs = resultsServiceProvider(client);
   return rs.getCategoryStoppedPartitions(jobIds, fieldToBucket);
 }
 
@@ -112,9 +112,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getAnomaliesTableData(legacyClient, request.body);
+        const resp = await getAnomaliesTableData(client, request.body);
 
         return response.ok({
           body: resp,
@@ -144,9 +144,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getCategoryDefinition(legacyClient, request.body);
+        const resp = await getCategoryDefinition(client, request.body);
 
         return response.ok({
           body: resp,
@@ -176,9 +176,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getMaxAnomalyScore(legacyClient, request.body);
+        const resp = await getMaxAnomalyScore(client, request.body);
 
         return response.ok({
           body: resp,
@@ -208,9 +208,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getCategoryExamples(legacyClient, request.body);
+        const resp = await getCategoryExamples(client, request.body);
 
         return response.ok({
           body: resp,
@@ -240,9 +240,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getPartitionFieldsValues(legacyClient, request.body);
+        const resp = await getPartitionFieldsValues(client, request.body);
 
         return response.ok({
           body: resp,
@@ -269,14 +269,14 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
-      const body = {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
+      const { body } = await client.asInternalUser.search({
         ...request.body,
         index: ML_RESULTS_INDEX_PATTERN,
-      };
+      });
       try {
         return response.ok({
-          body: await legacyClient.callAsInternalUser('search', body),
+          body,
         });
       } catch (error) {
         return response.customError(wrapError(error));
@@ -304,9 +304,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getCategorizerStats(legacyClient, request.params, request.query);
+        const resp = await getCategorizerStats(client, request.params, request.query);
         return response.ok({
           body: resp,
         });
@@ -334,9 +334,9 @@ export function resultsServiceRoutes({ router, mlLicense }: RouteInitialization)
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const resp = await getCategoryStoppedPartitions(legacyClient, request.body);
+        const resp = await getCategoryStoppedPartitions(client, request.body);
         return response.ok({
           body: resp,
         });
diff --git a/x-pack/plugins/ml/server/routes/system.ts b/x-pack/plugins/ml/server/routes/system.ts
index 273b86163245fc..3a66f60943bb39 100644
--- a/x-pack/plugins/ml/server/routes/system.ts
+++ b/x-pack/plugins/ml/server/routes/system.ts
@@ -7,7 +7,7 @@
 import { schema } from '@kbn/config-schema';
 
 import { Request } from 'hapi';
-import { ILegacyScopedClusterClient } from 'kibana/server';
+import { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { mlLog } from '../client/log';
 import { capabilitiesProvider } from '../lib/capabilities';
@@ -21,17 +21,16 @@ export function systemRoutes(
   { router, mlLicense }: RouteInitialization,
   { spaces, cloud, resolveMlCapabilities }: SystemRouteDeps
 ) {
-  async function getNodeCount(legacyClient: ILegacyScopedClusterClient) {
-    const filterPath = 'nodes.*.attributes';
-    const resp = await legacyClient.callAsInternalUser('nodes.info', {
-      filterPath,
+  async function getNodeCount(client: IScopedClusterClient) {
+    const { body } = await client.asInternalUser.nodes.info({
+      filter_path: 'nodes.*.attributes',
     });
 
     let count = 0;
-    if (typeof resp.nodes === 'object') {
-      Object.keys(resp.nodes).forEach((k) => {
-        if (resp.nodes[k].attributes !== undefined) {
-          const maxOpenJobs = resp.nodes[k].attributes['ml.max_open_jobs'];
+    if (typeof body.nodes === 'object') {
+      Object.keys(body.nodes).forEach((k) => {
+        if (body.nodes[k].attributes !== undefined) {
+          const maxOpenJobs = body.nodes[k].attributes['ml.max_open_jobs'];
           if (maxOpenJobs !== null && maxOpenJobs > 0) {
             count++;
           }
@@ -58,15 +57,15 @@ export function systemRoutes(
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const { callAsCurrentUser, callAsInternalUser } = legacyClient;
+        const { asCurrentUser, asInternalUser } = client;
         let upgradeInProgress = false;
         try {
-          const info = await callAsInternalUser('ml.info');
+          const { body } = await asInternalUser.ml.info();
           // if ml indices are currently being migrated, upgrade_mode will be set to true
           // pass this back with the privileges to allow for the disabling of UI controls.
-          upgradeInProgress = info.upgrade_mode === true;
+          upgradeInProgress = body.upgrade_mode === true;
         } catch (error) {
           // if the ml.info check fails, it could be due to the user having insufficient privileges
           // most likely they do not have the ml_user role and therefore will be blocked from using
@@ -90,11 +89,12 @@ export function systemRoutes(
             },
           });
         } else {
-          const body = request.body;
-          const resp = await callAsCurrentUser('ml.privilegeCheck', { body });
-          resp.upgradeInProgress = upgradeInProgress;
+          const { body } = await asCurrentUser.security.hasPrivileges({ body: request.body });
           return response.ok({
-            body: resp,
+            body: {
+              ...body,
+              upgradeInProgress,
+            },
           });
         }
       } catch (error) {
@@ -115,7 +115,7 @@ export function systemRoutes(
       path: '/api/ml/ml_capabilities',
       validate: false,
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         // if spaces is disabled force isMlEnabledInSpace to be true
         const { isMlEnabledInSpace } =
@@ -129,7 +129,7 @@ export function systemRoutes(
         }
 
         const { getCapabilities } = capabilitiesProvider(
-          legacyClient,
+          client,
           mlCapabilities,
           mlLicense,
           isMlEnabledInSpace
@@ -159,10 +159,10 @@ export function systemRoutes(
       },
     },
 
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         return response.ok({
-          body: await getNodeCount(legacyClient),
+          body: await getNodeCount(client),
         });
       } catch (e) {
         return response.customError(wrapError(e));
@@ -185,12 +185,12 @@ export function systemRoutes(
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
-        const info = await legacyClient.callAsInternalUser('ml.info');
+        const { body } = await client.asInternalUser.ml.info();
         const cloudId = cloud && cloud.cloudId;
         return response.ok({
-          body: { ...info, cloudId },
+          body: { ...body, cloudId },
         });
       } catch (error) {
         return response.customError(wrapError(error));
@@ -216,10 +216,11 @@ export function systemRoutes(
         tags: ['access:ml:canGetJobs'],
       },
     },
-    mlLicense.fullLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.fullLicenseAPIGuard(async ({ client, request, response }) => {
       try {
+        const { body } = await client.asCurrentUser.search(request.body);
         return response.ok({
-          body: await legacyClient.callAsCurrentUser('search', request.body),
+          body,
         });
       } catch (error) {
         return response.customError(wrapError(error));
@@ -243,22 +244,21 @@ export function systemRoutes(
         tags: ['access:ml:canAccessML'],
       },
     },
-    mlLicense.basicLicenseAPIGuard(async ({ legacyClient, request, response }) => {
+    mlLicense.basicLicenseAPIGuard(async ({ client, request, response }) => {
       try {
         const { index } = request.body;
 
         const options = {
           index: [index],
           fields: ['*'],
-          ignoreUnavailable: true,
-          allowNoIndices: true,
-          ignore: 404,
+          ignore_unavailable: true,
+          allow_no_indices: true,
         };
 
-        const fieldsResult = await legacyClient.callAsCurrentUser('fieldCaps', options);
+        const { body } = await client.asCurrentUser.fieldCaps(options);
         const result = { exists: false };
 
-        if (Array.isArray(fieldsResult.indices) && fieldsResult.indices.length !== 0) {
+        if (Array.isArray(body.indices) && body.indices.length !== 0) {
           result.exists = true;
         }
 
diff --git a/x-pack/plugins/ml/server/shared_services/errors.ts b/x-pack/plugins/ml/server/shared_services/errors.ts
new file mode 100644
index 00000000000000..f15a85a490a460
--- /dev/null
+++ b/x-pack/plugins/ml/server/shared_services/errors.ts
@@ -0,0 +1,12 @@
+/*
+ * 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 class MLClusterClientUninitialized extends Error {
+  constructor(message?: string) {
+    super(message);
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+}
diff --git a/x-pack/plugins/ml/server/shared_services/license_checks/errors.ts b/x-pack/plugins/ml/server/shared_services/license_checks/errors.ts
new file mode 100644
index 00000000000000..18e7dab43fda7e
--- /dev/null
+++ b/x-pack/plugins/ml/server/shared_services/license_checks/errors.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.
+ */
+
+/* eslint-disable max-classes-per-file */
+
+export class InsufficientFullLicenseError extends Error {
+  constructor(message?: string) {
+    super(message);
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+}
+
+export class InsufficientBasicLicenseError extends Error {
+  constructor(message?: string) {
+    super(message);
+    Object.setPrototypeOf(this, new.target.prototype);
+  }
+}
diff --git a/x-pack/plugins/ml/server/shared_services/license_checks/index.ts b/x-pack/plugins/ml/server/shared_services/license_checks/index.ts
new file mode 100644
index 00000000000000..6b837dadf5c0de
--- /dev/null
+++ b/x-pack/plugins/ml/server/shared_services/license_checks/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 { LicenseCheck, licenseChecks } from './license_checks';
+export { InsufficientBasicLicenseError, InsufficientFullLicenseError } from './errors';
diff --git a/x-pack/plugins/ml/server/shared_services/license_checks.ts b/x-pack/plugins/ml/server/shared_services/license_checks/license_checks.ts
similarity index 66%
rename from x-pack/plugins/ml/server/shared_services/license_checks.ts
rename to x-pack/plugins/ml/server/shared_services/license_checks/license_checks.ts
index 191124ffa5f3af..3d9de1ef70f2d6 100644
--- a/x-pack/plugins/ml/server/shared_services/license_checks.ts
+++ b/x-pack/plugins/ml/server/shared_services/license_checks/license_checks.ts
@@ -4,7 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MlServerLicense } from '../lib/license';
+import { MlServerLicense } from '../../lib/license';
+import { InsufficientFullLicenseError, InsufficientBasicLicenseError } from './errors';
 
 export type LicenseCheck = () => void;
 
@@ -14,12 +15,12 @@ export function licenseChecks(
   return {
     isFullLicense() {
       if (mlLicense.isFullLicense() === false) {
-        throw Error('Platinum, Enterprise or trial license needed');
+        throw new InsufficientFullLicenseError('Platinum, Enterprise or trial license needed');
       }
     },
     isMinimumLicense() {
       if (mlLicense.isMinimumLicense() === false) {
-        throw Error('Basic license needed');
+        throw new InsufficientBasicLicenseError('Basic license needed');
       }
     },
   };
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 603b4fba17adbf..53898cb64d07f6 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
@@ -4,40 +4,33 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient, KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from 'kibana/server';
 import { Job } from '../../../common/types/anomaly_detection_jobs';
-import { SharedServicesChecks } from '../shared_services';
+import { GetGuards } from '../shared_services';
 
 export interface AnomalyDetectorsProvider {
   anomalyDetectorsProvider(
-    mlClusterClient: ILegacyScopedClusterClient,
     request: KibanaRequest
   ): {
     jobs(jobId?: string): Promise<{ count: number; jobs: Job[] }>;
   };
 }
 
-export function getAnomalyDetectorsProvider({
-  isFullLicense,
-  getHasMlCapabilities,
-}: SharedServicesChecks): AnomalyDetectorsProvider {
+export function getAnomalyDetectorsProvider(getGuards: GetGuards): AnomalyDetectorsProvider {
   return {
-    anomalyDetectorsProvider(mlClusterClient: ILegacyScopedClusterClient, request: KibanaRequest) {
-      //  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();
+    anomalyDetectorsProvider(request: KibanaRequest) {
       return {
         async jobs(jobId?: string) {
-          isFullLicense();
-          await hasMlCapabilities(['canGetJobs']);
-          return mlClusterClient.callAsInternalUser(
-            'ml.jobs',
-            jobId !== undefined ? { jobId } : {}
-          );
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canGetJobs'])
+            .ok(async ({ scopedClient }) => {
+              const { body } = await scopedClient.asInternalUser.ml.getJobs<{
+                count: number;
+                jobs: Job[];
+              }>(jobId !== undefined ? { job_id: jobId } : undefined);
+              return body;
+            });
         },
       };
     },
diff --git a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
index c734dcc1583a1b..2897bf08717f85 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/job_service.ts
@@ -4,38 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient, KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from 'kibana/server';
 import { jobServiceProvider } from '../../models/job_service';
-import { SharedServicesChecks } from '../shared_services';
+import { GetGuards } from '../shared_services';
 
 type OrigJobServiceProvider = ReturnType<typeof jobServiceProvider>;
 
 export interface JobServiceProvider {
   jobServiceProvider(
-    mlClusterClient: ILegacyScopedClusterClient,
     request: KibanaRequest
   ): {
     jobsSummary: OrigJobServiceProvider['jobsSummary'];
   };
 }
 
-export function getJobServiceProvider({
-  isFullLicense,
-  getHasMlCapabilities,
-}: SharedServicesChecks): JobServiceProvider {
+export function getJobServiceProvider(getGuards: GetGuards): JobServiceProvider {
   return {
-    jobServiceProvider(mlClusterClient: ILegacyScopedClusterClient, request: KibanaRequest) {
-      // const hasMlCapabilities = getHasMlCapabilities(request);
-      const { jobsSummary } = jobServiceProvider(mlClusterClient);
+    jobServiceProvider(request: KibanaRequest) {
       return {
-        async jobsSummary(...args) {
-          isFullLicense();
-          // Removed while https://github.com/elastic/kibana/issues/64588 exists.
-          // SIEM are calling this endpoint with a dummy request object from their alerting
-          // integration and currently alerting does not supply a request object.
-          // await hasMlCapabilities(['canGetJobs']);
-
-          return jobsSummary(...args);
+        jobsSummary: async (...args) => {
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canGetJobs'])
+            .ok(async ({ scopedClient }) => {
+              const { jobsSummary } = jobServiceProvider(scopedClient);
+              return jobsSummary(...args);
+            });
         },
       };
     },
diff --git a/x-pack/plugins/ml/server/shared_services/providers/modules.ts b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
index fb7d59f9c8218d..a727d96433f1db 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/modules.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/modules.ts
@@ -4,23 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  ILegacyScopedClusterClient,
-  KibanaRequest,
-  SavedObjectsClientContract,
-} from 'kibana/server';
+import { IScopedClusterClient, KibanaRequest, SavedObjectsClientContract } from 'kibana/server';
 import { TypeOf } from '@kbn/config-schema';
 import { DataRecognizer } from '../../models/data_recognizer';
-import { SharedServicesChecks } from '../shared_services';
+import { GetGuards } from '../shared_services';
 import { moduleIdParamSchema, setupModuleBodySchema } from '../../routes/schemas/modules';
-import { HasMlCapabilities } from '../../lib/capabilities';
 
 export type ModuleSetupPayload = TypeOf<typeof moduleIdParamSchema> &
   TypeOf<typeof setupModuleBodySchema>;
 
 export interface ModulesProvider {
   modulesProvider(
-    mlClusterClient: ILegacyScopedClusterClient,
     request: KibanaRequest,
     savedObjectsClient: SavedObjectsClientContract
   ): {
@@ -31,61 +25,58 @@ export interface ModulesProvider {
   };
 }
 
-export function getModulesProvider({
-  isFullLicense,
-  getHasMlCapabilities,
-}: SharedServicesChecks): ModulesProvider {
+export function getModulesProvider(getGuards: GetGuards): ModulesProvider {
   return {
-    modulesProvider(
-      mlClusterClient: ILegacyScopedClusterClient,
-      request: KibanaRequest,
-      savedObjectsClient: SavedObjectsClientContract
-    ) {
-      let hasMlCapabilities: HasMlCapabilities;
-      if (request.params === 'DummyKibanaRequest') {
-        hasMlCapabilities = () => Promise.resolve();
-      } else {
-        hasMlCapabilities = getHasMlCapabilities(request);
-      }
-      const dr = dataRecognizerFactory(mlClusterClient, savedObjectsClient, request);
-
+    modulesProvider(request: KibanaRequest, savedObjectsClient: SavedObjectsClientContract) {
       return {
         async recognize(...args) {
-          isFullLicense();
-          await hasMlCapabilities(['canCreateJob']);
-
-          return dr.findMatches(...args);
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canGetJobs'])
+            .ok(async ({ scopedClient }) => {
+              const dr = dataRecognizerFactory(scopedClient, savedObjectsClient, request);
+              return dr.findMatches(...args);
+            });
         },
         async getModule(moduleId: string) {
-          isFullLicense();
-          await hasMlCapabilities(['canGetJobs']);
-
-          return dr.getModule(moduleId);
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canGetJobs'])
+            .ok(async ({ scopedClient }) => {
+              const dr = dataRecognizerFactory(scopedClient, savedObjectsClient, request);
+              return dr.getModule(moduleId);
+            });
         },
         async listModules() {
-          isFullLicense();
-          await hasMlCapabilities(['canGetJobs']);
-
-          return dr.listModules();
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canGetJobs'])
+            .ok(async ({ scopedClient }) => {
+              const dr = dataRecognizerFactory(scopedClient, savedObjectsClient, request);
+              return dr.listModules();
+            });
         },
         async setup(payload: ModuleSetupPayload) {
-          isFullLicense();
-          await hasMlCapabilities(['canCreateJob']);
-
-          return dr.setup(
-            payload.moduleId,
-            payload.prefix,
-            payload.groups,
-            payload.indexPatternName,
-            payload.query,
-            payload.useDedicatedIndex,
-            payload.startDatafeed,
-            payload.start,
-            payload.end,
-            payload.jobOverrides,
-            payload.datafeedOverrides,
-            payload.estimateModelMemory
-          );
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canCreateJob'])
+            .ok(async ({ scopedClient }) => {
+              const dr = dataRecognizerFactory(scopedClient, savedObjectsClient, request);
+              return dr.setup(
+                payload.moduleId,
+                payload.prefix,
+                payload.groups,
+                payload.indexPatternName,
+                payload.query,
+                payload.useDedicatedIndex,
+                payload.startDatafeed,
+                payload.start,
+                payload.end,
+                payload.jobOverrides,
+                payload.datafeedOverrides,
+                payload.estimateModelMemory
+              );
+            });
         },
       };
     },
@@ -93,9 +84,9 @@ export function getModulesProvider({
 }
 
 function dataRecognizerFactory(
-  mlClusterClient: ILegacyScopedClusterClient,
+  client: IScopedClusterClient,
   savedObjectsClient: SavedObjectsClientContract,
   request: KibanaRequest
 ) {
-  return new DataRecognizer(mlClusterClient, savedObjectsClient, request);
+  return new DataRecognizer(client, savedObjectsClient, request);
 }
diff --git a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
index 6af4eb008567ac..5536765cc376a2 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/results_service.ts
@@ -4,41 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient, KibanaRequest } from 'kibana/server';
+import { KibanaRequest } from 'kibana/server';
 import { resultsServiceProvider } from '../../models/results_service';
-import { SharedServicesChecks } from '../shared_services';
+import { GetGuards } from '../shared_services';
 
 type OrigResultsServiceProvider = ReturnType<typeof resultsServiceProvider>;
 
 export interface ResultsServiceProvider {
   resultsServiceProvider(
-    mlClusterClient: ILegacyScopedClusterClient,
     request: KibanaRequest
   ): {
     getAnomaliesTableData: OrigResultsServiceProvider['getAnomaliesTableData'];
   };
 }
 
-export function getResultsServiceProvider({
-  isFullLicense,
-  getHasMlCapabilities,
-}: SharedServicesChecks): ResultsServiceProvider {
+export function getResultsServiceProvider(getGuards: GetGuards): ResultsServiceProvider {
   return {
-    resultsServiceProvider(mlClusterClient: ILegacyScopedClusterClient, request: KibanaRequest) {
-      //  Uptime 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();
-
-      const { getAnomaliesTableData } = resultsServiceProvider(mlClusterClient);
+    resultsServiceProvider(request: KibanaRequest) {
       return {
         async getAnomaliesTableData(...args) {
-          isFullLicense();
-          await hasMlCapabilities(['canGetJobs']);
-          return getAnomaliesTableData(...args);
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canGetJobs'])
+            .ok(async ({ scopedClient }) => {
+              const { getAnomaliesTableData } = resultsServiceProvider(scopedClient);
+              return getAnomaliesTableData(...args);
+            });
         },
       };
     },
diff --git a/x-pack/plugins/ml/server/shared_services/providers/system.ts b/x-pack/plugins/ml/server/shared_services/providers/system.ts
index d292abc438a2f3..3217ff13787b00 100644
--- a/x-pack/plugins/ml/server/shared_services/providers/system.ts
+++ b/x-pack/plugins/ml/server/shared_services/providers/system.ts
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ILegacyScopedClusterClient, KibanaRequest } from 'kibana/server';
-import { SearchResponse, SearchParams } from 'elasticsearch';
+import { KibanaRequest } from 'kibana/server';
+import { SearchResponse } from 'elasticsearch';
+import { RequestParams } from '@elastic/elasticsearch';
 import { MlServerLicense } from '../../lib/license';
 import { CloudSetup } from '../../../../cloud/server';
 import { spacesUtilsProvider } from '../../lib/spaces_utils';
@@ -14,73 +15,79 @@ import { capabilitiesProvider } from '../../lib/capabilities';
 import { MlInfoResponse } from '../../../common/types/ml_server_info';
 import { ML_RESULTS_INDEX_PATTERN } from '../../../common/constants/index_patterns';
 import { MlCapabilitiesResponse, ResolveMlCapabilities } from '../../../common/types/capabilities';
-import { SharedServicesChecks } from '../shared_services';
+import { GetGuards } from '../shared_services';
 
 export interface MlSystemProvider {
   mlSystemProvider(
-    mlClusterClient: ILegacyScopedClusterClient,
     request: KibanaRequest
   ): {
     mlCapabilities(): Promise<MlCapabilitiesResponse>;
     mlInfo(): Promise<MlInfoResponse>;
-    mlAnomalySearch<T>(searchParams: SearchParams): Promise<SearchResponse<T>>;
+    mlAnomalySearch<T>(searchParams: RequestParams.Search<any>): Promise<SearchResponse<T>>;
   };
 }
 
 export function getMlSystemProvider(
-  { isMinimumLicense, isFullLicense, getHasMlCapabilities }: SharedServicesChecks,
+  getGuards: GetGuards,
   mlLicense: MlServerLicense,
   spaces: SpacesPluginSetup | undefined,
   cloud: CloudSetup | undefined,
   resolveMlCapabilities: ResolveMlCapabilities
 ): MlSystemProvider {
   return {
-    mlSystemProvider(mlClusterClient: ILegacyScopedClusterClient, request: KibanaRequest) {
-      // const hasMlCapabilities = getHasMlCapabilities(request);
-      const { callAsInternalUser } = mlClusterClient;
+    mlSystemProvider(request: KibanaRequest) {
       return {
         async mlCapabilities() {
-          isMinimumLicense();
+          return await getGuards(request)
+            .isMinimumLicense()
+            .ok(async ({ scopedClient }) => {
+              const { isMlEnabledInSpace } =
+                spaces !== undefined
+                  ? spacesUtilsProvider(spaces, request)
+                  : { isMlEnabledInSpace: async () => true };
 
-          const { isMlEnabledInSpace } =
-            spaces !== undefined
-              ? spacesUtilsProvider(spaces, request)
-              : { isMlEnabledInSpace: async () => true };
+              const mlCapabilities = await resolveMlCapabilities(request);
+              if (mlCapabilities === null) {
+                throw new Error('mlCapabilities is not defined');
+              }
 
-          const mlCapabilities = await resolveMlCapabilities(request);
-          if (mlCapabilities === null) {
-            throw new Error('mlCapabilities is not defined');
-          }
-
-          const { getCapabilities } = capabilitiesProvider(
-            mlClusterClient,
-            mlCapabilities,
-            mlLicense,
-            isMlEnabledInSpace
-          );
-          return getCapabilities();
+              const { getCapabilities } = capabilitiesProvider(
+                scopedClient,
+                mlCapabilities,
+                mlLicense,
+                isMlEnabledInSpace
+              );
+              return getCapabilities();
+            });
         },
         async mlInfo(): Promise<MlInfoResponse> {
-          isMinimumLicense();
+          return await getGuards(request)
+            .isMinimumLicense()
+            .ok(async ({ scopedClient }) => {
+              const { asInternalUser } = scopedClient;
 
-          const info = await callAsInternalUser('ml.info');
-          const cloudId = cloud && cloud.cloudId;
-          return {
-            ...info,
-            cloudId,
-          };
+              const { body: info } = await asInternalUser.ml.info<MlInfoResponse>();
+              const cloudId = cloud && cloud.cloudId;
+              return {
+                ...info,
+                cloudId,
+              };
+            });
         },
-        async mlAnomalySearch<T>(searchParams: SearchParams): Promise<SearchResponse<T>> {
-          isFullLicense();
-          // Removed while https://github.com/elastic/kibana/issues/64588 exists.
-          // SIEM are calling this endpoint with a dummy request object from their alerting
-          // integration and currently alerting does not supply a request object.
-          // await hasMlCapabilities(['canAccessML']);
-
-          return callAsInternalUser('search', {
-            ...searchParams,
-            index: ML_RESULTS_INDEX_PATTERN,
-          });
+        async mlAnomalySearch<T>(
+          searchParams: RequestParams.Search<any>
+        ): Promise<SearchResponse<T>> {
+          return await getGuards(request)
+            .isFullLicense()
+            .hasMlCapabilities(['canAccessML'])
+            .ok(async ({ scopedClient }) => {
+              const { asInternalUser } = scopedClient;
+              const { body } = await asInternalUser.search<SearchResponse<T>>({
+                ...searchParams,
+                index: ML_RESULTS_INDEX_PATTERN,
+              });
+              return body;
+            });
         },
       };
     },
diff --git a/x-pack/plugins/ml/server/shared_services/shared_services.ts b/x-pack/plugins/ml/server/shared_services/shared_services.ts
index 3345111fad4ae2..4c568e4515a278 100644
--- a/x-pack/plugins/ml/server/shared_services/shared_services.ts
+++ b/x-pack/plugins/ml/server/shared_services/shared_services.ts
@@ -4,7 +4,11 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaRequest } from 'kibana/server';
+import { IClusterClient, IScopedClusterClient } from 'kibana/server';
+// including KibanaRequest from 'kibana/server' causes an error
+// when being used with instanceof
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaRequest } from '../../.././../../src/core/server/http';
 import { MlServerLicense } from '../lib/license';
 
 import { SpacesPluginSetup } from '../../../spaces/server';
@@ -18,8 +22,9 @@ import {
   AnomalyDetectorsProvider,
   getAnomalyDetectorsProvider,
 } from './providers/anomaly_detectors';
-import { ResolveMlCapabilities } from '../../common/types/capabilities';
+import { ResolveMlCapabilities, MlCapabilitiesKey } from '../../common/types/capabilities';
 import { hasMlCapabilitiesProvider, HasMlCapabilities } from '../lib/capabilities';
+import { MLClusterClientUninitialized } from './errors';
 
 export type SharedServices = JobServiceProvider &
   AnomalyDetectorsProvider &
@@ -27,31 +32,97 @@ export type SharedServices = JobServiceProvider &
   ModulesProvider &
   ResultsServiceProvider;
 
+interface Guards {
+  isMinimumLicense(): Guards;
+  isFullLicense(): Guards;
+  hasMlCapabilities: (caps: MlCapabilitiesKey[]) => Guards;
+  ok(callback: OkCallback): any;
+}
+
+export type GetGuards = (request: KibanaRequest) => Guards;
+
 export interface SharedServicesChecks {
-  isFullLicense(): void;
-  isMinimumLicense(): void;
-  getHasMlCapabilities(request: KibanaRequest): HasMlCapabilities;
+  getGuards(request: KibanaRequest): Guards;
 }
 
+interface OkParams {
+  scopedClient: IScopedClusterClient;
+}
+
+type OkCallback = (okParams: OkParams) => any;
+
 export function createSharedServices(
   mlLicense: MlServerLicense,
   spaces: SpacesPluginSetup | undefined,
   cloud: CloudSetup,
-  resolveMlCapabilities: ResolveMlCapabilities
+  resolveMlCapabilities: ResolveMlCapabilities,
+  getClusterClient: () => IClusterClient | null
 ): SharedServices {
+  const getRequestItems = getRequestItemsProvider(resolveMlCapabilities, getClusterClient);
   const { isFullLicense, isMinimumLicense } = licenseChecks(mlLicense);
-  const getHasMlCapabilities = hasMlCapabilitiesProvider(resolveMlCapabilities);
-  const checks: SharedServicesChecks = {
-    isFullLicense,
-    isMinimumLicense,
-    getHasMlCapabilities,
-  };
+
+  function getGuards(request: KibanaRequest): Guards {
+    const { hasMlCapabilities, scopedClient } = getRequestItems(request);
+    const asyncGuards: Array<Promise<void>> = [];
+
+    const guards: Guards = {
+      isMinimumLicense: () => {
+        isMinimumLicense();
+        return guards;
+      },
+      isFullLicense: () => {
+        isFullLicense();
+        return guards;
+      },
+      hasMlCapabilities: (caps: MlCapabilitiesKey[]) => {
+        asyncGuards.push(hasMlCapabilities(caps));
+        return guards;
+      },
+      async ok(callback: OkCallback) {
+        await Promise.all(asyncGuards);
+        return callback({ scopedClient });
+      },
+    };
+    return guards;
+  }
 
   return {
-    ...getJobServiceProvider(checks),
-    ...getAnomalyDetectorsProvider(checks),
-    ...getModulesProvider(checks),
-    ...getResultsServiceProvider(checks),
-    ...getMlSystemProvider(checks, mlLicense, spaces, cloud, resolveMlCapabilities),
+    ...getJobServiceProvider(getGuards),
+    ...getAnomalyDetectorsProvider(getGuards),
+    ...getModulesProvider(getGuards),
+    ...getResultsServiceProvider(getGuards),
+    ...getMlSystemProvider(getGuards, mlLicense, spaces, cloud, resolveMlCapabilities),
+  };
+}
+
+function getRequestItemsProvider(
+  resolveMlCapabilities: ResolveMlCapabilities,
+  getClusterClient: () => IClusterClient | null
+) {
+  return (request: KibanaRequest) => {
+    const getHasMlCapabilities = hasMlCapabilitiesProvider(resolveMlCapabilities);
+    let hasMlCapabilities: HasMlCapabilities;
+    let scopedClient: IScopedClusterClient;
+    // While https://github.com/elastic/kibana/issues/64588 exists we
+    // will not receive a real request object when being called from an alert.
+    // instead a dummy request object will be supplied
+    const clusterClient = getClusterClient();
+
+    if (clusterClient === null) {
+      throw new MLClusterClientUninitialized(`ML's cluster client has not been initialized`);
+    }
+
+    if (request instanceof KibanaRequest) {
+      hasMlCapabilities = getHasMlCapabilities(request);
+      scopedClient = clusterClient.asScoped(request);
+    } else {
+      hasMlCapabilities = () => Promise.resolve();
+      const { asInternalUser } = clusterClient;
+      scopedClient = {
+        asInternalUser,
+        asCurrentUser: asInternalUser,
+      };
+    }
+    return { hasMlCapabilities, scopedClient };
   };
 }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
index 18a64a12431b8c..bd9bf50688b58a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/find_ml_signals.ts
@@ -6,13 +6,12 @@
 
 import dateMath from '@elastic/datemath';
 
-import { ILegacyScopedClusterClient, KibanaRequest } from '../../../../../../../src/core/server';
+import { KibanaRequest } from '../../../../../../../src/core/server';
 import { MlPluginSetup } from '../../../../../ml/server';
 import { getAnomalies } from '../../machine_learning';
 
 export const findMlSignals = async ({
   ml,
-  clusterClient,
   request,
   jobId,
   anomalyThreshold,
@@ -20,14 +19,13 @@ export const findMlSignals = async ({
   to,
 }: {
   ml: MlPluginSetup;
-  clusterClient: ILegacyScopedClusterClient;
   request: KibanaRequest;
   jobId: string;
   anomalyThreshold: number;
   from: string;
   to: string;
 }) => {
-  const { mlAnomalySearch } = ml.mlSystemProvider(clusterClient, request);
+  const { mlAnomalySearch } = ml.mlSystemProvider(request);
   const params = {
     jobIds: [jobId],
     threshold: anomalyThreshold,
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 c5124edcaf187a..9d688736a98460 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
@@ -185,12 +185,12 @@ export const signalRulesAlertType = ({
             );
           }
 
-          const scopedClusterClient = services.getLegacyScopedClusterClient(ml.mlClient);
           // Using fake KibanaRequest as it is needed to satisfy the ML Services API, but can be empty as it is
           // currently unused by the jobsSummary function.
-          const summaryJobs = await (
-            await ml.jobServiceProvider(scopedClusterClient, ({} as unknown) as KibanaRequest)
-          ).jobsSummary([machineLearningJobId]);
+          const fakeRequest = {} as KibanaRequest;
+          const summaryJobs = await ml
+            .jobServiceProvider(fakeRequest)
+            .jobsSummary([machineLearningJobId]);
           const jobSummary = summaryJobs.find((job) => job.id === machineLearningJobId);
 
           if (jobSummary == null || !isJobStarted(jobSummary.jobState, jobSummary.datafeedState)) {
@@ -207,7 +207,6 @@ export const signalRulesAlertType = ({
 
           const anomalyResults = await findMlSignals({
             ml,
-            clusterClient: scopedClusterClient,
             // Using fake KibanaRequest as it is needed to satisfy the ML Services API, but can be empty as it is
             // currently unused by the mlAnomalySearch function.
             request: ({} as unknown) as KibanaRequest,
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
index 98de9536b1baa3..386eda5281f0c2 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
@@ -114,7 +114,6 @@ export const isMlAdmin = async ({
   request: KibanaRequest;
   ml: MlPluginSetup;
 }): Promise<boolean> => {
-  const scopedMlClient = ml.mlClient.asScoped(request);
-  const mlCapabilities = await ml.mlSystemProvider(scopedMlClient, request).mlCapabilities();
+  const mlCapabilities = await ml.mlSystemProvider(request).mlCapabilities();
   return hasMlAdminPermissions(mlCapabilities);
 };
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
index ad2f1e5a8285c4..c17d9ab1bb46ee 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/index.ts
@@ -4,13 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { SearchResponse, SearchParams } from 'elasticsearch';
+import { SearchResponse } from 'elasticsearch';
+import { RequestParams } from '@elastic/elasticsearch';
 
 import { AnomalyRecordDoc as Anomaly } from '../../../../ml/server';
 
 export { Anomaly };
 export type AnomalyResults = SearchResponse<Anomaly>;
-type MlAnomalySearch = <T>(searchParams: SearchParams) => Promise<SearchResponse<T>>;
+type MlAnomalySearch = <T>(searchParams: RequestParams.Search) => Promise<SearchResponse<T>>;
 
 export interface AnomaliesSearchParams {
   jobIds: string[];
diff --git a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts
index a6d4dc7a38e14a..5cf17af2fa9c0b 100644
--- a/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts
+++ b/x-pack/plugins/security_solution/server/usage/detections/detections_helpers.ts
@@ -172,18 +172,12 @@ export const getMlJobsUsage = async (ml: MlPluginSetup | undefined): Promise<MlJ
 
   if (ml) {
     try {
-      const fakeRequest = { headers: {}, params: 'DummyKibanaRequest' } as KibanaRequest;
+      const fakeRequest = {} as KibanaRequest;
       const fakeSOClient = {} as SavedObjectsClient;
-      const internalMlClient = {
-        callAsCurrentUser: ml?.mlClient.callAsInternalUser,
-        callAsInternalUser: ml?.mlClient.callAsInternalUser,
-      };
-
-      const modules = await ml
-        .modulesProvider(internalMlClient, fakeRequest, fakeSOClient)
-        .listModules();
+
+      const modules = await ml.modulesProvider(fakeRequest, fakeSOClient).listModules();
       const moduleJobs = modules.flatMap((module) => module.jobs);
-      const jobs = await ml.jobServiceProvider(internalMlClient, fakeRequest).jobsSummary();
+      const jobs = await ml.jobServiceProvider(fakeRequest).jobsSummary();
 
       jobsUsage = jobs.filter(isSecurityJob).reduce((usage, job) => {
         const isElastic = moduleJobs.some((moduleJob) => moduleJob.id === job.id);
diff --git a/x-pack/plugins/transform/server/routes/api/field_histograms.ts b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
index f2fd81368ec17c..2642040c4cd0db 100644
--- a/x-pack/plugins/transform/server/routes/api/field_histograms.ts
+++ b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
@@ -34,7 +34,7 @@ export function registerFieldHistogramsRoutes({ router, license }: RouteDependen
 
       try {
         const resp = await getHistogramsForFields(
-          ctx.transform!.dataClient,
+          ctx.core.elasticsearch.client,
           indexPatternTitle,
           query,
           fields,
diff --git a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts b/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
index 9ed453d2862854..568b0873b8dbb8 100644
--- a/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
+++ b/x-pack/plugins/uptime/server/lib/alerts/duration_anomaly.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { KibanaRequest } from 'kibana/server';
 import moment from 'moment';
 import { schema } from '@kbn/config-schema';
-import { ILegacyScopedClusterClient } from 'kibana/server';
 import { updateState } from './common';
 import { ACTION_GROUP_DEFINITIONS } from '../../../common/constants/alerts';
 import { commonStateTranslations, durationAnomalyTranslations } from './translations';
@@ -36,13 +36,11 @@ export const getAnomalySummary = (anomaly: AnomaliesTableRecord, monitorInfo: Pi
 
 const getAnomalies = async (
   plugins: UptimeCorePlugins,
-  mlClusterClient: ILegacyScopedClusterClient,
   params: Record<any, any>,
   lastCheckedAt: string
 ) => {
-  const { getAnomaliesTableData } = plugins.ml.resultsServiceProvider(mlClusterClient, {
-    params: 'DummyKibanaRequest',
-  } as any);
+  const fakeRequest = {} as KibanaRequest;
+  const { getAnomaliesTableData } = plugins.ml.resultsServiceProvider(fakeRequest);
 
   return await getAnomaliesTableData(
     [getMLJobId(params.monitorId)],
@@ -82,23 +80,12 @@ export const durationAnomalyAlertFactory: UptimeAlertTypeFactory = (_server, _li
   producer: 'uptime',
   async executor(options) {
     const {
-      services: {
-        alertInstanceFactory,
-        callCluster,
-        savedObjectsClient,
-        getLegacyScopedClusterClient,
-      },
+      services: { alertInstanceFactory, callCluster, savedObjectsClient },
       state,
       params,
     } = options;
 
-    const { anomalies } =
-      (await getAnomalies(
-        plugins,
-        getLegacyScopedClusterClient(plugins.ml.mlClient),
-        params,
-        state.lastCheckedAt
-      )) ?? {};
+    const { anomalies } = (await getAnomalies(plugins, params, state.lastCheckedAt)) ?? {};
 
     const foundAnomalies = anomalies?.length > 0;
 
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
index f4964308cd8c95..7aa5c180c5a02c 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update.ts
@@ -258,7 +258,7 @@ export default ({ getService }: FtrProviderContext) => {
           description: 'Not found',
         };
         const id = `${jobId}_invalid`;
-        const message = `[resource_not_found_exception] No known data frame analytics with id [${id}]`;
+        const message = 'resource_not_found_exception';
 
         const { body } = await supertest
           .post(`/api/ml/data_frame/analytics/${id}/_update`)
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
index 299f5f93fd2812..a5969bdffbf8a7 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
@@ -60,8 +60,7 @@ export default ({ getService }: FtrProviderContext) => {
       responseBody: {
         statusCode: 404,
         error: 'Not Found',
-        message:
-          '[index_not_found_exception] no such index [ft_farequote_not_exists], with { resource.type="index_or_alias" & resource.id="ft_farequote_not_exists" & index_uuid="_na_" & index="ft_farequote_not_exists" }',
+        message: 'index_not_found_exception',
       },
     },
   };
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
index 5795eac9637b1e..4ec8ae0429a6bb 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
@@ -152,8 +152,7 @@ export default ({ getService }: FtrProviderContext) => {
       responseBody: {
         statusCode: 404,
         error: 'Not Found',
-        message:
-          '[index_not_found_exception] no such index [ft_farequote_not_exists], with { resource.type="index_or_alias" & resource.id="ft_farequote_not_exists" & index_uuid="_na_" & index="ft_farequote_not_exists" }',
+        message: 'index_not_found_exception',
       },
     },
   };
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
index fa83807be161a6..af2c53c5772539 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
@@ -116,8 +116,7 @@ export default ({ getService }: FtrProviderContext) => {
         responseBody: {
           statusCode: 404,
           error: 'Not Found',
-          message:
-            '[index_not_found_exception] no such index [ft_farequote_not_exist], with { resource.type="index_or_alias" & resource.id="ft_farequote_not_exist" & index_uuid="_na_" & index="ft_farequote_not_exist" }',
+          message: 'index_not_found_exception',
         },
       },
     },
diff --git a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
index 627d9454beeb6f..7dbb4a9d03e4f8 100644
--- a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
+++ b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
@@ -78,8 +78,7 @@ export default ({ getService }: FtrProviderContext) => {
         responseBody: {
           statusCode: 404,
           error: 'Not Found',
-          message:
-            '[index_not_found_exception] no such index [ft_ecommerce_not_exist], with { resource.type="index_or_alias" & resource.id="ft_ecommerce_not_exist" & index_uuid="_na_" & index="ft_ecommerce_not_exist" }',
+          message: 'index_not_found_exception',
         },
       },
     },
diff --git a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
index b1c086ddbb456e..6588d4df570b75 100644
--- a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
+++ b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
@@ -81,8 +81,7 @@ export default ({ getService }: FtrProviderContext) => {
         responseBody: {
           statusCode: 404,
           error: 'Not Found',
-          message:
-            '[index_not_found_exception] no such index [ft_ecommerce_not_exist], with { resource.type="index_or_alias" & resource.id="ft_ecommerce_not_exist" & index_uuid="_na_" & index="ft_ecommerce_not_exist" }',
+          message: 'index_not_found_exception',
         },
       },
     },
diff --git a/x-pack/test/api_integration/apis/ml/filters/create_filters.ts b/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
index dfec7798ffc0ce..598fab2cb7fa6d 100644
--- a/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/create_filters.ts
@@ -73,7 +73,7 @@ export default ({ getService }: FtrProviderContext) => {
         responseCode: 400,
         responseBody: {
           error: 'Bad Request',
-          message: 'Invalid filter_id',
+          message: 'status_exception',
         },
       },
     },
diff --git a/x-pack/test/api_integration/apis/ml/filters/get_filters.ts b/x-pack/test/api_integration/apis/ml/filters/get_filters.ts
index 5d7900ea5e9d93..4a3589634ded93 100644
--- a/x-pack/test/api_integration/apis/ml/filters/get_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/get_filters.ts
@@ -91,7 +91,7 @@ export default ({ getService }: FtrProviderContext) => {
         .set(COMMON_REQUEST_HEADERS)
         .expect(400);
       expect(body.error).to.eql('Bad Request');
-      expect(body.message).to.contain('Unable to find filter');
+      expect(body.message).to.contain('resource_not_found_exception');
     });
   });
 };
diff --git a/x-pack/test/api_integration/apis/ml/filters/update_filters.ts b/x-pack/test/api_integration/apis/ml/filters/update_filters.ts
index fbbb94d54c035f..6f421ad120b510 100644
--- a/x-pack/test/api_integration/apis/ml/filters/update_filters.ts
+++ b/x-pack/test/api_integration/apis/ml/filters/update_filters.ts
@@ -111,7 +111,7 @@ export default ({ getService }: FtrProviderContext) => {
         .send(updateFilterRequestBody)
         .expect(400);
 
-      expect(body.message).to.contain('No filter with id');
+      expect(body.message).to.contain('resource_not_found_exception');
     });
   });
 };
diff --git a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
index 5b9c5393e81d91..0b7f9cf927d26b 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/close_jobs.ts
@@ -47,8 +47,8 @@ export default ({ getService }: FtrProviderContext) => {
         responseCode: 200,
 
         responseBody: {
-          [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: false, error: { statusCode: 409 } },
-          [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: false, error: { statusCode: 409 } },
+          [SINGLE_METRIC_JOB_CONFIG.job_id]: { closed: false, error: { status: 409 } },
+          [MULTI_METRIC_JOB_CONFIG.job_id]: { closed: false, error: { status: 409 } },
         },
       },
     },
@@ -162,9 +162,7 @@ export default ({ getService }: FtrProviderContext) => {
 
           expectedRspJobIds.forEach((id) => {
             expect(body[id].closed).to.eql(testData.expected.responseBody[id].closed);
-            expect(body[id].error.statusCode).to.eql(
-              testData.expected.responseBody[id].error.statusCode
-            );
+            expect(body[id].error.status).to.eql(testData.expected.responseBody[id].error.status);
           });
 
           // ensure jobs are still open

From 70cea4871846e5487cd977a13ef6b488e57ecdfa Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Wed, 2 Sep 2020 09:11:05 -0400
Subject: [PATCH 175/216] [ML] DF Analytics jobs list: persist pagination
 through refresh interval (#75996)

* wip: switch analyticsList inMemoryTable to basic and implement search bar

* move basicTable settings to custom hook and update types

* update types

* add types for empty prompt

* ensure sorting works

* add refresh to analytics management list

* ensure table still updates editing job
---
 .../analytics_list/analytics_list.tsx         | 245 ++++++++----------
 .../components/analytics_list/common.ts       |   1 +
 .../analytics_list/empty_prompt.tsx           |  51 ++++
 .../components/analytics_list/use_columns.tsx |   2 -
 .../analytics_list/use_table_settings.ts      | 119 +++++++++
 .../analytics_search_bar.tsx                  | 157 +++++++++++
 .../components/analytics_search_bar/index.ts  |   7 +
 .../components/jobs_list/jobs_list.js         |   2 +-
 8 files changed, 446 insertions(+), 138 deletions(-)
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/empty_prompt.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/analytics_search_bar.tsx
 create mode 100644 x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/index.ts

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
index c4c7a8a4ca11a8..88287b963a0287 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/analytics_list.tsx
@@ -5,17 +5,13 @@
  */
 
 import React, { FC, useCallback, useState, useEffect } from 'react';
-
 import { i18n } from '@kbn/i18n';
-
 import {
-  Direction,
-  EuiButton,
   EuiCallOut,
-  EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiInMemoryTable,
+  EuiBasicTable,
+  EuiSearchBar,
   EuiSearchBarProps,
   EuiSpacer,
 } from '@elastic/eui';
@@ -43,6 +39,39 @@ import {
   getGroupQueryText,
 } from '../../../../../jobs/jobs_list/components/utils';
 import { SourceSelection } from '../source_selection';
+import { filterAnalytics, AnalyticsSearchBar } from '../analytics_search_bar';
+import { AnalyticsEmptyPrompt } from './empty_prompt';
+import { useTableSettings } from './use_table_settings';
+import { RefreshAnalyticsListButton } from '../refresh_analytics_list_button';
+
+const filters: EuiSearchBarProps['filters'] = [
+  {
+    type: 'field_value_selection',
+    field: 'job_type',
+    name: i18n.translate('xpack.ml.dataframe.analyticsList.typeFilter', {
+      defaultMessage: 'Type',
+    }),
+    multiSelect: 'or',
+    options: Object.values(ANALYSIS_CONFIG_TYPE).map((val) => ({
+      value: val,
+      name: val,
+      view: getJobTypeBadge(val),
+    })),
+  },
+  {
+    type: 'field_value_selection',
+    field: 'state',
+    name: i18n.translate('xpack.ml.dataframe.analyticsList.statusFilter', {
+      defaultMessage: 'Status',
+    }),
+    multiSelect: 'or',
+    options: Object.values(DATA_FRAME_TASK_STATE).map((val) => ({
+      value: val,
+      name: val,
+      view: getTaskStateBadge(val),
+    })),
+  },
+];
 
 function getItemIdToExpandedRowMap(
   itemIds: DataFrameAnalyticsId[],
@@ -70,23 +99,23 @@ export const DataFrameAnalyticsList: FC<Props> = ({
   const [isInitialized, setIsInitialized] = useState(false);
   const [isSourceIndexModalVisible, setIsSourceIndexModalVisible] = useState(false);
   const [isLoading, setIsLoading] = useState(false);
-
+  const [filteredAnalytics, setFilteredAnalytics] = useState<{
+    active: boolean;
+    items: DataFrameAnalyticsListRow[];
+  }>({
+    active: false,
+    items: [],
+  });
   const [searchQueryText, setSearchQueryText] = useState('');
-
   const [analytics, setAnalytics] = useState<DataFrameAnalyticsListRow[]>([]);
   const [analyticsStats, setAnalyticsStats] = useState<AnalyticStatsBarStats | undefined>(
     undefined
   );
   const [expandedRowItemIds, setExpandedRowItemIds] = useState<DataFrameAnalyticsId[]>([]);
-
   const [errorMessage, setErrorMessage] = useState<any>(undefined);
-  const [searchError, setSearchError] = useState<any>(undefined);
-
-  const [pageIndex, setPageIndex] = useState(0);
-  const [pageSize, setPageSize] = useState(10);
-
-  const [sortField, setSortField] = useState<string>(DataFrameAnalyticsListColumn.id);
-  const [sortDirection, setSortDirection] = useState<Direction>('asc');
+  // Query text/job_id based on url but only after getAnalytics is done first
+  // selectedJobIdFromUrlInitialized makes sure the query is only run once since analytics is being refreshed constantly
+  const [selectedIdFromUrlInitialized, setSelectedIdFromUrlInitialized] = useState(false);
 
   const disabled =
     !checkPermission('canCreateDataFrameAnalytics') ||
@@ -100,9 +129,29 @@ export const DataFrameAnalyticsList: FC<Props> = ({
     blockRefresh
   );
 
-  // Query text/job_id based on url but only after getAnalytics is done first
-  // selectedJobIdFromUrlInitialized makes sure the query is only run once since analytics is being refreshed constantly
-  const [selectedIdFromUrlInitialized, setSelectedIdFromUrlInitialized] = useState(false);
+  const setQueryClauses = (queryClauses: any) => {
+    if (queryClauses.length) {
+      const filtered = filterAnalytics(analytics, queryClauses);
+      setFilteredAnalytics({ active: true, items: filtered });
+    } else {
+      setFilteredAnalytics({ active: false, items: [] });
+    }
+  };
+
+  const filterList = () => {
+    if (searchQueryText !== '' && selectedIdFromUrlInitialized === true) {
+      // trigger table filtering with query for job id to trigger table filter
+      const query = EuiSearchBar.Query.parse(searchQueryText);
+      let clauses: any = [];
+      if (query && query.ast !== undefined && query.ast.clauses !== undefined) {
+        clauses = query.ast.clauses;
+      }
+      setQueryClauses(clauses);
+    } else {
+      setQueryClauses([]);
+    }
+  };
+
   useEffect(() => {
     if (selectedIdFromUrlInitialized === false && analytics.length > 0) {
       const { jobId, groupIds } = getSelectedIdFromUrl(window.location.href);
@@ -116,9 +165,15 @@ export const DataFrameAnalyticsList: FC<Props> = ({
 
       setSelectedIdFromUrlInitialized(true);
       setSearchQueryText(queryText);
+    } else {
+      filterList();
     }
   }, [selectedIdFromUrlInitialized, analytics]);
 
+  useEffect(() => {
+    filterList();
+  }, [selectedIdFromUrlInitialized, searchQueryText]);
+
   const getAnalyticsCallback = useCallback(() => getAnalytics(true), []);
 
   // Subscribe to the refresh observable to trigger reloading the analytics list.
@@ -137,6 +192,10 @@ export const DataFrameAnalyticsList: FC<Props> = ({
     isMlEnabledInSpace
   );
 
+  const { onTableChange, pageOfItems, pagination, sorting } = useTableSettings(
+    filteredAnalytics.active ? filteredAnalytics.items : analytics
+  );
+
   // Before the analytics have been loaded for the first time, display the loading indicator only.
   // Otherwise a user would see 'No data frame analytics found' during the initial loading.
   if (!isInitialized) {
@@ -160,34 +219,10 @@ export const DataFrameAnalyticsList: FC<Props> = ({
   if (analytics.length === 0) {
     return (
       <>
-        <EuiEmptyPrompt
-          iconType="createAdvancedJob"
-          title={
-            <h2>
-              {i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptTitle', {
-                defaultMessage: 'Create your first data frame analytics job',
-              })}
-            </h2>
-          }
-          actions={
-            !isManagementTable
-              ? [
-                  <EuiButton
-                    onClick={() => setIsSourceIndexModalVisible(true)}
-                    isDisabled={disabled}
-                    color="primary"
-                    iconType="plusInCircle"
-                    fill
-                    data-test-subj="mlAnalyticsCreateFirstButton"
-                  >
-                    {i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptButtonText', {
-                      defaultMessage: 'Create job',
-                    })}
-                  </EuiButton>,
-                ]
-              : []
-          }
-          data-test-subj="mlNoDataFrameAnalyticsFound"
+        <AnalyticsEmptyPrompt
+          isManagementTable={isManagementTable}
+          disabled={disabled}
+          onCreateFirstJobClick={() => setIsSourceIndexModalVisible(true)}
         />
         {isSourceIndexModalVisible === true && (
           <SourceSelection onClose={() => setIsSourceIndexModalVisible(false)} />
@@ -196,95 +231,32 @@ export const DataFrameAnalyticsList: FC<Props> = ({
     );
   }
 
-  const sorting = {
-    sort: {
-      field: sortField,
-      direction: sortDirection,
-    },
-  };
-
   const itemIdToExpandedRowMap = getItemIdToExpandedRowMap(expandedRowItemIds, analytics);
 
-  const pagination = {
-    initialPageIndex: pageIndex,
-    initialPageSize: pageSize,
-    totalItemCount: analytics.length,
-    pageSizeOptions: [10, 20, 50],
-    hidePerPageOptions: false,
-  };
-
-  const handleSearchOnChange: EuiSearchBarProps['onChange'] = (search) => {
-    if (search.error !== null) {
-      setSearchError(search.error.message);
-      return false;
-    }
-
-    setSearchError(undefined);
-    setSearchQueryText(search.queryText);
-    return true;
-  };
-
-  const search: EuiSearchBarProps = {
-    query: searchQueryText,
-    onChange: handleSearchOnChange,
-    box: {
-      incremental: true,
-    },
-    filters: [
-      {
-        type: 'field_value_selection',
-        field: 'job_type',
-        name: i18n.translate('xpack.ml.dataframe.analyticsList.typeFilter', {
-          defaultMessage: 'Type',
-        }),
-        multiSelect: 'or',
-        options: Object.values(ANALYSIS_CONFIG_TYPE).map((val) => ({
-          value: val,
-          name: val,
-          view: getJobTypeBadge(val),
-        })),
-      },
-      {
-        type: 'field_value_selection',
-        field: 'state',
-        name: i18n.translate('xpack.ml.dataframe.analyticsList.statusFilter', {
-          defaultMessage: 'Status',
-        }),
-        multiSelect: 'or',
-        options: Object.values(DATA_FRAME_TASK_STATE).map((val) => ({
-          value: val,
-          name: val,
-          view: getTaskStateBadge(val),
-        })),
-      },
-    ],
-  };
-
-  const onTableChange: EuiInMemoryTable<DataFrameAnalyticsListRow>['onTableChange'] = ({
-    page = { index: 0, size: 10 },
-    sort = { field: DataFrameAnalyticsListColumn.id, direction: 'asc' },
-  }) => {
-    const { index, size } = page;
-    setPageIndex(index);
-    setPageSize(size);
+  const stats = analyticsStats && (
+    <EuiFlexItem grow={false}>
+      <StatsBar stats={analyticsStats} dataTestSub={'mlAnalyticsStatsBar'} />
+    </EuiFlexItem>
+  );
 
-    const { field, direction } = sort;
-    setSortField(field);
-    setSortDirection(direction);
-  };
+  const managementStats = (
+    <EuiFlexItem>
+      <EuiFlexGroup justifyContent="spaceBetween">
+        {stats}
+        <EuiFlexItem grow={false}>
+          <RefreshAnalyticsListButton />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFlexItem>
+  );
 
   return (
     <>
       {modals}
-      <EuiSpacer size="m" />
+      {!isManagementTable && <EuiSpacer size="m" />}
       <EuiFlexGroup justifyContent="spaceBetween">
-        <EuiFlexItem grow={false}>
-          {analyticsStats && (
-            <EuiFlexItem grow={false}>
-              <StatsBar stats={analyticsStats} dataTestSub={'mlAnalyticsStatsBar'} />
-            </EuiFlexItem>
-          )}
-        </EuiFlexItem>
+        {!isManagementTable && stats}
+        {isManagementTable && managementStats}
         <EuiFlexItem grow={false}>
           <EuiFlexGroup alignItems="center" gutterSize="s">
             {!isManagementTable && (
@@ -300,22 +272,25 @@ export const DataFrameAnalyticsList: FC<Props> = ({
       </EuiFlexGroup>
       <EuiSpacer size="m" />
       <div data-test-subj="mlAnalyticsTableContainer">
-        <EuiInMemoryTable
-          allowNeutralSort={false}
+        <AnalyticsSearchBar
+          filters={filters}
+          searchQueryText={searchQueryText}
+          setSearchQueryText={setSearchQueryText}
+        />
+        <EuiSpacer size="l" />
+        <EuiBasicTable<DataFrameAnalyticsListRow>
           className="mlAnalyticsTable"
           columns={columns}
-          error={searchError}
           hasActions={false}
           isExpandable={true}
           isSelectable={false}
-          items={analytics}
+          items={pageOfItems}
           itemId={DataFrameAnalyticsListColumn.id}
           itemIdToExpandedRowMap={itemIdToExpandedRowMap}
           loading={isLoading}
-          onTableChange={onTableChange}
-          pagination={pagination}
+          onChange={onTableChange}
+          pagination={pagination!}
           sorting={sorting}
-          search={search}
           data-test-subj={isLoading ? 'mlAnalyticsTable loading' : 'mlAnalyticsTable loaded'}
           rowProps={(item) => ({
             'data-test-subj': `mlAnalyticsTableRow row-${item.id}`,
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
index 774864ae964a8e..994357412510df 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/common.ts
@@ -26,6 +26,7 @@ export type Clause = Parameters<typeof Query['isMust']>[0];
 type ExtractClauseType<T> = T extends (x: any) => x is infer Type ? Type : never;
 export type TermClause = ExtractClauseType<typeof Ast['Term']['isInstance']>;
 export type FieldClause = ExtractClauseType<typeof Ast['Field']['isInstance']>;
+export type Value = Parameters<typeof Ast['Term']['must']>[0];
 
 interface ProgressSection {
   phase: string;
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/empty_prompt.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/empty_prompt.tsx
new file mode 100644
index 00000000000000..fb173697b45726
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/empty_prompt.tsx
@@ -0,0 +1,51 @@
+/*
+ * 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 { EuiButton, EuiEmptyPrompt } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+interface Props {
+  disabled: boolean;
+  isManagementTable: boolean;
+  onCreateFirstJobClick: () => void;
+}
+
+export const AnalyticsEmptyPrompt: FC<Props> = ({
+  disabled,
+  isManagementTable,
+  onCreateFirstJobClick,
+}) => (
+  <EuiEmptyPrompt
+    iconType="createAdvancedJob"
+    title={
+      <h2>
+        {i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptTitle', {
+          defaultMessage: 'Create your first data frame analytics job',
+        })}
+      </h2>
+    }
+    actions={
+      !isManagementTable
+        ? [
+            <EuiButton
+              onClick={onCreateFirstJobClick}
+              isDisabled={disabled}
+              color="primary"
+              iconType="plusInCircle"
+              fill
+              data-test-subj="mlAnalyticsCreateFirstButton"
+            >
+              {i18n.translate('xpack.ml.dataFrame.analyticsList.emptyPromptButtonText', {
+                defaultMessage: 'Create job',
+              })}
+            </EuiButton>,
+          ]
+        : []
+    }
+    data-test-subj="mlNoDataFrameAnalyticsFound"
+  />
+);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
index 7001681b6917aa..ef1d373a55a124 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_columns.tsx
@@ -23,7 +23,6 @@ import { getJobIdUrl, TAB_IDS } from '../../../../../util/get_selected_ids_url';
 
 import { getAnalysisType, DataFrameAnalyticsId } from '../../../../common';
 import {
-  getDataFrameAnalyticsProgress,
   getDataFrameAnalyticsProgressPhase,
   isDataFrameAnalyticsFailed,
   isDataFrameAnalyticsRunning,
@@ -76,7 +75,6 @@ export const progressColumn = {
   name: i18n.translate('xpack.ml.dataframe.analyticsList.progress', {
     defaultMessage: 'Progress',
   }),
-  sortable: (item: DataFrameAnalyticsListRow) => getDataFrameAnalyticsProgress(item.stats),
   truncateText: true,
   render(item: DataFrameAnalyticsListRow) {
     const { currentPhase, progress, totalPhases } = getDataFrameAnalyticsProgressPhase(item.stats);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts
new file mode 100644
index 00000000000000..57eb9f6857053f
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts
@@ -0,0 +1,119 @@
+/*
+ * 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 } from 'react';
+import { Direction, EuiBasicTableProps, EuiTableSortingType } from '@elastic/eui';
+import sortBy from 'lodash/sortBy';
+import get from 'lodash/get';
+import { DataFrameAnalyticsListColumn, DataFrameAnalyticsListRow } from './common';
+
+const PAGE_SIZE = 10;
+const PAGE_SIZE_OPTIONS = [10, 25, 50];
+
+const jobPropertyMap = {
+  ID: 'id',
+  Status: 'state',
+  Type: 'job_type',
+};
+
+interface AnalyticsBasicTableSettings {
+  pageIndex: number;
+  pageSize: number;
+  totalItemCount: number;
+  hidePerPageOptions: boolean;
+  sortField: string;
+  sortDirection: Direction;
+}
+
+interface UseTableSettingsReturnValue {
+  onTableChange: EuiBasicTableProps<DataFrameAnalyticsListRow>['onChange'];
+  pageOfItems: DataFrameAnalyticsListRow[];
+  pagination: EuiBasicTableProps<DataFrameAnalyticsListRow>['pagination'];
+  sorting: EuiTableSortingType<any>;
+}
+
+export function useTableSettings(items: DataFrameAnalyticsListRow[]): UseTableSettingsReturnValue {
+  const [tableSettings, setTableSettings] = useState<AnalyticsBasicTableSettings>({
+    pageIndex: 0,
+    pageSize: PAGE_SIZE,
+    totalItemCount: 0,
+    hidePerPageOptions: false,
+    sortField: DataFrameAnalyticsListColumn.id,
+    sortDirection: 'asc',
+  });
+
+  const getPageOfItems = (
+    list: any[],
+    index: number,
+    size: number,
+    sortField: string,
+    sortDirection: Direction
+  ) => {
+    list = sortBy(list, (item) =>
+      get(item, jobPropertyMap[sortField as keyof typeof jobPropertyMap] || sortField)
+    );
+    list = sortDirection === 'asc' ? list : list.reverse();
+    const listLength = list.length;
+
+    let pageStart = index * size;
+    if (pageStart >= listLength && listLength !== 0) {
+      // if the page start is larger than the number of items due to
+      // filters being applied or items being deleted, calculate a new page start
+      pageStart = Math.floor((listLength - 1) / size) * size;
+
+      setTableSettings({ ...tableSettings, pageIndex: pageStart / size });
+    }
+    return {
+      pageOfItems: list.slice(pageStart, pageStart + size),
+      totalItemCount: listLength,
+    };
+  };
+
+  const onTableChange = ({
+    page = { index: 0, size: PAGE_SIZE },
+    sort = { field: DataFrameAnalyticsListColumn.id, direction: 'asc' },
+  }: {
+    page?: { index: number; size: number };
+    sort?: { field: string; direction: Direction };
+  }) => {
+    const { index, size } = page;
+    const { field, direction } = sort;
+
+    setTableSettings({
+      ...tableSettings,
+      pageIndex: index,
+      pageSize: size,
+      sortField: field,
+      sortDirection: direction,
+    });
+  };
+
+  const { pageIndex, pageSize, sortField, sortDirection } = tableSettings;
+
+  const { pageOfItems, totalItemCount } = getPageOfItems(
+    items,
+    pageIndex,
+    pageSize,
+    sortField,
+    sortDirection
+  );
+
+  const pagination = {
+    pageIndex,
+    pageSize,
+    totalItemCount,
+    pageSizeOptions: PAGE_SIZE_OPTIONS,
+  };
+
+  const sorting = {
+    sort: {
+      field: sortField,
+      direction: sortDirection,
+    },
+  };
+
+  return { onTableChange, pageOfItems, pagination, sorting };
+}
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/analytics_search_bar.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/analytics_search_bar.tsx
new file mode 100644
index 00000000000000..44a6572a3766c8
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/analytics_search_bar.tsx
@@ -0,0 +1,157 @@
+/*
+ * 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, { Dispatch, SetStateAction, FC, Fragment, useState } from 'react';
+import {
+  EuiSearchBar,
+  EuiSearchBarProps,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { stringMatch } from '../../../../../util/string_utils';
+import {
+  TermClause,
+  FieldClause,
+  Value,
+  DataFrameAnalyticsListRow,
+} from '../analytics_list/common';
+
+export function filterAnalytics(
+  items: DataFrameAnalyticsListRow[],
+  clauses: Array<TermClause | FieldClause>
+) {
+  if (clauses.length === 0) {
+    return items;
+  }
+
+  // keep count of the number of matches we make as we're looping over the clauses
+  // we only want to return items which match all clauses, i.e. each search term is ANDed
+  const matches: Record<string, any> = items.reduce((p: Record<string, any>, c) => {
+    p[c.id] = {
+      job: c,
+      count: 0,
+    };
+    return p;
+  }, {});
+
+  clauses.forEach((c) => {
+    // the search term could be negated with a minus, e.g. -bananas
+    const bool = c.match === 'must';
+    let js = [];
+
+    if (c.type === 'term') {
+      // filter term based clauses, e.g. bananas
+      // match on id, description and memory_status
+      // if the term has been negated, AND the matches
+      if (bool === true) {
+        js = items.filter(
+          (item) =>
+            stringMatch(item.id, c.value) === bool ||
+            stringMatch(item.config.description, c.value) === bool ||
+            stringMatch(item.stats?.memory_usage?.status, c.value) === bool
+        );
+      } else {
+        js = items.filter(
+          (item) =>
+            stringMatch(item.id, c.value) === bool &&
+            stringMatch(item.config.description, c.value) === bool &&
+            stringMatch(item.stats?.memory_usage?.status, c.value) === bool
+        );
+      }
+    } else {
+      // filter other clauses, i.e. the filters for type and status
+      if (Array.isArray(c.value)) {
+        // job type value and status value are an array of string(s) e.g. c.value => ['failed', 'stopped']
+        js = items.filter((item) =>
+          (c.value as Value[]).includes(
+            item[c.field as keyof Pick<typeof item, 'job_type' | 'state'>]
+          )
+        );
+      } else {
+        js = items.filter(
+          (item) => item[c.field as keyof Pick<typeof item, 'job_type' | 'state'>] === c.value
+        );
+      }
+    }
+
+    js.forEach((j) => matches[j.id].count++);
+  });
+
+  // loop through the matches and return only those items which have match all the clauses
+  const filtered = Object.values(matches)
+    .filter((m) => (m && m.count) >= clauses.length)
+    .map((m) => m.job);
+
+  return filtered;
+}
+
+function getError(errorMessage: string | null) {
+  if (errorMessage) {
+    return i18n.translate('xpack.ml.analyticList.searchBar.invalidSearchErrorMessage', {
+      defaultMessage: 'Invalid search: {errorMessage}',
+      values: { errorMessage },
+    });
+  }
+
+  return '';
+}
+
+interface Props {
+  filters: EuiSearchBarProps['filters'];
+  searchQueryText: string;
+  setSearchQueryText: Dispatch<SetStateAction<string>>;
+}
+
+export const AnalyticsSearchBar: FC<Props> = ({ filters, searchQueryText, setSearchQueryText }) => {
+  const [errorMessage, setErrorMessage] = useState<null | string>(null);
+
+  const onChange: EuiSearchBarProps['onChange'] = ({ query, error }) => {
+    if (error) {
+      setErrorMessage(error.message);
+    } else if (query !== null && query.text !== undefined) {
+      setSearchQueryText(query.text);
+      setErrorMessage(null);
+    }
+  };
+
+  return (
+    <EuiFlexGroup direction="column">
+      <EuiFlexItem data-test-subj="mlAnalyticsSearchBar" grow={false}>
+        {searchQueryText === undefined && (
+          <EuiSearchBar
+            box={{
+              incremental: true,
+            }}
+            filters={filters}
+            onChange={onChange}
+            className="mlAnalyitcsSearchBar"
+          />
+        )}
+        {searchQueryText !== undefined && (
+          <EuiSearchBar
+            box={{
+              incremental: true,
+            }}
+            defaultQuery={searchQueryText}
+            filters={filters}
+            onChange={onChange}
+            className="mlAnalyitcsSearchBar"
+          />
+        )}
+        <EuiFormRow
+          fullWidth
+          isInvalid={errorMessage !== null}
+          error={getError(errorMessage)}
+          style={{ maxHeight: '0px' }}
+        >
+          <Fragment />
+        </EuiFormRow>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/index.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/index.ts
new file mode 100644
index 00000000000000..3b901f5063eb1e
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_search_bar/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 { AnalyticsSearchBar, filterAnalytics } from './analytics_search_bar';
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/jobs_list/jobs_list.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/jobs_list/jobs_list.js
index f90bbf3cf3fe6a..fa4ea09b89ff91 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/jobs_list/jobs_list.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/jobs_list/jobs_list.js
@@ -7,7 +7,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 
-import { sortBy } from 'lodash';
+import sortBy from 'lodash/sortBy';
 import moment from 'moment';
 
 import { toLocaleString } from '../../../../util/string_utils';

From 093f58872054c8d0b8601ad94865ba3bf50a4886 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Wed, 2 Sep 2020 15:35:33 +0200
Subject: [PATCH 176/216] [RUM Dashboard] Use median values instead of averages
 to display page load times (#76407)

---
 .../elasticsearch_fieldnames.test.ts.snap     | 12 ++++++++
 .../apm/common/elasticsearch_fieldnames.ts    |  5 ++++
 .../RumDashboard/Charts/PageLoadDistChart.tsx |  2 +-
 .../PercentileAnnotations.tsx                 |  4 +--
 .../__snapshots__/queries.test.ts.snap        | 18 +++++++++---
 .../lib/rum_client/get_client_metrics.ts      | 28 +++++++++++++------
 .../server/lib/transaction_groups/fetcher.ts  |  4 +--
 .../apm/typings/elasticsearch/aggregations.ts |  2 +-
 8 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
index 7c42fb6f12a54a..aecf4af667603d 100644
--- a/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
+++ b/x-pack/plugins/apm/common/__snapshots__/elasticsearch_fieldnames.test.ts.snap
@@ -120,6 +120,8 @@ exports[`Error TRACE_ID 1`] = `"trace id"`;
 
 exports[`Error TRANSACTION_BREAKDOWN_COUNT 1`] = `undefined`;
 
+exports[`Error TRANSACTION_DOM_INTERACTIVE 1`] = `undefined`;
+
 exports[`Error TRANSACTION_DURATION 1`] = `undefined`;
 
 exports[`Error TRANSACTION_ID 1`] = `"transaction id"`;
@@ -132,6 +134,8 @@ exports[`Error TRANSACTION_RESULT 1`] = `undefined`;
 
 exports[`Error TRANSACTION_SAMPLED 1`] = `undefined`;
 
+exports[`Error TRANSACTION_TIME_TO_FIRST_BYTE 1`] = `undefined`;
+
 exports[`Error TRANSACTION_TYPE 1`] = `"request"`;
 
 exports[`Error TRANSACTION_URL 1`] = `undefined`;
@@ -268,6 +272,8 @@ exports[`Span TRACE_ID 1`] = `"trace id"`;
 
 exports[`Span TRANSACTION_BREAKDOWN_COUNT 1`] = `undefined`;
 
+exports[`Span TRANSACTION_DOM_INTERACTIVE 1`] = `undefined`;
+
 exports[`Span TRANSACTION_DURATION 1`] = `undefined`;
 
 exports[`Span TRANSACTION_ID 1`] = `"transaction id"`;
@@ -280,6 +286,8 @@ exports[`Span TRANSACTION_RESULT 1`] = `undefined`;
 
 exports[`Span TRANSACTION_SAMPLED 1`] = `undefined`;
 
+exports[`Span TRANSACTION_TIME_TO_FIRST_BYTE 1`] = `undefined`;
+
 exports[`Span TRANSACTION_TYPE 1`] = `undefined`;
 
 exports[`Span TRANSACTION_URL 1`] = `undefined`;
@@ -416,6 +424,8 @@ exports[`Transaction TRACE_ID 1`] = `"trace id"`;
 
 exports[`Transaction TRANSACTION_BREAKDOWN_COUNT 1`] = `undefined`;
 
+exports[`Transaction TRANSACTION_DOM_INTERACTIVE 1`] = `undefined`;
+
 exports[`Transaction TRANSACTION_DURATION 1`] = `1337`;
 
 exports[`Transaction TRANSACTION_ID 1`] = `"transaction id"`;
@@ -428,6 +438,8 @@ exports[`Transaction TRANSACTION_RESULT 1`] = `"transaction result"`;
 
 exports[`Transaction TRANSACTION_SAMPLED 1`] = `true`;
 
+exports[`Transaction TRANSACTION_TIME_TO_FIRST_BYTE 1`] = `undefined`;
+
 exports[`Transaction TRANSACTION_TYPE 1`] = `"transaction type"`;
 
 exports[`Transaction TRANSACTION_URL 1`] = `undefined`;
diff --git a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
index 610a32e8e9b99b..4aa68de9b8b32f 100644
--- a/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
@@ -99,3 +99,8 @@ export const TRANSACTION_URL = 'transaction.page.url';
 export const CLIENT_GEO = 'client.geo';
 export const USER_AGENT_DEVICE = 'user_agent.device.name';
 export const USER_AGENT_OS = 'user_agent.os.name';
+
+export const TRANSACTION_TIME_TO_FIRST_BYTE =
+  'transaction.marks.agent.timeToFirstByte';
+export const TRANSACTION_DOM_INTERACTIVE =
+  'transaction.marks.agent.domInteractive';
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx
index b2b5e66d06ac69..33573052dbcbbf 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Charts/PageLoadDistChart.tsx
@@ -35,7 +35,7 @@ import { BreakdownSeries } from '../PageLoadDistribution/BreakdownSeries';
 
 interface PageLoadData {
   pageLoadDistribution: Array<{ x: number; y: number }>;
-  percentiles: Record<string, number> | undefined;
+  percentiles: Record<string, number | null> | undefined;
   minDuration: number;
   maxDuration: number;
 }
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx
index 407ec42f03ff5a..7e81dc011bdb5b 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/PageLoadDistribution/PercentileAnnotations.tsx
@@ -16,11 +16,11 @@ import styled from 'styled-components';
 import { EuiToolTip } from '@elastic/eui';
 
 interface Props {
-  percentiles?: Record<string, number>;
+  percentiles?: Record<string, number | null>;
 }
 
 function generateAnnotationData(
-  values?: Record<string, number>
+  values?: Record<string, number | null>
 ): LineAnnotationDatum[] {
   return Object.entries(values ?? {}).map((value) => ({
     dataValue: value[1],
diff --git a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
index c5264373ea4954..22b8c226e90261 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/rum_client/__snapshots__/queries.test.ts.snap
@@ -10,15 +10,25 @@ Object {
   "body": Object {
     "aggs": Object {
       "backEnd": Object {
-        "avg": Object {
+        "percentiles": Object {
           "field": "transaction.marks.agent.timeToFirstByte",
-          "missing": 0,
+          "hdr": Object {
+            "number_of_significant_value_digits": 3,
+          },
+          "percents": Array [
+            50,
+          ],
         },
       },
       "domInteractive": Object {
-        "avg": Object {
+        "percentiles": Object {
           "field": "transaction.marks.agent.domInteractive",
-          "missing": 0,
+          "hdr": Object {
+            "number_of_significant_value_digits": 3,
+          },
+          "percents": Array [
+            50,
+          ],
         },
       },
       "pageViews": Object {
diff --git a/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts b/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts
index 194c136e2b3d06..e0dec183f06d6c 100644
--- a/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts
+++ b/x-pack/plugins/apm/server/lib/rum_client/get_client_metrics.ts
@@ -11,6 +11,10 @@ import {
   SetupTimeRange,
   SetupUIFilters,
 } from '../helpers/setup_request';
+import {
+  TRANSACTION_DOM_INTERACTIVE,
+  TRANSACTION_TIME_TO_FIRST_BYTE,
+} from '../../../common/elasticsearch_fieldnames';
 
 export async function getClientMetrics({
   setup,
@@ -30,15 +34,21 @@ export async function getClientMetrics({
       aggs: {
         pageViews: { value_count: { field: 'transaction.type' } },
         backEnd: {
-          avg: {
-            field: 'transaction.marks.agent.timeToFirstByte',
-            missing: 0,
+          percentiles: {
+            field: TRANSACTION_TIME_TO_FIRST_BYTE,
+            percents: [50],
+            hdr: {
+              number_of_significant_value_digits: 3,
+            },
           },
         },
         domInteractive: {
-          avg: {
-            field: 'transaction.marks.agent.domInteractive',
-            missing: 0,
+          percentiles: {
+            field: TRANSACTION_DOM_INTERACTIVE,
+            percents: [50],
+            hdr: {
+              number_of_significant_value_digits: 3,
+            },
           },
         },
       },
@@ -53,9 +63,11 @@ export async function getClientMetrics({
   // Divide by 1000 to convert ms into seconds
   return {
     pageViews,
-    backEnd: { value: (backEnd.value || 0) / 1000 },
+    backEnd: { value: (backEnd.values['50.0'] || 0) / 1000 },
     frontEnd: {
-      value: ((domInteractive.value || 0) - (backEnd.value || 0)) / 1000,
+      value:
+        ((domInteractive.values['50.0'] || 0) - (backEnd.values['50.0'] || 0)) /
+        1000,
     },
   };
 }
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 2a1a581c795742..d0ba31f42c536b 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -65,7 +65,7 @@ function getItemsWithRelativeImpact(
     key: string | Record<string, any>;
     avg?: number | null;
     count?: number | null;
-    p95?: number;
+    p95?: number | null;
     sample?: Transaction;
   }>
 ) {
@@ -188,7 +188,7 @@ export interface TransactionGroup {
   key: Record<string, any> | string;
   averageResponseTime: number | null | undefined;
   transactionsPerMinute: number;
-  p95: number | undefined;
+  p95: number | null | undefined;
   impact: number;
   sample: Transaction;
 }
diff --git a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
index d25ec8709e3bef..6a2a0e81e81cdd 100644
--- a/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -223,7 +223,7 @@ interface AggregationResponsePart<
     value: number;
   };
   percentiles: {
-    values: Record<string, number>;
+    values: Record<string, number | null>;
   };
   extended_stats: {
     count: number;

From 5345af9281406368d8c4520742fbdd3ae08a61fd Mon Sep 17 00:00:00 2001
From: Brent Kimmel <bkimmel@users.noreply.github.com>
Date: Wed, 2 Sep 2020 09:48:33 -0400
Subject: [PATCH 177/216] [Security Solution][Resolver] Add events link to
 Process Detail Panel (#76195)

* [Security_Solution][Resolver]Add events link to Process Detail Panel
---
 .../resolver/store/data/reducer.test.ts       | 19 ++++++++++++++++++
 .../public/resolver/store/data/selectors.ts   | 20 +++++++++++++++++++
 .../public/resolver/store/selectors.ts        | 12 +++++++++++
 .../public/resolver/view/panels/index.tsx     | 12 +++++++----
 .../resolver/view/panels/process_details.tsx  | 18 +++++++++++++++++
 5 files changed, 77 insertions(+), 4 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 e087db9f74685a..21c4f92f8e502e 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
@@ -59,6 +59,7 @@ describe('Resolver Data Middleware', () => {
     let firstChildNodeInTree: TreeNode;
     let eventStatsForFirstChildNode: { total: number; byCategory: Record<string, number> };
     let categoryToOverCount: string;
+    let aggregateCategoryTotalForFirstChildNode: number;
     let tree: ResolverTree;
 
     /**
@@ -73,6 +74,7 @@ describe('Resolver Data Middleware', () => {
         firstChildNodeInTree,
         eventStatsForFirstChildNode,
         categoryToOverCount,
+        aggregateCategoryTotalForFirstChildNode,
       } = mockedTree());
       if (tree) {
         dispatchTree(tree);
@@ -138,6 +140,13 @@ describe('Resolver Data Middleware', () => {
           expect(notDisplayed(typeCounted)).toBe(0);
         }
       });
+      it('should return an overall correct count for the number of related events', () => {
+        const aggregateTotalByEntityId = selectors.relatedEventAggregateTotalByEntityId(
+          store.getState()
+        );
+        const countForId = aggregateTotalByEntityId(firstChildNodeInTree.id);
+        expect(countForId).toBe(aggregateCategoryTotalForFirstChildNode);
+      });
     });
     describe('when data was received and stats show more related events than the API can provide', () => {
       beforeEach(() => {
@@ -262,6 +271,7 @@ function mockedTree() {
     tree: tree!,
     firstChildNodeInTree,
     eventStatsForFirstChildNode: statsResults.eventStats,
+    aggregateCategoryTotalForFirstChildNode: statsResults.aggregateCategoryTotal,
     categoryToOverCount: statsResults.firstCategory,
   };
 }
@@ -288,6 +298,7 @@ function compileStatsForChild(
   };
   /** The category of the first event.  */
   firstCategory: string;
+  aggregateCategoryTotal: number;
 } {
   const totalRelatedEvents = node.relatedEvents.length;
   // For the purposes of testing, we pick one category to fake an extra event for
@@ -295,6 +306,12 @@ function compileStatsForChild(
 
   let firstCategory: string | undefined;
 
+  // This is the "aggregate total" which is displayed to users as the total count
+  // of related events for the node. It is tallied by incrementing for every discrete
+  // event.category in an event.category array (or just 1 for a plain string). E.g. two events
+  // categories 'file' and ['dns','network'] would have an `aggregate total` of 3.
+  let aggregateCategoryTotal: number = 0;
+
   const compiledStats = node.relatedEvents.reduce(
     (counts: Record<string, number>, relatedEvent) => {
       // `relatedEvent.event.category` is `string | string[]`.
@@ -310,6 +327,7 @@ function compileStatsForChild(
 
         // Increment the count of events with this category
         counts[category] = counts[category] ? counts[category] + 1 : 1;
+        aggregateCategoryTotal++;
       }
       return counts;
     },
@@ -327,5 +345,6 @@ function compileStatsForChild(
       byCategory: compiledStats,
     },
     firstCategory,
+    aggregateCategoryTotal,
   };
 }
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 965547f1e309a9..eaa80b46471fad 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
@@ -170,6 +170,26 @@ export const relatedEventsStats: (
   }
 );
 
+/**
+ * This returns the "aggregate total" for related events, tallied as the sum
+ * of their individual `event.category`s. E.g. a [DNS, Network] would count as two
+ * towards the aggregate total.
+ */
+export const relatedEventAggregateTotalByEntityId: (
+  state: DataState
+) => (entityId: string) => number = createSelector(relatedEventsStats, (relatedStats) => {
+  return (entityId) => {
+    const statsForEntity = relatedStats(entityId);
+    if (statsForEntity === undefined) {
+      return 0;
+    }
+    return Object.values(statsForEntity?.events?.byCategory || {}).reduce(
+      (sum, val) => sum + val,
+      0
+    );
+  };
+});
+
 /**
  * returns a map of entity_ids to related event data.
  */
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 909a907626f304..bdea08df3d7f50 100644
--- a/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/resolver/store/selectors.ts
@@ -114,6 +114,18 @@ export const relatedEventsStats: (
   dataSelectors.relatedEventsStats
 );
 
+/**
+ * This returns the "aggregate total" for related events, tallied as the sum
+ * of their individual `event.category`s. E.g. a [DNS, Network] would count as two
+ * towards the aggregate total.
+ */
+export const relatedEventAggregateTotalByEntityId: (
+  state: ResolverState
+) => (nodeID: string) => number = composeSelectors(
+  dataStateSelector,
+  dataSelectors.relatedEventAggregateTotalByEntityId
+);
+
 /**
  * Map of related events... by entity id
  */
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 98b737de8fa598..133dcd21e7f565 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,6 +17,7 @@ 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 { ResolverState } from '../../types';
 
 /**
  * The team decided to use this table to determine which breadcrumbs/view to display:
@@ -102,6 +103,12 @@ const PanelContent = memo(function PanelContent() {
     ? relatedEventStats(idFromParams)
     : undefined;
 
+  const parentCount = useSelector((state: ResolverState) => {
+    if (idFromParams === '') {
+      return 0;
+    }
+    return selectors.relatedEventAggregateTotalByEntityId(state)(idFromParams);
+  });
   /**
    * Determine which set of breadcrumbs to display based on the query parameters
    * for the table & breadcrumb nav.
@@ -186,9 +193,6 @@ const PanelContent = memo(function PanelContent() {
     }
 
     if (panelToShow === 'relatedEventDetail') {
-      const parentCount: number = Object.values(
-        relatedStatsForIdFromParams?.events.byCategory || {}
-      ).reduce((sum, val) => sum + val, 0);
       return (
         <RelatedEventDetail
           relatedEventId={crumbId}
@@ -199,7 +203,7 @@ const PanelContent = memo(function PanelContent() {
     }
     // The default 'Event List' / 'List of all processes' view
     return <ProcessListWithCounts />;
-  }, [uiSelectedEvent, crumbEvent, crumbId, relatedStatsForIdFromParams, panelToShow]);
+  }, [uiSelectedEvent, crumbEvent, crumbId, relatedStatsForIdFromParams, panelToShow, parentCount]);
 
   return <>{panelInstance}</>;
 });
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 01fa912caa866f..4fcc5577426430 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
@@ -13,6 +13,7 @@ import {
   EuiText,
   EuiTextColor,
   EuiDescriptionList,
+  EuiLink,
 } from '@elastic/eui';
 import styled from 'styled-components';
 import { FormattedMessage } from 'react-intl';
@@ -58,6 +59,9 @@ export const ProcessDetails = memo(function ProcessDetails({
   const isProcessTerminated = useSelector((state: ResolverState) =>
     selectors.isProcessTerminated(state)(entityId)
   );
+  const relatedEventTotal = useSelector((state: ResolverState) => {
+    return selectors.relatedEventAggregateTotalByEntityId(state)(entityId);
+  });
   const processInfoEntry: EuiDescriptionListProps['listItems'] = useMemo(() => {
     const eventTime = event.eventTimestamp(processEvent);
     const dateTime = eventTime === undefined ? null : formatDate(eventTime);
@@ -164,6 +168,12 @@ export const ProcessDetails = memo(function ProcessDetails({
     return cubeAssetsForNode(isProcessTerminated, false);
   }, [processEvent, cubeAssetsForNode, isProcessTerminated]);
 
+  const handleEventsLinkClick = useMemo(() => {
+    return () => {
+      pushToQueryParams({ crumbId: entityId, crumbEvent: 'all' });
+    };
+  }, [entityId, pushToQueryParams]);
+
   const titleID = useMemo(() => htmlIdGenerator('resolverTable')(), []);
   return (
     <>
@@ -185,6 +195,14 @@ export const ProcessDetails = memo(function ProcessDetails({
           <span id={titleID}>{descriptionText}</span>
         </EuiTextColor>
       </EuiText>
+      <EuiSpacer size="s" />
+      <EuiLink onClick={handleEventsLinkClick}>
+        <FormattedMessage
+          id="xpack.securitySolution.endpoint.resolver.panel.processDescList.numberOfEvents"
+          values={{ relatedEventTotal }}
+          defaultMessage="{relatedEventTotal} Events"
+        />
+      </EuiLink>
       <EuiSpacer size="l" />
       <StyledDescriptionList
         data-test-subj="resolver:node-detail"

From 25c176255ad7dcb02e74b27e9507c7aa449675d6 Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Wed, 2 Sep 2020 16:00:38 +0200
Subject: [PATCH 178/216] [uiActions] notify action usage (#76294)

Notify feature usage when dynamic actions with specified license requirements are executed

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../dashboard_to_url_drilldown/index.tsx      |  1 +
 .../services/feature_usage_service.mock.ts    |  4 +
 .../action_wizard/action_wizard.test.tsx      |  8 +-
 .../action_wizard/action_wizard.tsx           | 10 +--
 .../components/action_wizard/test_data.tsx    | 16 ++--
 .../connected_flyout_manage_drilldowns.tsx    |  2 +-
 .../form_drilldown_wizard.tsx                 |  2 +-
 .../public/drilldowns/drilldown_definition.ts |  9 +-
 .../dynamic_actions/action_factory.test.ts    | 87 ++++++++++++++++---
 .../public/dynamic_actions/action_factory.ts  | 45 ++++++++--
 .../action_factory_definition.ts              | 11 ++-
 .../dynamic_action_manager.test.ts            |  6 +-
 .../ui_actions_enhanced/public/mocks.ts       |  4 +-
 .../ui_actions_enhanced/public/plugin.ts      | 36 +++++---
 .../ui_actions_service_enhancements.test.ts   | 43 +++++++--
 .../ui_actions_service_enhancements.ts        | 31 +++++--
 16 files changed, 247 insertions(+), 68 deletions(-)

diff --git a/x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx b/x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx
index 7d915ea23c66f0..58916f26121d4c 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx
+++ b/x-pack/examples/ui_actions_enhanced_examples/public/dashboard_to_url_drilldown/index.tsx
@@ -44,6 +44,7 @@ export class DashboardToUrlDrilldown implements Drilldown<Config, UrlTrigger> {
   public readonly order = 8;
 
   readonly minimalLicense = 'gold'; // example of minimal license support
+  readonly licenseFeatureName = 'Sample URL Drilldown';
 
   public readonly getDisplayName = () => 'Go to URL (example)';
 
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
index fc9d4f9381151a..b2390ea35c1407 100644
--- a/x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts
+++ b/x-pack/plugins/licensing/public/services/feature_usage_service.mock.ts
@@ -15,6 +15,8 @@ const createSetupMock = (): jest.Mocked<FeatureUsageServiceSetup> => {
     register: jest.fn(),
   };
 
+  mock.register.mockImplementation(() => Promise.resolve());
+
   return mock;
 };
 
@@ -23,6 +25,8 @@ const createStartMock = (): jest.Mocked<FeatureUsageServiceStart> => {
     notifyUsage: jest.fn(),
   };
 
+  mock.notifyUsage.mockImplementation(() => Promise.resolve());
+
   return mock;
 };
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
index 78252dccd20d24..9cc64defc17952 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.test.tsx
@@ -15,7 +15,7 @@ import {
   urlDrilldownActionFactory,
 } from './test_data';
 import { ActionFactory } from '../../dynamic_actions';
-import { licenseMock } from '../../../../licensing/common/licensing.mock';
+import { licensingMock } from '../../../../licensing/public/mocks';
 
 // TODO: afterEach is not available for it globally during setup
 // https://github.com/elastic/kibana/issues/59469
@@ -68,8 +68,12 @@ test('If not enough license, button is disabled', () => {
     {
       ...urlDrilldownActionFactory,
       minimalLicense: 'gold',
+      licenseFeatureName: 'Url Drilldown',
     },
-    () => licenseMock.createLicense()
+    {
+      getLicense: () => licensingMock.createLicense(),
+      getFeatureUsageStart: () => licensingMock.createStart().featureUsage,
+    }
   );
   const screen = render(<Demo actionFactories={[dashboardFactory, urlWithGoldLicense]} />);
 
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
index 7e4fe1de8be8dc..a49251811239fa 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/action_wizard.tsx
@@ -93,7 +93,7 @@ export const ActionWizard: React.FC<ActionWizardProps> = ({
   if (
     !currentActionFactory &&
     actionFactories.length === 1 &&
-    actionFactories[0].isCompatibleLicence()
+    actionFactories[0].isCompatibleLicense()
   ) {
     onActionFactoryChange(actionFactories[0]);
   }
@@ -314,8 +314,8 @@ const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
    * make sure not compatible factories are in the end
    */
   const ensureOrder = (factories: ActionFactory[]) => {
-    const compatibleLicense = factories.filter((f) => f.isCompatibleLicence());
-    const notCompatibleLicense = factories.filter((f) => !f.isCompatibleLicence());
+    const compatibleLicense = factories.filter((f) => f.isCompatibleLicense());
+    const notCompatibleLicense = factories.filter((f) => !f.isCompatibleLicense());
     return [
       ...compatibleLicense.sort((f1, f2) => f2.order - f1.order),
       ...notCompatibleLicense.sort((f1, f2) => f2.order - f1.order),
@@ -328,7 +328,7 @@ const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
         <EuiFlexItem grow={false} key={actionFactory.id}>
           <EuiToolTip
             content={
-              !actionFactory.isCompatibleLicence() && (
+              !actionFactory.isCompatibleLicense() && (
                 <FormattedMessage
                   defaultMessage="Insufficient license level"
                   id="xpack.uiActionsEnhanced.components.actionWizard.insufficientLicenseLevelTooltip"
@@ -341,7 +341,7 @@ const ActionFactorySelector: React.FC<ActionFactorySelectorProps> = ({
               label={actionFactory.getDisplayName(context)}
               data-test-subj={`${TEST_SUBJ_ACTION_FACTORY_ITEM}-${actionFactory.id}`}
               onClick={() => onActionFactorySelected(actionFactory)}
-              disabled={!actionFactory.isCompatibleLicence()}
+              disabled={!actionFactory.isCompatibleLicense()}
             >
               {actionFactory.getIconType(context) && (
                 <EuiIcon type={actionFactory.getIconType(context)!} size="m" />
diff --git a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
index d48cb13b1a4705..71286e9a59c06e 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/components/action_wizard/test_data.tsx
@@ -10,7 +10,7 @@ import { reactToUiComponent } from '../../../../../../src/plugins/kibana_react/p
 import { ActionWizard } from './action_wizard';
 import { ActionFactory, ActionFactoryDefinition } from '../../dynamic_actions';
 import { CollectConfigProps } from '../../../../../../src/plugins/kibana_utils/public';
-import { licenseMock } from '../../../../licensing/common/licensing.mock';
+import { licensingMock } from '../../../../licensing/public/mocks';
 import {
   APPLY_FILTER_TRIGGER,
   SELECT_RANGE_TRIGGER,
@@ -116,9 +116,10 @@ export const dashboardDrilldownActionFactory: ActionFactoryDefinition<
   },
 };
 
-export const dashboardFactory = new ActionFactory(dashboardDrilldownActionFactory, () =>
-  licenseMock.createLicense()
-);
+export const dashboardFactory = new ActionFactory(dashboardDrilldownActionFactory, {
+  getLicense: () => licensingMock.createLicense(),
+  getFeatureUsageStart: () => licensingMock.createStart().featureUsage,
+});
 
 interface UrlDrilldownConfig {
   url: string;
@@ -176,9 +177,10 @@ export const urlDrilldownActionFactory: ActionFactoryDefinition<UrlDrilldownConf
   },
 };
 
-export const urlFactory = new ActionFactory(urlDrilldownActionFactory, () =>
-  licenseMock.createLicense()
-);
+export const urlFactory = new ActionFactory(urlDrilldownActionFactory, {
+  getLicense: () => licensingMock.createLicense(),
+  getFeatureUsageStart: () => licensingMock.createStart().featureUsage,
+});
 
 export const mockSupportedTriggers: TriggerId[] = [
   VALUE_CLICK_TRIGGER,
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
index 9fca785ec90722..b708bbc57375d2 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/connected_flyout_manage_drilldowns/connected_flyout_manage_drilldowns.tsx
@@ -148,7 +148,7 @@ export function createFlyoutManageDrilldowns({
         icon: actionFactory?.getIconType(drilldownFactoryContext),
         error: !actionFactory
           ? invalidDrilldownType(drilldown.action.factoryId) // this shouldn't happen for the end user, but useful during development
-          : !actionFactory.isCompatibleLicence()
+          : !actionFactory.isCompatibleLicense()
           ? insufficientLicenseLevel
           : undefined,
         triggers: drilldown.triggers.map((trigger) => getTrigger(trigger as TriggerId)),
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/form_drilldown_wizard/form_drilldown_wizard.tsx b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/form_drilldown_wizard/form_drilldown_wizard.tsx
index bb3eb89d8f1996..d7f94a52088b7f 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/form_drilldown_wizard/form_drilldown_wizard.tsx
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/components/form_drilldown_wizard/form_drilldown_wizard.tsx
@@ -75,7 +75,7 @@ export const FormDrilldownWizard: React.FC<FormDrilldownWizardProps> = ({
   );
 
   const hasNotCompatibleLicenseFactory = () =>
-    actionFactories?.some((f) => !f.isCompatibleLicence());
+    actionFactories?.some((f) => !f.isCompatibleLicense());
 
   const renderGetMoreActionsLink = () => (
     <EuiText size="s">
diff --git a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
index ff455c6ae45b66..8faccc088a3279 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/drilldowns/drilldown_definition.ts
@@ -37,11 +37,18 @@ export interface DrilldownDefinition<
   id: string;
 
   /**
-   * Minimal licence level
+   * Minimal license level
    * Empty means no restrictions
    */
   minimalLicense?: LicenseType;
 
+  /**
+   * Required when `minimalLicense` is used.
+   * Is a user-facing string. Has to be unique. Doesn't need i18n.
+   * The feature's name will be displayed to Cloud end-users when they're billed based on their feature usage.
+   */
+  licenseFeatureName?: string;
+
   /**
    * Determines the display order of the drilldowns in the flyout picker.
    * Higher numbers are displayed first.
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
index a07fed8486438a..032a4a63fe2e9d 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.test.ts
@@ -7,6 +7,7 @@
 import { ActionFactory } from './action_factory';
 import { ActionFactoryDefinition } from './action_factory_definition';
 import { licensingMock } from '../../../licensing/public/mocks';
+import { PublicLicense } from '../../../licensing/public';
 
 const def: ActionFactoryDefinition = {
   id: 'ACTION_FACTORY_1',
@@ -22,34 +23,94 @@ const def: ActionFactoryDefinition = {
   supportedTriggers: () => [],
 };
 
+const featureUsage = licensingMock.createStart().featureUsage;
+
+const createActionFactory = (
+  defOverride: Partial<ActionFactoryDefinition> = {},
+  license?: Partial<PublicLicense>
+) => {
+  return new ActionFactory(
+    { ...def, ...defOverride },
+    {
+      getLicense: () => licensingMock.createLicense({ license }),
+      getFeatureUsageStart: () => featureUsage,
+    }
+  );
+};
+
 describe('License & ActionFactory', () => {
   test('no license requirements', async () => {
-    const factory = new ActionFactory(def, () => licensingMock.createLicense());
+    const factory = createActionFactory();
     expect(await factory.isCompatible({ triggers: [] })).toBe(true);
-    expect(factory.isCompatibleLicence()).toBe(true);
+    expect(factory.isCompatibleLicense()).toBe(true);
   });
 
   test('not enough license level', async () => {
-    const factory = new ActionFactory({ ...def, minimalLicense: 'gold' }, () =>
-      licensingMock.createLicense()
-    );
+    const factory = createActionFactory({ minimalLicense: 'gold', licenseFeatureName: 'Feature' });
     expect(await factory.isCompatible({ triggers: [] })).toBe(true);
-    expect(factory.isCompatibleLicence()).toBe(false);
+    expect(factory.isCompatibleLicense()).toBe(false);
   });
 
-  test('licence has expired', async () => {
-    const factory = new ActionFactory({ ...def, minimalLicense: 'gold' }, () =>
-      licensingMock.createLicense({ license: { type: 'gold', status: 'expired' } })
+  test('license has expired', async () => {
+    const factory = createActionFactory(
+      { minimalLicense: 'gold', licenseFeatureName: 'Feature' },
+      { type: 'gold', status: 'expired' }
     );
     expect(await factory.isCompatible({ triggers: [] })).toBe(true);
-    expect(factory.isCompatibleLicence()).toBe(false);
+    expect(factory.isCompatibleLicense()).toBe(false);
   });
 
   test('enough license level', async () => {
-    const factory = new ActionFactory({ ...def, minimalLicense: 'gold' }, () =>
-      licensingMock.createLicense({ license: { type: 'gold' } })
+    const factory = createActionFactory(
+      { minimalLicense: 'gold', licenseFeatureName: 'Feature' },
+      { type: 'gold' }
     );
+
     expect(await factory.isCompatible({ triggers: [] })).toBe(true);
-    expect(factory.isCompatibleLicence()).toBe(true);
+    expect(factory.isCompatibleLicense()).toBe(true);
+  });
+
+  describe('licenseFeatureName', () => {
+    test('licenseFeatureName is required, if minimalLicense is provided', () => {
+      expect(() => {
+        createActionFactory();
+      }).not.toThrow();
+
+      expect(() => {
+        createActionFactory({ minimalLicense: 'gold', licenseFeatureName: 'feature' });
+      }).not.toThrow();
+
+      expect(() => {
+        createActionFactory({ minimalLicense: 'gold' });
+      }).toThrow();
+    });
+
+    test('"licenseFeatureName"', () => {
+      expect(
+        createActionFactory({ minimalLicense: 'gold', licenseFeatureName: 'feature' })
+          .licenseFeatureName
+      ).toBe('feature');
+      expect(createActionFactory().licenseFeatureName).toBeUndefined();
+    });
+  });
+
+  describe('notifyFeatureUsage', () => {
+    const spy = jest.spyOn(featureUsage, 'notifyUsage');
+    beforeEach(() => {
+      spy.mockClear();
+    });
+    test('is not called if no license requirements', async () => {
+      const action = createActionFactory().create({ name: 'fake', config: {} });
+      await action.execute({});
+      expect(spy).not.toBeCalled();
+    });
+    test('is called if has license requirements', async () => {
+      const action = createActionFactory({
+        minimalLicense: 'gold',
+        licenseFeatureName: 'feature',
+      }).create({ name: 'fake', config: {} });
+      await action.execute({});
+      expect(spy).toBeCalledWith('feature');
+    });
   });
 });
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
index 35e06ab036fc97..35a82adf9896dd 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/action_factory.ts
@@ -13,9 +13,14 @@ import {
 import { ActionFactoryDefinition } from './action_factory_definition';
 import { Configurable } from '../../../../../src/plugins/kibana_utils/public';
 import { BaseActionFactoryContext, SerializedAction } from './types';
-import { ILicense } from '../../../licensing/public';
+import { ILicense, LicensingPluginStart } from '../../../licensing/public';
 import { UiActionsActionDefinition as ActionDefinition } from '../../../../../src/plugins/ui_actions/public';
 
+export interface ActionFactoryDeps {
+  readonly getLicense: () => ILicense;
+  readonly getFeatureUsageStart: () => LicensingPluginStart['featureUsage'];
+}
+
 export class ActionFactory<
   Config extends object = object,
   SupportedTriggers extends TriggerId = TriggerId,
@@ -31,11 +36,18 @@ export class ActionFactory<
       FactoryContext,
       ActionContext
     >,
-    protected readonly getLicence: () => ILicense
-  ) {}
+    protected readonly deps: ActionFactoryDeps
+  ) {
+    if (def.minimalLicense && !def.licenseFeatureName) {
+      throw new Error(
+        `ActionFactory [actionFactory.id = ${def.id}] "licenseFeatureName" is required, if "minimalLicense" is provided`
+      );
+    }
+  }
 
   public readonly id = this.def.id;
   public readonly minimalLicense = this.def.minimalLicense;
+  public readonly licenseFeatureName = this.def.licenseFeatureName;
   public readonly order = this.def.order || 0;
   public readonly MenuItem? = this.def.MenuItem;
   public readonly ReactMenuItem? = this.MenuItem ? uiToReactComponent(this.MenuItem) : undefined;
@@ -65,13 +77,13 @@ export class ActionFactory<
   }
 
   /**
-   * Does this action factory licence requirements
+   * Does this action factory license requirements
    * compatible with current license?
    */
-  public isCompatibleLicence() {
+  public isCompatibleLicense() {
     if (!this.minimalLicense) return true;
-    const licence = this.getLicence();
-    return licence.isAvailable && licence.isActive && licence.hasAtLeast(this.minimalLicense);
+    const license = this.deps.getLicense();
+    return license.isAvailable && license.isActive && license.hasAtLeast(this.minimalLicense);
   }
 
   public create(
@@ -81,14 +93,31 @@ export class ActionFactory<
     return {
       ...action,
       isCompatible: async (context: ActionContext): Promise<boolean> => {
-        if (!this.isCompatibleLicence()) return false;
+        if (!this.isCompatibleLicense()) return false;
         if (!action.isCompatible) return true;
         return action.isCompatible(context);
       },
+      execute: async (context: ActionContext): Promise<void> => {
+        this.notifyFeatureUsage();
+        return action.execute(context);
+      },
     };
   }
 
   public supportedTriggers(): SupportedTriggers[] {
     return this.def.supportedTriggers();
   }
+
+  private notifyFeatureUsage(): void {
+    if (!this.minimalLicense || !this.licenseFeatureName) return;
+    this.deps
+      .getFeatureUsageStart()
+      .notifyUsage(this.licenseFeatureName)
+      .catch(() => {
+        // eslint-disable-next-line no-console
+        console.warn(
+          `ActionFactory [actionFactory.id = ${this.def.id}] fail notify feature usage.`
+        );
+      });
+  }
 }
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 d79614e47ccd4e..91b8c8ec1e5eff 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
@@ -34,11 +34,18 @@ export interface ActionFactoryDefinition<
   id: string;
 
   /**
-   * Minimal licence level
-   * Empty means no licence restrictions
+   * Minimal license level
+   * Empty means no license restrictions
    */
   readonly minimalLicense?: LicenseType;
 
+  /**
+   * Required when `minimalLicense` is used.
+   * Is a user-facing string. Has to be unique. Doesn't need i18n.
+   * The feature's name will be displayed to Cloud end-users when they're billed based on their feature usage.
+   */
+  licenseFeatureName?: string;
+
   /**
    * This method should return a definition of a new action, normally used to
    * register it in `ui_actions` registry.
diff --git a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
index 0b0cd39e35e25f..39d9dfeca2fd6c 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/dynamic_actions/dynamic_action_manager.test.ts
@@ -87,7 +87,9 @@ const setup = (
     actions,
   });
   const uiActionsEnhancements = new UiActionsServiceEnhancements({
-    getLicenseInfo,
+    getLicense: getLicenseInfo,
+    featureUsageSetup: licensingMock.createSetup().featureUsage,
+    getFeatureUsageStart: () => licensingMock.createStart().featureUsage,
   });
   const manager = new DynamicActionManager({
     isCompatible,
@@ -671,11 +673,13 @@ describe('DynamicActionManager', () => {
     const basicActionFactory: ActionFactoryDefinition = {
       ...actionFactoryDefinition1,
       minimalLicense: 'basic',
+      licenseFeatureName: 'Feature 1',
     };
 
     const goldActionFactory: ActionFactoryDefinition = {
       ...actionFactoryDefinition2,
       minimalLicense: 'gold',
+      licenseFeatureName: 'Feature 2',
     };
 
     uiActions.registerActionFactory(basicActionFactory);
diff --git a/x-pack/plugins/ui_actions_enhanced/public/mocks.ts b/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
index ff07d6e74a9c0b..17a6fc1b955dff 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/mocks.ts
@@ -11,6 +11,7 @@ import { embeddablePluginMock } from '../../../../src/plugins/embeddable/public/
 import { AdvancedUiActionsSetup, AdvancedUiActionsStart } from '.';
 import { plugin as pluginInitializer } from '.';
 import { licensingMock } from '../../licensing/public/mocks';
+import { StartDependencies } from './plugin';
 
 export type Setup = jest.Mocked<AdvancedUiActionsSetup>;
 export type Start = jest.Mocked<AdvancedUiActionsStart>;
@@ -35,7 +36,7 @@ const createStartContract = (): Start => {
 };
 
 const createPlugin = (
-  coreSetup: CoreSetup = coreMock.createSetup(),
+  coreSetup: CoreSetup<StartDependencies> = coreMock.createSetup(),
   coreStart: CoreStart = coreMock.createStart()
 ) => {
   const pluginInitializerContext = coreMock.createPluginInitializerContext();
@@ -47,6 +48,7 @@ const createPlugin = (
   const setup = plugin.setup(coreSetup, {
     uiActions: uiActions.setup,
     embeddable: embeddable.setup,
+    licensing: licensingMock.createSetup(),
   });
 
   return {
diff --git a/x-pack/plugins/ui_actions_enhanced/public/plugin.ts b/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
index 5069b485b198d0..015531aab97437 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/plugin.ts
@@ -36,16 +36,17 @@ import {
 } from './custom_time_range_badge';
 import { CommonlyUsedRange } from './types';
 import { UiActionsServiceEnhancements } from './services';
-import { ILicense, LicensingPluginStart } from '../../licensing/public';
+import { ILicense, LicensingPluginSetup, LicensingPluginStart } from '../../licensing/public';
 import { createFlyoutManageDrilldowns } from './drilldowns';
-import { Storage } from '../../../../src/plugins/kibana_utils/public';
+import { createStartServicesGetter, Storage } from '../../../../src/plugins/kibana_utils/public';
 
 interface SetupDependencies {
   embeddable: EmbeddableSetup; // Embeddable are needed because they register basic triggers/actions.
   uiActions: UiActionsSetup;
+  licensing: LicensingPluginSetup;
 }
 
-interface StartDependencies {
+export interface StartDependencies {
   embeddable: EmbeddableStart;
   uiActions: UiActionsStart;
   licensing: LicensingPluginStart;
@@ -70,23 +71,30 @@ declare module '../../../../src/plugins/ui_actions/public' {
 
 export class AdvancedUiActionsPublicPlugin
   implements Plugin<SetupContract, StartContract, SetupDependencies, StartDependencies> {
-  readonly licenceInfo = new BehaviorSubject<ILicense | undefined>(undefined);
+  readonly licenseInfo = new BehaviorSubject<ILicense | undefined>(undefined);
   private getLicenseInfo(): ILicense {
-    if (!this.licenceInfo.getValue()) {
+    if (!this.licenseInfo.getValue()) {
       throw new Error(
-        'AdvancedUiActionsPublicPlugin: Licence is not ready! Licence becomes available only after setup.'
+        'AdvancedUiActionsPublicPlugin: License is not ready! License becomes available only after setup.'
       );
     }
-    return this.licenceInfo.getValue()!;
+    return this.licenseInfo.getValue()!;
   }
-  private readonly enhancements = new UiActionsServiceEnhancements({
-    getLicenseInfo: () => this.getLicenseInfo(),
-  });
+  private enhancements?: UiActionsServiceEnhancements;
   private subs: Subscription[] = [];
 
   constructor(initializerContext: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup, { uiActions }: SetupDependencies): SetupContract {
+  public setup(
+    core: CoreSetup<StartDependencies>,
+    { uiActions, licensing }: SetupDependencies
+  ): SetupContract {
+    const startServices = createStartServicesGetter(core.getStartServices);
+    this.enhancements = new UiActionsServiceEnhancements({
+      getLicense: () => this.getLicenseInfo(),
+      featureUsageSetup: licensing.featureUsage,
+      getFeatureUsageStart: () => startServices().plugins.licensing.featureUsage,
+    });
     return {
       ...uiActions,
       ...this.enhancements,
@@ -94,7 +102,7 @@ export class AdvancedUiActionsPublicPlugin
   }
 
   public start(core: CoreStart, { uiActions, licensing }: StartDependencies): StartContract {
-    this.subs.push(licensing.license$.subscribe(this.licenceInfo));
+    this.subs.push(licensing.license$.subscribe(this.licenseInfo));
 
     const dateFormat = core.uiSettings.get('dateFormat') as string;
     const commonlyUsedRanges = core.uiSettings.get(
@@ -117,9 +125,9 @@ export class AdvancedUiActionsPublicPlugin
 
     return {
       ...uiActions,
-      ...this.enhancements,
+      ...this.enhancements!,
       FlyoutManageDrilldowns: createFlyoutManageDrilldowns({
-        actionFactories: this.enhancements.getActionFactories(),
+        actionFactories: this.enhancements!.getActionFactories(),
         getTrigger: (triggerId: TriggerId) => uiActions.getTrigger(triggerId),
         storage: new Storage(window?.localStorage),
         toastService: core.notifications.toasts,
diff --git a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
index 08823833b9af28..3a0b65d2ed8446 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.test.ts
@@ -4,11 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { UiActionsServiceEnhancements } from './ui_actions_service_enhancements';
+import {
+  UiActionsServiceEnhancements,
+  UiActionsServiceEnhancementsParams,
+} from './ui_actions_service_enhancements';
 import { ActionFactoryDefinition, ActionFactory } from '../dynamic_actions';
 import { licensingMock } from '../../../licensing/public/mocks';
 
-const getLicenseInfo = () => licensingMock.createLicense();
+const deps: UiActionsServiceEnhancementsParams = {
+  getLicense: () => licensingMock.createLicense(),
+  featureUsageSetup: licensingMock.createSetup().featureUsage,
+  getFeatureUsageStart: () => licensingMock.createStart().featureUsage,
+};
 
 describe('UiActionsService', () => {
   describe('action factories', () => {
@@ -34,7 +41,7 @@ describe('UiActionsService', () => {
     };
 
     test('.getActionFactories() returns empty array if no action factories registered', () => {
-      const service = new UiActionsServiceEnhancements({ getLicenseInfo });
+      const service = new UiActionsServiceEnhancements(deps);
 
       const factories = service.getActionFactories();
 
@@ -42,7 +49,7 @@ describe('UiActionsService', () => {
     });
 
     test('can register and retrieve an action factory', () => {
-      const service = new UiActionsServiceEnhancements({ getLicenseInfo });
+      const service = new UiActionsServiceEnhancements(deps);
 
       service.registerActionFactory(factoryDefinition1);
 
@@ -53,7 +60,7 @@ describe('UiActionsService', () => {
     });
 
     test('can retrieve all action factories', () => {
-      const service = new UiActionsServiceEnhancements({ getLicenseInfo });
+      const service = new UiActionsServiceEnhancements(deps);
 
       service.registerActionFactory(factoryDefinition1);
       service.registerActionFactory(factoryDefinition2);
@@ -67,7 +74,7 @@ describe('UiActionsService', () => {
     });
 
     test('throws when retrieving action factory that does not exist', () => {
-      const service = new UiActionsServiceEnhancements({ getLicenseInfo });
+      const service = new UiActionsServiceEnhancements(deps);
 
       service.registerActionFactory(factoryDefinition1);
 
@@ -77,7 +84,7 @@ describe('UiActionsService', () => {
     });
 
     test('isCompatible from definition is used on registered factory', async () => {
-      const service = new UiActionsServiceEnhancements({ getLicenseInfo });
+      const service = new UiActionsServiceEnhancements(deps);
 
       service.registerActionFactory({
         ...factoryDefinition1,
@@ -88,5 +95,27 @@ describe('UiActionsService', () => {
         service.getActionFactory(factoryDefinition1.id).isCompatible({ triggers: [] })
       ).resolves.toBe(false);
     });
+
+    describe('registerFeature for licensing', () => {
+      const spy = jest.spyOn(deps.featureUsageSetup, 'register');
+      beforeEach(() => {
+        spy.mockClear();
+      });
+      test('registerFeature is not called if no license requirements', () => {
+        const service = new UiActionsServiceEnhancements(deps);
+        service.registerActionFactory(factoryDefinition1);
+        expect(spy).not.toBeCalled();
+      });
+
+      test('registerFeature is called if has license requirements', () => {
+        const service = new UiActionsServiceEnhancements(deps);
+        service.registerActionFactory({
+          ...factoryDefinition1,
+          minimalLicense: 'gold',
+          licenseFeatureName: 'a name',
+        });
+        expect(spy).toBeCalledWith('a name', 'gold');
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
index 95753295148356..b8086c16f5e714 100644
--- a/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
+++ b/x-pack/plugins/ui_actions_enhanced/public/services/ui_actions_service_enhancements.ts
@@ -13,19 +13,22 @@ import {
 import { DrilldownDefinition } from '../drilldowns';
 import { ILicense } from '../../../licensing/common/types';
 import { TriggerContextMapping, TriggerId } from '../../../../../src/plugins/ui_actions/public';
+import { LicensingPluginSetup, LicensingPluginStart } from '../../../licensing/public';
 
 export interface UiActionsServiceEnhancementsParams {
   readonly actionFactories?: ActionFactoryRegistry;
-  readonly getLicenseInfo: () => ILicense;
+  readonly getLicense: () => ILicense;
+  readonly featureUsageSetup: LicensingPluginSetup['featureUsage'];
+  readonly getFeatureUsageStart: () => LicensingPluginStart['featureUsage'];
 }
 
 export class UiActionsServiceEnhancements {
   protected readonly actionFactories: ActionFactoryRegistry;
-  protected readonly getLicenseInfo: () => ILicense;
+  protected readonly deps: Omit<UiActionsServiceEnhancementsParams, 'actionFactories'>;
 
-  constructor({ actionFactories = new Map(), getLicenseInfo }: UiActionsServiceEnhancementsParams) {
+  constructor({ actionFactories = new Map(), ...deps }: UiActionsServiceEnhancementsParams) {
     this.actionFactories = actionFactories;
-    this.getLicenseInfo = getLicenseInfo;
+    this.deps = deps;
   }
 
   /**
@@ -51,9 +54,10 @@ export class UiActionsServiceEnhancements {
       SupportedTriggers,
       FactoryContext,
       ActionContext
-    >(definition, this.getLicenseInfo);
+    >(definition, this.deps);
 
     this.actionFactories.set(actionFactory.id, actionFactory as ActionFactory<any, any, any>);
+    this.registerFeatureUsage(definition);
   };
 
   public readonly getActionFactory = (actionFactoryId: string): ActionFactory => {
@@ -94,6 +98,7 @@ export class UiActionsServiceEnhancements {
     execute,
     getHref,
     minimalLicense,
+    licenseFeatureName,
     supportedTriggers,
     isCompatible,
   }: DrilldownDefinition<Config, SupportedTriggers, FactoryContext, ExecutionContext>): void => {
@@ -105,6 +110,7 @@ export class UiActionsServiceEnhancements {
     > = {
       id: factoryId,
       minimalLicense,
+      licenseFeatureName,
       order,
       CollectConfig,
       createConfig,
@@ -128,4 +134,19 @@ export class UiActionsServiceEnhancements {
 
     this.registerActionFactory(actionFactory);
   };
+
+  private registerFeatureUsage = (definition: ActionFactoryDefinition<any, any, any>): void => {
+    if (!definition.minimalLicense || !definition.licenseFeatureName) return;
+
+    // Intentionally don't wait for response because
+    // happens in setup phase and has to be sync
+    this.deps.featureUsageSetup
+      .register(definition.licenseFeatureName, definition.minimalLicense)
+      .catch(() => {
+        // eslint-disable-next-line no-console
+        console.warn(
+          `ActionFactory [actionFactory.id = ${definition.id}] fail to register feature for featureUsage.`
+        );
+      });
+  };
 }

From 3e077973e8a5b73c03ab149d74c13ae2b9a700f3 Mon Sep 17 00:00:00 2001
From: Dario Gieselaar <dario.gieselaar@elastic.co>
Date: Wed, 2 Sep 2020 16:11:12 +0200
Subject: [PATCH 179/216] [APM] Immediately return terms for unbound queries
 (#74543)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../apm/server/lib/environments/get_all_environments.ts      | 5 +++++
 .../lib/helpers/create_es_client/call_client_with_debug.ts   | 2 +-
 .../agent_configuration/__snapshots__/queries.test.ts.snap   | 2 ++
 .../lib/settings/agent_configuration/get_service_names.ts    | 2 ++
 4 files changed, 10 insertions(+), 1 deletion(-)

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 29aaa98169fa5a..8060bf10da99cc 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
@@ -37,6 +37,9 @@ export async function getAllEnvironments({
       ],
     },
     body: {
+      // use timeout + min_doc_count to return as early as possible
+      // if filter is not defined to prevent timeouts
+      ...(!serviceName ? { timeout: '1ms' } : {}),
       size: 0,
       query: {
         bool: {
@@ -48,6 +51,7 @@ export async function getAllEnvironments({
           terms: {
             field: SERVICE_ENVIRONMENT,
             size: 100,
+            ...(!serviceName ? { min_doc_count: 0 } : {}),
             missing: includeMissing ? ENVIRONMENT_NOT_DEFINED.value : undefined,
           },
         },
@@ -56,6 +60,7 @@ export async function getAllEnvironments({
   };
 
   const resp = await apmEventClient.search(params);
+
   const environments =
     resp.aggregations?.environments.buckets.map(
       (bucket) => bucket.key as string
diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts
index c4756405952279..9f7aaafbefb8ce 100644
--- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts
+++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_client_with_debug.ts
@@ -34,7 +34,7 @@ export async function callClientWithDebug({
   let res: any;
   let esError = null;
   try {
-    res = apiCaller(operationName, params);
+    res = await apiCaller(operationName, params);
   } catch (e) {
     // catch error and throw after outputting debug info
     esError = e;
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/__snapshots__/queries.test.ts.snap b/x-pack/plugins/apm/server/lib/settings/agent_configuration/__snapshots__/queries.test.ts.snap
index 2b465a0f874752..c01e5c87eeea2f 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/__snapshots__/queries.test.ts.snap
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/__snapshots__/queries.test.ts.snap
@@ -127,11 +127,13 @@ Object {
       "services": Object {
         "terms": Object {
           "field": "service.name",
+          "min_doc_count": 0,
           "size": 50,
         },
       },
     },
     "size": 0,
+    "timeout": "1ms",
   },
 }
 `;
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
index 8b6c1d82beab00..91bdfeef003f13 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/get_service_names.ts
@@ -25,12 +25,14 @@ export async function getServiceNames({ setup }: { setup: Setup }) {
       ],
     },
     body: {
+      timeout: '1ms',
       size: 0,
       aggs: {
         services: {
           terms: {
             field: SERVICE_NAME,
             size: 50,
+            min_doc_count: 0,
           },
         },
       },

From 01e442081f666322a99266f443b2651228306cf4 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <william.conlon@elastic.co>
Date: Wed, 2 Sep 2020 10:34:37 -0400
Subject: [PATCH 180/216] [Visualize] Remove alias icon for Lens and Maps
 (#76418)

* [Visualize] Remove alias icon for Lens and Maps

* Fix snapshots

* Fix translations
---
 .../__snapshots__/new_vis_modal.test.tsx.snap | 140 +-----------------
 .../wizard/type_selection/type_selection.tsx  |  42 ++----
 .../translations/translations/ja-JP.json      |   2 -
 .../translations/translations/zh-CN.json      |   2 -
 4 files changed, 16 insertions(+), 170 deletions(-)

diff --git a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index 6aed16e9377131..3c4c983efa9faf 100644
--- a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -248,7 +248,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                             <li>
                               <button
                                 aria-describedby="visTypeDescription-visWithAliasUrl"
-                                class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                class="euiKeyPadMenuItem visNewVisDialog__type"
                                 data-test-subj="visType-visWithAliasUrl"
                                 data-vis-stage="alias"
                                 role="menuitem"
@@ -257,24 +257,6 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                 <div
                                   class="euiKeyPadMenuItem__inner"
                                 >
-                                  <span
-                                    class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                  >
-                                    <span
-                                      class="euiToolTipAnchor"
-                                    >
-                                      <span
-                                        class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                        tabindex="0"
-                                      >
-                                        <div
-                                          aria-hidden="true"
-                                          class="euiBetaBadge__icon"
-                                          data-euiicon-type="popout"
-                                        />
-                                      </span>
-                                    </span>
-                                  </span>
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
@@ -650,9 +632,6 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                         >
                                           <EuiKeyPadMenuItem
                                             aria-describedby="visTypeDescription-visWithAliasUrl"
-                                            betaBadgeIconType="popout"
-                                            betaBadgeLabel="Kibana application"
-                                            betaBadgeTooltipContent="Opens a Kibana application that is outside of Visualize."
                                             className="visNewVisDialog__type"
                                             data-test-subj="visType-visWithAliasUrl"
                                             data-vis-stage="alias"
@@ -674,7 +653,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                           >
                                             <button
                                               aria-describedby="visTypeDescription-visWithAliasUrl"
-                                              className="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                              className="euiKeyPadMenuItem visNewVisDialog__type"
                                               data-test-subj="visType-visWithAliasUrl"
                                               data-vis-stage="alias"
                                               disabled={false}
@@ -689,51 +668,6 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                               <div
                                                 className="euiKeyPadMenuItem__inner"
                                               >
-                                                <span
-                                                  className="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                >
-                                                  <EuiBetaBadge
-                                                    className="euiKeyPadMenuItem__betaBadge"
-                                                    iconType="popout"
-                                                    label="Kibana application"
-                                                    tooltipContent="Opens a Kibana application that is outside of Visualize."
-                                                  >
-                                                    <EuiToolTip
-                                                      content="Opens a Kibana application that is outside of Visualize."
-                                                      delay="regular"
-                                                      position="top"
-                                                      title="Kibana application"
-                                                    >
-                                                      <span
-                                                        className="euiToolTipAnchor"
-                                                        onKeyUp={[Function]}
-                                                        onMouseOut={[Function]}
-                                                        onMouseOver={[Function]}
-                                                      >
-                                                        <span
-                                                          className="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                          onBlur={[Function]}
-                                                          onFocus={[Function]}
-                                                          tabIndex={0}
-                                                        >
-                                                          <EuiIcon
-                                                            aria-hidden="true"
-                                                            className="euiBetaBadge__icon"
-                                                            size="m"
-                                                            type="popout"
-                                                          >
-                                                            <div
-                                                              aria-hidden="true"
-                                                              className="euiBetaBadge__icon"
-                                                              data-euiicon-type="popout"
-                                                              size="m"
-                                                            />
-                                                          </EuiIcon>
-                                                        </span>
-                                                      </span>
-                                                    </EuiToolTip>
-                                                  </EuiBetaBadge>
-                                                </span>
                                                 <div
                                                   className="euiKeyPadMenuItem__icon"
                                                 >
@@ -1243,7 +1177,7 @@ exports[`NewVisModal should render as expected 1`] = `
                             <li>
                               <button
                                 aria-describedby="visTypeDescription-visWithAliasUrl"
-                                class="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                class="euiKeyPadMenuItem visNewVisDialog__type"
                                 data-test-subj="visType-visWithAliasUrl"
                                 data-vis-stage="alias"
                                 role="menuitem"
@@ -1252,24 +1186,6 @@ exports[`NewVisModal should render as expected 1`] = `
                                 <div
                                   class="euiKeyPadMenuItem__inner"
                                 >
-                                  <span
-                                    class="euiKeyPadMenuItem__betaBadgeWrapper"
-                                  >
-                                    <span
-                                      class="euiToolTipAnchor"
-                                    >
-                                      <span
-                                        class="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                        tabindex="0"
-                                      >
-                                        <div
-                                          aria-hidden="true"
-                                          class="euiBetaBadge__icon"
-                                          data-euiicon-type="popout"
-                                        />
-                                      </span>
-                                    </span>
-                                  </span>
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
@@ -1632,9 +1548,6 @@ exports[`NewVisModal should render as expected 1`] = `
                                         >
                                           <EuiKeyPadMenuItem
                                             aria-describedby="visTypeDescription-visWithAliasUrl"
-                                            betaBadgeIconType="popout"
-                                            betaBadgeLabel="Kibana application"
-                                            betaBadgeTooltipContent="Opens a Kibana application that is outside of Visualize."
                                             className="visNewVisDialog__type"
                                             data-test-subj="visType-visWithAliasUrl"
                                             data-vis-stage="alias"
@@ -1656,7 +1569,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                           >
                                             <button
                                               aria-describedby="visTypeDescription-visWithAliasUrl"
-                                              className="euiKeyPadMenuItem euiKeyPadMenuItem--hasBetaBadge visNewVisDialog__type"
+                                              className="euiKeyPadMenuItem visNewVisDialog__type"
                                               data-test-subj="visType-visWithAliasUrl"
                                               data-vis-stage="alias"
                                               disabled={false}
@@ -1671,51 +1584,6 @@ exports[`NewVisModal should render as expected 1`] = `
                                               <div
                                                 className="euiKeyPadMenuItem__inner"
                                               >
-                                                <span
-                                                  className="euiKeyPadMenuItem__betaBadgeWrapper"
-                                                >
-                                                  <EuiBetaBadge
-                                                    className="euiKeyPadMenuItem__betaBadge"
-                                                    iconType="popout"
-                                                    label="Kibana application"
-                                                    tooltipContent="Opens a Kibana application that is outside of Visualize."
-                                                  >
-                                                    <EuiToolTip
-                                                      content="Opens a Kibana application that is outside of Visualize."
-                                                      delay="regular"
-                                                      position="top"
-                                                      title="Kibana application"
-                                                    >
-                                                      <span
-                                                        className="euiToolTipAnchor"
-                                                        onKeyUp={[Function]}
-                                                        onMouseOut={[Function]}
-                                                        onMouseOver={[Function]}
-                                                      >
-                                                        <span
-                                                          className="euiBetaBadge euiBetaBadge--iconOnly euiKeyPadMenuItem__betaBadge"
-                                                          onBlur={[Function]}
-                                                          onFocus={[Function]}
-                                                          tabIndex={0}
-                                                        >
-                                                          <EuiIcon
-                                                            aria-hidden="true"
-                                                            className="euiBetaBadge__icon"
-                                                            size="m"
-                                                            type="popout"
-                                                          >
-                                                            <div
-                                                              aria-hidden="true"
-                                                              className="euiBetaBadge__icon"
-                                                              data-euiicon-type="popout"
-                                                              size="m"
-                                                            />
-                                                          </EuiIcon>
-                                                        </span>
-                                                      </span>
-                                                    </EuiToolTip>
-                                                  </EuiBetaBadge>
-                                                </span>
                                                 <div
                                                   className="euiKeyPadMenuItem__icon"
                                                 >
diff --git a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
index dc6ac4919a4c42..0555b95648bc10 100644
--- a/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
+++ b/src/plugins/visualizations/public/wizard/type_selection/type_selection.tsx
@@ -221,36 +221,18 @@ class TypeSelection extends React.Component<TypeSelectionProps, TypeSelectionSta
         defaultMessage:
           'This visualization is experimental. The design and implementation are less mature than stable visualizations and might be subject to change.',
       });
-    } else if ('aliasPath' in visType) {
-      if (visType.stage === 'beta') {
-        const aliasDescription = i18n.translate('visualizations.newVisWizard.betaDescription', {
-          defaultMessage:
-            'This visualization 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',
-        });
-        stage = {
-          betaBadgeLabel: i18n.translate('visualizations.newVisWizard.betaTitle', {
-            defaultMessage: 'Beta',
-          }),
-          betaBadgeTooltipContent: aliasDescription,
-          // betaBadgeIconType: 'popout',
-        };
-        highlightMsg = aliasDescription;
-      } else {
-        const aliasDescription = i18n.translate(
-          'visualizations.newVisWizard.visTypeAliasDescription',
-          {
-            defaultMessage: 'Opens a Kibana application that is outside of Visualize.',
-          }
-        );
-        stage = {
-          betaBadgeLabel: i18n.translate('visualizations.newVisWizard.visTypeAliasTitle', {
-            defaultMessage: 'Kibana application',
-          }),
-          betaBadgeTooltipContent: aliasDescription,
-          betaBadgeIconType: 'popout',
-        };
-        highlightMsg = aliasDescription;
-      }
+    } else if ('aliasPath' in visType && visType.stage === 'beta') {
+      const aliasDescription = i18n.translate('visualizations.newVisWizard.betaDescription', {
+        defaultMessage:
+          'This visualization 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',
+      });
+      stage = {
+        betaBadgeLabel: i18n.translate('visualizations.newVisWizard.betaTitle', {
+          defaultMessage: 'Beta',
+        }),
+        betaBadgeTooltipContent: aliasDescription,
+      };
+      highlightMsg = aliasDescription;
     }
 
     const isDisabled = this.state.query !== '' && !visType.highlighted;
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 093ef4d6f1873d..59d952d08c1811 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -4433,8 +4433,6 @@
     "visualizations.newVisWizard.searchSelection.savedObjectType.search": "保存検索",
     "visualizations.newVisWizard.selectVisType": "ビジュアライゼーションのタイプを選択してください",
     "visualizations.newVisWizard.title": "新規ビジュアライゼーション",
-    "visualizations.newVisWizard.visTypeAliasDescription": "Visualize 外で Kibana アプリケーションを開きます。",
-    "visualizations.newVisWizard.visTypeAliasTitle": "Kibana アプリケーション",
     "visualizations.savedObjectName": "ビジュアライゼーション",
     "visualizations.visualizationTypeInvalidMessage": "無効なビジュアライゼーションタイプ \"{visType}\"",
     "visualize.badge.readOnly.text": "読み取り専用",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index ea04b1e14d9591..6641eede91e66b 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -4434,8 +4434,6 @@
     "visualizations.newVisWizard.searchSelection.savedObjectType.search": "已保存搜索",
     "visualizations.newVisWizard.selectVisType": "选择可视化类型",
     "visualizations.newVisWizard.title": "新建可视化",
-    "visualizations.newVisWizard.visTypeAliasDescription": "打开 Visualize 外部的 Kibana 应用程序。",
-    "visualizations.newVisWizard.visTypeAliasTitle": "Kibana 应用程序",
     "visualizations.savedObjectName": "可视化",
     "visualizations.visualizationTypeInvalidMessage": "无效的可视化类型“{visType}”",
     "visualize.badge.readOnly.text": "只读",

From d932830218c00c6548957c0954fcc4ae550352cb Mon Sep 17 00:00:00 2001
From: Angela Chuang <6295984+angorayc@users.noreply.github.com>
Date: Wed, 2 Sep 2020 15:34:49 +0100
Subject: [PATCH 181/216] [Security Solution] Search strategy - authentications
 (#76090)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* move authentications to searchstrategy

* useAuthentications

* add authenticationFields

* remove import from lib

* remove duplicated types

* getInspectResponse

* getInspectResponse

* move folder

* update path

* update path

* shallowEqual

* revert path

* update path

* remove redundant types

* fix import

* fix types

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Patryk Kopyciński <patryk.kopycinski@elastic.co>
---
 .../common/ecs/ecs_fields/extend_map.test.ts  |  56 +++
 .../common/ecs/ecs_fields/extend_map.ts       |  14 +
 .../common/ecs/ecs_fields/index.ts            | 358 ++++++++++++++++++
 .../hosts/authentications/index.ts            |  83 ++++
 .../security_solution/hosts/index.ts          |   3 +-
 .../security_solution/index.ts                |  50 ++-
 .../security_solution/public/helpers.ts       |  13 +
 .../authentications_table/index.tsx           |   8 +-
 .../components/authentications_table/mock.ts  |  29 +-
 .../containers/authentications/index.tsx      | 294 ++++++++------
 .../authentications/translations.ts           |  21 +
 .../public/hosts/containers/hosts/index.tsx   |   6 +-
 .../containers/hosts/overview/_index.tsx      |   6 +-
 .../hosts/containers/hosts/translations.ts    |  14 +
 .../authentications_query_tab_body.tsx        |  58 +--
 .../network/containers/network_http/index.tsx |   6 +-
 .../public/network/containers/tls/index.tsx   |   4 +-
 .../plugins/security_solution/public/types.ts |   3 +
 .../search_strategy/helpers/to_array.ts       |   8 +
 .../hosts/authentications/dsl/query.dsl.ts    | 120 ++++++
 .../factory/hosts/authentications/helpers.ts  |  91 +++++
 .../factory/hosts/authentications/index.tsx   |  64 ++++
 .../factory/hosts/helpers.ts                  |   8 +-
 .../security_solution/factory/hosts/index.ts  |   2 +
 .../factory/network/http/index.ts             |   1 -
 25 files changed, 1143 insertions(+), 177 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.test.ts
 create mode 100644 x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.ts
 create mode 100644 x-pack/plugins/security_solution/common/ecs/ecs_fields/index.ts
 create mode 100644 x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/authentications/index.ts
 create mode 100644 x-pack/plugins/security_solution/public/hosts/containers/authentications/translations.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/helpers/to_array.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/helpers.ts
 create mode 100644 x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/index.tsx

diff --git a/x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.test.ts b/x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.test.ts
new file mode 100644
index 00000000000000..9ba22e83b4b4d3
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.test.ts
@@ -0,0 +1,56 @@
+/*
+ * 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 { extendMap } from './extend_map';
+
+describe('ecs_fields test', () => {
+  describe('extendMap', () => {
+    test('it should extend a record', () => {
+      const osFieldsMap: Readonly<Record<string, string>> = {
+        'os.platform': 'os.platform',
+        'os.full': 'os.full',
+        'os.family': 'os.family',
+        'os.version': 'os.version',
+        'os.kernel': 'os.kernel',
+      };
+      const expected: Record<string, string> = {
+        'host.os.family': 'host.os.family',
+        'host.os.full': 'host.os.full',
+        'host.os.kernel': 'host.os.kernel',
+        'host.os.platform': 'host.os.platform',
+        'host.os.version': 'host.os.version',
+      };
+      expect(extendMap('host', osFieldsMap)).toEqual(expected);
+    });
+
+    test('it should extend a sample hosts record', () => {
+      const hostMap: Record<string, string> = {
+        'host.id': 'host.id',
+        'host.ip': 'host.ip',
+        'host.name': 'host.name',
+      };
+      const osFieldsMap: Readonly<Record<string, string>> = {
+        'os.platform': 'os.platform',
+        'os.full': 'os.full',
+        'os.family': 'os.family',
+        'os.version': 'os.version',
+        'os.kernel': 'os.kernel',
+      };
+      const expected: Record<string, string> = {
+        'host.id': 'host.id',
+        'host.ip': 'host.ip',
+        'host.name': 'host.name',
+        'host.os.family': 'host.os.family',
+        'host.os.full': 'host.os.full',
+        'host.os.kernel': 'host.os.kernel',
+        'host.os.platform': 'host.os.platform',
+        'host.os.version': 'host.os.version',
+      };
+      const output = { ...hostMap, ...extendMap('host', osFieldsMap) };
+      expect(output).toEqual(expected);
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.ts b/x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.ts
new file mode 100644
index 00000000000000..c25979cbcdceea
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/ecs/ecs_fields/extend_map.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 const extendMap = (
+  path: string,
+  map: Readonly<Record<string, string>>
+): Readonly<Record<string, string>> =>
+  Object.entries(map).reduce<Record<string, string>>((accum, [key, value]) => {
+    accum[`${path}.${key}`] = `${path}.${value}`;
+    return accum;
+  }, {});
diff --git a/x-pack/plugins/security_solution/common/ecs/ecs_fields/index.ts b/x-pack/plugins/security_solution/common/ecs/ecs_fields/index.ts
new file mode 100644
index 00000000000000..19b16bd4bc6d24
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/ecs/ecs_fields/index.ts
@@ -0,0 +1,358 @@
+/*
+ * 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 { extendMap } from './extend_map';
+
+export const auditdMap: Readonly<Record<string, string>> = {
+  'auditd.result': 'auditd.result',
+  'auditd.session': 'auditd.session',
+  'auditd.data.acct': 'auditd.data.acct',
+  'auditd.data.terminal': 'auditd.data.terminal',
+  'auditd.data.op': 'auditd.data.op',
+  'auditd.summary.actor.primary': 'auditd.summary.actor.primary',
+  'auditd.summary.actor.secondary': 'auditd.summary.actor.secondary',
+  'auditd.summary.object.primary': 'auditd.summary.object.primary',
+  'auditd.summary.object.secondary': 'auditd.summary.object.secondary',
+  'auditd.summary.object.type': 'auditd.summary.object.type',
+  'auditd.summary.how': 'auditd.summary.how',
+  'auditd.summary.message_type': 'auditd.summary.message_type',
+  'auditd.summary.sequence': 'auditd.summary.sequence',
+};
+
+export const cloudFieldsMap: Readonly<Record<string, string>> = {
+  'cloud.account.id': 'cloud.account.id',
+  'cloud.availability_zone': 'cloud.availability_zone',
+  'cloud.instance.id': 'cloud.instance.id',
+  'cloud.instance.name': 'cloud.instance.name',
+  'cloud.machine.type': 'cloud.machine.type',
+  'cloud.provider': 'cloud.provider',
+  'cloud.region': 'cloud.region',
+};
+
+export const fileMap: Readonly<Record<string, string>> = {
+  'file.name': 'file.name',
+  'file.path': 'file.path',
+  'file.target_path': 'file.target_path',
+  'file.extension': 'file.extension',
+  'file.type': 'file.type',
+  'file.device': 'file.device',
+  'file.inode': 'file.inode',
+  'file.uid': 'file.uid',
+  'file.owner': 'file.owner',
+  'file.gid': 'file.gid',
+  'file.group': 'file.group',
+  'file.mode': 'file.mode',
+  'file.size': 'file.size',
+  'file.mtime': 'file.mtime',
+  'file.ctime': 'file.ctime',
+};
+
+export const osFieldsMap: Readonly<Record<string, string>> = {
+  'os.platform': 'os.platform',
+  'os.name': 'os.name',
+  'os.full': 'os.full',
+  'os.family': 'os.family',
+  'os.version': 'os.version',
+  'os.kernel': 'os.kernel',
+};
+
+export const hostFieldsMap: Readonly<Record<string, string>> = {
+  'host.architecture': 'host.architecture',
+  'host.id': 'host.id',
+  'host.ip': 'host.ip',
+  'host.mac': 'host.mac',
+  'host.name': 'host.name',
+  ...extendMap('host', osFieldsMap),
+};
+
+export const processFieldsMap: Readonly<Record<string, string>> = {
+  'process.hash.md5': 'process.hash.md5',
+  'process.hash.sha1': 'process.hash.sha1',
+  'process.hash.sha256': 'process.hash.sha256',
+  'process.pid': 'process.pid',
+  'process.name': 'process.name',
+  'process.ppid': 'process.ppid',
+  'process.args': 'process.args',
+  'process.entity_id': 'process.entity_id',
+  'process.executable': 'process.executable',
+  'process.title': 'process.title',
+  'process.thread': 'process.thread',
+  'process.working_directory': 'process.working_directory',
+};
+
+export const agentFieldsMap: Readonly<Record<string, string>> = {
+  'agent.type': 'agent.type',
+};
+
+export const userFieldsMap: Readonly<Record<string, string>> = {
+  'user.domain': 'user.domain',
+  'user.id': 'user.id',
+  'user.name': 'user.name',
+  // NOTE: This field is not tested and available from ECS. Please remove this tag once it is
+  'user.full_name': 'user.full_name',
+  // NOTE: This field is not tested and available from ECS. Please remove this tag once it is
+  'user.email': 'user.email',
+  // NOTE: This field is not tested and available from ECS. Please remove this tag once it is
+  'user.hash': 'user.hash',
+  // NOTE: This field is not tested and available from ECS. Please remove this tag once it is
+  'user.group': 'user.group',
+};
+
+export const winlogFieldsMap: Readonly<Record<string, string>> = {
+  'winlog.event_id': 'winlog.event_id',
+};
+
+export const suricataFieldsMap: Readonly<Record<string, string>> = {
+  'suricata.eve.flow_id': 'suricata.eve.flow_id',
+  'suricata.eve.proto': 'suricata.eve.proto',
+  'suricata.eve.alert.signature': 'suricata.eve.alert.signature',
+  'suricata.eve.alert.signature_id': 'suricata.eve.alert.signature_id',
+};
+
+export const tlsFieldsMap: Readonly<Record<string, string>> = {
+  'tls.client_certificate.fingerprint.sha1': 'tls.client_certificate.fingerprint.sha1',
+  'tls.fingerprints.ja3.hash': 'tls.fingerprints.ja3.hash',
+  'tls.server_certificate.fingerprint.sha1': 'tls.server_certificate.fingerprint.sha1',
+};
+
+export const urlFieldsMap: Readonly<Record<string, string>> = {
+  'url.original': 'url.original',
+  'url.domain': 'url.domain',
+  'user.username': 'user.username',
+  'user.password': 'user.password',
+};
+
+export const httpFieldsMap: Readonly<Record<string, string>> = {
+  'http.version': 'http.version',
+  'http.request': 'http.request',
+  'http.request.method': 'http.request.method',
+  'http.request.body.bytes': 'http.request.body.bytes',
+  'http.request.body.content': 'http.request.body.content',
+  'http.request.referrer': 'http.request.referrer',
+  'http.response.status_code': 'http.response.status_code',
+  'http.response.body': 'http.response.body',
+  'http.response.body.bytes': 'http.response.body.bytes',
+  'http.response.body.content': 'http.response.body.content',
+};
+
+export const zeekFieldsMap: Readonly<Record<string, string>> = {
+  'zeek.session_id': 'zeek.session_id',
+  'zeek.connection.local_resp': 'zeek.connection.local_resp',
+  'zeek.connection.local_orig': 'zeek.connection.local_orig',
+  'zeek.connection.missed_bytes': 'zeek.connection.missed_bytes',
+  'zeek.connection.state': 'zeek.connection.state',
+  'zeek.connection.history': 'zeek.connection.history',
+  'zeek.notice.suppress_for': 'zeek.notice.suppress_for',
+  'zeek.notice.msg': 'zeek.notice.msg',
+  'zeek.notice.note': 'zeek.notice.note',
+  'zeek.notice.sub': 'zeek.notice.sub',
+  'zeek.notice.dst': 'zeek.notice.dst',
+  'zeek.notice.dropped': 'zeek.notice.dropped',
+  'zeek.notice.peer_descr': 'zeek.notice.peer_descr',
+  'zeek.dns.AA': 'zeek.dns.AA',
+  'zeek.dns.qclass_name': 'zeek.dns.qclass_name',
+  'zeek.dns.RD': 'zeek.dns.RD',
+  'zeek.dns.qtype_name': 'zeek.dns.qtype_name',
+  'zeek.dns.qtype': 'zeek.dns.qtype',
+  'zeek.dns.query': 'zeek.dns.query',
+  'zeek.dns.trans_id': 'zeek.dns.trans_id',
+  'zeek.dns.qclass': 'zeek.dns.qclass',
+  'zeek.dns.RA': 'zeek.dns.RA',
+  'zeek.dns.TC': 'zeek.dns.TC',
+  'zeek.http.resp_mime_types': 'zeek.http.resp_mime_types',
+  'zeek.http.trans_depth': 'zeek.http.trans_depth',
+  'zeek.http.status_msg': 'zeek.http.status_msg',
+  'zeek.http.resp_fuids': 'zeek.http.resp_fuids',
+  'zeek.http.tags': 'zeek.http.tags',
+  'zeek.files.session_ids': 'zeek.files.session_ids',
+  'zeek.files.timedout': 'zeek.files.timedout',
+  'zeek.files.local_orig': 'zeek.files.local_orig',
+  'zeek.files.tx_host': 'zeek.files.tx_host',
+  'zeek.files.source': 'zeek.files.source',
+  'zeek.files.is_orig': 'zeek.files.is_orig',
+  'zeek.files.overflow_bytes': 'zeek.files.overflow_bytes',
+  'zeek.files.sha1': 'zeek.files.sha1',
+  'zeek.files.duration': 'zeek.files.duration',
+  'zeek.files.depth': 'zeek.files.depth',
+  'zeek.files.analyzers': 'zeek.files.analyzers',
+  'zeek.files.mime_type': 'zeek.files.mime_type',
+  'zeek.files.rx_host': 'zeek.files.rx_host',
+  'zeek.files.total_bytes': 'zeek.files.total_bytes',
+  'zeek.files.fuid': 'zeek.files.fuid',
+  'zeek.files.seen_bytes': 'zeek.files.seen_bytes',
+  'zeek.files.missing_bytes': 'zeek.files.missing_bytes',
+  'zeek.files.md5': 'zeek.files.md5',
+  'zeek.ssl.cipher': 'zeek.ssl.cipher',
+  'zeek.ssl.established': 'zeek.ssl.established',
+  'zeek.ssl.resumed': 'zeek.ssl.resumed',
+  'zeek.ssl.version': 'zeek.ssl.version',
+};
+
+export const sourceFieldsMap: Readonly<Record<string, string>> = {
+  'source.bytes': 'source.bytes',
+  'source.ip': 'source.ip',
+  'source.packets': 'source.packets',
+  'source.port': 'source.port',
+  'source.domain': 'source.domain',
+  'source.geo.continent_name': 'source.geo.continent_name',
+  'source.geo.country_name': 'source.geo.country_name',
+  'source.geo.country_iso_code': 'source.geo.country_iso_code',
+  'source.geo.city_name': 'source.geo.city_name',
+  'source.geo.region_iso_code': 'source.geo.region_iso_code',
+  'source.geo.region_name': 'source.geo.region_name',
+};
+
+export const destinationFieldsMap: Readonly<Record<string, string>> = {
+  'destination.bytes': 'destination.bytes',
+  'destination.ip': 'destination.ip',
+  'destination.packets': 'destination.packets',
+  'destination.port': 'destination.port',
+  'destination.domain': 'destination.domain',
+  'destination.geo.continent_name': 'destination.geo.continent_name',
+  'destination.geo.country_name': 'destination.geo.country_name',
+  'destination.geo.country_iso_code': 'destination.geo.country_iso_code',
+  'destination.geo.city_name': 'destination.geo.city_name',
+  'destination.geo.region_iso_code': 'destination.geo.region_iso_code',
+  'destination.geo.region_name': 'destination.geo.region_name',
+};
+
+export const networkFieldsMap: Readonly<Record<string, string>> = {
+  'network.bytes': 'network.bytes',
+  'network.community_id': 'network.community_id',
+  'network.direction': 'network.direction',
+  'network.packets': 'network.packets',
+  'network.protocol': 'network.protocol',
+  'network.transport': 'network.transport',
+};
+
+export const geoFieldsMap: Readonly<Record<string, string>> = {
+  'geo.region_name': 'destination.geo.region_name',
+  'geo.country_iso_code': 'destination.geo.country_iso_code',
+};
+
+export const dnsFieldsMap: Readonly<Record<string, string>> = {
+  'dns.question.name': 'dns.question.name',
+  'dns.question.type': 'dns.question.type',
+  'dns.resolved_ip': 'dns.resolved_ip',
+  'dns.response_code': 'dns.response_code',
+};
+
+export const endgameFieldsMap: Readonly<Record<string, string>> = {
+  'endgame.exit_code': 'endgame.exit_code',
+  'endgame.file_name': 'endgame.file_name',
+  'endgame.file_path': 'endgame.file_path',
+  'endgame.logon_type': 'endgame.logon_type',
+  'endgame.parent_process_name': 'endgame.parent_process_name',
+  'endgame.pid': 'endgame.pid',
+  'endgame.process_name': 'endgame.process_name',
+  'endgame.subject_domain_name': 'endgame.subject_domain_name',
+  'endgame.subject_logon_id': 'endgame.subject_logon_id',
+  'endgame.subject_user_name': 'endgame.subject_user_name',
+  'endgame.target_domain_name': 'endgame.target_domain_name',
+  'endgame.target_logon_id': 'endgame.target_logon_id',
+  'endgame.target_user_name': 'endgame.target_user_name',
+};
+
+export const eventBaseFieldsMap: Readonly<Record<string, string>> = {
+  'event.action': 'event.action',
+  'event.category': 'event.category',
+  'event.code': 'event.code',
+  'event.created': 'event.created',
+  'event.dataset': 'event.dataset',
+  'event.duration': 'event.duration',
+  'event.end': 'event.end',
+  'event.hash': 'event.hash',
+  'event.id': 'event.id',
+  'event.kind': 'event.kind',
+  'event.module': 'event.module',
+  'event.original': 'event.original',
+  'event.outcome': 'event.outcome',
+  'event.risk_score': 'event.risk_score',
+  'event.risk_score_norm': 'event.risk_score_norm',
+  'event.severity': 'event.severity',
+  'event.start': 'event.start',
+  'event.timezone': 'event.timezone',
+  'event.type': 'event.type',
+};
+
+export const systemFieldsMap: Readonly<Record<string, string>> = {
+  'system.audit.package.arch': 'system.audit.package.arch',
+  'system.audit.package.entity_id': 'system.audit.package.entity_id',
+  'system.audit.package.name': 'system.audit.package.name',
+  'system.audit.package.size': 'system.audit.package.size',
+  'system.audit.package.summary': 'system.audit.package.summary',
+  'system.audit.package.version': 'system.audit.package.version',
+  'system.auth.ssh.signature': 'system.auth.ssh.signature',
+  'system.auth.ssh.method': 'system.auth.ssh.method',
+};
+
+export const signalFieldsMap: Readonly<Record<string, string>> = {
+  'signal.original_time': 'signal.original_time',
+  'signal.rule.id': 'signal.rule.id',
+  'signal.rule.saved_id': 'signal.rule.saved_id',
+  'signal.rule.timeline_id': 'signal.rule.timeline_id',
+  'signal.rule.timeline_title': 'signal.rule.timeline_title',
+  'signal.rule.output_index': 'signal.rule.output_index',
+  'signal.rule.from': 'signal.rule.from',
+  'signal.rule.index': 'signal.rule.index',
+  'signal.rule.language': 'signal.rule.language',
+  'signal.rule.query': 'signal.rule.query',
+  'signal.rule.to': 'signal.rule.to',
+  'signal.rule.filters': 'signal.rule.filters',
+  'signal.rule.rule_id': 'signal.rule.rule_id',
+  'signal.rule.false_positives': 'signal.rule.false_positives',
+  'signal.rule.max_signals': 'signal.rule.max_signals',
+  'signal.rule.risk_score': 'signal.rule.risk_score',
+  'signal.rule.description': 'signal.rule.description',
+  'signal.rule.name': 'signal.rule.name',
+  'signal.rule.immutable': 'signal.rule.immutable',
+  'signal.rule.references': 'signal.rule.references',
+  'signal.rule.severity': 'signal.rule.severity',
+  'signal.rule.tags': 'signal.rule.tags',
+  'signal.rule.threat': 'signal.rule.threat',
+  'signal.rule.type': 'signal.rule.type',
+  'signal.rule.size': 'signal.rule.size',
+  'signal.rule.enabled': 'signal.rule.enabled',
+  'signal.rule.created_at': 'signal.rule.created_at',
+  'signal.rule.updated_at': 'signal.rule.updated_at',
+  'signal.rule.created_by': 'signal.rule.created_by',
+  'signal.rule.updated_by': 'signal.rule.updated_by',
+  'signal.rule.version': 'signal.rule.version',
+  'signal.rule.note': 'signal.rule.note',
+  'signal.rule.threshold': 'signal.rule.threshold',
+  'signal.rule.exceptions_list': 'signal.rule.exceptions_list',
+};
+
+export const ruleFieldsMap: Readonly<Record<string, string>> = {
+  'rule.reference': 'rule.reference',
+};
+
+export const eventFieldsMap: Readonly<Record<string, string>> = {
+  timestamp: '@timestamp',
+  '@timestamp': '@timestamp',
+  message: 'message',
+  ...{ ...agentFieldsMap },
+  ...{ ...auditdMap },
+  ...{ ...destinationFieldsMap },
+  ...{ ...dnsFieldsMap },
+  ...{ ...endgameFieldsMap },
+  ...{ ...eventBaseFieldsMap },
+  ...{ ...fileMap },
+  ...{ ...geoFieldsMap },
+  ...{ ...hostFieldsMap },
+  ...{ ...networkFieldsMap },
+  ...{ ...ruleFieldsMap },
+  ...{ ...signalFieldsMap },
+  ...{ ...sourceFieldsMap },
+  ...{ ...suricataFieldsMap },
+  ...{ ...systemFieldsMap },
+  ...{ ...tlsFieldsMap },
+  ...{ ...zeekFieldsMap },
+  ...{ ...httpFieldsMap },
+  ...{ ...userFieldsMap },
+  ...{ ...winlogFieldsMap },
+  ...{ ...processFieldsMap },
+};
diff --git a/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/authentications/index.ts b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/authentications/index.ts
new file mode 100644
index 00000000000000..0071fe3deeb1f8
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/search_strategy/security_solution/hosts/authentications/index.ts
@@ -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 { IEsSearchResponse } from '../../../../../../../../src/plugins/data/common';
+
+import { UserEcs } from '../../../../ecs/user';
+import { SourceEcs } from '../../../../ecs/source';
+import { HostEcs } from '../../../../ecs/host';
+import {
+  CursorType,
+  Inspect,
+  Maybe,
+  PageInfoPaginated,
+  RequestOptionsPaginated,
+  StringOrNumber,
+  Hit,
+  TotalHit,
+} from '../../';
+
+export interface AuthenticationsStrategyResponse extends IEsSearchResponse {
+  edges: AuthenticationsEdges[];
+  totalCount: number;
+  pageInfo: PageInfoPaginated;
+  inspect?: Maybe<Inspect>;
+}
+
+export interface AuthenticationsRequestOptions extends RequestOptionsPaginated {
+  defaultIndex: string[];
+}
+
+export interface AuthenticationsEdges {
+  node: AuthenticationItem;
+  cursor: CursorType;
+}
+
+export interface AuthenticationItem {
+  _id: string;
+  failures: number;
+  successes: number;
+  user: UserEcs;
+  lastSuccess?: Maybe<LastSourceHost>;
+  lastFailure?: Maybe<LastSourceHost>;
+}
+
+export interface LastSourceHost {
+  timestamp?: Maybe<string>;
+  source?: Maybe<SourceEcs>;
+  host?: Maybe<HostEcs>;
+}
+
+export interface AuthenticationHit extends Hit {
+  _source: {
+    '@timestamp': string;
+    lastSuccess?: LastSourceHost;
+    lastFailure?: LastSourceHost;
+  };
+  user: string;
+  failures: number;
+  successes: number;
+  cursor?: string;
+  sort: StringOrNumber[];
+}
+
+export interface AuthenticationBucket {
+  key: {
+    user_uid: string;
+  };
+  doc_count: number;
+  failures: {
+    doc_count: number;
+  };
+  successes: {
+    doc_count: number;
+  };
+  authentication: {
+    hits: {
+      total: TotalHit;
+      hits: ArrayLike<AuthenticationHit>;
+    };
+  };
+}
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 a27899e4540747..dc81c0a9137f87 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
@@ -10,7 +10,8 @@ export * from './overview';
 export * from './first_last_seen';
 
 export enum HostsQueries {
+  authentications = 'authentications',
+  firstLastSeen = 'firstLastSeen',
   hosts = 'hosts',
   hostOverview = 'hostOverview',
-  firstLastSeen = 'firstLastSeen',
 }
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 6905f2be38966d..474002c93f24f7 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
@@ -15,6 +15,10 @@ import {
   HostsRequestOptions,
   HostsStrategyResponse,
 } from './hosts';
+import {
+  AuthenticationsRequestOptions,
+  AuthenticationsStrategyResponse,
+} from './hosts/authentications';
 import {
   NetworkQueries,
   NetworkTlsStrategyResponse,
@@ -38,7 +42,6 @@ export interface TotalValue {
 
 export interface Inspect {
   dsl: string[];
-  response: string[];
 }
 
 export interface PageInfoPaginated {
@@ -96,6 +99,43 @@ export interface DocValueFields {
   format: string;
 }
 
+export interface Explanation {
+  value: number;
+  description: string;
+  details: Explanation[];
+}
+
+export interface TotalValue {
+  value: number;
+  relation: string;
+}
+export interface ShardsResponse {
+  total: number;
+  successful: number;
+  failed: number;
+  skipped: number;
+}
+
+export interface TotalHit {
+  value: number;
+  relation: string;
+}
+
+export interface Hit {
+  _index: string;
+  _type: string;
+  _id: string;
+  _score: number | null;
+}
+
+export interface Hits<T, U> {
+  hits: {
+    total: T;
+    max_score: number | null;
+    hits: U[];
+  };
+}
+
 export interface RequestBasicOptions extends IEsSearchRequest {
   timerange: TimerangeInput;
   filterQuery: ESQuery | string | undefined;
@@ -104,6 +144,8 @@ export interface RequestBasicOptions extends IEsSearchRequest {
   factoryQueryType?: FactoryQueryTypes;
 }
 
+/** A mapping of semantic fields to their document counterparts */
+
 export interface RequestOptions<Field = string> extends RequestBasicOptions {
   pagination: PaginationInput;
   sort: SortField<Field>;
@@ -118,6 +160,8 @@ export type StrategyResponseType<T extends FactoryQueryTypes> = T extends HostsQ
   ? HostsStrategyResponse
   : T extends HostsQueries.hostOverview
   ? HostOverviewStrategyResponse
+  : T extends HostsQueries.authentications
+  ? AuthenticationsStrategyResponse
   : T extends HostsQueries.firstLastSeen
   ? HostFirstLastSeenStrategyResponse
   : T extends NetworkQueries.tls
@@ -130,6 +174,8 @@ export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQu
   ? HostsRequestOptions
   : T extends HostsQueries.hostOverview
   ? HostOverviewRequestOptions
+  : T extends HostsQueries.authentications
+  ? AuthenticationsRequestOptions
   : T extends HostsQueries.firstLastSeen
   ? HostFirstLastSeenRequestOptions
   : T extends NetworkQueries.tls
@@ -138,6 +184,8 @@ export type StrategyRequestType<T extends FactoryQueryTypes> = T extends HostsQu
   ? NetworkHttpRequestOptions
   : never;
 
+export type StringOrNumber = string | number;
+
 export interface GenericBuckets {
   key: string;
   doc_count: number;
diff --git a/x-pack/plugins/security_solution/public/helpers.ts b/x-pack/plugins/security_solution/public/helpers.ts
index 53fe185ef9a658..63c3f3ea81d981 100644
--- a/x-pack/plugins/security_solution/public/helpers.ts
+++ b/x-pack/plugins/security_solution/public/helpers.ts
@@ -6,7 +6,12 @@
 
 import { CoreStart } from '../../../../src/core/public';
 import { APP_ID } from '../common/constants';
+import {
+  FactoryQueryTypes,
+  StrategyResponseType,
+} from '../common/search_strategy/security_solution';
 import { SecurityPageName } from './app/types';
+import { InspectResponse } from './types';
 
 export const manageOldSiemRoutes = async (coreStart: CoreStart) => {
   const { application } = coreStart;
@@ -73,3 +78,11 @@ export const manageOldSiemRoutes = async (coreStart: CoreStart) => {
       break;
   }
 };
+
+export const getInspectResponse = <T extends FactoryQueryTypes>(
+  response: StrategyResponseType<T>,
+  prevResponse: InspectResponse
+): InspectResponse => ({
+  dsl: response?.inspect?.dsl ?? prevResponse?.dsl ?? [],
+  response: response != null ? [JSON.stringify(response, null, 2)] : prevResponse?.response,
+});
diff --git a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx
index e8bd0c58f9ace2..8e2b47769adf3c 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/index.tsx
@@ -10,8 +10,8 @@ import { has } from 'lodash/fp';
 import React, { useCallback, useMemo } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
 
-import { hostsActions, hostsModel, hostsSelectors } from '../../store';
-import { AuthenticationsEdges } from '../../../graphql/types';
+import { AuthenticationsEdges } from '../../../../common/search_strategy/security_solution/hosts/authentications';
+
 import { State } from '../../../common/store';
 import {
   DragEffects,
@@ -24,9 +24,11 @@ import { HostDetailsLink, IPDetailsLink } from '../../../common/components/links
 import { Columns, ItemsPerRow, PaginatedTable } from '../../../common/components/paginated_table';
 import { IS_OPERATOR } from '../../../timelines/components/timeline/data_providers/data_provider';
 import { Provider } from '../../../timelines/components/timeline/data_providers/provider';
+import { getRowItemDraggables } from '../../../common/components/tables/helpers';
+
+import { hostsActions, hostsModel, hostsSelectors } from '../../store';
 
 import * as i18n from './translations';
-import { getRowItemDraggables } from '../../../common/components/tables/helpers';
 
 const tableType = hostsModel.HostsTableType.authentications;
 
diff --git a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/mock.ts b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/mock.ts
index 84682fd14ac6ba..759b34cd258d5d 100644
--- a/x-pack/plugins/security_solution/public/hosts/components/authentications_table/mock.ts
+++ b/x-pack/plugins/security_solution/public/hosts/components/authentications_table/mock.ts
@@ -3,11 +3,34 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { SearchResponse } from 'elasticsearch';
+import { AuthenticationsStrategyResponse } from '../../../../common/search_strategy/security_solution/hosts/authentications';
 
-import { AuthenticationsData } from '../../../graphql/types';
-
-export const mockData: { Authentications: AuthenticationsData } = {
+export const mockData: { Authentications: AuthenticationsStrategyResponse } = {
   Authentications: {
+    rawResponse: {
+      aggregations: {
+        group_by_users: {
+          buckets: [
+            {
+              key: 'SYSTEM',
+              doc_count: 4,
+              failures: {
+                doc_count: 0,
+                lastFailure: { hits: { total: 0, max_score: null, hits: [] } },
+                hits: { total: 0, max_score: null, hits: [] },
+              },
+              successes: {
+                doc_count: 4,
+                lastSuccess: { hits: { total: 4, max_score: null } },
+              },
+            },
+          ],
+          doc_count_error_upper_bound: -1,
+          sum_other_doc_count: 566,
+        },
+      },
+    } as SearchResponse<unknown>,
     totalCount: 54,
     edges: [
       {
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
index efd80c5c590ed6..c11de9100e71ed 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
@@ -4,35 +4,45 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getOr } from 'lodash/fp';
-import React from 'react';
-import { Query } from 'react-apollo';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
+import { noop } from 'lodash/fp';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { shallowEqual, useSelector } from 'react-redux';
+import deepEqual from 'fast-deep-equal';
+
+import { AbortError } from '../../../../../../../src/plugins/data/common';
 
 import { DEFAULT_INDEX_KEY } from '../../../../common/constants';
 import {
-  AuthenticationsEdges,
-  GetAuthenticationsQuery,
+  Direction,
+  DocValueFields,
+  HostPolicyResponseActionStatus,
+  HostsQueries,
   PageInfoPaginated,
-} from '../../../graphql/types';
-import { inputsModel, State, inputsSelectors } from '../../../common/store';
-import { createFilter, getDefaultFetchPolicy } from '../../../common/containers/helpers';
-import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers';
-import { withKibana, WithKibanaProps } from '../../../common/lib/kibana';
+} from '../../../../common/search_strategy/security_solution';
 import {
-  QueryTemplatePaginated,
-  QueryTemplatePaginatedProps,
-} from '../../../common/containers/query_template_paginated';
+  AuthenticationsRequestOptions,
+  AuthenticationsStrategyResponse,
+  AuthenticationsEdges,
+} from '../../../../common/search_strategy/security_solution/hosts/authentications';
+import { ESTermQuery } from '../../../../common/typed_json';
+
+import { inputsModel, State } from '../../../common/store';
+import { createFilter } from '../../../common/containers/helpers';
+import { generateTablePaginationOptions } from '../../../common/components/paginated_table/helpers';
+import { useKibana } from '../../../common/lib/kibana';
+import { getInspectResponse } from '../../../helpers';
+import { InspectResponse } from '../../../types';
+
 import { hostsModel, hostsSelectors } from '../../store';
-import { authenticationsQuery } from './index.gql_query';
+
+import * as i18n from './translations';
 
 const ID = 'authenticationQuery';
 
 export interface AuthenticationArgs {
   authentications: AuthenticationsEdges[];
   id: string;
-  inspect: inputsModel.InspectQuery;
+  inspect: InspectResponse;
   isInspected: boolean;
   loading: boolean;
   loadPage: (newActivePage: number) => void;
@@ -41,115 +51,161 @@ export interface AuthenticationArgs {
   totalCount: number;
 }
 
-export interface OwnProps extends QueryTemplatePaginatedProps {
-  children: (args: AuthenticationArgs) => React.ReactNode;
+interface UseAuthentications {
+  docValueFields?: DocValueFields[];
+  filterQuery?: ESTermQuery | string;
+  endDate: string;
+  startDate: string;
   type: hostsModel.HostsType;
 }
 
-export interface AuthenticationsComponentReduxProps {
-  activePage: number;
-  isInspected: boolean;
-  limit: number;
-}
+export const useAuthentications = ({
+  docValueFields,
+  filterQuery,
+  endDate,
+  startDate,
+  type,
+}: UseAuthentications): [boolean, AuthenticationArgs] => {
+  const getAuthenticationsSelector = hostsSelectors.authenticationsSelector();
+  const { activePage, limit } = useSelector(
+    (state: State) => getAuthenticationsSelector(state, type),
+    shallowEqual
+  );
+  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 [authenticationsRequest, setAuthenticationsRequest] = useState<
+    AuthenticationsRequestOptions
+  >({
+    defaultIndex,
+    docValueFields: docValueFields ?? [],
+    factoryQueryType: HostsQueries.authentications,
+    filterQuery: createFilter(filterQuery),
+    pagination: generateTablePaginationOptions(activePage, limit),
+    timerange: {
+      interval: '12h',
+      from: startDate,
+      to: endDate,
+    },
+    sort: {
+      direction: Direction.desc,
+      field: HostPolicyResponseActionStatus.success,
+    },
+  });
+
+  const wrappedLoadMore = useCallback(
+    (newActivePage: number) => {
+      setAuthenticationsRequest((prevRequest) => {
+        return {
+          ...prevRequest,
+          pagination: generateTablePaginationOptions(newActivePage, limit),
+        };
+      });
+    },
+    [limit]
+  );
+
+  const [authenticationsResponse, setAuthenticationsResponse] = useState<AuthenticationArgs>({
+    authentications: [],
+    id: ID,
+    inspect: {
+      dsl: [],
+      response: [],
+    },
+    isInspected: false,
+    loading: true,
+    loadPage: wrappedLoadMore,
+    pageInfo: {
+      activePage: 0,
+      fakeTotalCount: 0,
+      showMorePagesIndicator: false,
+    },
+    refetch: refetch.current,
+    totalCount: -1,
+  });
 
-type AuthenticationsProps = OwnProps & AuthenticationsComponentReduxProps & WithKibanaProps;
-
-class AuthenticationsComponentQuery extends QueryTemplatePaginated<
-  AuthenticationsProps,
-  GetAuthenticationsQuery.Query,
-  GetAuthenticationsQuery.Variables
-> {
-  public render() {
-    const {
-      activePage,
-      children,
-      docValueFields,
-      endDate,
-      filterQuery,
-      id = ID,
-      isInspected,
-      kibana,
-      limit,
-      skip,
-      sourceId,
-      startDate,
-    } = this.props;
-    const variables: GetAuthenticationsQuery.Variables = {
-      sourceId,
-      timerange: {
-        interval: '12h',
-        from: startDate!,
-        to: endDate!,
-      },
-      pagination: generateTablePaginationOptions(activePage, limit),
-      filterQuery: createFilter(filterQuery),
-      defaultIndex: kibana.services.uiSettings.get<string[]>(DEFAULT_INDEX_KEY),
-      inspect: isInspected,
-      docValueFields: docValueFields ?? [],
-    };
-    return (
-      <Query<GetAuthenticationsQuery.Query, GetAuthenticationsQuery.Variables>
-        query={authenticationsQuery}
-        fetchPolicy={getDefaultFetchPolicy()}
-        notifyOnNetworkStatusChange
-        skip={skip}
-        variables={variables}
-      >
-        {({ data, loading, fetchMore, networkStatus, refetch }) => {
-          const authentications = getOr([], 'source.Authentications.edges', data);
-          this.setFetchMore(fetchMore);
-          this.setFetchMoreOptions((newActivePage: number) => ({
-            variables: {
-              pagination: generateTablePaginationOptions(newActivePage, limit),
+  const authenticationsSearch = useCallback(
+    (request: AuthenticationsRequestOptions) => {
+      let didCancel = false;
+      const asyncSearch = async () => {
+        abortCtrl.current = new AbortController();
+        setLoading(true);
+
+        const searchSubscription$ = data.search
+          .search<AuthenticationsRequestOptions, AuthenticationsStrategyResponse>(request, {
+            strategy: 'securitySolutionSearchStrategy',
+            signal: abortCtrl.current.signal,
+          })
+          .subscribe({
+            next: (response) => {
+              if (!response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                  setAuthenticationsResponse((prevResponse) => ({
+                    ...prevResponse,
+                    authentications: response.edges,
+                    inspect: getInspectResponse(response, prevResponse.inspect),
+                    pageInfo: response.pageInfo,
+                    refetch: refetch.current,
+                    totalCount: response.totalCount,
+                  }));
+                }
+                searchSubscription$.unsubscribe();
+              } else if (response.isPartial && !response.isRunning) {
+                if (!didCancel) {
+                  setLoading(false);
+                }
+                notifications.toasts.addWarning(i18n.ERROR_AUTHENTICATIONS);
+                searchSubscription$.unsubscribe();
+              }
             },
-            updateQuery: (prev, { fetchMoreResult }) => {
-              if (!fetchMoreResult) {
-                return prev;
+            error: (msg) => {
+              if (!(msg instanceof AbortError)) {
+                notifications.toasts.addDanger({
+                  title: i18n.FAIL_AUTHENTICATIONS,
+                  text: msg.message,
+                });
               }
-              return {
-                ...fetchMoreResult,
-                source: {
-                  ...fetchMoreResult.source,
-                  Authentications: {
-                    ...fetchMoreResult.source.Authentications,
-                    edges: [...fetchMoreResult.source.Authentications.edges],
-                  },
-                },
-              };
             },
-          }));
-          const isLoading = this.isItAValidLoading(loading, variables, networkStatus);
-          return children({
-            authentications,
-            id,
-            inspect: getOr(null, 'source.Authentications.inspect', data),
-            isInspected,
-            loading: isLoading,
-            loadPage: this.wrappedLoadMore,
-            pageInfo: getOr({}, 'source.Authentications.pageInfo', data),
-            refetch: this.memoizedRefetchQuery(variables, limit, refetch),
-            totalCount: getOr(-1, 'source.Authentications.totalCount', data),
           });
-        }}
-      </Query>
-    );
-  }
-}
+      };
+      abortCtrl.current.abort();
+      asyncSearch();
+      refetch.current = asyncSearch;
+      return () => {
+        didCancel = true;
+        abortCtrl.current.abort();
+      };
+    },
+    [data.search, notifications.toasts]
+  );
 
-const makeMapStateToProps = () => {
-  const getAuthenticationsSelector = hostsSelectors.authenticationsSelector();
-  const getQuery = inputsSelectors.globalQueryByIdSelector();
-  const mapStateToProps = (state: State, { type, id = ID }: OwnProps) => {
-    const { isInspected } = getQuery(state, id);
-    return {
-      ...getAuthenticationsSelector(state, type),
-      isInspected,
-    };
-  };
-  return mapStateToProps;
-};
+  useEffect(() => {
+    setAuthenticationsRequest((prevRequest) => {
+      const myRequest = {
+        ...prevRequest,
+        defaultIndex,
+        docValueFields: docValueFields ?? [],
+        filterQuery: createFilter(filterQuery),
+        pagination: generateTablePaginationOptions(activePage, limit),
+        timerange: {
+          interval: '12h',
+          from: startDate,
+          to: endDate,
+        },
+      };
+      if (!deepEqual(prevRequest, myRequest)) {
+        return myRequest;
+      }
+      return prevRequest;
+    });
+  }, [activePage, defaultIndex, docValueFields, endDate, filterQuery, limit, startDate]);
 
-export const AuthenticationsQuery = compose<React.ComponentClass<OwnProps>>(
-  connect(makeMapStateToProps),
-  withKibana
-)(AuthenticationsComponentQuery);
+  useEffect(() => {
+    authenticationsSearch(authenticationsRequest);
+  }, [authenticationsRequest, authenticationsSearch]);
+
+  return [loading, authenticationsResponse];
+};
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/authentications/translations.ts b/x-pack/plugins/security_solution/public/hosts/containers/authentications/translations.ts
new file mode 100644
index 00000000000000..95ff6363a38705
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/hosts/containers/authentications/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_AUTHENTICATIONS = i18n.translate(
+  'xpack.securitySolution.authentications.errorSearchDescription',
+  {
+    defaultMessage: `An error has occurred on authentications search`,
+  }
+);
+
+export const FAIL_AUTHENTICATIONS = i18n.translate(
+  'xpack.securitySolution.authentications.failSearchDescription',
+  {
+    defaultMessage: `Failed to run search on authentications`,
+  }
+);
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 6e1ebbfd1e7bb6..bc711d08065e22 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
@@ -26,6 +26,8 @@ import { ESTermQuery } from '../../../../common/typed_json';
 
 import * as i18n from './translations';
 import { AbortError } from '../../../../../../../src/plugins/data/common';
+import { getInspectResponse } from '../../../helpers';
+import { InspectResponse } from '../../../types';
 
 const ID = 'hostsQuery';
 
@@ -34,7 +36,7 @@ export interface HostsArgs {
   endDate: string;
   hosts: HostsEdges[];
   id: string;
-  inspect: inputsModel.InspectQuery;
+  inspect: InspectResponse;
   isInspected: boolean;
   loadPage: LoadPage;
   pageInfo: PageInfoPaginated;
@@ -139,7 +141,7 @@ export const useAllHost = ({
                   setHostsResponse((prevResponse) => ({
                     ...prevResponse,
                     hosts: response.edges,
-                    inspect: response.inspect ?? prevResponse.inspect,
+                    inspect: getInspectResponse(response, prevResponse.inspect),
                     pageInfo: response.pageInfo,
                     refetch: refetch.current,
                     totalCount: response.totalCount,
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
index f766f068f099fc..a72ef0ff1c46e2 100644
--- 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
@@ -22,12 +22,14 @@ import {
 
 import * as i18n from './translations';
 import { AbortError } from '../../../../../../../../src/plugins/data/common';
+import { getInspectResponse } from '../../../../helpers';
+import { InspectResponse } from '../../../../types';
 
 const ID = 'hostOverviewQuery';
 
 export interface HostOverviewArgs {
   id: string;
-  inspect: inputsModel.InspectQuery;
+  inspect: InspectResponse;
   hostOverview: HostItem;
   refetch: inputsModel.Refetch;
   startDate: string;
@@ -97,7 +99,7 @@ export const useHostOverview = ({
                   setHostOverviewResponse((prevResponse) => ({
                     ...prevResponse,
                     hostOverview: response.hostOverview,
-                    inspect: response.inspect ?? prevResponse.inspect,
+                    inspect: getInspectResponse(response, prevResponse.inspect),
                     refetch: refetch.current,
                   }));
                 }
diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/translations.ts b/x-pack/plugins/security_solution/public/hosts/containers/hosts/translations.ts
index ada713d135c227..c8cd36e40d6e0e 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/hosts/translations.ts
+++ b/x-pack/plugins/security_solution/public/hosts/containers/hosts/translations.ts
@@ -19,3 +19,17 @@ export const FAIL_ALL_HOST = i18n.translate(
     defaultMessage: `Failed to run search on all hosts`,
   }
 );
+
+export const ERROR_HOST_OVERVIEW = i18n.translate(
+  'xpack.securitySolution.hostOverview.errorSearchDescription',
+  {
+    defaultMessage: `An error has occurred on host overview search`,
+  }
+);
+
+export const FAIL_HOST_OVERVIEW = i18n.translate(
+  'xpack.securitySolution.hostOverview.failSearchDescription',
+  {
+    defaultMessage: `Failed to run search on host overview`,
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx b/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx
index 6c8eb9eb04941c..084d4b699e8ebd 100644
--- a/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/pages/navigation/authentications_query_tab_body.tsx
@@ -8,7 +8,7 @@ import { getOr } from 'lodash/fp';
 import React, { useEffect } from 'react';
 import { AuthenticationTable } from '../../components/authentications_table';
 import { manageQuery } from '../../../common/components/page/manage_query';
-import { AuthenticationsQuery } from '../../containers/authentications';
+import { useAuthentications } from '../../containers/authentications';
 import { HostsComponentsQueryProps } from './types';
 import { hostsModel } from '../../store';
 import {
@@ -77,6 +77,11 @@ export const AuthenticationsQueryTabBody = ({
     };
   }, [deleteQuery]);
 
+  const [
+    loading,
+    { authentications, totalCount, pageInfo, loadPage, id, inspect, isInspected, refetch },
+  ] = useAuthentications({ docValueFields, endDate, filterQuery, startDate, type });
+
   return (
     <>
       <MatrixHistogramContainer
@@ -89,43 +94,22 @@ export const AuthenticationsQueryTabBody = ({
         type={hostsModel.HostsType.page}
         {...histogramConfigs}
       />
-      <AuthenticationsQuery
-        docValueFields={docValueFields}
-        endDate={endDate}
-        filterQuery={filterQuery}
-        skip={skip}
-        sourceId="default"
-        startDate={startDate}
+
+      <AuthenticationTableManage
+        data={authentications}
+        deleteQuery={deleteQuery}
+        fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
+        id={id}
+        inspect={inspect}
+        isInspect={isInspected}
+        loading={loading}
+        loadPage={loadPage}
+        refetch={refetch}
+        showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
+        setQuery={setQuery}
+        totalCount={totalCount}
         type={type}
-      >
-        {({
-          authentications,
-          totalCount,
-          loading,
-          pageInfo,
-          loadPage,
-          id,
-          inspect,
-          isInspected,
-          refetch,
-        }) => (
-          <AuthenticationTableManage
-            data={authentications}
-            deleteQuery={deleteQuery}
-            fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)}
-            id={id}
-            inspect={inspect}
-            isInspect={isInspected}
-            loading={loading}
-            loadPage={loadPage}
-            refetch={refetch}
-            showMorePagesIndicator={getOr(false, 'showMorePagesIndicator', pageInfo)}
-            setQuery={setQuery}
-            totalCount={totalCount}
-            type={type}
-          />
-        )}
-      </AuthenticationsQuery>
+      />
     </>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
index ae50f6919dce1f..d71953eec026f9 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
@@ -25,13 +25,15 @@ import {
 } from '../../../../common/search_strategy/security_solution';
 import { AbortError } from '../../../../../../../src/plugins/data/common';
 import * as i18n from './translations';
+import { InspectResponse } from '../../../types';
+import { getInspectResponse } from '../../../helpers';
 
 const ID = 'networkHttpQuery';
 
 export interface NetworkHttpArgs {
   id: string;
   ip?: string;
-  inspect: inputsModel.InspectQuery;
+  inspect: InspectResponse;
   isInspected: boolean;
   loadPage: (newActivePage: number) => void;
   networkHttp: NetworkHttpEdges[];
@@ -134,7 +136,7 @@ export const useNetworkHttp = ({
                   setNetworkHttpResponse((prevResponse) => ({
                     ...prevResponse,
                     networkHttp: response.edges,
-                    inspect: response.inspect ?? prevResponse.inspect,
+                    inspect: getInspectResponse(response, prevResponse.inspect),
                     pageInfo: response.pageInfo,
                     refetch: refetch.current,
                     totalCount: response.totalCount,
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
index 77c6446fbb3d05..1c2604ee655521 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -23,7 +23,9 @@ import {
   NetworkTlsStrategyResponse,
 } from '../../../../common/search_strategy/security_solution/network';
 import { AbortError } from '../../../../../../../src/plugins/data/common';
+
 import * as i18n from './translations';
+import { getInspectResponse } from '../../../helpers';
 
 const ID = 'networkTlsQuery';
 
@@ -133,7 +135,7 @@ export const useNetworkTls = ({
                   setNetworkTlsResponse((prevResponse) => ({
                     ...prevResponse,
                     tls: response.edges,
-                    inspect: response.inspect ?? prevResponse.inspect,
+                    inspect: getInspectResponse(response, prevResponse.inspect),
                     pageInfo: response.pageInfo,
                     refetch: refetch.current,
                     totalCount: response.totalCount,
diff --git a/x-pack/plugins/security_solution/public/types.ts b/x-pack/plugins/security_solution/public/types.ts
index d2b66207d86028..4fdacb2621abd4 100644
--- a/x-pack/plugins/security_solution/public/types.ts
+++ b/x-pack/plugins/security_solution/public/types.ts
@@ -22,6 +22,7 @@ import {
 import { SecurityPluginSetup } from '../../security/public';
 import { AppFrontendLibs } from './common/lib/lib';
 import { ResolverPluginSetup } from './resolver/types';
+import { Inspect } from '../common/search_strategy/security_solution';
 
 export interface SetupPlugins {
   home?: HomePublicPluginSetup;
@@ -56,3 +57,5 @@ export interface PluginStart {}
 export interface AppObservableLibs extends AppFrontendLibs {
   kibana: CoreStart;
 }
+
+export type InspectResponse = Inspect & { response: string[] };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/helpers/to_array.ts b/x-pack/plugins/security_solution/server/search_strategy/helpers/to_array.ts
new file mode 100644
index 00000000000000..4da319d5b1e429
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/helpers/to_array.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 const toArray = <T = string>(value: T | T[] | null) =>
+  Array.isArray(value) ? value : value == null ? [] : [value];
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts
new file mode 100644
index 00000000000000..35e4d2cc8e1fea
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.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 { isEmpty } from 'lodash/fp';
+
+import { AuthenticationsRequestOptions } from '../../../../../../../common/search_strategy/security_solution/hosts/authentications';
+import { sourceFieldsMap, hostFieldsMap } from '../../../../../../../common/ecs/ecs_fields';
+
+import { createQueryFilterClauses } from '../../../../../../utils/build_query';
+import { reduceFields } from '../../../../../../utils/build_query/reduce_fields';
+import { extendMap } from '../../../../../../lib/ecs_fields/extend_map';
+
+import { authenticationFields } from '../helpers';
+
+export const auditdFieldsMap: Readonly<Record<string, string>> = {
+  latest: '@timestamp',
+  'lastSuccess.timestamp': 'lastSuccess.@timestamp',
+  'lastFailure.timestamp': 'lastFailure.@timestamp',
+  ...{ ...extendMap('lastSuccess', sourceFieldsMap) },
+  ...{ ...extendMap('lastSuccess', hostFieldsMap) },
+  ...{ ...extendMap('lastFailure', sourceFieldsMap) },
+  ...{ ...extendMap('lastFailure', hostFieldsMap) },
+};
+
+export const buildQuery = ({
+  filterQuery,
+  timerange: { from, to },
+  pagination: { querySize },
+  defaultIndex,
+  docValueFields,
+}: AuthenticationsRequestOptions) => {
+  const esFields = reduceFields(authenticationFields, { ...hostFieldsMap, ...sourceFieldsMap });
+
+  const filter = [
+    ...createQueryFilterClauses(filterQuery),
+    { term: { 'event.category': 'authentication' } },
+    {
+      range: {
+        '@timestamp': {
+          gte: from,
+          lte: to,
+          format: 'strict_date_optional_time',
+        },
+      },
+    },
+  ];
+
+  const agg = {
+    user_count: {
+      cardinality: {
+        field: 'user.name',
+      },
+    },
+  };
+
+  const dslQuery = {
+    allowNoIndices: true,
+    index: defaultIndex,
+    ignoreUnavailable: true,
+    body: {
+      ...(isEmpty(docValueFields) ? { docvalue_fields: docValueFields } : {}),
+      aggregations: {
+        ...agg,
+        group_by_users: {
+          terms: {
+            size: querySize,
+            field: 'user.name',
+            order: [{ 'successes.doc_count': 'desc' }, { 'failures.doc_count': 'desc' }],
+          },
+          aggs: {
+            failures: {
+              filter: {
+                term: {
+                  'event.outcome': 'failure',
+                },
+              },
+              aggs: {
+                lastFailure: {
+                  top_hits: {
+                    size: 1,
+                    _source: esFields,
+                    sort: [{ '@timestamp': { order: 'desc' } }],
+                  },
+                },
+              },
+            },
+            successes: {
+              filter: {
+                term: {
+                  'event.outcome': 'success',
+                },
+              },
+              aggs: {
+                lastSuccess: {
+                  top_hits: {
+                    size: 1,
+                    _source: esFields,
+                    sort: [{ '@timestamp': { order: 'desc' } }],
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+      query: {
+        bool: {
+          filter,
+        },
+      },
+      size: 0,
+    },
+    track_total_hits: false,
+  };
+
+  return dslQuery;
+};
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/helpers.ts
new file mode 100644
index 00000000000000..722445a7275a14
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/helpers.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 { get, getOr } from 'lodash/fp';
+import { set } from '@elastic/safer-lodash-set/fp';
+import { mergeFieldsWithHit } from '../../../../../utils/build_query';
+import {
+  AuthenticationsEdges,
+  AuthenticationHit,
+  AuthenticationBucket,
+} from '../../../../../../common/search_strategy/security_solution/hosts/authentications';
+import { toArray } from '../../../../helpers/to_array';
+import {
+  FactoryQueryTypes,
+  StrategyResponseType,
+} from '../../../../../../common/search_strategy/security_solution';
+
+export const authenticationFields = [
+  '_id',
+  'failures',
+  'successes',
+  'user.name',
+  'lastSuccess.timestamp',
+  'lastSuccess.source.ip',
+  'lastSuccess.host.id',
+  'lastSuccess.host.name',
+  'lastFailure.timestamp',
+  'lastFailure.source.ip',
+  'lastFailure.host.id',
+  'lastFailure.host.name',
+];
+
+export const formatAuthenticationData = (
+  hit: AuthenticationHit,
+  fieldMap: Readonly<Record<string, string>>
+): AuthenticationsEdges =>
+  authenticationFields.reduce<AuthenticationsEdges>(
+    (flattenedFields, fieldName) => {
+      if (hit.cursor) {
+        flattenedFields.cursor.value = hit.cursor;
+      }
+      flattenedFields.node = {
+        ...flattenedFields.node,
+        ...{
+          _id: hit._id,
+          user: { name: [hit.user] },
+          failures: hit.failures,
+          successes: hit.successes,
+        },
+      };
+      const mergedResult = mergeFieldsWithHit(fieldName, flattenedFields, fieldMap, hit);
+      const fieldPath = `node.${fieldName}`;
+      const fieldValue = get(fieldPath, mergedResult);
+
+      return set(fieldPath, toArray(fieldValue), mergedResult);
+    },
+    {
+      node: {
+        failures: 0,
+        successes: 0,
+        _id: '',
+        user: {
+          name: [''],
+        },
+      },
+      cursor: {
+        value: '',
+        tiebreaker: null,
+      },
+    }
+  );
+
+export const getHits = <T extends FactoryQueryTypes>(response: StrategyResponseType<T>) =>
+  getOr([], 'aggregations.group_by_users.buckets', response.rawResponse).map(
+    (bucket: AuthenticationBucket) => ({
+      _id: getOr(
+        `${bucket.key}+${bucket.doc_count}`,
+        'failures.lastFailure.hits.hits[0].id',
+        bucket
+      ),
+      _source: {
+        lastSuccess: getOr(null, 'successes.lastSuccess.hits.hits[0]._source', bucket),
+        lastFailure: getOr(null, 'failures.lastFailure.hits.hits[0]._source', bucket),
+      },
+      user: bucket.key,
+      failures: bucket.failures.doc_count,
+      successes: bucket.successes.doc_count,
+    })
+  );
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/index.tsx b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/index.tsx
new file mode 100644
index 00000000000000..d07c239dfab865
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/index.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 { getOr } from 'lodash/fp';
+
+import { IEsSearchResponse } from '../../../../../../../../../src/plugins/data/common';
+
+import { DEFAULT_MAX_TABLE_QUERY_SIZE } from '../../../../../../common/constants';
+import { HostsQueries } from '../../../../../../common/search_strategy/security_solution';
+import {
+  AuthenticationsEdges,
+  AuthenticationsRequestOptions,
+  AuthenticationsStrategyResponse,
+  AuthenticationHit,
+} from '../../../../../../common/search_strategy/security_solution/hosts/authentications';
+
+import { inspectStringifyObject } from '../../../../../utils/build_query';
+import { SecuritySolutionFactory } from '../../types';
+import { auditdFieldsMap, buildQuery as buildAuthenticationQuery } from './dsl/query.dsl';
+import { formatAuthenticationData, getHits } from './helpers';
+
+export const authentications: SecuritySolutionFactory<HostsQueries.authentications> = {
+  buildDsl: (options: AuthenticationsRequestOptions) => {
+    if (options.pagination && options.pagination.querySize >= DEFAULT_MAX_TABLE_QUERY_SIZE) {
+      throw new Error(`No query size above ${DEFAULT_MAX_TABLE_QUERY_SIZE}`);
+    }
+
+    return buildAuthenticationQuery(options);
+  },
+  parse: async (
+    options: AuthenticationsRequestOptions,
+    response: IEsSearchResponse<unknown>
+  ): Promise<AuthenticationsStrategyResponse> => {
+    const { activePage, cursorStart, fakePossibleCount, querySize } = options.pagination;
+    const totalCount = getOr(0, 'aggregations.user_count.value', response.rawResponse);
+
+    const fakeTotalCount = fakePossibleCount <= totalCount ? fakePossibleCount : totalCount;
+    const hits: AuthenticationHit[] = getHits(response);
+    const authenticationEdges: AuthenticationsEdges[] = hits.map((hit) =>
+      formatAuthenticationData(hit, auditdFieldsMap)
+    );
+
+    const edges = authenticationEdges.splice(cursorStart, querySize - cursorStart);
+    const inspect = {
+      dsl: [inspectStringifyObject(buildAuthenticationQuery(options))],
+    };
+    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/helpers.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/helpers.ts
index a7ec822839d21a..48e210d8229181 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/helpers.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/helpers.ts
@@ -13,6 +13,8 @@ import { hostFieldsMap } from '../../../../lib/ecs_fields';
 
 import { HostAggEsItem, HostBuckets, HostValue } from '../../../../lib/hosts/types';
 
+import { toArray } from '../../../helpers/to_array';
+
 const hostsFields = ['_id', 'lastSeen', 'host.id', 'host.name', 'host.os.name', 'host.os.version'];
 
 export const formatHostEdgesData = (bucket: HostAggEsItem): HostsEdges =>
@@ -23,11 +25,7 @@ export const formatHostEdgesData = (bucket: HostAggEsItem): HostsEdges =>
       flattenedFields.cursor.value = hostId || '';
       const fieldValue = getHostFieldValue(fieldName, bucket);
       if (fieldValue != null) {
-        return set(
-          `node.${fieldName}`,
-          Array.isArray(fieldValue) ? fieldValue : [fieldValue],
-          flattenedFields
-        );
+        return set(`node.${fieldName}`, toArray(fieldValue), flattenedFields);
       }
       return flattenedFields;
     },
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 34676fc1932fed..ddd2a458b3b8c4 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
@@ -11,9 +11,11 @@ import { SecuritySolutionFactory } from '../types';
 import { allHosts } from './all';
 import { overviewHost } from './overview';
 import { firstLastSeenHost } from './last_first_seen';
+import { authentications } from './authentications';
 
 export const hostsFactory: Record<HostsQueries, SecuritySolutionFactory<FactoryQueryTypes>> = {
   [HostsQueries.hosts]: allHosts,
   [HostsQueries.hostOverview]: overviewHost,
   [HostsQueries.firstLastSeen]: firstLastSeenHost,
+  [HostsQueries.authentications]: authentications,
 };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
index b6c26cd533de23..c0205ccce63ccd 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/network/http/index.ts
@@ -40,7 +40,6 @@ export const networkHttp: SecuritySolutionFactory<NetworkQueries.http> = {
     const edges = networkHttpEdges.splice(cursorStart, querySize - cursorStart);
     const inspect = {
       dsl: [inspectStringifyObject(buildHttpQuery(options))],
-      response: [inspectStringifyObject(response)],
     };
     const showMorePagesIndicator = totalCount > fakeTotalCount;
 

From aeba68464e087cea6bb5d83e8d0e2eaae647c048 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 2 Sep 2020 17:23:45 +0200
Subject: [PATCH 182/216] Bump buffer from v5.2.1 to v5.6.0 (#76478)

---
 yarn.lock | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3be2599c64201d..9ab1de22af57ce 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7791,15 +7791,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.1.0, buffer@^5.2.0:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
-  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
-buffer@^5.5.0:
+buffer@^5.1.0, buffer@^5.2.0, 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==

From 46689b33488fa76e17b5f2d0028d483af5833cf3 Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 2 Sep 2020 17:24:12 +0200
Subject: [PATCH 183/216] Bump readable-stream to newest 2.x and 3.x versions
 (#76480)

---
 yarn.lock | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 9ab1de22af57ce..a37ae19b15a06e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24179,7 +24179,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.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@^2.3.7, readable-stream@~2.3.3, readable-stream@~2.3.6:
   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==
@@ -24202,29 +24202,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.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==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
-  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.3"
-    isarray "~1.0.0"
-    process-nextick-args "~2.0.0"
-    safe-buffer "~5.1.1"
-    string_decoder "~1.1.1"
-    util-deprecate "~1.0.1"
-
-readable-stream@^3.0.2:
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.4.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==

From 34664360312f03c73bf0805115a27c41242e5066 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Wed, 2 Sep 2020 08:53:23 -0700
Subject: [PATCH 184/216] [Enterprise Search] Add 404 pages (#76404)

* Add new 404 NotFound shared view

* Add new telemetry ui_error.not_found metric

* Add check for licensed users who should be sent to support.elastic.co
---
 .../enterprise_search/common/constants.ts     |   4 +
 .../public/applications/app_search/index.tsx  |   4 +
 .../applications/shared/licensing/index.ts    |   2 +-
 .../shared/licensing/license_checks.test.ts   |  23 +++-
 .../shared/licensing/license_checks.ts        |   8 +-
 .../not_found/assets/app_search_logo.tsx      |  32 +++++
 .../shared/not_found/assets/logo.scss         |  21 ++++
 .../assets/workplace_search_logo.tsx          |  38 ++++++
 .../applications/shared/not_found/index.ts    |   7 ++
 .../shared/not_found/not_found.test.tsx       |  65 +++++++++++
 .../shared/not_found/not_found.tsx            | 110 ++++++++++++++++++
 .../applications/workplace_search/index.tsx   |   5 +
 .../collectors/app_search/telemetry.test.ts   |   3 +
 .../server/collectors/app_search/telemetry.ts |   4 +
 .../workplace_search/telemetry.test.ts        |   3 +
 .../collectors/workplace_search/telemetry.ts  |   4 +
 .../schema/xpack_plugins.json                 |   6 +
 17 files changed, 336 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx

diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
index c5839df4c603b3..05d27d7337a6ef 100644
--- a/x-pack/plugins/enterprise_search/common/constants.ts
+++ b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -24,6 +24,7 @@ export const APP_SEARCH_PLUGIN = {
       'Leverage dashboards, analytics, and APIs for advanced application search made simple.',
   }),
   URL: '/app/enterprise_search/app_search',
+  SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/app-search/',
 };
 
 export const WORKPLACE_SEARCH_PLUGIN = {
@@ -36,8 +37,11 @@ export const WORKPLACE_SEARCH_PLUGIN = {
       'Search all documents, files, and sources available across your virtual workplace.',
   }),
   URL: '/app/enterprise_search/workplace_search',
+  SUPPORT_URL: 'https://discuss.elastic.co/c/enterprise-search/workplace-search/',
 };
 
+export const LICENSED_SUPPORT_URL = 'https://support.elastic.co';
+
 export const JSON_HEADER = { 'Content-Type': 'application/json' }; // This needs specific casing or Chrome throws a 415 error
 
 export const ENGINES_PAGE_SIZE = 10;
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 6575e44f509ebc..c4a366930d22aa 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
@@ -29,6 +29,7 @@ import {
 
 import { SetupGuide } from './components/setup_guide';
 import { ErrorConnecting } from './components/error_connecting';
+import { NotFound } from '../shared/not_found';
 import { EngineOverview } from './components/engine_overview';
 
 export const AppSearch: React.FC<IInitialAppData> = (props) => {
@@ -73,6 +74,9 @@ export const AppSearchConfigured: React.FC<IInitialAppData> = (props) => {
               <Route exact path={ENGINES_PATH}>
                 <EngineOverview />
               </Route>
+              <Route>
+                <NotFound product={APP_SEARCH_PLUGIN} />
+              </Route>
             </Switch>
           )}
         </Layout>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/index.ts
index 9c8c1417d48db2..29c11ffa1cef8c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/index.ts
@@ -5,4 +5,4 @@
  */
 
 export { LicenseContext, LicenseProvider, ILicenseContext } from './license_context';
-export { hasPlatinumLicense } from './license_checks';
+export { hasPlatinumLicense, hasGoldLicense } from './license_checks';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.test.ts
index ad134e7d36b10c..40f0f6380c21cd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { hasPlatinumLicense } from './license_checks';
+import { hasPlatinumLicense, hasGoldLicense } from './license_checks';
 
 describe('hasPlatinumLicense', () => {
   it('is true for platinum licenses', () => {
@@ -31,3 +31,24 @@ describe('hasPlatinumLicense', () => {
     expect(hasPlatinumLicense({ isActive: true, type: 'gold' } as any)).toEqual(false);
   });
 });
+
+describe('hasGoldLicense', () => {
+  it('is true for gold+ and trial licenses', () => {
+    expect(hasGoldLicense({ isActive: true, type: 'gold' } as any)).toEqual(true);
+    expect(hasGoldLicense({ isActive: true, type: 'platinum' } as any)).toEqual(true);
+    expect(hasGoldLicense({ isActive: true, type: 'enterprise' } as any)).toEqual(true);
+    expect(hasGoldLicense({ isActive: true, type: 'trial' } as any)).toEqual(true);
+  });
+
+  it('is false if the current license is expired', () => {
+    expect(hasGoldLicense({ isActive: false, type: 'gold' } as any)).toEqual(false);
+    expect(hasGoldLicense({ isActive: false, type: 'platinum' } as any)).toEqual(false);
+    expect(hasGoldLicense({ isActive: false, type: 'enterprise' } as any)).toEqual(false);
+    expect(hasGoldLicense({ isActive: false, type: 'trial' } as any)).toEqual(false);
+  });
+
+  it('is false for licenses below gold', () => {
+    expect(hasGoldLicense({ isActive: true, type: 'basic' } as any)).toEqual(false);
+    expect(hasGoldLicense({ isActive: false, type: 'standard' } as any)).toEqual(false);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.ts
index de4a17ce2bd3c1..d13d0909243be7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/license_checks.ts
@@ -7,5 +7,11 @@
 import { ILicense } from '../../../../../licensing/public';
 
 export const hasPlatinumLicense = (license?: ILicense) => {
-  return license?.isActive && ['platinum', 'enterprise', 'trial'].includes(license?.type as string);
+  const qualifyingLicenses = ['platinum', 'enterprise', 'trial'];
+  return license?.isActive && qualifyingLicenses.includes(license?.type as string);
+};
+
+export const hasGoldLicense = (license?: ILicense) => {
+  const qualifyingLicenses = ['gold', 'platinum', 'enterprise', 'trial'];
+  return license?.isActive && qualifyingLicenses.includes(license?.type as string);
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx
new file mode 100644
index 00000000000000..6bd0486532576d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/app_search_logo.tsx
@@ -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 React from 'react';
+
+export const AppSearchLogo: React.FC = () => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    width="136"
+    height="136"
+    viewBox="0 0 136 136"
+    className="logo404"
+    aria-hidden="true"
+  >
+    <rect x="1" y="1" width="134" height="134" rx="67" strokeWidth="2" strokeDasharray="8 4" />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M105.305 43.282l2.934-1.692c3.015 3.693 4.761 8.35 4.761 13.267V82.57a21 21 0 01-10.5 18.186L80 113.747V73.934c0-4.93-1.753-9.588-4.774-13.284l30.079-17.367zM66.5 55.747A21 21 0 0056 73.933v39.817l-22.5-12.993A21.001 21.001 0 0123 82.57V54.86c0-7.503 4.002-14.44 10.5-18.19l1.478-.853.022.014 33 19.05-1.5.867z"
+      className="logo404__light"
+    />
+    <path
+      d="M78.5 22.813a21.007 21.007 0 00-21 0L35 35.83l33 19.05 33.001-19.05-22.5-13.017z"
+      fillRule="evenodd"
+      clipRule="evenodd"
+      className="logo404__dark"
+    />
+  </svg>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss
new file mode 100644
index 00000000000000..322e6a4182c5c1
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/logo.scss
@@ -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.
+ */
+
+.logo404 {
+  width: $euiSize * 8;
+  height: $euiSize * 8;
+
+  fill: $euiColorEmptyShade;
+  stroke: $euiColorLightShade;
+
+  &__light {
+    fill: $euiColorLightShade;
+  }
+
+  &__dark {
+    fill: $euiColorMediumShade;
+  }
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx
new file mode 100644
index 00000000000000..30bcf9ad2d7fda
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/assets/workplace_search_logo.tsx
@@ -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 React from 'react';
+
+export const WorkplaceSearchLogo: React.FC = () => (
+  <svg
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    width="137"
+    height="137"
+    viewBox="0 0 137 137"
+    className="logo404"
+    aria-hidden="true"
+  >
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M136.886 72.486l-1.997-.115a67.11 67.11 0 000-7.742l1.997-.115a69.278 69.278 0 010 7.972zm-.343-11.943l-1.987.23a66.084 66.084 0 00-1.335-7.617l1.947-.46a68.478 68.478 0 011.375 7.847zm-2.404-11.696l-1.916.573a65.939 65.939 0 00-2.645-7.265l1.836-.794a67.996 67.996 0 012.725 7.486zm-4.412-11.096l-1.786.899a66.668 66.668 0 00-3.873-6.694l1.67-1.101a68.365 68.365 0 013.989 6.896zm-6.278-10.158l-1.603 1.195a66.966 66.966 0 00-4.975-5.923l1.454-1.372a68.733 68.733 0 015.124 6.1zm-7.941-8.918l-1.373 1.454a66.818 66.818 0 00-5.924-4.975l1.196-1.603a68.803 68.803 0 016.101 5.124zm-9.363-7.413l-1.101 1.67A66.34 66.34 0 0098.35 9.06l.9-1.786a68.38 68.38 0 016.895 3.99zM95.638 5.586l-.793 1.836a66 66 0 00-7.265-2.645l.573-1.916a67.995 67.995 0 017.485 2.725zM84.304 1.832l-.46 1.947a66.263 66.263 0 00-7.617-1.335l.23-1.987c2.665.309 5.284.77 7.847 1.375zM72.486.114l-.115 1.997a67.582 67.582 0 00-7.742 0L64.514.114a69.582 69.582 0 017.972 0zM60.543.457l.23 1.987c-2.588.3-5.13.747-7.617 1.335l-.46-1.947A68.267 68.267 0 0160.543.457zM48.847 2.861l.573 1.916a65.986 65.986 0 00-7.265 2.645l-.794-1.836a67.995 67.995 0 017.486-2.725zM37.75 7.273l.899 1.786a66.406 66.406 0 00-6.694 3.873l-1.101-1.67a68.42 68.42 0 016.896-3.99zM27.593 13.55l1.195 1.603a66.85 66.85 0 00-5.923 4.975l-1.372-1.454a68.853 68.853 0 016.1-5.124zm-8.918 7.941l1.454 1.373a66.866 66.866 0 00-4.975 5.924l-1.603-1.196a68.855 68.855 0 015.124-6.1zm-7.413 9.363l1.67 1.1A66.423 66.423 0 009.06 38.65l-1.786-.9a68.424 68.424 0 013.99-6.895zM5.586 41.361l1.836.794a66 66 0 00-2.645 7.265l-1.916-.573a67.995 67.995 0 012.725-7.486zM1.832 52.697l1.947.46a66.263 66.263 0 00-1.335 7.617l-1.987-.23c.309-2.665.77-5.284 1.375-7.847zM.114 64.514a69.582 69.582 0 000 7.972l1.997-.115a67.582 67.582 0 010-7.742l-1.997-.115zm.343 11.943l1.987-.23c.3 2.588.747 5.13 1.335 7.617l-1.947.46a68.267 68.267 0 01-1.375-7.847zm2.404 11.696l1.916-.573a66 66 0 002.645 7.266l-1.836.792a67.995 67.995 0 01-2.725-7.485zM7.273 99.25l1.786-.898a66.323 66.323 0 003.873 6.693l-1.67 1.101a68.378 68.378 0 01-3.99-6.895zm6.278 10.158l1.603-1.196a66.801 66.801 0 004.975 5.924l-1.454 1.373a68.803 68.803 0 01-5.124-6.101zm7.941 8.918l1.373-1.454a66.966 66.966 0 005.924 4.975l-1.196 1.603a68.734 68.734 0 01-6.1-5.124zm9.363 7.413l1.1-1.67a66.668 66.668 0 006.695 3.873l-.9 1.786a68.354 68.354 0 01-6.895-3.989zm10.506 5.676l.794-1.836a65.953 65.953 0 007.265 2.645l-.573 1.916a67.996 67.996 0 01-7.486-2.725zm11.335 3.754l.46-1.947a66.084 66.084 0 007.617 1.335l-.23 1.987a68.478 68.478 0 01-7.847-1.375zm11.818 1.718l.115-1.997a67.11 67.11 0 007.742 0l.115 1.997a69.278 69.278 0 01-7.972 0zm11.943-.343l-.23-1.987a66.084 66.084 0 007.617-1.335l.46 1.947a68.478 68.478 0 01-7.847 1.375zm11.696-2.404l-.573-1.916a65.953 65.953 0 007.266-2.645l.792 1.836a67.996 67.996 0 01-7.485 2.725zm11.096-4.412l-.898-1.786a66.584 66.584 0 006.693-3.873l1.101 1.67a68.31 68.31 0 01-6.895 3.989zm10.158-6.278l-1.196-1.603a66.918 66.918 0 005.924-4.975l1.373 1.454a68.682 68.682 0 01-6.101 5.124zm8.918-7.941l-1.454-1.373a66.918 66.918 0 004.975-5.924l1.603 1.196a68.682 68.682 0 01-5.124 6.101zm7.413-9.363l-1.67-1.101a66.584 66.584 0 003.873-6.694l1.786.9a68.31 68.31 0 01-3.989 6.895zm5.676-10.507l-1.836-.793a65.953 65.953 0 002.645-7.265l1.916.573a67.996 67.996 0 01-2.725 7.485zm3.754-11.334l-1.947-.46a66.084 66.084 0 001.335-7.617l1.987.23a68.478 68.478 0 01-1.375 7.847zM72.406 44.047c.372-.442 1-1.12 1.881-2.034 2.332-2.413 7.462-6.825 11.778-6.825h13.56v65.624H86.062c-4.313 0-8.739-3.17-11.775-6.794l-1.671-2.301 6.016-7.606c7.573-9.573 7.575-22.601.002-32.172l-6.228-7.892z"
+      className="logo404__light"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M38.375 100.812V35.188h12.71c3.74 0 7.328 1.719 9.596 4.593l12.808 16.232c5.683 7.181 5.683 16.839-.005 24.025L60.677 96.232c-2.269 2.868-5.852 4.58-9.582 4.58h-12.72z"
+      className="logo404__light"
+    />
+    <path
+      fillRule="evenodd"
+      clipRule="evenodd"
+      d="M67.653 87.447l-7.075-6.978c-6.274-7.258-6.274-17.981.005-24.767 3.357-3.585 5.711-5.946 7.065-7.083l5.84 7.083c5.77 7.405 5.634 17.471-.135 24.88l-5.703 6.863.002.002z"
+      className="logo404__dark"
+    />
+  </svg>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/index.ts
new file mode 100644
index 00000000000000..dcc7762b932141
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/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 { NotFound } from './not_found';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
new file mode 100644
index 00000000000000..ce9071ad7b9d0c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
@@ -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 '../../__mocks__/shallow_usecontext.mock';
+
+import React, { useContext } from 'react';
+import { shallow } from 'enzyme';
+
+import { EuiButton as EuiButtonExternal, EuiEmptyPrompt } from '@elastic/eui';
+
+import { APP_SEARCH_PLUGIN, WORKPLACE_SEARCH_PLUGIN } from '../../../../common/constants';
+import { AppSearchLogo } from './assets/app_search_logo';
+import { WorkplaceSearchLogo } from './assets/workplace_search_logo';
+
+import { NotFound } from './';
+
+describe('NotFound', () => {
+  const basicLicense = { isActive: true, type: 'basic' };
+  const goldLicense = { isActive: true, type: 'gold' };
+
+  beforeEach(() => {
+    (useContext as jest.Mock).mockImplementation(() => ({ license: basicLicense }));
+  });
+
+  it('renders an App Search 404 view', () => {
+    const wrapper = shallow(<NotFound product={APP_SEARCH_PLUGIN} />);
+    const prompt = wrapper.find(EuiEmptyPrompt).dive().shallow();
+
+    expect(prompt.find('h2').text()).toEqual('404 error');
+    expect(prompt.find(EuiButtonExternal).prop('href')).toEqual(APP_SEARCH_PLUGIN.SUPPORT_URL);
+
+    const logo = prompt.find(AppSearchLogo).dive().shallow();
+    expect(logo.type()).toEqual('svg');
+  });
+
+  it('renders a Workplace Search 404 view', () => {
+    const wrapper = shallow(<NotFound product={WORKPLACE_SEARCH_PLUGIN} />);
+    const prompt = wrapper.find(EuiEmptyPrompt).dive().shallow();
+
+    expect(prompt.find('h2').text()).toEqual('404 error');
+    expect(prompt.find(EuiButtonExternal).prop('href')).toEqual(
+      WORKPLACE_SEARCH_PLUGIN.SUPPORT_URL
+    );
+
+    const logo = prompt.find(WorkplaceSearchLogo).dive().shallow();
+    expect(logo.type()).toEqual('svg');
+  });
+
+  it('changes the support URL if the user has a gold+ license', () => {
+    (useContext as jest.Mock).mockImplementation(() => ({ license: goldLicense }));
+    const wrapper = shallow(<NotFound product={APP_SEARCH_PLUGIN} />);
+    const prompt = wrapper.find(EuiEmptyPrompt).dive().shallow();
+
+    expect(prompt.find(EuiButtonExternal).prop('href')).toEqual('https://support.elastic.co');
+  });
+
+  it('does not render anything without a valid product', () => {
+    const wrapper = shallow(<NotFound product={undefined as any} />);
+
+    expect(wrapper.isEmptyRender()).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx
new file mode 100644
index 00000000000000..bd988854225fbd
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.tsx
@@ -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 React, { useContext } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiPageContent,
+  EuiEmptyPrompt,
+  EuiTitle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButton as EuiButtonExternal,
+} from '@elastic/eui';
+
+import {
+  APP_SEARCH_PLUGIN,
+  WORKPLACE_SEARCH_PLUGIN,
+  LICENSED_SUPPORT_URL,
+} from '../../../../common/constants';
+
+import { EuiButton } from '../react_router_helpers';
+import { SetAppSearchChrome, SetWorkplaceSearchChrome } from '../kibana_chrome';
+import { SendAppSearchTelemetry, SendWorkplaceSearchTelemetry } from '../telemetry';
+import { LicenseContext, ILicenseContext, hasGoldLicense } from '../licensing';
+
+import { AppSearchLogo } from './assets/app_search_logo';
+import { WorkplaceSearchLogo } from './assets/workplace_search_logo';
+import './assets/logo.scss';
+
+interface NotFoundProps {
+  // Expects product plugin constants (@see common/constants.ts)
+  product: {
+    ID: string;
+    SUPPORT_URL: string;
+  };
+}
+
+export const NotFound: React.FC<NotFoundProps> = ({ product = {} }) => {
+  const { license } = useContext(LicenseContext) as ILicenseContext;
+  const supportUrl = hasGoldLicense(license) ? LICENSED_SUPPORT_URL : product.SUPPORT_URL;
+
+  let Logo;
+  let SetPageChrome;
+  let SendTelemetry;
+
+  switch (product.ID) {
+    case APP_SEARCH_PLUGIN.ID:
+      Logo = AppSearchLogo;
+      SetPageChrome = SetAppSearchChrome;
+      SendTelemetry = SendAppSearchTelemetry;
+      break;
+    case WORKPLACE_SEARCH_PLUGIN.ID:
+      Logo = WorkplaceSearchLogo;
+      SetPageChrome = SetWorkplaceSearchChrome;
+      SendTelemetry = SendWorkplaceSearchTelemetry;
+      break;
+    default:
+      return null;
+  }
+
+  return (
+    <>
+      <SetPageChrome isRoot />
+      <SendTelemetry action="error" metric="not_found" />
+
+      <EuiPageContent>
+        <EuiEmptyPrompt
+          title={<Logo />}
+          body={
+            <>
+              <EuiTitle>
+                <h2>
+                  {i18n.translate('xpack.enterpriseSearch.notFound.title', {
+                    defaultMessage: '404 error',
+                  })}
+                </h2>
+              </EuiTitle>
+              <p>
+                {i18n.translate('xpack.enterpriseSearch.notFound.description', {
+                  defaultMessage: 'The page you’re looking for was not found.',
+                })}
+              </p>
+            </>
+          }
+          actions={
+            <EuiFlexGroup>
+              <EuiFlexItem>
+                <EuiButton to="/" color="primary" fill>
+                  {i18n.translate('xpack.enterpriseSearch.notFound.action1', {
+                    defaultMessage: 'Back to your dashboard',
+                  })}
+                </EuiButton>
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiButtonExternal href={supportUrl} target="_blank">
+                  {i18n.translate('xpack.enterpriseSearch.notFound.action2', {
+                    defaultMessage: 'Contact support',
+                  })}
+                </EuiButtonExternal>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          }
+        />
+      </EuiPageContent>
+    </>
+  );
+};
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 23e24e343937d4..6a51b49869eafb 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
@@ -8,6 +8,7 @@ import React, { useContext, useEffect } from 'react';
 import { Route, Redirect, Switch } from 'react-router-dom';
 import { useActions, useValues } from 'kea';
 
+import { WORKPLACE_SEARCH_PLUGIN } from '../../../common/constants';
 import { IInitialAppData } from '../../../common/types';
 import { KibanaContext, IKibanaContext } from '../index';
 import { HttpLogic } from '../shared/http';
@@ -19,6 +20,7 @@ import { SETUP_GUIDE_PATH } from './routes';
 
 import { SetupGuide } from './views/setup_guide';
 import { ErrorState } from './views/error_state';
+import { NotFound } from '../shared/not_found';
 import { Overview } from './views/overview';
 
 export const WorkplaceSearch: React.FC<IInitialAppData> = (props) => {
@@ -53,6 +55,9 @@ export const WorkplaceSearchConfigured: React.FC<IInitialAppData> = (props) => {
                 {/* Will replace with groups component subsequent PR */}
                 <div />
               </Route>
+              <Route>
+                <NotFound product={WORKPLACE_SEARCH_PLUGIN} />
+              </Route>
             </Switch>
           )}
         </Layout>
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 189f8278f1b070..6532e06f7051cf 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
@@ -22,6 +22,7 @@ describe('App Search Telemetry Usage Collector', () => {
         'ui_viewed.setup_guide': 10,
         'ui_viewed.engines_overview': 20,
         'ui_error.cannot_connect': 3,
+        'ui_error.not_found': 7,
         'ui_clicked.create_first_engine_button': 40,
         'ui_clicked.header_launch_button': 50,
         'ui_clicked.engine_table_link': 60,
@@ -60,6 +61,7 @@ describe('App Search Telemetry Usage Collector', () => {
         },
         ui_error: {
           cannot_connect: 3,
+          not_found: 7,
         },
         ui_clicked: {
           create_first_engine_button: 40,
@@ -86,6 +88,7 @@ describe('App Search Telemetry Usage Collector', () => {
         },
         ui_error: {
           cannot_connect: 0,
+          not_found: 0,
         },
         ui_clicked: {
           create_first_engine_button: 0,
diff --git a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
index f700088cb67a03..ede776b6e0dce1 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/app_search/telemetry.ts
@@ -17,6 +17,7 @@ interface ITelemetry {
   };
   ui_error: {
     cannot_connect: number;
+    not_found: number;
   };
   ui_clicked: {
     create_first_engine_button: number;
@@ -47,6 +48,7 @@ export const registerTelemetryUsageCollector = (
       },
       ui_error: {
         cannot_connect: { type: 'long' },
+        not_found: { type: 'long' },
       },
       ui_clicked: {
         create_first_engine_button: { type: 'long' },
@@ -77,6 +79,7 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart, log
     },
     ui_error: {
       cannot_connect: 0,
+      not_found: 0,
     },
     ui_clicked: {
       create_first_engine_button: 0,
@@ -97,6 +100,7 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart, log
     },
     ui_error: {
       cannot_connect: get(savedObjectAttributes, 'ui_error.cannot_connect', 0),
+      not_found: get(savedObjectAttributes, 'ui_error.not_found', 0),
     },
     ui_clicked: {
       create_first_engine_button: get(
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 8960d6fa9b67b4..f7d73cb232b8dd 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
@@ -22,6 +22,7 @@ describe('Workplace Search Telemetry Usage Collector', () => {
         'ui_viewed.setup_guide': 10,
         'ui_viewed.overview': 20,
         'ui_error.cannot_connect': 3,
+        'ui_error.not_found': 7,
         'ui_clicked.header_launch_button': 30,
         'ui_clicked.org_name_change_button': 40,
         'ui_clicked.onboarding_card_button': 50,
@@ -61,6 +62,7 @@ describe('Workplace Search Telemetry Usage Collector', () => {
         },
         ui_error: {
           cannot_connect: 3,
+          not_found: 7,
         },
         ui_clicked: {
           header_launch_button: 30,
@@ -88,6 +90,7 @@ describe('Workplace Search Telemetry Usage Collector', () => {
         },
         ui_error: {
           cannot_connect: 0,
+          not_found: 0,
         },
         ui_clicked: {
           header_launch_button: 0,
diff --git a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
index 892de5cfee35e0..cc08febf41f454 100644
--- a/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
+++ b/x-pack/plugins/enterprise_search/server/collectors/workplace_search/telemetry.ts
@@ -17,6 +17,7 @@ interface ITelemetry {
   };
   ui_error: {
     cannot_connect: number;
+    not_found: number;
   };
   ui_clicked: {
     header_launch_button: number;
@@ -48,6 +49,7 @@ export const registerTelemetryUsageCollector = (
       },
       ui_error: {
         cannot_connect: { type: 'long' },
+        not_found: { type: 'long' },
       },
       ui_clicked: {
         header_launch_button: { type: 'long' },
@@ -79,6 +81,7 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart, log
     },
     ui_error: {
       cannot_connect: 0,
+      not_found: 0,
     },
     ui_clicked: {
       header_launch_button: 0,
@@ -100,6 +103,7 @@ const fetchTelemetryMetrics = async (savedObjects: SavedObjectsServiceStart, log
     },
     ui_error: {
       cannot_connect: get(savedObjectAttributes, 'ui_error.cannot_connect', 0),
+      not_found: get(savedObjectAttributes, 'ui_error.not_found', 0),
     },
     ui_clicked: {
       header_launch_button: get(savedObjectAttributes, 'ui_clicked.header_launch_button', 0),
diff --git a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
index 5280f094e3a5d2..2435d8a9aaf04c 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -30,6 +30,9 @@
           "properties": {
             "cannot_connect": {
               "type": "long"
+            },
+            "not_found": {
+              "type": "long"
             }
           }
         },
@@ -64,6 +67,9 @@
           "properties": {
             "cannot_connect": {
               "type": "long"
+            },
+            "not_found": {
+              "type": "long"
             }
           }
         },

From 7b7b013b977ec75a8c379b50ae42bb729c66b384 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Wed, 2 Sep 2020 08:59:58 -0700
Subject: [PATCH 185/216] [DOCS] Adds cloud icon to alerting settings (#76516)

---
 docs/settings/alert-action-settings.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
index e02c7f212277ec..88858c36643ec8 100644
--- a/docs/settings/alert-action-settings.asciidoc
+++ b/docs/settings/alert-action-settings.asciidoc
@@ -37,12 +37,12 @@ You can configure the following settings in the `kibana.yml` file.
 [cols="2*<"]
 |===
 
-| `xpack.actions.whitelistedHosts`
+| `xpack.actions.whitelistedHosts` {ess-icon}
   | A list of hostnames that {kib} is allowed to connect to when built-in actions are triggered. It defaults to `[*]`, allowing any host, but keep in mind the potential for SSRF attacks when hosts are not explicitly whitelisted. An empty list `[]` can be used to block built-in actions from making any external connections. +
   +
   Note that hosts associated with built-in actions, such as Slack and PagerDuty, are not automatically whitelisted. If you are not using the default `[*]` setting, you must ensure that the corresponding endpoints are whitelisted as well.
 
-| `xpack.actions.enabledActionTypes`
+| `xpack.actions.enabledActionTypes` {ess-icon}
   | A list of action types that are enabled. It defaults to `[*]`, enabling all types. The names for built-in {kib} action types are prefixed with a `.` and include: `.server-log`, `.slack`, `.email`, `.index`, `.pagerduty`, and `.webhook`. An empty list `[]` will disable all action types. +
   +
   Disabled action types will not appear as an option when creating new connectors, but existing connectors and actions of that type will remain in {kib} and will not function.

From 71b9dedfc4eadd97db2b6b0dc038d0f640babf7b Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Wed, 2 Sep 2020 12:07:32 -0400
Subject: [PATCH 186/216] [Ingest Manager] Remove success: true as top-level
 API response (#73223)

* Big bang commit removing top-level success property in API response

Left in check-permissions and in array of objects returned by delete package configs

* Remove success property from  mocks

* Resolve conflict from upstream changes

* Remove success property (after upstream merge)

* Remove more 'success'es after merging in upstream

* Remove success from some tests

* Remove success from OpenAPI spec

* Revert prior try/catch. Use res.ok

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../common/openapi/spec_oas3.json             | 94 ++++---------------
 .../common/types/rest_spec/agent.ts           | 20 ++--
 .../common/types/rest_spec/agent_policy.ts    |  7 --
 .../types/rest_spec/enrollment_api_key.ts     |  4 -
 .../common/types/rest_spec/epm.ts             |  6 --
 .../common/types/rest_spec/output.ts          |  3 -
 .../common/types/rest_spec/package_policy.ts  |  3 -
 .../common/types/rest_spec/settings.ts        |  2 -
 .../components/agent_policy_copy_provider.tsx |  6 +-
 .../agent_policy_delete_provider.tsx          |  6 +-
 .../components/settings/index.tsx             |  2 +-
 .../components/create_agent_policy.tsx        |  2 +-
 .../scripts/dev_agent/script.ts               |  2 +-
 .../server/routes/agent/acks_handlers.test.ts |  1 -
 .../server/routes/agent/acks_handlers.ts      |  1 -
 .../routes/agent/actions_handlers.test.ts     |  1 -
 .../server/routes/agent/actions_handlers.ts   |  1 -
 .../server/routes/agent/handlers.ts           | 13 +--
 .../server/routes/agent/unenroll_handler.ts   |  4 +-
 .../server/routes/agent_policy/handlers.ts    |  8 +-
 .../routes/enrollment_api_key/handler.ts      |  8 +-
 .../server/routes/epm/handlers.ts             |  6 --
 .../server/routes/output/handler.ts           |  3 -
 .../server/routes/package_policy/handlers.ts  |  6 +-
 .../server/routes/settings/index.ts           |  2 -
 .../server/services/agent_policy.ts           |  1 -
 .../store/mock_endpoint_result_list.ts        |  3 -
 .../store/policy_list/test_mock_utils.ts      |  2 -
 .../apis/agent_policy/agent_policy.ts         |  7 +-
 .../apis/fleet/agents/acks.ts                 |  1 -
 .../apis/fleet/agents/actions.ts              |  1 -
 .../apis/fleet/agents/checkin.ts              |  1 -
 .../apis/fleet/agents/complete_flow.ts        | 14 +--
 .../apis/fleet/agents/delete.ts               |  2 -
 .../apis/fleet/agents/enroll.ts               |  3 +-
 .../apis/fleet/agents/list.ts                 |  6 +-
 .../apis/fleet/agents/unenroll.ts             | 10 +-
 .../apis/fleet/enrollment_api_keys/crud.ts    |  7 +-
 .../apis/package_policy/create.ts             |  5 +-
 .../apis/package_policy/get.ts                |  7 +-
 .../apis/package_policy/update.ts             |  5 +-
 .../apis/artifacts/index.ts                   |  1 -
 42 files changed, 58 insertions(+), 229 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
index 8c9ede1fde9ba1..d75a914e080d73 100644
--- a/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
+++ b/x-pack/plugins/ingest_manager/common/openapi/spec_oas3.json
@@ -43,12 +43,9 @@
                     },
                     "perPage": {
                       "type": "number"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["items", "total", "page", "perPage", "success"]
+                  "required": ["items", "total", "page", "perPage"]
                 },
                 "examples": {
                   "success": {
@@ -71,8 +68,7 @@
                       ],
                       "total": 1,
                       "page": 1,
-                      "perPage": 50,
-                      "success": true
+                      "perPage": 50
                     }
                   }
                 }
@@ -107,9 +103,6 @@
                   "properties": {
                     "item": {
                       "$ref": "#/components/schemas/AgentPolicy"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   }
                 }
@@ -159,12 +152,9 @@
                   "properties": {
                     "item": {
                       "$ref": "#/components/schemas/AgentPolicy"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["item", "success"]
+                  "required": ["item"]
                 },
                 "examples": {
                   "success": {
@@ -707,8 +697,7 @@
                         "revision": 2,
                         "updated_on": "2020-05-06T17:32:21.905Z",
                         "updated_by": "system"
-                      },
-                      "success": true
+                      }
                     }
                   }
                 }
@@ -733,12 +722,9 @@
                   "properties": {
                     "item": {
                       "$ref": "#/components/schemas/AgentPolicy"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["item", "success"]
+                  "required": ["item"]
                 },
                 "examples": {
                   "example-1": {
@@ -751,8 +737,7 @@
                         "updated_on": "Fri Feb 28 2020 16:22:31 GMT-0500 (Eastern Standard Time)",
                         "updated_by": "elastic",
                         "packagePolicies": []
-                      },
-                      "success": true
+                      }
                     }
                   }
                 }
@@ -810,12 +795,9 @@
                   "properties": {
                     "item": {
                       "$ref": "#/components/schemas/AgentPolicy"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["item", "success"]
+                  "required": ["item"]
                 }
               }
             }
@@ -948,12 +930,9 @@
                     },
                     "perPage": {
                       "type": "number"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["items", "success"]
+                  "required": ["items"]
                 },
                 "examples": {
                   "example-1": {
@@ -1157,8 +1136,7 @@
                       ],
                       "total": 6,
                       "page": 1,
-                      "perPage": 20,
-                      "success": true
+                      "perPage": 20
                     }
                   }
                 }
@@ -1251,12 +1229,9 @@
                   "properties": {
                     "item": {
                       "$ref": "#/components/schemas/PackagePolicy"
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["item", "success"]
+                  "required": ["item"]
                 }
               }
             }
@@ -1415,9 +1390,6 @@
                       "properties": {
                         "response": {
                           "$ref": "#/components/schemas/PackageInfo"
-                        },
-                        "success": {
-                          "type": "boolean"
                         }
                       }
                     },
@@ -1709,8 +1681,7 @@
                           },
                           "references": []
                         }
-                      },
-                      "success": true
+                      }
                     }
                   },
                   "required-package": {
@@ -1899,8 +1870,7 @@
                           },
                           "references": []
                         }
-                      },
-                      "success": true
+                      }
                     }
                   }
                 }
@@ -1950,12 +1920,9 @@
                         },
                         "required": ["id", "type"]
                       }
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["response", "success"]
+                  "required": ["response"]
                 }
               }
             }
@@ -1994,12 +1961,9 @@
                         },
                         "required": ["id", "type"]
                       }
-                    },
-                    "success": {
-                      "type": "boolean"
                     }
                   },
-                  "required": ["response", "success"]
+                  "required": ["response"]
                 }
               }
             }
@@ -2678,8 +2642,7 @@
                           "version": "1.0.0",
                           "status": "not_installed"
                         }
-                      ],
-                      "success": true
+                      ]
                     }
                   }
                 }
@@ -2743,9 +2706,6 @@
                         "type": "object"
                       }
                     },
-                    "success": {
-                      "type": "boolean"
-                    },
                     "total": {
                       "type": "number"
                     },
@@ -2756,7 +2716,7 @@
                       "type": "number"
                     }
                   },
-                  "required": ["list", "success", "total", "page", "perPage"]
+                  "required": ["list", "total", "page", "perPage"]
                 },
                 "examples": {
                   "example-1": {
@@ -2793,7 +2753,6 @@
                           "status": "online"
                         }
                       ],
-                      "success": true,
                       "total": 1,
                       "page": 1,
                       "perPage": 20
@@ -2836,12 +2795,9 @@
                   "properties": {
                     "item": {
                       "type": "object"
-                    },
-                    "success": {
-                      "type": "string"
                     }
                   },
-                  "required": ["item", "success"]
+                  "required": ["item"]
                 }
               }
             }
@@ -2916,9 +2872,6 @@
                       "type": "string",
                       "enum": ["checkin"]
                     },
-                    "success": {
-                      "type": "string"
-                    },
                     "actions": {
                       "type": "array",
                       "items": {
@@ -2950,7 +2903,6 @@
                   "success": {
                     "value": {
                       "action": "checkin",
-                      "success": true,
                       "actions": [
                         {
                           "agent_id": "a6f14bd2-1a2a-481c-9212-9494d064ffdf",
@@ -3346,21 +3298,17 @@
                 "schema": {
                   "type": "object",
                   "properties": {
-                    "success": {
-                      "type": "boolean"
-                    },
                     "action": {
                       "type": "string",
                       "enum": ["acks"]
                     }
                   },
-                  "required": ["success", "action"]
+                  "required": ["action"]
                 },
                 "examples": {
                   "success": {
                     "value": {
-                      "action": "checkin",
-                      "success": true
+                      "action": "checkin"
                     }
                   }
                 }
@@ -3417,9 +3365,6 @@
                     "action": {
                       "type": "string"
                     },
-                    "success": {
-                      "type": "boolean"
-                    },
                     "item": {
                       "$ref": "#/components/schemas/Agent"
                     }
@@ -3429,7 +3374,6 @@
                   "success": {
                     "value": {
                       "action": "created",
-                      "success": true,
                       "item": {
                         "id": "8086fb1a-72ca-4a67-8533-09300c1639fa",
                         "active": true,
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
index 4a50938049a7b2..cf8d3ab1c908ac 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent.ts
@@ -28,7 +28,6 @@ export interface GetAgentsResponse {
   total: number;
   page: number;
   perPage: number;
-  success: boolean;
 }
 
 export interface GetOneAgentRequest {
@@ -39,7 +38,6 @@ export interface GetOneAgentRequest {
 
 export interface GetOneAgentResponse {
   item: Agent;
-  success: boolean;
 }
 
 export interface PostAgentCheckinRequest {
@@ -55,7 +53,7 @@ export interface PostAgentCheckinRequest {
 
 export interface PostAgentCheckinResponse {
   action: string;
-  success: boolean;
+
   actions: AgentAction[];
 }
 
@@ -72,7 +70,7 @@ export interface PostAgentEnrollRequest {
 
 export interface PostAgentEnrollResponse {
   action: string;
-  success: boolean;
+
   item: Agent & { status: AgentStatus };
 }
 
@@ -87,7 +85,6 @@ export interface PostAgentAcksRequest {
 
 export interface PostAgentAcksResponse {
   action: string;
-  success: boolean;
 }
 
 export interface PostNewAgentActionRequest {
@@ -100,7 +97,6 @@ export interface PostNewAgentActionRequest {
 }
 
 export interface PostNewAgentActionResponse {
-  success: boolean;
   item: AgentAction;
 }
 
@@ -110,9 +106,8 @@ export interface PostAgentUnenrollRequest {
   };
 }
 
-export interface PostAgentUnenrollResponse {
-  success: boolean;
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface PostAgentUnenrollResponse {}
 
 export interface PutAgentReassignRequest {
   params: {
@@ -121,9 +116,8 @@ export interface PutAgentReassignRequest {
   body: { policy_id: string };
 }
 
-export interface PutAgentReassignResponse {
-  success: boolean;
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface PutAgentReassignResponse {}
 
 export interface GetOneAgentEventsRequest {
   params: {
@@ -141,7 +135,6 @@ export interface GetOneAgentEventsResponse {
   total: number;
   page: number;
   perPage: number;
-  success: boolean;
 }
 
 export interface DeleteAgentRequest {
@@ -166,7 +159,6 @@ export interface GetAgentStatusRequest {
 }
 
 export interface GetAgentStatusResponse {
-  success: boolean;
   results: {
     events: number;
     total: number;
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
index 4683727ed51ac3..aa9fbc20fc0b03 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/agent_policy.ts
@@ -19,7 +19,6 @@ export interface GetAgentPoliciesResponse {
   total: number;
   page: number;
   perPage: number;
-  success: boolean;
 }
 
 export interface GetOneAgentPolicyRequest {
@@ -30,7 +29,6 @@ export interface GetOneAgentPolicyRequest {
 
 export interface GetOneAgentPolicyResponse {
   item: AgentPolicy;
-  success: boolean;
 }
 
 export interface CreateAgentPolicyRequest {
@@ -39,7 +37,6 @@ export interface CreateAgentPolicyRequest {
 
 export interface CreateAgentPolicyResponse {
   item: AgentPolicy;
-  success: boolean;
 }
 
 export type UpdateAgentPolicyRequest = GetOneAgentPolicyRequest & {
@@ -48,7 +45,6 @@ export type UpdateAgentPolicyRequest = GetOneAgentPolicyRequest & {
 
 export interface UpdateAgentPolicyResponse {
   item: AgentPolicy;
-  success: boolean;
 }
 
 export interface CopyAgentPolicyRequest {
@@ -57,7 +53,6 @@ export interface CopyAgentPolicyRequest {
 
 export interface CopyAgentPolicyResponse {
   item: AgentPolicy;
-  success: boolean;
 }
 
 export interface DeleteAgentPolicyRequest {
@@ -68,7 +63,6 @@ export interface DeleteAgentPolicyRequest {
 
 export interface DeleteAgentPolicyResponse {
   id: string;
-  success: boolean;
 }
 
 export interface GetFullAgentPolicyRequest {
@@ -79,5 +73,4 @@ export interface GetFullAgentPolicyRequest {
 
 export interface GetFullAgentPolicyResponse {
   item: FullAgentPolicy;
-  success: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
index 1929955cac84c9..1d1c2f79bf6cb7 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/enrollment_api_key.ts
@@ -19,7 +19,6 @@ export interface GetEnrollmentAPIKeysResponse {
   total: number;
   page: number;
   perPage: number;
-  success: boolean;
 }
 
 export interface GetOneEnrollmentAPIKeyRequest {
@@ -30,7 +29,6 @@ export interface GetOneEnrollmentAPIKeyRequest {
 
 export interface GetOneEnrollmentAPIKeyResponse {
   item: EnrollmentAPIKey;
-  success: boolean;
 }
 
 export interface DeleteEnrollmentAPIKeyRequest {
@@ -41,7 +39,6 @@ export interface DeleteEnrollmentAPIKeyRequest {
 
 export interface DeleteEnrollmentAPIKeyResponse {
   action: string;
-  success: boolean;
 }
 
 export interface PostEnrollmentAPIKeyRequest {
@@ -55,5 +52,4 @@ export interface PostEnrollmentAPIKeyRequest {
 export interface PostEnrollmentAPIKeyResponse {
   action: string;
   item: EnrollmentAPIKey;
-  success: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts
index 1901b8c0c70394..5fb718f91b8762 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/epm.ts
@@ -20,7 +20,6 @@ export interface GetCategoriesRequest {
 
 export interface GetCategoriesResponse {
   response: CategorySummaryList;
-  success: boolean;
 }
 
 export interface GetPackagesRequest {
@@ -39,12 +38,10 @@ export interface GetPackagesResponse {
       >
     >
   >;
-  success: boolean;
 }
 
 export interface GetLimitedPackagesResponse {
   response: string[];
-  success: boolean;
 }
 
 export interface GetFileRequest {
@@ -62,7 +59,6 @@ export interface GetInfoRequest {
 
 export interface GetInfoResponse {
   response: PackageInfo;
-  success: boolean;
 }
 
 export interface InstallPackageRequest {
@@ -73,7 +69,6 @@ export interface InstallPackageRequest {
 
 export interface InstallPackageResponse {
   response: AssetReference[];
-  success: boolean;
 }
 
 export interface DeletePackageRequest {
@@ -84,5 +79,4 @@ export interface DeletePackageRequest {
 
 export interface DeletePackageResponse {
   response: AssetReference[];
-  success: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts
index 41620603633818..87e8a0977e3ba7 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/output.ts
@@ -7,7 +7,6 @@ import { Output } from '../models';
 
 export interface GetOneOutputResponse {
   item: Output;
-  success: boolean;
 }
 
 export interface GetOneOutputRequest {
@@ -28,7 +27,6 @@ export interface PutOutputRequest {
 
 export interface PutOutputResponse {
   item: Output;
-  success: boolean;
 }
 
 export interface GetOutputsResponse {
@@ -36,5 +34,4 @@ export interface GetOutputsResponse {
   total: number;
   page: number;
   perPage: number;
-  success: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
index e5bba3d6deab3e..61669ab876d802 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/package_policy.ts
@@ -18,7 +18,6 @@ export interface GetPackagePoliciesResponse {
   total: number;
   page: number;
   perPage: number;
-  success: boolean;
 }
 
 export interface GetOnePackagePolicyRequest {
@@ -29,7 +28,6 @@ export interface GetOnePackagePolicyRequest {
 
 export interface GetOnePackagePolicyResponse {
   item: PackagePolicy;
-  success: boolean;
 }
 
 export interface CreatePackagePolicyRequest {
@@ -38,7 +36,6 @@ export interface CreatePackagePolicyRequest {
 
 export interface CreatePackagePolicyResponse {
   item: PackagePolicy;
-  success: boolean;
 }
 
 export type UpdatePackagePolicyRequest = GetOnePackagePolicyRequest & {
diff --git a/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts b/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts
index c02a5e5878ee91..90d623b8a4be94 100644
--- a/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts
+++ b/x-pack/plugins/ingest_manager/common/types/rest_spec/settings.ts
@@ -7,7 +7,6 @@ import { Settings } from '../models';
 
 export interface GetSettingsResponse {
   item: Settings;
-  success: boolean;
 }
 
 export interface PutSettingsRequest {
@@ -16,5 +15,4 @@ export interface PutSettingsRequest {
 
 export interface PutSettingsResponse {
   item: Settings;
-  success: boolean;
 }
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
index 8a91cabe78d00f..fefbe1fa82a0c5 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_copy_provider.tsx
@@ -61,7 +61,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
     try {
       const { data } = await sendCopyAgentPolicy(agentPolicy!.id, newAgentPolicy!);
 
-      if (data?.success) {
+      if (data) {
         notifications.toasts.addSuccess(
           i18n.translate('xpack.ingestManager.copyAgentPolicy.successNotificationTitle', {
             defaultMessage: 'Agent policy copied',
@@ -70,9 +70,7 @@ export const AgentPolicyCopyProvider: React.FunctionComponent<Props> = ({ childr
         if (onSuccessCallback.current) {
           onSuccessCallback.current(data.item);
         }
-      }
-
-      if (!data?.success) {
+      } else {
         notifications.toasts.addDanger(
           i18n.translate('xpack.ingestManager.copyAgentPolicy.failureNotificationTitle', {
             defaultMessage: "Error copying agent policy '{id}'",
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
index 08367bf2a97bfc..15f71689ecdfa1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/components/agent_policy_delete_provider.tsx
@@ -59,7 +59,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
         agentPolicyId: agentPolicy!,
       });
 
-      if (data?.success) {
+      if (data) {
         notifications.toasts.addSuccess(
           i18n.translate('xpack.ingestManager.deleteAgentPolicy.successSingleNotificationTitle', {
             defaultMessage: "Deleted agent policy '{id}'",
@@ -69,9 +69,7 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({ chil
         if (onSuccessCallback.current) {
           onSuccessCallback.current(agentPolicy!);
         }
-      }
-
-      if (!data?.success) {
+      } else {
         notifications.toasts.addDanger(
           i18n.translate('xpack.ingestManager.deleteAgentPolicy.failureSingleNotificationTitle', {
             defaultMessage: "Error deleting agent policy '{id}'",
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
index 766bdc2e2c1930..b8fbb4f1835a6a 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/details_page/components/settings/index.tsx
@@ -82,7 +82,7 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
           namespace,
           monitoring_enabled,
         });
-        if (data?.success) {
+        if (data) {
           notifications.toasts.addSuccess(
             i18n.translate('xpack.ingestManager.editAgentPolicy.successNotificationTitle', {
               defaultMessage: "Successfully updated '{name}' settings",
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
index b072990727e3cc..e3e2975777e17b 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_policy/list_page/components/create_agent_policy.tsx
@@ -116,7 +116,7 @@ export const CreateAgentPolicyFlyout: React.FunctionComponent<Props> = ({
               try {
                 const { data, error } = await createAgentPolicy();
                 setIsLoading(false);
-                if (data?.success) {
+                if (data) {
                   notifications.toasts.addSuccess(
                     i18n.translate(
                       'xpack.ingestManager.createAgentPolicy.successNotificationTitle',
diff --git a/x-pack/plugins/ingest_manager/scripts/dev_agent/script.ts b/x-pack/plugins/ingest_manager/scripts/dev_agent/script.ts
index c7b8edd0c332ef..65375a076e9a48 100644
--- a/x-pack/plugins/ingest_manager/scripts/dev_agent/script.ts
+++ b/x-pack/plugins/ingest_manager/scripts/dev_agent/script.ts
@@ -122,7 +122,7 @@ async function enroll(kibanaURL: string, apiKey: string, log: ToolingLog): Promi
   });
   const obj: PostAgentEnrollResponse = await res.json();
 
-  if (!obj.success) {
+  if (!res.ok) {
     log.error(JSON.stringify(obj, null, 2));
     throw new Error('unable to enroll');
   }
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
index aaed189ae3dddf..33b9dc617075b3 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.test.ts
@@ -88,7 +88,6 @@ describe('test acks handlers', () => {
     await postAgentAcksHandler(({} as unknown) as RequestHandlerContext, mockRequest, mockResponse);
     expect(mockResponse.ok.mock.calls[0][0]?.body as PostAgentAcksResponse).toEqual({
       action: 'acks',
-      success: true,
     });
   });
 });
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.ts
index 0b719d8a67df74..564f5d03e94502 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/acks_handlers.ts
@@ -46,7 +46,6 @@ export const postAgentAcksHandlerBuilder = function (
 
       const body: PostAgentAcksResponse = {
         action: 'acks',
-        success: true,
       };
 
       return response.ok({ body });
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.test.ts b/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.test.ts
index bcb9a7797f26ab..5445a46fbe2b47 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.test.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.test.ts
@@ -97,6 +97,5 @@ describe('test actions handlers', () => {
       ?.body as unknown) as PostNewAgentActionResponse;
 
     expect(expectedAgentActionResponse.item).toEqual(agentAction);
-    expect(expectedAgentActionResponse.success).toEqual(true);
   });
 });
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.ts
index 81893b1e78338c..b81d44c40f8eb8 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/actions_handlers.ts
@@ -35,7 +35,6 @@ export const postNewAgentActionHandlerBuilder = function (
       });
 
       const body: PostNewAgentActionResponse = {
-        success: true,
         item: savedAgentAction,
       };
 
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
index 3e80a74dc2b11f..2bce8daa6637e4 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/handlers.ts
@@ -43,7 +43,6 @@ export const getAgentHandler: RequestHandler<TypeOf<
         ...agent,
         status: AgentService.getAgentStatus(agent),
       },
-      success: true,
     };
 
     return response.ok({ body });
@@ -77,7 +76,6 @@ export const getAgentEventsHandler: RequestHandler<
     const body: GetOneAgentEventsResponse = {
       list: items,
       total,
-      success: true,
       page,
       perPage,
     };
@@ -107,7 +105,6 @@ export const deleteAgentHandler: RequestHandler<TypeOf<
     await AgentService.deleteAgent(soClient, request.params.agentId);
 
     const body = {
-      success: true,
       action: 'deleted',
     };
 
@@ -144,7 +141,6 @@ export const updateAgentHandler: RequestHandler<
         ...agent,
         status: AgentService.getAgentStatus(agent),
       },
-      success: true,
     };
 
     return response.ok({ body });
@@ -187,7 +183,6 @@ export const postAgentCheckinHandler: RequestHandler<
     );
     const body: PostAgentCheckinResponse = {
       action: 'checkin',
-      success: true,
       actions: actions.map((a) => ({
         agent_id: agent.id,
         type: a.type,
@@ -248,7 +243,6 @@ export const postAgentEnrollHandler: RequestHandler<
     );
     const body: PostAgentEnrollResponse = {
       action: 'created',
-      success: true,
       item: {
         ...agent,
         status: AgentService.getAgentStatus(agent),
@@ -289,7 +283,6 @@ export const getAgentsHandler: RequestHandler<
         ...agent,
         status: AgentService.getAgentStatus(agent),
       })),
-      success: true,
       total,
       page,
       perPage,
@@ -312,9 +305,7 @@ export const putAgentsReassignHandler: RequestHandler<
   try {
     await AgentService.reassignAgent(soClient, request.params.agentId, request.body.policy_id);
 
-    const body: PutAgentReassignResponse = {
-      success: true,
-    };
+    const body: PutAgentReassignResponse = {};
     return response.ok({ body });
   } catch (e) {
     return response.customError({
@@ -336,7 +327,7 @@ export const getAgentStatusForAgentPolicyHandler: RequestHandler<
       request.query.policyId
     );
 
-    const body: GetAgentStatusResponse = { results, success: true };
+    const body: GetAgentStatusResponse = { results };
 
     return response.ok({ body });
   } catch (e) {
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent/unenroll_handler.ts b/x-pack/plugins/ingest_manager/server/routes/agent/unenroll_handler.ts
index d1e54fe4fb3a17..5df695d248f5b6 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent/unenroll_handler.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent/unenroll_handler.ts
@@ -23,9 +23,7 @@ export const postAgentsUnenrollHandler: RequestHandler<
       await AgentService.unenrollAgent(soClient, request.params.agentId);
     }
 
-    const body: PostAgentUnenrollResponse = {
-      success: true,
-    };
+    const body: PostAgentUnenrollResponse = {};
     return response.ok({ body });
   } catch (e) {
     return response.customError({
diff --git a/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
index cc178e1038e2ea..7eb3df23461068 100644
--- a/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/agent_policy/handlers.ts
@@ -49,7 +49,6 @@ export const getAgentPoliciesHandler: RequestHandler<
       total,
       page,
       perPage,
-      success: true,
     };
 
     await bluebird.map(
@@ -82,7 +81,6 @@ export const getOneAgentPolicyHandler: RequestHandler<TypeOf<
     if (agentPolicy) {
       const body: GetOneAgentPolicyResponse = {
         item: agentPolicy,
-        success: true,
       };
       return response.ok({
         body,
@@ -141,7 +139,6 @@ export const createAgentPolicyHandler: RequestHandler<
 
     const body: CreateAgentPolicyResponse = {
       item: agentPolicy,
-      success: true,
     };
 
     return response.ok({
@@ -171,7 +168,7 @@ export const updateAgentPolicyHandler: RequestHandler<
         user: user || undefined,
       }
     );
-    const body: UpdateAgentPolicyResponse = { item: agentPolicy, success: true };
+    const body: UpdateAgentPolicyResponse = { item: agentPolicy };
     return response.ok({
       body,
     });
@@ -199,7 +196,7 @@ export const copyAgentPolicyHandler: RequestHandler<
         user: user || undefined,
       }
     );
-    const body: CopyAgentPolicyResponse = { item: agentPolicy, success: true };
+    const body: CopyAgentPolicyResponse = { item: agentPolicy };
     return response.ok({
       body,
     });
@@ -248,7 +245,6 @@ export const getFullAgentPolicy: RequestHandler<
     if (fullAgentPolicy) {
       const body: GetFullAgentPolicyResponse = {
         item: fullAgentPolicy,
-        success: true,
       };
       return response.ok({
         body,
diff --git a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
index 2d6e2f67225e33..7c04acf4798f95 100644
--- a/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/enrollment_api_key/handler.ts
@@ -31,7 +31,7 @@ export const getEnrollmentApiKeysHandler: RequestHandler<
       perPage: request.query.perPage,
       kuery: request.query.kuery,
     });
-    const body: GetEnrollmentAPIKeysResponse = { list: items, success: true, total, page, perPage };
+    const body: GetEnrollmentAPIKeysResponse = { list: items, total, page, perPage };
 
     return response.ok({ body });
   } catch (e) {
@@ -54,7 +54,7 @@ export const postEnrollmentApiKeyHandler: RequestHandler<
       agentPolicyId: request.body.policy_id,
     });
 
-    const body: PostEnrollmentAPIKeyResponse = { item: apiKey, success: true, action: 'created' };
+    const body: PostEnrollmentAPIKeyResponse = { item: apiKey, action: 'created' };
 
     return response.ok({ body });
   } catch (e) {
@@ -78,7 +78,7 @@ export const deleteEnrollmentApiKeyHandler: RequestHandler<TypeOf<
   try {
     await APIKeyService.deleteEnrollmentApiKey(soClient, request.params.keyId);
 
-    const body: DeleteEnrollmentAPIKeyResponse = { action: 'deleted', success: true };
+    const body: DeleteEnrollmentAPIKeyResponse = { action: 'deleted' };
 
     return response.ok({ body });
   } catch (e) {
@@ -100,7 +100,7 @@ export const getOneEnrollmentApiKeyHandler: RequestHandler<TypeOf<
   const soClient = context.core.savedObjects.client;
   try {
     const apiKey = await APIKeyService.getEnrollmentAPIKey(soClient, request.params.keyId);
-    const body: GetOneEnrollmentAPIKeyResponse = { item: apiKey, success: true };
+    const body: GetOneEnrollmentAPIKeyResponse = { item: apiKey };
 
     return response.ok({ body });
   } catch (e) {
diff --git a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts
index bbd91b97a86c98..6400d6e215f9be 100644
--- a/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/epm/handlers.ts
@@ -43,7 +43,6 @@ export const getCategoriesHandler: RequestHandler<
     const res = await getCategories(request.query);
     const body: GetCategoriesResponse = {
       response: res,
-      success: true,
     };
     return response.ok({ body });
   } catch (e) {
@@ -66,7 +65,6 @@ export const getListHandler: RequestHandler<
     });
     const body: GetPackagesResponse = {
       response: res,
-      success: true,
     };
     return response.ok({
       body,
@@ -85,7 +83,6 @@ export const getLimitedListHandler: RequestHandler = async (context, request, re
     const res = await getLimitedPackages({ savedObjectsClient });
     const body: GetLimitedPackagesResponse = {
       response: res,
-      success: true,
     };
     return response.ok({
       body,
@@ -136,7 +133,6 @@ export const getInfoHandler: RequestHandler<TypeOf<typeof GetInfoRequestSchema.p
     const res = await getPackageInfo({ savedObjectsClient, pkgName, pkgVersion });
     const body: GetInfoResponse = {
       response: res,
-      success: true,
     };
     return response.ok({ body });
   } catch (e) {
@@ -166,7 +162,6 @@ export const installPackageHandler: RequestHandler<
     });
     const body: InstallPackageResponse = {
       response: res,
-      success: true,
     };
     return response.ok({ body });
   } catch (e) {
@@ -206,7 +201,6 @@ export const deletePackageHandler: RequestHandler<TypeOf<
     const res = await removeInstallation({ savedObjectsClient, pkgkey, callCluster });
     const body: DeletePackageResponse = {
       response: res,
-      success: true,
     };
     return response.ok({ body });
   } catch (e) {
diff --git a/x-pack/plugins/ingest_manager/server/routes/output/handler.ts b/x-pack/plugins/ingest_manager/server/routes/output/handler.ts
index cd35b2a43426ca..d920ad4e6cb714 100644
--- a/x-pack/plugins/ingest_manager/server/routes/output/handler.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/output/handler.ts
@@ -20,7 +20,6 @@ export const getOutputsHandler: RequestHandler = async (context, request, respon
       page: outputs.page,
       perPage: outputs.perPage,
       total: outputs.total,
-      success: true,
     };
 
     return response.ok({ body });
@@ -41,7 +40,6 @@ export const getOneOuputHandler: RequestHandler<TypeOf<
 
     const body: GetOneOutputResponse = {
       item: output,
-      success: true,
     };
 
     return response.ok({ body });
@@ -71,7 +69,6 @@ export const putOuputHandler: RequestHandler<
 
     const body: GetOneOutputResponse = {
       item: output,
-      success: true,
     };
 
     return response.ok({ body });
diff --git a/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
index d19a73604b4f06..04e3c453da94c5 100644
--- a/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/package_policy/handlers.ts
@@ -34,7 +34,6 @@ export const getPackagePoliciesHandler: RequestHandler<
         total,
         page,
         perPage,
-        success: true,
       },
     });
   } catch (e) {
@@ -59,7 +58,6 @@ export const getOnePackagePolicyHandler: RequestHandler<TypeOf<
       return response.ok({
         body: {
           item: packagePolicy,
-          success: true,
         },
       });
     } else {
@@ -115,7 +113,7 @@ export const createPackagePolicyHandler: RequestHandler<
     const packagePolicy = await packagePolicyService.create(soClient, callCluster, newData, {
       user,
     });
-    const body: CreatePackagePolicyResponse = { item: packagePolicy, success: true };
+    const body: CreatePackagePolicyResponse = { item: packagePolicy };
     return response.ok({
       body,
     });
@@ -163,7 +161,7 @@ export const updatePackagePolicyHandler: RequestHandler<
       { user }
     );
     return response.ok({
-      body: { item: updatedPackagePolicy, success: true },
+      body: { item: updatedPackagePolicy },
     });
   } catch (e) {
     return response.customError({
diff --git a/x-pack/plugins/ingest_manager/server/routes/settings/index.ts b/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
index aabb85dadabc20..dcba42af6d7889 100644
--- a/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
+++ b/x-pack/plugins/ingest_manager/server/routes/settings/index.ts
@@ -16,7 +16,6 @@ export const getSettingsHandler: RequestHandler = async (context, request, respo
   try {
     const settings = await settingsService.getSettings(soClient);
     const body = {
-      success: true,
       item: settings,
     };
     return response.ok({ body });
@@ -47,7 +46,6 @@ export const putSettingsHandler: RequestHandler<
       user: user || undefined,
     });
     const body = {
-      success: true,
       item: settings,
     };
     return response.ok({ body });
diff --git a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
index 2c97bba0cac459..a03a3b7f59fba3 100644
--- a/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
+++ b/x-pack/plugins/ingest_manager/server/services/agent_policy.ts
@@ -380,7 +380,6 @@ class AgentPolicyService {
     await this.triggerAgentPolicyUpdatedEvent(soClient, 'deleted', id);
     return {
       id,
-      success: true,
     };
   }
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
index aa9bef7bb5417e..cfde474c6290dc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts
@@ -90,7 +90,6 @@ const endpointListApiPathHandlerMocks = ({
     [INGEST_API_EPM_PACKAGES]: (): GetPackagesResponse => {
       return {
         response: epmPackages,
-        success: true,
       };
     },
 
@@ -114,7 +113,6 @@ const endpointListApiPathHandlerMocks = ({
       return {
         items: [agentPolicy],
         total: 10,
-        success: true,
         perPage: 10,
         page: 1,
       };
@@ -132,7 +130,6 @@ const endpointListApiPathHandlerMocks = ({
         page: 1,
         perPage: 10,
         total: endpointPackagePolicies?.length,
-        success: true,
       };
     },
   };
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
index 5ef01c00dbf166..1093aed0608d56 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/store/policy_list/test_mock_utils.ts
@@ -64,7 +64,6 @@ export const mockPolicyResultList: (options?: {
     total,
     page: requestPageIndex,
     perPage: requestPageSize,
-    success: true,
   };
   return mock;
 };
@@ -81,7 +80,6 @@ export const policyListApiPathHandlers = (totalPolicies: number = 1) => {
     [INGEST_API_EPM_PACKAGES]: (): GetPackagesResponse => {
       return {
         response: [generator.generateEpmPackage()],
-        success: true,
       };
     },
   };
diff --git a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
index b55da0798c5f06..410b0fe0930024 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/agent_policy/agent_policy.ts
@@ -14,7 +14,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('ingest_manager_agent_policies', () => {
     describe('POST /api/ingest_manager/agent_policies', () => {
       it('should work with valid values', async () => {
-        const { body: apiResponse } = await supertest
+        await supertest
           .post(`/api/ingest_manager/agent_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
@@ -22,8 +22,6 @@ export default function ({ getService }: FtrProviderContext) {
             namespace: 'default',
           })
           .expect(200);
-
-        expect(apiResponse.success).to.be(true);
       });
 
       it('should return a 400 with an empty namespace', async () => {
@@ -61,7 +59,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should work with valid values', async () => {
         const {
-          body: { success, item },
+          body: { item },
         } = await supertest
           .post(`/api/ingest_manager/agent_policies/${TEST_POLICY_ID}/copy`)
           .set('kbn-xsrf', 'xxxx')
@@ -73,7 +71,6 @@ export default function ({ getService }: FtrProviderContext) {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         const { id, updated_at, ...newPolicy } = item;
 
-        expect(success).to.be(true);
         expect(newPolicy).to.eql({
           name: 'Copied policy',
           description: 'Test',
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/acks.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/acks.ts
index c9fa80c88762bf..1613ca9d11ee66 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/acks.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/acks.ts
@@ -90,7 +90,6 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
       expect(apiResponse.action).to.be('acks');
-      expect(apiResponse.success).to.be(true);
       const { body: eventResponse } = await supertest
         .get(`/api/ingest_manager/fleet/agents/agent1/events`)
         .set('kbn-xsrf', 'xx')
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/actions.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/actions.ts
index 8dc4e5c232b800..2b4bb335dfc5c9 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/actions.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/actions.ts
@@ -33,7 +33,6 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
 
-      expect(apiResponse.success).to.be(true);
       expect(apiResponse.item.data).to.eql({ data: 'action_data' });
       expect(apiResponse.item.sent_at).to.be('2020-03-18T19:45:02.620Z');
     });
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/checkin.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/checkin.ts
index 79f6cfae175e19..fbfc94a0840b04 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/checkin.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/checkin.ts
@@ -102,7 +102,6 @@ export default function (providerContext: FtrProviderContext) {
         .expect(200);
 
       expect(apiResponse.action).to.be('checkin');
-      expect(apiResponse.success).to.be(true);
     });
   });
 }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
index 2d14a7a10e6685..1d5b682d71c7ab 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/complete_flow.ts
@@ -62,7 +62,6 @@ export default function (providerContext: FtrProviderContext) {
           },
         })
         .expect(200);
-      expect(enrollmentResponse.success).to.eql(true);
 
       const agentAccessAPIKey = enrollmentResponse.item.access_api_key;
 
@@ -76,14 +75,13 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
 
-      expect(checkinApiResponse.success).to.eql(true);
       expect(checkinApiResponse.actions).length(1);
       expect(checkinApiResponse.actions[0].type).be('CONFIG_CHANGE');
       const policyChangeAction = checkinApiResponse.actions[0];
       const defaultOutputApiKey = policyChangeAction.data.config.outputs.default.api_key;
 
       // Ack actions
-      const { body: ackApiResponse } = await supertestWithoutAuth
+      await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/${enrollmentResponse.item.id}/acks`)
         .set('Authorization', `ApiKey ${agentAccessAPIKey}`)
         .set('kbn-xsrf', 'xx')
@@ -102,7 +100,6 @@ export default function (providerContext: FtrProviderContext) {
           ],
         })
         .expect(200);
-      expect(ackApiResponse.success).to.eql(true);
 
       // Second agent checkin
       const { body: secondCheckinApiResponse } = await supertestWithoutAuth
@@ -113,7 +110,6 @@ export default function (providerContext: FtrProviderContext) {
           events: [],
         })
         .expect(200);
-      expect(secondCheckinApiResponse.success).to.eql(true);
       expect(secondCheckinApiResponse.actions).length(0);
 
       // Get agent
@@ -121,18 +117,16 @@ export default function (providerContext: FtrProviderContext) {
         .get(`/api/ingest_manager/fleet/agents/${enrollmentResponse.item.id}`)
         .expect(200);
 
-      expect(getAgentApiResponse.success).to.eql(true);
       expect(getAgentApiResponse.item.packages).to.contain(
         'system',
         "Agent should run the 'system' package"
       );
 
       // Unenroll agent
-      const { body: unenrollResponse } = await supertest
+      await supertest
         .post(`/api/ingest_manager/fleet/agents/${enrollmentResponse.item.id}/unenroll`)
         .set('kbn-xsrf', 'xx')
         .expect(200);
-      expect(unenrollResponse.success).to.eql(true);
 
       //  Checkin after unenrollment
       const { body: checkinAfterUnenrollResponse } = await supertestWithoutAuth
@@ -144,13 +138,12 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
 
-      expect(checkinAfterUnenrollResponse.success).to.eql(true);
       expect(checkinAfterUnenrollResponse.actions).length(1);
       expect(checkinAfterUnenrollResponse.actions[0].type).be('UNENROLL');
       const unenrollAction = checkinAfterUnenrollResponse.actions[0];
 
       //  ack unenroll actions
-      const { body: ackUnenrollApiResponse } = await supertestWithoutAuth
+      await supertestWithoutAuth
         .post(`/api/ingest_manager/fleet/agents/${enrollmentResponse.item.id}/acks`)
         .set('Authorization', `ApiKey ${agentAccessAPIKey}`)
         .set('kbn-xsrf', 'xx')
@@ -168,7 +161,6 @@ export default function (providerContext: FtrProviderContext) {
           ],
         })
         .expect(200);
-      expect(ackUnenrollApiResponse.success).to.eql(true);
 
       // Checkin after unenrollment acknowledged
       await supertestWithoutAuth
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/delete.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/delete.ts
index dc05b7a4dd792e..65fbdabe8bd790 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/delete.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/delete.ts
@@ -68,7 +68,6 @@ export default function ({ getService }: FtrProviderContext) {
         .expect(404);
 
       expect(apiResponse).not.to.eql({
-        success: true,
         action: 'deleted',
       });
     });
@@ -88,7 +87,6 @@ export default function ({ getService }: FtrProviderContext) {
         .set('kbn-xsrf', 'xx')
         .expect(200);
       expect(apiResponse).to.eql({
-        success: true,
         action: 'deleted',
       });
     });
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
index 93f656ea952d22..eef0d3beb69d07 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/enroll.ts
@@ -136,7 +136,6 @@ export default function (providerContext: FtrProviderContext) {
           },
         })
         .expect(200);
-      expect(apiResponse.success).to.eql(true);
       expect(apiResponse.item).to.have.keys('id', 'active', 'access_api_key', 'type', 'policy_id');
     });
 
@@ -158,7 +157,7 @@ export default function (providerContext: FtrProviderContext) {
           },
         })
         .expect(200);
-      expect(apiResponse.success).to.eql(true);
+
       const { body: privileges } = await getEsClientForAPIKey(
         providerContext,
         apiResponse.item.access_api_key
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/list.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/list.ts
index 23563c6f43bbec..1ee00ed7201692 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/list.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/list.ts
@@ -78,8 +78,7 @@ export default function ({ getService }: FtrProviderContext) {
         .auth(users.fleet_admin.username, users.fleet_admin.password)
         .expect(200);
 
-      expect(apiResponse).to.have.keys('success', 'page', 'total', 'list');
-      expect(apiResponse.success).to.eql(true);
+      expect(apiResponse).to.have.keys('page', 'total', 'list');
       expect(apiResponse.total).to.eql(4);
     });
     it('should return the list of agents when requesting as a user with fleet read permissions', async () => {
@@ -87,8 +86,7 @@ export default function ({ getService }: FtrProviderContext) {
         .get(`/api/ingest_manager/fleet/agents`)
         .auth(users.fleet_user.username, users.fleet_user.password)
         .expect(200);
-      expect(apiResponse).to.have.keys('success', 'page', 'total', 'list');
-      expect(apiResponse.success).to.eql(true);
+      expect(apiResponse).to.have.keys('page', 'total', 'list');
       expect(apiResponse.total).to.eql(4);
     });
     it('should not return the list of agents when requesting as a user without fleet permissions', async () => {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/unenroll.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/unenroll.ts
index d1ff8731183ba4..d24e438fa13eab 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/unenroll.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/agents/unenroll.ts
@@ -65,20 +65,17 @@ export default function (providerContext: FtrProviderContext) {
     });
 
     it('allow to unenroll using a list of ids', async () => {
-      const { body } = await supertest
+      await supertest
         .post(`/api/ingest_manager/fleet/agents/agent1/unenroll`)
         .set('kbn-xsrf', 'xxx')
         .send({
           force: true,
         })
         .expect(200);
-
-      expect(body).to.have.keys('success');
-      expect(body.success).to.be(true);
     });
 
     it('should invalidate related API keys', async () => {
-      const { body } = await supertest
+      await supertest
         .post(`/api/ingest_manager/fleet/agents/agent1/unenroll`)
         .set('kbn-xsrf', 'xxx')
         .send({
@@ -86,9 +83,6 @@ export default function (providerContext: FtrProviderContext) {
         })
         .expect(200);
 
-      expect(body).to.have.keys('success');
-      expect(body.success).to.be(true);
-
       const {
         body: { api_keys: accessAPIKeys },
       } = await esClient.security.getApiKey({ id: accessAPIKeyId });
diff --git a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
index 275462072919bb..6c5d552a51eb9c 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/fleet/enrollment_api_keys/crud.ts
@@ -67,13 +67,11 @@ export default function (providerContext: FtrProviderContext) {
       });
 
       it('should invalide an existing api keys', async () => {
-        const { body: apiResponse } = await supertest
+        await supertest
           .delete(`/api/ingest_manager/fleet/enrollment-api-keys/${keyId}`)
           .set('kbn-xsrf', 'xxx')
           .expect(200);
 
-        expect(apiResponse.success).to.eql(true);
-
         const {
           body: { api_keys: apiKeys },
         } = await es.security.getApiKey({ id: esApiKeyId });
@@ -113,7 +111,6 @@ export default function (providerContext: FtrProviderContext) {
           })
           .expect(200);
 
-        expect(apiResponse.success).to.eql(true);
         expect(apiResponse.item).to.have.keys('id', 'api_key', 'api_key_id', 'name', 'policy_id');
       });
 
@@ -125,7 +122,7 @@ export default function (providerContext: FtrProviderContext) {
             policy_id: 'policy1',
           })
           .expect(200);
-        expect(apiResponse.success).to.eql(true);
+
         const { body: privileges } = await getEsClientForAPIKey(
           providerContext,
           apiResponse.item.api_key
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
index c88f03de59615b..113fbeca494d8f 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/create.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { warnAndSkipTest } from '../../helpers';
 
@@ -34,7 +33,7 @@ export default function ({ getService }: FtrProviderContext) {
 
     it('should work with valid values', async function () {
       if (server.enabled) {
-        const { body: apiResponse } = await supertest
+        await supertest
           .post(`/api/ingest_manager/package_policies`)
           .set('kbn-xsrf', 'xxxx')
           .send({
@@ -52,8 +51,6 @@ export default function ({ getService }: FtrProviderContext) {
             },
           })
           .expect(200);
-
-        expect(apiResponse.success).to.be(true);
       } else {
         warnAndSkipTest(this, log);
       }
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
index 756eaa8ea49bab..53a400d2fd9ebf 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/get.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
@@ -75,11 +74,7 @@ export default function (providerContext: FtrProviderContext) {
     });
 
     it('should succeed with a valid id', async function () {
-      const { body: apiResponse } = await supertest
-        .get(`/api/ingest_manager/package_policies/${packagePolicyId}`)
-        .expect(200);
-
-      expect(apiResponse.success).to.be(true);
+      await supertest.get(`/api/ingest_manager/package_policies/${packagePolicyId}`).expect(200);
     });
 
     it('should return a 404 with an invalid id', async function () {
diff --git a/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts b/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
index e74d88f3538e4a..3c4cb93ee3ff3d 100644
--- a/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
+++ b/x-pack/test/ingest_manager_api_integration/apis/package_policy/update.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
@@ -77,7 +76,7 @@ export default function (providerContext: FtrProviderContext) {
     });
 
     it('should work with valid values', async function () {
-      const { body: apiResponse } = await supertest
+      await supertest
         .put(`/api/ingest_manager/package_policies/${packagePolicyId}`)
         .set('kbn-xsrf', 'xxxx')
         .send({
@@ -95,8 +94,6 @@ export default function (providerContext: FtrProviderContext) {
           },
         })
         .expect(200);
-
-      expect(apiResponse.success).to.be(true);
     });
 
     it('should return a 500 if there is another package policy with the same name', async function () {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/artifacts/index.ts b/x-pack/test/security_solution_endpoint_api_int/apis/artifacts/index.ts
index d5106f55499241..17a4182fe9371d 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/artifacts/index.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/artifacts/index.ts
@@ -54,7 +54,6 @@ export default function (providerContext: FtrProviderContext) {
           },
         })
         .expect(200);
-      expect(enrollmentResponse.success).to.eql(true);
 
       agentAccessAPIKey = enrollmentResponse.item.access_api_key;
     });

From 1d4a56f7056f6627b823bcfaaea7de4e2d19c1bb Mon Sep 17 00:00:00 2001
From: Spencer <email@spalger.com>
Date: Wed, 2 Sep 2020 11:15:01 -0700
Subject: [PATCH 187/216] [esArchiver] stop importing stream helpers from src
 (#76519)

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .../src/lib/streams/concat_stream.test.js     |  74 ++++++++++
 .../src/lib/streams/concat_stream.ts          |  41 ++++++
 .../streams/concat_stream_providers.test.js   |  66 +++++++++
 .../lib/streams/concat_stream_providers.ts    |  60 ++++++++
 .../src/lib/streams/filter_stream.test.ts     |  77 ++++++++++
 .../{streams.ts => streams/filter_stream.ts}  |  15 +-
 .../kbn-es-archiver/src/lib/streams/index.ts  |  29 ++++
 .../lib/streams/intersperse_stream.test.js    |  54 +++++++
 .../src/lib/streams/intersperse_stream.ts     |  61 ++++++++
 .../src/lib/streams/list_stream.test.js       |  44 ++++++
 .../src/lib/streams/list_stream.ts            |  41 ++++++
 .../src/lib/streams/map_stream.test.js        |  61 ++++++++
 .../src/lib/streams/map_stream.ts             |  36 +++++
 .../lib/streams/promise_from_streams.test.js  | 136 ++++++++++++++++++
 .../src/lib/streams/promise_from_streams.ts   |  64 +++++++++
 .../src/lib/streams/reduce_stream.test.js     |  84 +++++++++++
 .../src/lib/streams/reduce_stream.ts          |  77 ++++++++++
 .../src/lib/streams/replace_stream.test.js    | 130 +++++++++++++++++
 .../src/lib/streams/replace_stream.ts         |  84 +++++++++++
 .../src/lib/streams/split_stream.test.js      |  71 +++++++++
 .../src/lib/streams/split_stream.ts           |  71 +++++++++
 21 files changed, 1375 insertions(+), 1 deletion(-)
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/concat_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/concat_stream.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/filter_stream.test.ts
 rename packages/kbn-es-archiver/src/lib/{streams.ts => streams/filter_stream.ts} (71%)
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/index.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/intersperse_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/intersperse_stream.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/list_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/list_stream.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/map_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/map_stream.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/promise_from_streams.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/promise_from_streams.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/reduce_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/reduce_stream.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/replace_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/replace_stream.ts
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/split_stream.test.js
 create mode 100644 packages/kbn-es-archiver/src/lib/streams/split_stream.ts

diff --git a/packages/kbn-es-archiver/src/lib/streams/concat_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/concat_stream.test.js
new file mode 100644
index 00000000000000..1498334013d1ab
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/concat_stream.test.js
@@ -0,0 +1,74 @@
+/*
+ * 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 { createListStream, createPromiseFromStreams, createConcatStream } from './';
+
+describe('concatStream', () => {
+  test('accepts an initial value', async () => {
+    const output = await createPromiseFromStreams([
+      createListStream([1, 2, 3]),
+      createConcatStream([0]),
+    ]);
+
+    expect(output).toEqual([0, 1, 2, 3]);
+  });
+
+  describe(`combines using the previous value's concat method`, () => {
+    test('works with strings', async () => {
+      const output = await createPromiseFromStreams([
+        createListStream(['a', 'b', 'c']),
+        createConcatStream(),
+      ]);
+      expect(output).toEqual('abc');
+    });
+
+    test('works with arrays', async () => {
+      const output = await createPromiseFromStreams([
+        createListStream([[1], [2, 3, 4], [10]]),
+        createConcatStream(),
+      ]);
+      expect(output).toEqual([1, 2, 3, 4, 10]);
+    });
+
+    test('works with a mixture, starting with array', async () => {
+      const output = await createPromiseFromStreams([
+        createListStream([[], 1, 2, 3, 4, [5, 6, 7]]),
+        createConcatStream(),
+      ]);
+      expect(output).toEqual([1, 2, 3, 4, 5, 6, 7]);
+    });
+
+    test('fails when the value does not have a concat method', async () => {
+      let promise;
+      try {
+        promise = createPromiseFromStreams([createListStream([1, '1']), createConcatStream()]);
+      } catch (err) {
+        throw new Error('createPromiseFromStreams() should not fail synchronously');
+      }
+
+      try {
+        await promise;
+        throw new Error('Promise should have rejected');
+      } catch (err) {
+        expect(err).toBeInstanceOf(Error);
+        expect(err.message).toContain('concat');
+      }
+    });
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/concat_stream.ts b/packages/kbn-es-archiver/src/lib/streams/concat_stream.ts
new file mode 100644
index 00000000000000..03dd894067afc5
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/concat_stream.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 { createReduceStream } from './reduce_stream';
+
+/**
+ *  Creates a Transform stream that consumes all provided
+ *  values and concatenates them using each values `concat`
+ *  method.
+ *
+ *  Concatenate strings:
+ *    createListStream(['f', 'o', 'o'])
+ *      .pipe(createConcatStream())
+ *      .on('data', console.log)
+ *      // logs "foo"
+ *
+ *  Concatenate values into an array:
+ *    createListStream([1,2,3])
+ *      .pipe(createConcatStream([]))
+ *      .on('data', console.log)
+ *      // logs "[1,2,3]"
+ */
+export function createConcatStream(initial: any) {
+  return createReduceStream((acc, chunk) => acc.concat(chunk), initial);
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.test.js b/packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.test.js
new file mode 100644
index 00000000000000..b742a770b70c81
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.test.js
@@ -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 { Readable } from 'stream';
+
+import { concatStreamProviders } from './concat_stream_providers';
+import { createListStream } from './list_stream';
+import { createConcatStream } from './concat_stream';
+import { createPromiseFromStreams } from './promise_from_streams';
+
+describe('concatStreamProviders() helper', () => {
+  test('writes the data from an array of stream providers into a destination stream in order', async () => {
+    const results = await createPromiseFromStreams([
+      concatStreamProviders([
+        () => createListStream(['foo', 'bar']),
+        () => createListStream(['baz']),
+        () => createListStream(['bug']),
+      ]),
+      createConcatStream(''),
+    ]);
+
+    expect(results).toBe('foobarbazbug');
+  });
+
+  test('emits the errors from a sub-stream to the destination', async () => {
+    const dest = concatStreamProviders([
+      () => createListStream(['foo', 'bar']),
+      () =>
+        new Readable({
+          read() {
+            this.emit('error', new Error('foo'));
+          },
+        }),
+    ]);
+
+    const errorListener = jest.fn();
+    dest.on('error', errorListener);
+
+    await expect(createPromiseFromStreams([dest])).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"foo"`
+    );
+    expect(errorListener.mock.calls).toMatchInlineSnapshot(`
+Array [
+  Array [
+    [Error: foo],
+  ],
+]
+`);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.ts b/packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.ts
new file mode 100644
index 00000000000000..4794d76cc7f846
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/concat_stream_providers.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 { PassThrough, TransformOptions } from 'stream';
+
+/**
+ *  Write the data and errors from a list of stream providers
+ *  to a single stream in order. Stream providers are only
+ *  called right before they will be consumed, and only one
+ *  provider will be active at a time.
+ */
+export function concatStreamProviders(
+  sourceProviders: Array<() => NodeJS.ReadableStream>,
+  options: TransformOptions = {}
+) {
+  const destination = new PassThrough(options);
+  const queue = sourceProviders.slice();
+
+  (function pipeNext() {
+    const provider = queue.shift();
+
+    if (!provider) {
+      return;
+    }
+
+    const source = provider();
+    const isLast = !queue.length;
+
+    // if there are more sources to pipe, hook
+    // into the source completion
+    if (!isLast) {
+      source.once('end', pipeNext);
+    }
+
+    source
+      // proxy errors from the source to the destination
+      .once('error', (error) => destination.emit('error', error))
+      // pipe the source to the destination but only proxy the
+      // end event if this is the last source
+      .pipe(destination, { end: isLast });
+  })();
+
+  return destination;
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/filter_stream.test.ts b/packages/kbn-es-archiver/src/lib/streams/filter_stream.test.ts
new file mode 100644
index 00000000000000..28b7f2588628e7
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/filter_stream.test.ts
@@ -0,0 +1,77 @@
+/*
+ * 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 {
+  createConcatStream,
+  createFilterStream,
+  createListStream,
+  createPromiseFromStreams,
+} from './';
+
+describe('createFilterStream()', () => {
+  test('calls the function with each item in the source stream', async () => {
+    const filter = jest.fn().mockReturnValue(true);
+
+    await createPromiseFromStreams([createListStream(['a', 'b', 'c']), createFilterStream(filter)]);
+
+    expect(filter).toMatchInlineSnapshot(`
+      [MockFunction] {
+        "calls": Array [
+          Array [
+            "a",
+          ],
+          Array [
+            "b",
+          ],
+          Array [
+            "c",
+          ],
+        ],
+        "results": Array [
+          Object {
+            "type": "return",
+            "value": true,
+          },
+          Object {
+            "type": "return",
+            "value": true,
+          },
+          Object {
+            "type": "return",
+            "value": true,
+          },
+        ],
+      }
+    `);
+  });
+
+  test('send the filtered values on the output stream', async () => {
+    const result = await createPromiseFromStreams([
+      createListStream([1, 2, 3]),
+      createFilterStream<number>((n) => n % 2 === 0),
+      createConcatStream([]),
+    ]);
+
+    expect(result).toMatchInlineSnapshot(`
+      Array [
+        2,
+      ]
+    `);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams.ts b/packages/kbn-es-archiver/src/lib/streams/filter_stream.ts
similarity index 71%
rename from packages/kbn-es-archiver/src/lib/streams.ts
rename to packages/kbn-es-archiver/src/lib/streams/filter_stream.ts
index a90afbe0c4d254..738b9d5793d064 100644
--- a/packages/kbn-es-archiver/src/lib/streams.ts
+++ b/packages/kbn-es-archiver/src/lib/streams/filter_stream.ts
@@ -17,4 +17,17 @@
  * under the License.
  */
 
-export * from '../../../../src/legacy/utils/streams';
+import { Transform } from 'stream';
+
+export function createFilterStream<T>(fn: (obj: T) => boolean) {
+  return new Transform({
+    objectMode: true,
+    async transform(obj, _, done) {
+      const canPushDownStream = fn(obj);
+      if (canPushDownStream) {
+        this.push(obj);
+      }
+      done();
+    },
+  });
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/index.ts b/packages/kbn-es-archiver/src/lib/streams/index.ts
new file mode 100644
index 00000000000000..447d1ed5b1c535
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/index.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.
+ */
+
+export { concatStreamProviders } from './concat_stream_providers';
+export { createIntersperseStream } from './intersperse_stream';
+export { createSplitStream } from './split_stream';
+export { createListStream } from './list_stream';
+export { createReduceStream } from './reduce_stream';
+export { createPromiseFromStreams } from './promise_from_streams';
+export { createConcatStream } from './concat_stream';
+export { createMapStream } from './map_stream';
+export { createReplaceStream } from './replace_stream';
+export { createFilterStream } from './filter_stream';
diff --git a/packages/kbn-es-archiver/src/lib/streams/intersperse_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/intersperse_stream.test.js
new file mode 100644
index 00000000000000..e11b36d77106a6
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/intersperse_stream.test.js
@@ -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 {
+  createPromiseFromStreams,
+  createListStream,
+  createIntersperseStream,
+  createConcatStream,
+} from './';
+
+describe('intersperseStream', () => {
+  test('places the intersperse value between each provided value', async () => {
+    expect(
+      await createPromiseFromStreams([
+        createListStream(['to', 'be', 'or', 'not', 'to', 'be']),
+        createIntersperseStream(' '),
+        createConcatStream(),
+      ])
+    ).toBe('to be or not to be');
+  });
+
+  test('emits values as soon as possible, does not needlessly buffer', async () => {
+    const str = createIntersperseStream('y');
+    const onData = jest.fn();
+    str.on('data', onData);
+
+    str.write('a');
+    expect(onData).toHaveBeenCalledTimes(1);
+    expect(onData.mock.calls[0]).toEqual(['a']);
+    onData.mockClear();
+
+    str.write('b');
+    expect(onData).toHaveBeenCalledTimes(2);
+    expect(onData.mock.calls[0]).toEqual(['y']);
+    expect(onData).toHaveBeenCalledTimes(2);
+    expect(onData.mock.calls[1]).toEqual(['b']);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/intersperse_stream.ts b/packages/kbn-es-archiver/src/lib/streams/intersperse_stream.ts
new file mode 100644
index 00000000000000..eb2e3d3087d4ad
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/intersperse_stream.ts
@@ -0,0 +1,61 @@
+/*
+ * 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 { Transform } from 'stream';
+
+/**
+ *  Create a Transform stream that receives values in object mode,
+ *  and intersperses a chunk between each object received.
+ *
+ *  This is useful for writing lists:
+ *
+ *    createListStream(['foo', 'bar'])
+ *      .pipe(createIntersperseStream('\n'))
+ *      .pipe(process.stdout) // outputs "foo\nbar"
+ *
+ *  Combine with a concat stream to get "join" like functionality:
+ *
+ *    await createPromiseFromStreams([
+ *      createListStream(['foo', 'bar']),
+ *      createIntersperseStream(' '),
+ *      createConcatStream()
+ *    ]) // produces a single value "foo bar"
+ */
+export function createIntersperseStream(intersperseChunk: any) {
+  let first = true;
+
+  return new Transform({
+    writableObjectMode: true,
+    readableObjectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        if (first) {
+          first = false;
+        } else {
+          this.push(intersperseChunk);
+        }
+
+        this.push(chunk);
+        callback(undefined);
+      } catch (err) {
+        callback(err);
+      }
+    },
+  });
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/list_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/list_stream.test.js
new file mode 100644
index 00000000000000..12e20696b05101
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/list_stream.test.js
@@ -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 { createListStream } from './';
+
+describe('listStream', () => {
+  test('provides the values in the initial list', async () => {
+    const str = createListStream([1, 2, 3, 4]);
+    const onData = jest.fn();
+    str.on('data', onData);
+
+    await new Promise((resolve) => str.on('end', resolve));
+
+    expect(onData).toHaveBeenCalledTimes(4);
+    expect(onData.mock.calls[0]).toEqual([1]);
+    expect(onData.mock.calls[1]).toEqual([2]);
+    expect(onData.mock.calls[2]).toEqual([3]);
+    expect(onData.mock.calls[3]).toEqual([4]);
+  });
+
+  test('does not modify the list passed', async () => {
+    const list = [1, 2, 3, 4];
+    const str = createListStream(list);
+    str.resume();
+    await new Promise((resolve) => str.on('end', resolve));
+    expect(list).toEqual([1, 2, 3, 4]);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/list_stream.ts b/packages/kbn-es-archiver/src/lib/streams/list_stream.ts
new file mode 100644
index 00000000000000..c061b969b3c099
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/list_stream.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 { Readable } from 'stream';
+
+/**
+ *  Create a Readable stream that provides the items
+ *  from a list as objects to subscribers
+ */
+export function createListStream(items: any | any[] = []) {
+  const queue: any[] = [].concat(items);
+
+  return new Readable({
+    objectMode: true,
+    read(size) {
+      queue.splice(0, size).forEach((item) => {
+        this.push(item);
+      });
+
+      if (!queue.length) {
+        this.push(null);
+      }
+    },
+  });
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/map_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/map_stream.test.js
new file mode 100644
index 00000000000000..d86da178f0c1b3
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/map_stream.test.js
@@ -0,0 +1,61 @@
+/*
+ * 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 { delay } from 'bluebird';
+
+import { createPromiseFromStreams } from './promise_from_streams';
+import { createListStream } from './list_stream';
+import { createMapStream } from './map_stream';
+import { createConcatStream } from './concat_stream';
+
+describe('createMapStream()', () => {
+  test('calls the function with each item in the source stream', async () => {
+    const mapper = jest.fn();
+
+    await createPromiseFromStreams([createListStream(['a', 'b', 'c']), createMapStream(mapper)]);
+
+    expect(mapper).toHaveBeenCalledTimes(3);
+    expect(mapper).toHaveBeenCalledWith('a', 0);
+    expect(mapper).toHaveBeenCalledWith('b', 1);
+    expect(mapper).toHaveBeenCalledWith('c', 2);
+  });
+
+  test('send the return value from the mapper on the output stream', async () => {
+    const result = await createPromiseFromStreams([
+      createListStream([1, 2, 3]),
+      createMapStream((n) => n * 100),
+      createConcatStream([]),
+    ]);
+
+    expect(result).toEqual([100, 200, 300]);
+  });
+
+  test('supports async mappers', async () => {
+    const result = await createPromiseFromStreams([
+      createListStream([1, 2, 3]),
+      createMapStream(async (n, i) => {
+        await delay(n);
+        return n * i;
+      }),
+      createConcatStream([]),
+    ]);
+
+    expect(result).toEqual([0, 2, 6]);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/map_stream.ts b/packages/kbn-es-archiver/src/lib/streams/map_stream.ts
new file mode 100644
index 00000000000000..e88c512a386535
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/map_stream.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 { Transform } from 'stream';
+
+export function createMapStream<T = any>(fn: (chunk: any, i: number) => T | Promise<T>) {
+  let i = 0;
+
+  return new Transform({
+    objectMode: true,
+    async transform(value, _, done) {
+      try {
+        this.push(await fn(value, i++));
+        done();
+      } catch (err) {
+        done(err);
+      }
+    },
+  });
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/promise_from_streams.test.js b/packages/kbn-es-archiver/src/lib/streams/promise_from_streams.test.js
new file mode 100644
index 00000000000000..e4d9835106f12c
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/promise_from_streams.test.js
@@ -0,0 +1,136 @@
+/*
+ * 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 { Readable, Writable, Duplex, Transform } from 'stream';
+
+import { createListStream, createPromiseFromStreams, createReduceStream } from './';
+
+describe('promiseFromStreams', () => {
+  test('pipes together an array of streams', async () => {
+    const str1 = createListStream([1, 2, 3]);
+    const str2 = createReduceStream((acc, n) => acc + n, 0);
+    const sumPromise = new Promise((resolve) => str2.once('data', resolve));
+    createPromiseFromStreams([str1, str2]);
+    await new Promise((resolve) => str2.once('end', resolve));
+    expect(await sumPromise).toBe(6);
+  });
+
+  describe('last stream is writable', () => {
+    test('waits for the last stream to finish writing', async () => {
+      let written = '';
+
+      await createPromiseFromStreams([
+        createListStream(['a']),
+        new Writable({
+          write(chunk, enc, cb) {
+            setTimeout(() => {
+              written += chunk;
+              cb();
+            }, 100);
+          },
+        }),
+      ]);
+
+      expect(written).toBe('a');
+    });
+
+    test('resolves to undefined', async () => {
+      const result = await createPromiseFromStreams([
+        createListStream(['a']),
+        new Writable({
+          write(chunk, enc, cb) {
+            cb();
+          },
+        }),
+      ]);
+
+      expect(result).toBe(undefined);
+    });
+  });
+
+  describe('last stream is readable', () => {
+    test(`resolves to it's final value`, async () => {
+      const result = await createPromiseFromStreams([createListStream(['a', 'b', 'c'])]);
+
+      expect(result).toBe('c');
+    });
+  });
+
+  describe('last stream is duplex', () => {
+    test('waits for writing and resolves to final value', async () => {
+      let written = '';
+
+      const duplexReadQueue = [];
+      const duplexItemsToPush = ['foo', 'bar', null];
+      const result = await createPromiseFromStreams([
+        createListStream(['a', 'b', 'c']),
+        new Duplex({
+          async read() {
+            const result = await duplexReadQueue.shift();
+            this.push(result);
+          },
+
+          write(chunk, enc, cb) {
+            duplexReadQueue.push(
+              new Promise((resolve) => {
+                setTimeout(() => {
+                  written += chunk;
+                  cb();
+                  resolve(duplexItemsToPush.shift());
+                }, 50);
+              })
+            );
+          },
+        }).setEncoding('utf8'),
+      ]);
+
+      expect(written).toEqual('abc');
+      expect(result).toBe('bar');
+    });
+  });
+
+  describe('error handling', () => {
+    test('read stream gets destroyed when transform stream fails', async () => {
+      let destroyCalled = false;
+      const readStream = new Readable({
+        read() {
+          this.push('a');
+          this.push('b');
+          this.push('c');
+          this.push(null);
+        },
+        destroy() {
+          destroyCalled = true;
+        },
+      });
+      const transformStream = new Transform({
+        transform(chunk, enc, done) {
+          done(new Error('Test error'));
+        },
+      });
+      try {
+        await createPromiseFromStreams([readStream, transformStream]);
+        throw new Error('Should fail');
+      } catch (e) {
+        expect(e.message).toBe('Test error');
+        expect(destroyCalled).toBe(true);
+      }
+    });
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/promise_from_streams.ts b/packages/kbn-es-archiver/src/lib/streams/promise_from_streams.ts
new file mode 100644
index 00000000000000..fefb18be147805
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/promise_from_streams.ts
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ */
+
+/**
+ *  Take an array of streams, pipe the output
+ *  from each one into the next, listening for
+ *  errors from any of the streams, and then resolve
+ *  the promise once the final stream has finished
+ *  writing/reading.
+ *
+ *  If the last stream is readable, it's final value
+ *  will be provided as the promise value.
+ *
+ *  Errors emitted from any stream will cause
+ *  the promise to be rejected with that error.
+ */
+
+import { pipeline, Writable } from 'stream';
+import { promisify } from 'util';
+
+const asyncPipeline = promisify(pipeline);
+
+export async function createPromiseFromStreams<T = any>(streams: any): Promise<T> {
+  let finalChunk: any;
+  const last = streams[streams.length - 1];
+  if (typeof last.read !== 'function' && streams.length === 1) {
+    // For a nicer error than what stream.pipeline throws
+    throw new Error('A minimum of 2 streams is required when a non-readable stream is given');
+  }
+  if (typeof last.read === 'function') {
+    // We are pushing a writable stream to capture the last chunk
+    streams.push(
+      new Writable({
+        // Use object mode even when "last" stream isn't. This allows to
+        // capture the last chunk as-is.
+        objectMode: true,
+        write(chunk, _, done) {
+          finalChunk = chunk;
+          done();
+        },
+      })
+    );
+  }
+
+  await asyncPipeline(...(streams as [any]));
+
+  return finalChunk;
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/reduce_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/reduce_stream.test.js
new file mode 100644
index 00000000000000..2c073f67f82a89
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/reduce_stream.test.js
@@ -0,0 +1,84 @@
+/*
+ * 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 { createReduceStream, createPromiseFromStreams, createListStream } from './';
+
+const promiseFromEvent = (name, emitter) =>
+  new Promise((resolve) => emitter.on(name, () => resolve(name)));
+
+describe('reduceStream', () => {
+  test('calls the reducer for each item provided', async () => {
+    const stub = jest.fn();
+    await createPromiseFromStreams([
+      createListStream([1, 2, 3]),
+      createReduceStream((val, chunk, enc) => {
+        stub(val, chunk, enc);
+        return chunk;
+      }, 0),
+    ]);
+    expect(stub).toHaveBeenCalledTimes(3);
+    expect(stub.mock.calls[0]).toEqual([0, 1, 'utf8']);
+    expect(stub.mock.calls[1]).toEqual([1, 2, 'utf8']);
+    expect(stub.mock.calls[2]).toEqual([2, 3, 'utf8']);
+  });
+
+  test('provides the return value of the last iteration of the reducer', async () => {
+    const result = await createPromiseFromStreams([
+      createListStream('abcdefg'.split('')),
+      createReduceStream((acc) => acc + 1, 0),
+    ]);
+    expect(result).toBe(7);
+  });
+
+  test('emits an error if an iteration fails', async () => {
+    const reduce = createReduceStream((acc, i) => expect(i).toBe(1), 0);
+    const errorEvent = promiseFromEvent('error', reduce);
+
+    reduce.write(1);
+    reduce.write(2);
+    reduce.resume();
+    await errorEvent;
+  });
+
+  test('stops calling the reducer if an iteration fails, emits no data', async () => {
+    const reducer = jest.fn((acc, i) => {
+      if (i < 100) return acc + i;
+      else throw new Error(i);
+    });
+    const reduce$ = createReduceStream(reducer, 0);
+
+    const dataStub = jest.fn();
+    const errorStub = jest.fn();
+    reduce$.on('data', dataStub);
+    reduce$.on('error', errorStub);
+    const endEvent = promiseFromEvent('end', reduce$);
+
+    reduce$.write(1);
+    reduce$.write(2);
+    reduce$.write(300);
+    reduce$.write(400);
+    reduce$.write(1000);
+    reduce$.end();
+
+    await endEvent;
+    expect(reducer).toHaveBeenCalledTimes(3);
+    expect(dataStub).toHaveBeenCalledTimes(0);
+    expect(errorStub).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/reduce_stream.ts b/packages/kbn-es-archiver/src/lib/streams/reduce_stream.ts
new file mode 100644
index 00000000000000..d9458e9a11c33a
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/reduce_stream.ts
@@ -0,0 +1,77 @@
+/*
+ * 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 { Transform } from 'stream';
+
+/**
+ *  Create a transform stream that consumes each chunk it receives
+ *  and passes it to the reducer, which will return the new value
+ *  for the stream. Once all chunks have been received the reduce
+ *  stream provides the result of final call to the reducer to
+ *  subscribers.
+ */
+export function createReduceStream(
+  reducer: (acc: any, chunk: any, env: string) => any,
+  initial: any
+) {
+  let i = -1;
+  let value = initial;
+
+  // if the reducer throws an error then the value is
+  // considered invalid and the stream will never provide
+  // it to subscribers. We will also stop calling the
+  // reducer for any new data that is provided to us
+  let failed = false;
+
+  if (typeof reducer !== 'function') {
+    throw new TypeError('reducer must be a function');
+  }
+
+  return new Transform({
+    readableObjectMode: true,
+    writableObjectMode: true,
+    async transform(chunk, enc, callback) {
+      try {
+        if (failed) {
+          return callback();
+        }
+
+        i += 1;
+        if (i === 0 && initial === undefined) {
+          value = chunk;
+        } else {
+          value = await reducer(value, chunk, enc);
+        }
+
+        callback();
+      } catch (err) {
+        failed = true;
+        callback(err);
+      }
+    },
+
+    flush(callback) {
+      if (!failed) {
+        this.push(value);
+      }
+
+      callback();
+    },
+  });
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/replace_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/replace_stream.test.js
new file mode 100644
index 00000000000000..01b89f93e5af06
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/replace_stream.test.js
@@ -0,0 +1,130 @@
+/*
+ * 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 {
+  createReplaceStream,
+  createConcatStream,
+  createPromiseFromStreams,
+  createListStream,
+  createMapStream,
+} from './';
+
+async function concatToString(streams) {
+  return await createPromiseFromStreams([
+    ...streams,
+    createMapStream((buff) => buff.toString('utf8')),
+    createConcatStream(''),
+  ]);
+}
+
+describe('replaceStream', () => {
+  test('produces buffers when it receives buffers', async () => {
+    const chunks = await createPromiseFromStreams([
+      createListStream([Buffer.from('foo'), Buffer.from('bar')]),
+      createReplaceStream('o', '0'),
+      createConcatStream([]),
+    ]);
+
+    chunks.forEach((chunk) => {
+      expect(chunk).toBeInstanceOf(Buffer);
+    });
+  });
+
+  test('produces buffers when it receives strings', async () => {
+    const chunks = await createPromiseFromStreams([
+      createListStream(['foo', 'bar']),
+      createReplaceStream('o', '0'),
+      createConcatStream([]),
+    ]);
+
+    chunks.forEach((chunk) => {
+      expect(chunk).toBeInstanceOf(Buffer);
+    });
+  });
+
+  test('expects toReplace to be a string', () => {
+    expect(() => createReplaceStream(Buffer.from('foo'))).toThrowError(/be a string/);
+  });
+
+  test('replaces multiple single-char instances in a single chunk', async () => {
+    expect(
+      await concatToString([
+        createListStream([Buffer.from('f00 bar')]),
+        createReplaceStream('0', 'o'),
+      ])
+    ).toBe('foo bar');
+  });
+
+  test('replaces multiple single-char instances in multiple chunks', async () => {
+    expect(
+      await concatToString([
+        createListStream([Buffer.from('f0'), Buffer.from('0 bar')]),
+        createReplaceStream('0', 'o'),
+      ])
+    ).toBe('foo bar');
+  });
+
+  test('replaces single multi-char instances in single chunks', async () => {
+    expect(
+      await concatToString([
+        createListStream([Buffer.from('f0'), Buffer.from('0 bar')]),
+        createReplaceStream('0', 'o'),
+      ])
+    ).toBe('foo bar');
+  });
+
+  test('replaces multiple multi-char instances in single chunks', async () => {
+    expect(
+      await concatToString([
+        createListStream([Buffer.from('foo ba'), Buffer.from('r b'), Buffer.from('az bar')]),
+        createReplaceStream('bar', '*'),
+      ])
+    ).toBe('foo * baz *');
+  });
+
+  test('replaces multi-char instance that stretches multiple chunks', async () => {
+    expect(
+      await concatToString([
+        createListStream([
+          Buffer.from('foo supe'),
+          Buffer.from('rcalifra'),
+          Buffer.from('gilistic'),
+          Buffer.from('expialid'),
+          Buffer.from('ocious bar'),
+        ]),
+        createReplaceStream('supercalifragilisticexpialidocious', '*'),
+      ])
+    ).toBe('foo * bar');
+  });
+
+  test('ignores missing multi-char instance', async () => {
+    expect(
+      await concatToString([
+        createListStream([
+          Buffer.from('foo supe'),
+          Buffer.from('rcalifra'),
+          Buffer.from('gili stic'),
+          Buffer.from('expialid'),
+          Buffer.from('ocious bar'),
+        ]),
+        createReplaceStream('supercalifragilisticexpialidocious', '*'),
+      ])
+    ).toBe('foo supercalifragili sticexpialidocious bar');
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/replace_stream.ts b/packages/kbn-es-archiver/src/lib/streams/replace_stream.ts
new file mode 100644
index 00000000000000..fe2ba1fcdf31c9
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/replace_stream.ts
@@ -0,0 +1,84 @@
+/*
+ * 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 { Transform } from 'stream';
+
+export function createReplaceStream(toReplace: string, replacement: string) {
+  if (typeof toReplace !== 'string') {
+    throw new TypeError('toReplace must be a string');
+  }
+
+  let buffer = Buffer.alloc(0);
+  return new Transform({
+    objectMode: false,
+    async transform(value, _, done) {
+      try {
+        buffer = Buffer.concat([buffer, value], buffer.length + value.length);
+
+        while (true) {
+          // try to find the next instance of `toReplace` in buffer
+          const index = buffer.indexOf(toReplace);
+
+          // if there is no next instance, break
+          if (index === -1) {
+            break;
+          }
+
+          // flush everything to the left of the next instance
+          // of `toReplace`
+          this.push(buffer.slice(0, index));
+
+          // then flush an instance of `replacement`
+          this.push(replacement);
+
+          // and finally update the buffer to include everything
+          // to the right of `toReplace`, dropping to replace from the buffer
+          buffer = buffer.slice(index + toReplace.length);
+        }
+
+        // until now we have only flushed data that is to the left
+        // of a discovered instance of `toReplace`. If `toReplace` is
+        // never found this would lead to us buffering the entire stream.
+        //
+        // Instead, we only keep enough buffer to complete a potentially
+        // partial instance of `toReplace`
+        if (buffer.length > toReplace.length) {
+          // the entire buffer except the last `toReplace.length` bytes
+          // so that if all but one byte from `toReplace` is in the buffer,
+          // and the next chunk delivers the necessary byte, the buffer will then
+          // contain a complete `toReplace` token.
+          this.push(buffer.slice(0, buffer.length - toReplace.length));
+          buffer = buffer.slice(-toReplace.length);
+        }
+
+        done();
+      } catch (err) {
+        done(err);
+      }
+    },
+
+    flush(callback) {
+      if (buffer.length) {
+        this.push(buffer);
+      }
+
+      callback();
+    },
+  });
+}
diff --git a/packages/kbn-es-archiver/src/lib/streams/split_stream.test.js b/packages/kbn-es-archiver/src/lib/streams/split_stream.test.js
new file mode 100644
index 00000000000000..e0736d220ba5ca
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/split_stream.test.js
@@ -0,0 +1,71 @@
+/*
+ * 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 { createSplitStream, createConcatStream, createPromiseFromStreams } from './';
+
+async function split(stream, input) {
+  const concat = createConcatStream();
+  concat.write([]);
+  stream.pipe(concat);
+  const output = createPromiseFromStreams([concat]);
+
+  input.forEach((i) => {
+    stream.write(i);
+  });
+  stream.end();
+
+  return await output;
+}
+
+describe('splitStream', () => {
+  test('splits buffers, produces strings', async () => {
+    const output = await split(createSplitStream('&'), [Buffer.from('foo&bar')]);
+    expect(output).toEqual(['foo', 'bar']);
+  });
+
+  test('supports mixed input', async () => {
+    const output = await split(createSplitStream('&'), [Buffer.from('foo&b'), 'ar']);
+    expect(output).toEqual(['foo', 'bar']);
+  });
+
+  test('supports buffer split chunks', async () => {
+    const output = await split(createSplitStream(Buffer.from('&')), ['foo&b', 'ar']);
+    expect(output).toEqual(['foo', 'bar']);
+  });
+
+  test('splits provided values by a delimiter', async () => {
+    const output = await split(createSplitStream('&'), ['foo&b', 'ar']);
+    expect(output).toEqual(['foo', 'bar']);
+  });
+
+  test('handles multi-character delimiters', async () => {
+    const output = await split(createSplitStream('oo'), ['foo&b', 'ar']);
+    expect(output).toEqual(['f', '&bar']);
+  });
+
+  test('handles delimiters that span multiple chunks', async () => {
+    const output = await split(createSplitStream('ba'), ['foo&b', 'ar']);
+    expect(output).toEqual(['foo&', 'r']);
+  });
+
+  test('produces an empty chunk if the split char is at the end of the input', async () => {
+    const output = await split(createSplitStream('&bar'), ['foo&b', 'ar']);
+    expect(output).toEqual(['foo', '']);
+  });
+});
diff --git a/packages/kbn-es-archiver/src/lib/streams/split_stream.ts b/packages/kbn-es-archiver/src/lib/streams/split_stream.ts
new file mode 100644
index 00000000000000..1c9b59449bd927
--- /dev/null
+++ b/packages/kbn-es-archiver/src/lib/streams/split_stream.ts
@@ -0,0 +1,71 @@
+/*
+ * 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 { Transform } from 'stream';
+
+/**
+ *  Creates a Transform stream that consumes a stream of Buffers
+ *  and produces a stream of strings (in object mode) by splitting
+ *  the received bytes using the splitChunk.
+ *
+ *  Ways this is behaves like String#split:
+ *    - instances of splitChunk are removed from the input
+ *    - splitChunk can be on any size
+ *    - if there are no bytes found after the last splitChunk
+ *      a final empty chunk is emitted
+ *
+ *  Ways this deviates from String#split:
+ *    - splitChunk cannot be a regexp
+ *    - an empty string or Buffer will not produce a stream of individual
+ *      bytes like `string.split('')` would
+ */
+export function createSplitStream(splitChunk: string) {
+  let unsplitBuffer = Buffer.alloc(0);
+
+  return new Transform({
+    writableObjectMode: false,
+    readableObjectMode: true,
+    transform(chunk, _, callback) {
+      try {
+        let i;
+        let toSplit = Buffer.concat([unsplitBuffer, chunk]);
+        while ((i = toSplit.indexOf(splitChunk)) !== -1) {
+          const slice = toSplit.slice(0, i);
+          toSplit = toSplit.slice(i + splitChunk.length);
+          this.push(slice.toString('utf8'));
+        }
+
+        unsplitBuffer = toSplit;
+        callback(undefined);
+      } catch (err) {
+        callback(err);
+      }
+    },
+
+    flush(callback) {
+      try {
+        this.push(unsplitBuffer.toString('utf8'));
+
+        callback(undefined);
+      } catch (err) {
+        callback(err);
+      }
+    },
+  });
+}

From de3ddbc6e1a986229ad2033b24af7bba6b353497 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Wed, 2 Sep 2020 14:22:55 -0400
Subject: [PATCH 188/216] [ML] DF Analytics jobs list: improve job details
 analysis stats view in expanded row (#76196)

* move analysis stats to own section in expanded row

* fix type errors

* move stats to separate tab in expanded row

* handle parameters and hyperparameters not defined
---
 .../analytics_list/expanded_row.tsx           | 78 ++++++++++++++++---
 1 file changed, 68 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
index 645c6c276a6f9f..95204f9ba09fcd 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/expanded_row.tsx
@@ -14,7 +14,7 @@ import { i18n } from '@kbn/i18n';
 import { formatHumanReadableDateTimeSeconds } from '../../../../../util/date_utils';
 
 import { DataFrameAnalyticsListRow } from './common';
-import { ExpandedRowDetailsPane, SectionConfig } from './expanded_row_details_pane';
+import { ExpandedRowDetailsPane, SectionConfig, SectionItem } from './expanded_row_details_pane';
 import { ExpandedRowJsonPane } from './expanded_row_json_pane';
 import { ProgressBar } from './progress_bar';
 import {
@@ -28,6 +28,7 @@ import { getTaskStateBadge } from './use_columns';
 import { getDataFrameAnalyticsProgressPhase, isCompletedAnalyticsJob } from './common';
 import {
   isRegressionAnalysis,
+  getAnalysisType,
   ANALYSIS_CONFIG_TYPE,
   REGRESSION_STATS,
   isRegressionEvaluateResponse,
@@ -76,6 +77,7 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
   const resultsField = item.config.dest.results_field;
   const jobIsCompleted = isCompletedAnalyticsJob(item.stats);
   const isRegressionJob = isRegressionAnalysis(item.config.analysis);
+  const analysisType = getAnalysisType(item.config.analysis);
 
   const loadData = async () => {
     setIsLoadingGeneralization(true);
@@ -160,25 +162,34 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
 
   const stateValues: any = { ...item.stats };
 
+  const analysisStatsValues = stateValues.analysis_stats
+    ? stateValues.analysis_stats[`${analysisType}_stats`]
+    : undefined;
+
   if (item.config?.description) {
     stateValues.description = item.config.description;
   }
   delete stateValues.progress;
 
-  const state: SectionConfig = {
-    title: i18n.translate('xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.state', {
-      defaultMessage: 'State',
-    }),
-    items: Object.entries(stateValues).map(([stateKey, stateValue]) => {
+  const stateItems = Object.entries(stateValues)
+    .map(([stateKey, stateValue]) => {
       const title = stateKey.toString();
       if (title === 'state') {
         return {
           title,
           description: getTaskStateBadge(getItemDescription(stateValue)),
         };
+      } else if (title !== 'analysis_stats') {
+        return { title, description: getItemDescription(stateValue) };
       }
-      return { title, description: getItemDescription(stateValue) };
+    })
+    .filter((stateItem) => stateItem !== undefined);
+
+  const state: SectionConfig = {
+    title: i18n.translate('xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.state', {
+      defaultMessage: 'State',
     }),
+    items: stateItems as SectionItem[],
     position: 'left',
   };
 
@@ -204,7 +215,7 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
         };
       }),
     ],
-    position: 'left',
+    position: 'right',
   };
 
   const stats: SectionConfig = {
@@ -221,9 +232,39 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
       { title: 'model_memory_limit', description: item.config.model_memory_limit },
       { title: 'version', description: item.config.version },
     ],
-    position: 'right',
+    position: 'left',
   };
 
+  const analysisStats: SectionConfig | undefined = analysisStatsValues
+    ? {
+        title: i18n.translate(
+          'xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.analysisStats',
+          {
+            defaultMessage: 'Analysis stats',
+          }
+        ),
+        items: [
+          {
+            title: 'timestamp',
+            description: formatHumanReadableDateTimeSeconds(
+              moment(analysisStatsValues.timestamp).unix() * 1000
+            ),
+          },
+          {
+            title: 'timing_stats',
+            description: getItemDescription(analysisStatsValues.timing_stats),
+          },
+          ...Object.entries(
+            analysisStatsValues.parameters || analysisStatsValues.hyperparameters || {}
+          ).map(([stateKey, stateValue]) => {
+            const title = stateKey.toString();
+            return { title, description: getItemDescription(stateValue) };
+          }),
+        ],
+        position: 'right',
+      }
+    : undefined;
+
   if (jobIsCompleted && isRegressionJob) {
     stats.items.push(
       {
@@ -309,13 +350,30 @@ export const ExpandedRow: FC<Props> = ({ item }) => {
     );
   }
 
+  const detailsSections: SectionConfig[] = [state, progress];
+  const statsSections: SectionConfig[] = [stats];
+
+  if (analysisStats !== undefined) {
+    statsSections.push(analysisStats);
+  }
+
   const tabs = [
     {
       id: 'ml-analytics-job-details',
       name: i18n.translate('xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettingsLabel', {
         defaultMessage: 'Job details',
       }),
-      content: <ExpandedRowDetailsPane sections={[state, progress, stats]} />,
+      content: <ExpandedRowDetailsPane sections={detailsSections} />,
+    },
+    {
+      id: 'ml-analytics-job-stats',
+      name: i18n.translate(
+        'xpack.ml.dataframe.analyticsList.analyticsDetails.tabs.analyticsStatsLabel',
+        {
+          defaultMessage: 'Job stats',
+        }
+      ),
+      content: <ExpandedRowDetailsPane sections={statsSections} />,
     },
     {
       id: 'ml-analytics-job-json',

From b8822da21e48a944ffb5248c800f09c904b91add Mon Sep 17 00:00:00 2001
From: Thomas Watson <w@tson.dk>
Date: Wed, 2 Sep 2020 20:45:52 +0200
Subject: [PATCH 189/216] Bump end-of-stream from v1.4.1 to v1.4.4 (#76479)

---
 packages/kbn-pm/dist/index.js | 11 +++++++++--
 yarn.lock                     |  9 +--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index eb2d0d2581a347..9a3bb1c687032d 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -27651,6 +27651,7 @@ var eos = function(stream, opts, callback) {
 	var rs = stream._readableState;
 	var readable = opts.readable || (opts.readable !== false && stream.readable);
 	var writable = opts.writable || (opts.writable !== false && stream.writable);
+	var cancelled = false;
 
 	var onlegacyfinish = function() {
 		if (!stream.writable) onfinish();
@@ -27675,8 +27676,13 @@ var eos = function(stream, opts, callback) {
 	};
 
 	var onclose = function() {
-		if (readable && !(rs && rs.ended)) return callback.call(stream, new Error('premature close'));
-		if (writable && !(ws && ws.ended)) return callback.call(stream, new Error('premature close'));
+		process.nextTick(onclosenexttick);
+	};
+
+	var onclosenexttick = function() {
+		if (cancelled) return;
+		if (readable && !(rs && (rs.ended && !rs.destroyed))) return callback.call(stream, new Error('premature close'));
+		if (writable && !(ws && (ws.ended && !ws.destroyed))) return callback.call(stream, new Error('premature close'));
 	};
 
 	var onrequest = function() {
@@ -27701,6 +27707,7 @@ var eos = function(stream, opts, callback) {
 	stream.on('close', onclose);
 
 	return function() {
+		cancelled = true;
 		stream.removeListener('complete', onfinish);
 		stream.removeListener('abort', onclose);
 		stream.removeListener('request', onrequest);
diff --git a/yarn.lock b/yarn.lock
index a37ae19b15a06e..56530a0ab4fdc0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11392,14 +11392,7 @@ encoding@^0.1.11:
   dependencies:
     iconv-lite "~0.4.13"
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
-  integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
-  dependencies:
-    once "^1.4.0"
-
-end-of-stream@^1.4.1, end-of-stream@^1.4.4:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==

From 535eb4069e24d3f725286affedd72f06997330d0 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:53:35 -0400
Subject: [PATCH 190/216] [SECURITY_SOLUTION][ENDPOINT] Trusted app delete api
 (#76435)

* Trusted app delete api
---
 .../common/endpoint/constants.ts              |  1 +
 .../common/endpoint/schema/trusted_apps.ts    |  6 +++
 .../endpoint/routes/trusted_apps/handlers.ts  | 29 ++++++++++++
 .../endpoint/routes/trusted_apps/index.ts     | 18 +++++++-
 .../routes/trusted_apps/trusted_apps.test.ts  | 45 ++++++++++++++++++-
 .../endpoint/routes/trusted_apps/types.ts     | 10 +++++
 6 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/types.ts

diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts
index b72a52f0a0eb72..366bf7a1df1f24 100644
--- a/x-pack/plugins/security_solution/common/endpoint/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/constants.ts
@@ -14,3 +14,4 @@ export const LIMITED_CONCURRENCY_ENDPOINT_COUNT = 100;
 
 export const TRUSTED_APPS_LIST_API = '/api/endpoint/trusted_apps';
 export const TRUSTED_APPS_CREATE_API = '/api/endpoint/trusted_apps';
+export const TRUSTED_APPS_DELETE_API = '/api/endpoint/trusted_apps/{id}';
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
index 7535b23a10e8af..7c0de84b637c9a 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/trusted_apps.ts
@@ -6,6 +6,12 @@
 
 import { schema } from '@kbn/config-schema';
 
+export const DeleteTrustedAppsRequestSchema = {
+  params: schema.object({
+    id: schema.string(),
+  }),
+};
+
 export const GetTrustedAppsRequestSchema = {
   query: schema.object({
     page: schema.maybe(schema.number({ defaultValue: 1, min: 1 })),
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
index 977683ab55495a..a3e6f54f3eee80 100644
--- 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
@@ -13,6 +13,35 @@ import {
 import { EndpointAppContext } from '../../types';
 import { exceptionItemToTrustedAppItem, newTrustedAppItemToExceptionItem } from './utils';
 import { ENDPOINT_TRUSTED_APPS_LIST_ID } from '../../../../../lists/common/constants';
+import { DeleteTrustedAppsRequestParams } from './types';
+
+export const getTrustedAppsDeleteRouteHandler = (
+  endpointAppContext: EndpointAppContext
+): RequestHandler<DeleteTrustedAppsRequestParams, undefined, undefined> => {
+  const logger = endpointAppContext.logFactory.get('trusted_apps');
+
+  return async (context, req, res) => {
+    const exceptionsListService = endpointAppContext.service.getExceptionsList();
+
+    try {
+      const { id } = req.params;
+      const response = await exceptionsListService.deleteExceptionListItem({
+        id,
+        itemId: undefined,
+        namespaceType: 'agnostic',
+      });
+
+      if (response === null) {
+        return res.notFound({ body: `trusted app id [${id}] not found` });
+      }
+
+      return res.ok();
+    } catch (error) {
+      logger.error(error);
+      return res.internalError({ body: error });
+    }
+  };
+};
 
 export const getTrustedAppsListRouteHandler = (
   endpointAppContext: EndpointAppContext
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
index 1302b10533ccf6..5f502555ee153d 100644
--- 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
@@ -6,20 +6,36 @@
 
 import { IRouter } from 'kibana/server';
 import {
+  DeleteTrustedAppsRequestSchema,
   GetTrustedAppsRequestSchema,
   PostTrustedAppCreateRequestSchema,
 } from '../../../../common/endpoint/schema/trusted_apps';
 import {
   TRUSTED_APPS_CREATE_API,
+  TRUSTED_APPS_DELETE_API,
   TRUSTED_APPS_LIST_API,
 } from '../../../../common/endpoint/constants';
-import { getTrustedAppsCreateRouteHandler, getTrustedAppsListRouteHandler } from './handlers';
+import {
+  getTrustedAppsCreateRouteHandler,
+  getTrustedAppsDeleteRouteHandler,
+  getTrustedAppsListRouteHandler,
+} from './handlers';
 import { EndpointAppContext } from '../../types';
 
 export const registerTrustedAppsRoutes = (
   router: IRouter,
   endpointAppContext: EndpointAppContext
 ) => {
+  // DELETE one
+  router.delete(
+    {
+      path: TRUSTED_APPS_DELETE_API,
+      validate: DeleteTrustedAppsRequestSchema,
+      options: { authRequired: true },
+    },
+    getTrustedAppsDeleteRouteHandler(endpointAppContext)
+  );
+
   // GET list
   router.get(
     {
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
index 488c8390411b04..2325036ef40aeb 100644
--- 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
@@ -9,11 +9,12 @@ import {
   createMockEndpointAppContext,
   createMockEndpointAppContextServiceStartContract,
 } from '../../mocks';
-import { IRouter, RequestHandler } from 'kibana/server';
+import { IRouter, KibanaRequest, RequestHandler } from 'kibana/server';
 import { httpServerMock, httpServiceMock } from '../../../../../../../src/core/server/mocks';
 import { registerTrustedAppsRoutes } from './index';
 import {
   TRUSTED_APPS_CREATE_API,
+  TRUSTED_APPS_DELETE_API,
   TRUSTED_APPS_LIST_API,
 } from '../../../../common/endpoint/constants';
 import {
@@ -26,6 +27,7 @@ import { EndpointAppContext } from '../../types';
 import { ExceptionListClient } from '../../../../../lists/server';
 import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
 import { ExceptionListItemSchema } from '../../../../../lists/common/schemas/response';
+import { DeleteTrustedAppsRequestParams } from './types';
 
 describe('when invoking endpoint trusted apps route handlers', () => {
   let routerMock: jest.Mocked<IRouter>;
@@ -220,4 +222,45 @@ describe('when invoking endpoint trusted apps route handlers', () => {
       expect(endpointAppContext.logFactory.get('trusted_apps').error).toHaveBeenCalled();
     });
   });
+
+  describe('when deleting a trusted app', () => {
+    let routeHandler: RequestHandler<DeleteTrustedAppsRequestParams>;
+    let request: KibanaRequest<DeleteTrustedAppsRequestParams>;
+
+    beforeEach(() => {
+      [, routeHandler] = routerMock.delete.mock.calls.find(([{ path }]) =>
+        path.startsWith(TRUSTED_APPS_DELETE_API)
+      )!;
+
+      request = httpServerMock.createKibanaRequest<DeleteTrustedAppsRequestParams>({
+        path: TRUSTED_APPS_DELETE_API.replace('{id}', '123'),
+        method: 'delete',
+      });
+    });
+
+    it('should return 200 on successful delete', async () => {
+      await routeHandler(context, request, response);
+      expect(exceptionsListClient.deleteExceptionListItem).toHaveBeenCalledWith({
+        id: request.params.id,
+        itemId: undefined,
+        namespaceType: 'agnostic',
+      });
+      expect(response.ok).toHaveBeenCalled();
+    });
+
+    it('should return 404 if item does not exist', async () => {
+      exceptionsListClient.deleteExceptionListItem.mockResolvedValueOnce(null);
+      await routeHandler(context, request, response);
+      expect(response.notFound).toHaveBeenCalled();
+    });
+
+    it('should log unexpected error if one occurs', async () => {
+      exceptionsListClient.deleteExceptionListItem.mockImplementation(() => {
+        throw new Error('expected error for delete');
+      });
+      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/types.ts b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/types.ts
new file mode 100644
index 00000000000000..13c8bcfc207932
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/trusted_apps/types.ts
@@ -0,0 +1,10 @@
+/*
+ * 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 { DeleteTrustedAppsRequestSchema } from '../../../../common/endpoint/schema/trusted_apps';
+
+export type DeleteTrustedAppsRequestParams = TypeOf<typeof DeleteTrustedAppsRequestSchema.params>;

From 6f94bf7d2aaac6f329456357b0f4164a6a8cbe30 Mon Sep 17 00:00:00 2001
From: Scotty Bollinger <scotty.bollinger@elastic.co>
Date: Wed, 2 Sep 2020 13:55:02 -0500
Subject: [PATCH 191/216] [Enterprise Search] Migrate shared components used in
 Workplace Search Groups (#76345)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add shared images and export file

* Migrate SourceIcon component

* Add util to format routes

We need a way to format routes using parametrized routes in Workplace Search. We used to the `react-router-named-routes` library, but it is 5 years old has has no typings. I extracted the function we needed into a util.

* Update recent_activity to use formatRoute

For the 7.9 Kibana MVP, we used a temporary function to generate this route. Aligning this component to use the helper other parts of the app will use after migration.

* Add types and constants

Various types and constants migrated for use in groups component

* Migrate SourceRow component

Also adds a mock for contentSources. For now the array only has one item needed for this test, but in future tests, more sources will be added to that array.

* Migrate SourcesTable component

* Migrate TablePaginationBar component

* Migrate UserIcon component

* Migrate UserRow component

* Refactor format_route

Uses Object.entries instead of for…in. This is more modern and allows for 100% test coverage.

Also removed `toString()` as `encodeURIComponent()` seems to automatically cast to string

* Remove unused import

* Use forEach instead of map

We’re not returning anything so map is not needed

* Minify images

* Remove formatRoute in favor of generatePath

Unike formatRoute, generatePath adds the trailing slash automatically

* Stop renaming methods

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../__mocks__/content_sources.mock.ts         |  36 ++++
 .../workplace_search/__mocks__/users.mock.ts  |  17 ++
 .../components/shared/assets/box.svg          |   1 +
 .../components/shared/assets/confluence.svg   |   1 +
 .../shared/assets/connection_illustration.svg |   1 +
 .../components/shared/assets/crawler.svg      |   1 +
 .../components/shared/assets/custom.svg       |   1 +
 .../components/shared/assets/drive.svg        |   1 +
 .../components/shared/assets/dropbox.svg      |   1 +
 .../components/shared/assets/github.svg       |   1 +
 .../components/shared/assets/gmail.svg        |   1 +
 .../components/shared/assets/google.svg       |   1 +
 .../components/shared/assets/google_drive.svg |   1 +
 .../components/shared/assets/index.ts         |  53 ++++++
 .../components/shared/assets/jira.svg         |   1 +
 .../components/shared/assets/jira_server.svg  |   1 +
 .../shared/assets/loading_small.svg           |   1 +
 .../components/shared/assets/office365.svg    |   1 +
 .../components/shared/assets/one_drive.svg    |   1 +
 .../components/shared/assets/outlook.svg      |   1 +
 .../components/shared/assets/people.svg       |   1 +
 .../components/shared/assets/salesforce.svg   |   1 +
 .../components/shared/assets/service_now.svg  |   1 +
 .../components/shared/assets/share_point.svg  |   1 +
 .../components/shared/assets/slack.svg        |   1 +
 .../components/shared/assets/zendesk.svg      |   1 +
 .../components/shared/source_icon/index.ts    |   7 +
 .../shared/source_icon/source_icon.test.tsx   |  27 +++
 .../shared/source_icon/source_icon.tsx        |  34 ++++
 .../components/shared/source_row/index.ts     |   7 +
 .../shared/source_row/source_row.test.tsx     |  83 +++++++++
 .../shared/source_row/source_row.tsx          | 171 ++++++++++++++++++
 .../components/shared/sources_table/index.ts  |   7 +
 .../sources_table/sources_table.test.tsx      |  35 ++++
 .../shared/sources_table/sources_table.tsx    |  44 +++++
 .../shared/table_pagination_bar/index.ts      |   7 +
 .../table_pagination_bar.test.tsx             |  35 ++++
 .../table_pagination_bar.tsx                  |  82 +++++++++
 .../components/shared/user_icon/index.ts      |   7 +
 .../shared/user_icon/user_icon.test.tsx       |  42 +++++
 .../components/shared/user_icon/user_icon.tsx |  19 ++
 .../components/shared/user_row/index.ts       |   7 +
 .../shared/user_row/user_row.test.tsx         |  29 +++
 .../components/shared/user_row/user_row.tsx   |  23 +++
 .../workplace_search/constants.ts             |  19 ++
 .../workplace_search/routes.test.tsx          |  38 ++++
 .../applications/workplace_search/routes.ts   |   8 +-
 .../applications/workplace_search/types.ts    |  40 ++++
 .../views/overview/recent_activity.tsx        |   4 +-
 49 files changed, 901 insertions(+), 3 deletions(-)
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/users.mock.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/box.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/confluence.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/connection_illustration.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/crawler.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/custom.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/drive.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/dropbox.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/github.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/gmail.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google_drive.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira_server.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/loading_small.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/office365.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/one_drive.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/outlook.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/people.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/salesforce.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/service_now.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/share_point.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/slack.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/zendesk.svg
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/index.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.tsx
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
 create mode 100644 x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx

diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
new file mode 100644
index 00000000000000..7789d0caba3458
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/content_sources.mock.ts
@@ -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.
+ */
+
+export const contentSources = [
+  {
+    id: '123',
+    serviceType: 'custom',
+    searchable: true,
+    supportedByLicense: true,
+    status: 'foo',
+    statusMessage: 'bar',
+    name: 'source',
+    documentCount: '123',
+    isFederatedSource: false,
+    errorReason: 0,
+    allowsReauth: true,
+    boost: 1,
+  },
+  {
+    id: '123',
+    serviceType: 'jira',
+    searchable: true,
+    supportedByLicense: true,
+    status: 'synced',
+    statusMessage: 'all green',
+    name: 'Jira',
+    documentCount: '34234',
+    isFederatedSource: false,
+    errorReason: 0,
+    allowsReauth: true,
+    boost: 0.5,
+  },
+];
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/users.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/users.mock.ts
new file mode 100644
index 00000000000000..0294803042ada7
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/__mocks__/users.mock.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.
+ */
+
+export const users = [
+  {
+    id: '1z1z',
+    name: 'John Does',
+    pictureUrl: 'http://google.cats',
+    color: '#ededed',
+    initials: 'JD',
+    email: 'jd@elastic.co',
+    groupIds: [],
+  },
+];
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/box.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/box.svg
new file mode 100644
index 00000000000000..1e7324d9581a78
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/box.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#29ace3" fill-rule="evenodd" transform="translate(14 31)"><path d="m37.16568 32.6140377c-4.45176 0-8.06112-3.5913585-8.06112-8.0237358 0-4.4287925 3.60936-8.019434 8.06112-8.019434 4.4496 0 8.0568 3.5906415 8.0568 8.019434 0 4.4323773-3.6072 8.0237358-8.0568 8.0237358zm-23.7348 0c-4.45032 0-8.06184-3.5899245-8.06184-8.0223019 0-4.4302264 3.61152-8.0208679 8.06184-8.0208679s8.05464 3.5906415 8.05464 8.019434c0 4.4323773-3.60432 8.0237358-8.05464 8.0237358zm23.7348-21.3983019c-5.1408 0-9.61344 2.8793963-11.86632 7.106717-2.2536-4.2273207-6.72408-7.106717-11.86848-7.106717-3.0204 0-5.81112.9951699-8.06184 2.6757736v-11.2695094c-.02664-1.45690566-1.21968-2.622-2.68704-2.622s-2.64816 1.16509434-2.682 2.622v22.191283h.00288c.11808 7.2866793 6.08112 13.1558868 13.428 13.1558868 5.1444 0 9.61488-2.8815472 11.86848-7.104566 2.25288 4.2230188 6.72552 7.104566 11.86632 7.104566 7.416 0 13.43232-5.9882264 13.43232-13.3788679 0-7.3870566-6.01632-13.3745661-13.43232-13.3745661z"/><path d="m71.44128 33.4909057-7.30152-8.9178114 7.31088-8.9357358c.92376-1.178717.6588-2.8249057-.61704-3.6996227-1.27728-.8818867-3.07008-.6553207-4.05864.4882642v-.0021509l-6.2892 7.676-6.28344-7.676v.0021509c-.97848-1.1435849-2.78208-1.3701509-4.05576-.4882642-1.27368.875434-1.53936 2.5209057-.61056 3.6996227h-.00288l7.2972 8.9357358-7.2972 8.9178114h.00288c-.9288 1.1823018-.66312 2.8234717.61056 3.7017735 1.27368.8783019 3.07728.6546038 4.05576-.491132l6.28344-7.6652453 6.28056 7.6652453c.98928 1.1457358 2.78136 1.3694339 4.05864.491132 1.27656-.8783018 1.54224-2.5194717.61632-3.7017735z"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/confluence.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/confluence.svg
new file mode 100644
index 00000000000000..23eff13915401d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/confluence.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" x1="99.14%" x2="33.859%" xlink:href="#a" y1="112.708%" y2="37.755%"/><linearGradient id="c" x1="7053.827%" x2="6067.181%" xlink:href="#a" y1="-161634%" y2="-163895%"/><g fill="none" transform="translate(18 20)"><path d="m3.23 46.53c-.65 1.06-1.38 2.29-2 3.27-.55494813.9377932-.25702976 2.1472528.67 2.72l13 8c.4563267.2817439 1.0066877.3684166 1.5275199.2405589.5208321-.1278577.9684941-.4595324 1.2424801-.9205589.52-.87 1.19-2 1.92-3.21 5.15-8.5 10.33-7.46 19.67-3l12.89 6.13c.48819.2323645 1.0496589.2571765 1.5564427.068781.5067839-.1883955.9157017-.573946 1.1335573-1.068781l6.19-14c.4373336-.9998956-.0076609-2.165781-1-2.62-2.72-1.28-8.13-3.83-13-6.18-17.52-8.51-32.41-7.96-43.8 10.57z" fill="url(#b)"/><path d="m61.52 14.76c.65-1.06 1.38-2.29 2-3.27.5549481-.9377932.2570298-2.14725284-.67-2.72l-13-8c-.4600501-.30985835-1.0281196-.4147483-1.5684887-.28961019s-1.0045021.46906442-1.2815113.94961019c-.52.87-1.19 2-1.92 3.21-5.15 8.5-10.33 7.46-19.67 3l-12.85-6.1c-.48819-.23236451-1.0496589-.25717646-1.5564427-.06878099-.5067839.18839548-.9157017.57394602-1.1335573 1.06878099l-6.19 14c-.43733358.9998956.00766087 2.165781 1 2.62 2.72 1.28 8.13 3.83 13 6.18 17.56 8.5 32.45 7.93 43.84-10.58z" fill="url(#c)"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/connection_illustration.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/connection_illustration.svg
new file mode 100644
index 00000000000000..c1c3c3b3ee9eeb
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/connection_illustration.svg
@@ -0,0 +1 @@
+<svg width="398" height="552" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill="#22272D" d="M0 0h398v552H0z"/><mask id="a" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="398" height="552"><path d="M0 4a4 4 0 014-4h394v552H4a4 4 0 01-4-4V4z" fill="#22272D"/></mask><g mask="url(#a)"><path d="M197 471.611l89.25 48.346L197 568.303l-89.25-48.346L197 471.611z" fill="#171A1F"/><path d="M197 471.611l89.25 48.346L197 568.303v-96.692z" fill="#2E353D"/><path d="M245.75 445.904L335 494.25l-48.75 25.846L197 471.75l48.75-25.846zM148.25 445.904L59 494.25l48.75 25.846L197 471.75l-48.75-25.846z" fill="#3D434B"/><g filter="url(#filter0_d)"><path d="M131 409h105c13.807 0 25 11.193 25 25v20H156c-13.807 0-25-11.193-25-25v-20z" fill="#696F76"/></g><g filter="url(#filter1_d)"><path d="M131 462h105c13.807 0 25 11.193 25 25v20H156c-13.807 0-25-11.193-25-25v-20z" fill="#696F76"/></g><g filter="url(#filter2_d)"><path d="M131 515h105c13.807 0 25 11.193 25 25v20H156c-13.807 0-25-11.193-25-25v-20z" fill="#696F76"/></g><g filter="url(#filter3_d)" fill="#fff"><path d="M167.835 428.192h2.505c-.036-2.203-1.847-3.725-4.6-3.725-2.711 0-4.697 1.498-4.685 3.743-.006 1.823 1.28 2.868 3.369 3.369l1.346.338c1.346.326 2.095.712 2.101 1.545-.006.906-.863 1.522-2.192 1.522-1.358 0-2.336-.628-2.42-1.866h-2.53c.067 2.675 1.98 4.057 4.981 4.057 3.018 0 4.793-1.443 4.799-3.707-.006-2.058-1.558-3.151-3.707-3.634l-1.111-.265c-1.074-.248-1.974-.646-1.955-1.534 0-.797.706-1.382 1.986-1.382 1.249 0 2.016.567 2.113 1.539zM176.329 437.181c2.813 0 4.563-1.926 4.563-4.781 0-2.874-1.75-4.793-4.563-4.793-2.814 0-4.564 1.919-4.564 4.793 0 2.855 1.75 4.781 4.564 4.781zm.012-1.992c-1.298 0-1.962-1.189-1.962-2.807 0-1.618.664-2.813 1.962-2.813 1.273 0 1.937 1.195 1.937 2.813s-.664 2.807-1.937 2.807zM188.431 433.052c.006 1.243-.845 1.895-1.769 1.895-.972 0-1.6-.682-1.606-1.774v-5.446h-2.571v5.904c.006 2.168 1.273 3.49 3.139 3.49 1.394 0 2.397-.719 2.813-1.805h.097V437h2.469v-9.273h-2.572v5.325zM192.98 437h2.572v-5.246c0-1.141.833-1.926 1.968-1.926.356 0 .845.061 1.086.139v-2.282a3.876 3.876 0 00-.809-.091c-1.038 0-1.889.604-2.227 1.751h-.097v-1.618h-2.493V437zM203.614 437.181c2.469 0 4.021-1.449 4.141-3.58h-2.427c-.15.99-.802 1.546-1.684 1.546-1.201 0-1.98-1.008-1.98-2.783 0-1.751.785-2.753 1.98-2.753.942 0 1.546.622 1.684 1.545h2.427c-.108-2.143-1.732-3.549-4.153-3.549-2.813 0-4.552 1.949-4.552 4.793 0 2.819 1.708 4.781 4.564 4.781zM213.548 437.181c2.294 0 3.839-1.117 4.201-2.837l-2.378-.157c-.26.706-.924 1.074-1.781 1.074-1.286 0-2.101-.851-2.101-2.233v-.006h6.315v-.707c0-3.151-1.908-4.708-4.359-4.708-2.729 0-4.497 1.937-4.497 4.799 0 2.94 1.744 4.775 4.6 4.775zm-2.059-5.753c.054-1.057.857-1.902 1.998-1.902 1.117 0 1.89.797 1.896 1.902h-3.894zM225.436 437l.918-2.819h4.461l.917 2.819h2.802l-4.263-12.364h-3.368L222.635 437h2.801zm1.582-4.86l1.521-4.678h.096l1.522 4.678h-3.139zM168.573 481.192h2.506c-.037-2.203-1.848-3.725-4.6-3.725-2.711 0-4.697 1.498-4.685 3.743-.006 1.823 1.28 2.868 3.368 3.369l1.347.338c1.346.326 2.095.712 2.101 1.545-.006.906-.864 1.522-2.192 1.522-1.358 0-2.336-.628-2.421-1.866h-2.529c.066 2.675 1.98 4.057 4.98 4.057 3.019 0 4.794-1.443 4.8-3.707-.006-2.058-1.558-3.151-3.707-3.634l-1.111-.265c-1.074-.248-1.974-.646-1.956-1.534 0-.797.707-1.382 1.986-1.382 1.25 0 2.017.567 2.113 1.539zM177.067 490.181c2.814 0 4.564-1.926 4.564-4.781 0-2.874-1.75-4.793-4.564-4.793-2.813 0-4.564 1.919-4.564 4.793 0 2.855 1.751 4.781 4.564 4.781zm.012-1.992c-1.298 0-1.962-1.189-1.962-2.807 0-1.618.664-2.813 1.962-2.813 1.274 0 1.938 1.195 1.938 2.813s-.664 2.807-1.938 2.807zM189.17 486.052c.006 1.243-.845 1.895-1.769 1.895-.972 0-1.6-.682-1.606-1.774v-5.446h-2.572v5.904c.007 2.168 1.274 3.49 3.14 3.49 1.394 0 2.396-.719 2.813-1.805h.096V490h2.47v-9.273h-2.572v5.325zM193.719 490h2.571v-5.246c0-1.141.833-1.926 1.968-1.926.357 0 .846.061 1.087.139v-2.282a3.876 3.876 0 00-.809-.091c-1.038 0-1.889.604-2.227 1.751h-.097v-1.618h-2.493V490zM204.353 490.181c2.469 0 4.02-1.449 4.141-3.58h-2.427c-.151.99-.803 1.546-1.684 1.546-1.201 0-1.98-1.008-1.98-2.783 0-1.751.785-2.753 1.98-2.753.942 0 1.545.622 1.684 1.545h2.427c-.109-2.143-1.733-3.549-4.153-3.549-2.814 0-4.552 1.949-4.552 4.793 0 2.819 1.708 4.781 4.564 4.781zM214.286 490.181c2.295 0 3.84-1.117 4.202-2.837l-2.378-.157c-.26.706-.924 1.074-1.781 1.074-1.286 0-2.101-.851-2.101-2.233v-.006h6.315v-.707c0-3.151-1.908-4.708-4.359-4.708-2.729 0-4.498 1.937-4.498 4.799 0 2.94 1.745 4.775 4.6 4.775zm-2.058-5.753c.054-1.057.857-1.902 1.998-1.902 1.117 0 1.89.797 1.896 1.902h-3.894zM224.044 490h5.282c2.777 0 4.256-1.449 4.256-3.417 0-1.829-1.31-2.934-2.717-3v-.121c1.286-.29 2.234-1.201 2.234-2.656 0-1.854-1.376-3.17-4.105-3.17h-4.95V490zm2.614-2.137v-3.284h2.191c1.256 0 2.034.724 2.034 1.745 0 .929-.633 1.539-2.094 1.539h-2.131zm0-5.053v-3.061h1.986c1.159 0 1.817.598 1.817 1.491 0 .978-.797 1.57-1.866 1.57h-1.937zM167.801 533.192h2.506c-.037-2.203-1.848-3.725-4.6-3.725-2.711 0-4.697 1.498-4.685 3.743-.006 1.823 1.28 2.868 3.369 3.369l1.346.338c1.346.326 2.095.712 2.101 1.545-.006.906-.864 1.522-2.192 1.522-1.358 0-2.336-.628-2.421-1.866h-2.529c.066 2.675 1.98 4.057 4.98 4.057 3.019 0 4.794-1.443 4.8-3.707-.006-2.058-1.558-3.151-3.707-3.634l-1.111-.265c-1.074-.248-1.974-.646-1.956-1.534 0-.797.707-1.382 1.986-1.382 1.25 0 2.017.567 2.113 1.539zM176.295 542.181c2.814 0 4.564-1.926 4.564-4.781 0-2.874-1.75-4.793-4.564-4.793-2.813 0-4.564 1.919-4.564 4.793 0 2.855 1.751 4.781 4.564 4.781zm.012-1.992c-1.298 0-1.962-1.189-1.962-2.807 0-1.618.664-2.813 1.962-2.813 1.274 0 1.938 1.195 1.938 2.813s-.664 2.807-1.938 2.807zM188.398 538.052c.006 1.243-.845 1.895-1.769 1.895-.972 0-1.6-.682-1.606-1.774v-5.446h-2.572v5.904c.007 2.168 1.274 3.49 3.14 3.49 1.394 0 2.396-.719 2.813-1.805h.096V542h2.47v-9.273h-2.572v5.325zM192.947 542h2.571v-5.246c0-1.141.834-1.926 1.968-1.926.357 0 .846.061 1.087.139v-2.282a3.876 3.876 0 00-.809-.091c-1.038 0-1.889.604-2.227 1.751h-.097v-1.618h-2.493V542zM203.581 542.181c2.469 0 4.02-1.449 4.141-3.58h-2.427c-.151.99-.803 1.546-1.684 1.546-1.201 0-1.98-1.008-1.98-2.783 0-1.751.785-2.753 1.98-2.753.942 0 1.545.622 1.684 1.545h2.427c-.109-2.143-1.733-3.549-4.153-3.549-2.814 0-4.552 1.949-4.552 4.793 0 2.819 1.708 4.781 4.564 4.781zM213.514 542.181c2.295 0 3.84-1.117 4.202-2.837l-2.378-.157c-.26.706-.924 1.074-1.781 1.074-1.286 0-2.101-.851-2.101-2.233v-.006h6.315v-.707c0-3.151-1.908-4.708-4.359-4.708-2.729 0-4.498 1.937-4.498 4.799 0 2.94 1.745 4.775 4.6 4.775zm-2.058-5.753c.054-1.057.857-1.902 1.998-1.902 1.117 0 1.89.797 1.896 1.902h-3.894zM234.18 533.965c-.344-2.856-2.505-4.498-5.366-4.498-3.266 0-5.76 2.306-5.76 6.351 0 4.033 2.451 6.351 5.76 6.351 3.169 0 5.083-2.107 5.366-4.383l-2.644-.012c-.247 1.322-1.286 2.083-2.68 2.083-1.878 0-3.151-1.395-3.151-4.039 0-2.572 1.255-4.039 3.169-4.039 1.431 0 2.463.828 2.662 2.186h2.644z"/></g><path d="M197 568.172l89.25 48.345L197 664.863l-89.25-48.346L197 568.172z" fill="#171A1F"/><path d="M197 568.171l89.25 48.346L197 664.863v-96.692z" fill="#22272D"/><path d="M286.25 519.898L197 568.244l48.75 25.846L335 545.744l-48.75-25.846zM107.75 519.898L197 568.244l-48.75 25.846L59 545.744l48.75-25.846z" fill="#3D434B"/><g filter="url(#filter4_d)"><path fill="#DBE4EE" d="M185.037 259.776h26.925v30.056h-26.925z"/></g><g filter="url(#filter5_d)"><path d="M241.13 289.409l-42.409 42.409-42.409-42.409h84.818z" fill="#fff"/></g><path opacity=".14" d="M210.207 320.332L183.039 347.5l-27.169-27.168h54.337z" fill="#fff"/><g filter="url(#filter6_d)"><path d="M233.841 311.276l-15.131 15.13-15.13-15.13h30.261z" fill="#696F76"/></g><path d="M328 75c0 68.483-55.517 124-124 124S80 143.483 80 75 135.517-49 204-49 328 6.517 328 75z" fill="url(#paint0_linear)"/><g filter="url(#filter7_d)"><path d="M186 219c-68.483 0-124-55.517-124-124h124v124z" fill="#00C8AC"/></g><g filter="url(#filter8_d)"><path d="M294 75c0 48.601-39.399 88-88 88V75h88z" fill="#FFB92F"/></g><g filter="url(#filter9_dd)"><path fill="#fff" d="M38 163h134v33H38z"/></g><g filter="url(#filter10_dd)"><path fill="#fff" d="M225 97h134v33H225z"/></g><path d="M293.567 117.636h1.726l-.157-2.876 2.415 1.584.867-1.506-2.586-1.293 2.586-1.292-.867-1.506-2.415 1.584.157-2.876h-1.726l.163 2.876-2.415-1.584-.866 1.506 2.578 1.292-2.578 1.293.866 1.506 2.415-1.584-.163 2.876zM304.926 117.636h1.726l-.156-2.876 2.415 1.584.866-1.506-2.585-1.293 2.585-1.292-.866-1.506-2.415 1.584.156-2.876h-1.726l.164 2.876-2.415-1.584-.867 1.506 2.578 1.292-2.578 1.293.867 1.506 2.415-1.584-.164 2.876zM316.286 117.636h1.725l-.156-2.876 2.415 1.584.866-1.506-2.585-1.293 2.585-1.292-.866-1.506-2.415 1.584.156-2.876h-1.725l.163 2.876-2.415-1.584-.866 1.506 2.578 1.292-2.578 1.293.866 1.506 2.415-1.584-.163 2.876zM327.645 117.636h1.726l-.156-2.876 2.414 1.584.867-1.506-2.585-1.293 2.585-1.292-.867-1.506-2.414 1.584.156-2.876h-1.726l.163 2.876-2.414-1.584-.867 1.506 2.578 1.292-2.578 1.293.867 1.506 2.414-1.584-.163 2.876zM339.004 117.636h1.726l-.156-2.876 2.415 1.584.866-1.506-2.585-1.293 2.585-1.292-.866-1.506-2.415 1.584.156-2.876h-1.726l.164 2.876-2.415-1.584-.867 1.506 2.579 1.292-2.579 1.293.867 1.506 2.415-1.584-.164 2.876z" fill="#FFB92F"/><path d="M242.408 111.746h2.064c-.03-1.814-1.522-3.067-3.789-3.067-2.232 0-3.868 1.233-3.858 3.082-.005 1.502 1.054 2.362 2.774 2.775l1.109.278c1.109.268 1.725.587 1.73 1.273-.005.745-.711 1.252-1.804 1.252-1.119 0-1.924-.517-1.994-1.536h-2.083c.055 2.203 1.631 3.341 4.101 3.341 2.486 0 3.948-1.188 3.953-3.052-.005-1.696-1.283-2.596-3.053-2.993l-.914-.219c-.885-.204-1.626-.532-1.611-1.263 0-.656.581-1.138 1.635-1.138 1.03 0 1.661.467 1.74 1.267zM249.419 119.149c1.889 0 3.162-.92 3.46-2.337l-1.958-.129c-.214.582-.761.885-1.467.885-1.059 0-1.73-.701-1.73-1.839v-.005h5.2v-.582c0-2.595-1.571-3.878-3.589-3.878-2.247 0-3.704 1.596-3.704 3.953 0 2.421 1.437 3.932 3.788 3.932zm-1.695-4.738c.045-.87.706-1.566 1.645-1.566.92 0 1.557.656 1.562 1.566h-3.207zM257.677 119.149c2.033 0 3.311-1.193 3.41-2.948h-1.999c-.124.815-.661 1.273-1.387 1.273-.989 0-1.63-.831-1.63-2.292 0-1.442.646-2.267 1.63-2.267.776 0 1.273.512 1.387 1.272h1.999c-.089-1.764-1.427-2.923-3.42-2.923-2.317 0-3.749 1.606-3.749 3.948 0 2.321 1.407 3.937 3.759 3.937zM262.363 119h2.118v-4.32c0-.94.686-1.586 1.621-1.586.293 0 .696.049.895.114v-1.879a3.168 3.168 0 00-.667-.075c-.855 0-1.556.497-1.834 1.442h-.08v-1.332h-2.053V119zM271.136 119.149c1.889 0 3.162-.92 3.46-2.337l-1.958-.129c-.214.582-.761.885-1.467.885-1.059 0-1.73-.701-1.73-1.839v-.005h5.2v-.582c0-2.595-1.571-3.878-3.589-3.878-2.247 0-3.704 1.596-3.704 3.953 0 2.421 1.437 3.932 3.788 3.932zm-1.695-4.738c.045-.87.706-1.566 1.645-1.566.92 0 1.557.656 1.562 1.566h-3.207zM280.005 111.364h-1.437v-1.83h-2.118v1.83h-1.044v1.591h1.044v3.977c-.01 1.496 1.01 2.237 2.546 2.172a4.113 4.113 0 001.148-.198l-.333-1.576c-.104.019-.328.069-.527.069-.422 0-.716-.159-.716-.746v-3.698h1.437v-1.591zM282.543 113.785a1.21 1.21 0 001.193-1.193 1.208 1.208 0 00-1.193-1.184 1.189 1.189 0 100 2.377zm0 5.344a1.21 1.21 0 001.193-1.193 1.208 1.208 0 00-1.193-1.183 1.188 1.188 0 100 2.376z" fill="#343741"/><path d="M85.057 184h1.057v-3.409h1.909c.076 0 .149 0 .221-.004L90.085 184h1.227l-1.973-3.605c1.113-.379 1.633-1.287 1.633-2.446 0-1.543-.92-2.676-2.966-2.676h-2.95V184zm1.057-4.364v-3.426h1.858c1.414 0 1.96.691 1.96 1.739s-.546 1.687-1.943 1.687h-1.875zM93.233 184h3.153c2.063 0 2.915-1.006 2.915-2.318 0-1.381-.955-2.131-1.756-2.182v-.085c.75-.205 1.415-.699 1.415-1.824 0-1.279-.852-2.318-2.676-2.318h-3.052V184zm1.056-.938v-3.034h2.148c1.142 0 1.858.767 1.858 1.654 0 .767-.528 1.38-1.909 1.38h-2.097zm0-3.954v-2.898h1.995c1.159 0 1.67.614 1.67 1.381 0 .92-.75 1.517-1.704 1.517h-1.96zM104.282 184.119c1.764.022 2.914-1.308 2.914-2.932 0-1.687-1.248-2.897-2.744-2.897-.899 0-1.67.439-2.148 1.159h-.068c.004-2.144.831-3.375 2.182-3.375.92 0 1.474.579 1.67 1.381h1.04c-.213-1.373-1.244-2.319-2.71-2.319-1.965 0-3.171 1.739-3.171 4.841 0 3.226 1.603 4.125 3.035 4.142zm0-.937c-1.096 0-1.897-.933-1.892-1.977.004-1.044.843-1.978 1.926-1.978 1.069 0 1.858.878 1.858 1.96 0 1.108-.823 1.995-1.892 1.995zM112.151 175.136c-1.773-.017-2.915 1.313-2.915 2.932 0 1.688 1.244 2.898 2.744 2.898.903 0 1.671-.443 2.148-1.159h.068c0 2.148-.835 3.375-2.182 3.375-.92 0-1.483-.58-1.67-1.381h-1.04c.204 1.381 1.244 2.318 2.71 2.318 1.96 0 3.171-1.738 3.171-4.841 0-3.221-1.603-4.125-3.034-4.142zm0 .938c1.09 0 1.892.937 1.892 1.977s-.853 1.977-1.927 1.977c-1.073 0-1.858-.869-1.858-1.96 0-1.108.819-1.994 1.893-1.994zM117.514 184h3.153c2.063 0 2.915-1.006 2.915-2.318 0-1.381-.955-2.131-1.756-2.182v-.085c.75-.205 1.415-.699 1.415-1.824 0-1.279-.852-2.318-2.676-2.318h-3.051V184zm1.057-.938v-3.034h2.147c1.142 0 1.858.767 1.858 1.654 0 .767-.528 1.38-1.909 1.38h-2.096zm0-3.954v-2.898h1.994c1.159 0 1.67.614 1.67 1.381 0 .92-.75 1.517-1.704 1.517h-1.96zM128.392 184.119c1.662 0 2.881-1.227 2.881-2.897 0-1.692-1.176-2.932-2.778-2.932-.588 0-1.159.209-1.517.494h-.052l.307-2.574h3.648v-.937h-4.534l-.529 4.295.989.119c.362-.259.98-.447 1.517-.443 1.112.009 1.926.853 1.926 1.995 0 1.12-.784 1.943-1.858 1.943-.895 0-1.606-.575-1.687-1.364h-1.023c.064 1.33 1.21 2.301 2.71 2.301zM133.977 175.273h-1.108l3.205 8.727h1.091l3.204-8.727h-1.108l-2.591 7.346h-.102l-2.591-7.346zM147.784 178h1.091c-.324-1.688-1.738-2.847-3.579-2.847-2.237 0-3.818 1.722-3.818 4.483 0 2.762 1.568 4.483 3.886 4.483 2.079 0 3.562-1.385 3.562-3.545v-.938h-3.323v.938h2.301c-.03 1.568-1.061 2.557-2.54 2.557-1.619 0-2.864-1.228-2.864-3.495 0-2.267 1.245-3.494 2.796-3.494 1.261 0 2.118.712 2.488 1.858z" fill="#00B8AA"/><path d="M63.038 174.818h-2.153V185h2.153v-10.182zM68.338 185c3.102 0 4.982-1.919 4.982-5.101 0-3.172-1.88-5.081-4.952-5.081h-3.64V185h3.61zm-1.457-1.844v-6.493h1.373c1.909 0 2.918.974 2.918 3.236 0 2.272-1.01 3.257-2.923 3.257H66.88zM76.032 178.825a1.21 1.21 0 001.194-1.193 1.208 1.208 0 00-1.194-1.183 1.188 1.188 0 100 2.376zm0 4.992a1.21 1.21 0 001.194-1.193 1.208 1.208 0 00-1.194-1.184 1.188 1.188 0 100 2.377z" fill="#343741"/><g filter="url(#filter11_d)" fill="#fff"><path d="M96.455 118.492c-.364-3.023-2.653-4.762-5.682-4.762-3.459 0-6.098 2.442-6.098 6.725 0 4.269 2.595 6.724 6.098 6.724 3.355 0 5.382-2.231 5.682-4.641l-2.8-.012c-.262 1.399-1.361 2.205-2.838 2.205-1.988 0-3.336-1.477-3.336-4.276 0-2.723 1.33-4.277 3.356-4.277 1.514 0 2.607.876 2.818 2.314h2.8zM102.745 127.192c2.978 0 4.832-2.039 4.832-5.063 0-3.042-1.854-5.075-4.832-5.075-2.979 0-4.833 2.033-4.833 5.075 0 3.024 1.854 5.063 4.833 5.063zm.013-2.11c-1.375 0-2.078-1.259-2.078-2.972s.703-2.979 2.078-2.979c1.348 0 2.051 1.266 2.051 2.979s-.703 2.972-2.051 2.972zM111.991 121.324c.006-1.266.76-2.007 1.86-2.007 1.093 0 1.751.716 1.745 1.917V127h2.723v-6.251c0-2.289-1.342-3.695-3.388-3.695-1.457 0-2.512.716-2.953 1.86h-.115v-1.732h-2.595V127h2.723v-5.676zM125.665 117.182h-1.95v-.659c0-.664.269-1.054 1.068-1.054.326 0 .658.07.875.14l.48-2.045a7.182 7.182 0 00-1.924-.269c-1.847 0-3.222 1.042-3.222 3.177v.71h-1.387v2.045h1.387V127h2.723v-7.773h1.95v-2.045zM127.248 127h2.723v-9.818h-2.723V127zm1.368-11.084c.812 0 1.477-.62 1.477-1.38 0-.755-.665-1.375-1.477-1.375-.805 0-1.47.62-1.47 1.375 0 .76.665 1.38 1.47 1.38zM136.496 130.822c2.806 0 4.8-1.278 4.8-3.726v-9.914h-2.703v1.649h-.103c-.364-.799-1.163-1.777-2.806-1.777-2.154 0-3.976 1.675-3.976 5.018 0 3.266 1.771 4.787 3.983 4.787 1.566 0 2.441-.786 2.799-1.598h.115v1.797c0 1.284-.863 1.808-2.045 1.808-1.202 0-1.809-.524-2.033-1.054l-2.518.339c.326 1.483 1.841 2.671 4.487 2.671zm.058-6.008c-1.336 0-2.065-1.061-2.065-2.755 0-1.668.716-2.838 2.065-2.838 1.323 0 2.064 1.118 2.064 2.838 0 1.732-.754 2.755-2.064 2.755zM149.679 122.82c.007 1.316-.894 2.007-1.872 2.007-1.03 0-1.694-.723-1.701-1.88v-5.765h-2.723v6.251c.007 2.295 1.349 3.695 3.324 3.695 1.477 0 2.538-.761 2.979-1.911h.102V127h2.614v-9.818h-2.723v5.638zM154.501 127h2.723v-5.555c0-1.208.882-2.039 2.083-2.039.378 0 .895.064 1.151.147v-2.416a4.126 4.126 0 00-.857-.096c-1.099 0-2 .639-2.358 1.854h-.103v-1.713h-2.639V127zM165.803 127.192c2.429 0 4.066-1.183 4.449-3.004l-2.518-.167c-.275.748-.978 1.138-1.886 1.138-1.362 0-2.224-.901-2.224-2.365v-.006h6.686v-.748c0-3.337-2.02-4.986-4.615-4.986-2.89 0-4.763 2.052-4.763 5.082 0 3.113 1.848 5.056 4.871 5.056zm-2.179-6.092c.057-1.118.907-2.013 2.115-2.013 1.183 0 2.001.843 2.007 2.013h-4.122zM131.793 139.492c-.364-3.023-2.652-4.762-5.682-4.762-3.458 0-6.098 2.442-6.098 6.725 0 4.269 2.595 6.724 6.098 6.724 3.356 0 5.382-2.231 5.682-4.641l-2.799-.012c-.263 1.399-1.362 2.205-2.839 2.205-1.987 0-3.336-1.477-3.336-4.276 0-2.723 1.329-4.277 3.356-4.277 1.515 0 2.608.876 2.819 2.314h2.799zM136.37 134.909h-2.723V148h2.723v-13.091zM138.471 148h2.723v-9.818h-2.723V148zm1.368-11.084c.812 0 1.477-.62 1.477-1.38 0-.755-.665-1.375-1.477-1.375-.805 0-1.47.62-1.47 1.375 0 .76.665 1.38 1.47 1.38zM147.77 148.192c2.429 0 4.065-1.183 4.449-3.004l-2.519-.167c-.275.748-.978 1.138-1.885 1.138-1.362 0-2.225-.901-2.225-2.365v-.006h6.686v-.748c0-3.337-2.02-4.986-4.615-4.986-2.889 0-4.762 2.052-4.762 5.082 0 3.113 1.847 5.056 4.871 5.056zm-2.18-6.092c.058-1.118.908-2.013 2.116-2.013 1.182 0 2.001.843 2.007 2.013h-4.123zM156.696 142.324c.007-1.266.761-2.007 1.86-2.007 1.093 0 1.752.716 1.745 1.917V148h2.723v-6.251c0-2.289-1.342-3.695-3.387-3.695-1.458 0-2.512.716-2.954 1.86h-.115v-1.732h-2.595V148h2.723v-5.676zM170.313 138.182h-1.848v-2.352h-2.723v2.352H164.4v2.045h1.342v5.114c-.012 1.924 1.298 2.876 3.273 2.793a5.306 5.306 0 001.477-.255l-.428-2.027c-.135.026-.422.09-.678.09-.543 0-.921-.205-.921-.959v-4.756h1.848v-2.045z"/></g><g filter="url(#filter12_d)" fill="#fff"><path d="M133.837 372.492c-.364-3.023-2.653-4.762-5.682-4.762-3.459 0-6.098 2.442-6.098 6.725 0 4.269 2.595 6.724 6.098 6.724 3.355 0 5.382-2.231 5.682-4.641l-2.8-.012c-.262 1.399-1.361 2.205-2.838 2.205-1.988 0-3.336-1.477-3.336-4.276 0-2.723 1.329-4.277 3.355-4.277 1.515 0 2.608.876 2.819 2.314h2.8zM140.127 381.192c2.978 0 4.832-2.039 4.832-5.063 0-3.042-1.854-5.075-4.832-5.075-2.979 0-4.833 2.033-4.833 5.075 0 3.024 1.854 5.063 4.833 5.063zm.013-2.11c-1.375 0-2.078-1.259-2.078-2.972s.703-2.979 2.078-2.979c1.348 0 2.051 1.266 2.051 2.979s-.703 2.972-2.051 2.972zM149.373 375.324c.006-1.266.76-2.007 1.86-2.007 1.093 0 1.751.716 1.745 1.917V381h2.723v-6.251c0-2.289-1.342-3.695-3.388-3.695-1.457 0-2.512.716-2.953 1.86h-.115v-1.732h-2.595V381h2.723v-5.676zM160.49 375.324c.006-1.266.761-2.007 1.86-2.007 1.093 0 1.751.716 1.745 1.917V381h2.723v-6.251c0-2.289-1.342-3.695-3.388-3.695-1.457 0-2.512.716-2.953 1.86h-.115v-1.732h-2.595V381h2.723v-5.676zM173.359 381.192c2.429 0 4.065-1.183 4.449-3.005l-2.519-.166c-.275.748-.978 1.138-1.886 1.138-1.361 0-2.224-.901-2.224-2.365v-.006h6.686v-.748c0-3.337-2.02-4.986-4.615-4.986-2.889 0-4.762 2.052-4.762 5.082 0 3.113 1.847 5.056 4.871 5.056zm-2.18-6.092c.058-1.118.908-2.013 2.116-2.013 1.182 0 2 .843 2.007 2.013h-4.123zM183.998 381.192c2.614 0 4.257-1.534 4.385-3.791h-2.57c-.159 1.049-.85 1.637-1.783 1.637-1.272 0-2.096-1.068-2.096-2.947 0-1.854.83-2.915 2.096-2.915.997 0 1.636.659 1.783 1.636h2.57c-.115-2.269-1.834-3.758-4.398-3.758-2.978 0-4.819 2.065-4.819 5.075 0 2.985 1.809 5.063 4.832 5.063zM195.269 371.182h-1.847v-2.352h-2.724v2.352h-1.342v2.045h1.342v5.114c-.012 1.924 1.298 2.876 3.273 2.793a5.306 5.306 0 001.477-.255l-.428-2.027c-.135.026-.422.09-.678.09-.543 0-.92-.205-.92-.959v-4.756h1.847v-2.045zM208.201 371.674h2.653c-.038-2.333-1.956-3.944-4.871-3.944-2.87 0-4.973 1.585-4.96 3.963-.006 1.931 1.355 3.036 3.567 3.567l1.425.358c1.426.345 2.218.754 2.225 1.636-.007.959-.914 1.611-2.321 1.611-1.438 0-2.473-.665-2.563-1.975h-2.678c.07 2.832 2.096 4.295 5.273 4.295 3.196 0 5.076-1.527 5.082-3.924-.006-2.18-1.649-3.337-3.925-3.848l-1.176-.282c-1.138-.262-2.09-.684-2.071-1.623 0-.844.748-1.464 2.103-1.464 1.323 0 2.135.601 2.237 1.63zM217.2 381.192c2.978 0 4.832-2.039 4.832-5.063 0-3.042-1.854-5.075-4.832-5.075-2.979 0-4.833 2.033-4.833 5.075 0 3.024 1.854 5.063 4.833 5.063zm.012-2.11c-1.374 0-2.077-1.259-2.077-2.972s.703-2.979 2.077-2.979c1.349 0 2.052 1.266 2.052 2.979s-.703 2.972-2.052 2.972zM230.019 376.82c.006 1.316-.895 2.007-1.873 2.007-1.029 0-1.694-.723-1.7-1.88v-5.765h-2.723v6.251c.006 2.295 1.348 3.695 3.323 3.695 1.477 0 2.538-.761 2.979-1.911h.102V381h2.615v-9.818h-2.723v5.638zM234.84 381h2.723v-5.555c0-1.208.882-2.039 2.084-2.039.377 0 .895.064 1.15.147v-2.416a4.117 4.117 0 00-.856-.096c-1.1 0-2.001.639-2.359 1.854h-.102v-1.713h-2.64V381zM246.104 381.192c2.615 0 4.257-1.534 4.385-3.791h-2.57c-.159 1.049-.85 1.637-1.783 1.637-1.272 0-2.096-1.068-2.096-2.947 0-1.854.83-2.915 2.096-2.915.997 0 1.636.659 1.783 1.636h2.57c-.115-2.269-1.834-3.758-4.398-3.758-2.978 0-4.819 2.065-4.819 5.075 0 2.985 1.809 5.063 4.832 5.063zM256.627 381.192c2.429 0 4.065-1.183 4.449-3.005l-2.519-.166c-.274.748-.978 1.138-1.885 1.138-1.362 0-2.225-.901-2.225-2.365v-.006h6.686v-.748c0-3.337-2.02-4.986-4.615-4.986-2.889 0-4.762 2.052-4.762 5.082 0 3.113 1.848 5.056 4.871 5.056zm-2.18-6.092c.058-1.118.908-2.013 2.116-2.013 1.183 0 2.001.843 2.007 2.013h-4.123zM270.999 373.982c-.243-1.809-1.7-2.928-4.18-2.928-2.512 0-4.168 1.163-4.161 3.055-.007 1.471.92 2.423 2.838 2.806l1.7.339c.857.173 1.247.486 1.259.978-.012.582-.645.997-1.598.997-.971 0-1.617-.415-1.783-1.214l-2.678.141c.255 1.879 1.853 3.036 4.455 3.036 2.544 0 4.366-1.298 4.372-3.235-.006-1.419-.933-2.269-2.838-2.659l-1.777-.358c-.914-.198-1.253-.511-1.246-.984-.007-.588.658-.972 1.502-.972.946 0 1.508.518 1.642 1.151l2.493-.153z"/></g><path opacity=".85" fill="url(#paint1_linear)" d="M0 288h398v264H0z"/></g><defs><filter id="filter0_d" x="101" y="389" width="190" height="105" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter1_d" x="101" y="442" width="190" height="105" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter2_d" x="101" y="495" width="190" height="105" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter3_d" x="156.696" y="421.467" width="81.838" height="125.714" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1"/><feGaussianBlur stdDeviation="2"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.27 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter4_d" x="155.037" y="239.776" width="86.925" height="90.056" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter5_d" x="126.312" y="227" width="144.818" height="144.818" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter6_d" x="173.58" y="276.146" width="90.26" height="90.26" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter7_d" x="32" y="75" width="184" height="184" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter8_d" x="176" y="55" width="148" height="148" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter9_dd" x="8" y="143" width="194" height="93" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="3"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0.631373 0 0 0 0 0.937255 0 0 0 1 0"/><feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/></filter><filter id="filter10_dd" x="195" y="77" width="194" height="93" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="10"/><feGaussianBlur stdDeviation="15"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.45 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="3"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0.631373 0 0 0 0 0.937255 0 0 0 1 0"/><feBlend mode="normal" in2="effect1_dropShadow" result="effect2_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect2_dropShadow" result="shape"/></filter><filter id="filter11_d" x="80.675" y="110.161" width="93.817" height="43.031" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1"/><feGaussianBlur stdDeviation="2"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.27 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><filter id="filter12_d" x="118.057" y="364.73" width="157.167" height="21.462" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="BackgroundImageFix"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0"/><feOffset dy="1"/><feGaussianBlur stdDeviation="2"/><feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.27 0"/><feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow"/><feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow" result="shape"/></filter><linearGradient id="paint0_linear" x1="204" y1="28" x2="204" y2="145" gradientUnits="userSpaceOnUse"><stop stop-color="#3E444B" stop-opacity="0"/><stop offset="1" stop-color="#3E444B"/></linearGradient><linearGradient id="paint1_linear" x1="199" y1="288" x2="199" y2="504" gradientUnits="userSpaceOnUse"><stop stop-color="#13171C" stop-opacity="0"/><stop offset="1" stop-color="#13171C"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/crawler.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/crawler.svg
new file mode 100644
index 00000000000000..d241989f1aff16
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/crawler.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" fill="#017f4b" r="35"/><path clip-rule="evenodd" d="m52.2348 25.0436c12.7604 1.1309 22.768 11.8589 22.768 24.9288 0 6.7302-2.6536 12.8393-6.9702 17.3369l1.8767 2.3728c5.0039-5.0634 8.0935-12.0257 8.0935-19.7097 0-14.7253-11.3463-26.8004-25.768-27.9394zm-4-3.0436c-14.6429.9124-26.2348 13.0886-26.2348 27.9724 0 8.8748 4.1213 16.7869 10.5534 21.9224l1.6417-2.5305c-5.612-4.5892-9.1951-11.5713-9.1951-19.3919 0-13.2289 10.2524-24.0585 23.2348-24.9658zm-10.7496 49.6425-1.6349 2.52c4.1523 2.4388 8.9884 3.8372 14.1511 3.8372 6.3473 0 12.201-2.1137 16.8972-5.6761l-1.8616-2.3538c-4.1846 3.1578-9.3919 5.0299-15.0356 5.0299-4.5601 0-8.8352-1.2222-12.5162-3.3572zm-5.6311-15.4785c2.5729 7.5568 9.7251 12.9934 18.1474 12.9934 10.5874 0 19.1676-8.5907 19.1676-19.1849 0-.8008-.049-1.5903-.1442-2.3654l-2.9317.7863c.0502.5196.0759 1.0464.0759 1.5791 0 8.9401-7.2398 16.1849-16.1676 16.1849-7.0322 0-13.0171-4.495-15.2416-10.7728zm2.0484-4.6908-2.9337.7868c-.089-.75-.1348-1.5134-.1348-2.2875 0-10.5941 8.5802-19.1848 19.1675-19.1848 8.395 0 15.5281 5.4012 18.1222 12.9197l-2.9068.7797c-2.2449-6.2394-8.2106-10.6994-15.2154-10.6994-8.9277 0-16.1675 7.2448-16.1675 16.1848 0 .506.0231 1.0066.0685 1.5007zm22.5661 1.9658c.5532-1.0318.8667-2.2112.8667-3.4664 0-4.0565-3.2848-7.3424-7.3338-7.3424-4.0489 0-7.3337 3.2859-7.3337 7.3424s3.2848 7.3424 7.3337 7.3424c1.3472 0 2.6069-.3624 3.6905-.9957l2.1703 2.1725c-1.6655 1.1495-3.6864 1.8232-5.8608 1.8232-5.7085 0-10.3337-4.6318-10.3337-10.3424s4.6252-10.3424 10.3337-10.3424c5.7086 0 10.3338 4.6318 10.3338 10.3424 0 2.0851-.6179 4.0294-1.6803 5.655z" fill="#fff" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/custom.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/custom.svg
new file mode 100644
index 00000000000000..f8f6415dea22b9
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/custom.svg
@@ -0,0 +1 @@
+<svg width="100" height="100" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="35" fill="#0060D5"/><mask id="a" mask-type="alpha" maskUnits="userSpaceOnUse" x="15" y="15" width="70" height="70"><circle cx="50" cy="50" r="35" fill="#0060D5"/></mask><g mask="url(#a)"><path clip-rule="evenodd" d="M50 10c-7.295 0-14.112 1.985-20 5.395C41.943 22.315 50 35.203 50 50c0 14.797-8.057 27.685-20 34.605C35.888 88.015 42.705 90 50 90c22.093 0 40-17.907 40-40S72.093 10 50 10z" stroke="#fff" stroke-width="3"/><path d="M50.555 30l1.181-.925-.45-.575h-.731V30zm.006.008l-1.181.924.435.556.705.02.041-1.5zm0 39.984l-.041-1.5-.706.02-.434.556 1.181.924zm-.006.008v1.5h.731l.45-.576L50.556 70zM30 71.5h14.62v-3H30v3zM8.5 50c0 11.873 9.627 21.5 21.5 21.5v-3c-10.217 0-18.5-8.283-18.5-18.5h-3zM30 28.5C18.127 28.5 8.5 38.127 8.5 50h3c0-10.217 8.283-18.5 18.5-18.5v-3zm14.62 0H30v3h14.62v-3zm5.38 0h-5.38v3H50v-3zm.555 0H50v3h.555v-3zm1.187.583l-.006-.008-2.362 1.85a.22.22 0 01.006.007l2.362-1.849zM71.5 50c0-11.672-9.302-21.172-20.898-21.492l-.082 3c9.976.274 17.98 8.45 17.98 18.492h3zM50.602 71.492C62.198 71.172 71.5 61.672 71.5 50h-3c0 10.043-8.004 18.218-17.98 18.493l.082 2.999zm1.135-.568l.002-.003.004-.005-2.363-1.848-.003.004-.004.004 2.364 1.848zM50 71.5h.555v-3H50v3zm-5.38 0H50v-3h-5.38v3z" fill="#fff"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/drive.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/drive.svg
new file mode 100644
index 00000000000000..40b65df3a1ce3a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/drive.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" x1="15.093%" x2="84.907%" y1="0%" y2="100%"><stop offset="0" stop-color="#f6c338"/><stop offset=".52278" stop-color="#ffd351"/><stop offset="1" stop-color="#f6c338"/></linearGradient><linearGradient id="b" x1="56.638%" x2="43.362%" y1="0%" y2="100%"><stop offset="0" stop-color="#286ee6"/><stop offset=".52105" stop-color="#4286fb"/><stop offset="1" stop-color="#286ee6"/></linearGradient><linearGradient id="c" x1="65.289%" x2="35.995%" y1="33.288%" y2="66.712%"><stop offset="0" stop-color="#069b5a"/><stop offset=".53103" stop-color="#11aa62"/><stop offset="1" stop-color="#069b5a"/></linearGradient><g fill="none" fill-rule="evenodd" transform="translate(15 20)"><path d="m22.776 0h24.335l22.885 39.455h-24.389z" fill="url(#a)"/><path d="m69.996 39.455-12.194 21.081h-45.662l12.222-21.081z" fill="url(#b)"/><path d="m12.14 60.536-12.14-21.081 22.776-39.455 12.222 21.136z" fill="url(#c)"/><g fill="#000"><path d="m12.14 60.536 22.721-21.081h-10.499z" opacity=".1"/><path d="m69.996 39.455h-24.362l-5.359-9.242z" opacity=".1"/><path d="m22.776 0 7.027 30.077 5.195-8.941z" opacity=".1"/></g></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/dropbox.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/dropbox.svg
new file mode 100644
index 00000000000000..d16f293fde6dc6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/dropbox.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path d="m14.23744 24.847309-14.23744-11.4018811 20.5915056-13.4452194 14.4077992 12.0267509-20.7617694 12.820426 20.7618391 12.8202176-14.4077994 12.0274457-20.5915056-13.4452194zm20.7621428 12.820294 14.4084942 12.0274457 20.5908109-13.4452194-14.2375357-11.4026524zm34.9995134-24.2223836-20.5908105-13.4452194-14.4084942 12.0267508 20.7617694 12.8204261zm-34.9573991 26.8099593-14.4501915 11.9913065-6.1830113-4.0371796v4.5264506l20.6332028 12.3742444 20.6338978-12.3742444v-4.5264506l-6.1823164 4.0371796z" fill="#007ee5" fill-rule="evenodd" transform="translate(15 17)"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/github.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/github.svg
new file mode 100644
index 00000000000000..c4b4176560d5b1
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/github.svg
@@ -0,0 +1 @@
+<svg height="52" viewBox="0 0 52 52" width="52" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="26" cy="26" fill="#fff" r="26"/><path d="m26.2884088 9c-9.5464114 0-17.2884088 7.740936-17.2884088 17.2905316 0 7.6390397 4.9536471 14.1190087 11.8242187 16.4053074.8650573.159213 1.180299-.3746813 1.180299-.8332147 0-.4107695-.0148599-1.4976636-.0233512-2.9401334-4.809294 1.0444373-5.8240115-2.3181412-5.8240115-2.3181412-.7865122-1.9975925-1.9201088-2.5293639-1.9201088-2.5293639-1.5698401-1.0720342.1188791-1.0508058.1188791-1.0508058 1.7354216.1220633 2.6482428 1.7821242 2.6482428 1.7821242 1.5422433 2.6418744 4.0471945 1.8787134 5.0321922 1.4361012.1570902-1.1166138.603948-1.8787133 1.0975083-2.3107113-3.8391561-.4362436-7.8757363-1.9201087-7.8757363-8.5454923 0-1.8872047.6740017-3.4315708 1.7800013-4.6394668-.1783186-.437305-.7716524-2.1960779.1698272-4.5757816 0 0 1.4509611-.4649019 4.7541001 1.7725714 1.3787846-.384234 2.858404-.5752896 4.3284707-.5827195 1.4690053.0074299 2.9475633.1984855 4.3284707.5827195 3.3010162-2.2374733 4.7498545-1.7725714 4.7498545-1.7725714.9436024 2.3797037.3502686 4.1384766.1730115 4.5757816 1.1081224 1.207896 1.776817 2.7522621 1.776817 4.6394668 0 6.6423663-4.0429487 8.1039416-7.8937804 8.5316939.6198692.5338942 1.172869 1.5889457 1.172869 3.2012427 0 2.3117727-.0212284 4.1766876-.0212284 4.7434859 0 .4627791.3120575 1.000919 1.1887904.8321533 6.8652645-2.2916058 11.8146659-8.7673292 11.8146659-16.404246 0-9.5495956-7.7419974-17.2905316-17.291593-17.2905316" fill="#1a1919"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/gmail.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/gmail.svg
new file mode 100644
index 00000000000000..ee824f730aca67
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/gmail.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(21 29)"><path d="m55.074 0c2.706 0 4.92 2.22169863 4.92 4.93764384v1.43150684l-6.828 4.90027402-23.25 16.0883287-23.25-16.2516712v32.5015342h-1.752c-2.7 0-4.914-2.2223013-4.914-4.9376438v-33.73112328c0-2.71594521 2.214-4.93764384 4.914-4.93764384l25.002 18.61923292 25.158-18.61923292z" fill="#e75a4d"/><path d="m6.666 11.106v32.502h46.5v-32.339l-23.25 16.089z" fill="#e7e4d7"/><path d="m6.666 43.608 23.25-16.25-.108-.076-23.142 15.968z" fill="#b8b7ae"/><path d="m53.166 11.269.012 32.339-23.262-16.25z" fill="#b7b6ad"/><path d="m59.994 6.36915068.006 32.30443832c-.12 3.5911233-1.668 4.872548-6.822 4.932822l-.012-32.3387946 6.828-4.90027393z" fill="#b2392f"/><path d="m4.914 0 25.002 18.619 25.158-18.619z" fill="#f7f5ed"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google.svg
new file mode 100644
index 00000000000000..22630f533dcbf2
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(15 14)"><path d="m70 36.457165c0-2.9324271-.23828-5.0721553-.75397-7.2915728h-33.53175v13.2354175h19.68239c-.39669 3.288932-2.53953 8.2429515-7.30149 11.5710291l-.06678.4431845 10.60213 8.2017087.73451.0733981c6.7459-6.2213592 10.63496-15.3751456 10.63496-26.2331651" fill="#4285f4"/><path d="m35.71428 71.328932c9.64271 0 17.73786-3.170097 23.65076-8.6386019l-11.26986-8.7182913c-3.01588 2.1005826-7.06356 3.5664466-12.3809 3.5664466-9.4444 0-17.46017-6.2213592-20.31764-14.8201165l-.41881.0356505-11.02423 8.519767-.1442.3998447c5.873 11.6507184 17.93652 19.6553009 31.90488 19.6553009" fill="#34a853"/><path d="m15.39664 42.7183689c-.7539-2.2194174-1.19028-4.5968155-1.19028-7.0539029s.43638-4.8344854 1.15066-7.0539029l-.01995-.4725437-11.16241-8.6567767-.36526.1733592c-2.42053 4.8344855-3.8094 10.2638447-3.8094 16.0098641s1.38887 11.1746796 3.8094 16.0091651z" fill="#fbbc05"/><path d="m35.71428 13.7897476c6.70628 0 11.22996 2.8932815 13.80946 5.3105242l10.0793-9.82765044c-6.19031-5.74601942-14.24605-9.27262136-23.88876-9.27262136-13.96836 0-26.03188 8.00458252-31.90488 19.6546019l11.54762 8.9559612c2.89709-8.5987573 10.91286-14.8208155 20.35726-14.8208155" fill="#eb4335"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google_drive.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google_drive.svg
new file mode 100644
index 00000000000000..59469d814e35fd
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/google_drive.svg
@@ -0,0 +1 @@
+<svg height="52" viewBox="0 0 52 52" width="52" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle cx="26" cy="26" fill="#f9fafb" r="26"/><g transform="translate(8 10)"><path d="m5.98703634 31.1142993 5.98622706-10.3714331h23.9467966l-5.9867666 10.3714331z" fill="#3777e3"/><path d="m23.9470663 20.7428662h11.9729937l-11.9729937-20.7428662h-11.9738029z" fill="#ffcf63"/><path d="m0 20.7428662 5.98703634 10.3714331 11.97299366-20.7428662-5.9867666-10.3714331z" fill="#11a861"/></g></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/index.ts
new file mode 100644
index 00000000000000..5f93694da09b8f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/index.ts
@@ -0,0 +1,53 @@
+/*
+ * 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 box from './box.svg';
+import confluence from './confluence.svg';
+import crawler from './crawler.svg';
+import custom from './custom.svg';
+import drive from './drive.svg';
+import dropbox from './dropbox.svg';
+import github from './github.svg';
+import gmail from './gmail.svg';
+import google from './google.svg';
+import googleDrive from './google_drive.svg';
+import jira from './jira.svg';
+import jiraServer from './jira_server.svg';
+import loadingSmall from './loading_small.svg';
+import office365 from './office365.svg';
+import oneDrive from './one_drive.svg';
+import outlook from './outlook.svg';
+import people from './people.svg';
+import salesforce from './salesforce.svg';
+import serviceNow from './service_now.svg';
+import sharePoint from './share_point.svg';
+import slack from './slack.svg';
+import zendesk from './zendesk.svg';
+
+export const images = {
+  box,
+  confluence,
+  crawler,
+  custom,
+  drive,
+  dropbox,
+  github,
+  gmail,
+  googleDrive,
+  google,
+  jira,
+  jiraServer,
+  loadingSmall,
+  office365,
+  oneDrive,
+  outlook,
+  people,
+  salesforce,
+  serviceNow,
+  sharePoint,
+  slack,
+  zendesk,
+} as { [key: string]: string };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira.svg
new file mode 100644
index 00000000000000..224bb822a581ca
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" x1="98.031%" x2="58.888%" xlink:href="#a" y1=".161%" y2="40.766%"/><linearGradient id="c" x1="3739.421%" x2="2058.278%" xlink:href="#a" y1="3462%" y2="5116%"/><g fill="none" transform="translate(14 14)"><path d="m68.81 0h-34.58c0 4.14002941 1.6446203 8.11049399 4.5720631 11.0379369 2.9274429 2.9274428 6.8979075 4.5720631 11.0379369 4.5720631h6.37v6.15c.0055161 8.6133562 6.9866438 15.5944839 15.6 15.6v-34.36c0-1.65685425-1.3431458-3-3-3z" fill="#2684ff"/><path d="m51.7 17.23h-34.58c.0055161 8.6133562 6.9866438 15.5944839 15.6 15.6h6.37v6.17c.0110357 8.6133534 6.9966395 15.5900071 15.61 15.59v-34.36c0-1.6568542-1.3431458-3-3-3z" fill="url(#b)"/><path d="m34.58 34.45h-34.58c0 8.6211649 6.98883506 15.61 15.61 15.61h6.39v6.15c.005497 8.6055588 6.9744553 15.5834632 15.58 15.6v-34.36c0-1.6568542-1.3431458-3-3-3z" fill="url(#c)"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira_server.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira_server.svg
new file mode 100644
index 00000000000000..71750fb6e25a01
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/jira_server.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a"><stop offset=".18" stop-color="#0052cc"/><stop offset="1" stop-color="#2684ff"/></linearGradient><linearGradient id="b" gradientUnits="userSpaceOnUse" x1="48.0798" x2="33.1398" xlink:href="#a" y1="28.4649" y2="43.4049"/><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="1038.61" x2="1532.16" xlink:href="#a" y1="2278.21" y2="1958.05"/><path d="m84.1499 47.9249-31.18-31.0999-3-3-23.42 23.42-10.72 10.6799c-.2664.2657-.4778.5813-.622.9288s-.2184.72-.2184 1.0963c0 .3762.0742.7487.2184 1.0962s.3556.6631.622.9287l21.42 21.46 12.72 12.74 23.47-23.4399.36-.36 10.35-10.3601c.2724-.2663.4889-.5844.6366-.9356.1478-.3512.224-.7283.224-1.1094 0-.381-.0762-.7581-.224-1.1093-.1477-.3512-.3642-.6693-.6366-.9357zm-34.18 12.7701-10.7-10.7001 10.7-10.6999 10.7 10.6999z" fill="#2684ff"/><path d="m49.9698 39.2949c-3.3494-3.3721-5.2293-7.9321-5.2293-12.685s1.8799-9.3129 5.2293-12.685l-23.46 23.37 12.74 12.74z" fill="url(#b)"/><path d="m60.7198 49.9249-10.75 10.77c1.6751 1.6719 3.0041 3.6577 3.9108 5.8438s1.3734 4.5296 1.3734 6.8962c0 2.3667-.4667 4.7101-1.3734 6.8962s-2.2357 4.1719-3.9108 5.8438l23.5-23.47z" fill="url(#c)"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/loading_small.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/loading_small.svg
new file mode 100644
index 00000000000000..159408ea029386
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/loading_small.svg
@@ -0,0 +1 @@
+<svg width="154" height="154" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-ring"><path fill="none" class="bk" d="M0 0h100v100H0z"/><circle cx="50" cy="50" r="40" stroke-dasharray="163.36281798666926 87.9645943005142" stroke="#258BF8" fill="none" stroke-width="20"><animateTransform attributeName="transform" type="rotate" values="0 50 50;180 50 50;360 50 50;" keyTimes="0;0.5;1" dur="1s" repeatCount="indefinite" begin="0s"/></circle></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/office365.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/office365.svg
new file mode 100644
index 00000000000000..fdce5d02da3cda
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/office365.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path d="m39.8071 64.45585c.11284-.7067.14198-51.8080167.03472-52.92295-8.7296 2.0683-17.4468 4.13475-26.19934 6.2079833v36.0225834c-4.50616 1.75195-8.9962 3.4965-13.485 5.2392-.02852-.01665-.05332-.0252834-.07688-.0419334-.01984-.0141833-.04464-.0357666-.0465-.0555-.01426-.13505-.03224-.2694833-.03224-.4063833-.00186-14.5551833-.00186-29.1122167-.00186-43.6316333.20088-.2466667.46066-.2775.68634-.3595167 12.82904-4.77855 25.6618-9.55216667 38.49208-14.33071667.44454-.16588333.84754-.24666666 1.34044-.10236666 7.0401 2.03191666 14.0864 4.04101666 21.13146 6.0569.1023.03083333.2046.0666.34968.11346666v61.34908337c-2.02306.5593166-4.02752 1.1186333-6.03446 1.6687-5.10818 1.4010666-10.22008 2.79165-15.32454 4.2032-.50034.13875-.93744.1282666-1.42848-.0518-12.61886-4.6385667-25.24392-9.2623334-37.86464-13.8885667-.24924-.0912667-.49352-.19425-.70308-.4150167 13.05472 1.7821667 26.10944 3.5624834 39.1623 5.3452667z" fill="#dc3e15" fill-rule="evenodd" transform="translate(19 13)"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/one_drive.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/one_drive.svg
new file mode 100644
index 00000000000000..1856e5e3ce1af8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/one_drive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="100" width="100" viewBox="-154.506 -164.981 1339.055 989.883"><path d="M622.292 445.338l212.613-203.327C790.741 69.804 615.338-33.996 443.13 10.168a321.9 321.9 0 00-188.92 134.837c3.29-.083 368.082 300.333 368.082 300.333z" fill="#0364B8"/><path d="M392.776 183.283l-.01.035A256.233 256.233 0 00257.5 144.921c-1.104 0-2.189.07-3.29.083C112.063 146.765-1.74 263.424.02 405.567a257.389 257.389 0 0046.244 144.04l318.528-39.894 244.21-196.915z" fill="#0078D4"/><path d="M834.905 242.012c-4.674-.312-9.37-.528-14.123-.528a208.464 208.464 0 00-82.93 17.117l-.006-.022-128.844 54.22 142.041 175.456 253.934 61.728c54.8-101.732 16.752-228.625-84.98-283.424a209.23 209.23 0 00-85.09-24.546z" fill="#1490DF"/><path d="M46.264 549.607C94.36 618.757 173.27 659.967 257.5 659.922h563.281c76.946.022 147.691-42.202 184.195-109.937L609.001 312.798z" fill="#28A8EA"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/outlook.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/outlook.svg
new file mode 100644
index 00000000000000..2680bc99cc3677
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/outlook.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path d="m58.470798 31.205258h22.4994182c.8279025 0 2.294983 1.1273613 2.294983 2.7001315l-19.7112086 13.2892772c-.1207888.0377477-.3824974.0352299-.5032862 0l-4.5799064-2.8838314zm0 17.9950047 4.1797934 2.8712488c.5888452.4328264 1.2984792 0 1.2984792 0-.7071175.4328264 19.3186464-12.8690327 19.3186464-12.8690327v24.0872863c0 2.6221222-1.67846 3.7218025-3.5657824 3.7218025h-21.2336531v-17.8113049zm-41.470798-24.6509669 39.0046948-7.5492958v67l-39.0046948-8.1784038zm26.1004319 34.304c1.6482629-2.1691643 2.4736526-5.027831 2.4711362-8.5734836 0-3.4500282-.7951925-6.228169-2.3855775-8.336939-1.5878685-2.1087699-3.6714742-3.1606385-6.245784-3.1606385-2.7252958 0-4.9145916 1.1021972-6.5678874 3.3040752-1.6532957 2.2018779-2.4786854 5.0857089-2.4786854 8.6514929 0 3.3770517.8153239 6.1149296 2.440939 8.2186667 1.6281314 2.1012206 3.7318685 3.1530892 6.3162441 3.1530892 2.6523193 0 4.8013521-1.0870986 6.449615-3.2562629zm-6.2709483-15.6949859c1.3840375 0 2.4736526.6492394 3.2713615 1.9477183.7977089 1.3009953 1.1953051 3.1203756 1.1953051 5.4581408 0 2.2421409-.4126948 3.9960939-1.2330516 5.2593427-.8203568 1.2632489-1.9326197 1.8948733-3.3342723 1.8948733-1.3588732 0-2.458554-.646723-3.2965258-1.9477183-.8379719-1.2984789-1.258216-3.0650141-1.258216-5.2996057 0-2.2018779.4202441-3.9709295 1.258216-5.3071549.8379718-1.3362253 1.9728826-2.0055962 3.3971831-2.0055962z" fill="#0072c6"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/people.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/people.svg
new file mode 100644
index 00000000000000..4500c494c23b77
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/people.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#db351d" transform="translate(22 23)"><path d="m23.2613385 10.1789755c0-2.92393845-2.3701795-5.29411803-5.294118-5.29411803-2.9239384 0-5.2941179 2.37017958-5.2941179 5.29411803 0 2.9239384 2.3701795 5.294118 5.2941179 5.294118 2.9239385 0 5.294118-2.3701796 5.294118-5.294118zm0 0c0-1.26700623 1.0271115-2.29411768 2.2941177-2.29411768 1.2670061 0 2.2941176 1.02711145 2.2941176 2.29411768 0 5.4579508-4.4244025 9.8823533-9.8823533 9.8823533s-9.88235323-4.4244025-9.88235323-9.8823533c0-5.45795082 4.42440243-9.88235331 9.88235323-9.88235331s9.8823533 4.42440249 9.8823533 9.88235331c0 1.2670062-1.0271115 2.2941176-2.2941176 2.2941176-1.2670062 0-2.2941177-1.0271114-2.2941177-2.2941176zm-17.32804825 28.247194c.45461188-5.6818277 5.04031305-8.9531083 12.03393025-8.9531083 6.2670404 0 10.6642786 2.6733501 11.7756237 7.3018317.2958132 1.2319899 1.5343424 1.9909112 2.7663323 1.6950978 1.2319899-.2958131 1.9909111-1.5343422 1.6950981-2.7663321-1.6681955-6.9476274-8.0357162-10.8188327-16.2370541-10.8188327-9.17625601 0-15.93938722 4.8245836-16.6075497 13.1754086l-.66768645 8.3452182c-.10680098 1.334874.94767014 2.4770813 2.28681 2.4770813h23.25041425c1.2670061 0 2.2941176-1.0271114 2.2941176-2.2941176 0-1.2670063-1.0271115-2.2941177-2.2941176-2.2941177h-20.76541722zm40.01761635-21.1883705c0-2.9239384-2.3701797-5.294118-5.294118-5.294118-2.9239384 0-5.294118 2.3701796-5.294118 5.294118s2.3701796 5.294118 5.294118 5.294118c2.9239383 0 5.294118-2.3701796 5.294118-5.294118zm0 0c0-1.2670062 1.0271114-2.2941176 2.2941176-2.2941176 1.2670063 0 2.2941177 1.0271114 2.2941177 2.2941176 0 5.4579508-4.4244025 9.8823533-9.8823533 9.8823533s-9.8823533-4.4244025-9.8823533-9.8823533 4.4244025-9.88235329 9.8823533-9.88235329 9.8823533 4.42440249 9.8823533 9.88235329c0 1.2670062-1.0271114 2.2941176-2.2941177 2.2941176-1.2670062 0-2.2941176-1.0271114-2.2941176-2.2941176z"/><path d="m52.6907193 45.4850005c-.4546122-5.6818352-5.0403134-8.9531157-12.0339307-8.9531157s-11.5793185 3.2712805-12.0339303 8.9531083l-.4694989 5.8681291h25.0068581zm2.9544953 10.456357h-29.9768522c-1.3391399 0-2.393611-1.1422073-2.28681-2.4770813l.6676864-8.3452182c.6681625-8.3508251 7.4312937-13.1754085 16.6075498-13.1754085 9.176256 0 15.9393872 4.8245834 16.6075503 13.1754159l.6676857 8.3452108c.106801 1.334874-.94767 2.4770813-2.28681 2.4770813z"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/salesforce.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/salesforce.svg
new file mode 100644
index 00000000000000..510c438a281951
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/salesforce.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd" transform="translate(15 26)"><path d="m29.134 5.3732c2.2561-2.3499 5.3956-3.8073 8.8683-3.8073 4.6158 0 8.6429 2.5739 10.7877 6.3952 1.9183227-.85671211 3.996069-1.298263 6.097-1.2957 8.3258 0 15.0752 6.8082 15.0752 15.2068 0 8.3993-6.7494 15.2075-15.0752 15.2075-.9971928.0004729-1.9919365-.0987201-2.9694-.2961-1.8886 3.3691-5.488 5.6455-9.618 5.6455-1.729 0-3.3649-.3997-4.8216-1.1102-1.9145 4.5038-6.3749 7.6615-11.5738 7.6615-5.4138 0-10.0282-3.4258-11.7992-8.2299-.7884736.1668588-1.5922646.2506164-2.3982.2499-6.4463 0-11.6718-5.2794-11.6718-11.7929 0-4.3652 2.3478-8.176 5.8366-10.2151-.73942666-1.7021192-1.11998158-3.5384098-1.1179-5.3942-.0007-7.4907 6.0809-13.5632 13.5821-13.5632 4.4037 0 8.3174 2.0937 10.7989 5.3382" fill="#00a1e0"/><g fill="#fff"><path d="m10.1633 25.417c-.0441.1141.0161.1386.0301.1582.1316.0959.2646.1645.399.2408.714.3787 1.3867.4893 2.0909.4893 1.435 0 2.3254-.763 2.3254-1.9915v-.0238c0-1.1354-1.0052-1.5477-1.9488-1.8459l-.1225-.0399c-.7112-.231-1.3244-.4298-1.3244-.8981v-.0252c0-.4004.3584-.6951.9142-.6951.6174 0 1.351.2051 1.8228.4662 0 0 .1386.0896.189-.0448.028-.0714.2674-.7154.2919-.7847.0273-.0763-.021-.1316-.07-.161-.539-.329-1.2838-.553-2.0545-.553l-.1435.0014c-1.3125 0-2.2295.7931-2.2295 1.9299v.0238c0 1.1984 1.0115 1.5869 1.9586 1.8578l.1526.0469c.6902.2121 1.2845.3941 1.2845.8806v.0238c0 .4438-.3864.7749-1.0094.7749-.6544212.0046414-1.2962145-.1801173-1.848-.532-.1008-.0588-.1596-.1015-.2373-.1484-.0406-.0259-.1435-.0707-.1883.0644zm20.9993 0c-.0441.1141.0161.1386.0301.1582.1309.0959.2646.1645.399.2408.714.3787 1.3867.4893 2.0909.4893 1.435 0 2.3247-.763 2.3247-1.9915v-.0238c0-1.1354-1.0045-1.5477-1.9481-1.8459l-.1225-.0399c-.7112-.231-1.3251-.4298-1.3251-.8981v-.0252c0-.4004.3591-.6951.9149-.6951.6174 0 1.351.2051 1.8228.4662 0 0 .1386.0896.189-.0448.028-.0714.2674-.7154.2919-.7847.0273-.0763-.021-.1316-.07-.161-.539-.329-1.2838-.553-2.0545-.553l-.1435.0014c-1.3132 0-2.2295.7931-2.2295 1.9299v.0238c0 1.1984 1.0115 1.5869 1.9586 1.8578l.1526.0469c.6902.2121 1.2859.3941 1.2859.8806v.0238c0 .4438-.3878.7749-1.0115.7749-.6544212.0046414-1.2962145-.1801173-1.848-.532-.1001-.0588-.1596-.0994-.2359-.1484-.0259-.0168-.147-.0637-.189.0644zm14.3353-2.4059c0 .6944-.1295 1.2411-.385 1.6275-.252.3822-.6328.5691-1.1648.5691-.5327 0-.9128-.1855-1.1606-.5691-.2506-.385-.378-.9331-.378-1.6275 0-.693.1274-1.239.378-1.6219.2478-.378.6279-.5628 1.1606-.5628.532 0 .9135.1841 1.1662.5628.2541.3829.3836.9282.3836 1.6219zm1.197-1.2873c-.1082986-.3801918-.2936766-.7340301-.5446-1.0395-.2507916-.2984721-.5647079-.5375553-.9191-.7-.3654-.1701-.798-.2562-1.2831-.2562-.4858 0-.9184.0861-1.2838.2569-.3668.1708-.6755.406-.9205.6993-.2429.2926-.427.6433-.5453 1.0395-.1195795.4185263-.1785128.8520401-.175 1.2873 0 .4592.0588.8925.175 1.2866.119.3969.301.7476.546 1.0402.2443.2926.5537.5271.9198.693.3661.1666.798.2513 1.2838.2513.4851 0 .917-.084 1.2831-.2513.3548283-.1585275.6690782-.3954715.9191-.693.2443-.2919.427-.6426.5453-1.0402.1204054-.4181438.1798181-.8514793.1764-1.2866 0-.4585-.0588-.8918-.1764-1.2873zm9.8329 3.2984c-.0399-.1169-.1526-.0728-.1526-.0728-.1793652.0726398-.3658994.1261364-.5565.1596-.2002.0308-.42.0462-.6566.0462-.5796 0-1.0402-.1722-1.3699-.5124-.3304-.3409-.5159-.8918-.5138-1.6366.0021-.679.1652-1.1886.4592-1.5771.2919-.3864.7364-.5845 1.3286-.5845.4942 0 .8708.056 1.2656.1813 0 0 .0945.0406.1393-.0833.105-.2905.182-.4984.294-.819.0315-.0903-.0462-.1288-.0742-.14-.2595687-.0903228-.5266056-.1575505-.798-.2009-.2978788-.0428571-.5985628-.0632147-.8995-.0609-.5026 0-.9506.0854-1.3342.2569-.3684641.1600304-.6976327.3984268-.9646.6986-.2569.2926-.4522.6433-.5824 1.0395-.1330277.4167496-.1991813.8519454-.196 1.2894 0 .9926.2688 1.7955.798 2.3835.5292.5894 1.3251.889 2.3632.889.6139 0 1.2432-.1239 1.6954-.3024 0 0 .0868-.042.049-.1421zm2.0951-2.6761c.056-.3857.1631-.707.3276-.9562.2478-.3801.6265-.588 1.1585-.588s.8834.2093 1.1354.588c.168.2499.2401.5845.2688.9562h-2.891zm4.0313-.8477c-.1023734-.3500617-.2795959-.6736956-.5194-.9485-.2611-.2807-.5159-.4774-.7686-.5866-.3675396-.1558601-.7627791-.2358604-1.162-.2352-.5054 0-.9646.084-1.337.2597-.3738.175-.6881.4144-.9338.7126-.2464.2968-.4312.651-.5488 1.0521-.1213995.4203722-.1815187.8560597-.1785 1.2936 0 .4669.0616.903.1841 1.2943.1239.3941.3213.742.588 1.0297.266.2898.609.5173 1.0192.6755.4074.1575.9023.2387 1.4714.238 1.1704-.0042 1.7864-.2653 2.0405-.406.0448-.0245.0882-.0679.0343-.1939l-.2653-.742c-.0399-.1106-.1526-.07-.1526-.07-.2898.1078-.7021.301-1.6632.2989-.6286-.0007-1.0948-.1862-1.386-.476-.301-.2968-.4466-.7329-.4725-1.3489l4.053.0042s.1064-.0021.1176-.105c.0042-.0441.14-.833-.1204-1.7465zm-36.4917.8477c.0574-.3857.1631-.707.3276-.9562.2478-.3801.6265-.588 1.1585-.588s.8834.2093 1.1368.588c.1659.2499.2387.5845.2674.9562h-2.891zm4.0299-.8477c-.1019379-.3499497-.2786797-.6735784-.518-.9485-.2604-.2807-.5159-.4774-.7686-.5866-.3675396-.1558601-.7627791-.2358604-1.162-.2352-.504 0-.9646.084-1.337.2597-.3738.175-.6874.4144-.9338.7126-.2457.2968-.4312.651-.5488 1.0521-.120915.4204749-.1810245.856092-.1785 1.2936 0 .4669.0623.903.1848 1.2943.1232.3941.3206.742.588 1.0297.266.2898.6083.5173 1.0185.6755.4074.1575.903.2387 1.4714.238 1.1704-.0042 1.7871-.2653 2.0405-.406.0455-.0245.0882-.0679.0343-.1939l-.2639-.742c-.0413-.1106-.154-.07-.154-.07-.2891.1078-.7007.301-1.6639.2989-.6279-.0007-1.0941-.1862-1.386-.476-.2996-.2968-.4459-.7329-.4718-1.3489l4.053.0042s.1064-.0021.1176-.105c.0042-.0441.14-.833-.1218-1.7465zm-12.7904 3.5014c-.1589-.126-.1806-.1582-.2345-.2401-.0798-.1246-.1204-.3017-.1204-.5271 0-.357.1169-.6125.3612-.7847-.0028.0007.3486-.3038 1.176-.2926.5803.0077 1.099.0931 1.099.0931v1.8431h.0014s-.5152.1106-1.0948.1456c-.8246.049-1.1914-.238-1.1886-.2373zm1.6121-2.8476c-.1645-.0119-.378-.0189-.6328-.0189-.3472 0-.6832.0434-.9975.1281-.3171.0847-.602.217-.847.392-.244902.1748278-.4461288.403843-.588.6692-.1435.2667-.2156.581-.2156.9338 0 .3591.0616.6706.1848.9254.1239.2562.3017.469.5292.6335.2254.1645.5033.2849.826.3577.3178.0728.6783.1099 1.0724.1099.4158 0 .8302-.0343 1.232-.1029.3414896-.0586887.681759-.1242687 1.0206-.1967.1344-.0322.2835-.0728.2835-.0728.1008-.0252.0931-.133.0931-.133l-.0021-3.7065c0-.812-.217-1.4154-.6447-1.7885-.4256-.3731-1.0521-.5614-1.862-.5614-.3038 0-.7924.042-1.085.1008 0 0-.8862.1715-1.2509.4564 0 0-.0791.0497-.035.161l.2863.7714c.0357.0994.133.0658.133.0658s.0301-.0119.0665-.0329c.7798-.4242 1.7661-.4116 1.7661-.4116.4382 0 .7749.0875 1.0017.2618.2212.1694.3339.4256.3339.966v.1708c-.3486-.0497-.6685-.0784-.6685-.0784zm32.6907-2.0888c.0119193-.0273156.0121564-.0583161.0006562-.0858108s-.0337383-.0490944-.0615562-.0597892c-.0686-.0266-.413-.0994-.679-.1162-.5089-.0308-.7917.0546-1.0451.168-.2506.1141-.5299.2968-.6853.5054v-.4935c0-.0686-.049-.1232-.1162-.1232h-1.0395c-.0672 0-.1162.0546-.1162.1232v6.0459c0 .0672.056.1232.1232.1232h1.0654c.0672 0 .1225-.056.1225-.1232v-3.0205c0-.406.0448-.8099.1344-1.064.0875-.2506.2072-.4522.3542-.5964.1484-.1435.3171-.2443.5012-.301.1767669-.0511631.3598778-.0770861.5439-.077.2121 0 .4452.0553.4452.0553.0777.0091.1218-.0392.147-.1099.07-.1848.2674-.7399.3052-.8505z"/><path d="m41.7095 17.262c-.131459-.0398337-.2651592-.0718563-.4004-.0959-.1820629-.0299909-.3663948-.0440441-.5509-.042-.7329 0-1.3104.2072-1.7164.616-.4032.406-.6769 1.0248-.8148 1.8382l-.049.2744h-.9212s-.1113-.0042-.1351.1176l-.1505.8435c-.0112.0798.0238.1302.1316.1302h.896l-.9093 5.0722c-.0534811.3392846-.1347205.673607-.2429.9996-.0889.2506-.175.4389-.2828.5768-.1036.1309-.2016.2289-.371.2856-.1393.0469-.301.0686-.4767.0686-.098 0-.2282-.0161-.3248-.0357-.075604-.0146961-.1491658-.0384332-.2191-.0707 0 0-.105-.0399-.147.0644l-.3003.8239c-.028.0812.0119.1435.063.1624.119.042.2079.07.3703.1085.2254.0532.4151.056.5936.056.3724 0 .714-.0525.9954-.154.2828-.1029.5299-.2814.749-.5222.2359-.2611.385-.5341.5257-.9079.14-.3682.2611-.826.357-1.3601l.9135-5.1674h1.3342s.1127.0042.1358-.1183l.1512-.8428c.0105-.0805-.0238-.1302-.1323-.1302h-1.2957c.007-.0294.0658-.4851.2142-.9149.063-.182.1827-.3304.2835-.4319.0994-.1001.2142-.1708.3395-.2114.1288-.042.2751-.0616.4354-.0616.1218 0 .2422.014.3332.0329.1253.0266.1743.0406.2072.0504.1323.0399.1498.0014.1757-.063l.3101-.8505c.0322-.091-.0469-.1302-.0749-.1414zm-18.1069 8.7654c0 .0679-.049.1225-.1162.1225h-1.0752c-.0672 0-.1155-.0546-.1155-.1225v-8.6499c0-.0679.0483-.1225.1155-.1225h1.0752c.0679 0 .1162.0546.1162.1225z"/></g></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/service_now.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/service_now.svg
new file mode 100644
index 00000000000000..2d0c09db4e1c31
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/service_now.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m50 15c-18.9 0-35 15.4-35 34.65 0 10.15 4.2 19.2501 10.85 25.9001 2.45 2.45 6.3 2.45 9.1.35 3.85-3.15 9.1-4.9 15.05-4.9s10.85 1.75 15.05 4.9c2.8 2.1 6.65 1.75 9.1-.7 6.65-6.3 10.85-15.4001 10.85-25.5501-.35-18.9-15.75-34.65-35-34.65zm-.35 52.5001c-10.15 0-17.5-7.7001-17.5-17.5001s7-17.5 17.5-17.5 17.5 8.05 17.5 17.5-7 17.5001-17.5 17.5001z" fill="#82b6a1" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/share_point.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/share_point.svg
new file mode 100644
index 00000000000000..8724be9da88cf0
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/share_point.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" gradientUnits="userSpaceOnUse" x1="21.2216" x2="44.5924" y1="29.5987" y2="70.0757"><stop offset="0" stop-color="#058f92"/><stop offset=".5" stop-color="#038489"/><stop offset="1" stop-color="#026d71"/></linearGradient><path d="m50.814 54.7209c10.7888 0 19.5348-8.746 19.5348-19.5348s-8.746-19.5349-19.5348-19.5349c-10.7889 0-19.5349 8.7461-19.5349 19.5349s8.746 19.5348 19.5349 19.5348z" fill="#036c70"/><path d="m67.093 71c9.8898 0 17.907-8.0172 17.907-17.907 0-9.8897-8.0172-17.9069-17.907-17.9069-9.8897 0-17.9069 8.0172-17.9069 17.9069 0 9.8898 8.0172 17.907 17.9069 17.907z" fill="#1a9ba1"/><path d="m53.2558 84.0232c7.6421 0 13.8372-6.1951 13.8372-13.8372 0-7.642-6.1951-13.8372-13.8372-13.8372s-13.8372 6.1952-13.8372 13.8372c0 7.6421 6.1951 13.8372 13.8372 13.8372z" fill="#37c6d0"/><g fill="#000"><path d="m54.0697 33.2814v34.7395c-.008 1.2071-.7395 2.2916-1.8558 2.7512-.3554.1503-.7373.2278-1.1232.2279h-11.6558c-.0163-.2768-.0163-.5372-.0163-.814-.0054-.2717.0055-.5435.0326-.8139.2979-5.2037 3.5036-9.795 8.286-11.8675v-3.0279c-10.6434-1.6866-17.9043-11.6821-16.2177-22.3255.0117-.0737.0238-.1474.0364-.221.081-.549.1952-1.0926.3418-1.6278h19.193c1.6427.0062 2.9728 1.3363 2.979 2.979z" opacity=".1"/><path d="m49.4628 31.9302h-17.907c-1.8089 10.6243 5.3373 20.7033 15.9615 22.5123.3217.0548.6447.1015.9687.14-5.0465 2.3931-8.7239 9.1896-9.0365 14.7895-.027.2705-.0379.5423-.0325.814 0 .2768 0 .5372.0162.814.0294.5472.1002 1.0914.2117 1.6279h9.8162c1.2071-.0081 2.2916-.7396 2.7512-1.8559.1503-.3553.2278-.7373.2279-1.1232v-34.7395c-.0062-1.642-1.3353-2.9719-2.9774-2.9791z" opacity=".2"/><path d="m49.4628 31.9302h-17.907c-1.8085 10.6252 5.3388 20.7048 15.964 22.5134.2173.037.4352.0703.6537.0999-4.8837 2.5656-8.4162 9.3458-8.7223 14.8286h10.0116c1.6401-.0124 2.9667-1.339 2.9791-2.9791v-31.4837c-.0063-1.6427-1.3364-2.9728-2.9791-2.9791z" opacity=".2"/><path d="m47.8349 31.9302h-16.2791c-1.7077 10.0303 4.5774 19.6896 14.4396 22.1916-3.7343 4.2666-6.0248 9.6042-6.5442 15.2503h8.3837c1.6427-.0063 2.9728-1.3364 2.9791-2.9791v-31.4837c-.0009-1.6449-1.3342-2.9781-2.9791-2.9791z" opacity=".2"/></g><path d="m17.984 31.9302h29.846c1.648 0 2.9839 1.336 2.9839 2.984v29.846c0 1.648-1.3359 2.9839-2.9839 2.9839h-29.846c-1.648 0-2.984-1.3359-2.984-2.9839v-29.846c0-1.648 1.336-2.984 2.984-2.984z" fill="url(#a)"/><path d="m28.3277 49.4726c-.6993-.4639-1.2834-1.0814-1.7077-1.8054-.4111-.7569-.616-1.6085-.5942-2.4695-.0366-1.1658.3568-2.3044 1.1054-3.1989.7866-.8956 1.8033-1.5588 2.94-1.9177 1.2954-.4264 2.6523-.6365 4.016-.6218 1.7934-.0655 3.5843.1852 5.2907.7407v3.7442c-.7415-.4492-1.549-.7788-2.393-.9767-.9158-.2246-1.8555-.3372-2.7984-.3354-.9943-.0365-1.9823.1726-2.8765.6088-.6904.2978-1.1381.977-1.1395 1.7289-.0029.4561.1724.8952.4883 1.2242.3732.3878.8147.7034 1.3024.9311.5426.2703 1.3566.6295 2.4418 1.0777.1195.0378.236.0846.3484.14 1.0681.4175 2.0985.9256 3.08 1.5189.7432.4582 1.367 1.0865 1.82 1.833.4644.8462.6895 1.8029.6512 2.7674.053 1.1969-.3132 2.3748-1.0354 3.3307-.7198.8788-1.6822 1.5265-2.7674 1.8623-1.2764.4001-2.6086.5935-3.9461.5731-1.2.0054-2.3982-.0926-3.5814-.2931-.999-.1635-1.9739-.4499-2.9025-.853v-3.9477c.8876.634 1.8793 1.1078 2.9302 1.4 1.0474.3264 2.1361.5008 3.233.5177 1.0153.0643 2.0287-.1507 2.9303-.6218.6316-.3564 1.0157-1.0315.9995-1.7565.0042-.5045-.1953-.9894-.5535-1.3447-.4453-.4372-.961-.7965-1.5253-1.063-.6511-.3256-1.61-.7548-2.8765-1.2877-1.0076-.4051-1.9723-.9095-2.8798-1.5058z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/slack.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/slack.svg
new file mode 100644
index 00000000000000..14dbd0289da848
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/slack.svg
@@ -0,0 +1 @@
+<svg fill="none" height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg"><path d="m29.7068 59.2345c0 4.0473-3.3061 7.3535-7.3534 7.3535-4.0472 0-7.3534-3.3062-7.3534-7.3535 0-4.0472 3.3062-7.3534 7.3534-7.3534h7.3534z" fill="#e01e5a"/><path d="m33.412 59.2345c0-4.0472 3.3062-7.3534 7.3535-7.3534 4.0472 0 7.3534 3.3062 7.3534 7.3534v18.4121c0 4.0472-3.3062 7.3534-7.3534 7.3534-4.0473 0-7.3535-3.3062-7.3535-7.3534z" fill="#e01e5a"/><path d="m40.7655 29.7068c-4.0473 0-7.3535-3.3061-7.3535-7.3534 0-4.0472 3.3062-7.3534 7.3535-7.3534 4.0472 0 7.3534 3.3062 7.3534 7.3534v7.3534z" fill="#36c5f0"/><path d="m40.7655 33.4121c4.0472 0 7.3534 3.3061 7.3534 7.3534 0 4.0472-3.3062 7.3534-7.3534 7.3534h-18.4121c-4.0472 0-7.3534-3.3062-7.3534-7.3534 0-4.0473 3.3062-7.3534 7.3534-7.3534z" fill="#36c5f0"/><path d="m70.2932 40.7655c0-4.0473 3.3062-7.3534 7.3534-7.3534s7.3534 3.3061 7.3534 7.3534c0 4.0472-3.3062 7.3534-7.3534 7.3534h-7.3534z" fill="#2eb67d"/><path d="m66.588 40.7655c0 4.0472-3.3062 7.3534-7.3534 7.3534-4.0473 0-7.3535-3.3062-7.3535-7.3534v-18.4121c0-4.0472 3.3062-7.3534 7.3535-7.3534 4.0472 0 7.3534 3.3062 7.3534 7.3534z" fill="#2eb67d"/><g fill="#ecb22e"><path d="m59.2346 70.2932c4.0472 0 7.3534 3.3062 7.3534 7.3534s-3.3062 7.3534-7.3534 7.3534c-4.0473 0-7.3535-3.3062-7.3535-7.3534v-7.3534z"/><path d="m59.2346 66.588c-4.0473 0-7.3535-3.3062-7.3535-7.3535 0-4.0472 3.3062-7.3534 7.3535-7.3534h18.412c4.0472 0 7.3534 3.3062 7.3534 7.3534 0 4.0473-3.3062 7.3535-7.3534 7.3535z"/></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/zendesk.svg b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/zendesk.svg
new file mode 100644
index 00000000000000..f7bc1fda0c9ac7
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/assets/zendesk.svg
@@ -0,0 +1 @@
+<svg height="100" viewBox="0 0 100 100" width="100" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a"><path d="m912 1779h100v100h-100z" fill="#fff"/></mask><g transform="translate(-912 -1779)"><path d="m912 1779h100v100h-100z" fill="#fff"/><g fill="#03363d" mask="url(#a)"><path d="m32.3348.0000004v36.7933996h-32.3347981z" transform="translate(927 1817.21)"/><path d="m32.3348-.0000003c0 4.0412803-1.7033 7.9170403-4.7353 10.7747003-3.032 2.8576-7.1442 4.463-11.4321 4.463s-8.4001-1.6054-11.43207-4.463c-3.03198-2.85766-4.7353281-6.73342-4.7353281-10.7747003z" transform="translate(927 1804)"/><path d="m-.00000169 15.2377c0-4.0413 1.70334169-7.91708 4.73532169-10.77469 3.03198-2.85762 7.14418-4.46301119 11.43208-4.46301119s8.4001 1.60539119 11.4321 4.46301119c3.032 2.85761 4.7353 6.73339 4.7353 10.77469z" transform="translate(964.662 1838.76)"/><path d="m-.00000169 36.7934v-36.7934003h32.33830169z" transform="translate(964.662 1804)"/></g></g></svg>
\ No newline at end of file
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/index.ts
new file mode 100644
index 00000000000000..da0d11cc1fdc5c
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/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 { SourceIcon } from './source_icon';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.tsx
new file mode 100644
index 00000000000000..dd37ba9b6d8590
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.test.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 '../../../../__mocks__/shallow_usecontext.mock';
+
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { SourceIcon } from './';
+
+describe('SourceIcon', () => {
+  it('renders unwrapped icon', () => {
+    const wrapper = shallow(<SourceIcon name="foo" serviceType="custom" />);
+
+    expect(wrapper.find('img')).toHaveLength(1);
+    expect(wrapper.find('.user-group-source')).toHaveLength(0);
+  });
+
+  it('renders wrapped icon', () => {
+    const wrapper = shallow(<SourceIcon name="foo" wrapped serviceType="custom" />);
+
+    expect(wrapper.find('.user-group-source')).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.tsx
new file mode 100644
index 00000000000000..ddbe327a40a305
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_icon/source_icon.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 _camelCase from 'lodash/camelCase';
+
+import { images } from '../assets';
+
+interface ISourceIconProps {
+  serviceType: string;
+  name: string;
+  className?: string;
+  wrapped?: boolean;
+}
+
+export const SourceIcon: React.FC<ISourceIconProps> = ({
+  name,
+  serviceType,
+  className,
+  wrapped,
+}) => {
+  const icon = <img src={images[_camelCase(serviceType)]} alt={name} className={className} />;
+  return wrapped ? (
+    <div className="user-group-source" title={name}>
+      {icon}
+    </div>
+  ) : (
+    <>{icon}</>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/index.ts
new file mode 100644
index 00000000000000..f7a99b59837a5d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/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 { SourceRow, ISourceRow } from './source_row';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.tsx
new file mode 100644
index 00000000000000..2bde3b70f82b50
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.test.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 '../../../../__mocks__/shallow_usecontext.mock';
+
+import React from 'react';
+import { shallow } from 'enzyme';
+
+import { EuiTableRow, EuiSwitch, EuiIcon } from '@elastic/eui';
+import { contentSources } from '../../../__mocks__/content_sources.mock';
+
+import { SourceIcon } from '../source_icon';
+
+import { SourceRow } from './';
+
+const onToggle = jest.fn();
+
+describe('SourceRow', () => {
+  it('renders with no "Fix" link', () => {
+    const wrapper = shallow(<SourceRow source={contentSources[0]} />);
+
+    expect(wrapper.find(EuiTableRow)).toHaveLength(1);
+    expect(wrapper.contains('Fix')).toBeFalsy();
+    expect(wrapper.find(SourceIcon).prop('serviceType')).toEqual('custom');
+  });
+
+  it('calls handler on click', () => {
+    const wrapper = shallow(<SourceRow onSearchableToggle={onToggle} source={contentSources[0]} />);
+    wrapper.find(EuiSwitch).simulate('change', { target: { checked: true } });
+
+    expect(onToggle).toHaveBeenCalled();
+  });
+
+  it('renders "Fix" link', () => {
+    const source = {
+      ...contentSources[0],
+      status: 'error',
+      errorReason: 1,
+    };
+    const wrapper = shallow(<SourceRow isOrganization source={source} />);
+
+    expect(wrapper.contains('Fix')).toBeTruthy();
+  });
+
+  it('renders loading icon when indexing', () => {
+    const source = {
+      ...contentSources[0],
+      status: 'indexing',
+    };
+    const wrapper = shallow(<SourceRow isOrganization source={source} />);
+
+    expect(wrapper.find(SourceIcon).prop('serviceType')).toEqual('loadingSmall');
+  });
+
+  it('renders warning dot when more config needed', () => {
+    const source = {
+      ...contentSources[0],
+      status: 'need-more-config',
+    };
+    const wrapper = shallow(<SourceRow isOrganization source={source} />);
+
+    expect(wrapper.find(EuiIcon).prop('color')).toEqual('warning');
+  });
+
+  it('renders remote tooltip when source is federated', () => {
+    const source = {
+      ...contentSources[0],
+      isFederatedSource: true,
+    };
+    const wrapper = shallow(<SourceRow isOrganization source={source} />);
+
+    expect(wrapper.find('.source-row__document-count').contains('Remote')).toBeTruthy();
+  });
+
+  it('renders details link', () => {
+    const wrapper = shallow(<SourceRow isOrganization showDetails source={contentSources[0]} />);
+
+    expect(wrapper.find('[data-test-subj="SourceDetailsLink"]')).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx
new file mode 100644
index 00000000000000..17ca8e58a80fab
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/source_row/source_row.tsx
@@ -0,0 +1,171 @@
+/*
+ * 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 classNames from 'classnames';
+import _kebabCase from 'lodash/kebabCase';
+import { Link } from 'react-router-dom';
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiSwitch,
+  EuiSwitchEvent,
+  EuiTableRow,
+  EuiTableRowCell,
+  EuiText,
+  EuiToolTip,
+} from '@elastic/eui';
+
+import { SOURCE_STATUSES as statuses } from '../../../constants';
+import { IContentSourceDetails } from '../../../types';
+import { ADD_SOURCE_PATH, SOURCE_DETAILS_PATH, getContentSourcePath } from '../../../routes';
+
+import { SourceIcon } from '../source_icon';
+
+const CREDENTIALS_INVALID_ERROR_REASON = 1;
+
+export interface ISourceRow {
+  showDetails?: boolean;
+  isOrganization?: boolean;
+  onSearchableToggle?(sourceId: string, isSearchable: boolean): void;
+}
+
+interface ISourceRowProps extends ISourceRow {
+  source: IContentSourceDetails;
+}
+
+export const SourceRow: React.FC<ISourceRowProps> = ({
+  source: {
+    id,
+    serviceType,
+    searchable,
+    supportedByLicense,
+    status,
+    statusMessage,
+    name,
+    documentCount,
+    isFederatedSource,
+    errorReason,
+    allowsReauth,
+  },
+  onSearchableToggle,
+  isOrganization,
+  showDetails,
+}) => {
+  const isIndexing = status === statuses.INDEXING;
+  const hasError = status === statuses.ERROR || status === statuses.DISCONNECTED;
+  const showFix =
+    isOrganization && hasError && allowsReauth && errorReason === CREDENTIALS_INVALID_ERROR_REASON;
+
+  const rowClass = classNames(
+    'source-row',
+    { 'content-section--disabled': !searchable },
+    { 'source-row source-row--error': hasError }
+  );
+
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  const imageClass = classNames('source-row__icon', { 'source-row__icon--loading': isIndexing });
+
+  const fixLink = (
+    <Link
+      to={{
+        pathname: `${ADD_SOURCE_PATH}/${_kebabCase(serviceType)}/re-authenticate`,
+        search: `?sourceId=${id}`,
+      }}
+    >
+      Fix
+    </Link>
+  );
+
+  const remoteTooltip = (
+    <>
+      <span>Remote</span>
+      <EuiToolTip
+        position="top"
+        content="Remote sources rely on the source's search service directly, and no content is indexed with Workplace Search. Speed and integrity of results are functions of the third-party service's health and performance."
+      >
+        <EuiIcon type="questionInCircle" />
+      </EuiToolTip>
+    </>
+  );
+
+  return (
+    <EuiTableRow data-test-subj="GroupsRow" className={rowClass}>
+      <EuiTableRowCell>
+        <EuiFlexGroup justifyContent="flexStart" alignItems="center" responsive={false}>
+          <EuiFlexItem grow={false}>
+            <SourceIcon
+              serviceType={isIndexing ? 'loadingSmall' : serviceType}
+              name={name}
+              className={imageClass}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <span className="source-row__name">{name}</span>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiTableRowCell>
+      <EuiTableRowCell>
+        <EuiFlexGroup
+          justifyContent="flexStart"
+          alignItems="center"
+          responsive={false}
+          gutterSize="xs"
+        >
+          {status === 'need-more-config' && (
+            <EuiFlexItem grow={false}>
+              <EuiIcon size="m" type="dot" color="warning" />
+            </EuiFlexItem>
+          )}
+          <EuiFlexItem>
+            <EuiText
+              className={`source-row__status source-row__status--${status}`}
+              color={status === 'need-more-config' ? 'default' : 'subdued'}
+              size="xs"
+            >
+              {statusMessage}
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiTableRowCell>
+      <EuiTableRowCell className="source-row__document-count" data-test-subj="SourceDocumentCount">
+        {isFederatedSource ? remoteTooltip : parseInt(documentCount, 10).toLocaleString('en-US')}
+      </EuiTableRowCell>
+      {onSearchableToggle && (
+        <EuiTableRowCell>
+          <EuiSwitch
+            checked={searchable}
+            onChange={(e: EuiSwitchEvent) => onSearchableToggle(id, e.target.checked)}
+            disabled={!supportedByLicense}
+            compressed
+            label="Source Searchable Toggle"
+            showLabel={false}
+            data-test-subj="SourceSearchableToggle"
+          />
+        </EuiTableRowCell>
+      )}
+      <EuiTableRowCell className="source-row__actions">
+        <EuiFlexGroup justifyContent="flexEnd" alignItems="center" gutterSize="s">
+          {showFix && <EuiFlexItem grow={false}>{fixLink}</EuiFlexItem>}
+          <EuiFlexItem grow={false}>
+            {showDetails && (
+              <Link
+                className="eui-textNoWrap"
+                data-test-subj="SourceDetailsLink"
+                to={getContentSourcePath(SOURCE_DETAILS_PATH, id, !!isOrganization)}
+              >
+                Details
+              </Link>
+            )}
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiTableRowCell>
+    </EuiTableRow>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/index.ts
new file mode 100644
index 00000000000000..bb5f490ed472b1
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/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 { SourcesTable } from './sources_table';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.tsx
new file mode 100644
index 00000000000000..dfac8525471b49
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.test.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 { shallow } from 'enzyme';
+
+import { EuiTable } from '@elastic/eui';
+import { TableHeader } from '../../../../shared/table_header/table_header';
+import { contentSources } from '../../../__mocks__/content_sources.mock';
+
+import { SourceRow } from '../source_row';
+
+import { SourcesTable } from './';
+
+const onToggle = jest.fn();
+
+describe('SourcesTable', () => {
+  it('renders', () => {
+    const wrapper = shallow(<SourcesTable sources={contentSources} />);
+
+    expect(wrapper.find(EuiTable)).toHaveLength(1);
+    expect(wrapper.find(SourceRow)).toHaveLength(2);
+  });
+
+  it('renders "Searchable" header item when toggle fn present', () => {
+    const wrapper = shallow(
+      <SourcesTable onSearchableToggle={onToggle} sources={contentSources} />
+    );
+
+    expect(wrapper.find(TableHeader).prop('headerItems')).toContain('Searchable');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.tsx
new file mode 100644
index 00000000000000..184aadc1dad848
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/sources_table/sources_table.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 React from 'react';
+
+import { EuiTable, EuiTableBody } from '@elastic/eui';
+
+import { TableHeader } from '../../../../shared/table_header/table_header';
+import { SourceRow, ISourceRow } from '../source_row';
+import { IContentSourceDetails } from '../../../types';
+
+interface ISourcesTableProps extends ISourceRow {
+  sources: IContentSourceDetails[];
+}
+
+export const SourcesTable: React.FC<ISourcesTableProps> = ({
+  sources,
+  showDetails,
+  isOrganization,
+  onSearchableToggle,
+}) => {
+  const headerItems = ['Source', 'Status', 'Documents'];
+  if (onSearchableToggle) headerItems.push('Searchable');
+
+  return (
+    <EuiTable className="table table--emphasized" responsive={false}>
+      <TableHeader extraCell headerItems={headerItems} />
+      <EuiTableBody>
+        {sources.map((source) => (
+          <SourceRow
+            key={source.id}
+            source={source}
+            showDetails={showDetails}
+            isOrganization={isOrganization}
+            onSearchableToggle={onSearchableToggle}
+          />
+        ))}
+      </EuiTableBody>
+    </EuiTable>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/index.ts
new file mode 100644
index 00000000000000..1598ee760c059a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/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 { TablePaginationBar } from './table_pagination_bar';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.tsx
new file mode 100644
index 00000000000000..14d4dfecd0094d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.test.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 { shallow } from 'enzyme';
+
+import { EuiFlexGroup, EuiTablePagination } from '@elastic/eui';
+
+import { TablePaginationBar } from './';
+
+const onChange = jest.fn();
+
+describe('TablePaginationBar', () => {
+  it('renders', () => {
+    const wrapper = shallow(
+      <TablePaginationBar onChangePage={onChange} totalPages={1} totalItems={10} />
+    );
+
+    expect(wrapper.find(EuiTablePagination)).toHaveLength(1);
+    expect(wrapper.find(EuiFlexGroup)).toHaveLength(2);
+    expect(wrapper.find(EuiTablePagination).prop('itemsPerPage')).toEqual(10);
+    expect(wrapper.find(EuiTablePagination).prop('pageCount')).toEqual(1);
+  });
+
+  it('passes max page count when showAllPages false', () => {
+    const wrapper = shallow(
+      <TablePaginationBar onChangePage={onChange} totalPages={1000} totalItems={10000} />
+    );
+
+    expect(wrapper.find(EuiTablePagination).prop('pageCount')).toEqual(100);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.tsx
new file mode 100644
index 00000000000000..04f5b9a477058a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/table_pagination_bar/table_pagination_bar.tsx
@@ -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 React from 'react';
+
+import { EuiFlexGroup, EuiFlexItem, EuiTablePagination } from '@elastic/eui';
+
+interface ITablePaginationBarProps {
+  itemLabel?: string;
+  itemsPerPage?: number;
+  totalPages: number;
+  totalItems: number;
+  activePage?: number;
+  hidePerPageOptions?: boolean;
+  hideLabelCount?: boolean;
+  clearFiltersLink?: React.ReactElement;
+  onChangePage(nextPage: number): void;
+}
+
+const MAX_PAGES = 100;
+
+export const TablePaginationBar: React.FC<ITablePaginationBarProps> = ({
+  itemLabel = 'Items',
+  itemsPerPage = 10,
+  totalPages,
+  totalItems,
+  activePage = 1,
+  hidePerPageOptions = true,
+  hideLabelCount = false,
+  onChangePage,
+  clearFiltersLink,
+}) => {
+  // EUI component starts page at 0. API starts at 1.
+  const currentPage = activePage - 1;
+  const showAllPages = totalPages < MAX_PAGES;
+
+  const pageRangeText = () => {
+    const rangeEnd = activePage === totalPages ? totalItems : itemsPerPage * activePage;
+    const rangeStart = currentPage * itemsPerPage + 1;
+    const rangeEl = (
+      <strong>
+        {rangeStart}-{rangeEnd}
+      </strong>
+    );
+    const totalEl = <strong>{totalItems.toLocaleString()}</strong>;
+
+    return (
+      <EuiFlexGroup alignItems="center" justifyContent="flexStart">
+        <EuiFlexItem grow={false}>
+          <div>
+            Showing {rangeEl}
+            {showAllPages && (
+              <>
+                {' '}
+                of {totalEl} {itemLabel}
+              </>
+            )}
+          </div>
+        </EuiFlexItem>
+        <EuiFlexItem>{clearFiltersLink}</EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  };
+
+  return (
+    <EuiFlexGroup alignItems="center">
+      {!hideLabelCount && <EuiFlexItem>{pageRangeText()}</EuiFlexItem>}
+      <EuiFlexItem>
+        <EuiTablePagination
+          hidePerPageOptions={hidePerPageOptions}
+          activePage={currentPage}
+          itemsPerPage={itemsPerPage}
+          pageCount={showAllPages ? totalPages : MAX_PAGES}
+          onChangePage={onChangePage}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/index.ts
new file mode 100644
index 00000000000000..e9ee92bed68cad
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/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 { UserIcon } from './user_icon';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.test.tsx
new file mode 100644
index 00000000000000..f8c1d00047825f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.test.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 { shallow } from 'enzyme';
+
+import { users } from '../../../__mocks__/users.mock';
+
+import { UserIcon } from './user_icon';
+
+describe('SourcesTable', () => {
+  it('renders with picture', () => {
+    const wrapper = shallow(<UserIcon {...users[0]} />);
+
+    expect(wrapper.find('.avatar')).toHaveLength(1);
+    expect(wrapper.find('.avatar__image')).toHaveLength(1);
+  });
+
+  it('renders without picture', () => {
+    const user = {
+      ...users[0],
+      pictureUrl: null,
+    };
+    const wrapper = shallow(<UserIcon {...user} />);
+
+    expect(wrapper.find('.avatar')).toHaveLength(1);
+    expect(wrapper.find('.avatar__text')).toHaveLength(1);
+  });
+
+  it('renders fallback "alt" value when name not present', () => {
+    const user = {
+      ...users[0],
+      name: null,
+    };
+    const wrapper = shallow(<UserIcon {...user} />);
+
+    expect(wrapper.find('img').prop('alt')).toEqual(user.email);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.tsx
new file mode 100644
index 00000000000000..28ea303d14eaf9
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_icon/user_icon.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 { IUser } from '../../../types';
+
+export const UserIcon: React.FC<IUser> = ({ name, pictureUrl, color, initials, email }) => (
+  <div className="avatar avatar--small" style={{ backgroundColor: color }}>
+    {pictureUrl ? (
+      <img src={pictureUrl} className="avatar__image" alt={name || email} />
+    ) : (
+      <span className="avatar__text">{initials}</span>
+    )}
+  </div>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/index.ts
new file mode 100644
index 00000000000000..cc4650d70dad03
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/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 { UserRow } from './user_row';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.test.tsx
new file mode 100644
index 00000000000000..20d2732e8c82a3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.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 { EuiTableRow } from '@elastic/eui';
+
+import { users } from '../../../__mocks__/users.mock';
+
+import { UserRow } from './';
+
+describe('SourcesTable', () => {
+  it('renders', () => {
+    const wrapper = shallow(<UserRow user={users[0]} />);
+
+    expect(wrapper.find(EuiTableRow)).toHaveLength(1);
+    expect(wrapper.find('span')).toHaveLength(0);
+  });
+
+  it('renders with email visible', () => {
+    const wrapper = shallow(<UserRow user={users[0]} showEmail />);
+
+    expect(wrapper.find('span')).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.tsx
new file mode 100644
index 00000000000000..45866c10a5b217
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/components/shared/user_row/user_row.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 { EuiTableRow, EuiTableRowCell } from '@elastic/eui';
+
+import { IUser } from '../../../types';
+
+interface IUserRowProps {
+  user: IUser;
+  showEmail?: boolean;
+}
+
+export const UserRow: React.FC<IUserRowProps> = ({ user: { name, email }, showEmail }) => (
+  <EuiTableRow>
+    <EuiTableRowCell>{name}</EuiTableRowCell>
+    <EuiTableRowCell>{showEmail && <span>{email}</span>}</EuiTableRowCell>
+  </EuiTableRow>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.ts
new file mode 100644
index 00000000000000..9f313a6995ad58
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/constants.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.
+ */
+
+export const MAX_TABLE_ROW_ICONS = 3;
+
+export const SOURCE_STATUSES = {
+  INDEXING: 'indexing',
+  SYNCED: 'synced',
+  SYNCING: 'syncing',
+  AWAITING_USER_ACTION: 'awaiting_user_action',
+  ERROR: 'error',
+  DISCONNECTED: 'disconnected',
+  ALWAYS_SYNCED: 'always_synced',
+};
+
+export const CUSTOM_SERVICE_TYPE = 'custom';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
new file mode 100644
index 00000000000000..d03c0abb441b98
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
@@ -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 React from 'react';
+import { shallow } from 'enzyme';
+
+import { EuiLink } from '@elastic/eui';
+
+import {
+  getContentSourcePath,
+  SOURCES_PATH,
+  ORG_SOURCES_PATH,
+  SOURCE_DETAILS_PATH,
+} from './routes';
+
+const TestComponent = ({ id, isOrg }: { id: string; isOrg?: boolean }) => {
+  const href = getContentSourcePath(SOURCE_DETAILS_PATH, id, !!isOrg);
+  return <EuiLink href={href}>test</EuiLink>;
+};
+
+describe('getContentSourcePath', () => {
+  it('should format org route', () => {
+    const wrapper = shallow(<TestComponent id="123" isOrg />);
+    const path = wrapper.find(EuiLink).prop('href');
+
+    expect(path).toEqual(`${ORG_SOURCES_PATH}/123`);
+  });
+
+  it('should format user route', () => {
+    const wrapper = shallow(<TestComponent id="123" />);
+    const path = wrapper.find(EuiLink).prop('href');
+
+    expect(path).toEqual(`${SOURCES_PATH}/123`);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
index 993a1a378e7385..e833dde4c1b728 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { generatePath } from 'react-router-dom';
+
 import { CURRENT_MAJOR_VERSION } from '../../../common/version';
 
 export const SETUP_GUIDE_PATH = '/setup_guide';
@@ -107,4 +109,8 @@ export const EDIT_SLACK_PATH = `${ORG_SETTINGS_CONNECTORS_PATH}/slack/edit`;
 export const EDIT_ZENDESK_PATH = `${ORG_SETTINGS_CONNECTORS_PATH}/zendesk/edit`;
 export const EDIT_CUSTOM_PATH = `${ORG_SETTINGS_CONNECTORS_PATH}/custom/edit`;
 
-export const getSourcePath = (sourceId: string): string => `${ORG_SOURCES_PATH}/${sourceId}`;
+export const getContentSourcePath = (
+  path: string,
+  sourceId: string,
+  isOrganization: boolean
+): string => generatePath(isOrganization ? ORG_PATH + path : path, { sourceId });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
index a8348a6f69a394..3866da738cbb61 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/types.ts
@@ -7,3 +7,43 @@
 export * from '../../../common/types/workplace_search';
 
 export type TSpacerSize = 'xs' | 's' | 'm' | 'l' | 'xl' | 'xxl';
+
+export interface IGroup {
+  id: string;
+  name: string;
+  createdAt: string;
+  updatedAt: string;
+  contentSources: IContentSource[];
+  users: IUser[];
+  usersCount: number;
+  color?: string;
+}
+
+export interface IUser {
+  id: string;
+  name: string | null;
+  initials: string;
+  pictureUrl: string | null;
+  color: string;
+  email: string;
+  role?: string;
+  groupIds: string[];
+}
+
+export interface IContentSource {
+  id: string;
+  serviceType: string;
+  name: string;
+}
+
+export interface IContentSourceDetails extends IContentSource {
+  status: string;
+  statusMessage: string;
+  documentCount: string;
+  isFederatedSource: boolean;
+  searchable: boolean;
+  supportedByLicense: boolean;
+  errorReason: number;
+  allowsReauth: boolean;
+  boost: number;
+}
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 3c476be8d10e66..441f45a947a493 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
@@ -15,7 +15,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { ContentSection } from '../../components/shared/content_section';
 import { sendTelemetry } from '../../../shared/telemetry';
 import { KibanaContext, IKibanaContext } from '../../../index';
-import { getSourcePath } from '../../routes';
+import { SOURCE_DETAILS_PATH, getContentSourcePath } from '../../routes';
 
 import { OverviewLogic } from './overview_logic';
 
@@ -107,7 +107,7 @@ export const RecentActivityItem: React.FC<IFeedActivity> = ({
   const linkProps = {
     onClick,
     target: '_blank',
-    href: getWorkplaceSearchUrl(getSourcePath(sourceId)),
+    href: getWorkplaceSearchUrl(getContentSourcePath(SOURCE_DETAILS_PATH, sourceId, true)),
     external: true,
     color: status === 'error' ? 'danger' : 'primary',
     'data-test-subj': 'viewSourceDetailsLink',

From d9dc47ef369ff91c5e569ebbc534969f78c950be Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 2 Sep 2020 12:17:23 -0700
Subject: [PATCH 192/216] skip flaky suite (#76551)

---
 .../reporting_api_integration/reporting_and_security/spaces.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
index 0145ca2a180927..6a68bd530cf63b 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
@@ -27,7 +27,8 @@ export default function ({ getService }: FtrProviderContext) {
     );
   };
 
-  describe('Exports from Non-default Space', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/76551
+  describe.skip('Exports from Non-default Space', () => {
     before(async () => {
       await esArchiver.load('reporting/ecommerce');
       await esArchiver.load('reporting/ecommerce_kibana_spaces'); // dashboard in non default space

From aac84240b237ec33aa72d986137f9decc5f64c38 Mon Sep 17 00:00:00 2001
From: Quynh Nguyen <43350163+qn895@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:52:10 -0500
Subject: [PATCH 193/216] [ML] Extend MlUrlGenerator to support other ML pages
 (#75696)

Co-authored-by: Dima Arnautov <dmitrii.arnautov@elastic.co>
---
 .../ml/common/constants/ml_url_generator.ts   |  38 +++
 .../ml/common/types/ml_url_generator.ts       | 187 +++++++++++++
 .../application/contexts/kibana/index.ts      |   1 +
 .../contexts/kibana/use_create_url.ts         |  20 ++
 .../contexts/kibana/use_navigate_to_path.ts   |  25 +-
 .../back_to_list_panel/back_to_list_panel.tsx |  13 +-
 .../view_results_panel/view_results_panel.tsx |  19 +-
 .../explorer/explorer_dashboard_service.ts    |  19 +-
 .../ml/public/application/routing/router.tsx  |   1 -
 .../application/routing/routes/explorer.tsx   |   3 +-
 .../anomaly_detection_urls_generator.ts       | 163 +++++++++++
 .../ml/public/ml_url_generator/common.ts      |  55 ++++
 .../data_frame_analytics_urls_generator.ts    |  70 +++++
 .../data_visualizer_urls_generator.ts         |  29 ++
 .../ml/public/ml_url_generator/index.ts       |   6 +
 .../ml_url_generator/ml_url_generator.test.ts | 262 ++++++++++++++++++
 .../ml_url_generator/ml_url_generator.ts      |  91 ++++++
 x-pack/plugins/ml/public/plugin.ts            |   2 +-
 .../open_in_anomaly_explorer_action.tsx       |  30 +-
 .../plugins/ml/public/url_generator.test.ts   |  34 ---
 x-pack/plugins/ml/public/url_generator.ts     | 118 --------
 .../lib/sample_data_sets/sample_data_sets.ts  |   4 +-
 22 files changed, 982 insertions(+), 208 deletions(-)
 create mode 100644 x-pack/plugins/ml/common/constants/ml_url_generator.ts
 create mode 100644 x-pack/plugins/ml/common/types/ml_url_generator.ts
 create mode 100644 x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/common.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/data_frame_analytics_urls_generator.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/data_visualizer_urls_generator.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/index.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
 create mode 100644 x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.ts
 delete mode 100644 x-pack/plugins/ml/public/url_generator.test.ts
 delete mode 100644 x-pack/plugins/ml/public/url_generator.ts

diff --git a/x-pack/plugins/ml/common/constants/ml_url_generator.ts b/x-pack/plugins/ml/common/constants/ml_url_generator.ts
new file mode 100644
index 00000000000000..44f33aa329e7ae
--- /dev/null
+++ b/x-pack/plugins/ml/common/constants/ml_url_generator.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.
+ */
+
+export const ML_APP_URL_GENERATOR = 'ML_APP_URL_GENERATOR';
+
+export const ML_PAGES = {
+  ANOMALY_DETECTION_JOBS_MANAGE: 'jobs',
+  ANOMALY_EXPLORER: 'explorer',
+  SINGLE_METRIC_VIEWER: 'timeseriesexplorer',
+  DATA_FRAME_ANALYTICS_JOBS_MANAGE: 'data_frame_analytics',
+  DATA_FRAME_ANALYTICS_EXPLORATION: 'data_frame_analytics/exploration',
+  /**
+   * Page: Data Visualizer
+   */
+  DATA_VISUALIZER: 'datavisualizer',
+  /**
+   * Page: Data Visualizer
+   * Open data visualizer by selecting a Kibana index pattern or saved search
+   */
+  DATA_VISUALIZER_INDEX_SELECT: 'datavisualizer_index_select',
+  /**
+   * Page: Data Visualizer
+   * Open data visualizer by importing data from a log file
+   */
+  DATA_VISUALIZER_FILE: 'filedatavisualizer',
+  /**
+   * Page: Data Visualizer
+   * Open index data visualizer viewer page
+   */
+  DATA_VISUALIZER_INDEX_VIEWER: 'jobs/new_job/datavisualizer',
+  ANOMALY_DETECTION_CREATE_JOB_SELECT_TYPE: `jobs/new_job/step/job_type`,
+  SETTINGS: 'settings',
+  CALENDARS_MANAGE: 'settings/calendars_list',
+  FILTER_LISTS_MANAGE: 'settings/filter_lists',
+} as const;
diff --git a/x-pack/plugins/ml/common/types/ml_url_generator.ts b/x-pack/plugins/ml/common/types/ml_url_generator.ts
new file mode 100644
index 00000000000000..234be8b6faf909
--- /dev/null
+++ b/x-pack/plugins/ml/common/types/ml_url_generator.ts
@@ -0,0 +1,187 @@
+/*
+ * 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 { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query';
+import { JobId } from '../../../reporting/common/types';
+import { ML_PAGES } from '../constants/ml_url_generator';
+
+type OptionalPageState = object | undefined;
+
+export type MLPageState<PageType, PageState> = PageState extends OptionalPageState
+  ? { page: PageType; pageState?: PageState }
+  : PageState extends object
+  ? { page: PageType; pageState: PageState }
+  : { page: PageType };
+
+export const ANALYSIS_CONFIG_TYPE = {
+  OUTLIER_DETECTION: 'outlier_detection',
+  REGRESSION: 'regression',
+  CLASSIFICATION: 'classification',
+} as const;
+
+type DataFrameAnalyticsType = typeof ANALYSIS_CONFIG_TYPE[keyof typeof ANALYSIS_CONFIG_TYPE];
+
+export interface MlCommonGlobalState {
+  time?: TimeRange;
+}
+export interface MlCommonAppState {
+  [key: string]: any;
+}
+
+export interface MlIndexBasedSearchState {
+  index?: string;
+  savedSearchId?: string;
+}
+
+export interface MlGenericUrlPageState extends MlIndexBasedSearchState {
+  globalState?: MlCommonGlobalState;
+  appState?: MlCommonAppState;
+  [key: string]: any;
+}
+
+export interface MlGenericUrlState {
+  page:
+    | typeof ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER
+    | typeof ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_SELECT_TYPE;
+  pageState: MlGenericUrlPageState;
+}
+
+export interface AnomalyDetectionQueryState {
+  jobId?: JobId;
+  groupIds?: string[];
+}
+
+export type AnomalyDetectionUrlState = MLPageState<
+  typeof ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE,
+  AnomalyDetectionQueryState | undefined
+>;
+export interface ExplorerAppState {
+  mlExplorerSwimlane: {
+    selectedType?: string;
+    selectedLanes?: string[];
+    selectedTimes?: number[];
+    showTopFieldValues?: boolean;
+    viewByFieldName?: string;
+    viewByPerPage?: number;
+    viewByFromPage?: number;
+  };
+  mlExplorerFilter: {
+    influencersFilterQuery?: unknown;
+    filterActive?: boolean;
+    filteredFields?: string[];
+    queryString?: string;
+  };
+  query?: any;
+}
+export interface ExplorerGlobalState {
+  ml: { jobIds: JobId[] };
+  time?: TimeRange;
+  refreshInterval?: RefreshInterval;
+}
+
+export interface ExplorerUrlPageState {
+  /**
+   * Job IDs
+   */
+  jobIds: JobId[];
+  /**
+   * Optionally set the time range in the time picker.
+   */
+  timeRange?: TimeRange;
+  /**
+   * Optionally set the refresh interval.
+   */
+  refreshInterval?: RefreshInterval;
+  /**
+   * Optionally set the query.
+   */
+  query?: any;
+  /**
+   * Optional state for the swim lane
+   */
+  mlExplorerSwimlane?: ExplorerAppState['mlExplorerSwimlane'];
+  mlExplorerFilter?: ExplorerAppState['mlExplorerFilter'];
+}
+
+export type ExplorerUrlState = MLPageState<typeof ML_PAGES.ANOMALY_EXPLORER, ExplorerUrlPageState>;
+
+export interface TimeSeriesExplorerGlobalState {
+  ml: {
+    jobIds: JobId[];
+  };
+  time?: TimeRange;
+  refreshInterval?: RefreshInterval;
+}
+
+export interface TimeSeriesExplorerAppState {
+  zoom?: {
+    from?: string;
+    to?: string;
+  };
+  mlTimeSeriesExplorer?: {
+    detectorIndex?: number;
+    entities?: Record<string, string>;
+  };
+  query?: any;
+}
+
+export interface TimeSeriesExplorerPageState
+  extends Pick<TimeSeriesExplorerAppState, 'zoom' | 'query'>,
+    Pick<TimeSeriesExplorerGlobalState, 'refreshInterval'> {
+  jobIds: JobId[];
+  timeRange?: TimeRange;
+  detectorIndex?: number;
+  entities?: Record<string, string>;
+}
+
+export type TimeSeriesExplorerUrlState = MLPageState<
+  typeof ML_PAGES.SINGLE_METRIC_VIEWER,
+  TimeSeriesExplorerPageState
+>;
+
+export interface DataFrameAnalyticsQueryState {
+  jobId?: JobId | JobId[];
+  groupIds?: string[];
+}
+
+export type DataFrameAnalyticsUrlState = MLPageState<
+  typeof ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE,
+  DataFrameAnalyticsQueryState | undefined
+>;
+
+export interface DataVisualizerUrlState {
+  page:
+    | typeof ML_PAGES.DATA_VISUALIZER
+    | typeof ML_PAGES.DATA_VISUALIZER_FILE
+    | typeof ML_PAGES.DATA_VISUALIZER_INDEX_SELECT;
+}
+
+export interface DataFrameAnalyticsExplorationQueryState {
+  ml: {
+    jobId: JobId;
+    analysisType: DataFrameAnalyticsType;
+  };
+}
+
+export type DataFrameAnalyticsExplorationUrlState = MLPageState<
+  typeof ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
+  {
+    jobId: JobId;
+    analysisType: DataFrameAnalyticsType;
+  }
+>;
+
+/**
+ * Union type of ML URL state based on page
+ */
+export type MlUrlGeneratorState =
+  | AnomalyDetectionUrlState
+  | ExplorerUrlState
+  | TimeSeriesExplorerUrlState
+  | DataFrameAnalyticsUrlState
+  | DataFrameAnalyticsExplorationUrlState
+  | DataVisualizerUrlState
+  | MlGenericUrlState;
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/index.ts b/x-pack/plugins/ml/public/application/contexts/kibana/index.ts
index 8a43ae12deb21c..44979a1b9c60ae 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/index.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/index.ts
@@ -9,3 +9,4 @@ export { useNavigateToPath, NavigateToPath } from './use_navigate_to_path';
 export { useUiSettings } from './use_ui_settings_context';
 export { useTimefilter } from './use_timefilter';
 export { useNotifications } from './use_notifications_context';
+export { useMlUrlGenerator } from './use_create_url';
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts b/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
new file mode 100644
index 00000000000000..48385ad3ae6a82
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/use_create_url.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 { useMlKibana } from './kibana_context';
+import { ML_APP_URL_GENERATOR } from '../../../../common/constants/ml_url_generator';
+
+export const useMlUrlGenerator = () => {
+  const {
+    services: {
+      share: {
+        urlGenerators: { getUrlGenerator },
+      },
+    },
+  } = useMlKibana();
+
+  return getUrlGenerator(ML_APP_URL_GENERATOR);
+};
diff --git a/x-pack/plugins/ml/public/application/contexts/kibana/use_navigate_to_path.ts b/x-pack/plugins/ml/public/application/contexts/kibana/use_navigate_to_path.ts
index f2db970bf5057e..96d41be03a142e 100644
--- a/x-pack/plugins/ml/public/application/contexts/kibana/use_navigate_to_path.ts
+++ b/x-pack/plugins/ml/public/application/contexts/kibana/use_navigate_to_path.ts
@@ -21,14 +21,19 @@ export const useNavigateToPath = () => {
 
   const location = useLocation();
 
-  return useMemo(
-    () => (path: string | undefined, preserveSearch = false) => {
-      navigateToUrl(
-        getUrlForApp(PLUGIN_ID, {
-          path: `${path}${preserveSearch === true ? location.search : ''}`,
-        })
-      );
-    },
-    [location]
-  );
+  return useMemo(() => {
+    return (path: string | undefined, preserveSearch = false) => {
+      if (path === undefined) return;
+      const modifiedPath = `${path}${preserveSearch === true ? location.search : ''}`;
+      /**
+       * Handle urls generated by MlUrlGenerator where '/app/ml' is automatically prepended
+       */
+      const url = modifiedPath.includes('/app/ml')
+        ? modifiedPath
+        : getUrlForApp(PLUGIN_ID, {
+            path: modifiedPath,
+          });
+      navigateToUrl(url);
+    };
+  }, [location]);
 };
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
index babb5571052702..0560c3150a424c 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/back_to_list_panel/back_to_list_panel.tsx
@@ -7,13 +7,20 @@
 import React, { FC, Fragment } from 'react';
 import { EuiCard, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useNavigateToPath } from '../../../../../contexts/kibana';
+import { useMlKibana, useMlUrlGenerator } from '../../../../../contexts/kibana';
+import { ML_PAGES } from '../../../../../../../common/constants/ml_url_generator';
 
 export const BackToListPanel: FC = () => {
-  const navigateToPath = useNavigateToPath();
+  const urlGenerator = useMlUrlGenerator();
+  const {
+    services: {
+      application: { navigateToUrl },
+    },
+  } = useMlKibana();
 
   const redirectToAnalyticsManagementPage = async () => {
-    await navigateToPath('/data_frame_analytics');
+    const url = await urlGenerator.createUrl({ page: ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE });
+    await navigateToUrl(url);
   };
 
   return (
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
index 23a16ba84ef923..b832bfb2549c6d 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/view_results_panel/view_results_panel.tsx
@@ -7,20 +7,27 @@
 import React, { FC, Fragment } from 'react';
 import { EuiCard, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useNavigateToPath } from '../../../../../contexts/kibana';
-import { getResultsUrl } from '../../../analytics_management/components/analytics_list/common';
+import { useMlUrlGenerator } from '../../../../../contexts/kibana';
 import { ANALYSIS_CONFIG_TYPE } from '../../../../common/analytics';
-
+import { ML_PAGES } from '../../../../../../../common/constants/ml_url_generator';
+import { useNavigateToPath } from '../../../../../contexts/kibana';
 interface Props {
   jobId: string;
   analysisType: ANALYSIS_CONFIG_TYPE;
 }
 
 export const ViewResultsPanel: FC<Props> = ({ jobId, analysisType }) => {
+  const urlGenerator = useMlUrlGenerator();
   const navigateToPath = useNavigateToPath();
 
-  const redirectToAnalyticsManagementPage = async () => {
-    const path = getResultsUrl(jobId, analysisType);
+  const redirectToAnalyticsExplorationPage = async () => {
+    const path = await urlGenerator.createUrl({
+      page: ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
+      pageState: {
+        jobId,
+        analysisType,
+      },
+    });
     await navigateToPath(path);
   };
 
@@ -38,7 +45,7 @@ export const ViewResultsPanel: FC<Props> = ({ jobId, analysisType }) => {
             defaultMessage: 'View results for the analytics job.',
           }
         )}
-        onClick={redirectToAnalyticsManagementPage}
+        onClick={redirectToAnalyticsExplorationPage}
         data-test-subj="analyticsWizardViewResultsCard"
       />
     </Fragment>
diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts b/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
index 4d697bcda1a065..e0ed2ea6cf5e08 100644
--- a/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
+++ b/x-pack/plugins/ml/public/application/explorer/explorer_dashboard_service.ts
@@ -21,6 +21,7 @@ import { ExplorerChartsData } from './explorer_charts/explorer_charts_container_
 import { EXPLORER_ACTION } from './explorer_constants';
 import { AppStateSelectedCells, TimeRangeBounds } from './explorer_utils';
 import { explorerReducer, getExplorerDefaultState, ExplorerState } from './reducers';
+import { ExplorerAppState } from '../../../common/types/ml_url_generator';
 
 export const ALLOW_CELL_RANGE_SELECTION = true;
 
@@ -49,24 +50,6 @@ const explorerState$: Observable<ExplorerState> = explorerFilteredAction$.pipe(
   shareReplay(1)
 );
 
-export interface ExplorerAppState {
-  mlExplorerSwimlane: {
-    selectedType?: string;
-    selectedLanes?: string[];
-    selectedTimes?: number[];
-    showTopFieldValues?: boolean;
-    viewByFieldName?: string;
-    viewByPerPage?: number;
-    viewByFromPage?: number;
-  };
-  mlExplorerFilter: {
-    influencersFilterQuery?: unknown;
-    filterActive?: boolean;
-    filteredFields?: string[];
-    queryString?: string;
-  };
-}
-
 const explorerAppState$: Observable<ExplorerAppState> = explorerState$.pipe(
   map(
     (state: ExplorerState): ExplorerAppState => {
diff --git a/x-pack/plugins/ml/public/application/routing/router.tsx b/x-pack/plugins/ml/public/application/routing/router.tsx
index 56c9a19723fba1..22a17c4ea089a9 100644
--- a/x-pack/plugins/ml/public/application/routing/router.tsx
+++ b/x-pack/plugins/ml/public/application/routing/router.tsx
@@ -75,7 +75,6 @@ const MlRoutes: FC<{
   pageDeps: PageDependencies;
 }> = ({ pageDeps }) => {
   const navigateToPath = useNavigateToPath();
-
   return (
     <>
       {Object.entries(routes).map(([name, routeFactory]) => {
diff --git a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
index 62d7e82a214b57..2f2fc77283ef79 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
@@ -22,7 +22,8 @@ import { useSelectedCells } from '../../explorer/hooks/use_selected_cells';
 import { mlJobService } from '../../services/job_service';
 import { ml } from '../../services/ml_api_service';
 import { useExplorerData } from '../../explorer/actions';
-import { ExplorerAppState, explorerService } from '../../explorer/explorer_dashboard_service';
+import { ExplorerAppState } from '../../../../common/types/ml_url_generator';
+import { explorerService } from '../../explorer/explorer_dashboard_service';
 import { getDateFormatTz } from '../../explorer/explorer_utils';
 import { useJobSelection } from '../../components/job_selector/use_job_selection';
 import { useShowCharts } from '../../components/controls/checkbox_showcharts';
diff --git a/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts b/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
new file mode 100644
index 00000000000000..c4aebb108e7b92
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/anomaly_detection_urls_generator.ts
@@ -0,0 +1,163 @@
+/*
+ * 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/isEmpty';
+import {
+  AnomalyDetectionQueryState,
+  AnomalyDetectionUrlState,
+  ExplorerAppState,
+  ExplorerGlobalState,
+  ExplorerUrlState,
+  MlGenericUrlState,
+  TimeSeriesExplorerAppState,
+  TimeSeriesExplorerGlobalState,
+  TimeSeriesExplorerUrlState,
+} from '../../common/types/ml_url_generator';
+import { ML_PAGES } from '../../common/constants/ml_url_generator';
+import { createIndexBasedMlUrl } from './common';
+import { setStateToKbnUrl } from '../../../../../src/plugins/kibana_utils/public';
+/**
+ * Creates URL to the Anomaly Detection Job management page
+ */
+export function createAnomalyDetectionJobManagementUrl(
+  appBasePath: string,
+  params: AnomalyDetectionUrlState['pageState']
+): string {
+  let url = `${appBasePath}/${ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE}`;
+  if (!params || isEmpty(params)) {
+    return url;
+  }
+  const { jobId, groupIds } = params;
+  const queryState: AnomalyDetectionQueryState = {
+    jobId,
+    groupIds,
+  };
+
+  url = setStateToKbnUrl<AnomalyDetectionQueryState>(
+    'mlManagement',
+    queryState,
+    { useHash: false, storeInHashQuery: false },
+    url
+  );
+  return url;
+}
+
+export function createAnomalyDetectionCreateJobSelectType(
+  appBasePath: string,
+  pageState: MlGenericUrlState['pageState']
+): string {
+  return createIndexBasedMlUrl(
+    appBasePath,
+    ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_SELECT_TYPE,
+    pageState
+  );
+}
+
+/**
+ * Creates URL to the Anomaly Explorer page
+ */
+export function createExplorerUrl(
+  appBasePath: string,
+  params: ExplorerUrlState['pageState']
+): string {
+  let url = `${appBasePath}/${ML_PAGES.ANOMALY_EXPLORER}`;
+
+  if (!params) {
+    return url;
+  }
+  const {
+    refreshInterval,
+    timeRange,
+    jobIds,
+    query,
+    mlExplorerSwimlane = {},
+    mlExplorerFilter = {},
+  } = params;
+  const appState: Partial<ExplorerAppState> = {
+    mlExplorerSwimlane,
+    mlExplorerFilter,
+  };
+  if (query) appState.query = query;
+
+  if (jobIds) {
+    const queryState: Partial<ExplorerGlobalState> = {
+      ml: {
+        jobIds,
+      },
+    };
+
+    if (timeRange) queryState.time = timeRange;
+    if (refreshInterval) queryState.refreshInterval = refreshInterval;
+
+    url = setStateToKbnUrl<Partial<ExplorerGlobalState>>(
+      '_g',
+      queryState,
+      { useHash: false, storeInHashQuery: false },
+      url
+    );
+    url = setStateToKbnUrl<Partial<ExplorerAppState>>(
+      '_a',
+      appState,
+      { useHash: false, storeInHashQuery: false },
+      url
+    );
+  }
+
+  return url;
+}
+
+/**
+ * Creates URL to the SingleMetricViewer page
+ */
+export function createSingleMetricViewerUrl(
+  appBasePath: string,
+  params: TimeSeriesExplorerUrlState['pageState']
+): string {
+  let url = `${appBasePath}/${ML_PAGES.SINGLE_METRIC_VIEWER}`;
+  if (!params) {
+    return url;
+  }
+  const { timeRange, jobIds, refreshInterval, zoom, query, detectorIndex, entities } = params;
+
+  const queryState: TimeSeriesExplorerGlobalState = {
+    ml: {
+      jobIds,
+    },
+    refreshInterval,
+    time: timeRange,
+  };
+
+  const appState: Partial<TimeSeriesExplorerAppState> = {};
+  const mlTimeSeriesExplorer: Partial<TimeSeriesExplorerAppState['mlTimeSeriesExplorer']> = {};
+
+  if (detectorIndex !== undefined) {
+    mlTimeSeriesExplorer.detectorIndex = detectorIndex;
+  }
+  if (entities !== undefined) {
+    mlTimeSeriesExplorer.entities = entities;
+  }
+  appState.mlTimeSeriesExplorer = mlTimeSeriesExplorer;
+
+  if (zoom) appState.zoom = zoom;
+  if (query)
+    appState.query = {
+      query_string: query,
+    };
+  url = setStateToKbnUrl<TimeSeriesExplorerGlobalState>(
+    '_g',
+    queryState,
+    { useHash: false, storeInHashQuery: false },
+    url
+  );
+  url = setStateToKbnUrl<TimeSeriesExplorerAppState>(
+    '_a',
+    appState,
+    { useHash: false, storeInHashQuery: false },
+    url
+  );
+
+  return url;
+}
diff --git a/x-pack/plugins/ml/public/ml_url_generator/common.ts b/x-pack/plugins/ml/public/ml_url_generator/common.ts
new file mode 100644
index 00000000000000..57cfc52045282b
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/common.ts
@@ -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 isEmpty from 'lodash/isEmpty';
+import { MlGenericUrlState } from '../../common/types/ml_url_generator';
+import { setStateToKbnUrl } from '../../../../../src/plugins/kibana_utils/public';
+
+export function extractParams<UrlState>(urlState: UrlState) {
+  // page should be guaranteed to exist here but <UrlState> is unknown
+  // @ts-ignore
+  const { page, ...params } = urlState;
+  return { page, params };
+}
+
+/**
+ * Creates generic index based search ML url
+ * e.g. `jobs/new_job/datavisualizer?index=3da93760-e0af-11ea-9ad3-3bcfc330e42a`
+ */
+export function createIndexBasedMlUrl(
+  appBasePath: string,
+  page: MlGenericUrlState['page'],
+  pageState: MlGenericUrlState['pageState']
+): string {
+  const { globalState, appState, index, savedSearchId, ...restParams } = pageState;
+  let url = `${appBasePath}/${page}`;
+
+  if (index !== undefined && savedSearchId === undefined) {
+    url = `${url}?index=${index}`;
+  }
+  if (index === undefined && savedSearchId !== undefined) {
+    url = `${url}?savedSearchId=${savedSearchId}`;
+  }
+
+  if (!isEmpty(restParams)) {
+    Object.keys(restParams).forEach((key) => {
+      url = setStateToKbnUrl(
+        key,
+        restParams[key],
+        { useHash: false, storeInHashQuery: false },
+        url
+      );
+    });
+  }
+
+  if (globalState) {
+    url = setStateToKbnUrl('_g', globalState, { useHash: false, storeInHashQuery: false }, url);
+  }
+  if (appState) {
+    url = setStateToKbnUrl('_a', appState, { useHash: false, storeInHashQuery: false }, url);
+  }
+  return url;
+}
diff --git a/x-pack/plugins/ml/public/ml_url_generator/data_frame_analytics_urls_generator.ts b/x-pack/plugins/ml/public/ml_url_generator/data_frame_analytics_urls_generator.ts
new file mode 100644
index 00000000000000..8cf10a2acb64f2
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/data_frame_analytics_urls_generator.ts
@@ -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.
+ */
+
+/**
+ * Creates URL to the DataFrameAnalytics page
+ */
+import {
+  DataFrameAnalyticsExplorationQueryState,
+  DataFrameAnalyticsExplorationUrlState,
+  DataFrameAnalyticsQueryState,
+  DataFrameAnalyticsUrlState,
+} from '../../common/types/ml_url_generator';
+import { ML_PAGES } from '../../common/constants/ml_url_generator';
+import { setStateToKbnUrl } from '../../../../../src/plugins/kibana_utils/public';
+
+export function createDataFrameAnalyticsJobManagementUrl(
+  appBasePath: string,
+  mlUrlGeneratorState: DataFrameAnalyticsUrlState['pageState']
+): string {
+  let url = `${appBasePath}/${ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE}`;
+
+  if (mlUrlGeneratorState) {
+    const { jobId, groupIds } = mlUrlGeneratorState;
+    const queryState: Partial<DataFrameAnalyticsQueryState> = {
+      jobId,
+      groupIds,
+    };
+
+    url = setStateToKbnUrl<Partial<DataFrameAnalyticsQueryState>>(
+      'mlManagement',
+      queryState,
+      { useHash: false, storeInHashQuery: false },
+      url
+    );
+  }
+
+  return url;
+}
+
+/**
+ * Creates URL to the DataFrameAnalytics Exploration page
+ */
+export function createDataFrameAnalyticsExplorationUrl(
+  appBasePath: string,
+  mlUrlGeneratorState: DataFrameAnalyticsExplorationUrlState['pageState']
+): string {
+  let url = `${appBasePath}/${ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION}`;
+
+  if (mlUrlGeneratorState) {
+    const { jobId, analysisType } = mlUrlGeneratorState;
+    const queryState: DataFrameAnalyticsExplorationQueryState = {
+      ml: {
+        jobId,
+        analysisType,
+      },
+    };
+
+    url = setStateToKbnUrl<DataFrameAnalyticsExplorationQueryState>(
+      '_g',
+      queryState,
+      { useHash: false, storeInHashQuery: false },
+      url
+    );
+  }
+
+  return url;
+}
diff --git a/x-pack/plugins/ml/public/ml_url_generator/data_visualizer_urls_generator.ts b/x-pack/plugins/ml/public/ml_url_generator/data_visualizer_urls_generator.ts
new file mode 100644
index 00000000000000..24693df5025d9d
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/data_visualizer_urls_generator.ts
@@ -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.
+ */
+
+/**
+ * Creates URL to the Data Visualizer page
+ */
+import { DataVisualizerUrlState, MlGenericUrlState } from '../../common/types/ml_url_generator';
+import { createIndexBasedMlUrl } from './common';
+import { ML_PAGES } from '../../common/constants/ml_url_generator';
+
+export function createDataVisualizerUrl(
+  appBasePath: string,
+  { page }: DataVisualizerUrlState
+): string {
+  return `${appBasePath}/${page}`;
+}
+
+/**
+ * Creates URL to the Index Data Visualizer
+ */
+export function createIndexDataVisualizerUrl(
+  appBasePath: string,
+  pageState: MlGenericUrlState['pageState']
+): string {
+  return createIndexBasedMlUrl(appBasePath, ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER, pageState);
+}
diff --git a/x-pack/plugins/ml/public/ml_url_generator/index.ts b/x-pack/plugins/ml/public/ml_url_generator/index.ts
new file mode 100644
index 00000000000000..1579b187278c4f
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/index.ts
@@ -0,0 +1,6 @@
+/*
+ * 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 { MlUrlGenerator, registerUrlGenerator } from './ml_url_generator';
diff --git a/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts b/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
new file mode 100644
index 00000000000000..55bc6d3668de78
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.test.ts
@@ -0,0 +1,262 @@
+/*
+ * 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 { MlUrlGenerator } from './ml_url_generator';
+import { ML_PAGES } from '../../common/constants/ml_url_generator';
+import { ANALYSIS_CONFIG_TYPE } from '../../common/types/ml_url_generator';
+
+describe('MlUrlGenerator', () => {
+  const urlGenerator = new MlUrlGenerator({
+    appBasePath: '/app/ml',
+    useHash: false,
+  });
+
+  describe('AnomalyDetection', () => {
+    describe('Job Management Page', () => {
+      it('should generate valid URL for the Anomaly Detection job management page', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE,
+        });
+        expect(url).toBe('/app/ml/jobs');
+      });
+
+      it('should generate valid URL for the Anomaly Detection job management page for job', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE,
+          pageState: {
+            jobId: 'fq_single_1',
+          },
+        });
+        expect(url).toBe('/app/ml/jobs?mlManagement=(jobId:fq_single_1)');
+      });
+
+      it('should generate valid URL for the Anomaly Detection job management page for groupIds', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE,
+          pageState: {
+            groupIds: ['farequote', 'categorization'],
+          },
+        });
+        expect(url).toBe('/app/ml/jobs?mlManagement=(groupIds:!(farequote,categorization))');
+      });
+
+      it('should generate valid URL for the page for selecting the type of anomaly detection job to create', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_SELECT_TYPE,
+          pageState: {
+            index: `3da93760-e0af-11ea-9ad3-3bcfc330e42a`,
+            globalState: {
+              time: {
+                from: 'now-30m',
+                to: 'now',
+              },
+            },
+          },
+        });
+        expect(url).toBe(
+          '/app/ml/jobs/new_job/step/job_type?index=3da93760-e0af-11ea-9ad3-3bcfc330e42a&_g=(time:(from:now-30m,to:now))'
+        );
+      });
+    });
+
+    describe('Anomaly Explorer Page', () => {
+      it('should generate valid URL for the Anomaly Explorer page', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.ANOMALY_EXPLORER,
+          pageState: {
+            jobIds: ['fq_single_1'],
+            mlExplorerSwimlane: { viewByFromPage: 2, viewByPerPage: 20 },
+            refreshInterval: {
+              pause: false,
+              value: 0,
+            },
+            timeRange: {
+              from: '2019-02-07T00:00:00.000Z',
+              to: '2020-08-13T17:15:00.000Z',
+              mode: 'absolute',
+            },
+            query: {
+              analyze_wildcard: true,
+              query: '*',
+            },
+          },
+        });
+        expect(url).toBe(
+          "/app/ml/explorer?_g=(ml:(jobIds:!(fq_single_1)),refreshInterval:(pause:!f,value:0),time:(from:'2019-02-07T00:00:00.000Z',mode:absolute,to:'2020-08-13T17:15:00.000Z'))&_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFromPage:2,viewByPerPage:20),query:(analyze_wildcard:!t,query:'*'))"
+        );
+      });
+      it('should generate valid URL for the Anomaly Explorer page for multiple jobIds', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.ANOMALY_EXPLORER,
+          pageState: {
+            jobIds: ['fq_single_1', 'logs_categorization_1'],
+            timeRange: {
+              from: '2019-02-07T00:00:00.000Z',
+              to: '2020-08-13T17:15:00.000Z',
+              mode: 'absolute',
+            },
+          },
+        });
+        expect(url).toBe(
+          "/app/ml/explorer?_g=(ml:(jobIds:!(fq_single_1,logs_categorization_1)),time:(from:'2019-02-07T00:00:00.000Z',mode:absolute,to:'2020-08-13T17:15:00.000Z'))&_a=(mlExplorerFilter:(),mlExplorerSwimlane:())"
+        );
+      });
+    });
+
+    describe('Single Metric Viewer Page', () => {
+      it('should generate valid URL for the Single Metric Viewer page', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.SINGLE_METRIC_VIEWER,
+          pageState: {
+            jobIds: ['logs_categorization_1'],
+            refreshInterval: {
+              pause: false,
+              value: 0,
+            },
+            timeRange: {
+              from: '2020-07-12T00:39:02.912Z',
+              to: '2020-07-22T15:52:18.613Z',
+              mode: 'absolute',
+            },
+            query: {
+              analyze_wildcard: true,
+              query: '*',
+            },
+          },
+        });
+        expect(url).toBe(
+          "/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(logs_categorization_1)),refreshInterval:(pause:!f,value:0),time:(from:'2020-07-12T00:39:02.912Z',mode:absolute,to:'2020-07-22T15:52:18.613Z'))&_a=(mlTimeSeriesExplorer:(),query:(query_string:(analyze_wildcard:!t,query:'*')))"
+        );
+      });
+
+      it('should generate valid URL for the Single Metric Viewer page with extra settings', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.SINGLE_METRIC_VIEWER,
+          pageState: {
+            jobIds: ['logs_categorization_1'],
+            detectorIndex: 0,
+            entities: { mlcategory: '2' },
+            refreshInterval: {
+              pause: false,
+              value: 0,
+            },
+            timeRange: {
+              from: '2020-07-12T00:39:02.912Z',
+              to: '2020-07-22T15:52:18.613Z',
+              mode: 'absolute',
+            },
+            zoom: {
+              from: '2020-07-20T23:58:29.367Z',
+              to: '2020-07-21T11:00:13.173Z',
+            },
+            query: {
+              analyze_wildcard: true,
+              query: '*',
+            },
+          },
+        });
+        expect(url).toBe(
+          "/app/ml/timeseriesexplorer?_g=(ml:(jobIds:!(logs_categorization_1)),refreshInterval:(pause:!f,value:0),time:(from:'2020-07-12T00:39:02.912Z',mode:absolute,to:'2020-07-22T15:52:18.613Z'))&_a=(mlTimeSeriesExplorer:(detectorIndex:0,entities:(mlcategory:'2')),query:(query_string:(analyze_wildcard:!t,query:'*')),zoom:(from:'2020-07-20T23:58:29.367Z',to:'2020-07-21T11:00:13.173Z'))"
+        );
+      });
+    });
+  });
+
+  describe('DataFrameAnalytics', () => {
+    describe('JobManagement Page', () => {
+      it('should generate valid URL for the Data Frame Analytics job management page', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE,
+        });
+        expect(url).toBe('/app/ml/data_frame_analytics');
+      });
+      it('should generate valid URL for the Data Frame Analytics job management page with jobId', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE,
+          pageState: {
+            jobId: 'grid_regression_1',
+          },
+        });
+        expect(url).toBe('/app/ml/data_frame_analytics?mlManagement=(jobId:grid_regression_1)');
+      });
+
+      it('should generate valid URL for the Data Frame Analytics job management page with groupIds', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE,
+          pageState: {
+            groupIds: ['group_1', 'group_2'],
+          },
+        });
+        expect(url).toBe('/app/ml/data_frame_analytics?mlManagement=(groupIds:!(group_1,group_2))');
+      });
+    });
+
+    describe('ExplorationPage', () => {
+      it('should generate valid URL for the Data Frame Analytics exploration page for job', async () => {
+        const url = await urlGenerator.createUrl({
+          page: ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION,
+          pageState: {
+            jobId: 'grid_regression_1',
+            analysisType: ANALYSIS_CONFIG_TYPE.REGRESSION,
+          },
+        });
+        expect(url).toBe(
+          '/app/ml/data_frame_analytics/exploration?_g=(ml:(analysisType:regression,jobId:grid_regression_1))'
+        );
+      });
+    });
+  });
+
+  describe('DataVisualizer', () => {
+    it('should generate valid URL for the Data Visualizer page', async () => {
+      const url = await urlGenerator.createUrl({
+        page: ML_PAGES.DATA_VISUALIZER,
+      });
+      expect(url).toBe('/app/ml/datavisualizer');
+    });
+
+    it('should generate valid URL for the File Data Visualizer import page', async () => {
+      const url = await urlGenerator.createUrl({
+        page: ML_PAGES.DATA_VISUALIZER_FILE,
+      });
+      expect(url).toBe('/app/ml/filedatavisualizer');
+    });
+
+    it('should generate valid URL for the Index Data Visualizer select index pattern or saved search page', async () => {
+      const url = await urlGenerator.createUrl({
+        page: ML_PAGES.DATA_VISUALIZER_INDEX_SELECT,
+      });
+      expect(url).toBe('/app/ml/datavisualizer_index_select');
+    });
+
+    it('should generate valid URL for the Index Data Visualizer Viewer page', async () => {
+      const url = await urlGenerator.createUrl({
+        page: ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER,
+        pageState: {
+          index: '3da93760-e0af-11ea-9ad3-3bcfc330e42a',
+          globalState: {
+            time: {
+              from: 'now-30m',
+              to: 'now',
+            },
+          },
+        },
+      });
+      expect(url).toBe(
+        '/app/ml/jobs/new_job/datavisualizer?index=3da93760-e0af-11ea-9ad3-3bcfc330e42a&_g=(time:(from:now-30m,to:now))'
+      );
+    });
+  });
+
+  it('should throw an error in case the page is not provided', async () => {
+    expect.assertions(1);
+
+    // @ts-ignore
+    await urlGenerator.createUrl({ jobIds: ['test-job'] }).catch((e) => {
+      expect(e.message).toEqual('Page type is not provided or unknown');
+    });
+  });
+});
diff --git a/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.ts b/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.ts
new file mode 100644
index 00000000000000..b69260d8d4157b
--- /dev/null
+++ b/x-pack/plugins/ml/public/ml_url_generator/ml_url_generator.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 { CoreSetup } from 'kibana/public';
+import {
+  SharePluginSetup,
+  UrlGeneratorsDefinition,
+  UrlGeneratorState,
+} from '../../../../../src/plugins/share/public';
+import { MlStartDependencies } from '../plugin';
+import { ML_PAGES, ML_APP_URL_GENERATOR } from '../../common/constants/ml_url_generator';
+import { MlUrlGeneratorState } from '../../common/types/ml_url_generator';
+import {
+  createAnomalyDetectionJobManagementUrl,
+  createAnomalyDetectionCreateJobSelectType,
+  createExplorerUrl,
+  createSingleMetricViewerUrl,
+} from './anomaly_detection_urls_generator';
+import {
+  createDataFrameAnalyticsJobManagementUrl,
+  createDataFrameAnalyticsExplorationUrl,
+} from './data_frame_analytics_urls_generator';
+import {
+  createIndexDataVisualizerUrl,
+  createDataVisualizerUrl,
+} from './data_visualizer_urls_generator';
+
+declare module '../../../../../src/plugins/share/public' {
+  export interface UrlGeneratorStateMapping {
+    [ML_APP_URL_GENERATOR]: UrlGeneratorState<MlUrlGeneratorState>;
+  }
+}
+
+interface Params {
+  appBasePath: string;
+  useHash: boolean;
+}
+
+export class MlUrlGenerator implements UrlGeneratorsDefinition<typeof ML_APP_URL_GENERATOR> {
+  constructor(private readonly params: Params) {}
+
+  public readonly id = ML_APP_URL_GENERATOR;
+
+  public readonly createUrl = async (mlUrlGeneratorState: MlUrlGeneratorState): Promise<string> => {
+    const appBasePath = this.params.appBasePath;
+    switch (mlUrlGeneratorState.page) {
+      case ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE:
+        return createAnomalyDetectionJobManagementUrl(appBasePath, mlUrlGeneratorState.pageState);
+      case ML_PAGES.ANOMALY_EXPLORER:
+        return createExplorerUrl(appBasePath, mlUrlGeneratorState.pageState);
+      case ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_SELECT_TYPE:
+        return createAnomalyDetectionCreateJobSelectType(
+          appBasePath,
+          mlUrlGeneratorState.pageState
+        );
+      case ML_PAGES.SINGLE_METRIC_VIEWER:
+        return createSingleMetricViewerUrl(appBasePath, mlUrlGeneratorState.pageState);
+      case ML_PAGES.DATA_FRAME_ANALYTICS_JOBS_MANAGE:
+        return createDataFrameAnalyticsJobManagementUrl(appBasePath, mlUrlGeneratorState.pageState);
+      case ML_PAGES.DATA_FRAME_ANALYTICS_EXPLORATION:
+        return createDataFrameAnalyticsExplorationUrl(appBasePath, mlUrlGeneratorState.pageState);
+      case ML_PAGES.DATA_VISUALIZER:
+      case ML_PAGES.DATA_VISUALIZER_FILE:
+      case ML_PAGES.DATA_VISUALIZER_INDEX_SELECT:
+        return createDataVisualizerUrl(appBasePath, mlUrlGeneratorState);
+      case ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER:
+        return createIndexDataVisualizerUrl(appBasePath, mlUrlGeneratorState.pageState);
+      default:
+        throw new Error('Page type is not provided or unknown');
+    }
+  };
+}
+
+/**
+ * Registers the URL generator
+ */
+export function registerUrlGenerator(
+  share: SharePluginSetup,
+  core: CoreSetup<MlStartDependencies>
+) {
+  const baseUrl = core.http.basePath.prepend('/app/ml');
+  share.urlGenerators.registerUrlGenerator(
+    new MlUrlGenerator({
+      appBasePath: baseUrl,
+      useHash: core.uiSettings.get('state:storeInSessionStorage'),
+    })
+  );
+}
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 214b393a0fda92..3e8ab99e341ad5 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -34,7 +34,7 @@ import { registerFeature } from './register_feature';
 import { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import { registerMlUiActions } from './ui_actions';
 import { KibanaLegacyStart } from '../../../../src/plugins/kibana_legacy/public';
-import { registerUrlGenerator } from './url_generator';
+import { registerUrlGenerator } from './ml_url_generator';
 import { isFullLicense, isMlEnabled } from '../common/license';
 import { registerEmbeddables } from './embeddables';
 
diff --git a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
index e327befcf72938..e4d7cfa32c2cd5 100644
--- a/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
+++ b/x-pack/plugins/ml/public/ui_actions/open_in_anomaly_explorer_action.tsx
@@ -7,7 +7,7 @@
 import { i18n } from '@kbn/i18n';
 import { ActionContextMapping, createAction } from '../../../../../src/plugins/ui_actions/public';
 import { MlCoreSetup } from '../plugin';
-import { ML_APP_URL_GENERATOR } from '../url_generator';
+import { ML_APP_URL_GENERATOR } from '../../common/constants/ml_url_generator';
 import { ANOMALY_SWIMLANE_EMBEDDABLE_TYPE, SwimLaneDrilldownContext } from '../embeddables';
 
 export const OPEN_IN_ANOMALY_EXPLORER_ACTION = 'openInAnomalyExplorerAction';
@@ -32,19 +32,21 @@ export function createOpenInExplorerAction(getStartServices: MlCoreSetup['getSta
 
       return urlGenerator.createUrl({
         page: 'explorer',
-        jobIds,
-        timeRange,
-        mlExplorerSwimlane: {
-          viewByFromPage: fromPage,
-          viewByPerPage: perPage,
-          viewByFieldName: viewBy,
-          ...(data
-            ? {
-                selectedType: data.type,
-                selectedTimes: data.times,
-                selectedLanes: data.lanes,
-              }
-            : {}),
+        pageState: {
+          jobIds,
+          timeRange,
+          mlExplorerSwimlane: {
+            viewByFromPage: fromPage,
+            viewByPerPage: perPage,
+            viewByFieldName: viewBy,
+            ...(data
+              ? {
+                  selectedType: data.type,
+                  selectedTimes: data.times,
+                  selectedLanes: data.lanes,
+                }
+              : {}),
+          },
         },
       });
     },
diff --git a/x-pack/plugins/ml/public/url_generator.test.ts b/x-pack/plugins/ml/public/url_generator.test.ts
deleted file mode 100644
index 21dde124049577..00000000000000
--- a/x-pack/plugins/ml/public/url_generator.test.ts
+++ /dev/null
@@ -1,34 +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 { MlUrlGenerator } from './url_generator';
-
-describe('MlUrlGenerator', () => {
-  const urlGenerator = new MlUrlGenerator({
-    appBasePath: '/app/ml',
-    useHash: false,
-  });
-
-  it('should generate valid URL for the Anomaly Explorer page', async () => {
-    const url = await urlGenerator.createUrl({
-      page: 'explorer',
-      jobIds: ['test-job'],
-      mlExplorerSwimlane: { viewByFromPage: 2, viewByPerPage: 20 },
-    });
-    expect(url).toBe(
-      '/app/ml/explorer#?_g=(ml:(jobIds:!(test-job)))&_a=(mlExplorerFilter:(),mlExplorerSwimlane:(viewByFromPage:2,viewByPerPage:20))'
-    );
-  });
-
-  it('should throw an error in case the page is not provided', async () => {
-    expect.assertions(1);
-
-    // @ts-ignore
-    await urlGenerator.createUrl({ jobIds: ['test-job'] }).catch((e) => {
-      expect(e.message).toEqual('Page type is not provided or unknown');
-    });
-  });
-});
diff --git a/x-pack/plugins/ml/public/url_generator.ts b/x-pack/plugins/ml/public/url_generator.ts
deleted file mode 100644
index 4e08c57c0b2e0b..00000000000000
--- a/x-pack/plugins/ml/public/url_generator.ts
+++ /dev/null
@@ -1,118 +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 { CoreSetup } from 'kibana/public';
-import {
-  SharePluginSetup,
-  UrlGeneratorsDefinition,
-  UrlGeneratorState,
-} from '../../../../src/plugins/share/public';
-import { TimeRange } from '../../../../src/plugins/data/public';
-import { setStateToKbnUrl } from '../../../../src/plugins/kibana_utils/public';
-import { JobId } from '../../reporting/common/types';
-import { ExplorerAppState } from './application/explorer/explorer_dashboard_service';
-import { MlStartDependencies } from './plugin';
-
-declare module '../../../../src/plugins/share/public' {
-  export interface UrlGeneratorStateMapping {
-    [ML_APP_URL_GENERATOR]: UrlGeneratorState<MlUrlGeneratorState>;
-  }
-}
-
-export const ML_APP_URL_GENERATOR = 'ML_APP_URL_GENERATOR';
-
-export interface ExplorerUrlState {
-  /**
-   * ML App Page
-   */
-  page: 'explorer';
-  /**
-   * Job IDs
-   */
-  jobIds: JobId[];
-  /**
-   * Optionally set the time range in the time picker.
-   */
-  timeRange?: TimeRange;
-  /**
-   * Optional state for the swim lane
-   */
-  mlExplorerSwimlane?: ExplorerAppState['mlExplorerSwimlane'];
-  mlExplorerFilter?: ExplorerAppState['mlExplorerFilter'];
-}
-
-/**
- * Union type of ML URL state based on page
- */
-export type MlUrlGeneratorState = ExplorerUrlState;
-
-export interface ExplorerQueryState {
-  ml: { jobIds: JobId[] };
-  time?: TimeRange;
-}
-
-interface Params {
-  appBasePath: string;
-  useHash: boolean;
-}
-
-export class MlUrlGenerator implements UrlGeneratorsDefinition<typeof ML_APP_URL_GENERATOR> {
-  constructor(private readonly params: Params) {}
-
-  public readonly id = ML_APP_URL_GENERATOR;
-
-  public readonly createUrl = async ({ page, ...params }: MlUrlGeneratorState): Promise<string> => {
-    if (page === 'explorer') {
-      return this.createExplorerUrl(params);
-    }
-    throw new Error('Page type is not provided or unknown');
-  };
-
-  /**
-   * Creates URL to the Anomaly Explorer page
-   */
-  private createExplorerUrl({
-    timeRange,
-    jobIds,
-    mlExplorerSwimlane = {},
-    mlExplorerFilter = {},
-  }: Omit<ExplorerUrlState, 'page'>): string {
-    const appState: ExplorerAppState = {
-      mlExplorerSwimlane,
-      mlExplorerFilter,
-    };
-
-    const queryState: ExplorerQueryState = {
-      ml: {
-        jobIds,
-      },
-    };
-
-    if (timeRange) queryState.time = timeRange;
-
-    let url = `${this.params.appBasePath}/explorer`;
-    url = setStateToKbnUrl<ExplorerQueryState>('_g', queryState, { useHash: false }, url);
-    url = setStateToKbnUrl('_a', appState, { useHash: false }, url);
-
-    return url;
-  }
-}
-
-/**
- * Registers the URL generator
- */
-export function registerUrlGenerator(
-  share: SharePluginSetup,
-  core: CoreSetup<MlStartDependencies>
-) {
-  const baseUrl = core.http.basePath.prepend('/app/ml');
-  share.urlGenerators.registerUrlGenerator(
-    new MlUrlGenerator({
-      appBasePath: baseUrl,
-      useHash: core.uiSettings.get('state:storeInSessionStorage'),
-    })
-  );
-}
diff --git a/x-pack/plugins/ml/server/lib/sample_data_sets/sample_data_sets.ts b/x-pack/plugins/ml/server/lib/sample_data_sets/sample_data_sets.ts
index 902cc907a0eff1..28f12ead7924ba 100644
--- a/x-pack/plugins/ml/server/lib/sample_data_sets/sample_data_sets.ts
+++ b/x-pack/plugins/ml/server/lib/sample_data_sets/sample_data_sets.ts
@@ -18,7 +18,7 @@ export function initSampleDataSets(mlLicense: MlLicense, plugins: PluginsSetup)
     addAppLinksToSampleDataset('ecommerce', [
       {
         path:
-          '/app/ml#/modules/check_view_or_create?id=sample_data_ecommerce&index=ff959d40-b880-11e8-a6d9-e546fe2bba5f',
+          '/app/ml/modules/check_view_or_create?id=sample_data_ecommerce&index=ff959d40-b880-11e8-a6d9-e546fe2bba5f',
         label: sampleDataLinkLabel,
         icon: 'machineLearningApp',
       },
@@ -27,7 +27,7 @@ export function initSampleDataSets(mlLicense: MlLicense, plugins: PluginsSetup)
     addAppLinksToSampleDataset('logs', [
       {
         path:
-          '/app/ml#/modules/check_view_or_create?id=sample_data_weblogs&index=90943e30-9a47-11e8-b64d-95841ca0b247',
+          '/app/ml/modules/check_view_or_create?id=sample_data_weblogs&index=90943e30-9a47-11e8-b64d-95841ca0b247',
         label: sampleDataLinkLabel,
         icon: 'machineLearningApp',
       },

From c46e77712ae6ae0ae563d0ebc9b6ca53ef2bccbd Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Wed, 2 Sep 2020 16:44:42 -0400
Subject: [PATCH 194/216] [Security Solution][Exceptions] - Adds sort order for
 exception items (#76537)

## Summary

**Components affected:** ExceptionsViewer

**Current behavior:**
  - when a user edits an exception item, the order of the exception items in the viewer changes. This creates confusion and looks like updates weren't applied (even though they were, just item order changed)

**New behavior:**
  - when a user edits an exception item, the order of the exception items in the viewer don't change. Sort order is now based on `created_at`
---
 x-pack/plugins/lists/public/exceptions/api.test.ts | 10 ++++++++++
 x-pack/plugins/lists/public/exceptions/api.ts      |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/x-pack/plugins/lists/public/exceptions/api.test.ts b/x-pack/plugins/lists/public/exceptions/api.test.ts
index 7e79b212f69cb8..b02a82f98af91e 100644
--- a/x-pack/plugins/lists/public/exceptions/api.test.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.test.ts
@@ -375,6 +375,8 @@ describe('Exceptions Lists API', () => {
           namespace_type: 'single,single',
           page: '1',
           per_page: '20',
+          sort_field: 'created_at',
+          sort_order: 'desc',
         },
         signal: abortCtrl.signal,
       });
@@ -406,6 +408,8 @@ describe('Exceptions Lists API', () => {
           namespace_type: 'single',
           page: '1',
           per_page: '20',
+          sort_field: 'created_at',
+          sort_order: 'desc',
         },
         signal: abortCtrl.signal,
       });
@@ -437,6 +441,8 @@ describe('Exceptions Lists API', () => {
           namespace_type: 'agnostic',
           page: '1',
           per_page: '20',
+          sort_field: 'created_at',
+          sort_order: 'desc',
         },
         signal: abortCtrl.signal,
       });
@@ -468,6 +474,8 @@ describe('Exceptions Lists API', () => {
           namespace_type: 'agnostic',
           page: '1',
           per_page: '20',
+          sort_field: 'created_at',
+          sort_order: 'desc',
         },
         signal: abortCtrl.signal,
       });
@@ -500,6 +508,8 @@ describe('Exceptions Lists API', () => {
           namespace_type: 'agnostic',
           page: '1',
           per_page: '20',
+          sort_field: 'created_at',
+          sort_order: 'desc',
         },
         signal: abortCtrl.signal,
       });
diff --git a/x-pack/plugins/lists/public/exceptions/api.ts b/x-pack/plugins/lists/public/exceptions/api.ts
index 203c84b2943fd5..3f5ec803205035 100644
--- a/x-pack/plugins/lists/public/exceptions/api.ts
+++ b/x-pack/plugins/lists/public/exceptions/api.ts
@@ -288,6 +288,8 @@ export const fetchExceptionListsItemsByListIds = async ({
     namespace_type: namespaceTypes.join(','),
     page: pagination.page ? `${pagination.page}` : '1',
     per_page: pagination.perPage ? `${pagination.perPage}` : '20',
+    sort_field: 'created_at',
+    sort_order: 'desc',
     ...(filters.trim() !== '' ? { filter: filters } : {}),
   };
   const [validatedRequest, errorsRequest] = validate(query, findExceptionListItemSchema);

From 5467f3164034784f10e60c084dbcc856ec0b4b36 Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Wed, 2 Sep 2020 16:00:23 -0500
Subject: [PATCH 195/216] Remove dependencies from index pattern field and
 index pattern list (#75185)

* Remove dependencies from index pattern field and index pattern list
---
 ...ins-data-public.fieldlist._constructor_.md |  23 ---
 ...lugin-plugins-data-public.fieldlist.add.md |  11 -
 ...in-plugins-data-public.fieldlist.getall.md |  11 -
 ...plugins-data-public.fieldlist.getbyname.md |  11 -
 ...plugins-data-public.fieldlist.getbytype.md |  11 -
 ...na-plugin-plugins-data-public.fieldlist.md |  27 +--
 ...in-plugins-data-public.fieldlist.remove.md |  11 -
 ...plugins-data-public.fieldlist.removeall.md |  11 -
 ...lugins-data-public.fieldlist.replaceall.md |  11 -
 ...in-plugins-data-public.fieldlist.tospec.md |  25 ---
 ...in-plugins-data-public.fieldlist.update.md |  11 -
 ...a-plugin-plugins-data-public.ifieldtype.md |   2 +-
 ...n-plugins-data-public.ifieldtype.tospec.md |   4 +-
 ...gins-data-public.iindexpatternfieldlist.md |   1 +
 ...ta-public.iindexpatternfieldlist.tospec.md |  24 +++
 ...-public.indexpatternfield._constructor_.md |   4 +-
 ...ns-data-public.indexpatternfield.format.md |  11 -
 ...a-public.indexpatternfield.indexpattern.md |  11 -
 ...n-plugins-data-public.indexpatternfield.md |   6 +-
 ...ns-data-public.indexpatternfield.tospec.md |  21 +-
 .../kibana-plugin-plugins-data-public.md      |   2 +-
 ...a-plugin-plugins-data-server.ifieldtype.md |   2 +-
 ...n-plugins-data-server.ifieldtype.tospec.md |   4 +-
 src/core/public/public.api.md                 |   3 +
 src/core/server/server.api.md                 |   3 +
 .../es_query/filters/get_display_value.ts     |  30 ++-
 .../common/field_formats/converters/source.ts |   4 +-
 .../field_formats/field_formats_registry.ts   |   6 +-
 .../data/common/field_formats/types.ts        |   1 +
 .../data/common/index_patterns/errors.ts      |  29 +++
 .../index_pattern_field.test.ts.snap          |   8 +-
 .../index_patterns/fields/field_list.ts       | 143 +++++++------
 .../fields/index_pattern_field.test.ts        |  46 ++---
 .../fields/index_pattern_field.ts             |  39 ++--
 .../common/index_patterns/fields/types.ts     |   4 +-
 .../data/common/index_patterns/index.ts       |   2 +
 .../__snapshots__/index_pattern.test.ts.snap  | 189 +++++++++++++++---
 .../index_patterns/format_hit.ts              |   4 +-
 .../index_patterns/index_pattern.test.ts      |  12 +-
 .../index_patterns/index_pattern.ts           |  86 ++++++--
 .../index_patterns/index_patterns.ts          |  10 -
 .../common/search/aggs/agg_config.test.ts     |   6 +-
 .../data/common/search/aggs/agg_type.test.ts  |   3 +
 .../data/common/search/aggs/agg_type.ts       |   4 +-
 .../buckets/_terms_other_bucket_helper.ts     |   8 +-
 .../buckets/create_filter/histogram.test.ts   |   1 +
 .../aggs/buckets/create_filter/range.test.ts  |   2 +-
 .../aggs/buckets/create_filter/terms.ts       |   2 +-
 .../common/search/aggs/buckets/date_range.ts  |   4 +-
 .../common/search/aggs/buckets/ip_range.ts    |   4 +-
 .../common/search/aggs/buckets/range.test.ts  |  13 +-
 .../data/common/search/aggs/buckets/range.ts  |   4 +-
 .../data/common/search/aggs/buckets/terms.ts  |   4 +-
 .../aggs/metrics/parent_pipeline.test.ts      |   6 +-
 .../aggs/metrics/sibling_pipeline.test.ts     |   3 +
 .../create_filters_from_value_click.test.ts   |   6 +-
 src/plugins/data/public/index.ts              |   2 +-
 src/plugins/data/public/public.api.md         |  64 ++----
 .../search/expressions/create_filter.test.ts  |   1 +
 src/plugins/data/server/server.api.md         |   5 +-
 .../sidebar/discover_field.test.tsx           |   4 +-
 .../components/sidebar/discover_sidebar.tsx   |   4 +-
 .../sidebar/lib/field_calculator.js           |   6 +-
 .../sidebar/lib/field_calculator.test.ts      |  12 +-
 .../components/sidebar/lib/get_details.ts     |   8 +-
 .../lib/get_index_pattern_field_list.ts       |   1 +
 .../indexed_fields_table.test.tsx.snap        |  19 +-
 .../indexed_fields_table.test.tsx             |   8 +-
 .../indexed_fields_table.tsx                  |   1 -
 .../edit_index_pattern/tabs/tabs.tsx          |   4 +-
 .../edit_index_pattern/tabs/utils.ts          |   4 +-
 .../field_editor/field_editor.test.tsx        |   6 +-
 .../public/control/control.ts                 |   5 +-
 src/test_utils/public/stub_index_pattern.js   |   4 +-
 .../classes/sources/es_source/es_source.js    |   2 +-
 .../classes/tooltips/es_tooltip_property.ts   |   9 +-
 .../services/field_format_service.ts          |   6 +-
 .../rules/description_step/helpers.test.tsx   |   6 +-
 78 files changed, 578 insertions(+), 547 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getall.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
 create mode 100644 src/plugins/data/common/index_patterns/errors.ts

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
deleted file mode 100644
index 9f9613a5a68f7c..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist._constructor_.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [(constructor)](./kibana-plugin-plugins-data-public.fieldlist._constructor_.md)
-
-## FieldList.(constructor)
-
-Constructs a new instance of the `FieldList` class
-
-<b>Signature:</b>
-
-```typescript
-constructor(indexPattern: IndexPattern, specs?: FieldSpec[], shortDotsEnable?: boolean, onNotification?: OnNotification);
-```
-
-## Parameters
-
-|  Parameter | Type | Description |
-|  --- | --- | --- |
-|  indexPattern | <code>IndexPattern</code> |  |
-|  specs | <code>FieldSpec[]</code> |  |
-|  shortDotsEnable | <code>boolean</code> |  |
-|  onNotification | <code>OnNotification</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md
deleted file mode 100644
index ae3d82f0cc3ea1..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.add.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [add](./kibana-plugin-plugins-data-public.fieldlist.add.md)
-
-## FieldList.add property
-
-<b>Signature:</b>
-
-```typescript
-readonly add: (field: FieldSpec) => void;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getall.md
deleted file mode 100644
index da29a4de9acc8f..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getall.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [getAll](./kibana-plugin-plugins-data-public.fieldlist.getall.md)
-
-## FieldList.getAll property
-
-<b>Signature:</b>
-
-```typescript
-readonly getAll: () => IndexPatternField[];
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md
deleted file mode 100644
index af368d003423a5..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbyname.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [getByName](./kibana-plugin-plugins-data-public.fieldlist.getbyname.md)
-
-## FieldList.getByName property
-
-<b>Signature:</b>
-
-```typescript
-readonly getByName: (name: IndexPatternField['name']) => IndexPatternField | undefined;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md
deleted file mode 100644
index 16bae3ee7c555c..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.getbytype.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [getByType](./kibana-plugin-plugins-data-public.fieldlist.getbytype.md)
-
-## FieldList.getByType property
-
-<b>Signature:</b>
-
-```typescript
-readonly getByType: (type: IndexPatternField['type']) => any[];
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md
index 012b0694302903..79bcaf9700cf02 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.md
@@ -1,32 +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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [fieldList](./kibana-plugin-plugins-data-public.fieldlist.md)
 
-## FieldList class
+## fieldList variable
 
 <b>Signature:</b>
 
 ```typescript
-export declare class FieldList extends Array<IndexPatternField> implements IIndexPatternFieldList 
+fieldList: (specs?: FieldSpec[], shortDotsEnable?: boolean) => IIndexPatternFieldList
 ```
-
-## Constructors
-
-|  Constructor | Modifiers | Description |
-|  --- | --- | --- |
-|  [(constructor)(indexPattern, specs, shortDotsEnable, onNotification)](./kibana-plugin-plugins-data-public.fieldlist._constructor_.md) |  | Constructs a new instance of the <code>FieldList</code> class |
-
-## Properties
-
-|  Property | Modifiers | Type | Description |
-|  --- | --- | --- | --- |
-|  [add](./kibana-plugin-plugins-data-public.fieldlist.add.md) |  | <code>(field: FieldSpec) =&gt; void</code> |  |
-|  [getAll](./kibana-plugin-plugins-data-public.fieldlist.getall.md) |  | <code>() =&gt; IndexPatternField[]</code> |  |
-|  [getByName](./kibana-plugin-plugins-data-public.fieldlist.getbyname.md) |  | <code>(name: IndexPatternField['name']) =&gt; IndexPatternField &#124; undefined</code> |  |
-|  [getByType](./kibana-plugin-plugins-data-public.fieldlist.getbytype.md) |  | <code>(type: IndexPatternField['type']) =&gt; any[]</code> |  |
-|  [remove](./kibana-plugin-plugins-data-public.fieldlist.remove.md) |  | <code>(field: IFieldType) =&gt; void</code> |  |
-|  [removeAll](./kibana-plugin-plugins-data-public.fieldlist.removeall.md) |  | <code>() =&gt; void</code> |  |
-|  [replaceAll](./kibana-plugin-plugins-data-public.fieldlist.replaceall.md) |  | <code>(specs: FieldSpec[]) =&gt; void</code> |  |
-|  [toSpec](./kibana-plugin-plugins-data-public.fieldlist.tospec.md) |  | <code>() =&gt; {</code><br/><code>        count: number;</code><br/><code>        script: string &#124; undefined;</code><br/><code>        lang: string &#124; undefined;</code><br/><code>        conflictDescriptions: Record&lt;string, string[]&gt; &#124; undefined;</code><br/><code>        name: string;</code><br/><code>        type: string;</code><br/><code>        esTypes: string[] &#124; undefined;</code><br/><code>        scripted: boolean;</code><br/><code>        searchable: boolean;</code><br/><code>        aggregatable: boolean;</code><br/><code>        readFromDocValues: boolean;</code><br/><code>        subType: import(&quot;../types&quot;).IFieldSubType &#124; undefined;</code><br/><code>        format: any;</code><br/><code>    }[]</code> |  |
-|  [update](./kibana-plugin-plugins-data-public.fieldlist.update.md) |  | <code>(field: FieldSpec) =&gt; void</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md
deleted file mode 100644
index 149410adb3550a..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.remove.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [remove](./kibana-plugin-plugins-data-public.fieldlist.remove.md)
-
-## FieldList.remove property
-
-<b>Signature:</b>
-
-```typescript
-readonly remove: (field: IFieldType) => void;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md
deleted file mode 100644
index 92a45349ad0051..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.removeall.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [removeAll](./kibana-plugin-plugins-data-public.fieldlist.removeall.md)
-
-## FieldList.removeAll property
-
-<b>Signature:</b>
-
-```typescript
-readonly removeAll: () => void;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md
deleted file mode 100644
index 5330440e6b96a1..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.replaceall.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [replaceAll](./kibana-plugin-plugins-data-public.fieldlist.replaceall.md)
-
-## FieldList.replaceAll property
-
-<b>Signature:</b>
-
-```typescript
-readonly replaceAll: (specs: FieldSpec[]) => void;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md
deleted file mode 100644
index e646339feb4955..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.tospec.md
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [toSpec](./kibana-plugin-plugins-data-public.fieldlist.tospec.md)
-
-## FieldList.toSpec property
-
-<b>Signature:</b>
-
-```typescript
-readonly toSpec: () => {
-        count: number;
-        script: string | undefined;
-        lang: string | undefined;
-        conflictDescriptions: Record<string, string[]> | undefined;
-        name: string;
-        type: string;
-        esTypes: string[] | undefined;
-        scripted: boolean;
-        searchable: boolean;
-        aggregatable: boolean;
-        readFromDocValues: boolean;
-        subType: import("../types").IFieldSubType | undefined;
-        format: any;
-    }[];
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md
deleted file mode 100644
index c718e47b31b50a..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fieldlist.update.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) &gt; [update](./kibana-plugin-plugins-data-public.fieldlist.update.md)
-
-## FieldList.update property
-
-<b>Signature:</b>
-
-```typescript
-readonly update: (field: FieldSpec) => void;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
index 6f42fb32fdb7be..3ff2afafcc5145 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
@@ -28,7 +28,7 @@ export interface IFieldType
 |  [searchable](./kibana-plugin-plugins-data-public.ifieldtype.searchable.md) | <code>boolean</code> |  |
 |  [sortable](./kibana-plugin-plugins-data-public.ifieldtype.sortable.md) | <code>boolean</code> |  |
 |  [subType](./kibana-plugin-plugins-data-public.ifieldtype.subtype.md) | <code>IFieldSubType</code> |  |
-|  [toSpec](./kibana-plugin-plugins-data-public.ifieldtype.tospec.md) | <code>() =&gt; FieldSpec</code> |  |
+|  [toSpec](./kibana-plugin-plugins-data-public.ifieldtype.tospec.md) | <code>(options?: {</code><br/><code>        getFormatterForField?: IndexPattern['getFormatterForField'];</code><br/><code>    }) =&gt; FieldSpec</code> |  |
 |  [type](./kibana-plugin-plugins-data-public.ifieldtype.type.md) | <code>string</code> |  |
 |  [visualizable](./kibana-plugin-plugins-data-public.ifieldtype.visualizable.md) | <code>boolean</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.tospec.md
index 1fb4084c25d343..52238ea2a00ca4 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.tospec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.tospec.md
@@ -7,5 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-toSpec?: () => FieldSpec;
+toSpec?: (options?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }) => FieldSpec;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md
index b068c4804c0ddd..b1e13ffaabd077 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.md
@@ -21,5 +21,6 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField>
 |  [remove(field)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.remove.md) |  |
 |  [removeAll()](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.removeall.md) |  |
 |  [replaceAll(specs)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.replaceall.md) |  |
+|  [toSpec(options)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md) |  |
 |  [update(field)](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.update.md) |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md
new file mode 100644
index 00000000000000..fd20f2944c5be3
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IIndexPatternFieldList](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.md) &gt; [toSpec](./kibana-plugin-plugins-data-public.iindexpatternfieldlist.tospec.md)
+
+## IIndexPatternFieldList.toSpec() method
+
+<b>Signature:</b>
+
+```typescript
+toSpec(options?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }): FieldSpec[];
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  options | <code>{</code><br/><code>        getFormatterForField?: IndexPattern['getFormatterForField'];</code><br/><code>    }</code> |  |
+
+<b>Returns:</b>
+
+`FieldSpec[]`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
index 10b65bdccdf87e..5d467a7a9cbcee 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md
@@ -9,15 +9,13 @@ Constructs a new instance of the `IndexPatternField` class
 <b>Signature:</b>
 
 ```typescript
-constructor(indexPattern: IndexPattern, spec: FieldSpec, displayName: string, onNotification: OnNotification);
+constructor(spec: FieldSpec, displayName: string);
 ```
 
 ## Parameters
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  indexPattern | <code>IndexPattern</code> |  |
 |  spec | <code>FieldSpec</code> |  |
 |  displayName | <code>string</code> |  |
-|  onNotification | <code>OnNotification</code> |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md
deleted file mode 100644
index f28d5b1bca7e56..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.format.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md)
-
-## IndexPatternField.format property
-
-<b>Signature:</b>
-
-```typescript
-get format(): FieldFormat;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
deleted file mode 100644
index 3d145cce9d07df..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) &gt; [indexPattern](./kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md)
-
-## IndexPatternField.indexPattern property
-
-<b>Signature:</b>
-
-```typescript
-readonly indexPattern: IndexPattern;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
index 713b29ea3a3d30..215188ffa26073 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
@@ -14,7 +14,7 @@ export declare class IndexPatternField implements IFieldType
 
 |  Constructor | Modifiers | Description |
 |  --- | --- | --- |
-|  [(constructor)(indexPattern, spec, displayName, onNotification)](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md) |  | Constructs a new instance of the <code>IndexPatternField</code> class |
+|  [(constructor)(spec, displayName)](./kibana-plugin-plugins-data-public.indexpatternfield._constructor_.md) |  | Constructs a new instance of the <code>IndexPatternField</code> class |
 
 ## Properties
 
@@ -26,8 +26,6 @@ export declare class IndexPatternField implements IFieldType
 |  [displayName](./kibana-plugin-plugins-data-public.indexpatternfield.displayname.md) |  | <code>string</code> |  |
 |  [esTypes](./kibana-plugin-plugins-data-public.indexpatternfield.estypes.md) |  | <code>string[] &#124; undefined</code> |  |
 |  [filterable](./kibana-plugin-plugins-data-public.indexpatternfield.filterable.md) |  | <code>boolean</code> |  |
-|  [format](./kibana-plugin-plugins-data-public.indexpatternfield.format.md) |  | <code>FieldFormat</code> |  |
-|  [indexPattern](./kibana-plugin-plugins-data-public.indexpatternfield.indexpattern.md) |  | <code>IndexPattern</code> |  |
 |  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string &#124; undefined</code> |  |
 |  [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) |  | <code>string</code> |  |
 |  [readFromDocValues](./kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md) |  | <code>boolean</code> |  |
@@ -45,5 +43,5 @@ export declare class IndexPatternField implements IFieldType
 |  Method | Modifiers | Description |
 |  --- | --- | --- |
 |  [toJSON()](./kibana-plugin-plugins-data-public.indexpatternfield.tojson.md) |  |  |
-|  [toSpec()](./kibana-plugin-plugins-data-public.indexpatternfield.tospec.md) |  |  |
+|  [toSpec({ getFormatterForField, })](./kibana-plugin-plugins-data-public.indexpatternfield.tospec.md) |  |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md
index 5037cb0049e829..1d80c90991f553 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tospec.md
@@ -7,7 +7,9 @@
 <b>Signature:</b>
 
 ```typescript
-toSpec(): {
+toSpec({ getFormatterForField, }?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }): {
         count: number;
         script: string | undefined;
         lang: string | undefined;
@@ -20,9 +22,19 @@ toSpec(): {
         aggregatable: boolean;
         readFromDocValues: boolean;
         subType: import("../types").IFieldSubType | undefined;
-        format: any;
+        format: {
+            id: any;
+            params: any;
+        } | undefined;
     };
 ```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  { getFormatterForField, } | <code>{</code><br/><code>        getFormatterForField?: IndexPattern['getFormatterForField'];</code><br/><code>    }</code> |  |
+
 <b>Returns:</b>
 
 `{
@@ -38,6 +50,9 @@ toSpec(): {
         aggregatable: boolean;
         readFromDocValues: boolean;
         subType: import("../types").IFieldSubType | undefined;
-        format: any;
+        format: {
+            id: any;
+            params: any;
+        } | undefined;
     }`
 
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 09702df4fdb545..0ab86e0f4dab20 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
@@ -10,7 +10,6 @@
 |  --- | --- |
 |  [AggParamType](./kibana-plugin-plugins-data-public.aggparamtype.md) |  |
 |  [FieldFormat](./kibana-plugin-plugins-data-public.fieldformat.md) |  |
-|  [FieldList](./kibana-plugin-plugins-data-public.fieldlist.md) |  |
 |  [FilterManager](./kibana-plugin-plugins-data-public.filtermanager.md) |  |
 |  [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) |  |
 |  [IndexPatternField](./kibana-plugin-plugins-data-public.indexpatternfield.md) |  |
@@ -103,6 +102,7 @@
 |  [expandShorthand](./kibana-plugin-plugins-data-public.expandshorthand.md) |  |
 |  [extractSearchSourceReferences](./kibana-plugin-plugins-data-public.extractsearchsourcereferences.md) |  |
 |  [fieldFormats](./kibana-plugin-plugins-data-public.fieldformats.md) |  |
+|  [fieldList](./kibana-plugin-plugins-data-public.fieldlist.md) |  |
 |  [FilterBar](./kibana-plugin-plugins-data-public.filterbar.md) |  |
 |  [getKbnTypeNames](./kibana-plugin-plugins-data-public.getkbntypenames.md) | Get the esTypes known by all kbnFieldTypes {<!-- -->Array<string>} |
 |  [indexPatterns](./kibana-plugin-plugins-data-public.indexpatterns.md) |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
index 77a2954428f8d4..d106f3a35a91c7 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
@@ -28,7 +28,7 @@ export interface IFieldType
 |  [searchable](./kibana-plugin-plugins-data-server.ifieldtype.searchable.md) | <code>boolean</code> |  |
 |  [sortable](./kibana-plugin-plugins-data-server.ifieldtype.sortable.md) | <code>boolean</code> |  |
 |  [subType](./kibana-plugin-plugins-data-server.ifieldtype.subtype.md) | <code>IFieldSubType</code> |  |
-|  [toSpec](./kibana-plugin-plugins-data-server.ifieldtype.tospec.md) | <code>() =&gt; FieldSpec</code> |  |
+|  [toSpec](./kibana-plugin-plugins-data-server.ifieldtype.tospec.md) | <code>(options?: {</code><br/><code>        getFormatterForField?: IndexPattern['getFormatterForField'];</code><br/><code>    }) =&gt; FieldSpec</code> |  |
 |  [type](./kibana-plugin-plugins-data-server.ifieldtype.type.md) | <code>string</code> |  |
 |  [visualizable](./kibana-plugin-plugins-data-server.ifieldtype.visualizable.md) | <code>boolean</code> |  |
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.tospec.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.tospec.md
index d1863bebce4f00..6f8ee9d9eebf03 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.tospec.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.tospec.md
@@ -7,5 +7,7 @@
 <b>Signature:</b>
 
 ```typescript
-toSpec?: () => FieldSpec;
+toSpec?: (options?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }) => FieldSpec;
 ```
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index bacbd6e757114a..cc37a3c7c09246 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -7,6 +7,7 @@
 import { Action } from 'history';
 import { ApiResponse } from '@elastic/elasticsearch/lib/Transport';
 import Boom from 'boom';
+import { ErrorToastOptions as ErrorToastOptions_2 } from 'src/core/public/notifications';
 import { EuiBreadcrumb } from '@elastic/eui';
 import { EuiButtonEmptyProps } from '@elastic/eui';
 import { EuiConfirmModalProps } from '@elastic/eui';
@@ -27,7 +28,9 @@ import { PublicUiSettingsParams as PublicUiSettingsParams_2 } from 'src/core/ser
 import React from 'react';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import * as Rx from 'rxjs';
+import { SavedObject as SavedObject_2 } from 'src/core/server';
 import { ShallowPromise } from '@kbn/utility-types';
+import { ToastInputFields as ToastInputFields_2 } from 'src/core/public/notifications';
 import { TransportRequestOptions } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 05afad5a4f7a41..2128eb077211fb 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -40,6 +40,7 @@ import { DeleteScriptParams } from 'elasticsearch';
 import { DeleteTemplateParams } from 'elasticsearch';
 import { DetailedPeerCertificate } from 'tls';
 import { Duration } from 'moment';
+import { ErrorToastOptions } from 'src/core/public/notifications';
 import { ExistsParams } from 'elasticsearch';
 import { ExplainParams } from 'elasticsearch';
 import { FieldStatsParams } from 'elasticsearch';
@@ -118,6 +119,7 @@ import { RenderSearchTemplateParams } from 'elasticsearch';
 import { Request } from 'hapi';
 import { ResponseObject } from 'hapi';
 import { ResponseToolkit } from 'hapi';
+import { SavedObject as SavedObject_2 } from 'src/core/server';
 import { SchemaTypeError } from '@kbn/config-schema';
 import { ScrollParams } from 'elasticsearch';
 import { SearchParams } from 'elasticsearch';
@@ -141,6 +143,7 @@ import { TasksCancelParams } from 'elasticsearch';
 import { TasksGetParams } from 'elasticsearch';
 import { TasksListParams } from 'elasticsearch';
 import { TermvectorsParams } from 'elasticsearch';
+import { ToastInputFields } from 'src/core/public/notifications';
 import { TransportRequestOptions } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
diff --git a/src/plugins/data/common/es_query/filters/get_display_value.ts b/src/plugins/data/common/es_query/filters/get_display_value.ts
index 10b4dab3f46efa..28ba0ab629e8f1 100644
--- a/src/plugins/data/common/es_query/filters/get_display_value.ts
+++ b/src/plugins/data/common/es_query/filters/get_display_value.ts
@@ -17,30 +17,26 @@
  * under the License.
  */
 
-import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { IIndexPattern, IFieldType } from '../..';
+import { IIndexPattern } from '../..';
 import { getIndexPatternFromFilter } from './get_index_pattern_from_filter';
 import { Filter } from '../filters';
 
 function getValueFormatter(indexPattern?: IIndexPattern, key?: string) {
-  if (!indexPattern || !key) return;
+  // checking getFormatterForField exists because there is at least once case where an index pattern
+  // is an object rather than an IndexPattern class
+  if (!indexPattern || !indexPattern.getFormatterForField || !key) return;
 
-  let format = get(indexPattern, ['fields', 'byName', key, 'format']);
-  if (!format && (indexPattern.fields as any).getByName) {
-    // TODO: Why is indexPatterns sometimes a map and sometimes an array?
-    const field: IFieldType = (indexPattern.fields as any).getByName(key);
-    if (!field) {
-      throw new Error(
-        i18n.translate('data.filter.filterBar.fieldNotFound', {
-          defaultMessage: 'Field {key} not found in index pattern {indexPattern}',
-          values: { key, indexPattern: indexPattern.title },
-        })
-      );
-    }
-    format = field.format;
+  const field = indexPattern.fields.find((f) => f.name === key);
+  if (!field) {
+    throw new Error(
+      i18n.translate('data.filter.filterBar.fieldNotFound', {
+        defaultMessage: 'Field {key} not found in index pattern {indexPattern}',
+        values: { key, indexPattern: indexPattern.title },
+      })
+    );
   }
-  return format;
+  return indexPattern.getFormatterForField(field);
 }
 
 export function getDisplayValueFromFilter(filter: Filter, indexPatterns: IIndexPattern[]): string {
diff --git a/src/plugins/data/common/field_formats/converters/source.ts b/src/plugins/data/common/field_formats/converters/source.ts
index 9c81bb011e127e..e7dce82c725d2b 100644
--- a/src/plugins/data/common/field_formats/converters/source.ts
+++ b/src/plugins/data/common/field_formats/converters/source.ts
@@ -60,7 +60,7 @@ export class SourceFormat extends FieldFormat {
   textConvert: TextContextTypeConvert = (value) => JSON.stringify(value);
 
   htmlConvert: HtmlContextTypeConvert = (value, options = {}) => {
-    const { field, hit } = options;
+    const { field, hit, indexPattern } = options;
 
     if (!field) {
       const converter = this.getConverterFor('text') as Function;
@@ -69,7 +69,7 @@ export class SourceFormat extends FieldFormat {
     }
 
     const highlights = (hit && hit.highlight) || {};
-    const formatted = field.indexPattern.formatHit(hit);
+    const formatted = indexPattern.formatHit(hit);
     const highlightPairs: any[] = [];
     const sourcePairs: any[] = [];
     const isShortDots = this.getConfig!(UI_SETTINGS.SHORT_DOTS_ENABLE);
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 4b46adf399363c..dbc3693c99779a 100644
--- a/src/plugins/data/common/field_formats/field_formats_registry.ts
+++ b/src/plugins/data/common/field_formats/field_formats_registry.ts
@@ -181,11 +181,11 @@ export class FieldFormatsRegistry {
    * @param  {ES_FIELD_TYPES[]} esTypes
    * @return {FieldFormat}
    */
-  getDefaultInstancePlain(
+  getDefaultInstancePlain = (
     fieldType: KBN_FIELD_TYPES,
     esTypes?: ES_FIELD_TYPES[],
     params: Record<string, any> = {}
-  ): FieldFormat {
+  ): FieldFormat => {
     const conf = this.getDefaultConfig(fieldType, esTypes);
     const instanceParams = {
       ...conf.params,
@@ -193,7 +193,7 @@ export class FieldFormatsRegistry {
     };
 
     return this.getInstance(conf.id, instanceParams);
-  }
+  };
   /**
    * Returns a cache key built by the given variables for caching in memoized
    * Where esType contains fieldType, fieldType is returned
diff --git a/src/plugins/data/common/field_formats/types.ts b/src/plugins/data/common/field_formats/types.ts
index daa44b2b0f85be..af956a20c0dc51 100644
--- a/src/plugins/data/common/field_formats/types.ts
+++ b/src/plugins/data/common/field_formats/types.ts
@@ -27,6 +27,7 @@ export type FieldFormatsContentType = 'html' | 'text';
 /** @internal **/
 export interface HtmlContextTypeOptions {
   field?: any;
+  indexPattern?: any;
   hit?: Record<string, any>;
 }
 
diff --git a/src/plugins/data/common/index_patterns/errors.ts b/src/plugins/data/common/index_patterns/errors.ts
new file mode 100644
index 00000000000000..3d92bae1968fb5
--- /dev/null
+++ b/src/plugins/data/common/index_patterns/errors.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 { FieldSpec } from './types';
+
+export class FieldTypeUnknownError extends Error {
+  public readonly fieldSpec: FieldSpec;
+  constructor(message: string, spec: FieldSpec) {
+    super(message);
+    this.name = 'FieldTypeUnknownError';
+    this.fieldSpec = spec;
+  }
+}
diff --git a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
index e61593f6bfb27b..4279dd320ad621 100644
--- a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
+++ b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
@@ -14,7 +14,7 @@ Object {
   },
   "count": 1,
   "esTypes": Array [
-    "type",
+    "text",
   ],
   "lang": "lang",
   "name": "name",
@@ -30,7 +30,7 @@ Object {
       "path": "path",
     },
   },
-  "type": "type",
+  "type": "string",
 }
 `;
 
@@ -48,7 +48,7 @@ Object {
   },
   "count": 1,
   "esTypes": Array [
-    "type",
+    "text",
   ],
   "format": Object {
     "id": "number",
@@ -70,6 +70,6 @@ Object {
       "path": "path",
     },
   },
-  "type": "type",
+  "type": "string",
 }
 `;
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 d2489a5d1f7e33..4cf60758698513 100644
--- a/src/plugins/data/common/index_patterns/fields/field_list.ts
+++ b/src/plugins/data/common/index_patterns/fields/field_list.ts
@@ -35,6 +35,7 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField> {
   removeAll(): void;
   replaceAll(specs: FieldSpec[]): void;
   update(field: FieldSpec): void;
+  toSpec(options?: { getFormatterForField?: IndexPattern['getFormatterForField'] }): FieldSpec[];
 }
 
 export type CreateIndexPatternFieldList = (
@@ -44,87 +45,79 @@ export type CreateIndexPatternFieldList = (
   onNotification?: OnNotification
 ) => IIndexPatternFieldList;
 
-export class FieldList extends Array<IndexPatternField> implements IIndexPatternFieldList {
-  private byName: FieldMap = new Map();
-  private groups: Map<IndexPatternField['type'], FieldMap> = new Map();
-  private indexPattern: IndexPattern;
-  private shortDotsEnable: boolean;
-  private onNotification: OnNotification;
-  private setByName = (field: IndexPatternField) => this.byName.set(field.name, field);
-  private setByGroup = (field: IndexPatternField) => {
-    if (typeof this.groups.get(field.type) === 'undefined') {
-      this.groups.set(field.type, new Map());
+// extending the array class and using a constructor doesn't work well
+// when calling filter and similar so wrapping in a callback.
+// to be removed in the future
+export const fieldList = (
+  specs: FieldSpec[] = [],
+  shortDotsEnable = false
+): IIndexPatternFieldList => {
+  class FldList extends Array<IndexPatternField> implements IIndexPatternFieldList {
+    private byName: FieldMap = new Map();
+    private groups: Map<IndexPatternField['type'], FieldMap> = new Map();
+    private setByName = (field: IndexPatternField) => this.byName.set(field.name, field);
+    private setByGroup = (field: IndexPatternField) => {
+      if (typeof this.groups.get(field.type) === 'undefined') {
+        this.groups.set(field.type, new Map());
+      }
+      this.groups.get(field.type)!.set(field.name, field);
+    };
+    private removeByGroup = (field: IFieldType) => this.groups.get(field.type)!.delete(field.name);
+    private calcDisplayName = (name: string) =>
+      shortDotsEnable ? shortenDottedString(name) : name;
+    constructor() {
+      super();
+      specs.map((field) => this.add(field));
     }
-    this.groups.get(field.type)!.set(field.name, field);
-  };
-  private removeByGroup = (field: IFieldType) => this.groups.get(field.type)!.delete(field.name);
-  private calcDisplayName = (name: string) =>
-    this.shortDotsEnable ? shortenDottedString(name) : name;
-  constructor(
-    indexPattern: IndexPattern,
-    specs: FieldSpec[] = [],
-    shortDotsEnable = false,
-    onNotification: OnNotification = () => {}
-  ) {
-    super();
-    this.indexPattern = indexPattern;
-    this.shortDotsEnable = shortDotsEnable;
-    this.onNotification = onNotification;
 
-    specs.map((field) => this.add(field));
-  }
+    public readonly getAll = () => [...this.byName.values()];
+    public readonly getByName = (name: IndexPatternField['name']) => this.byName.get(name);
+    public readonly getByType = (type: IndexPatternField['type']) => [
+      ...(this.groups.get(type) || new Map()).values(),
+    ];
+    public readonly add = (field: FieldSpec) => {
+      const newField = new IndexPatternField(field, this.calcDisplayName(field.name));
+      this.push(newField);
+      this.setByName(newField);
+      this.setByGroup(newField);
+    };
 
-  public readonly getAll = () => [...this.byName.values()];
-  public readonly getByName = (name: IndexPatternField['name']) => this.byName.get(name);
-  public readonly getByType = (type: IndexPatternField['type']) => [
-    ...(this.groups.get(type) || new Map()).values(),
-  ];
-  public readonly add = (field: FieldSpec) => {
-    const newField = new IndexPatternField(
-      this.indexPattern,
-      field,
-      this.calcDisplayName(field.name),
-      this.onNotification
-    );
-    this.push(newField);
-    this.setByName(newField);
-    this.setByGroup(newField);
-  };
+    public readonly remove = (field: IFieldType) => {
+      this.removeByGroup(field);
+      this.byName.delete(field.name);
 
-  public readonly remove = (field: IFieldType) => {
-    this.removeByGroup(field);
-    this.byName.delete(field.name);
+      const fieldIndex = findIndex(this, { name: field.name });
+      this.splice(fieldIndex, 1);
+    };
 
-    const fieldIndex = findIndex(this, { name: field.name });
-    this.splice(fieldIndex, 1);
-  };
+    public readonly update = (field: FieldSpec) => {
+      const newField = new IndexPatternField(field, this.calcDisplayName(field.name));
+      const index = this.findIndex((f) => f.name === newField.name);
+      this.splice(index, 1, newField);
+      this.setByName(newField);
+      this.removeByGroup(newField);
+      this.setByGroup(newField);
+    };
 
-  public readonly update = (field: FieldSpec) => {
-    const newField = new IndexPatternField(
-      this.indexPattern,
-      field,
-      this.calcDisplayName(field.name),
-      this.onNotification
-    );
-    const index = this.findIndex((f) => f.name === newField.name);
-    this.splice(index, 1, newField);
-    this.setByName(newField);
-    this.removeByGroup(newField);
-    this.setByGroup(newField);
-  };
+    public readonly removeAll = () => {
+      this.length = 0;
+      this.byName.clear();
+      this.groups.clear();
+    };
 
-  public readonly removeAll = () => {
-    this.length = 0;
-    this.byName.clear();
-    this.groups.clear();
-  };
+    public readonly replaceAll = (spcs: FieldSpec[]) => {
+      this.removeAll();
+      spcs.forEach(this.add);
+    };
 
-  public readonly replaceAll = (specs: FieldSpec[]) => {
-    this.removeAll();
-    specs.forEach(this.add);
-  };
+    public toSpec({
+      getFormatterForField,
+    }: {
+      getFormatterForField?: IndexPattern['getFormatterForField'];
+    } = {}) {
+      return [...this.map((field) => field.toSpec({ getFormatterForField }))];
+    }
+  }
 
-  public readonly toSpec = () => {
-    return [...this.map((field) => field.toSpec())];
-  };
-}
+  return new FldList();
+};
diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
index 0cd0fe8324809c..3c4fac81c2c7ce 100644
--- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
@@ -19,7 +19,7 @@
 
 import { IndexPatternField } from './index_pattern_field';
 import { IndexPattern } from '../index_patterns';
-import { KBN_FIELD_TYPES } from '../../../common';
+import { KBN_FIELD_TYPES, FieldFormat } from '../../../common';
 import { FieldSpec } from '../types';
 
 describe('Field', function () {
@@ -28,21 +28,16 @@ describe('Field', function () {
   }
 
   function getField(values = {}) {
-    return new IndexPatternField(
-      fieldValues.indexPattern as IndexPattern,
-      { ...fieldValues, ...values },
-      'displayName',
-      () => {}
-    );
+    return new IndexPatternField({ ...fieldValues, ...values }, 'displayName');
   }
 
   const fieldValues = {
     name: 'name',
-    type: 'type',
+    type: 'string',
     script: 'script',
     lang: 'lang',
     count: 1,
-    esTypes: ['type'],
+    esTypes: ['text'],
     aggregatable: true,
     filterable: true,
     searchable: true,
@@ -125,7 +120,7 @@ describe('Field', function () {
     const fieldB = getField({ indexed: true, type: KBN_FIELD_TYPES.STRING });
     expect(fieldB.sortable).toEqual(true);
 
-    const fieldC = getField({ indexed: false });
+    const fieldC = getField({ indexed: false, aggregatable: false, scripted: false });
     expect(fieldC.sortable).toEqual(false);
   });
 
@@ -139,31 +134,26 @@ describe('Field', function () {
     const fieldC = getField({ indexed: true, type: KBN_FIELD_TYPES.STRING });
     expect(fieldC.filterable).toEqual(true);
 
-    const fieldD = getField({ scripted: false, indexed: false });
+    const fieldD = getField({ scripted: false, indexed: false, searchable: false });
     expect(fieldD.filterable).toEqual(false);
   });
 
   it('exports the property to JSON', () => {
-    const field = new IndexPatternField(
-      { fieldFormatMap: { name: {} } } as IndexPattern,
-      fieldValues,
-      'displayName',
-      () => {}
-    );
+    const field = new IndexPatternField(fieldValues, 'displayName');
     expect(flatten(field)).toMatchSnapshot();
   });
 
   it('spec snapshot', () => {
-    const field = new IndexPatternField(
-      {
-        fieldFormatMap: {
-          name: { toJSON: () => ({ id: 'number', params: { pattern: '$0,0.[00]' } }) },
-        },
-      } as IndexPattern,
-      fieldValues,
-      'displayName',
-      () => {}
-    );
-    expect(field.toSpec()).toMatchSnapshot();
+    const field = new IndexPatternField(fieldValues, 'displayName');
+    const getFormatterForField = () =>
+      ({
+        toJSON: () => ({
+          id: 'number',
+          params: {
+            pattern: '$0,0.[00]',
+          },
+        }),
+      } as FieldFormat);
+    expect(field.toSpec({ getFormatterForField })).toMatchSnapshot();
   });
 });
diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
index 965f1a7f630651..7f72bfe55c7cd5 100644
--- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.ts
@@ -20,40 +20,27 @@
 import { i18n } from '@kbn/i18n';
 import { KbnFieldType, getKbnFieldType } from '../../kbn_field_types';
 import { KBN_FIELD_TYPES } from '../../kbn_field_types/types';
-import { FieldFormat } from '../../field_formats';
 import { IFieldType } from './types';
-import { OnNotification, FieldSpec } from '../types';
-
-import { IndexPattern } from '../index_patterns';
+import { FieldSpec, IndexPattern } from '../..';
+import { FieldTypeUnknownError } from '../errors';
 
 export class IndexPatternField implements IFieldType {
   readonly spec: FieldSpec;
   // not writable or serialized
-  readonly indexPattern: IndexPattern;
   readonly displayName: string;
   private readonly kbnFieldType: KbnFieldType;
 
-  constructor(
-    indexPattern: IndexPattern,
-    spec: FieldSpec,
-    displayName: string,
-    onNotification: OnNotification
-  ) {
-    this.indexPattern = indexPattern;
+  constructor(spec: FieldSpec, displayName: string) {
     this.spec = { ...spec, type: spec.name === '_source' ? '_source' : spec.type };
     this.displayName = displayName;
 
     this.kbnFieldType = getKbnFieldType(spec.type);
     if (spec.type && this.kbnFieldType?.name === KBN_FIELD_TYPES.UNKNOWN) {
-      const title = i18n.translate('data.indexPatterns.unknownFieldHeader', {
-        values: { type: spec.type },
-        defaultMessage: 'Unknown field type {type}',
-      });
-      const text = i18n.translate('data.indexPatterns.unknownFieldErrorMessage', {
-        values: { name: spec.name, title: indexPattern.title },
-        defaultMessage: 'Field {name} in indexPattern {title} is using an unknown field type.',
+      const msg = i18n.translate('data.indexPatterns.unknownFieldTypeErrorMsg', {
+        values: { type: spec.type, name: spec.name },
+        defaultMessage: `Field '{name}' Unknown field type '{type}'`,
       });
-      onNotification({ title, text, color: 'danger', iconType: 'alert' });
+      throw new FieldTypeUnknownError(msg, spec);
     }
   }
 
@@ -143,10 +130,6 @@ export class IndexPatternField implements IFieldType {
     return this.aggregatable;
   }
 
-  public get format(): FieldFormat {
-    return this.indexPattern.getFormatterForField(this);
-  }
-
   public toJSON() {
     return {
       count: this.count,
@@ -165,7 +148,11 @@ export class IndexPatternField implements IFieldType {
     };
   }
 
-  public toSpec() {
+  public toSpec({
+    getFormatterForField,
+  }: {
+    getFormatterForField?: IndexPattern['getFormatterForField'];
+  } = {}) {
     return {
       count: this.count,
       script: this.script,
@@ -179,7 +166,7 @@ export class IndexPatternField implements IFieldType {
       aggregatable: this.aggregatable,
       readFromDocValues: this.readFromDocValues,
       subType: this.subType,
-      format: this.indexPattern?.fieldFormatMap[this.name]?.toJSON() || undefined,
+      format: getFormatterForField ? getFormatterForField(this).toJSON() : undefined,
     };
   }
 }
diff --git a/src/plugins/data/common/index_patterns/fields/types.ts b/src/plugins/data/common/index_patterns/fields/types.ts
index 558b5b57dce40a..5814760601a675 100644
--- a/src/plugins/data/common/index_patterns/fields/types.ts
+++ b/src/plugins/data/common/index_patterns/fields/types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { FieldSpec, IFieldSubType } from '../types';
+import { FieldSpec, IFieldSubType, IndexPattern } from '../..';
 
 export interface IFieldType {
   name: string;
@@ -38,5 +38,5 @@ export interface IFieldType {
   subType?: IFieldSubType;
   displayName?: string;
   format?: any;
-  toSpec?: () => FieldSpec;
+  toSpec?: (options?: { getFormatterForField?: IndexPattern['getFormatterForField'] }) => FieldSpec;
 }
diff --git a/src/plugins/data/common/index_patterns/index.ts b/src/plugins/data/common/index_patterns/index.ts
index 51a642b775c29c..08f478404be2cf 100644
--- a/src/plugins/data/common/index_patterns/index.ts
+++ b/src/plugins/data/common/index_patterns/index.ts
@@ -20,3 +20,5 @@
 export * from './fields';
 export * from './types';
 export { IndexPatternsService } from './index_patterns';
+export type { IndexPattern } from './index_patterns';
+export * from './errors';
diff --git a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
index 047ac836a87d1f..a0c380ec55bf67 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
+++ b/src/plugins/data/common/index_patterns/index_patterns/__snapshots__/index_pattern.test.ts.snap
@@ -32,7 +32,12 @@ Object {
       "esTypes": Array [
         "boolean",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "ssl",
       "readFromDocValues": true,
@@ -49,7 +54,12 @@ Object {
       "esTypes": Array [
         "date",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "@timestamp",
       "readFromDocValues": true,
@@ -66,7 +76,12 @@ Object {
       "esTypes": Array [
         "date",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "time",
       "readFromDocValues": true,
@@ -83,7 +98,12 @@ Object {
       "esTypes": Array [
         "keyword",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "@tags",
       "readFromDocValues": true,
@@ -100,7 +120,12 @@ Object {
       "esTypes": Array [
         "date",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "utc_time",
       "readFromDocValues": true,
@@ -117,7 +142,12 @@ Object {
       "esTypes": Array [
         "integer",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "phpmemory",
       "readFromDocValues": true,
@@ -134,7 +164,12 @@ Object {
       "esTypes": Array [
         "ip",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "ip",
       "readFromDocValues": true,
@@ -151,7 +186,12 @@ Object {
       "esTypes": Array [
         "attachment",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "request_body",
       "readFromDocValues": true,
@@ -168,7 +208,12 @@ Object {
       "esTypes": Array [
         "geo_point",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "point",
       "readFromDocValues": true,
@@ -185,7 +230,12 @@ Object {
       "esTypes": Array [
         "geo_shape",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "area",
       "readFromDocValues": false,
@@ -202,7 +252,12 @@ Object {
       "esTypes": Array [
         "murmur3",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "hashed",
       "readFromDocValues": false,
@@ -219,7 +274,12 @@ Object {
       "esTypes": Array [
         "geo_point",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "geo.coordinates",
       "readFromDocValues": true,
@@ -236,7 +296,12 @@ Object {
       "esTypes": Array [
         "text",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "extension",
       "readFromDocValues": false,
@@ -253,7 +318,12 @@ Object {
       "esTypes": Array [
         "keyword",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "extension.keyword",
       "readFromDocValues": true,
@@ -274,7 +344,12 @@ Object {
       "esTypes": Array [
         "text",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "machine.os",
       "readFromDocValues": false,
@@ -291,7 +366,12 @@ Object {
       "esTypes": Array [
         "keyword",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "machine.os.raw",
       "readFromDocValues": true,
@@ -312,7 +392,12 @@ Object {
       "esTypes": Array [
         "keyword",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "geo.src",
       "readFromDocValues": true,
@@ -329,7 +414,12 @@ Object {
       "esTypes": Array [
         "_id",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "_id",
       "readFromDocValues": false,
@@ -346,7 +436,12 @@ Object {
       "esTypes": Array [
         "_type",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "_type",
       "readFromDocValues": false,
@@ -363,7 +458,12 @@ Object {
       "esTypes": Array [
         "_source",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "_source",
       "readFromDocValues": false,
@@ -380,7 +480,12 @@ Object {
       "esTypes": Array [
         "text",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "non-filterable",
       "readFromDocValues": false,
@@ -397,7 +502,12 @@ Object {
       "esTypes": Array [
         "text",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "non-sortable",
       "readFromDocValues": false,
@@ -414,7 +524,12 @@ Object {
       "esTypes": Array [
         "conflict",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": undefined,
       "name": "custom_user_field",
       "readFromDocValues": true,
@@ -431,7 +546,12 @@ Object {
       "esTypes": Array [
         "text",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": "expression",
       "name": "script string",
       "readFromDocValues": false,
@@ -448,7 +568,12 @@ Object {
       "esTypes": Array [
         "long",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": "expression",
       "name": "script number",
       "readFromDocValues": false,
@@ -465,7 +590,12 @@ Object {
       "esTypes": Array [
         "date",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": "painless",
       "name": "script date",
       "readFromDocValues": false,
@@ -482,7 +612,12 @@ Object {
       "esTypes": Array [
         "murmur3",
       ],
-      "format": undefined,
+      "format": Object {
+        "id": "number",
+        "params": Object {
+          "pattern": "$0,0.[00]",
+        },
+      },
       "lang": "expression",
       "name": "script murmur3",
       "readFromDocValues": false,
diff --git a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts b/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts
index a0597ed4b90269..b47fef107258ac 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/format_hit.ts
@@ -34,9 +34,9 @@ export function formatHitProvider(indexPattern: IndexPattern, defaultFormat: any
     type: FieldFormatsContentType = 'html'
   ) {
     const field = indexPattern.fields.getByName(fieldName);
-    const format = field ? field.format : defaultFormat;
+    const format = field ? indexPattern.getFormatterForField(field) : defaultFormat;
 
-    return format.convert(val, type, { field, hit });
+    return format.convert(val, type, { field, hit, indexPattern });
   }
 
   function formatHit(hit: Record<string, any>, type: string = 'html') {
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 f7e1156170f032..2350cbb67683ef 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
@@ -29,6 +29,7 @@ import { stubbedSavedObjectIndexPattern } from '../../../../../fixtures/stubbed_
 import { IndexPatternField } from '../fields';
 
 import { fieldFormatsMock } from '../../field_formats/mocks';
+import { FieldFormat } from '../..';
 
 class MockFieldFormatter {}
 
@@ -170,7 +171,6 @@ describe('IndexPattern', () => {
     test('should have expected properties on fields', function () {
       expect(indexPattern.fields[0]).toHaveProperty('displayName');
       expect(indexPattern.fields[0]).toHaveProperty('filterable');
-      expect(indexPattern.fields[0]).toHaveProperty('format');
       expect(indexPattern.fields[0]).toHaveProperty('sortable');
       expect(indexPattern.fields[0]).toHaveProperty('scripted');
     });
@@ -319,16 +319,18 @@ describe('IndexPattern', () => {
 
   describe('toSpec', () => {
     test('should match snapshot', () => {
-      indexPattern.fieldFormatMap.bytes = {
+      const formatter = {
         toJSON: () => ({ id: 'number', params: { pattern: '$0,0.[00]' } }),
-      };
+      } as FieldFormat;
+      indexPattern.getFormatterForField = () => formatter;
       expect(indexPattern.toSpec()).toMatchSnapshot();
     });
 
     test('can restore from spec', async () => {
-      indexPattern.fieldFormatMap.bytes = {
+      const formatter = {
         toJSON: () => ({ id: 'number', params: { pattern: '$0,0.[00]' } }),
-      };
+      } as FieldFormat;
+      indexPattern.getFormatterForField = () => formatter;
       const spec = indexPattern.toSpec();
       const restoredPattern = await create(spec.id as string);
       restoredPattern.initFromSpec(spec);
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 ea91a9bb14e1f5..c82bf7d759328a 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
@@ -26,11 +26,12 @@ import {
   ES_FIELD_TYPES,
   KBN_FIELD_TYPES,
   IIndexPattern,
+  FieldTypeUnknownError,
   FieldFormatNotFoundError,
 } from '../../../common';
 import { findByTitle } from '../utils';
 import { IndexPatternMissingIndices } from '../lib';
-import { IndexPatternField, IIndexPatternFieldList, FieldList } from '../fields';
+import { IndexPatternField, IIndexPatternFieldList, fieldList } from '../fields';
 import { createFieldsFetcher } from './_fields_fetcher';
 import { formatHitProvider } from './format_hit';
 import { flattenHitWrapper } from './flatten_hit';
@@ -125,8 +126,7 @@ export class IndexPattern implements IIndexPattern {
 
     this.shortDotsEnable = shortDotsEnable;
     this.metaFields = metaFields;
-
-    this.fields = new FieldList(this, [], this.shortDotsEnable, this.onNotification);
+    this.fields = fieldList([], this.shortDotsEnable);
 
     this.apiClient = apiClient;
     this.fieldsFetcher = createFieldsFetcher(this, apiClient, metaFields);
@@ -138,6 +138,22 @@ export class IndexPattern implements IIndexPattern {
     this.formatField = this.formatHit.formatField;
   }
 
+  private unknownFieldErrorNotification(
+    fieldType: string,
+    fieldName: string,
+    indexPatternTitle: string
+  ) {
+    const title = i18n.translate('data.indexPatterns.unknownFieldHeader', {
+      values: { type: fieldType },
+      defaultMessage: 'Unknown field type {type}',
+    });
+    const text = i18n.translate('data.indexPatterns.unknownFieldErrorMessage', {
+      values: { name: fieldName, title: indexPatternTitle },
+      defaultMessage: 'Field {name} in indexPattern {title} is using an unknown field type.',
+    });
+    this.onNotification({ title, text, color: 'danger', iconType: 'alert' });
+  }
+
   private serializeFieldFormatMap(flat: any, format: string, field: string | undefined) {
     if (format && field) {
       flat[field] = format;
@@ -181,7 +197,15 @@ export class IndexPattern implements IIndexPattern {
       await this.refreshFields();
     } else {
       if (specs) {
-        this.fields.replaceAll(specs);
+        try {
+          this.fields.replaceAll(specs);
+        } catch (err) {
+          if (err instanceof FieldTypeUnknownError) {
+            this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
+          } else {
+            throw err;
+          }
+        }
       }
     }
   }
@@ -203,7 +227,15 @@ export class IndexPattern implements IIndexPattern {
     this.timeFieldName = spec.timeFieldName;
     this.sourceFilters = spec.sourceFilters;
 
-    this.fields.replaceAll(spec.fields || []);
+    try {
+      this.fields.replaceAll(spec.fields || []);
+    } catch (err) {
+      if (err instanceof FieldTypeUnknownError) {
+        this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
+      } else {
+        throw err;
+      }
+    }
     this.typeMeta = spec.typeMeta;
 
     this.fieldFormatMap = _.mapValues(fieldFormatMap, (mapping) => {
@@ -322,7 +354,7 @@ export class IndexPattern implements IIndexPattern {
       title: this.title,
       timeFieldName: this.timeFieldName,
       sourceFilters: this.sourceFilters,
-      fields: this.fields.toSpec(),
+      fields: this.fields.toSpec({ getFormatterForField: this.getFormatterForField.bind(this) }),
       typeMeta: this.typeMeta,
     };
   }
@@ -342,19 +374,27 @@ export class IndexPattern implements IIndexPattern {
       throw new DuplicateField(name);
     }
 
-    this.fields.add({
-      name,
-      script,
-      type: fieldType,
-      scripted: true,
-      lang,
-      aggregatable: true,
-      searchable: true,
-      count: 0,
-      readFromDocValues: false,
-    });
+    try {
+      this.fields.add({
+        name,
+        script,
+        type: fieldType,
+        scripted: true,
+        lang,
+        aggregatable: true,
+        searchable: true,
+        count: 0,
+        readFromDocValues: false,
+      });
+    } catch (err) {
+      if (err instanceof FieldTypeUnknownError) {
+        this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
+      } else {
+        throw err;
+      }
 
-    await this.save();
+      await this.save();
+    }
   }
 
   removeScriptedField(fieldName: string) {
@@ -572,7 +612,15 @@ export class IndexPattern implements IIndexPattern {
   async _fetchFields() {
     const fields = await this.fieldsFetcher.fetch(this);
     const scripted = this.getScriptedFields().map((field) => field.spec);
-    this.fields.replaceAll([...fields, ...scripted]);
+    try {
+      this.fields.replaceAll([...fields, ...scripted]);
+    } catch (err) {
+      if (err instanceof FieldTypeUnknownError) {
+        this.unknownFieldErrorNotification(err.fieldSpec.name, err.fieldSpec.type, this.title);
+      } else {
+        throw err;
+      }
+    }
   }
 
   refreshFields() {
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 0ad9ae8f2014f8..fe0d14b2d9c19a 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
@@ -25,7 +25,6 @@ import {
   createEnsureDefaultIndexPattern,
   EnsureDefaultIndexPattern,
 } from './ensure_default_index_pattern';
-import { IndexPatternField } from '../fields';
 import {
   OnNotification,
   OnError,
@@ -86,15 +85,6 @@ export class IndexPatternsService {
     );
   }
 
-  public createField(
-    indexPattern: IndexPattern,
-    spec: IndexPatternField['spec'],
-    displayName: string,
-    onNotification: OnNotification
-  ) {
-    return new IndexPatternField(indexPattern, spec, displayName, onNotification);
-  }
-
   private async refreshSavedObjectsCache() {
     this.savedObjectsCache = await this.savedObjectsClient.find<IndexPatternSavedObjectAttrs>({
       type: 'index-pattern',
diff --git a/src/plugins/data/common/search/aggs/agg_config.test.ts b/src/plugins/data/common/search/aggs/agg_config.test.ts
index a443eacee731c4..f6fcc29805dc45 100644
--- a/src/plugins/data/common/search/aggs/agg_config.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.test.ts
@@ -25,8 +25,7 @@ import { AggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
 import { mockAggTypesRegistry } from './test_helpers';
 import { MetricAggType } from './metrics/metric_agg_type';
-import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';
-import { IIndexPatternFieldList } from '../../index_patterns/fields';
+import { IndexPattern, IndexPatternField, IIndexPatternFieldList } from '../../index_patterns';
 
 describe('AggConfig', () => {
   let indexPattern: IndexPattern;
@@ -67,6 +66,9 @@ describe('AggConfig', () => {
         getByName: (name: string) => fields.find((f) => f.name === name),
         filter: () => fields,
       } as unknown) as IndexPattern['fields'],
+      getFormatterForField: (field: IndexPatternField) => ({
+        toJSON: () => ({}),
+      }),
     } as IndexPattern;
     typesRegistry = mockAggTypesRegistry();
   });
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 bf1136159dfe86..16a5586858ab9f 100644
--- a/src/plugins/data/common/search/aggs/agg_type.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.test.ts
@@ -147,6 +147,9 @@ describe('AggType Class', () => {
               },
             },
           },
+          aggConfigs: {
+            indexPattern: { getFormatterForField: () => ({ toJSON: () => ({ id: 'format' }) }) },
+          },
         } as unknown) as IAggConfig;
         const aggType = new AggType({
           name: 'name',
diff --git a/src/plugins/data/common/search/aggs/agg_type.ts b/src/plugins/data/common/search/aggs/agg_type.ts
index 2ee604c1bf25da..1e3839038b0f71 100644
--- a/src/plugins/data/common/search/aggs/agg_type.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.ts
@@ -271,7 +271,9 @@ export class AggType<
     this.getSerializedFormat =
       config.getSerializedFormat ||
       ((agg: TAggConfig) => {
-        return agg.params.field ? agg.params.field.format.toJSON() : {};
+        return agg.params.field
+          ? agg.aggConfigs.indexPattern.getFormatterForField(agg.params.field).toJSON()
+          : {};
       });
 
     this.getValue = config.getValue || ((agg: TAggConfig, bucket: any) => {});
diff --git a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
index 1a7deafb548aed..7c09d2e64e8b73 100644
--- a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
+++ b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
@@ -140,7 +140,7 @@ export const buildOtherBucketAgg = (
   const bucketAggs = aggConfigs.aggs.filter((agg) => agg.type.type === AggGroupNames.Buckets);
   const index = bucketAggs.findIndex((agg) => agg.id === aggWithOtherBucket.id);
   const aggs = aggConfigs.toDsl();
-  const indexPattern = aggWithOtherBucket.params.field.indexPattern;
+  const indexPattern = aggWithOtherBucket.aggConfigs.indexPattern;
 
   // create filters aggregation
   const filterAgg = aggConfigs.createAggConfig(
@@ -211,7 +211,7 @@ export const buildOtherBucketAgg = (
       filters.push(
         buildExistsFilter(
           aggWithOtherBucket.params.field,
-          aggWithOtherBucket.params.field.indexPattern
+          aggWithOtherBucket.aggConfigs.indexPattern
         )
       );
     }
@@ -264,7 +264,7 @@ export const mergeOtherBucketAggResponse = (
     const phraseFilter = buildPhrasesFilter(
       otherAgg.params.field,
       requestFilterTerms,
-      otherAgg.params.field.indexPattern
+      otherAgg.aggConfigs.indexPattern
     );
     phraseFilter.meta.negate = true;
     bucket.filters = [phraseFilter];
@@ -276,7 +276,7 @@ export const mergeOtherBucketAggResponse = (
       )
     ) {
       bucket.filters.push(
-        buildExistsFilter(otherAgg.params.field, otherAgg.params.field.indexPattern)
+        buildExistsFilter(otherAgg.params.field, otherAgg.aggConfigs.indexPattern)
       );
     }
     aggResultBuckets.push(bucket);
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
index b57d530ef40e8d..dc1d0ec0a152f6 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/histogram.test.ts
@@ -40,6 +40,7 @@ describe('AggConfig Filters', () => {
           getByName: () => field,
           filter: () => [field],
         },
+        getFormatterForField: () => new BytesFormat({}, getConfig),
       } as any;
 
       return new AggConfigs(
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
index 30af970f55aa9a..b53ae44c05075c 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/range.test.ts
@@ -30,7 +30,6 @@ describe('AggConfig Filters', () => {
     const getAggConfigs = () => {
       const field = {
         name: 'bytes',
-        format: new BytesFormat({}, getConfig),
       };
 
       const indexPattern = {
@@ -40,6 +39,7 @@ describe('AggConfig Filters', () => {
           getByName: () => field,
           filter: () => [field],
         },
+        getFormatterForField: () => new BytesFormat({}, getConfig),
       } as any;
 
       return new AggConfigs(
diff --git a/src/plugins/data/common/search/aggs/buckets/create_filter/terms.ts b/src/plugins/data/common/search/aggs/buckets/create_filter/terms.ts
index 95de19b96abd4f..ccd1cf6e358b4e 100644
--- a/src/plugins/data/common/search/aggs/buckets/create_filter/terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/create_filter/terms.ts
@@ -27,7 +27,7 @@ import {
 
 export const createFilterTerms = (aggConfig: IBucketAggConfig, key: string, params: any) => {
   const field = aggConfig.params.field;
-  const indexPattern = field.indexPattern;
+  const indexPattern = aggConfig.aggConfigs.indexPattern;
 
   if (key === '__other__') {
     const terms = params.terms;
diff --git a/src/plugins/data/common/search/aggs/buckets/date_range.ts b/src/plugins/data/common/search/aggs/buckets/date_range.ts
index eda35a77afa5ff..f9a3acb990fbf8 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_range.ts
@@ -58,7 +58,9 @@ export const getDateRangeBucketAgg = ({
     getSerializedFormat(agg) {
       return {
         id: 'date_range',
-        params: agg.params.field ? agg.params.field.format.toJSON() : {},
+        params: agg.params.field
+          ? agg.aggConfigs.indexPattern.getFormatterForField(agg.params.field).toJSON()
+          : {},
       };
     },
     makeLabel(aggConfig) {
diff --git a/src/plugins/data/common/search/aggs/buckets/ip_range.ts b/src/plugins/data/common/search/aggs/buckets/ip_range.ts
index 46e0b62d0f8d7d..d0a6174b011fc4 100644
--- a/src/plugins/data/common/search/aggs/buckets/ip_range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/ip_range.ts
@@ -59,7 +59,9 @@ export const getIpRangeBucketAgg = () =>
     getSerializedFormat(agg) {
       return {
         id: 'ip_range',
-        params: agg.params.field ? agg.params.field.format.toJSON() : {},
+        params: agg.params.field
+          ? agg.aggConfigs.indexPattern.getFormatterForField(agg.params.field).toJSON()
+          : {},
       };
     },
     makeLabel(aggConfig) {
diff --git a/src/plugins/data/common/search/aggs/buckets/range.test.ts b/src/plugins/data/common/search/aggs/buckets/range.test.ts
index b23b03db6a9ec2..b8241e04ea1ee8 100644
--- a/src/plugins/data/common/search/aggs/buckets/range.test.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range.test.ts
@@ -27,12 +27,6 @@ describe('Range Agg', () => {
   const getAggConfigs = () => {
     const field = {
       name: 'bytes',
-      format: new NumberFormat(
-        {
-          pattern: '0,0.[000] b',
-        },
-        getConfig
-      ),
     };
 
     const indexPattern = {
@@ -42,6 +36,13 @@ describe('Range Agg', () => {
         getByName: () => field,
         filter: () => [field],
       },
+      getFormatterForField: () =>
+        new NumberFormat(
+          {
+            pattern: '0,0.[000] b',
+          },
+          getConfig
+        ),
     } as any;
 
     return new AggConfigs(
diff --git a/src/plugins/data/common/search/aggs/buckets/range.ts b/src/plugins/data/common/search/aggs/buckets/range.ts
index 91a357b6359504..169b234845274c 100644
--- a/src/plugins/data/common/search/aggs/buckets/range.ts
+++ b/src/plugins/data/common/search/aggs/buckets/range.ts
@@ -78,7 +78,9 @@ export const getRangeBucketAgg = ({ getFieldFormatsStart }: RangeBucketAggDepend
       return key;
     },
     getSerializedFormat(agg) {
-      const format = agg.params.field ? agg.params.field.format.toJSON() : {};
+      const format = agg.params.field
+        ? agg.aggConfigs.indexPattern.getFormatterForField(agg.params.field).toJSON()
+        : { id: undefined, params: undefined };
       return {
         id: 'range',
         params: {
diff --git a/src/plugins/data/common/search/aggs/buckets/terms.ts b/src/plugins/data/common/search/aggs/buckets/terms.ts
index 5c8483cf213695..1363d38748c8ba 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms.ts
@@ -82,7 +82,9 @@ export const getTermsBucketAgg = () =>
       return agg.getFieldDisplayName() + ': ' + params.order.text;
     },
     getSerializedFormat(agg) {
-      const format = agg.params.field ? agg.params.field.format.toJSON() : {};
+      const format = agg.params.field
+        ? agg.aggConfigs.indexPattern.getFormatterForField(agg.params.field).toJSON()
+        : { id: undefined, params: undefined };
       return {
         id: 'terms',
         params: {
diff --git a/src/plugins/data/common/search/aggs/metrics/parent_pipeline.test.ts b/src/plugins/data/common/search/aggs/metrics/parent_pipeline.test.ts
index c6bba56f73ec78..4815ab0ac56dca 100644
--- a/src/plugins/data/common/search/aggs/metrics/parent_pipeline.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/parent_pipeline.test.ts
@@ -66,9 +66,6 @@ describe('parent pipeline aggs', function () {
       ) => {
         const field = {
           name: 'field',
-          format: {
-            toJSON: () => ({ id: 'bytes' }),
-          },
         };
         const indexPattern = {
           id: '1234',
@@ -77,6 +74,9 @@ describe('parent pipeline aggs', function () {
             getByName: () => field,
             filter: () => [field],
           },
+          getFormatterForField: () => ({
+            toJSON: () => ({ id: 'bytes' }),
+          }),
         } as any;
 
         const aggConfigs = new AggConfigs(
diff --git a/src/plugins/data/common/search/aggs/metrics/sibling_pipeline.test.ts b/src/plugins/data/common/search/aggs/metrics/sibling_pipeline.test.ts
index a157d225c839cb..32737f7b7237d3 100644
--- a/src/plugins/data/common/search/aggs/metrics/sibling_pipeline.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sibling_pipeline.test.ts
@@ -72,6 +72,9 @@ describe('sibling pipeline aggs', () => {
             getByName: () => field,
             filter: () => [field],
           },
+          getFormatterForField: () => ({
+            toJSON: () => ({ id: 'bytes' }),
+          }),
         } as any;
 
         const aggConfigs = new AggConfigs(
diff --git a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
index a3b9b0b3448235..2ad20c3807819c 100644
--- a/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
+++ b/src/plugins/data/public/actions/filters/create_filters_from_value_click.test.ts
@@ -30,11 +30,7 @@ import { ValueClickContext } from '../../../../embeddable/public';
 
 const mockField = {
   name: 'bytes',
-  indexPattern: {
-    id: 'logstash-*',
-  },
   filterable: true,
-  format: new fieldFormats.BytesFormat({}, (() => {}) as FieldFormatsGetConfigFn),
 };
 
 describe('createFiltersFromValueClick', () => {
@@ -81,6 +77,8 @@ describe('createFiltersFromValueClick', () => {
           getByName: () => mockField,
           filter: () => [mockField],
         },
+        getFormatterForField: () =>
+          new fieldFormats.BytesFormat({}, (() => {}) as FieldFormatsGetConfigFn),
       }),
     } as unknown) as IndexPatternsContract);
   });
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index 27b16c57ffecf2..a9714a95ff3385 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -262,7 +262,7 @@ export {
   UI_SETTINGS,
   TypeMeta as IndexPatternTypeMeta,
   AggregationRestrictions as IndexPatternAggRestrictions,
-  FieldList,
+  fieldList,
 } from '../common';
 
 /*
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index 0c4465ae7f4b91..b09e957944b657 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -604,46 +604,11 @@ export type FieldFormatsContentType = 'html' | 'text';
 // @public (undocumented)
 export type FieldFormatsGetConfigFn = GetConfigFn;
 
-// Warning: (ae-missing-release-tag) "FieldList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
+// Warning: (ae-forgotten-export) The symbol "FieldSpec" needs to be exported by the entry point index.d.ts
+// Warning: (ae-missing-release-tag) "fieldList" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @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
-    // 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)
-    readonly getAll: () => IndexPatternField[];
-    // (undocumented)
-    readonly getByName: (name: IndexPatternField['name']) => IndexPatternField | undefined;
-    // (undocumented)
-    readonly getByType: (type: IndexPatternField['type']) => any[];
-    // (undocumented)
-    readonly remove: (field: IFieldType) => void;
-    // (undocumented)
-    readonly removeAll: () => void;
-    // (undocumented)
-    readonly replaceAll: (specs: FieldSpec[]) => void;
-    // (undocumented)
-    readonly toSpec: () => {
-        count: number;
-        script: string | undefined;
-        lang: string | undefined;
-        conflictDescriptions: Record<string, string[]> | undefined;
-        name: string;
-        type: string;
-        esTypes: string[] | undefined;
-        scripted: boolean;
-        searchable: boolean;
-        aggregatable: boolean;
-        readFromDocValues: boolean;
-        subType: import("../types").IFieldSubType | undefined;
-        format: any;
-    }[];
-    // (undocumented)
-    readonly update: (field: FieldSpec) => void;
-}
+export const fieldList: (specs?: FieldSpec[], shortDotsEnable?: boolean) => IIndexPatternFieldList;
 
 // @public (undocumented)
 export interface FieldMappingSpec {
@@ -868,7 +833,9 @@ export interface IFieldType {
     // (undocumented)
     subType?: IFieldSubType;
     // (undocumented)
-    toSpec?: () => FieldSpec;
+    toSpec?: (options?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }) => FieldSpec;
     // (undocumented)
     type: string;
     // (undocumented)
@@ -919,6 +886,10 @@ export interface IIndexPatternFieldList extends Array<IndexPatternField> {
     // (undocumented)
     replaceAll(specs: FieldSpec[]): void;
     // (undocumented)
+    toSpec(options?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }): FieldSpec[];
+    // (undocumented)
     update(field: FieldSpec): void;
 }
 
@@ -1100,7 +1071,7 @@ export interface IndexPatternAttributes {
 //
 // @public (undocumented)
 export class IndexPatternField implements IFieldType {
-    constructor(indexPattern: IndexPattern, spec: FieldSpec, displayName: string, onNotification: OnNotification);
+    constructor(spec: FieldSpec, displayName: string);
     // (undocumented)
     get aggregatable(): boolean;
     // (undocumented)
@@ -1116,10 +1087,6 @@ export class IndexPatternField implements IFieldType {
     // (undocumented)
     get filterable(): boolean;
     // (undocumented)
-    get format(): FieldFormat;
-    // (undocumented)
-    readonly indexPattern: IndexPattern;
-    // (undocumented)
     get lang(): string | undefined;
     set lang(lang: string | undefined);
     // (undocumented)
@@ -1155,7 +1122,9 @@ export class IndexPatternField implements IFieldType {
         subType: import("../types").IFieldSubType | undefined;
     };
     // (undocumented)
-    toSpec(): {
+    toSpec({ getFormatterForField, }?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }): {
         count: number;
         script: string | undefined;
         lang: string | undefined;
@@ -1168,7 +1137,10 @@ export class IndexPatternField implements IFieldType {
         aggregatable: boolean;
         readFromDocValues: boolean;
         subType: import("../types").IFieldSubType | undefined;
-        format: any;
+        format: {
+            id: any;
+            params: any;
+        } | undefined;
     };
     // (undocumented)
     get type(): string;
diff --git a/src/plugins/data/public/search/expressions/create_filter.test.ts b/src/plugins/data/public/search/expressions/create_filter.test.ts
index 7968c806285318..7cc336a1c20e96 100644
--- a/src/plugins/data/public/search/expressions/create_filter.test.ts
+++ b/src/plugins/data/public/search/expressions/create_filter.test.ts
@@ -52,6 +52,7 @@ describe('createFilter', () => {
         getByName: () => field,
         filter: () => [field],
       },
+      getFormatterForField: () => new BytesFormat({}, (() => {}) as FieldFormatsGetConfigFn),
     } as any;
 
     return new AggConfigs(
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 9f114f21320098..9497a41b45ff9c 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -565,7 +565,9 @@ export interface IFieldType {
     // Warning: (ae-forgotten-export) The symbol "FieldSpec" needs to be exported by the entry point index.d.ts
     //
     // (undocumented)
-    toSpec?: () => FieldSpec;
+    toSpec?: (options?: {
+        getFormatterForField?: IndexPattern['getFormatterForField'];
+    }) => FieldSpec;
     // (undocumented)
     type: string;
     // (undocumented)
@@ -1063,6 +1065,7 @@ export function usageProvider(core: CoreSetup_2): SearchUsage;
 
 // Warnings were encountered during analysis:
 //
+// src/plugins/data/common/index_patterns/fields/types.ts:41:25 - (ae-forgotten-export) The symbol "IndexPattern" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:40:23 - (ae-forgotten-export) The symbol "buildCustomFilter" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:40:23 - (ae-forgotten-export) The symbol "buildFilter" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:71:21 - (ae-forgotten-export) The symbol "getEsQueryConfig" needs to be exported by the entry point index.d.ts
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
index 6d1238e02c7fb9..b03b37da40908d 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
@@ -62,7 +62,6 @@ function getComponent(selected = false, showDetails = false, useShortDots = fals
   );
 
   const field = new IndexPatternField(
-    indexPattern,
     {
       name: 'bytes',
       type: 'number',
@@ -73,8 +72,7 @@ function getComponent(selected = false, showDetails = false, useShortDots = fals
       aggregatable: true,
       readFromDocValues: true,
     },
-    'bytes',
-    () => {}
+    'bytes'
   );
 
   const props = {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index 1f27766a1756d3..361c0707fef6b4 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -111,8 +111,8 @@ export function DiscoverSidebar({
   );
 
   const getDetailsByField = useCallback(
-    (ipField: IndexPatternField) => getDetails(ipField, hits, columns),
-    [hits, columns]
+    (ipField: IndexPatternField) => getDetails(ipField, hits, columns, selectedIndexPattern),
+    [hits, columns, selectedIndexPattern]
   );
 
   const popularLimit = services.uiSettings.get(FIELDS_LIMIT_SETTING);
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js
index e055d644e1f915..0ee279ac5b7272 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js
+++ b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js
@@ -20,9 +20,9 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 
-function getFieldValues(hits, field) {
+function getFieldValues(hits, field, indexPattern) {
   const name = field.name;
-  const flattenHit = field.indexPattern.flattenHit;
+  const flattenHit = indexPattern.flattenHit;
   return _.map(hits, function (hit) {
     return flattenHit(hit)[name];
   });
@@ -49,7 +49,7 @@ function getFieldValueCounts(params) {
     };
   }
 
-  const allValues = getFieldValues(params.hits, params.field);
+  const allValues = getFieldValues(params.hits, params.field, params.indexPattern);
   let counts;
   const missing = _countMissing(allValues);
 
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
index 87401818c49073..8746883a5d9680 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
@@ -148,7 +148,8 @@ describe('fieldCalculator', function () {
     it('Should return an array of values for _source fields', function () {
       const extensions = fieldCalculator.getFieldValues(
         hits,
-        indexPattern.fields.getByName('extension')
+        indexPattern.fields.getByName('extension'),
+        indexPattern
       );
       expect(extensions).toBeInstanceOf(Array);
       expect(
@@ -160,7 +161,11 @@ describe('fieldCalculator', function () {
     });
 
     it('Should return an array of values for core meta fields', function () {
-      const types = fieldCalculator.getFieldValues(hits, indexPattern.fields.getByName('_type'));
+      const types = fieldCalculator.getFieldValues(
+        hits,
+        indexPattern.fields.getByName('_type'),
+        indexPattern
+      );
       expect(types).toBeInstanceOf(Array);
       expect(
         _.filter(types, function (v) {
@@ -172,12 +177,13 @@ describe('fieldCalculator', function () {
   });
 
   describe('getFieldValueCounts', function () {
-    let params: { hits: any; field: any; count: number };
+    let params: { hits: any; field: any; count: number; indexPattern: IndexPattern };
     beforeEach(function () {
       params = {
         hits: _.cloneDeep(realHits),
         field: indexPattern.fields.getByName('extension'),
         count: 3,
+        indexPattern,
       };
     });
 
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts b/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
index 41d3393672474b..13051f88c9591a 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
@@ -19,17 +19,19 @@
 
 // @ts-ignore
 import { fieldCalculator } from './field_calculator';
-import { IndexPatternField } from '../../../../../../data/public';
+import { IndexPattern, IndexPatternField } from '../../../../../../data/public';
 
 export function getDetails(
   field: IndexPatternField,
   hits: Array<Record<string, unknown>>,
-  columns: string[]
+  columns: string[],
+  indexPattern: IndexPattern
 ) {
   const details = {
     ...fieldCalculator.getFieldValueCounts({
       hits,
       field,
+      indexPattern,
       count: 5,
       grouped: false,
     }),
@@ -37,7 +39,7 @@ export function getDetails(
   };
   if (details.buckets) {
     for (const bucket of details.buckets) {
-      bucket.display = field.format.convert(bucket.value);
+      bucket.display = indexPattern.getFormatterForField(field).convert(bucket.value);
     }
   }
   return details;
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts b/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
index 00e00aa8e29913..c96a8f5ce17b98 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
+++ b/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
@@ -31,6 +31,7 @@ export function getIndexPatternFieldList(
 
   difference(fieldNamesInDocs, fieldNamesInIndexPattern).forEach((unknownFieldName) => {
     unknownTypes.push({
+      displayName: String(unknownFieldName),
       name: String(unknownFieldName),
       type: 'unknown',
     } as IndexPatternField);
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
index 47cabc4df662f0..45253f6ad27c03 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/__snapshots__/indexed_fields_table.test.tsx.snap
@@ -15,13 +15,10 @@ exports[`IndexedFieldsTable should filter based on the query bar 1`] = `
           "displayName": "Elastic",
           "excluded": false,
           "format": undefined,
-          "indexPattern": Object {
-            "getNonScriptedFields": [Function],
-          },
           "info": Array [],
           "name": "Elastic",
           "searchable": true,
-          "type": "name",
+          "type": "string",
         },
       ]
     }
@@ -44,9 +41,6 @@ exports[`IndexedFieldsTable should filter based on the type filter 1`] = `
           "displayName": "timestamp",
           "excluded": false,
           "format": undefined,
-          "indexPattern": Object {
-            "getNonScriptedFields": [Function],
-          },
           "info": Array [],
           "name": "timestamp",
           "type": "date",
@@ -72,21 +66,15 @@ exports[`IndexedFieldsTable should render normally 1`] = `
           "displayName": "Elastic",
           "excluded": false,
           "format": undefined,
-          "indexPattern": Object {
-            "getNonScriptedFields": [Function],
-          },
           "info": Array [],
           "name": "Elastic",
           "searchable": true,
-          "type": "name",
+          "type": "string",
         },
         Object {
           "displayName": "timestamp",
           "excluded": false,
           "format": undefined,
-          "indexPattern": Object {
-            "getNonScriptedFields": [Function],
-          },
           "info": Array [],
           "name": "timestamp",
           "type": "date",
@@ -95,9 +83,6 @@ exports[`IndexedFieldsTable should render normally 1`] = `
           "displayName": "conflictingField",
           "excluded": false,
           "format": undefined,
-          "indexPattern": Object {
-            "getNonScriptedFields": [Function],
-          },
           "info": Array [],
           "name": "conflictingField",
           "type": "conflict",
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
index 411bbe23e47618..319b9b2b3fce2a 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.test.tsx
@@ -19,7 +19,7 @@
 
 import React from 'react';
 import { shallow } from 'enzyme';
-import { IndexPatternField, IIndexPattern, IndexPattern } from 'src/plugins/data/public';
+import { IndexPatternField, IIndexPattern } from 'src/plugins/data/public';
 import { IndexedFieldsTable } from './indexed_fields_table';
 
 jest.mock('@elastic/eui', () => ({
@@ -47,10 +47,8 @@ const indexPattern = ({
 
 const mockFieldToIndexPatternField = (spec: Record<string, string | boolean | undefined>) => {
   return new IndexPatternField(
-    indexPattern as IndexPattern,
     (spec as unknown) as IndexPatternField['spec'],
-    spec.displayName as string,
-    () => {}
+    spec.displayName as string
   );
 };
 
@@ -59,7 +57,7 @@ const fields = [
     name: 'Elastic',
     displayName: 'Elastic',
     searchable: true,
-    type: 'name',
+    type: 'string',
   },
   { name: 'timestamp', displayName: 'timestamp', type: 'date' },
   { name: 'conflictingField', displayName: 'conflictingField', type: 'conflict' },
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
index 90f81a88b3da05..23977aac7fa7a2 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/indexed_fields_table.tsx
@@ -77,7 +77,6 @@ export class IndexedFieldsTable extends Component<
           return {
             ...field.spec,
             displayName: field.displayName,
-            indexPattern: field.indexPattern,
             format: getFieldFormat(indexPattern, field.name),
             excluded: fieldWildcardMatch ? fieldWildcardMatch(field.name) : false,
             info: helpers.getFieldInfo && helpers.getFieldInfo(indexPattern, field),
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx
index 6c9d6db8de130e..3bc9cd34f29841 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/tabs.tsx
@@ -176,7 +176,7 @@ export function Tabs({ indexPattern, fields, history, location }: TabsProps) {
                 indexedFieldTypeFilter={indexedFieldTypeFilter}
                 helpers={{
                   redirectToRoute: (field: IndexPatternField) => {
-                    history.push(getPath(field));
+                    history.push(getPath(field, indexPattern));
                   },
                   getFieldInfo: indexPatternManagementStart.list.getFieldInfo,
                 }}
@@ -195,7 +195,7 @@ export function Tabs({ indexPattern, fields, history, location }: TabsProps) {
                 scriptedFieldLanguageFilter={scriptedFieldLanguageFilter}
                 helpers={{
                   redirectToRoute: (field: IndexPatternField) => {
-                    history.push(getPath(field));
+                    history.push(getPath(field, indexPattern));
                   },
                 }}
                 onRemoveField={refreshFilters}
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts
index b422de93de7a97..91c5cc1afdb49e 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/tabs/utils.ts
@@ -116,8 +116,8 @@ export function getTabs(
   return tabs;
 }
 
-export function getPath(field: IndexPatternField) {
-  return `/patterns/${field.indexPattern?.id}/field/${field.name}`;
+export function getPath(field: IndexPatternField, indexPattern: IndexPattern) {
+  return `/patterns/${indexPattern?.id}/field/${field.name}`;
 }
 
 const allTypesDropDown = i18n.translate(
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
index 96d3fc549ece01..b0385a61a72ace 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.test.tsx
@@ -138,12 +138,12 @@ describe('FieldEditor', () => {
       name: 'test',
       script: 'doc.test.value',
     };
-    fieldList.push(testField as IndexPatternField);
+    fieldList.push((testField as unknown) as IndexPatternField);
     indexPattern.fields.getByName = (name) => {
       const flds = {
         [testField.name]: testField,
       };
-      return flds[name] as IndexPatternField;
+      return (flds[name] as unknown) as IndexPatternField;
     };
 
     const component = createComponentWithContext<FieldEdiorProps>(
@@ -173,7 +173,7 @@ describe('FieldEditor', () => {
       const flds = {
         [testField.name]: testField,
       };
-      return flds[name] as IndexPatternField;
+      return (flds[name] as unknown) as IndexPatternField;
     };
 
     const component = createComponentWithContext<FieldEdiorProps>(
diff --git a/src/plugins/input_control_vis/public/control/control.ts b/src/plugins/input_control_vis/public/control/control.ts
index 91e8f1b26164ba..da2dc7bab7cf7a 100644
--- a/src/plugins/input_control_vis/public/control/control.ts
+++ b/src/plugins/input_control_vis/public/control/control.ts
@@ -81,9 +81,10 @@ export abstract class Control<FilterManager extends BaseFilterManager> {
   abstract destroy(): void;
 
   format = (value: any) => {
+    const indexPattern = this.filterManager.getIndexPattern();
     const field = this.filterManager.getField();
-    if (field?.format?.convert) {
-      return field.format.convert(value);
+    if (field) {
+      return indexPattern.getFormatterForField(field).convert(value);
     }
 
     return value;
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
index f7b65930b683d4..3289610a062b0e 100644
--- a/src/test_utils/public/stub_index_pattern.js
+++ b/src/test_utils/public/stub_index_pattern.js
@@ -22,7 +22,7 @@ import sinon from 'sinon';
 // because it is one of the few places that we need to access the IndexPattern class itself, rather
 // than just the type. Doing this as a temporary measure; it will be left behind when migrating to NP.
 
-import { IndexPattern, indexPatterns, KBN_FIELD_TYPES, FieldList } from '../../plugins/data/public';
+import { IndexPattern, indexPatterns, KBN_FIELD_TYPES, fieldList } from '../../plugins/data/public';
 
 import { setFieldFormats } from '../../plugins/data/public/services';
 
@@ -64,7 +64,7 @@ export default function StubIndexPattern(pattern, getConfig, timeField, fields,
   });
 
   this._reindexFields = function () {
-    this.fields = new FieldList(this, this.fields || fields, false);
+    this.fields = fieldList(this.fields || fields, false);
   };
 
   this.stubSetFieldFormat = function (fieldName, id, params) {
diff --git a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
index 56b830e9ff0983..d51ca46fd98fff 100644
--- a/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
+++ b/x-pack/plugins/maps/public/classes/sources/es_source/es_source.js
@@ -281,7 +281,7 @@ export class AbstractESSource extends AbstractVectorSource {
       return null;
     }
 
-    return fieldFromIndexPattern.format.getConverterFor('text');
+    return indexPattern.getFormatterForField(fieldFromIndexPattern).getConverterFor('text');
   }
 
   async loadStylePropsMeta(
diff --git a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.ts b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.ts
index 516ad25f933f66..348cd5e5522582 100644
--- a/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.ts
+++ b/x-pack/plugins/maps/public/classes/tooltips/es_tooltip_property.ts
@@ -10,8 +10,8 @@ import { IField } from '../fields/field';
 import {
   esFilters,
   Filter,
-  IFieldType,
   IndexPattern,
+  IndexPatternField,
 } from '../../../../../../src/plugins/data/public';
 
 export class ESTooltipProperty implements ITooltipProperty {
@@ -37,7 +37,7 @@ export class ESTooltipProperty implements ITooltipProperty {
     return this._tooltipProperty.getRawValue();
   }
 
-  _getIndexPatternField(): IFieldType | undefined {
+  _getIndexPatternField(): IndexPatternField | undefined {
     return this._indexPattern.fields.getByName(this._field.getRootName());
   }
 
@@ -56,10 +56,11 @@ export class ESTooltipProperty implements ITooltipProperty {
       }
     }
 
-    const htmlConverter = indexPatternField.format.getConverterFor('html');
+    const formatter = this._indexPattern.getFormatterForField(indexPatternField);
+    const htmlConverter = formatter.getConverterFor('html');
     return htmlConverter
       ? htmlConverter(this.getRawValue())
-      : indexPatternField.format.convert(this.getRawValue());
+      : formatter.convert(this.getRawValue());
   }
 
   isFilterable(): boolean {
diff --git a/x-pack/plugins/ml/public/application/services/field_format_service.ts b/x-pack/plugins/ml/public/application/services/field_format_service.ts
index 1a5d22e7320a58..b66dac15b13647 100644
--- a/x-pack/plugins/ml/public/application/services/field_format_service.ts
+++ b/x-pack/plugins/ml/public/application/services/field_format_service.ts
@@ -77,7 +77,7 @@ class FieldFormatService {
       const fieldList = fullIndexPattern.fields;
       const field = fieldList.getByName(fieldName);
       if (field !== undefined) {
-        fieldFormat = field.format;
+        fieldFormat = fullIndexPattern.getFormatterForField(field);
       }
     }
 
@@ -104,7 +104,9 @@ class FieldFormatService {
               if (dtr.field_name !== undefined && esAgg !== 'cardinality') {
                 const field = fieldList.getByName(dtr.field_name);
                 if (field !== undefined) {
-                  formatsByDetector[dtr.detector_index!] = field.format;
+                  formatsByDetector[dtr.detector_index!] = indexPatternData.getFormatterForField(
+                    field
+                  );
                 }
               }
             });
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
index 0d98a0f2f26ff5..073cb46d3949a3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/helpers.test.tsx
@@ -140,7 +140,11 @@ describe('helpers', () => {
         filterManager: mockFilterManager,
         query: mockQueryBarWithFilters.query,
         savedId: mockQueryBarWithFilters.saved_id,
-        indexPatterns: { fields: [{ name: 'test name', type: 'test type' }], title: 'test title' },
+        indexPatterns: {
+          fields: [{ name: 'event.category', type: 'test type' }],
+          title: 'test title',
+          getFormatterForField: () => ({ convert: (val: unknown) => val }),
+        },
       });
       const wrapper = shallow<React.ReactElement>(result[0].description as React.ReactElement);
       const filterLabelComponent = wrapper.find(esFilters.FilterLabel).at(0);

From 9519fcd4a22d48c1ae8c01784d73acd4e67f9e19 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Wed, 2 Sep 2020 15:08:43 -0600
Subject: [PATCH 196/216] Fix issue where defaultAppId redirect could fire
 outside home app (#76415)

---
 src/plugins/home/public/application/application.tsx | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/home/public/application/application.tsx b/src/plugins/home/public/application/application.tsx
index 5d71bf8651d88a..a4a158bc7dbde5 100644
--- a/src/plugins/home/public/application/application.tsx
+++ b/src/plugins/home/public/application/application.tsx
@@ -47,6 +47,13 @@ export const renderApp = async (
 
   chrome.setBreadcrumbs([{ text: homeTitle }]);
 
+  // dispatch synthetic hash change event to update hash history objects
+  // this is necessary because hash updates triggered by using popState won't trigger this event naturally.
+  // This must be called before the app is mounted to avoid call this after the redirect to default app logic kicks in
+  const unlisten = history.listen((location) => {
+    window.dispatchEvent(new HashChangeEvent('hashchange'));
+  });
+
   render(
     <KibanaContextProvider services={{ ...coreStart }}>
       <HomeApp directories={directories} solutions={solutions} />
@@ -54,12 +61,6 @@ export const renderApp = async (
     element
   );
 
-  // dispatch synthetic hash change event to update hash history objects
-  // this is necessary because hash updates triggered by using popState won't trigger this event naturally.
-  const unlisten = history.listen(() => {
-    window.dispatchEvent(new HashChangeEvent('hashchange'));
-  });
-
   return () => {
     unmountComponentAtNode(element);
     unlisten();

From 1ffe24955cc72e2453b6f643a0f38876fa394ad3 Mon Sep 17 00:00:00 2001
From: Constance <constancecchen@users.noreply.github.com>
Date: Wed, 2 Sep 2020 14:53:58 -0700
Subject: [PATCH 197/216] Split up and clarify Enterprise Search codeowners
 (#76580)

@elastic/enterprise-search-frontend is a shared team of both app-search-frontend and workplace-search-frontend, but combining it into one group means only 1 reviewer is required (as opposed to 1 per team).
---
 .github/CODEOWNERS | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1d0f6fc50ee9ba..b4563dd1f9a9c0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -209,8 +209,19 @@ x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json @elastic/kib
 /x-pack/test/functional_with_es_ssl/fixtures/plugins/alerts/ @elastic/kibana-alerting-services
 
 # 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
+# Shared
+/x-pack/plugins/enterprise_search/ @elastic/enterprise-search-frontend
+/x-pack/test/functional_enterprise_search/ @elastic/enterprise-search-frontend
+# App Search
+/x-pack/plugins/enterprise_search/public/applications/app_search @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/app_search @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/app_search @elastic/app-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/app_search @elastic/app-search-frontend
+# Workplace Search
+/x-pack/plugins/enterprise_search/public/applications/workplace_search @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/routes/workplace_search @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/collectors/workplace_search @elastic/workplace-search-frontend
+/x-pack/plugins/enterprise_search/server/saved_objects/workplace_search @elastic/workplace-search-frontend
 
 # Elasticsearch UI
 /src/plugins/dev_tools/ @elastic/es-ui

From 46aef4b1e0594e41c51a6b4ed0ba069872c5bc33 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 2 Sep 2020 15:18:37 -0700
Subject: [PATCH 198/216] skip failing suite (#76581)

---
 .../reporting_api_integration/reporting_and_security/usage.ts  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
index feda5c1386e98d..49db8696c11349 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
@@ -21,7 +21,8 @@ export default function ({ getService }: FtrProviderContext) {
   const reportingAPI = getService('reportingAPI');
   const usageAPI = getService('usageAPI');
 
-  describe('Usage', () => {
+  // FAILING: https://github.com/elastic/kibana/issues/76581
+  describe.skip('Usage', () => {
     before(async () => {
       await esArchiver.load(OSS_KIBANA_ARCHIVE_PATH);
       await esArchiver.load(OSS_DATA_ARCHIVE_PATH);

From ee2ceef9bb904e18487441fe5f0853f2f9a3967a Mon Sep 17 00:00:00 2001
From: Matthew Kime <matt@mattki.me>
Date: Wed, 2 Sep 2020 17:20:14 -0500
Subject: [PATCH 199/216] Index Pattern class - remove toJSON and toString
 (#76246)

* remove toJSON

* remove toJSON, toString

* fix ml url

* Update actions_panel.tsx

* fix url

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 ...ana-plugin-plugins-data-public.indexpattern.md |  2 --
 ...gin-plugins-data-public.indexpattern.tojson.md | 15 ---------------
 ...n-plugins-data-public.indexpattern.tostring.md | 15 ---------------
 .../index_patterns/index_pattern.test.ts          |  2 --
 .../index_patterns/index_pattern.ts               |  8 --------
 src/plugins/data/public/public.api.md             |  4 ----
 .../components/actions_panel/actions_panel.tsx    |  6 ++++--
 7 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tojson.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tostring.md

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 37db063e284ec3..4c53af3f8970ed 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
@@ -61,7 +61,5 @@ export declare class IndexPattern implements IIndexPattern
 |  [refreshFields()](./kibana-plugin-plugins-data-public.indexpattern.refreshfields.md) |  |  |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  |  |
 |  [save(saveAttempts)](./kibana-plugin-plugins-data-public.indexpattern.save.md) |  |  |
-|  [toJSON()](./kibana-plugin-plugins-data-public.indexpattern.tojson.md) |  |  |
 |  [toSpec()](./kibana-plugin-plugins-data-public.indexpattern.tospec.md) |  |  |
-|  [toString()](./kibana-plugin-plugins-data-public.indexpattern.tostring.md) |  |  |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tojson.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tojson.md
deleted file mode 100644
index 0ae04bb424d44c..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tojson.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 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; [toJSON](./kibana-plugin-plugins-data-public.indexpattern.tojson.md)
-
-## IndexPattern.toJSON() method
-
-<b>Signature:</b>
-
-```typescript
-toJSON(): string | undefined;
-```
-<b>Returns:</b>
-
-`string | undefined`
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tostring.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tostring.md
deleted file mode 100644
index a10b549a7b9ebb..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.tostring.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- 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; [toString](./kibana-plugin-plugins-data-public.indexpattern.tostring.md)
-
-## IndexPattern.toString() method
-
-<b>Signature:</b>
-
-```typescript
-toString(): string;
-```
-<b>Returns:</b>
-
-`string`
-
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 2350cbb67683ef..f037a71b508a27 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
@@ -151,8 +151,6 @@ describe('IndexPattern', () => {
       expect(indexPattern).toHaveProperty('getNonScriptedFields');
       expect(indexPattern).toHaveProperty('addScriptedField');
       expect(indexPattern).toHaveProperty('removeScriptedField');
-      expect(indexPattern).toHaveProperty('toString');
-      expect(indexPattern).toHaveProperty('toJSON');
       expect(indexPattern).toHaveProperty('save');
 
       // properties
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 c82bf7d759328a..2feeb5441ab836 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
@@ -650,12 +650,4 @@ export class IndexPattern implements IIndexPattern {
         });
       });
   }
-
-  toJSON() {
-    return this.id;
-  }
-
-  toString() {
-    return '' + this.toJSON();
-  }
 }
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index b09e957944b657..e72fea160cc288 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -1022,12 +1022,8 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     title: string;
     // (undocumented)
-    toJSON(): string | undefined;
-    // (undocumented)
     toSpec(): IndexPatternSpec;
     // (undocumented)
-    toString(): string;
-    // (undocumented)
     type: string | undefined;
     // (undocumented)
     typeMeta?: IndexPatternTypeMeta;
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
index 16d9e0c5418fa4..1f2c97b128e3f8 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
@@ -13,6 +13,7 @@ import { EuiSpacer, EuiText, EuiTitle, EuiFlexGroup } from '@elastic/eui';
 import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
 import { CreateJobLinkCard } from '../../../../components/create_job_link_card';
 import { DataRecognizer } from '../../../../components/data_recognizer';
+import { getBasePath } from '../../../../util/dependency_cache';
 
 interface Props {
   indexPattern: IndexPattern;
@@ -20,6 +21,7 @@ interface Props {
 
 export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
   const [recognizerResultsCount, setRecognizerResultsCount] = useState(0);
+  const basePath = getBasePath();
 
   const recognizerResults = {
     count: 0,
@@ -31,7 +33,7 @@ export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
   function openAdvancedJobWizard() {
     // TODO - pass the search string to the advanced job page as well as the index pattern
     //       (add in with new advanced job wizard?)
-    window.open(`#/jobs/new_job/advanced?index=${indexPattern}`, '_self');
+    window.open(`${basePath.get()}/app/ml/jobs/new_job/advanced?index=${indexPattern.id}`, '_self');
   }
 
   // Note we use display:none for the DataRecognizer section as it needs to be
@@ -86,7 +88,7 @@ export const ActionsPanel: FC<Props> = ({ indexPattern }) => {
             'Use the full range of options to create a job for more advanced use cases',
         })}
         onClick={openAdvancedJobWizard}
-        href={`#/jobs/new_job/advanced?index=${indexPattern}`}
+        href={`${basePath.get()}/app/ml/jobs/new_job/advanced?index=${indexPattern.id}`}
         data-test-subj="mlDataVisualizerCreateAdvancedJobCard"
       />
     </div>

From aab8d3c7ddf97306f00c219f6ab30d6e4cec2618 Mon Sep 17 00:00:00 2001
From: Yara Tercero <yctercero@users.noreply.github.com>
Date: Wed, 2 Sep 2020 20:07:40 -0400
Subject: [PATCH 200/216] [Security Solution][Exceptions] - Updates enum schema
 and tests (#76544)

## Summary

Mistmatch caught between the io-ts type and the corresponding typescript enum. Currently, io-ts does not have support for enums - as a workaround I had made a matching typescript enum type. Tests were added to try to ensure the two stayed in sync, but didn't do a straight up comparison of the two.

Updated the tests to now error if the keys do not match.
---
 .../common/schemas/common/schemas.test.ts     | 66 +++----------------
 .../lists/common/schemas/common/schemas.ts    |  7 --
 x-pack/plugins/lists/common/shared_exports.ts |  1 -
 .../common/shared_imports.ts                  |  1 -
 4 files changed, 10 insertions(+), 65 deletions(-)

diff --git a/x-pack/plugins/lists/common/schemas/common/schemas.test.ts b/x-pack/plugins/lists/common/schemas/common/schemas.test.ts
index fad8ecc86277bd..ec3871b6738883 100644
--- a/x-pack/plugins/lists/common/schemas/common/schemas.test.ts
+++ b/x-pack/plugins/lists/common/schemas/common/schemas.test.ts
@@ -16,6 +16,8 @@ import {
   EsDataTypeRangeTerm,
   EsDataTypeSingle,
   EsDataTypeUnion,
+  ExceptionListTypeEnum,
+  OperatorEnum,
   Type,
   esDataTypeGeoPoint,
   esDataTypeGeoPointRange,
@@ -25,60 +27,10 @@ import {
   esDataTypeUnion,
   exceptionListType,
   operator,
-  operator_type as operatorType,
   type,
 } from './schemas';
 
 describe('Common schemas', () => {
-  describe('operatorType', () => {
-    test('it should validate for "match"', () => {
-      const payload = 'match';
-      const decoded = operatorType.decode(payload);
-      const message = pipe(decoded, foldLeftRight);
-
-      expect(getPaths(left(message.errors))).toEqual([]);
-      expect(message.schema).toEqual(payload);
-    });
-
-    test('it should validate for "match_any"', () => {
-      const payload = 'match_any';
-      const decoded = operatorType.decode(payload);
-      const message = pipe(decoded, foldLeftRight);
-
-      expect(getPaths(left(message.errors))).toEqual([]);
-      expect(message.schema).toEqual(payload);
-    });
-
-    test('it should validate for "list"', () => {
-      const payload = 'list';
-      const decoded = operatorType.decode(payload);
-      const message = pipe(decoded, foldLeftRight);
-
-      expect(getPaths(left(message.errors))).toEqual([]);
-      expect(message.schema).toEqual(payload);
-    });
-
-    test('it should validate for "exists"', () => {
-      const payload = 'exists';
-      const decoded = operatorType.decode(payload);
-      const message = pipe(decoded, foldLeftRight);
-
-      expect(getPaths(left(message.errors))).toEqual([]);
-      expect(message.schema).toEqual(payload);
-    });
-
-    test('it should contain 4 keys', () => {
-      // Might seem like a weird test, but its meant to
-      // ensure that if operatorType is updated, you
-      // also update the OperatorTypeEnum, a workaround
-      // for io-ts not yet supporting enums
-      // https://github.com/gcanti/io-ts/issues/67
-      const keys = Object.keys(operatorType.keys);
-
-      expect(keys.length).toEqual(4);
-    });
-  });
-
   describe('operator', () => {
     test('it should validate for "included"', () => {
       const payload = 'included';
@@ -98,15 +50,16 @@ describe('Common schemas', () => {
       expect(message.schema).toEqual(payload);
     });
 
-    test('it should contain 2 keys', () => {
+    test('it should contain same amount of keys as enum', () => {
       // Might seem like a weird test, but its meant to
       // ensure that if operator is updated, you
       // also update the operatorEnum, a workaround
       // for io-ts not yet supporting enums
       // https://github.com/gcanti/io-ts/issues/67
-      const keys = Object.keys(operator.keys);
+      const keys = Object.keys(operator.keys).sort().join(',').toLowerCase();
+      const enumKeys = Object.keys(OperatorEnum).sort().join(',').toLowerCase();
 
-      expect(keys.length).toEqual(2);
+      expect(keys).toEqual(enumKeys);
     });
   });
 
@@ -129,15 +82,16 @@ describe('Common schemas', () => {
       expect(message.schema).toEqual(payload);
     });
 
-    test('it should contain 2 keys', () => {
+    test('it should contain same amount of keys as enum', () => {
       // Might seem like a weird test, but its meant to
       // ensure that if exceptionListType is updated, you
       // also update the ExceptionListTypeEnum, a workaround
       // for io-ts not yet supporting enums
       // https://github.com/gcanti/io-ts/issues/67
-      const keys = Object.keys(exceptionListType.keys);
+      const keys = Object.keys(exceptionListType.keys).sort().join(',').toLowerCase();
+      const enumKeys = Object.keys(ExceptionListTypeEnum).sort().join(',').toLowerCase();
 
-      expect(keys.length).toEqual(2);
+      expect(keys).toEqual(enumKeys);
     });
   });
 
diff --git a/x-pack/plugins/lists/common/schemas/common/schemas.ts b/x-pack/plugins/lists/common/schemas/common/schemas.ts
index 1556ef5a5dab9d..37da5fbcd1a1b0 100644
--- a/x-pack/plugins/lists/common/schemas/common/schemas.ts
+++ b/x-pack/plugins/lists/common/schemas/common/schemas.ts
@@ -282,13 +282,6 @@ export enum OperatorEnum {
   EXCLUDED = 'excluded',
 }
 
-export const operator_type = t.keyof({
-  exists: null,
-  list: null,
-  match: null,
-  match_any: null,
-});
-export type OperatorType = t.TypeOf<typeof operator_type>;
 export enum OperatorTypeEnum {
   NESTED = 'nested',
   MATCH = 'match',
diff --git a/x-pack/plugins/lists/common/shared_exports.ts b/x-pack/plugins/lists/common/shared_exports.ts
index 1f6c65919b063a..361837bdef2291 100644
--- a/x-pack/plugins/lists/common/shared_exports.ts
+++ b/x-pack/plugins/lists/common/shared_exports.ts
@@ -25,7 +25,6 @@ export {
   NamespaceType,
   Operator,
   OperatorEnum,
-  OperatorType,
   OperatorTypeEnum,
   ExceptionListTypeEnum,
   comment,
diff --git a/x-pack/plugins/security_solution/common/shared_imports.ts b/x-pack/plugins/security_solution/common/shared_imports.ts
index e28d1969b39763..564254b6a75963 100644
--- a/x-pack/plugins/security_solution/common/shared_imports.ts
+++ b/x-pack/plugins/security_solution/common/shared_imports.ts
@@ -25,7 +25,6 @@ export {
   NamespaceType,
   Operator,
   OperatorEnum,
-  OperatorType,
   OperatorTypeEnum,
   ExceptionListTypeEnum,
   exceptionListItemSchema,

From 2f017b0e85c5e2e82d344a5fe8d8408a2faec502 Mon Sep 17 00:00:00 2001
From: Frank Hassanabad <frank.hassanabad@elastic.co>
Date: Wed, 2 Sep 2020 21:48:41 -0600
Subject: [PATCH 201/216] [Security Solution][Detection Engine] Remove
 RuleTypeSchema in favor of Type for TypeScript (#76586)

## Summary

Removes RuleTypeSchema in favor of Type for TypeScript. Does break out one function called `parseScheduleDates` into its own file to remove a circular ref issue.
---
 .../detection_engine/parse_schedule_dates.ts  | 20 +++++++++
 .../schemas/common/schemas.ts                 |  2 +-
 .../common/detection_engine/types.ts          | 10 -----
 .../common/detection_engine/utils.ts          | 19 +--------
 .../common/machine_learning/helpers.ts        |  4 +-
 .../timeline_actions/alert_context_menu.tsx   |  5 +--
 .../rules/description_step/helpers.tsx        |  5 +--
 .../rules/description_step/index.tsx          |  4 +-
 .../rules/select_rule_type/index.tsx          |  6 +--
 .../detection_engine/rules/types.ts           |  6 +--
 .../detection_engine/rules/create/helpers.ts  |  6 +--
 .../pages/detection_engine/rules/helpers.tsx  | 41 ++++++++++---------
 .../pages/detection_engine/rules/types.ts     |  7 ++--
 .../rules_notification_alert_type.ts          |  2 +-
 .../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     |  3 +-
 .../server/lib/detection_engine/types.ts      |  4 +-
 .../server/lib/machine_learning/authz.ts      |  6 +--
 20 files changed, 77 insertions(+), 80 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/common/detection_engine/parse_schedule_dates.ts

diff --git a/x-pack/plugins/security_solution/common/detection_engine/parse_schedule_dates.ts b/x-pack/plugins/security_solution/common/detection_engine/parse_schedule_dates.ts
new file mode 100644
index 00000000000000..b21cd84684fbc2
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/detection_engine/parse_schedule_dates.ts
@@ -0,0 +1,20 @@
+/*
+ * 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 moment from 'moment';
+import dateMath from '@elastic/datemath';
+
+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/common/detection_engine/schemas/common/schemas.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
index 64f2f223a3073c..a9f39d2db6080f 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
@@ -14,7 +14,7 @@ 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';
+import { parseScheduleDates } from '../../parse_schedule_dates';
 
 export const author = t.array(t.string);
 export type Author = t.TypeOf<typeof author>;
diff --git a/x-pack/plugins/security_solution/common/detection_engine/types.ts b/x-pack/plugins/security_solution/common/detection_engine/types.ts
index 7c752bca49dbdf..e7aab2fa5d219e 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/types.ts
@@ -3,18 +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 * as t from 'io-ts';
-
 import { AlertAction } from '../../../alerts/common';
 
 export type RuleAlertAction = Omit<AlertAction, 'actionTypeId'> & {
   action_type_id: string;
 };
-
-export const RuleTypeSchema = t.keyof({
-  query: null,
-  saved_query: null,
-  machine_learning: null,
-  threshold: null,
-});
-export type RuleType = t.TypeOf<typeof RuleTypeSchema>;
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 a70258c2684b6c..a72d641fbaf783 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/utils.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/utils.ts
@@ -4,11 +4,8 @@
  * 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';
+import { Type } from './schemas/common/schemas';
 
 export const hasLargeValueList = (entries: EntriesArray): boolean => {
   const found = entries.filter(({ type }) => type === 'list');
@@ -20,16 +17,4 @@ export const hasNestedEntry = (entries: EntriesArray): boolean => {
   return found.length > 0;
 };
 
-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;
-};
+export const isThresholdRule = (ruleType: Type) => ruleType === 'threshold';
diff --git a/x-pack/plugins/security_solution/common/machine_learning/helpers.ts b/x-pack/plugins/security_solution/common/machine_learning/helpers.ts
index fe3eb79a6f6109..73dc30f238c7e1 100644
--- a/x-pack/plugins/security_solution/common/machine_learning/helpers.ts
+++ b/x-pack/plugins/security_solution/common/machine_learning/helpers.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RuleType } from '../detection_engine/types';
+import { Type } from '../detection_engine/schemas/common/schemas';
 
 // Based on ML Job/Datafeed States from x-pack/legacy/plugins/ml/common/constants/states.js
 const enabledStates = ['started', 'opened'];
@@ -23,4 +23,4 @@ export const isJobFailed = (jobState: string, datafeedState: string): boolean =>
   return failureStates.includes(jobState) || failureStates.includes(datafeedState);
 };
 
-export const isMlRule = (ruleType: RuleType) => ruleType === 'machine_learning';
+export const isMlRule = (ruleType: Type) => ruleType === 'machine_learning';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
index 589116c901c303..216ed0cbe264d3 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/timeline_actions/alert_context_menu.tsx
@@ -17,9 +17,8 @@ import styled from 'styled-components';
 
 import { TimelineId } from '../../../../../common/types/timeline';
 import { DEFAULT_INDEX_PATTERN } from '../../../../../common/constants';
-import { Status } from '../../../../../common/detection_engine/schemas/common/schemas';
+import { Status, Type } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { isThresholdRule } from '../../../../../common/detection_engine/utils';
-import { RuleType } from '../../../../../common/detection_engine/types';
 import { isMlRule } from '../../../../../common/machine_learning/helpers';
 import { timelineActions } from '../../../../timelines/store/timeline';
 import { EventsTd, EventsTdContent } from '../../../../timelines/components/timeline/styles';
@@ -409,7 +408,7 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
       data: nonEcsRowData,
       fieldName: 'signal.rule.type',
     });
-    const [ruleType] = ruleTypes as RuleType[];
+    const [ruleType] = ruleTypes as Type[];
     return !isMlRule(ruleType) && !isThresholdRule(ruleType);
   }, [nonEcsRowData]);
 
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 3a0a5b04c58740..680ca78fc222e8 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
@@ -24,8 +24,7 @@ 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';
-import { RuleType } from '../../../../../common/detection_engine/types';
+import { Threshold, Type } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { esFilters } from '../../../../../../../../src/plugins/data/public';
 
 import { tacticsOptions, techniquesOptions } from '../../../mitre/mitre_tactics_techniques';
@@ -357,7 +356,7 @@ export const buildNoteDescription = (label: string, note: string): ListItems[] =
   return [];
 };
 
-export const buildRuleTypeDescription = (label: string, ruleType: RuleType): ListItems[] => {
+export const buildRuleTypeDescription = (label: string, ruleType: Type): ListItems[] => {
   switch (ruleType) {
     case 'machine_learning': {
       return [
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
index 00141c9a453d82..cf27fa97b14794 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx
@@ -9,7 +9,6 @@ import { isEmpty, chunk, get, pick, isNumber } from 'lodash/fp';
 import React, { memo, useState } from 'react';
 import styled from 'styled-components';
 
-import { RuleType } from '../../../../../common/detection_engine/types';
 import {
   IIndexPattern,
   Filter,
@@ -42,6 +41,7 @@ import { useSecurityJobs } from '../../../../common/components/ml_popover/hooks/
 import { buildMlJobDescription } from './ml_job_description';
 import { buildActionsDescription } from './actions_description';
 import { buildThrottleDescription } from './throttle_description';
+import { Type } from '../../../../../common/detection_engine/schemas/common/schemas';
 
 const DescriptionListContainer = styled(EuiDescriptionList)`
   &.euiDescriptionList--column .euiDescriptionList__title {
@@ -211,7 +211,7 @@ export const getDescriptionItem = (
     const val: string = get(field, data);
     return buildNoteDescription(label, val);
   } else if (field === 'ruleType') {
-    const ruleType: RuleType = get(field, data);
+    const ruleType: Type = get(field, data);
     return buildRuleTypeDescription(label, ruleType);
   } else if (field === 'kibanaSiemAppUrl') {
     return [];
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx
index c6ea269e1a355a..6f5f3361d2b3e1 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/select_rule_type/index.tsx
@@ -9,11 +9,11 @@ import { EuiCard, EuiFlexGrid, EuiFlexItem, EuiFormRow, EuiIcon } from '@elastic
 
 import { isMlRule } from '../../../../../common/machine_learning/helpers';
 import { isThresholdRule } from '../../../../../common/detection_engine/utils';
-import { RuleType } from '../../../../../common/detection_engine/types';
 import { FieldHook } from '../../../../shared_imports';
 import { useKibana } from '../../../../common/lib/kibana';
 import * as i18n from './translations';
 import { MlCardDescription } from './ml_card_description';
+import { Type } from '../../../../../common/detection_engine/schemas/common/schemas';
 
 interface SelectRuleTypeProps {
   describedByIds?: string[];
@@ -30,9 +30,9 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
   hasValidLicense = false,
   isMlAdmin = false,
 }) => {
-  const ruleType = field.value as RuleType;
+  const ruleType = field.value as Type;
   const setType = useCallback(
-    (type: RuleType) => {
+    (type: Type) => {
       field.setValue(type);
     },
     [field]
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
index a5bbc0465ccc1c..166bb90113aef7 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
@@ -6,7 +6,6 @@
 
 import * as t from 'io-ts';
 
-import { RuleTypeSchema } from '../../../../../common/detection_engine/types';
 import {
   author,
   building_block_type,
@@ -16,6 +15,7 @@ import {
   severity_mapping,
   timestamp_override,
   threshold,
+  type,
 } from '../../../../../common/detection_engine/schemas/common/schemas';
 import {
   listArray,
@@ -44,7 +44,7 @@ export const NewRuleSchema = t.intersection([
     name: t.string,
     risk_score: t.number,
     severity: t.string,
-    type: RuleTypeSchema,
+    type,
   }),
   t.partial({
     actions: t.array(action),
@@ -117,7 +117,7 @@ export const RuleSchema = t.intersection([
     severity: t.string,
     severity_mapping,
     tags: t.array(t.string),
-    type: RuleTypeSchema,
+    type,
     to: t.string,
     threat: t.array(t.unknown),
     updated_at: t.string,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts
index 434a33ac377228..f4a40b771c9fa9 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/helpers.ts
@@ -10,12 +10,12 @@ import deepmerge from 'deepmerge';
 
 import { NOTIFICATION_THROTTLE_NO_ACTIONS } from '../../../../../../common/constants';
 import { transformAlertToRuleAction } from '../../../../../../common/detection_engine/transform_actions';
-import { RuleType } from '../../../../../../common/detection_engine/types';
 import { isMlRule } from '../../../../../../common/machine_learning/helpers';
 import { isThresholdRule } from '../../../../../../common/detection_engine/utils';
 import { List } from '../../../../../../common/detection_engine/schemas/types';
 import { ENDPOINT_LIST_ID } from '../../../../../shared_imports';
 import { NewRule, Rule } from '../../../../containers/detection_engine/rules';
+import { Type } from '../../../../../../common/detection_engine/schemas/common/schemas';
 
 import {
   AboutStepRule,
@@ -68,7 +68,7 @@ const isThresholdFields = <T>(
   fields: QueryRuleFields<T> | MlRuleFields<T> | ThresholdRuleFields<T>
 ): fields is ThresholdRuleFields<T> => has('threshold', fields);
 
-export const filterRuleFieldsForType = <T extends RuleFields>(fields: T, type: RuleType) => {
+export const filterRuleFieldsForType = <T extends RuleFields>(fields: T, type: Type) => {
   if (isMlRule(type)) {
     const { index, queryBar, threshold, ...mlRuleFields } = fields;
     return mlRuleFields;
@@ -119,7 +119,7 @@ export const formatDefineStepData = (defineStepData: DefineStepRule): DefineStep
         query: ruleFields.queryBar?.query?.query as string,
         saved_id: ruleFields.queryBar?.saved_id,
         ...(ruleType === 'query' &&
-          ruleFields.queryBar?.saved_id && { type: 'saved_query' as RuleType }),
+          ruleFields.queryBar?.saved_id && { type: 'saved_query' as Type }),
       };
 
   return {
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
index f9279ce6395344..8178f5ae5ba1d4 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.tsx
@@ -10,7 +10,7 @@ import memoizeOne from 'memoize-one';
 import { useLocation } from 'react-router-dom';
 
 import { ActionVariable } from '../../../../../../triggers_actions_ui/public';
-import { RuleAlertAction, RuleType } from '../../../../../common/detection_engine/types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
 import { isMlRule } from '../../../../../common/machine_learning/helpers';
 import { transformRuleToAlertAction } from '../../../../../common/detection_engine/transform_actions';
 import { Filter } from '../../../../../../../../src/plugins/data/public';
@@ -24,7 +24,10 @@ import {
   ScheduleStepRule,
   ActionsStepRule,
 } from './types';
-import { SeverityMapping } from '../../../../../common/detection_engine/schemas/common/schemas';
+import {
+  SeverityMapping,
+  Type,
+} from '../../../../../common/detection_engine/schemas/common/schemas';
 import { severityOptions } from '../../../components/rules/step_about_rule/data';
 
 export interface GetStepsData {
@@ -307,7 +310,7 @@ export const redirectToDetections = (
   hasEncryptionKey === false ||
   needsListsConfiguration;
 
-const getRuleSpecificRuleParamKeys = (ruleType: RuleType) => {
+const getRuleSpecificRuleParamKeys = (ruleType: Type) => {
   const queryRuleParams = ['index', 'filters', 'language', 'query', 'saved_id'];
 
   if (isMlRule(ruleType)) {
@@ -321,7 +324,7 @@ const getRuleSpecificRuleParamKeys = (ruleType: RuleType) => {
   return queryRuleParams;
 };
 
-export const getActionMessageRuleParams = (ruleType: RuleType): string[] => {
+export const getActionMessageRuleParams = (ruleType: Type): string[] => {
   const commonRuleParamsKeys = [
     'id',
     'name',
@@ -349,23 +352,21 @@ export const getActionMessageRuleParams = (ruleType: RuleType): string[] => {
   return ruleParamsKeys;
 };
 
-export const getActionMessageParams = memoizeOne(
-  (ruleType: RuleType | undefined): ActionVariable[] => {
-    if (!ruleType) {
-      return [];
-    }
-    const actionMessageRuleParams = getActionMessageRuleParams(ruleType);
-
-    return [
-      { name: 'state.signals_count', description: 'state.signals_count' },
-      { name: '{context.results_link}', description: 'context.results_link' },
-      ...actionMessageRuleParams.map((param) => {
-        const extendedParam = `context.rule.${param}`;
-        return { name: extendedParam, description: extendedParam };
-      }),
-    ];
+export const getActionMessageParams = memoizeOne((ruleType: Type | undefined): ActionVariable[] => {
+  if (!ruleType) {
+    return [];
   }
-);
+  const actionMessageRuleParams = getActionMessageRuleParams(ruleType);
+
+  return [
+    { name: 'state.signals_count', description: 'state.signals_count' },
+    { name: '{context.results_link}', description: 'context.results_link' },
+    ...actionMessageRuleParams.map((param) => {
+      const extendedParam = `context.rule.${param}`;
+      return { name: extendedParam, description: extendedParam };
+    }),
+  ];
+});
 
 // typed as null not undefined as the initial state for this value is null.
 export const userHasNoPermissions = (canUserCRUD: boolean | null): boolean =>
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
index e36f08703dae51..891af4b8ca80ef 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RuleAlertAction, RuleType } from '../../../../../common/detection_engine/types';
+import { RuleAlertAction } from '../../../../../common/detection_engine/types';
 import { AlertAction } from '../../../../../../alerts/common';
 import { Filter } from '../../../../../../../../src/plugins/data/common';
 import { FormData, FormHook } from '../../../../shared_imports';
@@ -19,6 +19,7 @@ import {
   RuleNameOverride,
   SeverityMapping,
   TimestampOverride,
+  Type,
 } from '../../../../../common/detection_engine/schemas/common/schemas';
 import { List } from '../../../../../common/detection_engine/schemas/types';
 
@@ -102,7 +103,7 @@ export interface DefineStepRule extends StepRuleData {
   index: string[];
   machineLearningJobId: string;
   queryBar: FieldValueQueryBar;
-  ruleType: RuleType;
+  ruleType: Type;
   timeline: FieldValueTimeline;
   threshold: FieldValueThreshold;
 }
@@ -134,7 +135,7 @@ export interface DefineStepRuleJson {
   };
   timeline_id?: string;
   timeline_title?: string;
-  type: RuleType;
+  type: Type;
 }
 
 export interface AboutStepRuleJson {
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 0a899562d61c2d..802b9472a44870 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 '../../../../common/detection_engine/utils';
+import { parseScheduleDates } from '../../../../common/detection_engine/parse_schedule_dates';
 
 export const rulesNotificationAlertType = ({
   logger,
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 a7213c30eb3fb2..b8311182f3ca8c 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
@@ -17,7 +17,7 @@ import {
   getExceptions,
   sortExceptionItems,
 } from './utils';
-import { parseScheduleDates } from '../../../../common/detection_engine/utils';
+import { parseScheduleDates } from '../../../../common/detection_engine/parse_schedule_dates';
 import { RuleExecutorOptions } from './types';
 import { searchAfterAndBulkCreate } from './search_after_bulk_create';
 import { scheduleNotificationActions } from '../notifications/schedule_notification_actions';
@@ -38,6 +38,7 @@ jest.mock('../notifications/schedule_notification_actions');
 jest.mock('./find_ml_signals');
 jest.mock('./bulk_create_ml_signals');
 jest.mock('./../../../../common/detection_engine/utils');
+jest.mock('../../../../common/detection_engine/parse_schedule_dates');
 
 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 9d688736a98460..da17d4a1f123a7 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,7 +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 { parseScheduleDates } from '../../../../common/detection_engine/parse_schedule_dates';
 import { SetupPlugins } from '../../../plugin';
 import { getInputIndex } from './get_input_output_index';
 import {
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 a2e2fec3309c31..d053a8e1089ad3 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,7 +13,7 @@ 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 { parseScheduleDates } from '../../../../common/detection_engine/parse_schedule_dates';
 
 import {
   generateId,
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 92cc9be69839f3..dc09c6d5386fce 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,8 @@ 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, parseScheduleDates } from '../../../../common/detection_engine/utils';
+import { parseScheduleDates } from '../../../../common/detection_engine/parse_schedule_dates';
+import { hasLargeValueList } from '../../../../common/detection_engine/utils';
 import { MAX_EXCEPTION_LIST_SIZE } from '../../../../../lists/common/constants';
 
 interface SortExceptionsReturn {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
index 4b4f5147c9a42c..cbe756064b72b2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts
@@ -36,10 +36,10 @@ import {
   RuleNameOverrideOrUndefined,
   SeverityMappingOrUndefined,
   TimestampOverrideOrUndefined,
+  Type,
 } from '../../../common/detection_engine/schemas/common/schemas';
 import { LegacyCallAPIOptions } from '../../../../../../src/core/server';
 import { Filter } from '../../../../../../src/plugins/data/server';
-import { RuleType } from '../../../common/detection_engine/types';
 import { ListArrayOrUndefined } from '../../../common/detection_engine/schemas/types';
 
 export type PartialFilter = Partial<Filter>;
@@ -75,7 +75,7 @@ export interface RuleTypeParams {
   threshold: ThresholdOrUndefined;
   timestampOverride: TimestampOverrideOrUndefined;
   to: To;
-  type: RuleType;
+  type: Type;
   references: References;
   version: Version;
   exceptionsList: ListArrayOrUndefined;
diff --git a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
index 386eda5281f0c2..ff565c05848f97 100644
--- a/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
+++ b/x-pack/plugins/security_solution/server/lib/machine_learning/authz.ts
@@ -13,12 +13,12 @@ import { SetupPlugins } from '../../plugin';
 import { MINIMUM_ML_LICENSE } from '../../../common/constants';
 import { hasMlAdminPermissions } from '../../../common/machine_learning/has_ml_admin_permissions';
 import { isMlRule } from '../../../common/machine_learning/helpers';
-import { RuleType } from '../../../common/detection_engine/types';
 import { Validation } from './validation';
 import { cache } from './cache';
+import { Type } from '../../../common/detection_engine/schemas/common/schemas';
 
 export interface MlAuthz {
-  validateRuleType: (type: RuleType) => Promise<Validation>;
+  validateRuleType: (type: Type) => Promise<Validation>;
 }
 
 /**
@@ -40,7 +40,7 @@ export const buildMlAuthz = ({
   request: KibanaRequest;
 }): MlAuthz => {
   const cachedValidate = cache(() => validateMlAuthz({ license, ml, request }));
-  const validateRuleType = async (type: RuleType): Promise<Validation> => {
+  const validateRuleType = async (type: Type): Promise<Validation> => {
     if (!isMlRule(type)) {
       return { valid: true, message: undefined };
     } else {

From d3416c018907f13da89d99356322d0c7b9936c0d Mon Sep 17 00:00:00 2001
From: Oliver Gupte <ogupte@users.noreply.github.com>
Date: Wed, 2 Sep 2020 21:39:03 -0700
Subject: [PATCH 202/216] [APM] Service maps layout enhancements (#76481)

* Fixes storybook anomaly score generation and better utilizes available screen space

* Closes #71770 for APM service maps by replacing breadthfirst layout with
one from the cytoscape-dagre extension. Also replaces the taxi edges
with cubic bezier edges. Finally, this adds the ability to drag
individual nodes around the service map.

* Removes unused code

* removes commented line of code

* - Adds ability for scripts/notice.js to check files with the .tsx file extension
- Adds attribution for `applyCubicBezierStyles`

* Refine comment text and MIT license url
---
 NOTICE.txt                                    |  7 ++
 src/dev/notice/generate_notice_from_source.ts |  2 +-
 x-pack/package.json                           |  1 +
 .../components/app/ServiceMap/Cytoscape.tsx   | 98 ++++++++-----------
 .../app/ServiceMap/Popover/index.tsx          |  2 +
 .../__stories__/Cytoscape.stories.tsx         |  4 +-
 .../CytoscapeExampleData.stories.tsx          | 25 +++--
 .../generate_service_map_elements.ts          | 25 +++--
 .../app/ServiceMap/cytoscapeOptions.ts        |  5 +-
 .../components/app/ServiceMap/index.tsx       |  3 +-
 .../plugins/apm/typings/cytoscape_dagre.d.ts  |  7 ++
 yarn.lock                                     | 22 +++++
 12 files changed, 113 insertions(+), 88 deletions(-)
 create mode 100644 x-pack/plugins/apm/typings/cytoscape_dagre.d.ts

diff --git a/NOTICE.txt b/NOTICE.txt
index e1552852d03493..d689abf4c4e05c 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -281,6 +281,13 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+---
+This product includes code in the function applyCubicBezierStyles that was
+inspired by a public Codepen, which was available under a "MIT" license.
+
+Copyright (c) 2020 by Guillaume (https://codepen.io/guillaumethomas/pen/xxbbBKO)
+MIT License http://www.opensource.org/licenses/mit-license
+
 ---
 This product includes code that is adapted from mapbox-gl-js, which is
 available under a "BSD-3-Clause" license.
diff --git a/src/dev/notice/generate_notice_from_source.ts b/src/dev/notice/generate_notice_from_source.ts
index 0bef5bc5f32d42..9f7eb9d9e1aa4b 100644
--- a/src/dev/notice/generate_notice_from_source.ts
+++ b/src/dev/notice/generate_notice_from_source.ts
@@ -41,7 +41,7 @@ interface Options {
  * into the repository.
  */
 export async function generateNoticeFromSource({ productName, directory, log }: Options) {
-  const globs = ['**/*.{js,less,css,ts}'];
+  const globs = ['**/*.{js,less,css,ts,tsx}'];
 
   const options = {
     cwd: directory,
diff --git a/x-pack/package.json b/x-pack/package.json
index 0e9aef37aa2532..bf093fed307475 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -305,6 +305,7 @@
     "concat-stream": "1.6.2",
     "content-disposition": "0.5.3",
     "cytoscape": "^3.10.0",
+    "cytoscape-dagre": "^2.2.2",
     "d3-array": "1.2.4",
     "dedent": "^0.7.0",
     "del": "^5.1.0",
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
index 1cde473aae6fa6..0b00c8a8bf0934 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
@@ -13,6 +13,7 @@ import React, {
   useState,
 } from 'react';
 import cytoscape from 'cytoscape';
+import dagre from 'cytoscape-dagre';
 import { debounce } from 'lodash';
 import { useTheme } from '../../../hooks/useTheme';
 import {
@@ -22,6 +23,8 @@ import {
 } from './cytoscapeOptions';
 import { useUiTracker } from '../../../../../observability/public';
 
+cytoscape.use(dagre);
+
 export const CytoscapeContext = createContext<cytoscape.Core | undefined>(
   undefined
 );
@@ -30,7 +33,6 @@ interface CytoscapeProps {
   children?: ReactNode;
   elements: cytoscape.ElementDefinition[];
   height: number;
-  width: number;
   serviceName?: string;
   style?: CSSProperties;
 }
@@ -57,59 +59,52 @@ function useCytoscape(options: cytoscape.CytoscapeOptions) {
   return [ref, cy] as [React.MutableRefObject<any>, cytoscape.Core | undefined];
 }
 
-function rotatePoint(
-  { x, y }: { x: number; y: number },
-  degreesRotated: number
-) {
-  const radiansPerDegree = Math.PI / 180;
-  const θ = radiansPerDegree * degreesRotated;
-  const cosθ = Math.cos(θ);
-  const sinθ = Math.sin(θ);
-  return {
-    x: x * cosθ - y * sinθ,
-    y: x * sinθ + y * cosθ,
-  };
-}
-
-function getLayoutOptions(
-  selectedRoots: string[],
-  height: number,
-  width: number,
-  nodeHeight: number
-): cytoscape.LayoutOptions {
+function getLayoutOptions(nodeHeight: number): cytoscape.LayoutOptions {
   return {
-    name: 'breadthfirst',
-    // @ts-ignore DefinitelyTyped is incorrect here. Roots can be an Array
-    roots: selectedRoots.length ? selectedRoots : undefined,
+    name: 'dagre',
     fit: true,
     padding: nodeHeight,
     spacingFactor: 1.2,
     // @ts-ignore
-    // Rotate nodes counter-clockwise to transform layout from top→bottom to left→right.
-    // The extra 5° achieves the effect of separating overlapping taxi-styled edges.
-    transform: (node: any, pos: cytoscape.Position) => rotatePoint(pos, -95),
-    // swap width/height of boundingBox to compensate for the rotation
-    boundingBox: { x1: 0, y1: 0, w: height, h: width },
+    nodeSep: nodeHeight,
+    edgeSep: 32,
+    rankSep: 128,
+    rankDir: 'LR',
+    ranker: 'network-simplex',
   };
 }
 
-function selectRoots(cy: cytoscape.Core): string[] {
-  const bfs = cy.elements().bfs({
-    roots: cy.elements().leaves(),
+/*
+ * @notice
+ * This product includes code in the function applyCubicBezierStyles that was
+ * inspired by a public Codepen, which was available under a "MIT" license.
+ *
+ * Copyright (c) 2020 by Guillaume (https://codepen.io/guillaumethomas/pen/xxbbBKO)
+ * MIT License http://www.opensource.org/licenses/mit-license
+ */
+function applyCubicBezierStyles(edges: cytoscape.EdgeCollection) {
+  edges.forEach((edge) => {
+    const { x: x0, y: y0 } = edge.source().position();
+    const { x: x1, y: y1 } = edge.target().position();
+    const x = x1 - x0;
+    const y = y1 - y0;
+    const z = Math.sqrt(x * x + y * y);
+    const costheta = z === 0 ? 0 : x / z;
+    const alpha = 0.25;
+    // Two values for control-point-distances represent a pair symmetric quadratic
+    // bezier curves joined in the middle as a seamless cubic bezier curve:
+    edge.style('control-point-distances', [
+      -alpha * y * costheta,
+      alpha * y * costheta,
+    ]);
+    edge.style('control-point-weights', [alpha, 1 - alpha]);
   });
-  const furthestNodeFromLeaves = bfs.path.last();
-  return cy
-    .elements()
-    .roots()
-    .union(furthestNodeFromLeaves)
-    .map((el) => el.id());
 }
 
 export function Cytoscape({
   children,
   elements,
   height,
-  width,
   serviceName,
   style,
 }: CytoscapeProps) {
@@ -151,13 +146,7 @@ export function Cytoscape({
         } else {
           resetConnectedEdgeStyle();
         }
-
-        const selectedRoots = selectRoots(event.cy);
-        const layout = cy.layout(
-          getLayoutOptions(selectedRoots, height, width, nodeHeight)
-        );
-
-        layout.run();
+        cy.layout(getLayoutOptions(nodeHeight)).run();
       }
     };
     let layoutstopDelayTimeout: NodeJS.Timeout;
@@ -180,6 +169,7 @@ export function Cytoscape({
           event.cy.fit(undefined, nodeHeight);
         }
       }, 0);
+      applyCubicBezierStyles(event.cy.edges());
     };
     // debounce hover tracking so it doesn't spam telemetry with redundant events
     const trackNodeEdgeHover = debounce(
@@ -211,6 +201,9 @@ export function Cytoscape({
         console.debug('cytoscape:', event);
       }
     };
+    const dragHandler: cytoscape.EventHandler = (event) => {
+      applyCubicBezierStyles(event.target.connectedEdges());
+    };
 
     if (cy) {
       cy.on('data layoutstop select unselect', debugHandler);
@@ -220,6 +213,7 @@ export function Cytoscape({
       cy.on('mouseout', 'edge, node', mouseoutHandler);
       cy.on('select', 'node', selectHandler);
       cy.on('unselect', 'node', unselectHandler);
+      cy.on('drag', 'node', dragHandler);
 
       cy.remove(cy.elements());
       cy.add(elements);
@@ -239,19 +233,11 @@ export function Cytoscape({
         cy.removeListener('mouseout', 'edge, node', mouseoutHandler);
         cy.removeListener('select', 'node', selectHandler);
         cy.removeListener('unselect', 'node', unselectHandler);
+        cy.removeListener('drag', 'node', dragHandler);
       }
       clearTimeout(layoutstopDelayTimeout);
     };
-  }, [
-    cy,
-    elements,
-    height,
-    serviceName,
-    trackApmEvent,
-    width,
-    nodeHeight,
-    theme,
-  ]);
+  }, [cy, elements, height, serviceName, trackApmEvent, nodeHeight, theme]);
 
   return (
     <CytoscapeContext.Provider value={cy}>
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
index 1658c36e8a92fb..8291d94d91c48f 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
@@ -71,6 +71,7 @@ export function Popover({ focusedServiceName }: PopoverProps) {
       cy.on('select', 'node', selectHandler);
       cy.on('unselect', 'node', deselect);
       cy.on('data viewport', deselect);
+      cy.on('drag', 'node', deselect);
     }
 
     return () => {
@@ -78,6 +79,7 @@ export function Popover({ focusedServiceName }: PopoverProps) {
         cy.removeListener('select', 'node', selectHandler);
         cy.removeListener('unselect', 'node', deselect);
         cy.removeListener('data viewport', undefined, deselect);
+        cy.removeListener('drag', 'node', deselect);
       }
     };
   }, [cy, deselect]);
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx
index 2a7d11bb57ca5b..5b50eb953d896e 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx
@@ -49,13 +49,11 @@ storiesOf('app/ServiceMap/Cytoscape', module)
         },
       ];
       const height = 300;
-      const width = 1340;
       const serviceName = 'opbeans-python';
       return (
         <Cytoscape
           elements={elements}
           height={height}
-          width={width}
           serviceName={serviceName}
         />
       );
@@ -330,7 +328,7 @@ storiesOf('app/ServiceMap/Cytoscape', module)
           },
         },
       ];
-      return <Cytoscape elements={elements} height={600} width={1340} />;
+      return <Cytoscape elements={elements} height={600} />;
     },
     {
       info: { propTables: false, source: false },
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/CytoscapeExampleData.stories.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/CytoscapeExampleData.stories.tsx
index 830e3719b11f9d..d8dcc71f5051d9 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/CytoscapeExampleData.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/CytoscapeExampleData.stories.tsx
@@ -35,6 +35,8 @@ function setSessionJson(json: string) {
   window.sessionStorage.setItem(SESSION_STORAGE_KEY, json);
 }
 
+const getCytoscapeHeight = () => window.innerHeight - 300;
+
 storiesOf(STORYBOOK_PATH, module)
   .addDecorator((storyFn) => <EuiThemeProvider>{storyFn()}</EuiThemeProvider>)
   .add(
@@ -43,16 +45,17 @@ storiesOf(STORYBOOK_PATH, module)
       const [size, setSize] = useState<number>(10);
       const [json, setJson] = useState<string>('');
       const [elements, setElements] = useState<any[]>(
-        generateServiceMapElements(size)
+        generateServiceMapElements({ size, hasAnomalies: true })
       );
-
       return (
         <div>
           <EuiFlexGroup>
             <EuiFlexItem>
               <EuiButton
                 onClick={() => {
-                  setElements(generateServiceMapElements(size));
+                  setElements(
+                    generateServiceMapElements({ size, hasAnomalies: true })
+                  );
                   setJson('');
                 }}
               >
@@ -79,7 +82,7 @@ storiesOf(STORYBOOK_PATH, module)
             </EuiFlexItem>
           </EuiFlexGroup>
 
-          <Cytoscape elements={elements} height={600} width={1340} />
+          <Cytoscape elements={elements} height={getCytoscapeHeight()} />
 
           {json && (
             <EuiCodeEditor
@@ -121,7 +124,7 @@ storiesOf(STORYBOOK_PATH, module)
 
       return (
         <div>
-          <Cytoscape elements={elements} height={600} width={1340} />
+          <Cytoscape elements={elements} height={getCytoscapeHeight()} />
           <EuiForm isInvalid={error !== undefined} error={error}>
             <EuiFlexGroup>
               <EuiFlexItem>
@@ -204,8 +207,7 @@ storiesOf(STORYBOOK_PATH, module)
         <div>
           <Cytoscape
             elements={exampleResponseTodo.elements}
-            height={600}
-            width={1340}
+            height={getCytoscapeHeight()}
           />
         </div>
       );
@@ -224,8 +226,7 @@ storiesOf(STORYBOOK_PATH, module)
         <div>
           <Cytoscape
             elements={exampleResponseOpbeansBeats.elements}
-            height={600}
-            width={1340}
+            height={getCytoscapeHeight()}
           />
         </div>
       );
@@ -244,8 +245,7 @@ storiesOf(STORYBOOK_PATH, module)
         <div>
           <Cytoscape
             elements={exampleResponseHipsterStore.elements}
-            height={600}
-            width={1340}
+            height={getCytoscapeHeight()}
           />
         </div>
       );
@@ -264,8 +264,7 @@ storiesOf(STORYBOOK_PATH, module)
         <div>
           <Cytoscape
             elements={exampleResponseOneDomainManyIPs.elements}
-            height={600}
-            width={1340}
+            height={getCytoscapeHeight()}
           />
         </div>
       );
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/generate_service_map_elements.ts b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/generate_service_map_elements.ts
index 012256db3ab987..57ef2d49291c40 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/generate_service_map_elements.ts
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/generate_service_map_elements.ts
@@ -4,9 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { getSeverity } from '../Popover/getSeverity';
-
-export function generateServiceMapElements(size: number): any[] {
+export function generateServiceMapElements({
+  size,
+  hasAnomalies,
+}: {
+  size: number;
+  hasAnomalies: boolean;
+}): any[] {
   const services = range(size).map((i) => {
     const name = getName();
     const anomalyScore = randn(101);
@@ -15,11 +19,14 @@ export function generateServiceMapElements(size: number): any[] {
       'service.environment': 'production',
       'service.name': name,
       'agent.name': getAgentName(),
-      anomaly_score: anomalyScore,
-      anomaly_severity: getSeverity(anomalyScore),
-      actual_value: Math.random() * 2000000,
-      typical_value: Math.random() * 1000000,
-      ml_job_id: `${name}-request-high_mean_response_time`,
+      serviceAnomalyStats: hasAnomalies
+        ? {
+            transactionType: 'request',
+            anomalyScore,
+            actualValue: Math.random() * 2000000,
+            jobId: `${name}-request-high_mean_response_time`,
+          }
+        : undefined,
     };
   });
 
@@ -146,7 +153,7 @@ const NAMES = [
   'leech',
   'loki',
   'longshot',
-  'lumpkin,',
+  'lumpkin',
   'madame-web',
   'magician',
   'magneto',
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts b/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
index 4a271019e06db9..9d58ed142dab79 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
@@ -168,9 +168,7 @@ const getStyle = (theme: EuiTheme): cytoscape.Stylesheet[] => {
     {
       selector: 'edge',
       style: {
-        'curve-style': 'taxi',
-        // @ts-ignore
-        'taxi-direction': 'auto',
+        'curve-style': 'unbundled-bezier',
         'line-color': lineColor,
         'overlay-opacity': 0,
         'target-arrow-color': lineColor,
@@ -264,7 +262,6 @@ ${theme.eui.euiColorLightShade}`,
 export const getCytoscapeOptions = (
   theme: EuiTheme
 ): cytoscape.CytoscapeOptions => ({
-  autoungrabify: true,
   boxSelectionEnabled: false,
   maxZoom: 3,
   minZoom: 0.2,
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx
index d4be4da2ae1c54..83fab95bc91c9b 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx
@@ -57,7 +57,7 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
     }
   }, [license, serviceName, urlParams]);
 
-  const { ref, height, width } = useRefDimensions();
+  const { ref, height } = useRefDimensions();
 
   useTrackPageview({ app: 'apm', path: 'service_map' });
   useTrackPageview({ app: 'apm', path: 'service_map', delay: 15000 });
@@ -78,7 +78,6 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
         height={height}
         serviceName={serviceName}
         style={getCytoscapeDivStyle(theme)}
-        width={width}
       >
         <Controls />
         <BetaBadge />
diff --git a/x-pack/plugins/apm/typings/cytoscape_dagre.d.ts b/x-pack/plugins/apm/typings/cytoscape_dagre.d.ts
new file mode 100644
index 00000000000000..b5bbdfc14d9d35
--- /dev/null
+++ b/x-pack/plugins/apm/typings/cytoscape_dagre.d.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.
+ */
+
+declare module 'cytoscape-dagre';
diff --git a/yarn.lock b/yarn.lock
index 56530a0ab4fdc0..98092d71caebbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9989,6 +9989,13 @@ cypress@4.11.0:
     url "0.11.0"
     yauzl "2.10.0"
 
+cytoscape-dagre@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/cytoscape-dagre/-/cytoscape-dagre-2.2.2.tgz#5f32a85c0ba835f167efee531df9e89ac58ff411"
+  integrity sha512-zsg36qNwua/L2stJSWkcbSDcvW3E6VZf6KRe6aLnQJxuXuz89tMqI5EVYVKEcNBgzTEzFMFv0PE3T0nD4m6VDw==
+  dependencies:
+    dagre "^0.8.2"
+
 cytoscape@^3.10.0:
   version "3.10.0"
   resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.10.0.tgz#3b462e0d35121ecd2d2702f470915fd6dae01777"
@@ -10201,6 +10208,14 @@ d@1:
   dependencies:
     es5-ext "^0.10.9"
 
+dagre@^0.8.2:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee"
+  integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw==
+  dependencies:
+    graphlib "^2.1.8"
+    lodash "^4.17.15"
+
 damerau-levenshtein@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.4.tgz#03191c432cb6eea168bb77f3a55ffdccb8978514"
@@ -14359,6 +14374,13 @@ graceful-fs@~1.1:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.1.14.tgz#07078db5f6377f6321fceaaedf497de124dc9465"
   integrity sha1-BweNtfY3f2Mh/Oqu30l94STclGU=
 
+graphlib@^2.1.8:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da"
+  integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A==
+  dependencies:
+    lodash "^4.17.15"
+
 graphql-anywhere@^4.1.0-alpha.0:
   version "4.1.16"
   resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.16.tgz#82bb59643e30183cfb7b485ed4262a7b39d8a6c1"

From 210d6f2df18cce2b78eb075b3d8247559a359944 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Thu, 3 Sep 2020 08:50:03 +0200
Subject: [PATCH 203/216] Legacy SO import: Fix bug causing multiple overrides
 to only show the last confirm modal (#76482)

* Legacy SO import: Fix bug causing multiple overrides to only show the last confirm modal

* eslint

* fix for loops
---
 .../public/lib/resolve_saved_objects.ts       |  35 ++-
 .../apps/management/_import_objects.js        |  54 +++-
 ...import_index_patterns_multiple_exists.json |  26 ++
 .../_import_objects_multiple_exists.json      |  36 +++
 .../saved_objects_imports/data.json.gz        | Bin 0 -> 1754 bytes
 .../saved_objects_imports/mappings.json       | 244 ++++++++++++++++++
 test/functional/page_objects/common_page.ts   |   6 +-
 7 files changed, 379 insertions(+), 22 deletions(-)
 create mode 100644 test/functional/apps/management/exports/_import_index_patterns_multiple_exists.json
 create mode 100644 test/functional/apps/management/exports/_import_objects_multiple_exists.json
 create mode 100644 test/functional/fixtures/es_archiver/saved_objects_imports/data.json.gz
 create mode 100644 test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json

diff --git a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
index 79b8c33b84cfee..679ea5ffc23eea 100644
--- a/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
+++ b/src/plugins/saved_objects_management/public/lib/resolve_saved_objects.ts
@@ -160,10 +160,6 @@ function groupByType(docs: SavedObjectsRawDoc[]): Record<string, SavedObjectsRaw
   }, defaultDocTypes);
 }
 
-async function awaitEachItemInParallel<T, R>(list: T[], op: (item: T) => R) {
-  return await Promise.all(list.map((item) => op(item)));
-}
-
 export async function resolveIndexPatternConflicts(
   resolutions: Array<{ oldId: string; newId: string }>,
   conflictedIndexPatterns: any[],
@@ -175,7 +171,7 @@ export async function resolveIndexPatternConflicts(
 ) {
   let importCount = 0;
 
-  await awaitEachItemInParallel(conflictedIndexPatterns, async ({ obj, doc }) => {
+  for (const { obj, doc } of conflictedIndexPatterns) {
     const serializedSearchSource = JSON.parse(
       doc._source.kibanaSavedObjectMeta?.searchSourceJSON || '{}'
     );
@@ -220,7 +216,7 @@ export async function resolveIndexPatternConflicts(
 
     if (!allResolved) {
       // The user decided to skip this conflict so do nothing
-      return;
+      continue;
     }
     obj.searchSource = await dependencies.search.searchSource.create(
       serializedSearchSourceWithInjectedReferences
@@ -228,17 +224,17 @@ export async function resolveIndexPatternConflicts(
     if (await saveObject(obj, overwriteAll)) {
       importCount++;
     }
-  });
+  }
   return importCount;
 }
 
 export async function saveObjects(objs: SavedObject[], overwriteAll: boolean) {
   let importCount = 0;
-  await awaitEachItemInParallel(objs, async (obj) => {
+  for (const obj of objs) {
     if (await saveObject(obj, overwriteAll)) {
       importCount++;
     }
-  });
+  }
   return importCount;
 }
 
@@ -253,16 +249,16 @@ export async function resolveSavedSearches(
   overwriteAll: boolean
 ) {
   let importCount = 0;
-  await awaitEachItemInParallel(savedSearches, async (searchDoc) => {
+  for (const searchDoc of savedSearches) {
     const obj = await getSavedObject(searchDoc, services);
     if (!obj) {
       // Just ignore?
-      return;
+      continue;
     }
     if (await importDocument(obj, searchDoc, overwriteAll)) {
       importCount++;
     }
-  });
+  }
   return importCount;
 }
 
@@ -280,7 +276,10 @@ export async function resolveSavedObjects(
   let importedObjectCount = 0;
   const failedImports: FailedImport[] = [];
   // Start with the index patterns since everything is dependent on them
-  await awaitEachItemInParallel(docTypes.indexPatterns, async (indexPatternDoc) => {
+  // As the confirmation opens a modal, and as we only allow one modal at a time
+  // (opening a new one close the previous with a rejection)
+  // we can't do that in parallel
+  for (const indexPatternDoc of docTypes.indexPatterns) {
     try {
       const importedIndexPatternId = await importIndexPattern(
         indexPatternDoc,
@@ -294,7 +293,7 @@ export async function resolveSavedObjects(
     } catch (error) {
       failedImports.push({ obj: indexPatternDoc as any, error });
     }
-  });
+  }
 
   // We want to do the same for saved searches, but we want to keep them separate because they need
   // to be applied _first_ because other saved objects can be dependent on those saved searches existing
@@ -311,7 +310,7 @@ export async function resolveSavedObjects(
   // likely that these saved objects will work once resaved so keep them around to resave them.
   const conflictedSavedObjectsLinkedToSavedSearches: any[] = [];
 
-  await awaitEachItemInParallel(docTypes.searches, async (searchDoc) => {
+  for (const searchDoc of docTypes.searches) {
     const obj = await getSavedObject(searchDoc, services);
 
     try {
@@ -329,9 +328,9 @@ export async function resolveSavedObjects(
         failedImports.push({ obj, error });
       }
     }
-  });
+  }
 
-  await awaitEachItemInParallel(docTypes.other, async (otherDoc) => {
+  for (const otherDoc of docTypes.other) {
     const obj = await getSavedObject(otherDoc, services);
 
     try {
@@ -350,7 +349,7 @@ export async function resolveSavedObjects(
         failedImports.push({ obj, error });
       }
     }
-  });
+  }
 
   return {
     conflictedIndexPatterns,
diff --git a/test/functional/apps/management/_import_objects.js b/test/functional/apps/management/_import_objects.js
index 5fbeb978f9a1c2..3941b117e6efe8 100644
--- a/test/functional/apps/management/_import_objects.js
+++ b/test/functional/apps/management/_import_objects.js
@@ -21,6 +21,8 @@ import expect from '@kbn/expect';
 import path from 'path';
 import { keyBy } from 'lodash';
 
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+
 export default function ({ getService, getPageObjects }) {
   const kibanaServer = getService('kibanaServer');
   const esArchiver = getService('esArchiver');
@@ -203,12 +205,12 @@ export default function ({ getService, getPageObjects }) {
         // delete .kibana index and then wait for Kibana to re-create it
         await kibanaServer.uiSettings.replace({});
         await PageObjects.settings.navigateTo();
-        await esArchiver.load('management');
+        await esArchiver.load('saved_objects_imports');
         await PageObjects.settings.clickKibanaSavedObjects();
       });
 
       afterEach(async function () {
-        await esArchiver.unload('management');
+        await esArchiver.unload('saved_objects_imports');
       });
 
       it('should import saved objects', async function () {
@@ -280,6 +282,54 @@ export default function ({ getService, getPageObjects }) {
         expect(isSuccessful).to.be(true);
       });
 
+      it('should allow the user to confirm overriding multiple duplicate saved objects', async function () {
+        // This data has already been loaded by the "visualize" esArchive. We'll load it again
+        // so that we can override the existing visualization.
+        await PageObjects.savedObjects.importFile(
+          path.join(__dirname, 'exports', '_import_objects_multiple_exists.json'),
+          false
+        );
+
+        await PageObjects.savedObjects.checkImportLegacyWarning();
+        await PageObjects.savedObjects.checkImportConflictsWarning();
+
+        await PageObjects.settings.associateIndexPattern('logstash-*', 'logstash-*');
+        await PageObjects.savedObjects.clickConfirmChanges();
+
+        // Override the visualizations.
+        await PageObjects.common.clickConfirmOnModal(false);
+        // as the second confirm can pop instantly, we can't wait for it to be hidden
+        // with is why we call clickConfirmOnModal with ensureHidden: false in previous statement
+        // but as the initial popin can take a few ms before fading, we need to wait a little
+        // to avoid clicking twice on the same modal.
+        await delay(1000);
+        await PageObjects.common.clickConfirmOnModal(false);
+
+        const isSuccessful = await testSubjects.exists('importSavedObjectsSuccess');
+        expect(isSuccessful).to.be(true);
+      });
+
+      it('should allow the user to confirm overriding multiple duplicate index patterns', async function () {
+        // This data has already been loaded by the "visualize" esArchive. We'll load it again
+        // so that we can override the existing visualization.
+        await PageObjects.savedObjects.importFile(
+          path.join(__dirname, 'exports', '_import_index_patterns_multiple_exists.json'),
+          false
+        );
+
+        // Override the index patterns.
+        await PageObjects.common.clickConfirmOnModal(false);
+        // as the second confirm can pop instantly, we can't wait for it to be hidden
+        // with is why we call clickConfirmOnModal with ensureHidden: false in previous statement
+        // but as the initial popin can take a few ms before fading, we need to wait a little
+        // to avoid clicking twice on the same modal.
+        await delay(1000);
+        await PageObjects.common.clickConfirmOnModal(false);
+
+        const isSuccessful = await testSubjects.exists('importSavedObjectsSuccess');
+        expect(isSuccessful).to.be(true);
+      });
+
       it('should import saved objects linked to saved searches', async function () {
         await PageObjects.savedObjects.importFile(
           path.join(__dirname, 'exports', '_import_objects_saved_search.json')
diff --git a/test/functional/apps/management/exports/_import_index_patterns_multiple_exists.json b/test/functional/apps/management/exports/_import_index_patterns_multiple_exists.json
new file mode 100644
index 00000000000000..2eb64b1c7ca9f5
--- /dev/null
+++ b/test/functional/apps/management/exports/_import_index_patterns_multiple_exists.json
@@ -0,0 +1,26 @@
+[
+  {
+    "_id": "f1e4c910-a2e6-11e7-bb30-233be9be6a20",
+    "_type": "index-pattern",
+    "_source": {
+      "title": "index-pattern-test-1",
+      "timeFieldName": "@timestamp",
+      "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"expression script\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['bytes'].value\",\"lang\":\"expression\",\"indexed\":true,\"analyzed\":false,\"doc_values\":false}]"
+    },
+    "_meta": {
+      "savedObjectVersion": 1
+    }
+  },
+  {
+    "_id": "f1e4c910-a2e6-11e7-bb30-233be9be6a87",
+    "_type": "index-pattern",
+    "_source": {
+      "title": "index-pattern-test-2",
+      "timeFieldName": "@timestamp",
+      "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"expression script\",\"type\":\"number\",\"count\":0,\"scripted\":true,\"script\":\"doc['bytes'].value\",\"lang\":\"expression\",\"indexed\":true,\"analyzed\":false,\"doc_values\":false}]"
+    },
+    "_meta": {
+      "savedObjectVersion": 1
+    }
+  }
+]
diff --git a/test/functional/apps/management/exports/_import_objects_multiple_exists.json b/test/functional/apps/management/exports/_import_objects_multiple_exists.json
new file mode 100644
index 00000000000000..9e554aecd9f7a3
--- /dev/null
+++ b/test/functional/apps/management/exports/_import_objects_multiple_exists.json
@@ -0,0 +1,36 @@
+[
+  {
+    "_id": "test-1",
+    "_type": "visualization",
+    "_source": {
+      "title": "Visualization test 1",
+      "visState": "{\"title\":\"New Visualization\",\"type\":\"area\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"smoothLines\":false,\"scale\":\"linear\",\"interpolate\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}}],\"listeners\":{}}",
+      "uiStateJSON": "{}",
+      "description": "AreaChart",
+      "version": 1,
+      "kibanaSavedObjectMeta": {
+        "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+      }
+    },
+    "_meta": {
+      "savedObjectVersion": 2
+    }
+  },
+  {
+    "_id": "test-2",
+    "_type": "visualization",
+    "_source": {
+      "title": "Visualization test 2",
+      "visState": "{\"title\":\"New Visualization\",\"type\":\"area\",\"params\":{\"shareYAxis\":true,\"addTooltip\":true,\"addLegend\":true,\"smoothLines\":false,\"scale\":\"linear\",\"interpolate\":\"linear\",\"mode\":\"stacked\",\"times\":[],\"addTimeMarker\":false,\"defaultYExtents\":false,\"setYExtents\":false,\"yAxis\":{}},\"aggs\":[{\"id\":\"1\",\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"customInterval\":\"2h\",\"min_doc_count\":1,\"extended_bounds\":{}}}],\"listeners\":{}}",
+      "uiStateJSON": "{}",
+      "description": "AreaChart",
+      "version": 1,
+      "kibanaSavedObjectMeta": {
+        "searchSourceJSON": "{\"index\":\"logstash-*\",\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}},\"filter\":[]}"
+      }
+    },
+    "_meta": {
+      "savedObjectVersion": 2
+    }
+  }
+]
diff --git a/test/functional/fixtures/es_archiver/saved_objects_imports/data.json.gz b/test/functional/fixtures/es_archiver/saved_objects_imports/data.json.gz
new file mode 100644
index 0000000000000000000000000000000000000000..006476f867ae7e151f9dae0599cbcc405b3dbfa1
GIT binary patch
literal 1754
zcmXYuX*e5*7KTZJXlR7cHn>!-sjb>xTTxpEtwE{%5=#&=mMB79GGuB?Mr~DFNeG>&
zQc~;KQpPg2*r}zp7HL(-)<$c)jp?8BJm-79_dP$3TnZQ*?P}x62lT}dFzNx}A$Yz`
zH_MQ@>td{R=kqMMk~cE4VRNbs-mN}jCYKC{z(c)8#DhbT6cr1_+oC62S-bRGY4JT9
zf88C`1(7W%GHj8T7yb7y+vriNnueq9O}tC`4~I6J<R-P=fE6}cECUBu-};fo!496U
z8XFC2kAuvg9f}U>_2dcyj~O~tTG6MZ^>zE>$bQe-4pkkOGUE8z(U&m$oSJ9u184#0
zE@5g7M=*Y6wRL?W@=?X=9|biD=`E$9&f6E9(WxzEK3v(VJJO0{O@R<!8UlAC{v@K<
z)GrEb<gYd*^Z0c_Rrk}^+N7xMqx30_;vC92SzXSJs;%f1j`yEFImB89Msq!4V!M3=
z<5{`o{3c(+48?_eHJc^ql-7q889?je#HnApKZ?04E~_QXFuS9I@-xn92<Iyxl$Me{
zg|i)v{AS^7Ys}b<{2a?8&QIR`Wcf8@=UVSnLHLYNj4UYZxBx#$Ws=+%(~QXW`BuB_
zdfGKJVG>pkT<*OS1NCURwmXp9*5b(+^DTL)VpwLqnNpljdnl|OslEnV8&Y_fY?8m;
zEC^A^40CA|_Ld==MVG?r<xySfFG+Wk+uZs})Rrg?+~Xj@$J3Nb*#+Byms>@>w(U#T
zx>8wqaNMJ;ifK7a`@OoWMDK&qbn^xJK(Xca#0+p0r#}2^<$3B0l8^byCBUx{o;G0+
za(_NtxUB)i?(t8ttv|F99kxlPSL2dZ^A2w5gKDJq0YN1%vaEVz`ub=MfCD$AHGCK9
zcGPQam?Zi7@*_4t&`zbDm=P%Yi5~vY;!ciY8q1TPEe}i`P|3FYvZ9%NQySxaNZNa<
zx02|fmsQ>)wW6@(x)OqT2FlyR{ne7=z`e-?WM*D&7|COVmH)IS*$Q*cK>qH;AJ!+b
zptHel)Onhex})8ciuTwJslPAtFZdsrj*_zc)>`XYHL^SVvvOSP(i0AK^F63BE}--5
z$RvKwh`pbo+seeM2D{WaarC`61ENoqI`6)H9~i3A#bPX1G1v*S1RZvfYSFw&Q6m#g
z#nuuL5Lrwv`O=27L0X|C?ZbNPM|E+Iu?kCn?1MbO)0a=@bKZn9W7_HQ*x}>=QfGA%
zl1#r+b%4inV+Sk!-0Yh_KQ}1f|7~N(sjWpV<Y?a}26L=I%x%*+5i^@jH+kFm=0)L;
zWogk@TCjgVi>~w&s{4DbWqy)!<VG!2gWg1*r@>PB3>Z<0=SIO~b7M_F32f2f22<jS
zDKaXIEs;vXfuzy#I1sV~CdOOz6XQx?LAGhmSb1LJRq(aSh-S&dg5r7KD}g;o0bcsY
zbszZAd8^t=oX531G5D_k2Bojc5f=W9;OEttW{>;y=T6;1w$hQLAHK(PqsiZ{O-z!_
zZ3k^M?|WvOk2K#~09sgwEXvXsxjLpw#_8%FeP#&&1-KZU1Qxhn5B&faft{hDcTJV#
zQ5}M>z6~;1;B>jYR0I}~ezf9fa+*vt#x~N|#d+A=;+ZwWhhTw~<#vmIT#KXw$-{xH
zQ%?P7=y$!T(zMSPp*K1dTVq}=DAR9eNc*(IKanI`{5}2<xpxuOaW+Cr0S@1l;Q6)a
zUQu^Z9nVK}Q@WvknHa)_Yu%mmLY-Oj3vAlFe)miaM{90ZSjEKEeiGplh#wV26k~;4
zayty{2V?v2|J%oYg+d1}k;R{5Ds2nP<(mm5M-g9EYh{D~yCB5Bds1j|EoxO}C1xmi
zDWFd6gz8XHiw|9CBS3R+YcxrOx}dk!#QX(*(SS*Bbd^?YI5y@))c0LOIK8W@9GiKX
ziAE#%2EXb%vxnTO2=pP7T1OoBc6n}?#+ilf{Du0mplZ{Ml%|{q$~hbqWcIg%%{M4c
z&yH|swO!B0SpU*ZWYKP2lb3|D_1>K)(7^u7K2opxv^?hRB*hFJe(*Vmn02R!sJ`{>
zuy!Oe1Bc67;6kx+-tT*6iao}NJv-CHgHFcJR+fUS@=vV8{@*o}3x?l_3@raC559`4
zs4!LKTEJ{v>MQOjxQs9N^Ly*|Z-r_Wnxdq2tMORvq;Vq60iDNil!@>k_nT4{XVS0Y
z@V@+&x(|woxX+>x1xtl7N+Rn_v``t=RW)JSAhCyect3kmvx~q1l&Q`J+?bQ_%C1xW
t^NEj-opf^L1wA0(B7p8Gm5>BN8IndajLF8F6A0=AAm-&ITT0{O`#*DZMwS2o

literal 0
HcmV?d00001

diff --git a/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json
new file mode 100644
index 00000000000000..a89fe1dfacfc83
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json
@@ -0,0 +1,244 @@
+{
+  "type": "index",
+  "value": {
+    "index": ".kibana",
+    "mappings": {
+      "properties": {
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "buildNum": {
+              "type": "keyword"
+            }
+          }
+        },
+        "dashboard": {
+          "dynamic": "strict",
+          "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"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "index-pattern": {
+          "dynamic": "strict",
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            }
+          }
+        },
+        "search": {
+          "dynamic": "strict",
+          "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": {
+          "dynamic": "strict",
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "dynamic": "strict",
+          "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"
+        },
+        "url": {
+          "dynamic": "strict",
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "fields": {
+                "keyword": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                }
+              },
+              "type": "text"
+            }
+          }
+        },
+        "visualization": {
+          "dynamic": "strict",
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchId": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index d6a96eb651d022..ce7a3f9e132f78 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -332,12 +332,14 @@ export function CommonPageProvider({ getService, getPageObjects }: FtrProviderCo
       });
     }
 
-    async clickConfirmOnModal() {
+    async clickConfirmOnModal(ensureHidden = true) {
       log.debug('Clicking modal confirm');
       // make sure this data-test-subj 'confirmModalTitleText' exists because we're going to wait for it to be gone later
       await testSubjects.exists('confirmModalTitleText');
       await testSubjects.click('confirmModalConfirmButton');
-      await this.ensureModalOverlayHidden();
+      if (ensureHidden) {
+        await this.ensureModalOverlayHidden();
+      }
     }
 
     async pressEnterKey() {

From 182e0de18f7149f3ed5ddf3768d2903a321c81ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Loix?= <sabee77@gmail.com>
Date: Thu, 3 Sep 2020 08:58:05 +0200
Subject: [PATCH 204/216] [Form lib] Fix regression on field not being
 validated after reset to its default value. (#76379)

---
 .../components/use_field.test.tsx             | 87 +++++++++++++++++++
 .../forms/hook_form_lib/hooks/use_field.ts    | 19 ++--
 .../hook_form_lib/hooks/use_form.test.tsx     | 60 ++++++++++++-
 3 files changed, 157 insertions(+), 9 deletions(-)

diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
index a55b2f0a8fa291..c14471991ccd33 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/components/use_field.test.tsx
@@ -64,6 +64,93 @@ describe('<UseField />', () => {
     });
   });
 
+  describe('validation', () => {
+    let formHook: FormHook | null = null;
+
+    beforeEach(() => {
+      formHook = null;
+    });
+
+    const onFormHook = (form: FormHook) => {
+      formHook = form;
+    };
+
+    const getTestComp = (fieldConfig: FieldConfig) => {
+      const TestComp = ({ onForm }: { onForm: (form: FormHook) => void }) => {
+        const { form } = useForm<any>();
+
+        useEffect(() => {
+          onForm(form);
+        }, [onForm, form]);
+
+        return (
+          <Form form={form}>
+            <UseField path="name" config={fieldConfig} data-test-subj="myField" />
+          </Form>
+        );
+      };
+      return TestComp;
+    };
+
+    const setup = (fieldConfig: FieldConfig) => {
+      return registerTestBed(getTestComp(fieldConfig), {
+        memoryRouter: { wrapComponent: false },
+        defaultProps: { onForm: onFormHook },
+      })() as TestBed;
+    };
+
+    test('should update the form validity whenever the field value changes', async () => {
+      const fieldConfig: FieldConfig = {
+        defaultValue: '', // empty string, which is not valid
+        validations: [
+          {
+            validator: ({ value }) => {
+              // Validate that string is not empty
+              if ((value as string).trim() === '') {
+                return { message: 'Error: field is empty.' };
+              }
+            },
+          },
+        ],
+      };
+
+      // Mount our TestComponent
+      const {
+        form: { setInputValue },
+      } = setup(fieldConfig);
+
+      if (formHook === null) {
+        throw new Error('FormHook object has not been set.');
+      }
+
+      let { isValid } = formHook;
+      expect(isValid).toBeUndefined(); // Initially the form validity is undefined...
+
+      await act(async () => {
+        await formHook!.validate(); // ...until we validate the form
+      });
+
+      ({ isValid } = formHook);
+      expect(isValid).toBe(false);
+
+      // Change to a non empty string to pass validation
+      await act(async () => {
+        setInputValue('myField', 'changedValue');
+      });
+
+      ({ isValid } = formHook);
+      expect(isValid).toBe(true);
+
+      // Change back to an empty string to fail validation
+      await act(async () => {
+        setInputValue('myField', '');
+      });
+
+      ({ isValid } = formHook);
+      expect(isValid).toBe(false);
+    });
+  });
+
   describe('serializer(), deserializer(), formatter()', () => {
     interface MyForm {
       name: string;
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 fa29f900af2ef5..f01c7226ea4cea 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
@@ -69,11 +69,12 @@ export const useField = <T>(
   const [isChangingValue, setIsChangingValue] = useState(false);
   const [isValidated, setIsValidated] = useState(false);
 
+  const isMounted = useRef<boolean>(false);
   const validateCounter = useRef(0);
   const changeCounter = useRef(0);
+  const hasBeenReset = useRef<boolean>(false);
   const inflightValidation = useRef<Promise<any> | null>(null);
   const debounceTimeout = useRef<NodeJS.Timeout | null>(null);
-  const isMounted = useRef<boolean>(false);
 
   // -- HELPERS
   // ----------------------------------
@@ -142,11 +143,7 @@ export const useField = <T>(
     __updateFormDataAt(path, value);
 
     // 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]);
-    }
+    await __validateFields(fieldsToValidateOnChange ?? [path]);
 
     if (isMounted.current === false) {
       return;
@@ -172,8 +169,6 @@ export const useField = <T>(
   }, [
     path,
     value,
-    defaultValue,
-    initialValue,
     valueChangeListener,
     errorDisplayDelay,
     fieldsToValidateOnChange,
@@ -468,6 +463,7 @@ export const useField = <T>(
       setErrors([]);
 
       if (resetValue) {
+        hasBeenReset.current = true;
         const newValue = deserializeValue(updatedDefaultValue ?? defaultValue);
         setValue(newValue);
         return newValue;
@@ -539,6 +535,13 @@ export const useField = <T>(
   }, [path, __removeField]);
 
   useEffect(() => {
+    // If the field value has been reset, we don't want to call the "onValueChange()"
+    // as it will set the "isPristine" state to true or validate the field, which initially we don't want.
+    if (hasBeenReset.current) {
+      hasBeenReset.current = false;
+      return;
+    }
+
     if (!isMounted.current) {
       return;
     }
diff --git a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
index 4a880415b6d228..edcd84daf5d2fe 100644
--- a/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
+++ b/src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form.test.tsx
@@ -22,7 +22,13 @@ import { act } from 'react-dom/test-utils';
 import { registerTestBed, getRandomString, TestBed } from '../shared_imports';
 
 import { Form, UseField } from '../components';
-import { FormSubmitHandler, OnUpdateHandler, FormHook, ValidationFunc } from '../types';
+import {
+  FormSubmitHandler,
+  OnUpdateHandler,
+  FormHook,
+  ValidationFunc,
+  FieldConfig,
+} from '../types';
 import { useForm } from './use_form';
 
 interface MyForm {
@@ -441,5 +447,57 @@ describe('useForm() hook', () => {
         deeply: { nested: { value: '' } }, // Fallback to empty string as no config was provided
       });
     });
+
+    test('should not validate the fields after resetting its value (form validity should be undefined)', async () => {
+      const fieldConfig: FieldConfig = {
+        defaultValue: '',
+        validations: [
+          {
+            validator: ({ value }) => {
+              if ((value as string).trim() === '') {
+                return { message: 'Error: empty string' };
+              }
+            },
+          },
+        ],
+      };
+
+      const TestResetComp = () => {
+        const { form } = useForm();
+
+        useEffect(() => {
+          formHook = form;
+        }, [form]);
+
+        return (
+          <Form form={form}>
+            <UseField path="username" config={fieldConfig} data-test-subj="myField" />
+          </Form>
+        );
+      };
+
+      const {
+        form: { setInputValue },
+      } = registerTestBed(TestResetComp, {
+        memoryRouter: { wrapComponent: false },
+      })() as TestBed;
+
+      let { isValid } = formHook!;
+      expect(isValid).toBeUndefined();
+
+      await act(async () => {
+        setInputValue('myField', 'changedValue');
+      });
+      ({ isValid } = formHook!);
+      expect(isValid).toBe(true);
+
+      await act(async () => {
+        // When we reset the form, value is back to "", which is invalid for the field
+        formHook!.reset();
+      });
+
+      ({ isValid } = formHook!);
+      expect(isValid).toBeUndefined(); // Make sure it is "undefined" and not "false".
+    });
   });
 });

From 593298ee3147250b91d7c7daf6a768dde4b9a67a Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Thu, 3 Sep 2020 10:20:20 +0200
Subject: [PATCH 205/216] remove legacy kibana plugin (#76064)

* remove legacy kibana plugin

* as ES as a dependency to security instead of kibana

* remove 'kibana' plugin presence check in so mixin

* moved the `kibana` config section to the server
---
 src/legacy/core_plugins/kibana/index.js       | 39 -------------------
 src/legacy/core_plugins/kibana/package.json   |  9 -----
 .../core_plugins/kibana/public/index.scss     |  7 ----
 .../kibana/server/ui_setting_defaults.js      | 23 -----------
 src/legacy/server/config/schema.js            |  9 +++++
 .../saved_objects/saved_objects_mixin.js      |  8 ----
 .../saved_objects/saved_objects_mixin.test.js | 15 -------
 x-pack/legacy/plugins/security/index.ts       |  2 +-
 x-pack/legacy/plugins/spaces/index.ts         |  2 +-
 9 files changed, 11 insertions(+), 103 deletions(-)
 delete mode 100644 src/legacy/core_plugins/kibana/index.js
 delete mode 100644 src/legacy/core_plugins/kibana/package.json
 delete mode 100644 src/legacy/core_plugins/kibana/public/index.scss
 delete mode 100644 src/legacy/core_plugins/kibana/server/ui_setting_defaults.js

diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
deleted file mode 100644
index 722d75d00f78fc..00000000000000
--- a/src/legacy/core_plugins/kibana/index.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.
- */
-
-import { getUiSettingDefaults } from './server/ui_setting_defaults';
-
-export default function (kibana) {
-  return new kibana.Plugin({
-    id: 'kibana',
-    config: function (Joi) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-        index: Joi.string().default('.kibana'),
-        autocompleteTerminateAfter: Joi.number().integer().min(1).default(100000),
-        // TODO Also allow units here like in elasticsearch config once this is moved to the new platform
-        autocompleteTimeout: Joi.number().integer().min(1).default(1000),
-      }).default();
-    },
-
-    uiExports: {
-      uiSettingDefaults: getUiSettingDefaults(),
-    },
-  });
-}
diff --git a/src/legacy/core_plugins/kibana/package.json b/src/legacy/core_plugins/kibana/package.json
deleted file mode 100644
index 94db646611df0b..00000000000000
--- a/src/legacy/core_plugins/kibana/package.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "name": "kibana",
-  "version": "kibana",
-  "config": {
-    "@elastic/eslint-import-resolver-kibana": {
-      "projectRoot": false
-    }
-  }
-}
diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
deleted file mode 100644
index 7de0c8fc15f943..00000000000000
--- a/src/legacy/core_plugins/kibana/public/index.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-// Elastic charts
-@import '@elastic/charts/dist/theme';
-@import '@elastic/eui/src/themes/charts/theme';
-
-// Public UI styles
-@import 'src/legacy/ui/public/index';
-
diff --git a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js b/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
deleted file mode 100644
index 7de5fb581643ac..00000000000000
--- a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
+++ /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.
- */
-
-export function getUiSettingDefaults() {
-  // wrapped in provider so that a new instance is given to each app/test
-  return {};
-}
diff --git a/src/legacy/server/config/schema.js b/src/legacy/server/config/schema.js
index 6cd3f8dc448b09..dd65e45659ffce 100644
--- a/src/legacy/server/config/schema.js
+++ b/src/legacy/server/config/schema.js
@@ -231,6 +231,15 @@ export default () =>
       locale: Joi.string().default('en'),
     }).default(),
 
+    // temporarily moved here from the (now deleted) kibana legacy plugin
+    kibana: Joi.object({
+      enabled: Joi.boolean().default(true),
+      index: Joi.string().default('.kibana'),
+      autocompleteTerminateAfter: Joi.number().integer().min(1).default(100000),
+      // TODO Also allow units here like in elasticsearch config once this is moved to the new platform
+      autocompleteTimeout: Joi.number().integer().min(1).default(1000),
+    }).default(),
+
     savedObjects: Joi.object({
       maxImportPayloadBytes: Joi.number().default(10485760),
       maxImportExportSize: Joi.number().default(10000),
diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.js b/src/legacy/server/saved_objects/saved_objects_mixin.js
index 185c8807ae8b5f..96cf2058839cfb 100644
--- a/src/legacy/server/saved_objects/saved_objects_mixin.js
+++ b/src/legacy/server/saved_objects/saved_objects_mixin.js
@@ -39,14 +39,6 @@ export function savedObjectsMixin(kbnServer, server) {
 
   server.decorate('server', 'kibanaMigrator', migrator);
 
-  const warn = (message) => server.log(['warning', 'saved-objects'], message);
-  // we use kibana.index which is technically defined in the kibana plugin, so if
-  // we don't have the plugin (mainly tests) we can't initialize the saved objects
-  if (!kbnServer.pluginSpecs.some((p) => p.getId() === 'kibana')) {
-    warn('Saved Objects uninitialized because the Kibana plugin is disabled.');
-    return;
-  }
-
   const serializer = kbnServer.newPlatform.start.core.savedObjects.createSerializer();
 
   const createRepository = (callCluster, includedHiddenTypes = []) => {
diff --git a/src/legacy/server/saved_objects/saved_objects_mixin.test.js b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
index 63e4a632ab5e01..d1d6c052ad5891 100644
--- a/src/legacy/server/saved_objects/saved_objects_mixin.test.js
+++ b/src/legacy/server/saved_objects/saved_objects_mixin.test.js
@@ -161,21 +161,6 @@ describe('Saved Objects Mixin', () => {
     };
   });
 
-  describe('no kibana plugin', () => {
-    it('should not try to create anything', () => {
-      mockKbnServer.pluginSpecs.some = () => false;
-      savedObjectsMixin(mockKbnServer, mockServer);
-      expect(mockServer.log).toHaveBeenCalledWith(expect.any(Array), expect.any(String));
-      expect(mockServer.decorate).toHaveBeenCalledWith(
-        'server',
-        'kibanaMigrator',
-        expect.any(Object)
-      );
-      expect(mockServer.decorate).toHaveBeenCalledTimes(1);
-      expect(mockServer.route).not.toHaveBeenCalled();
-    });
-  });
-
   describe('Saved object service', () => {
     let service;
 
diff --git a/x-pack/legacy/plugins/security/index.ts b/x-pack/legacy/plugins/security/index.ts
index 3ab5126e52c5f0..c3596d3745e57e 100644
--- a/x-pack/legacy/plugins/security/index.ts
+++ b/x-pack/legacy/plugins/security/index.ts
@@ -11,7 +11,7 @@ export const security = (kibana: Record<string, any>) =>
   new kibana.Plugin({
     id: 'security',
     publicDir: resolve(__dirname, 'public'),
-    require: ['kibana'],
+    require: ['elasticsearch'],
     configPrefix: 'xpack.security',
     config: (Joi: Root) =>
       Joi.object({ enabled: Joi.boolean().default(true) })
diff --git a/x-pack/legacy/plugins/spaces/index.ts b/x-pack/legacy/plugins/spaces/index.ts
index 40339f198df6d1..725d022879e0d7 100644
--- a/x-pack/legacy/plugins/spaces/index.ts
+++ b/x-pack/legacy/plugins/spaces/index.ts
@@ -16,7 +16,7 @@ export const spaces = (kibana: Record<string, any>) =>
     id: 'spaces',
     configPrefix: 'xpack.spaces',
     publicDir: resolve(__dirname, 'public'),
-    require: ['kibana', 'elasticsearch', 'xpack_main'],
+    require: ['elasticsearch', 'xpack_main'],
     config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),

From ebc50e6c691a2483485f94a23314a8bb1a6ec5a0 Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Thu, 3 Sep 2020 10:45:28 +0200
Subject: [PATCH 206/216] [Ingest Manager] Wording & linking improvements
 (#76284)

* Improve wording on add agent flyout.

* Add agent explanation to agent flyout.

* Add link to data stream page.
---
 .../components/agent_enrollment_flyout/index.tsx | 10 ++++++++++
 .../managed_instructions.tsx                     |  6 +++---
 .../standalone_instructions.tsx                  | 16 ++++++++++++++--
 .../plugins/translations/translations/ja-JP.json |  2 --
 .../plugins/translations/translations/zh-CN.json |  2 --
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
index 414c4e0d7ad2ce..05817f28f92925 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/index.tsx
@@ -8,6 +8,8 @@ import {
   EuiFlyout,
   EuiFlyoutBody,
   EuiFlyoutHeader,
+  EuiSpacer,
+  EuiText,
   EuiTitle,
   EuiFlexGroup,
   EuiFlexItem,
@@ -44,6 +46,14 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
             />
           </h2>
         </EuiTitle>
+        <EuiSpacer size="l" />
+        <EuiText>
+          <FormattedMessage
+            id="xpack.ingestManager.agentEnrollment.agentDescription"
+            defaultMessage="Add Elastic Agents to your hosts to collect data and send it to the Elastic Stack."
+          />
+        </EuiText>
+        <EuiSpacer size="l" />
         <EuiTabs style={{ marginBottom: '-25px' }}>
           <EuiTab isSelected={mode === 'managed'} onClick={() => setMode('managed')}>
             <FormattedMessage
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
index 9307229cdc2582..7db9d72eb50e4f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -75,13 +75,13 @@ export const ManagedInstructions: React.FunctionComponent<Props> = ({ agentPolic
         <>
           <FormattedMessage
             id="xpack.ingestManager.agentEnrollment.fleetNotInitializedText"
-            defaultMessage="Before enrolling agents, set up Fleet. {link}"
+            defaultMessage="Before enrolling agents, {link}."
             values={{
               link: (
                 <EuiLink href={getHref('fleet')}>
                   <FormattedMessage
-                    id="xpack.ingestManager.agentEnrollment.goToFleetButton"
-                    defaultMessage="Go to Fleet."
+                    id="xpack.ingestManager.agentEnrollment.setUpFleetLink"
+                    defaultMessage="set up Fleet"
                   />
                 </EuiLink>
               ),
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
index 049ceca82b309b..9262cc2cb42ac0 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_enrollment_flyout/standalone_instructions.tsx
@@ -15,12 +15,13 @@ import {
   EuiFlexGroup,
   EuiCodeBlock,
   EuiCopy,
+  EuiLink,
 } from '@elastic/eui';
 import { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { AgentPolicy } from '../../../../types';
-import { useCore, sendGetOneAgentPolicyFull } from '../../../../hooks';
+import { useCore, useLink, sendGetOneAgentPolicyFull } from '../../../../hooks';
 import { DownloadStep, AgentPolicySelectionStep } from './steps';
 import { fullAgentPolicyToYaml, agentPolicyRouteService } from '../../../../services';
 
@@ -31,6 +32,7 @@ interface Props {
 const RUN_INSTRUCTIONS = './elastic-agent run';
 
 export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPolicies }) => {
+  const { getHref } = useLink();
   const core = useCore();
   const { notifications } = core;
 
@@ -157,7 +159,17 @@ export const StandaloneInstructions: React.FunctionComponent<Props> = ({ agentPo
           <EuiText>
             <FormattedMessage
               id="xpack.ingestManager.agentEnrollment.stepCheckForDataDescription"
-              defaultMessage="The agent should begin sending data. Go to data streams to view your data."
+              defaultMessage="The agent should begin sending data. Go to {link} to view your data."
+              values={{
+                link: (
+                  <EuiLink href={getHref('data_streams')}>
+                    <FormattedMessage
+                      id="xpack.ingestManager.agentEnrollment.goToDataStreamsLink"
+                      defaultMessage="data streams"
+                    />
+                  </EuiLink>
+                ),
+              }}
             />
           </EuiText>
         </>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 59d952d08c1811..936f5aaf6522d1 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -9119,10 +9119,8 @@
     "xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "スタンドアロンモード",
     "xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "エージェントを登録する前に、フリートを設定する必要があります。{link}",
     "xpack.ingestManager.agentEnrollment.flyoutTitle": "エージェントの追加",
-    "xpack.ingestManager.agentEnrollment.goToFleetButton": "フリートに移動します。",
     "xpack.ingestManager.agentEnrollment.managedDescription": "必要なエージェントの数に関係なく、Fleetでは、簡単に一元的に更新を管理し、エージェントにデプロイすることができます。次の手順に従い、Elasticエージェントをダウンロードし、Fleetに登録してください。",
     "xpack.ingestManager.agentEnrollment.standaloneDescription": "スタンドアロンモードで実行中のエージェントは、構成を変更したい場合には、手動で更新する必要があります。次の手順に従い、スタンドアロンモードでElasticエージェントをダウンロードし、セットアップしてください。",
-    "xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "エージェントを起動した後、エージェントはデータの送信を開始します。Ingest Managerのデータセットページでは、このデータを確認できます。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "データを確認",
     "xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "エージェント構成を選択",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "この構成をコピーし、Elasticエージェントがインストールされているシステムのファイル{fileName}に置きます。必ず、構成ファイルの{outputSection}セクションで{ESUsernameVariable}と{ESPasswordVariable}を修正し、実際のElasticsearch認証資格情報が使用されるようにしてください。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 6641eede91e66b..800439f7b7b3f7 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9122,10 +9122,8 @@
     "xpack.ingestManager.agentEnrollment.enrollStandaloneTabLabel": "独立模式",
     "xpack.ingestManager.agentEnrollment.fleetNotInitializedText": "注册代理前需要设置 Fleet。{link}",
     "xpack.ingestManager.agentEnrollment.flyoutTitle": "添加代理",
-    "xpack.ingestManager.agentEnrollment.goToFleetButton": "前往 Fleet。",
     "xpack.ingestManager.agentEnrollment.managedDescription": "无论是需要一个代理还是需要数以千计的代理，Fleet 允许您轻松地集中管理并部署代理的更新。按照下面的说明下载 Elastic 代理并将代理注册到 Fleet。",
     "xpack.ingestManager.agentEnrollment.standaloneDescription": "如果希望对以独立模式运行的代理进行配置更改，则需要手动更新。按照下面的说明下载并设置独立模式的 Elastic 代理。",
-    "xpack.ingestManager.agentEnrollment.stepCheckForDataDescription": "启动代理后，代理应开始发送数据。您可以在采集管理器的数据集页面查看此数据。",
     "xpack.ingestManager.agentEnrollment.stepCheckForDataTitle": "检查数据",
     "xpack.ingestManager.agentEnrollment.stepChooseAgentPolicyTitle": "选择代理配置",
     "xpack.ingestManager.agentEnrollment.stepConfigureAgentDescription": "在安装 Elastic 代理的系统上复制此配置并将其放入名为 {fileName} 的文件中。切勿忘记修改配置文件中 {outputSection} 部分的{ESUsernameVariable} 和 {ESPasswordVariable}，以便其使用您的实际 Elasticsearch 凭据。",

From cd86b81b82f3cf28edc47f56bab900bd43214d9c Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Thu, 3 Sep 2020 11:57:03 +0300
Subject: [PATCH 207/216] Move streams utils to the core  (#76397)

* move utils/streams to the KP

* allow imports from src/core/server/utils

* ts-ify

* import streams from KP

* remove unnecessary ts-expect-error

* fix kbn-es-archiver build

* lost export

* copy array in createListStream

* remove streams from legacy utils

Co-authored-by: spalger <spalger@users.noreply.github.com>
---
 .eslintrc.js                                  |  2 ++
 src/cli_keystore/add.js                       |  2 +-
 .../get_sorted_objects_for_export.test.ts     |  2 +-
 .../export/get_sorted_objects_for_export.ts   |  2 +-
 .../import/collect_saved_objects.ts           |  2 +-
 .../import/create_limit_stream.test.ts        |  2 +-
 .../server/saved_objects/routes/export.ts     |  6 +---
 .../routes/integration_tests/export.test.ts   |  2 +-
 .../server/saved_objects/routes/utils.test.ts |  2 +-
 src/core/server/saved_objects/routes/utils.ts |  6 +---
 src/core/server/utils/index.ts                |  1 +
 .../utils/streams/concat_stream.test.ts}      |  2 +-
 .../server/utils/streams/concat_stream.ts}    |  2 +-
 .../streams/concat_stream_providers.test.ts}  |  0
 .../utils/streams/concat_stream_providers.ts} |  7 ++--
 .../utils/streams/filter_stream.test.ts       |  2 +-
 .../server}/utils/streams/filter_stream.ts    |  0
 .../server/utils/streams/index.ts}            |  0
 .../utils/streams/intersperse_stream.test.ts} |  2 +-
 .../utils/streams/intersperse_stream.ts}      |  4 +--
 .../server/utils/streams/list_stream.test.ts} |  2 +-
 .../server/utils/streams/list_stream.ts}      |  4 +--
 .../server/utils/streams/map_stream.test.ts}  |  4 +--
 .../server/utils/streams/map_stream.ts}       |  2 +-
 .../streams/promise_from_streams.test.ts}     |  7 ++--
 .../utils/streams/promise_from_streams.ts}    | 16 ++++++---
 .../utils/streams/reduce_stream.test.ts}      | 11 +++---
 .../server/utils/streams/reduce_stream.ts}    |  5 ++-
 .../utils/streams/replace_stream.test.ts}     | 12 ++++---
 .../server/utils/streams/replace_stream.ts}   |  3 +-
 .../utils/streams/split_stream.test.ts}       |  8 ++---
 .../server/utils/streams/split_stream.ts}     |  6 ++--
 src/dev/build/lib/watch_stdio_for_line.ts     |  2 +-
 src/legacy/server/i18n/index.ts               |  1 -
 .../server/logging/log_format_json.test.js    |  2 +-
 .../server/logging/log_format_string.test.js  |  2 +-
 src/legacy/utils/artifact_type.ts             |  1 -
 src/legacy/utils/index.d.ts                   | 13 -------
 src/legacy/utils/index.js                     | 12 -------
 src/legacy/utils/streams/index.d.ts           | 36 -------------------
 .../routes/rules/import_rules_route.ts        |  2 +-
 .../routes/rules/utils.test.ts                |  2 +-
 .../create_rules_stream_from_ndjson.test.ts   |  2 +-
 .../rules/create_rules_stream_from_ndjson.ts  |  2 +-
 .../create_timelines_stream_from_ndjson.ts    |  2 +-
 .../routes/import_timelines_route.test.ts     |  4 +--
 .../lib/timeline/routes/utils/common.ts       |  2 +-
 .../timeline/routes/utils/import_timelines.ts |  2 +-
 .../utils/install_prepacked_timelines.test.ts |  2 +-
 .../read_stream/create_stream_from_ndjson.ts  |  2 +-
 .../create_copy_to_space_mocks.ts             |  2 +-
 51 files changed, 85 insertions(+), 136 deletions(-)
 rename src/{legacy/utils/streams/concat_stream.test.js => core/server/utils/streams/concat_stream.test.ts} (98%)
 rename src/{legacy/utils/streams/concat_stream.js => core/server/utils/streams/concat_stream.ts} (96%)
 rename src/{legacy/utils/streams/concat_stream_providers.test.js => core/server/utils/streams/concat_stream_providers.test.ts} (100%)
 rename src/{legacy/utils/streams/concat_stream_providers.js => core/server/utils/streams/concat_stream_providers.ts} (91%)
 rename src/{legacy => core/server}/utils/streams/filter_stream.test.ts (99%)
 rename src/{legacy => core/server}/utils/streams/filter_stream.ts (100%)
 rename src/{legacy/utils/streams/index.js => core/server/utils/streams/index.ts} (100%)
 rename src/{legacy/utils/streams/intersperse_stream.test.js => core/server/utils/streams/intersperse_stream.test.ts} (99%)
 rename src/{legacy/utils/streams/intersperse_stream.js => core/server/utils/streams/intersperse_stream.ts} (95%)
 rename src/{legacy/utils/streams/list_stream.test.js => core/server/utils/streams/list_stream.test.ts} (97%)
 rename src/{legacy/utils/streams/list_stream.js => core/server/utils/streams/list_stream.ts} (90%)
 rename src/{legacy/utils/streams/map_stream.test.js => core/server/utils/streams/map_stream.test.ts} (95%)
 rename src/{legacy/utils/streams/map_stream.js => core/server/utils/streams/map_stream.ts} (93%)
 rename src/{legacy/utils/streams/promise_from_streams.test.js => core/server/utils/streams/promise_from_streams.test.ts} (96%)
 rename src/{legacy/utils/streams/promise_from_streams.js => core/server/utils/streams/promise_from_streams.ts} (80%)
 rename src/{legacy/utils/streams/reduce_stream.test.js => core/server/utils/streams/reduce_stream.test.ts} (92%)
 rename src/{legacy/utils/streams/reduce_stream.js => core/server/utils/streams/reduce_stream.ts} (95%)
 rename src/{legacy/utils/streams/replace_stream.test.js => core/server/utils/streams/replace_stream.test.ts} (91%)
 rename src/{legacy/utils/streams/replace_stream.js => core/server/utils/streams/replace_stream.ts} (96%)
 rename src/{legacy/utils/streams/split_stream.test.js => core/server/utils/streams/split_stream.test.ts} (93%)
 rename src/{legacy/utils/streams/split_stream.js => core/server/utils/streams/split_stream.ts} (95%)
 delete mode 100644 src/legacy/utils/streams/index.d.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 9b75c36c95abdb..3161a25b708708 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -305,6 +305,8 @@ module.exports = {
                   '!src/core/server/mocks{,.ts}',
                   '!src/core/server/types{,.ts}',
                   '!src/core/server/test_utils{,.ts}',
+                  '!src/core/server/utils', // ts alias
+                  '!src/core/server/utils/**/*',
                   // for absolute imports until fixed in
                   // https://github.com/elastic/kibana/issues/36096
                   '!src/core/server/*.test.mocks{,.ts}',
diff --git a/src/cli_keystore/add.js b/src/cli_keystore/add.js
index 44737e387c2d29..462259ec942dd5 100644
--- a/src/cli_keystore/add.js
+++ b/src/cli_keystore/add.js
@@ -19,7 +19,7 @@
 
 import { Logger } from '../cli_plugin/lib/logger';
 import { confirm, question } from '../legacy/server/utils';
-import { createPromiseFromStreams, createConcatStream } from '../legacy/utils';
+import { createPromiseFromStreams, createConcatStream } from '../core/server/utils';
 
 /**
  * @param {Keystore} keystore
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 85b3a281aef7f6..c084125f43127a 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
@@ -20,7 +20,7 @@
 import { exportSavedObjectsToStream } from './get_sorted_objects_for_export';
 import { savedObjectsClientMock } from '../service/saved_objects_client.mock';
 import { Readable } from 'stream';
-import { createPromiseFromStreams, createConcatStream } from '../../../../legacy/utils/streams';
+import { createPromiseFromStreams, createConcatStream } from '../../utils/streams';
 
 async function readStreamToCompletion(stream: Readable) {
   return createPromiseFromStreams([stream, createConcatStream([])]);
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 94f727e238ecf3..214b51db7dd6bb 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
@@ -18,7 +18,7 @@
  */
 
 import Boom from 'boom';
-import { createListStream } from '../../../../legacy/utils/streams';
+import { createListStream } from '../../utils/streams';
 import { SavedObjectsClientContract, SavedObject } from '../types';
 import { fetchNestedDependencies } from './inject_nested_depdendencies';
 import { sortObjects } from './sort_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 f55e6bf0d2af4c..8e84f864cf4490 100644
--- a/src/core/server/saved_objects/import/collect_saved_objects.ts
+++ b/src/core/server/saved_objects/import/collect_saved_objects.ts
@@ -23,7 +23,7 @@ import {
   createFilterStream,
   createMapStream,
   createPromiseFromStreams,
-} from '../../../../legacy/utils/streams';
+} from '../../utils/streams';
 import { SavedObject } from '../types';
 import { createLimitStream } from './create_limit_stream';
 import { SavedObjectsImportError } from './types';
diff --git a/src/core/server/saved_objects/import/create_limit_stream.test.ts b/src/core/server/saved_objects/import/create_limit_stream.test.ts
index 736cfadcb62228..a7e689710a564f 100644
--- a/src/core/server/saved_objects/import/create_limit_stream.test.ts
+++ b/src/core/server/saved_objects/import/create_limit_stream.test.ts
@@ -21,7 +21,7 @@ import {
   createConcatStream,
   createListStream,
   createPromiseFromStreams,
-} from '../../../../legacy/utils/streams';
+} from '../../utils/streams';
 import { createLimitStream } from './create_limit_stream';
 
 describe('createLimitStream()', () => {
diff --git a/src/core/server/saved_objects/routes/export.ts b/src/core/server/saved_objects/routes/export.ts
index 9445c144ecda45..35a65d8d9651fe 100644
--- a/src/core/server/saved_objects/routes/export.ts
+++ b/src/core/server/saved_objects/routes/export.ts
@@ -19,11 +19,7 @@
 
 import { schema } from '@kbn/config-schema';
 import stringify from 'json-stable-stringify';
-import {
-  createPromiseFromStreams,
-  createMapStream,
-  createConcatStream,
-} from '../../../../legacy/utils/streams';
+import { createPromiseFromStreams, createMapStream, createConcatStream } from '../../utils/streams';
 import { IRouter } from '../../http';
 import { SavedObjectConfig } from '../saved_objects_config';
 import { exportSavedObjectsToStream } from '../export';
diff --git a/src/core/server/saved_objects/routes/integration_tests/export.test.ts b/src/core/server/saved_objects/routes/integration_tests/export.test.ts
index d47f7c6050d8f7..a3891712fd22b7 100644
--- a/src/core/server/saved_objects/routes/integration_tests/export.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/export.test.ts
@@ -22,7 +22,7 @@ jest.mock('../../export', () => ({
 }));
 
 import * as exportMock from '../../export';
-import { createListStream } from '../../../../../legacy/utils/streams';
+import { createListStream } from '../../../utils/streams';
 import supertest from 'supertest';
 import { UnwrapPromise } from '@kbn/utility-types';
 import { SavedObjectConfig } from '../../saved_objects_config';
diff --git a/src/core/server/saved_objects/routes/utils.test.ts b/src/core/server/saved_objects/routes/utils.test.ts
index 24719724785af1..fd3bdad8606ed5 100644
--- a/src/core/server/saved_objects/routes/utils.test.ts
+++ b/src/core/server/saved_objects/routes/utils.test.ts
@@ -19,7 +19,7 @@
 
 import { createSavedObjectsStreamFromNdJson, validateTypes, validateObjects } from './utils';
 import { Readable } from 'stream';
-import { createPromiseFromStreams, createConcatStream } from '../../../../legacy/utils/streams';
+import { createPromiseFromStreams, createConcatStream } from '../../utils/streams';
 
 async function readStreamToCompletion(stream: Readable) {
   return createPromiseFromStreams([stream, createConcatStream([])]);
diff --git a/src/core/server/saved_objects/routes/utils.ts b/src/core/server/saved_objects/routes/utils.ts
index 3963833a9c718b..f16a6e471257d0 100644
--- a/src/core/server/saved_objects/routes/utils.ts
+++ b/src/core/server/saved_objects/routes/utils.ts
@@ -19,11 +19,7 @@
 
 import { Readable } from 'stream';
 import { SavedObject, SavedObjectsExportResultDetails } from 'src/core/server';
-import {
-  createSplitStream,
-  createMapStream,
-  createFilterStream,
-} from '../../../../legacy/utils/streams';
+import { createSplitStream, createMapStream, createFilterStream } from '../../utils/streams';
 
 export function createSavedObjectsStreamFromNdJson(ndJsonStream: Readable) {
   return ndJsonStream
diff --git a/src/core/server/utils/index.ts b/src/core/server/utils/index.ts
index b01a4c4e048998..d9c4217c4117f7 100644
--- a/src/core/server/utils/index.ts
+++ b/src/core/server/utils/index.ts
@@ -20,3 +20,4 @@
 export * from './crypto';
 export * from './from_root';
 export * from './package_json';
+export * from './streams';
diff --git a/src/legacy/utils/streams/concat_stream.test.js b/src/core/server/utils/streams/concat_stream.test.ts
similarity index 98%
rename from src/legacy/utils/streams/concat_stream.test.js
rename to src/core/server/utils/streams/concat_stream.test.ts
index 1498334013d1ab..e964ab2a7a97ed 100644
--- a/src/legacy/utils/streams/concat_stream.test.js
+++ b/src/core/server/utils/streams/concat_stream.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { createListStream, createPromiseFromStreams, createConcatStream } from './';
+import { createListStream, createPromiseFromStreams, createConcatStream } from './index';
 
 describe('concatStream', () => {
   test('accepts an initial value', async () => {
diff --git a/src/legacy/utils/streams/concat_stream.js b/src/core/server/utils/streams/concat_stream.ts
similarity index 96%
rename from src/legacy/utils/streams/concat_stream.js
rename to src/core/server/utils/streams/concat_stream.ts
index e3f8f7261d2b7a..03450cb51b8322 100644
--- a/src/legacy/utils/streams/concat_stream.js
+++ b/src/core/server/utils/streams/concat_stream.ts
@@ -41,6 +41,6 @@ import { createReduceStream } from './reduce_stream';
  *                       items will concat with
  *  @return {Transform}
  */
-export function createConcatStream(initial) {
+export function createConcatStream<T>(initial?: T) {
   return createReduceStream((acc, chunk) => acc.concat(chunk), initial);
 }
diff --git a/src/legacy/utils/streams/concat_stream_providers.test.js b/src/core/server/utils/streams/concat_stream_providers.test.ts
similarity index 100%
rename from src/legacy/utils/streams/concat_stream_providers.test.js
rename to src/core/server/utils/streams/concat_stream_providers.test.ts
diff --git a/src/legacy/utils/streams/concat_stream_providers.js b/src/core/server/utils/streams/concat_stream_providers.ts
similarity index 91%
rename from src/legacy/utils/streams/concat_stream_providers.js
rename to src/core/server/utils/streams/concat_stream_providers.ts
index 11dfb84284df38..bb836e3d737872 100644
--- a/src/legacy/utils/streams/concat_stream_providers.js
+++ b/src/core/server/utils/streams/concat_stream_providers.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PassThrough } from 'stream';
+import { Readable, PassThrough, TransformOptions } from 'stream';
 
 /**
  *  Write the data and errors from a list of stream providers
@@ -29,7 +29,10 @@ import { PassThrough } from 'stream';
  *  @param {PassThroughOptions} options options passed to the PassThrough constructor
  *  @return {WritableStream} combined stream
  */
-export function concatStreamProviders(sourceProviders, options = {}) {
+export function concatStreamProviders(
+  sourceProviders: Array<() => Readable>,
+  options?: TransformOptions
+) {
   const destination = new PassThrough(options);
   const queue = sourceProviders.slice();
 
diff --git a/src/legacy/utils/streams/filter_stream.test.ts b/src/core/server/utils/streams/filter_stream.test.ts
similarity index 99%
rename from src/legacy/utils/streams/filter_stream.test.ts
rename to src/core/server/utils/streams/filter_stream.test.ts
index 28b7f2588628e7..41073e54b0a842 100644
--- a/src/legacy/utils/streams/filter_stream.test.ts
+++ b/src/core/server/utils/streams/filter_stream.test.ts
@@ -22,7 +22,7 @@ import {
   createFilterStream,
   createListStream,
   createPromiseFromStreams,
-} from './';
+} from './index';
 
 describe('createFilterStream()', () => {
   test('calls the function with each item in the source stream', async () => {
diff --git a/src/legacy/utils/streams/filter_stream.ts b/src/core/server/utils/streams/filter_stream.ts
similarity index 100%
rename from src/legacy/utils/streams/filter_stream.ts
rename to src/core/server/utils/streams/filter_stream.ts
diff --git a/src/legacy/utils/streams/index.js b/src/core/server/utils/streams/index.ts
similarity index 100%
rename from src/legacy/utils/streams/index.js
rename to src/core/server/utils/streams/index.ts
diff --git a/src/legacy/utils/streams/intersperse_stream.test.js b/src/core/server/utils/streams/intersperse_stream.test.ts
similarity index 99%
rename from src/legacy/utils/streams/intersperse_stream.test.js
rename to src/core/server/utils/streams/intersperse_stream.test.ts
index e11b36d77106a6..9aa15035d2a1cc 100644
--- a/src/legacy/utils/streams/intersperse_stream.test.js
+++ b/src/core/server/utils/streams/intersperse_stream.test.ts
@@ -22,7 +22,7 @@ import {
   createListStream,
   createIntersperseStream,
   createConcatStream,
-} from './';
+} from './index';
 
 describe('intersperseStream', () => {
   test('places the intersperse value between each provided value', async () => {
diff --git a/src/legacy/utils/streams/intersperse_stream.js b/src/core/server/utils/streams/intersperse_stream.ts
similarity index 95%
rename from src/legacy/utils/streams/intersperse_stream.js
rename to src/core/server/utils/streams/intersperse_stream.ts
index 5f9f0b03cd7eb8..272507221caff3 100644
--- a/src/legacy/utils/streams/intersperse_stream.js
+++ b/src/core/server/utils/streams/intersperse_stream.ts
@@ -40,7 +40,7 @@ import { Transform } from 'stream';
  *  @param  {String|Buffer} intersperseChunk
  *  @return {Transform}
  */
-export function createIntersperseStream(intersperseChunk) {
+export function createIntersperseStream(intersperseChunk: string | Buffer) {
   let first = true;
 
   return new Transform({
@@ -55,7 +55,7 @@ export function createIntersperseStream(intersperseChunk) {
         }
 
         this.push(chunk);
-        callback(null);
+        callback();
       } catch (err) {
         callback(err);
       }
diff --git a/src/legacy/utils/streams/list_stream.test.js b/src/core/server/utils/streams/list_stream.test.ts
similarity index 97%
rename from src/legacy/utils/streams/list_stream.test.js
rename to src/core/server/utils/streams/list_stream.test.ts
index 12e20696b05101..2a20c929db6b97 100644
--- a/src/legacy/utils/streams/list_stream.test.js
+++ b/src/core/server/utils/streams/list_stream.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { createListStream } from './';
+import { createListStream } from './index';
 
 describe('listStream', () => {
   test('provides the values in the initial list', async () => {
diff --git a/src/legacy/utils/streams/list_stream.js b/src/core/server/utils/streams/list_stream.ts
similarity index 90%
rename from src/legacy/utils/streams/list_stream.js
rename to src/core/server/utils/streams/list_stream.ts
index a614620b054b7f..e62f6d3fa930bb 100644
--- a/src/legacy/utils/streams/list_stream.js
+++ b/src/core/server/utils/streams/list_stream.ts
@@ -26,8 +26,8 @@ import { Readable } from 'stream';
  *  @param  {Array<any>} items - the list of items to provide
  *  @return {Readable}
  */
-export function createListStream(items = []) {
-  const queue = [].concat(items);
+export function createListStream<T = any>(items: T | T[] = []) {
+  const queue = Array.isArray(items) ? [...items] : [items];
 
   return new Readable({
     objectMode: true,
diff --git a/src/legacy/utils/streams/map_stream.test.js b/src/core/server/utils/streams/map_stream.test.ts
similarity index 95%
rename from src/legacy/utils/streams/map_stream.test.js
rename to src/core/server/utils/streams/map_stream.test.ts
index d86da178f0c1b3..bf0cab39c21f40 100644
--- a/src/legacy/utils/streams/map_stream.test.js
+++ b/src/core/server/utils/streams/map_stream.test.ts
@@ -39,7 +39,7 @@ describe('createMapStream()', () => {
   test('send the return value from the mapper on the output stream', async () => {
     const result = await createPromiseFromStreams([
       createListStream([1, 2, 3]),
-      createMapStream((n) => n * 100),
+      createMapStream((n: number) => n * 100),
       createConcatStream([]),
     ]);
 
@@ -49,7 +49,7 @@ describe('createMapStream()', () => {
   test('supports async mappers', async () => {
     const result = await createPromiseFromStreams([
       createListStream([1, 2, 3]),
-      createMapStream(async (n, i) => {
+      createMapStream(async (n: number, i: number) => {
         await delay(n);
         return n * i;
       }),
diff --git a/src/legacy/utils/streams/map_stream.js b/src/core/server/utils/streams/map_stream.ts
similarity index 93%
rename from src/legacy/utils/streams/map_stream.js
rename to src/core/server/utils/streams/map_stream.ts
index 4e906471330f1d..aad53cc5266260 100644
--- a/src/legacy/utils/streams/map_stream.js
+++ b/src/core/server/utils/streams/map_stream.ts
@@ -19,7 +19,7 @@
 
 import { Transform } from 'stream';
 
-export function createMapStream(fn) {
+export function createMapStream<T>(fn: (value: T, i: number) => void) {
   let i = 0;
 
   return new Transform({
diff --git a/src/legacy/utils/streams/promise_from_streams.test.js b/src/core/server/utils/streams/promise_from_streams.test.ts
similarity index 96%
rename from src/legacy/utils/streams/promise_from_streams.test.js
rename to src/core/server/utils/streams/promise_from_streams.test.ts
index e4d9835106f12c..1f2596c16a6fa3 100644
--- a/src/legacy/utils/streams/promise_from_streams.test.js
+++ b/src/core/server/utils/streams/promise_from_streams.test.ts
@@ -19,7 +19,7 @@
 
 import { Readable, Writable, Duplex, Transform } from 'stream';
 
-import { createListStream, createPromiseFromStreams, createReduceStream } from './';
+import { createListStream, createPromiseFromStreams, createReduceStream } from './index';
 
 describe('promiseFromStreams', () => {
   test('pipes together an array of streams', async () => {
@@ -76,14 +76,13 @@ describe('promiseFromStreams', () => {
     test('waits for writing and resolves to final value', async () => {
       let written = '';
 
-      const duplexReadQueue = [];
+      const duplexReadQueue: Array<Promise<unknown>> = [];
       const duplexItemsToPush = ['foo', 'bar', null];
       const result = await createPromiseFromStreams([
         createListStream(['a', 'b', 'c']),
         new Duplex({
           async read() {
-            const result = await duplexReadQueue.shift();
-            this.push(result);
+            this.push(await duplexReadQueue.shift());
           },
 
           write(chunk, enc, cb) {
diff --git a/src/legacy/utils/streams/promise_from_streams.js b/src/core/server/utils/streams/promise_from_streams.ts
similarity index 80%
rename from src/legacy/utils/streams/promise_from_streams.js
rename to src/core/server/utils/streams/promise_from_streams.ts
index 05f6a08aa1a09b..f5fc4af62bc838 100644
--- a/src/legacy/utils/streams/promise_from_streams.js
+++ b/src/core/server/utils/streams/promise_from_streams.ts
@@ -34,16 +34,20 @@
  *  @return {Promise<any>}
  */
 
-import { pipeline, Writable } from 'stream';
+import { pipeline, Writable, Readable } from 'stream';
 
-export async function createPromiseFromStreams(streams) {
-  let finalChunk;
+function isReadable(stream: Readable | Writable): stream is Readable {
+  return 'read' in stream && typeof stream.read === 'function';
+}
+
+export async function createPromiseFromStreams<T>(streams: [Readable, ...Writable[]]): Promise<T> {
+  let finalChunk: any;
   const last = streams[streams.length - 1];
-  if (typeof last.read !== 'function' && streams.length === 1) {
+  if (!isReadable(last) && streams.length === 1) {
     // For a nicer error than what stream.pipeline throws
     throw new Error('A minimum of 2 streams is required when a non-readable stream is given');
   }
-  if (typeof last.read === 'function') {
+  if (isReadable(last)) {
     // We are pushing a writable stream to capture the last chunk
     streams.push(
       new Writable({
@@ -57,7 +61,9 @@ export async function createPromiseFromStreams(streams) {
       })
     );
   }
+
   return new Promise((resolve, reject) => {
+    // @ts-expect-error 'pipeline' doesn't support variable length of arguments
     pipeline(...streams, (err) => {
       if (err) return reject(err);
       resolve(finalChunk);
diff --git a/src/legacy/utils/streams/reduce_stream.test.js b/src/core/server/utils/streams/reduce_stream.test.ts
similarity index 92%
rename from src/legacy/utils/streams/reduce_stream.test.js
rename to src/core/server/utils/streams/reduce_stream.test.ts
index 2c073f67f82a89..e4a7dc1cef4912 100644
--- a/src/legacy/utils/streams/reduce_stream.test.js
+++ b/src/core/server/utils/streams/reduce_stream.test.ts
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Transform } from 'stream';
+import { createReduceStream, createPromiseFromStreams, createListStream } from './index';
 
-import { createReduceStream, createPromiseFromStreams, createListStream } from './';
-
-const promiseFromEvent = (name, emitter) =>
+const promiseFromEvent = (name: string, emitter: Transform) =>
   new Promise((resolve) => emitter.on(name, () => resolve(name)));
 
 describe('reduceStream', () => {
@@ -47,7 +47,10 @@ describe('reduceStream', () => {
   });
 
   test('emits an error if an iteration fails', async () => {
-    const reduce = createReduceStream((acc, i) => expect(i).toBe(1), 0);
+    const reduce = createReduceStream((acc, i) => {
+      expect(i).toBe(1);
+      return acc;
+    }, 0);
     const errorEvent = promiseFromEvent('error', reduce);
 
     reduce.write(1);
diff --git a/src/legacy/utils/streams/reduce_stream.js b/src/core/server/utils/streams/reduce_stream.ts
similarity index 95%
rename from src/legacy/utils/streams/reduce_stream.js
rename to src/core/server/utils/streams/reduce_stream.ts
index d66b0124d1dab9..9129df096ad13d 100644
--- a/src/legacy/utils/streams/reduce_stream.js
+++ b/src/core/server/utils/streams/reduce_stream.ts
@@ -32,7 +32,10 @@ import { Transform } from 'stream';
  *                        initial value.
  *  @return {Transform}
  */
-export function createReduceStream(reducer, initial) {
+export function createReduceStream<T>(
+  reducer: (value: any, chunk: T, enc: string) => T,
+  initial?: T
+) {
   let i = -1;
   let value = initial;
 
diff --git a/src/legacy/utils/streams/replace_stream.test.js b/src/core/server/utils/streams/replace_stream.test.ts
similarity index 91%
rename from src/legacy/utils/streams/replace_stream.test.js
rename to src/core/server/utils/streams/replace_stream.test.ts
index 01b89f93e5af06..c9da42395fb85c 100644
--- a/src/legacy/utils/streams/replace_stream.test.js
+++ b/src/core/server/utils/streams/replace_stream.test.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Writable, Readable } from 'stream';
 
 import {
   createReplaceStream,
@@ -23,19 +24,19 @@ import {
   createPromiseFromStreams,
   createListStream,
   createMapStream,
-} from './';
+} from './index';
 
-async function concatToString(streams) {
+async function concatToString(streams: [Readable, ...Writable[]]) {
   return await createPromiseFromStreams([
     ...streams,
-    createMapStream((buff) => buff.toString('utf8')),
+    createMapStream((buff: Buffer) => buff.toString('utf8')),
     createConcatStream(''),
   ]);
 }
 
 describe('replaceStream', () => {
   test('produces buffers when it receives buffers', async () => {
-    const chunks = await createPromiseFromStreams([
+    const chunks = await createPromiseFromStreams<Buffer[]>([
       createListStream([Buffer.from('foo'), Buffer.from('bar')]),
       createReplaceStream('o', '0'),
       createConcatStream([]),
@@ -47,7 +48,7 @@ describe('replaceStream', () => {
   });
 
   test('produces buffers when it receives strings', async () => {
-    const chunks = await createPromiseFromStreams([
+    const chunks = await createPromiseFromStreams<string[]>([
       createListStream(['foo', 'bar']),
       createReplaceStream('o', '0'),
       createConcatStream([]),
@@ -59,6 +60,7 @@ describe('replaceStream', () => {
   });
 
   test('expects toReplace to be a string', () => {
+    // @ts-expect-error
     expect(() => createReplaceStream(Buffer.from('foo'))).toThrowError(/be a string/);
   });
 
diff --git a/src/legacy/utils/streams/replace_stream.js b/src/core/server/utils/streams/replace_stream.ts
similarity index 96%
rename from src/legacy/utils/streams/replace_stream.js
rename to src/core/server/utils/streams/replace_stream.ts
index 7309bd241fa521..05391bb3341c24 100644
--- a/src/legacy/utils/streams/replace_stream.js
+++ b/src/core/server/utils/streams/replace_stream.ts
@@ -19,7 +19,7 @@
 
 import { Transform } from 'stream';
 
-export function createReplaceStream(toReplace, replacement) {
+export function createReplaceStream(toReplace: string, replacement: string | Buffer) {
   if (typeof toReplace !== 'string') {
     throw new TypeError('toReplace must be a string');
   }
@@ -78,6 +78,7 @@ export function createReplaceStream(toReplace, replacement) {
         this.push(buffer);
       }
 
+      // @ts-expect-error
       buffer = null;
       callback();
     },
diff --git a/src/legacy/utils/streams/split_stream.test.js b/src/core/server/utils/streams/split_stream.test.ts
similarity index 93%
rename from src/legacy/utils/streams/split_stream.test.js
rename to src/core/server/utils/streams/split_stream.test.ts
index e0736d220ba5ca..f131bd0661e54f 100644
--- a/src/legacy/utils/streams/split_stream.test.js
+++ b/src/core/server/utils/streams/split_stream.test.ts
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { Transform } from 'stream';
+import { createSplitStream, createConcatStream, createPromiseFromStreams } from './index';
 
-import { createSplitStream, createConcatStream, createPromiseFromStreams } from './';
-
-async function split(stream, input) {
+async function split(stream: Transform, input: Array<Buffer | string>) {
   const concat = createConcatStream();
   concat.write([]);
   stream.pipe(concat);
   const output = createPromiseFromStreams([concat]);
 
-  input.forEach((i) => {
+  input.forEach((i: any) => {
     stream.write(i);
   });
   stream.end();
diff --git a/src/legacy/utils/streams/split_stream.js b/src/core/server/utils/streams/split_stream.ts
similarity index 95%
rename from src/legacy/utils/streams/split_stream.js
rename to src/core/server/utils/streams/split_stream.ts
index f55cbc7bd290d7..ae820f60abbf67 100644
--- a/src/legacy/utils/streams/split_stream.js
+++ b/src/core/server/utils/streams/split_stream.ts
@@ -38,7 +38,7 @@ import { Transform } from 'stream';
  *  @param  {String} splitChunk
  *  @return {Transform}
  */
-export function createSplitStream(splitChunk) {
+export function createSplitStream(splitChunk: string | Uint8Array) {
   let unsplitBuffer = Buffer.alloc(0);
 
   return new Transform({
@@ -55,7 +55,7 @@ export function createSplitStream(splitChunk) {
         }
 
         unsplitBuffer = toSplit;
-        callback(null);
+        callback();
       } catch (err) {
         callback(err);
       }
@@ -65,7 +65,7 @@ export function createSplitStream(splitChunk) {
       try {
         this.push(unsplitBuffer.toString('utf8'));
 
-        callback(null);
+        callback();
       } catch (err) {
         callback(err);
       }
diff --git a/src/dev/build/lib/watch_stdio_for_line.ts b/src/dev/build/lib/watch_stdio_for_line.ts
index 2322d017abc61b..3d7929ccfc33ac 100644
--- a/src/dev/build/lib/watch_stdio_for_line.ts
+++ b/src/dev/build/lib/watch_stdio_for_line.ts
@@ -24,7 +24,7 @@ import {
   createPromiseFromStreams,
   createSplitStream,
   createMapStream,
-} from '../../../legacy/utils/streams';
+} from '../../../core/server/utils';
 
 // creates a stream that skips empty lines unless they are followed by
 // another line, preventing the empty lines produced by splitStream
diff --git a/src/legacy/server/i18n/index.ts b/src/legacy/server/i18n/index.ts
index 09f7022436049d..e895f83fe69017 100644
--- a/src/legacy/server/i18n/index.ts
+++ b/src/legacy/server/i18n/index.ts
@@ -20,7 +20,6 @@
 import { i18n, i18nLoader } from '@kbn/i18n';
 import { basename } from 'path';
 import { Server } from 'hapi';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { fromRoot } from '../../../core/server/utils';
 import { getTranslationPaths } from './get_translations_path';
 import { I18N_RC } from './constants';
diff --git a/src/legacy/server/logging/log_format_json.test.js b/src/legacy/server/logging/log_format_json.test.js
index 31e622ecae6113..f4fb939750566b 100644
--- a/src/legacy/server/logging/log_format_json.test.js
+++ b/src/legacy/server/logging/log_format_json.test.js
@@ -21,7 +21,7 @@ import moment from 'moment';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { attachMetaData } from '../../../../src/core/server/legacy/logging/legacy_logging_server';
-import { createListStream, createPromiseFromStreams } from '../../utils';
+import { createListStream, createPromiseFromStreams } from '../../../core/server/utils';
 
 import KbnLoggerJsonFormat from './log_format_json';
 
diff --git a/src/legacy/server/logging/log_format_string.test.js b/src/legacy/server/logging/log_format_string.test.js
index 067ad70380961e..842325865cce22 100644
--- a/src/legacy/server/logging/log_format_string.test.js
+++ b/src/legacy/server/logging/log_format_string.test.js
@@ -21,7 +21,7 @@ import moment from 'moment';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { attachMetaData } from '../../../../src/core/server/legacy/logging/legacy_logging_server';
 
-import { createListStream, createPromiseFromStreams } from '../../utils';
+import { createListStream, createPromiseFromStreams } from '../../../core/server/utils';
 
 import KbnLoggerStringFormat from './log_format_string';
 
diff --git a/src/legacy/utils/artifact_type.ts b/src/legacy/utils/artifact_type.ts
index 69f728e9e2220b..ef471ef8e050d6 100644
--- a/src/legacy/utils/artifact_type.ts
+++ b/src/legacy/utils/artifact_type.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { pkg } from '../../core/server/utils';
 export const IS_KIBANA_DISTRIBUTABLE = pkg.build && pkg.build.distributable === true;
 export const IS_KIBANA_RELEASE = pkg.build && pkg.build.release === true;
diff --git a/src/legacy/utils/index.d.ts b/src/legacy/utils/index.d.ts
index c294c79542bbe9..a57caad1d34bf8 100644
--- a/src/legacy/utils/index.d.ts
+++ b/src/legacy/utils/index.d.ts
@@ -18,16 +18,3 @@
  */
 
 export function unset(object: object, rawPath: string): void;
-
-export {
-  concatStreamProviders,
-  createConcatStream,
-  createFilterStream,
-  createIntersperseStream,
-  createListStream,
-  createMapStream,
-  createPromiseFromStreams,
-  createReduceStream,
-  createReplaceStream,
-  createSplitStream,
-} from './streams';
diff --git a/src/legacy/utils/index.js b/src/legacy/utils/index.js
index 4274fb2e4901a0..529b1ddfd8a4d9 100644
--- a/src/legacy/utils/index.js
+++ b/src/legacy/utils/index.js
@@ -23,15 +23,3 @@ export { deepCloneWithBuffers } from './deep_clone_with_buffers';
 export { unset } from './unset';
 export { IS_KIBANA_DISTRIBUTABLE } from './artifact_type';
 export { IS_KIBANA_RELEASE } from './artifact_type';
-
-export {
-  concatStreamProviders,
-  createConcatStream,
-  createIntersperseStream,
-  createListStream,
-  createPromiseFromStreams,
-  createReduceStream,
-  createSplitStream,
-  createMapStream,
-  createReplaceStream,
-} from './streams';
diff --git a/src/legacy/utils/streams/index.d.ts b/src/legacy/utils/streams/index.d.ts
deleted file mode 100644
index 470b5d9fa35051..00000000000000
--- a/src/legacy/utils/streams/index.d.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 { Readable, Writable, Transform, TransformOptions } from 'stream';
-
-export function concatStreamProviders(
-  sourceProviders: Array<() => Readable>,
-  options: TransformOptions
-): Transform;
-export function createIntersperseStream(intersperseChunk: string | Buffer): Transform;
-export function createSplitStream<T>(splitChunk: T): Transform;
-export function createListStream(items: any | any[]): Readable;
-export function createReduceStream<T>(reducer: (value: any, chunk: T, enc: string) => T): Transform;
-export function createPromiseFromStreams<T>([first, ...rest]: [Readable, ...Writable[]]): Promise<
-  T
->;
-export function createConcatStream(initial?: any): Transform;
-export function createMapStream<T>(fn: (value: T, i: number) => void): Transform;
-export function createReplaceStream(toReplace: string, replacement: string | Buffer): Transform;
-export function createFilterStream<T>(fn: (obj: T) => boolean): Transform;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
index 18eea7c45585fc..8a7215e5a5badd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/import_rules_route.ts
@@ -20,7 +20,7 @@ import {
   importRulesSchema as importRulesResponseSchema,
 } from '../../../../../common/detection_engine/schemas/response/import_rules_schema';
 import { IRouter } from '../../../../../../../../src/core/server';
-import { createPromiseFromStreams } from '../../../../../../../../src/legacy/utils/streams';
+import { createPromiseFromStreams } from '../../../../../../../../src/core/server/utils/';
 import { DETECTION_ENGINE_RULES_URL } from '../../../../../common/constants';
 import { ConfigType } from '../../../../config';
 import { SetupPlugins } from '../../../../plugin';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
index 3122db1919c3c2..11f74c264ae0cf 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/utils.test.ts
@@ -22,7 +22,7 @@ import { INTERNAL_IDENTIFIER } from '../../../../../common/constants';
 import { RuleTypeParams } from '../../types';
 import { BulkError, ImportSuccessError } from '../utils';
 import { getOutputRuleAlertForRest } from '../__mocks__/utils';
-import { createPromiseFromStreams } from '../../../../../../../../src/legacy/utils/streams';
+import { createPromiseFromStreams } from '../../../../../../../../src/core/server/utils';
 import { PartialAlert } from '../../../../../../alerts/server';
 import { SanitizedAlert } from '../../../../../../alerts/server/types';
 import { createRulesStreamFromNdJson } from '../../rules/create_rules_stream_from_ndjson';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.test.ts
index f2061ce1d36de5..60071bc2cef41e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.test.ts
@@ -5,7 +5,7 @@
  */
 import { Readable } from 'stream';
 import { createRulesStreamFromNdJson } from './create_rules_stream_from_ndjson';
-import { createPromiseFromStreams } from 'src/legacy/utils/streams';
+import { createPromiseFromStreams } from 'src/core/server/utils';
 import { BadRequestError } from '../errors/bad_request_error';
 import { ImportRulesSchemaDecoded } from '../../../../common/detection_engine/schemas/request/import_rules_schema';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.ts
index d7723232ca921d..cd574a8d95615e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/create_rules_stream_from_ndjson.ts
@@ -19,7 +19,7 @@ import {
   createSplitStream,
   createMapStream,
   createConcatStream,
-} from '../../../../../../../src/legacy/utils/streams';
+} from '../../../../../../../src/core/server/utils';
 import { BadRequestError } from '../errors/bad_request_error';
 import {
   parseNdjsonStrings,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/create_timelines_stream_from_ndjson.ts b/x-pack/plugins/security_solution/server/lib/timeline/create_timelines_stream_from_ndjson.ts
index 6b4017b5e4d5c7..2827cd373d5e75 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/create_timelines_stream_from_ndjson.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/create_timelines_stream_from_ndjson.ts
@@ -13,7 +13,7 @@ import {
   createConcatStream,
   createSplitStream,
   createMapStream,
-} from '../../../../../../src/legacy/utils';
+} from '../../../../../../src/core/server/utils';
 import {
   parseNdjsonStrings,
   filterExportedCounts,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
index ff76045db90cb8..388ab5db3e852b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
@@ -79,7 +79,7 @@ describe('import timelines', () => {
       };
     });
 
-    jest.doMock('../../../../../../../src/legacy/utils', () => {
+    jest.doMock('../../../../../../../src/core/server/utils', () => {
       return {
         createPromiseFromStreams: jest.fn().mockReturnValue(mockParsedObjects),
       };
@@ -543,7 +543,7 @@ describe('import timeline templates', () => {
       };
     });
 
-    jest.doMock('../../../../../../../src/legacy/utils', () => {
+    jest.doMock('../../../../../../../src/core/server/utils', () => {
       return {
         createPromiseFromStreams: jest.fn().mockReturnValue(mockParsedTemplateTimelineObjects),
       };
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts
index fc25f1a48194e2..9a3dbf365e0266 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/common.ts
@@ -10,7 +10,7 @@ import { Readable } from 'stream';
 
 import { KibanaRequest, RequestHandlerContext } from 'src/core/server';
 
-import { createListStream } from '../../../../../../../../src/legacy/utils';
+import { createListStream } from '../../../../../../../../src/core/server/utils';
 
 import { SetupPlugins } from '../../../../plugin';
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/import_timelines.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/import_timelines.ts
index f62f02cc7bba94..a19b18e7d89b1a 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/import_timelines.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/import_timelines.ts
@@ -21,7 +21,7 @@ import { createBulkErrorObject, BulkError } from '../../../detection_engine/rout
 import { createTimelines } from './create_timelines';
 import { FrameworkRequest } from '../../../framework';
 import { createTimelinesStreamFromNdJson } from '../../create_timelines_stream_from_ndjson';
-import { createPromiseFromStreams } from '../../../../../../../../src/legacy/utils';
+import { createPromiseFromStreams } from '../../../../../../../../src/core/server/utils';
 
 import { getTupleDuplicateErrorsAndUniqueTimeline } from './get_timelines_from_stream';
 import { CompareTimelinesStatus } from './compare_timelines_status';
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/install_prepacked_timelines.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/install_prepacked_timelines.test.ts
index 66f16db01a508b..c63978a1f046e1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/install_prepacked_timelines.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/utils/install_prepacked_timelines.test.ts
@@ -5,7 +5,7 @@
  */
 import { join, resolve } from 'path';
 
-import { createPromiseFromStreams } from '../../../../../../../../src/legacy/utils/streams';
+import { createPromiseFromStreams } from '../../../../../../../../src/core/server/utils';
 import { SecurityPluginSetup } from '../../../../../../security/server';
 
 import { FrameworkRequest } from '../../../framework';
diff --git a/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts b/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts
index 0eb021bfe2a83d..4446e82f99de46 100644
--- a/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts
+++ b/x-pack/plugins/security_solution/server/utils/read_stream/create_stream_from_ndjson.ts
@@ -16,7 +16,7 @@ import {
   ImportRulesSchema,
 } from '../../../common/detection_engine/schemas/request/import_rules_schema';
 import { exactCheck } from '../../../common/exact_check';
-import { createMapStream, createFilterStream } from '../../../../../../src/legacy/utils/streams';
+import { createMapStream, createFilterStream } from '../../../../../../src/core/server/utils';
 import { BadRequestError } from '../../lib/detection_engine/errors/bad_request_error';
 
 export interface RulesObjectsExportResultDetails {
diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_copy_to_space_mocks.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_copy_to_space_mocks.ts
index 0e117b3f16e3f4..ef6f5e1541a469 100644
--- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_copy_to_space_mocks.ts
+++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/create_copy_to_space_mocks.ts
@@ -5,7 +5,7 @@
  */
 
 import { Readable } from 'stream';
-import { createPromiseFromStreams, createConcatStream } from 'src/legacy/utils';
+import { createPromiseFromStreams, createConcatStream } from 'src/core/server/utils';
 
 async function readStreamToCompletion(stream: Readable) {
   return (await (createPromiseFromStreams([stream, createConcatStream([])]) as unknown)) as any[];

From 411048ae0963c2193f753552f37dcda6277d1c5b Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Thu, 3 Sep 2020 12:30:31 +0300
Subject: [PATCH 208/216] Replace FetchOptions with ISearchOptions (#76538)

* Replace FetchOptions with ISearchOptions and update usage

* Merge the client and server ISearchOption types into common

* docs
---
 ...ns-data-public.fetchoptions.abortsignal.md | 11 --------
 ...plugin-plugins-data-public.fetchoptions.md | 19 --------------
 ...ta-public.fetchoptions.searchstrategyid.md | 11 --------
 ...-data-public.isearchoptions.abortsignal.md | 13 ++++++++++
 ...ugin-plugins-data-public.isearchoptions.md |  4 +--
 ...ugins-data-public.isearchoptions.signal.md | 11 --------
 ...ins-data-public.isearchoptions.strategy.md |  2 ++
 .../kibana-plugin-plugins-data-public.md      |  1 -
 ...data-server.isearchoptions.abortsignal.md} |  6 ++---
 ...ugin-plugins-data-server.isearchoptions.md |  4 +--
 ...ins-data-server.isearchoptions.strategy.md |  2 ++
 .../data/common/search/aggs/agg_config.ts     |  9 ++++---
 .../data/common/search/aggs/agg_configs.ts    |  4 +--
 .../common/search/aggs/param_types/base.ts    |  4 +--
 .../data/common/search/es_search/index.ts     |  1 +
 .../data/common/search/es_search/types.ts     | 11 ++++++++
 src/plugins/data/common/search/index.ts       |  1 +
 src/plugins/data/public/index.ts              |  4 +--
 src/plugins/data/public/public.api.md         | 16 ++----------
 .../data/public/search/expressions/esdsl.ts   |  2 +-
 src/plugins/data/public/search/fetch/types.ts |  5 ----
 src/plugins/data/public/search/index.ts       | 11 ++------
 .../data/public/search/legacy/call_client.ts  |  9 ++++---
 .../public/search/legacy/fetch_soon.test.ts   |  6 ++---
 .../data/public/search/legacy/fetch_soon.ts   | 10 ++++----
 .../public/search/search_interceptor.test.ts  |  6 +++--
 .../data/public/search/search_interceptor.ts  | 12 ++++++---
 .../search/search_source/search_source.ts     | 25 +++++++++++--------
 src/plugins/data/public/search/types.ts       |  6 +----
 src/plugins/data/server/index.ts              |  2 +-
 src/plugins/data/server/search/index.ts       |  8 +-----
 src/plugins/data/server/search/routes.ts      |  4 +--
 .../data/server/search/search_service.ts      | 12 +++++----
 src/plugins/data/server/search/types.ts       | 10 +-------
 src/plugins/data/server/server.api.md         |  5 ++--
 .../public/data_model/search_api.ts           |  2 +-
 .../public/search/search_interceptor.test.ts  |  4 +--
 .../server/search/es_search_strategy.ts       |  3 +--
 .../hosts/first_last_seen/index.tsx           |  2 +-
 .../public/hosts/containers/hosts/index.tsx   |  2 +-
 .../containers/hosts/overview/_index.tsx      |  2 +-
 .../network/containers/network_http/index.tsx |  2 +-
 .../public/network/containers/tls/index.tsx   |  2 +-
 43 files changed, 117 insertions(+), 169 deletions(-)
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.abortsignal.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.searchstrategyid.md
 create mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md
 delete mode 100644 docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.signal.md
 rename docs/development/plugins/data/server/{kibana-plugin-plugins-data-server.isearchoptions.signal.md => kibana-plugin-plugins-data-server.isearchoptions.abortsignal.md} (62%)

diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.abortsignal.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.abortsignal.md
deleted file mode 100644
index 791f1b63e65397..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.abortsignal.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FetchOptions](./kibana-plugin-plugins-data-public.fetchoptions.md) &gt; [abortSignal](./kibana-plugin-plugins-data-public.fetchoptions.abortsignal.md)
-
-## FetchOptions.abortSignal property
-
-<b>Signature:</b>
-
-```typescript
-abortSignal?: AbortSignal;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.md
deleted file mode 100644
index f07fdd4280533d..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<!-- 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; [FetchOptions](./kibana-plugin-plugins-data-public.fetchoptions.md)
-
-## FetchOptions interface
-
-<b>Signature:</b>
-
-```typescript
-export interface FetchOptions 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [abortSignal](./kibana-plugin-plugins-data-public.fetchoptions.abortsignal.md) | <code>AbortSignal</code> |  |
-|  [searchStrategyId](./kibana-plugin-plugins-data-public.fetchoptions.searchstrategyid.md) | <code>string</code> |  |
-
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.searchstrategyid.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.searchstrategyid.md
deleted file mode 100644
index 8824529eb4eca3..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.fetchoptions.searchstrategyid.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [FetchOptions](./kibana-plugin-plugins-data-public.fetchoptions.md) &gt; [searchStrategyId](./kibana-plugin-plugins-data-public.fetchoptions.searchstrategyid.md)
-
-## FetchOptions.searchStrategyId property
-
-<b>Signature:</b>
-
-```typescript
-searchStrategyId?: string;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md
new file mode 100644
index 00000000000000..fd8d322d54b264
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md
@@ -0,0 +1,13 @@
+<!-- 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; [ISearchOptions](./kibana-plugin-plugins-data-public.isearchoptions.md) &gt; [abortSignal](./kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md)
+
+## ISearchOptions.abortSignal property
+
+An `AbortSignal` that allows the caller of `search` to abort a search request.
+
+<b>Signature:</b>
+
+```typescript
+abortSignal?: AbortSignal;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.md
index 3eb38dc7d52e08..c9018b0048aa3c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.md
@@ -14,6 +14,6 @@ export interface ISearchOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [signal](./kibana-plugin-plugins-data-public.isearchoptions.signal.md) | <code>AbortSignal</code> |  |
-|  [strategy](./kibana-plugin-plugins-data-public.isearchoptions.strategy.md) | <code>string</code> |  |
+|  [abortSignal](./kibana-plugin-plugins-data-public.isearchoptions.abortsignal.md) | <code>AbortSignal</code> | An <code>AbortSignal</code> that allows the caller of <code>search</code> to abort a search request. |
+|  [strategy](./kibana-plugin-plugins-data-public.isearchoptions.strategy.md) | <code>string</code> | Use this option to force using a specific server side search strategy. Leave empty to use the default strategy. |
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.signal.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.signal.md
deleted file mode 100644
index 10bd186d55baad..00000000000000
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.signal.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- 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; [ISearchOptions](./kibana-plugin-plugins-data-public.isearchoptions.md) &gt; [signal](./kibana-plugin-plugins-data-public.isearchoptions.signal.md)
-
-## ISearchOptions.signal property
-
-<b>Signature:</b>
-
-```typescript
-signal?: AbortSignal;
-```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.strategy.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.strategy.md
index df7e050691a8f3..bd2580957f6c17 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.strategy.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.isearchoptions.strategy.md
@@ -4,6 +4,8 @@
 
 ## ISearchOptions.strategy property
 
+Use this option to force using a specific server side search strategy. Leave empty to use the default strategy.
+
 <b>Signature:</b>
 
 ```typescript
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 0ab86e0f4dab20..b651480a858992 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
@@ -50,7 +50,6 @@
 |  [DataPublicPluginSetup](./kibana-plugin-plugins-data-public.datapublicpluginsetup.md) |  |
 |  [DataPublicPluginStart](./kibana-plugin-plugins-data-public.datapublicpluginstart.md) |  |
 |  [EsQueryConfig](./kibana-plugin-plugins-data-public.esqueryconfig.md) |  |
-|  [FetchOptions](./kibana-plugin-plugins-data-public.fetchoptions.md) |  |
 |  [FieldFormatConfig](./kibana-plugin-plugins-data-public.fieldformatconfig.md) |  |
 |  [FieldMappingSpec](./kibana-plugin-plugins-data-public.fieldmappingspec.md) |  |
 |  [Filter](./kibana-plugin-plugins-data-public.filter.md) |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.abortsignal.md
similarity index 62%
rename from docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md
rename to docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.abortsignal.md
index 948dfd66da7a03..693345f480a9a4 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.signal.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.abortsignal.md
@@ -1,13 +1,13 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [ISearchOptions](./kibana-plugin-plugins-data-server.isearchoptions.md) &gt; [signal](./kibana-plugin-plugins-data-server.isearchoptions.signal.md)
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [ISearchOptions](./kibana-plugin-plugins-data-server.isearchoptions.md) &gt; [abortSignal](./kibana-plugin-plugins-data-server.isearchoptions.abortsignal.md)
 
-## ISearchOptions.signal property
+## ISearchOptions.abortSignal property
 
 An `AbortSignal` that allows the caller of `search` to abort a search request.
 
 <b>Signature:</b>
 
 ```typescript
-signal?: AbortSignal;
+abortSignal?: AbortSignal;
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md
index 002ce864a1aa41..21ddaef3a0b94c 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.md
@@ -14,6 +14,6 @@ export interface ISearchOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [signal](./kibana-plugin-plugins-data-server.isearchoptions.signal.md) | <code>AbortSignal</code> | An <code>AbortSignal</code> that allows the caller of <code>search</code> to abort a search request. |
-|  [strategy](./kibana-plugin-plugins-data-server.isearchoptions.strategy.md) | <code>string</code> |  |
+|  [abortSignal](./kibana-plugin-plugins-data-server.isearchoptions.abortsignal.md) | <code>AbortSignal</code> | An <code>AbortSignal</code> that allows the caller of <code>search</code> to abort a search request. |
+|  [strategy](./kibana-plugin-plugins-data-server.isearchoptions.strategy.md) | <code>string</code> | Use this option to force using a specific server side search strategy. Leave empty to use the default strategy. |
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.strategy.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.strategy.md
index 6df72d023e2c08..65da7fddd13f60 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.strategy.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.isearchoptions.strategy.md
@@ -4,6 +4,8 @@
 
 ## ISearchOptions.strategy property
 
+Use this option to force using a specific server side search strategy. Leave empty to use the default strategy.
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/src/plugins/data/common/search/aggs/agg_config.ts b/src/plugins/data/common/search/aggs/agg_config.ts
index b5747ce7bb9bdf..201e9f1ec402cd 100644
--- a/src/plugins/data/common/search/aggs/agg_config.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.ts
@@ -21,12 +21,13 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign, Ensure } from '@kbn/utility-types';
 
-import { FetchOptions, ISearchSource } from 'src/plugins/data/public';
+import { ISearchSource } from 'src/plugins/data/public';
 import {
   ExpressionAstFunction,
   ExpressionAstArgument,
   SerializedFieldFormat,
 } from 'src/plugins/expressions/common';
+import { ISearchOptions } from '../es_search';
 
 import { IAggType } from './agg_type';
 import { writeParams } from './agg_params';
@@ -213,11 +214,11 @@ export class AggConfig {
 
   /**
    *  Hook for pre-flight logic, see AggType#onSearchRequestStart
-   *  @param {Courier.SearchSource} searchSource
-   *  @param {Courier.FetchOptions} options
+   *  @param {SearchSource} searchSource
+   *  @param {ISearchOptions} options
    *  @return {Promise<undefined>}
    */
-  onSearchRequestStart(searchSource: ISearchSource, options?: FetchOptions) {
+  onSearchRequestStart(searchSource: ISearchSource, options?: ISearchOptions) {
     if (!this.type) {
       return Promise.resolve();
     }
diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts
index 203eda3a907eeb..282e6f3b538a49 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.ts
@@ -20,7 +20,7 @@
 import _ from 'lodash';
 import { Assign } from '@kbn/utility-types';
 
-import { FetchOptions, ISearchSource } from 'src/plugins/data/public';
+import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
 import { AggConfig, AggConfigSerialized, IAggConfig } from './agg_config';
 import { IAggType } from './agg_type';
 import { AggTypesRegistryStart } from './agg_types_registry';
@@ -300,7 +300,7 @@ export class AggConfigs {
     return _.find(reqAgg.getResponseAggs(), { id });
   }
 
-  onSearchRequestStart(searchSource: ISearchSource, options?: FetchOptions) {
+  onSearchRequestStart(searchSource: ISearchSource, options?: ISearchOptions) {
     return Promise.all(
       // @ts-ignore
       this.getRequestAggs().map((agg: AggConfig) => agg.onSearchRequestStart(searchSource, options))
diff --git a/src/plugins/data/common/search/aggs/param_types/base.ts b/src/plugins/data/common/search/aggs/param_types/base.ts
index 3a12a9a54500f4..c0316c974e26fb 100644
--- a/src/plugins/data/common/search/aggs/param_types/base.ts
+++ b/src/plugins/data/common/search/aggs/param_types/base.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { FetchOptions, ISearchSource } from 'src/plugins/data/public';
+import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
 import { ExpressionAstFunction } from 'src/plugins/expressions/common';
 import { IAggConfigs } from '../agg_configs';
 import { IAggConfig } from '../agg_config';
@@ -56,7 +56,7 @@ export class BaseParamType<TAggConfig extends IAggConfig = IAggConfig> {
   modifyAggConfigOnSearchRequestStart: (
     aggConfig: TAggConfig,
     searchSource?: ISearchSource,
-    options?: FetchOptions
+    options?: ISearchOptions
   ) => void;
 
   constructor(config: Record<string, any>) {
diff --git a/src/plugins/data/common/search/es_search/index.ts b/src/plugins/data/common/search/es_search/index.ts
index 7bc9cada8f0eee..54757b53b8665d 100644
--- a/src/plugins/data/common/search/es_search/index.ts
+++ b/src/plugins/data/common/search/es_search/index.ts
@@ -22,4 +22,5 @@ export {
   IEsSearchRequest,
   IEsSearchResponse,
   ES_SEARCH_STRATEGY,
+  ISearchOptions,
 } from './types';
diff --git a/src/plugins/data/common/search/es_search/types.ts b/src/plugins/data/common/search/es_search/types.ts
index 3184fbe3417055..89faa5b7119c86 100644
--- a/src/plugins/data/common/search/es_search/types.ts
+++ b/src/plugins/data/common/search/es_search/types.ts
@@ -22,6 +22,17 @@ import { IKibanaSearchRequest, IKibanaSearchResponse } from '../types';
 
 export const ES_SEARCH_STRATEGY = 'es';
 
+export interface ISearchOptions {
+  /**
+   * An `AbortSignal` that allows the caller of `search` to abort a search request.
+   */
+  abortSignal?: AbortSignal;
+  /**
+   * Use this option to force using a specific server side search strategy. Leave empty to use the default strategy.
+   */
+  strategy?: string;
+}
+
 export type ISearchRequestParams<T = Record<string, any>> = {
   trackTotalHits?: boolean;
 } & Search<T>;
diff --git a/src/plugins/data/common/search/index.ts b/src/plugins/data/common/search/index.ts
index d8184551b7f3d9..3bfb0ddb89aa9b 100644
--- a/src/plugins/data/common/search/index.ts
+++ b/src/plugins/data/common/search/index.ts
@@ -28,4 +28,5 @@ export {
   IEsSearchResponse,
   ES_SEARCH_STRATEGY,
   ISearchRequestParams,
+  ISearchOptions,
 } from './es_search';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index a9714a95ff3385..f7b4111df51726 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -342,7 +342,6 @@ export {
   ES_SEARCH_STRATEGY,
   EsQuerySortValue,
   extractSearchSourceReferences,
-  FetchOptions,
   getEsPreference,
   getSearchParamsFromRequest,
   IEsSearchRequest,
@@ -352,7 +351,6 @@ export {
   injectSearchSourceReferences,
   ISearch,
   ISearchGeneric,
-  ISearchOptions,
   ISearchSource,
   parseSearchSourceJSON,
   RequestTimeoutError,
@@ -367,6 +365,8 @@ export {
   EsRawResponseExpressionTypeDefinition,
 } from './search';
 
+export { ISearchOptions } from '../common';
+
 // Search namespace
 export const search = {
   aggs: {
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index e72fea160cc288..9f727d86b06e1b 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -26,11 +26,11 @@ import { EuiGlobalToastListToast } from '@elastic/eui';
 import { ExclusiveUnion } from '@elastic/eui';
 import { ExpressionAstFunction } from 'src/plugins/expressions/common';
 import { ExpressionsSetup } from 'src/plugins/expressions/public';
-import { FetchOptions as FetchOptions_2 } from 'src/plugins/data/public';
 import { History } from 'history';
 import { Href } from 'history';
 import { IconType } from '@elastic/eui';
 import { InjectedIntl } from '@kbn/i18n/react';
+import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public';
 import { ISearchSource as ISearchSource_2 } from 'src/plugins/data/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { IUiSettingsClient } from 'src/core/public';
@@ -486,16 +486,6 @@ export const extractSearchSourceReferences: (state: SearchSourceFields) => [Sear
     indexRefName?: string;
 }, SavedObjectReference[]];
 
-// Warning: (ae-missing-release-tag) "FetchOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
-// @public (undocumented)
-export interface FetchOptions {
-    // (undocumented)
-    abortSignal?: AbortSignal;
-    // (undocumented)
-    searchStrategyId?: string;
-}
-
 // Warning: (ae-missing-release-tag) "FieldFormat" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
 //
 // @public (undocumented)
@@ -1233,9 +1223,7 @@ export type ISearchGeneric = <SearchStrategyRequest extends IEsSearchRequest = I
 //
 // @public (undocumented)
 export interface ISearchOptions {
-    // (undocumented)
-    signal?: AbortSignal;
-    // (undocumented)
+    abortSignal?: AbortSignal;
     strategy?: string;
 }
 
diff --git a/src/plugins/data/public/search/expressions/esdsl.ts b/src/plugins/data/public/search/expressions/esdsl.ts
index d7b897ace29b49..2efb21671b5b7e 100644
--- a/src/plugins/data/public/search/expressions/esdsl.ts
+++ b/src/plugins/data/public/search/expressions/esdsl.ts
@@ -140,7 +140,7 @@ export const esdsl = (): EsdslExpressionFunctionDefinition => ({
               body: dsl,
             },
           },
-          { signal: abortSignal }
+          { abortSignal }
         )
         .toPromise();
 
diff --git a/src/plugins/data/public/search/fetch/types.ts b/src/plugins/data/public/search/fetch/types.ts
index 670c4f731971ac..81146c6b74c05b 100644
--- a/src/plugins/data/public/search/fetch/types.ts
+++ b/src/plugins/data/public/search/fetch/types.ts
@@ -29,11 +29,6 @@ import { ISearchStartLegacy } from '../types';
  */
 export type SearchRequest = Record<string, any>;
 
-export interface FetchOptions {
-  abortSignal?: AbortSignal;
-  searchStrategyId?: string;
-}
-
 export interface FetchHandlers {
   legacySearchService: ISearchStartLegacy;
   config: { get: GetConfigFn };
diff --git a/src/plugins/data/public/search/index.ts b/src/plugins/data/public/search/index.ts
index 14eff13b378ee1..a6a1736ac91daa 100644
--- a/src/plugins/data/public/search/index.ts
+++ b/src/plugins/data/public/search/index.ts
@@ -19,14 +19,7 @@
 
 export * from './expressions';
 
-export {
-  ISearch,
-  ISearchOptions,
-  ISearchGeneric,
-  ISearchSetup,
-  ISearchStart,
-  SearchEnhancements,
-} from './types';
+export { ISearch, ISearchGeneric, ISearchSetup, ISearchStart, SearchEnhancements } from './types';
 
 export { IEsSearchResponse, IEsSearchRequest, ES_SEARCH_STRATEGY } from '../../common/search';
 
@@ -34,7 +27,7 @@ export { getEsPreference } from './es_search';
 
 export { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search';
 
-export { SearchError, FetchOptions, getSearchParamsFromRequest, SearchRequest } from './fetch';
+export { SearchError, getSearchParamsFromRequest, SearchRequest } from './fetch';
 
 export {
   ISearchSource,
diff --git a/src/plugins/data/public/search/legacy/call_client.ts b/src/plugins/data/public/search/legacy/call_client.ts
index 3dcf11f72a7424..d66796b9427a14 100644
--- a/src/plugins/data/public/search/legacy/call_client.ts
+++ b/src/plugins/data/public/search/legacy/call_client.ts
@@ -18,21 +18,22 @@
  */
 
 import { SearchResponse } from 'elasticsearch';
-import { FetchOptions, FetchHandlers, handleResponse } from '../fetch';
+import { ISearchOptions } from 'src/plugins/data/common';
+import { FetchHandlers, handleResponse } from '../fetch';
 import { defaultSearchStrategy } from './default_search_strategy';
 import { SearchRequest } from '../index';
 
 export function callClient(
   searchRequests: SearchRequest[],
-  requestsOptions: FetchOptions[] = [],
+  requestsOptions: ISearchOptions[] = [],
   fetchHandlers: FetchHandlers
 ) {
   // Correlate the options with the request that they're associated with
   const requestOptionEntries: Array<[
     SearchRequest,
-    FetchOptions
+    ISearchOptions
   ]> = searchRequests.map((request, i) => [request, requestsOptions[i]]);
-  const requestOptionsMap = new Map<SearchRequest, FetchOptions>(requestOptionEntries);
+  const requestOptionsMap = new Map<SearchRequest, ISearchOptions>(requestOptionEntries);
   const requestResponseMap = new Map<SearchRequest, Promise<SearchResponse<any>>>();
 
   const { searching, abort } = defaultSearchStrategy.search({
diff --git a/src/plugins/data/public/search/legacy/fetch_soon.test.ts b/src/plugins/data/public/search/legacy/fetch_soon.test.ts
index d7a85e65b475de..d38a41cf5ffbc0 100644
--- a/src/plugins/data/public/search/legacy/fetch_soon.test.ts
+++ b/src/plugins/data/public/search/legacy/fetch_soon.test.ts
@@ -19,10 +19,10 @@
 
 import { fetchSoon } from './fetch_soon';
 import { callClient } from './call_client';
-import { FetchHandlers, FetchOptions } from '../fetch/types';
+import { FetchHandlers } from '../fetch/types';
 import { SearchRequest } from '../index';
 import { SearchResponse } from 'elasticsearch';
-import { GetConfigFn, UI_SETTINGS } from '../../../common';
+import { GetConfigFn, UI_SETTINGS, ISearchOptions } from '../../../common';
 
 function getConfigStub(config: any = {}): GetConfigFn {
   return (key) => config[key];
@@ -102,7 +102,7 @@ describe('fetchSoon', () => {
     const options = [{ bar: 1 }, { bar: 2 }];
 
     requests.forEach((request, i) => {
-      fetchSoon(request, options[i] as FetchOptions, { config } as FetchHandlers);
+      fetchSoon(request, options[i] as ISearchOptions, { config } as FetchHandlers);
     });
 
     jest.advanceTimersByTime(50);
diff --git a/src/plugins/data/public/search/legacy/fetch_soon.ts b/src/plugins/data/public/search/legacy/fetch_soon.ts
index 16920a8a4dd979..37c3827bb7bba5 100644
--- a/src/plugins/data/public/search/legacy/fetch_soon.ts
+++ b/src/plugins/data/public/search/legacy/fetch_soon.ts
@@ -19,9 +19,9 @@
 
 import { SearchResponse } from 'elasticsearch';
 import { callClient } from './call_client';
-import { FetchHandlers, FetchOptions } from '../fetch/types';
+import { FetchHandlers } from '../fetch/types';
 import { SearchRequest } from '../index';
-import { UI_SETTINGS } from '../../../common';
+import { UI_SETTINGS, ISearchOptions } from '../../../common';
 
 /**
  * This function introduces a slight delay in the request process to allow multiple requests to queue
@@ -29,7 +29,7 @@ import { UI_SETTINGS } from '../../../common';
  */
 export async function fetchSoon(
   request: SearchRequest,
-  options: FetchOptions,
+  options: ISearchOptions,
   fetchHandlers: FetchHandlers
 ) {
   const msToDelay = fetchHandlers.config.get(UI_SETTINGS.COURIER_BATCH_SEARCHES) ? 50 : 0;
@@ -51,7 +51,7 @@ function delay<T>(fn: (...args: any) => T, ms: number): Promise<T> {
 
 // The current batch/queue of requests to fetch
 let requestsToFetch: SearchRequest[] = [];
-let requestOptions: FetchOptions[] = [];
+let requestOptions: ISearchOptions[] = [];
 
 // The in-progress fetch (if there is one)
 let fetchInProgress: any = null;
@@ -65,7 +65,7 @@ let fetchInProgress: any = null;
  */
 async function delayedFetch(
   request: SearchRequest,
-  options: FetchOptions,
+  options: ISearchOptions,
   fetchHandlers: FetchHandlers,
   ms: number
 ): Promise<SearchResponse<any>> {
diff --git a/src/plugins/data/public/search/search_interceptor.test.ts b/src/plugins/data/public/search/search_interceptor.test.ts
index 2eded17bda88c8..da60f39b522ac9 100644
--- a/src/plugins/data/public/search/search_interceptor.test.ts
+++ b/src/plugins/data/public/search/search_interceptor.test.ts
@@ -112,7 +112,9 @@ describe('SearchInterceptor', () => {
       const mockRequest: IEsSearchRequest = {
         params: {},
       };
-      const response = searchInterceptor.search(mockRequest, { signal: abortController.signal });
+      const response = searchInterceptor.search(mockRequest, {
+        abortSignal: abortController.signal,
+      });
 
       const next = jest.fn();
       const error = (e: any) => {
@@ -131,7 +133,7 @@ describe('SearchInterceptor', () => {
       const mockRequest: IEsSearchRequest = {
         params: {},
       };
-      const response = searchInterceptor.search(mockRequest, { signal: abort.signal });
+      const response = searchInterceptor.search(mockRequest, { abortSignal: abort.signal });
       abort.abort();
 
       const error = (e: any) => {
diff --git a/src/plugins/data/public/search/search_interceptor.ts b/src/plugins/data/public/search/search_interceptor.ts
index 30e509edd4987d..c6c03267163c9c 100644
--- a/src/plugins/data/public/search/search_interceptor.ts
+++ b/src/plugins/data/public/search/search_interceptor.ts
@@ -22,8 +22,12 @@ import { BehaviorSubject, throwError, timer, Subscription, defer, from, Observab
 import { finalize, filter } from 'rxjs/operators';
 import { Toast, CoreStart, ToastsSetup, CoreSetup } from 'kibana/public';
 import { getCombinedSignal, AbortError } from '../../common/utils';
-import { IEsSearchRequest, IEsSearchResponse, ES_SEARCH_STRATEGY } from '../../common/search';
-import { ISearchOptions } from './types';
+import {
+  IEsSearchRequest,
+  IEsSearchResponse,
+  ISearchOptions,
+  ES_SEARCH_STRATEGY,
+} from '../../common/search';
 import { getLongQueryNotification } from './long_query_notification';
 import { SearchUsageCollector } from './collectors';
 
@@ -128,7 +132,7 @@ export class SearchInterceptor {
   ): Observable<IEsSearchResponse> {
     // Defer the following logic until `subscribe` is actually called
     return defer(() => {
-      if (options?.signal?.aborted) {
+      if (options?.abortSignal?.aborted) {
         return throwError(new AbortError());
       }
 
@@ -164,7 +168,7 @@ export class SearchInterceptor {
     const signals = [
       this.abortController.signal,
       timeoutSignal,
-      ...(options?.signal ? [options.signal] : []),
+      ...(options?.abortSignal ? [options.abortSignal] : []),
     ];
 
     const combinedSignal = getCombinedSignal(signals);
diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
index d2e33707620590..3a567501a75400 100644
--- a/src/plugins/data/public/search/search_source/search_source.ts
+++ b/src/plugins/data/public/search/search_source/search_source.ts
@@ -78,14 +78,19 @@ import { fieldWildcardFilter } from '../../../../kibana_utils/common';
 import { IIndexPattern, ISearchGeneric } from '../..';
 import { SearchSourceOptions, SearchSourceFields } from './types';
 import {
-  FetchOptions,
   RequestFailure,
   handleResponse,
   getSearchParamsFromRequest,
   SearchRequest,
 } from '../fetch';
 
-import { getEsQueryConfig, buildEsQuery, Filter, UI_SETTINGS } from '../../../common';
+import {
+  getEsQueryConfig,
+  buildEsQuery,
+  Filter,
+  UI_SETTINGS,
+  ISearchOptions,
+} from '../../../common';
 import { getHighlightRequest } from '../../../common/field_formats';
 import { GetConfigFn } from '../../../common/types';
 import { fetchSoon } from '../legacy';
@@ -121,7 +126,7 @@ export class SearchSource {
   private searchStrategyId?: string;
   private parent?: SearchSource;
   private requestStartHandlers: Array<
-    (searchSource: SearchSource, options?: FetchOptions) => Promise<unknown>
+    (searchSource: SearchSource, options?: ISearchOptions) => Promise<unknown>
   > = [];
   private inheritOptions: SearchSourceOptions = {};
   public history: SearchRequest[] = [];
@@ -225,7 +230,7 @@ export class SearchSource {
    * Run a search using the search service
    * @return {Observable<SearchResponse<unknown>>}
    */
-  private fetch$(searchRequest: SearchRequest, signal?: AbortSignal) {
+  private fetch$(searchRequest: SearchRequest, options: ISearchOptions) {
     const { search, esShardTimeout, getConfig } = this.dependencies;
 
     const params = getSearchParamsFromRequest(searchRequest, {
@@ -233,7 +238,7 @@ export class SearchSource {
       getConfig,
     });
 
-    return search({ params, indexType: searchRequest.indexType }, { signal }).pipe(
+    return search({ params, indexType: searchRequest.indexType }, options).pipe(
       map(({ rawResponse }) => handleResponse(searchRequest, rawResponse))
     );
   }
@@ -242,7 +247,7 @@ export class SearchSource {
    * Run a search using the search service
    * @return {Promise<SearchResponse<unknown>>}
    */
-  private async legacyFetch(searchRequest: SearchRequest, options: FetchOptions) {
+  private async legacyFetch(searchRequest: SearchRequest, options: ISearchOptions) {
     const { esShardTimeout, legacySearch, getConfig } = this.dependencies;
 
     return await fetchSoon(
@@ -263,7 +268,7 @@ export class SearchSource {
    *
    * @async
    */
-  async fetch(options: FetchOptions = {}) {
+  async fetch(options: ISearchOptions = {}) {
     const { getConfig } = this.dependencies;
     await this.requestIsStarting(options);
 
@@ -274,7 +279,7 @@ export class SearchSource {
     if (getConfig(UI_SETTINGS.COURIER_BATCH_SEARCHES)) {
       response = await this.legacyFetch(searchRequest, options);
     } else {
-      response = await this.fetch$(searchRequest, options.abortSignal).toPromise();
+      response = await this.fetch$(searchRequest, options).toPromise();
     }
 
     // TODO: Remove casting when https://github.com/elastic/elasticsearch-js/issues/1287 is resolved
@@ -291,7 +296,7 @@ export class SearchSource {
    *  @return {undefined}
    */
   onRequestStart(
-    handler: (searchSource: SearchSource, options?: FetchOptions) => Promise<unknown>
+    handler: (searchSource: SearchSource, options?: ISearchOptions) => Promise<unknown>
   ) {
     this.requestStartHandlers.push(handler);
   }
@@ -318,7 +323,7 @@ export class SearchSource {
    *  @param options
    *  @return {Promise<undefined>}
    */
-  private requestIsStarting(options: FetchOptions = {}) {
+  private requestIsStarting(options: ISearchOptions = {}) {
     const handlers = [...this.requestStartHandlers];
     // If callParentStartHandlers has been set to true, we also call all
     // handlers of parent search sources.
diff --git a/src/plugins/data/public/search/types.ts b/src/plugins/data/public/search/types.ts
index 55726e40f5a775..b0ac730d8afb12 100644
--- a/src/plugins/data/public/search/types.ts
+++ b/src/plugins/data/public/search/types.ts
@@ -29,15 +29,11 @@ import {
   IKibanaSearchResponse,
   IEsSearchRequest,
   IEsSearchResponse,
+  ISearchOptions,
 } from '../../common/search';
 import { IndexPatternsContract } from '../../common/index_patterns/index_patterns';
 import { UsageCollectionSetup } from '../../../usage_collection/public';
 
-export interface ISearchOptions {
-  signal?: AbortSignal;
-  strategy?: string;
-}
-
 export type ISearch = (
   request: IKibanaSearchRequest,
   options?: ISearchOptions
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index c3b06992dba0e2..f300fb0779e38c 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -198,6 +198,7 @@ export {
   OptionedValueProp,
   ParsedInterval,
   // search
+  ISearchOptions,
   IEsSearchRequest,
   IEsSearchResponse,
   // tabify
@@ -208,7 +209,6 @@ export {
 
 export {
   ISearchStrategy,
-  ISearchOptions,
   ISearchSetup,
   ISearchStart,
   getDefaultSearchParams,
diff --git a/src/plugins/data/server/search/index.ts b/src/plugins/data/server/search/index.ts
index 02c21c32546457..8a74c51f52f510 100644
--- a/src/plugins/data/server/search/index.ts
+++ b/src/plugins/data/server/search/index.ts
@@ -17,13 +17,7 @@
  * under the License.
  */
 
-export {
-  ISearchStrategy,
-  ISearchOptions,
-  ISearchSetup,
-  ISearchStart,
-  SearchEnhancements,
-} from './types';
+export { ISearchStrategy, ISearchSetup, ISearchStart, SearchEnhancements } from './types';
 
 export { getDefaultSearchParams, getTotalLoaded } from './es_search';
 
diff --git a/src/plugins/data/server/search/routes.ts b/src/plugins/data/server/search/routes.ts
index 3d813f745305f2..be5c8d035edff8 100644
--- a/src/plugins/data/server/search/routes.ts
+++ b/src/plugins/data/server/search/routes.ts
@@ -42,7 +42,7 @@ export function registerSearchRoute(core: CoreSetup<object, DataPluginStart>): v
     async (context, request, res) => {
       const searchRequest = request.body;
       const { strategy, id } = request.params;
-      const signal = getRequestAbortedSignal(request.events.aborted$);
+      const abortSignal = getRequestAbortedSignal(request.events.aborted$);
 
       const [, , selfStart] = await core.getStartServices();
 
@@ -51,7 +51,7 @@ export function registerSearchRoute(core: CoreSetup<object, DataPluginStart>): v
           context,
           { ...searchRequest, id },
           {
-            signal,
+            abortSignal,
             strategy,
           }
         );
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index edc94961c79d87..da14995af1fa4c 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -37,7 +37,7 @@ import { UsageCollectionSetup } from '../../../usage_collection/server';
 import { registerUsageCollector } from './collectors/register';
 import { usageProvider } from './collectors/usage';
 import { searchTelemetry } from '../saved_objects';
-import { IEsSearchRequest, IEsSearchResponse } from '../../common';
+import { IEsSearchRequest, IEsSearchResponse, ISearchOptions } from '../../common';
 
 type StrategyMap<
   SearchStrategyRequest extends IEsSearchRequest = IEsSearchRequest,
@@ -102,11 +102,13 @@ export class SearchService implements Plugin<ISearchSetup, ISearchStart> {
   private search(
     context: RequestHandlerContext,
     searchRequest: IEsSearchRequest,
-    options: Record<string, any>
+    options: ISearchOptions
   ) {
-    return this.getSearchStrategy(
-      options.strategy || this.defaultSearchStrategyName
-    ).search(context, searchRequest, { signal: options.signal });
+    return this.getSearchStrategy(options.strategy || this.defaultSearchStrategyName).search(
+      context,
+      searchRequest,
+      options
+    );
   }
 
   public start(
diff --git a/src/plugins/data/server/search/types.ts b/src/plugins/data/server/search/types.ts
index 5ce1bb3e6b9f80..6ce8430d0573b9 100644
--- a/src/plugins/data/server/search/types.ts
+++ b/src/plugins/data/server/search/types.ts
@@ -18,7 +18,7 @@
  */
 
 import { RequestHandlerContext } from '../../../../core/server';
-import { IKibanaSearchResponse, IKibanaSearchRequest } from '../../common/search';
+import { IKibanaSearchResponse, IKibanaSearchRequest, ISearchOptions } from '../../common/search';
 import { AggsSetup, AggsStart } from './aggs';
 import { SearchUsage } from './collectors/usage';
 import { IEsSearchRequest, IEsSearchResponse } from './es_search';
@@ -27,14 +27,6 @@ export interface SearchEnhancements {
   defaultStrategy: string;
 }
 
-export interface ISearchOptions {
-  /**
-   * An `AbortSignal` that allows the caller of `search` to abort a search request.
-   */
-  signal?: AbortSignal;
-  strategy?: string;
-}
-
 export interface ISearchSetup {
   aggs: AggsSetup;
   /**
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 9497a41b45ff9c..93f924493c3b48 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -48,7 +48,6 @@ import { ExistsParams } from 'elasticsearch';
 import { ExplainParams } from 'elasticsearch';
 import { ExpressionAstFunction } from 'src/plugins/expressions/common';
 import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
-import { FetchOptions } from 'src/plugins/data/public';
 import { FieldStatsParams } from 'elasticsearch';
 import { GenericParams } from 'elasticsearch';
 import { GetParams } from 'elasticsearch';
@@ -99,6 +98,7 @@ import { IngestDeletePipelineParams } from 'elasticsearch';
 import { IngestGetPipelineParams } from 'elasticsearch';
 import { IngestPutPipelineParams } from 'elasticsearch';
 import { IngestSimulateParams } from 'elasticsearch';
+import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public';
 import { ISearchSource } from 'src/plugins/data/public';
 import { KibanaClient } from '@elastic/elasticsearch/api/kibana';
 import { KibanaConfigType as KibanaConfigType_2 } from 'src/core/server/kibana_config';
@@ -678,8 +678,7 @@ export class IndexPatternsFetcher {
 //
 // @public (undocumented)
 export interface ISearchOptions {
-    signal?: AbortSignal;
-    // (undocumented)
+    abortSignal?: AbortSignal;
     strategy?: string;
 }
 
diff --git a/src/plugins/vis_type_vega/public/data_model/search_api.ts b/src/plugins/vis_type_vega/public/data_model/search_api.ts
index d2ce8c95b9f90f..8a1541ecae0d41 100644
--- a/src/plugins/vis_type_vega/public/data_model/search_api.ts
+++ b/src/plugins/vis_type_vega/public/data_model/search_api.ts
@@ -62,7 +62,7 @@ export class SearchAPI {
           requestResponders[requestId].json(params.body);
         }
 
-        return search({ params }, { signal: this.abortSignal }).pipe(
+        return search({ params }, { abortSignal: this.abortSignal }).pipe(
           tap((data) => this.inspectSearchResult(data, requestResponders[requestId])),
           map((data) => ({
             name: requestId,
diff --git a/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts b/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts
index fe954f1602cd31..1e2c7987b70417 100644
--- a/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts
+++ b/x-pack/plugins/data_enhanced/public/search/search_interceptor.test.ts
@@ -189,7 +189,7 @@ describe('EnhancedSearchInterceptor', () => {
       const abortController = new AbortController();
       abortController.abort();
 
-      const response = searchInterceptor.search({}, { signal: abortController.signal });
+      const response = searchInterceptor.search({}, { abortSignal: abortController.signal });
       response.subscribe({ next, error });
 
       await timeTravel(500);
@@ -225,7 +225,7 @@ describe('EnhancedSearchInterceptor', () => {
 
       const response = searchInterceptor.search(
         {},
-        { signal: abortController.signal, pollInterval: 0 }
+        { abortSignal: abortController.signal, pollInterval: 0 }
       );
       response.subscribe({ next, error });
 
diff --git a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
index 46609af52d0722..67a42b9954c9d5 100644
--- a/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
+++ b/x-pack/plugins/data_enhanced/server/search/es_search_strategy.ts
@@ -19,11 +19,10 @@ import {
   getTotalLoaded,
   ISearchStrategy,
   SearchUsage,
-  ISearchOptions,
 } from '../../../../../src/plugins/data/server';
 import { IEnhancedEsSearchRequest } from '../../common';
 import { shimHitsTotal } from './shim_hits_total';
-import { IEsSearchResponse } from '../../../../../src/plugins/data/common/search/es_search';
+import { ISearchOptions, IEsSearchResponse } from '../../../../../src/plugins/data/common/search';
 
 function isEnhancedEsSearchResponse(response: any): response is IEsSearchResponse {
   return response.hasOwnProperty('isPartial') && response.hasOwnProperty('isRunning');
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
index 3a93b1ee46e7ba..169fe58e9a2cc4 100644
--- 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
@@ -68,7 +68,7 @@ export const useFirstLastSeenHost = ({
         const searchSubscription$ = data.search
           .search<HostFirstLastSeenRequestOptions, HostFirstLastSeenStrategyResponse>(request, {
             strategy: 'securitySolutionSearchStrategy',
-            signal: abortCtrl.current.signal,
+            abortSignal: abortCtrl.current.signal,
           })
           .subscribe({
             next: (response) => {
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 bc711d08065e22..c545a7a75457bd 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
@@ -131,7 +131,7 @@ export const useAllHost = ({
         const searchSubscription$ = data.search
           .search<HostsRequestOptions, HostsStrategyResponse>(request, {
             strategy: 'securitySolutionSearchStrategy',
-            signal: abortCtrl.current.signal,
+            abortSignal: abortCtrl.current.signal,
           })
           .subscribe({
             next: (response) => {
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
index a72ef0ff1c46e2..b28f479634d421 100644
--- 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
@@ -89,7 +89,7 @@ export const useHostOverview = ({
         const searchSubscription$ = data.search
           .search<HostOverviewRequestOptions, HostOverviewStrategyResponse>(request, {
             strategy: 'securitySolutionSearchStrategy',
-            signal: abortCtrl.current.signal,
+            abortSignal: abortCtrl.current.signal,
           })
           .subscribe({
             next: (response) => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
index d71953eec026f9..857d7fe0229b2a 100644
--- a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
@@ -126,7 +126,7 @@ export const useNetworkHttp = ({
         const searchSubscription$ = data.search
           .search<NetworkHttpRequestOptions, NetworkHttpStrategyResponse>(request, {
             strategy: 'securitySolutionSearchStrategy',
-            signal: abortCtrl.current.signal,
+            abortSignal: abortCtrl.current.signal,
           })
           .subscribe({
             next: (response) => {
diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
index 1c2604ee655521..df02acf208603e 100644
--- a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
+++ b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -125,7 +125,7 @@ export const useNetworkTls = ({
         const searchSubscription$ = data.search
           .search<NetworkTlsRequestOptions, NetworkTlsStrategyResponse>(request, {
             strategy: 'securitySolutionSearchStrategy',
-            signal: abortCtrl.current.signal,
+            abortSignal: abortCtrl.current.signal,
           })
           .subscribe({
             next: (response) => {

From 7134cd7b7e4fb6b43727df1e6fc5681666baca88 Mon Sep 17 00:00:00 2001
From: Matthias Wilhelm <matthias.wilhelm@elastic.co>
Date: Thu, 3 Sep 2020 11:36:27 +0200
Subject: [PATCH 209/216] [Discover] Fix sidebar element focus behavior when
 adding / removing columns (#75749)

* Use field.name instead of idx for key in li element

* onClick adds focus to button

* prevent Chrome jumping back to last focused element
---
 .../public/application/angular/discover.html  |  9 ++++----
 .../components/sidebar/discover_field.tsx     |  6 +++++
 .../components/sidebar/discover_sidebar.tsx   | 22 +++++++++----------
 .../sidebar/discover_sidebar_directive.ts     |  1 -
 .../public/field_button/field_button.tsx      | 11 +++++++++-
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/plugins/discover/public/application/angular/discover.html b/src/plugins/discover/public/application/angular/discover.html
index d3d4f524873d88..94f13e1cd81325 100644
--- a/src/plugins/discover/public/application/angular/discover.html
+++ b/src/plugins/discover/public/application/angular/discover.html
@@ -31,7 +31,6 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
             on-remove-field="removeColumn"
             selected-index-pattern="searchSource.getField('index')"
             set-index-pattern="setIndexPattern"
-            state="state"
           >
           </discover-sidebar>
         </div>
@@ -78,11 +77,11 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
               class="dscTimechart"
               ng-if="opts.timefield"
             >
-              <timechart-header 
+              <timechart-header
                 from="toMoment(timeRange.from)"
-                to="toMoment(timeRange.to)" 
-                options="intervalOptions" 
-                on-change-interval="changeInterval" 
+                to="toMoment(timeRange.to)"
+                options="intervalOptions"
+                on-change-interval="changeInterval"
                 state-interval="state.interval"
                 show-scaled-info="bucketInterval.scaled"
                 bucket-interval-description="bucketInterval.description"
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
index 639dbfe09277cd..bb330cba68e2e6 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
@@ -133,6 +133,9 @@ export function DiscoverField({
           iconType="plusInCircleFilled"
           className="dscSidebarItem__action"
           onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
+            if (ev.type === 'click') {
+              ev.currentTarget.focus();
+            }
             ev.preventDefault();
             ev.stopPropagation();
             toggleDisplay(field);
@@ -155,6 +158,9 @@ export function DiscoverField({
           iconType="cross"
           className="dscSidebarItem__action"
           onClick={(ev: React.MouseEvent<HTMLButtonElement>) => {
+            if (ev.type === 'click') {
+              ev.currentTarget.focus();
+            }
             ev.preventDefault();
             ev.stopPropagation();
             toggleDisplay(field);
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
index 361c0707fef6b4..850624888b24a3 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
@@ -30,7 +30,6 @@ import { SavedObject } from '../../../../../../core/types';
 import { FIELDS_LIMIT_SETTING } from '../../../../common';
 import { groupFields } from './lib/group_fields';
 import { IndexPatternField, IndexPattern, UI_SETTINGS } from '../../../../../data/public';
-import { AppState } from '../../angular/discover_state';
 import { getDetails } from './lib/get_details';
 import { getDefaultFieldFilter, setFieldFilterProp } from './lib/field_filter';
 import { getIndexPatternFieldList } from './lib/get_index_pattern_field_list';
@@ -74,10 +73,6 @@ export interface DiscoverSidebarProps {
    * Callback function to select another index pattern
    */
   setIndexPattern: (id: string) => void;
-  /**
-   * Current app state, used for generating a link to visualize
-   */
-  state: AppState;
 }
 
 export function DiscoverSidebar({
@@ -90,7 +85,6 @@ export function DiscoverSidebar({
   onRemoveField,
   selectedIndexPattern,
   setIndexPattern,
-  state,
 }: DiscoverSidebarProps) {
   const [showFields, setShowFields] = useState(false);
   const [fields, setFields] = useState<IndexPatternField[] | null>(null);
@@ -185,10 +179,10 @@ export function DiscoverSidebar({
                 aria-labelledby="selected_fields"
                 data-test-subj={`fieldList-selected`}
               >
-                {selectedFields.map((field: IndexPatternField, idx: number) => {
+                {selectedFields.map((field: IndexPatternField) => {
                   return (
                     <li
-                      key={`field${idx}`}
+                      key={`field${field.name}`}
                       data-attr-field={field.name}
                       className="dscSidebar__item"
                     >
@@ -260,10 +254,10 @@ export function DiscoverSidebar({
                 aria-labelledby="available_fields available_fields_popular"
                 data-test-subj={`fieldList-popular`}
               >
-                {popularFields.map((field: IndexPatternField, idx: number) => {
+                {popularFields.map((field: IndexPatternField) => {
                   return (
                     <li
-                      key={`field${idx}`}
+                      key={`field${field.name}`}
                       data-attr-field={field.name}
                       className="dscSidebar__item"
                     >
@@ -290,9 +284,13 @@ export function DiscoverSidebar({
             aria-labelledby="available_fields"
             data-test-subj={`fieldList-unpopular`}
           >
-            {unpopularFields.map((field: IndexPatternField, idx: number) => {
+            {unpopularFields.map((field: IndexPatternField) => {
               return (
-                <li key={`field${idx}`} data-attr-field={field.name} className="dscSidebar__item">
+                <li
+                  key={`field${field.name}`}
+                  data-attr-field={field.name}
+                  className="dscSidebar__item"
+                >
                   <DiscoverField
                     field={field}
                     indexPattern={selectedIndexPattern}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_directive.ts b/src/plugins/discover/public/application/components/sidebar/discover_sidebar_directive.ts
index 624ec0f7578947..b271c920e5e010 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_directive.ts
+++ b/src/plugins/discover/public/application/components/sidebar/discover_sidebar_directive.ts
@@ -29,6 +29,5 @@ export function createDiscoverSidebarDirective(reactDirective: any) {
     ['onRemoveField', { watchDepth: 'reference' }],
     ['selectedIndexPattern', { watchDepth: 'reference' }],
     ['setIndexPattern', { watchDepth: 'reference' }],
-    ['state', { watchDepth: 'reference' }],
   ]);
 }
diff --git a/src/plugins/kibana_react/public/field_button/field_button.tsx b/src/plugins/kibana_react/public/field_button/field_button.tsx
index e5833b261946ae..26e6453e4c48b3 100644
--- a/src/plugins/kibana_react/public/field_button/field_button.tsx
+++ b/src/plugins/kibana_react/public/field_button/field_button.tsx
@@ -100,7 +100,16 @@ export function FieldButton({
 
   return (
     <div className={classes} {...rest}>
-      <button onClick={onClick} {...buttonProps} className={buttonClasses}>
+      <button
+        onClick={(e) => {
+          if (e.type === 'click') {
+            e.currentTarget.focus();
+          }
+          onClick();
+        }}
+        {...buttonProps}
+        className={buttonClasses}
+      >
         {fieldIcon && <span className="kbnFieldButton__fieldIcon">{fieldIcon}</span>}
         {fieldName && <span className="kbnFieldButton__name">{fieldName}</span>}
         {fieldInfoIcon && <div className="kbnFieldButton__infoIcon">{fieldInfoIcon}</div>}

From e976bddf81d5c811daa47f703fb474d3c601bec3 Mon Sep 17 00:00:00 2001
From: Pierre Gayvallet <pierre.gayvallet@elastic.co>
Date: Thu, 3 Sep 2020 12:23:57 +0200
Subject: [PATCH 210/216] Remove legacy applications and legacy mode (#75987)

* remove legacy mode and legacy service

* fix tests

* remove txt file

* fix xpack code

* fix types

* remove legacy test

* fix integration tests

* remove legacy reference

* yet another legacy reference

* handle uptime app special case

* update generated doc

* address review comments

* remove legacy fields from ChromeNavLink

* few fixes

* remove legacy API from docTitle service

* ChromeNavLink.href is now mandatory

* update generated doc

* remove legacyMode leftovers

* remove ChromeNavLink.active

* update generated doc
---
 ...na-plugin-core-public.app.capabilities.md} |   4 +-
 ...kibana-plugin-core-public.app.category.md} |   4 +-
 ...ana-plugin-core-public.app.defaultpath.md} |   4 +-
 ...ana-plugin-core-public.app.euiicontype.md} |   4 +-
 ... => kibana-plugin-core-public.app.icon.md} |   4 +-
 ...md => kibana-plugin-core-public.app.id.md} |   4 +-
 .../public/kibana-plugin-core-public.app.md   |  15 +-
 ...a-plugin-core-public.app.navlinkstatus.md} |   4 +-
 ...=> kibana-plugin-core-public.app.order.md} |   4 +-
 ...> kibana-plugin-core-public.app.status.md} |   4 +-
 ...=> kibana-plugin-core-public.app.title.md} |   4 +-
 ... kibana-plugin-core-public.app.tooltip.md} |   4 +-
 ...kibana-plugin-core-public.app.updater_.md} |   4 +-
 ...a-plugin-core-public.appbase.chromeless.md |  13 -
 .../kibana-plugin-core-public.appbase.md      |  31 --
 ...e-public.applicationstart.applications_.md |   2 +-
 ...ana-plugin-core-public.applicationstart.md |   2 +-
 ...a-plugin-core-public.appupdatablefields.md |   2 +-
 .../kibana-plugin-core-public.appupdater.md   |   2 +-
 ...plugin-core-public.chromenavlink.active.md |  17 -
 ...ugin-core-public.chromenavlink.disabled.md |   4 -
 ...lic.chromenavlink.disablesuburltracking.md |  17 -
 ...a-plugin-core-public.chromenavlink.href.md |   2 +-
 ...e-public.chromenavlink.linktolastsuburl.md |  17 -
 ...kibana-plugin-core-public.chromenavlink.md |   6 +-
 ...in-core-public.chromenavlink.suburlbase.md |  17 -
 ...na-plugin-core-public.chromenavlink.url.md |   2 +-
 ...lugin-core-public.chromenavlinks.update.md |   2 +-
 ...re-public.chromenavlinkupdateablefields.md |   2 +-
 ...-core-public.coresetup.injectedmetadata.md |   2 +-
 .../kibana-plugin-core-public.coresetup.md    |   2 +-
 ...-core-public.corestart.injectedmetadata.md |   2 +-
 .../kibana-plugin-core-public.corestart.md    |   2 +-
 ...ana-plugin-core-public.legacyapp.appurl.md |  11 -
 ...-public.legacyapp.disablesuburltracking.md |  11 -
 ...-core-public.legacyapp.linktolastsuburl.md |  11 -
 .../kibana-plugin-core-public.legacyapp.md    |  22 --
 ...plugin-core-public.legacyapp.suburlbase.md |  11 -
 ...public.legacycoresetup.injectedmetadata.md |  15 -
 ...bana-plugin-core-public.legacycoresetup.md |  28 --
 ...public.legacycorestart.injectedmetadata.md |  15 -
 ...bana-plugin-core-public.legacycorestart.md |  28 --
 ...ugin-core-public.legacynavlink.category.md |  11 -
 ...n-core-public.legacynavlink.euiicontype.md |  11 -
 ...a-plugin-core-public.legacynavlink.icon.md |  11 -
 ...ana-plugin-core-public.legacynavlink.id.md |  11 -
 ...kibana-plugin-core-public.legacynavlink.md |  25 --
 ...-plugin-core-public.legacynavlink.order.md |  11 -
 ...-plugin-core-public.legacynavlink.title.md |  11 -
 ...na-plugin-core-public.legacynavlink.url.md |  11 -
 .../core/public/kibana-plugin-core-public.md  |   8 +-
 ...plugin-core-public.navigatetoappoptions.md |   2 +-
 ...n-core-public.navigatetoappoptions.path.md |   2 +-
 ...ore-public.navigatetoappoptions.replace.md |   5 -
 ...kibana-plugin-core-public.publicappinfo.md |   1 -
 ...-plugin-core-public.publiclegacyappinfo.md |  17 -
 .../application/application_service.mock.ts   |   6 +-
 .../application/application_service.test.ts   | 203 +-----------
 .../application/application_service.tsx       |  68 +---
 src/core/public/application/index.ts          |   3 -
 .../application_service.test.tsx              |  52 ---
 .../integration_tests/router.test.tsx         |  38 +--
 .../application/integration_tests/utils.tsx   |  28 +-
 src/core/public/application/test_types.ts     |  14 +-
 src/core/public/application/types.ts          | 218 +++++--------
 .../application/ui/app_container.test.tsx     |   2 -
 src/core/public/application/ui/app_router.tsx |  45 ++-
 src/core/public/application/utils.test.ts     | 115 +------
 src/core/public/application/utils.ts          |  49 +--
 src/core/public/chrome/chrome_service.mock.ts |   3 -
 src/core/public/chrome/chrome_service.tsx     |   1 -
 .../doc_title/doc_title_service.test.ts       |  13 -
 .../chrome/doc_title/doc_title_service.ts     |  10 -
 src/core/public/chrome/nav_links/nav_link.ts  |  64 +---
 .../nav_links/nav_links_service.test.ts       |  83 ++---
 .../chrome/nav_links/to_nav_link.test.ts      |  44 +--
 .../public/chrome/nav_links/to_nav_link.ts    |  24 +-
 .../collapsible_nav.test.tsx.snap             |  13 -
 .../header/__snapshots__/header.test.tsx.snap |  48 ++-
 .../chrome/ui/header/collapsible_nav.test.tsx |   2 -
 .../chrome/ui/header/collapsible_nav.tsx      |   4 -
 .../public/chrome/ui/header/header.test.tsx   |   5 +-
 src/core/public/chrome/ui/header/header.tsx   |   4 -
 .../public/chrome/ui/header/nav_drawer.tsx    |   4 +-
 src/core/public/chrome/ui/header/nav_link.tsx |  16 +-
 src/core/public/core_system.test.mocks.ts     |   9 -
 src/core/public/core_system.test.ts           |  56 ----
 src/core/public/core_system.ts                |  52 +--
 src/core/public/index.ts                      |  39 +--
 src/core/public/injected_metadata/index.ts    |   1 -
 .../injected_metadata_service.mock.ts         |   2 -
 .../injected_metadata_service.ts              |  20 --
 src/core/public/legacy/index.ts               |  20 --
 src/core/public/legacy/legacy_service.mock.ts |  35 ---
 src/core/public/legacy/legacy_service.test.ts | 297 ------------------
 src/core/public/legacy/legacy_service.ts      | 204 ------------
 src/core/public/mocks.ts                      |   1 -
 src/core/public/public.api.md                 |  99 +-----
 src/core/public/rendering/index.ts            |   2 +-
 .../rendering/rendering_service.mock.ts       |  11 +-
 .../rendering/rendering_service.test.tsx      | 113 +++----
 .../public/rendering/rendering_service.tsx    |  41 +--
 .../__snapshots__/get_nav_links.test.ts.snap  |  56 ----
 .../plugins/find_legacy_plugin_specs.ts       |   4 +-
 .../legacy/plugins/get_nav_links.test.ts      | 288 -----------------
 .../server/legacy/plugins/get_nav_links.ts    |  82 -----
 .../rendering_service.test.ts.snap            |   5 -
 .../server/rendering/rendering_service.tsx    |   1 -
 src/core/server/rendering/types.ts            |   1 -
 .../saved_dashboards/saved_dashboards.ts      |   2 +-
 .../public/saved_searches/saved_searches.ts   |   6 +-
 .../embeddable_state_transfer.ts              |   9 +-
 src/plugins/embeddable/public/plugin.tsx      |   3 +-
 .../public/angular/angular_config.tsx         |  42 +--
 .../url/kbn_url_tracker.test.ts               |   4 +-
 .../saved_object/saved_object_loader.ts       |  18 +-
 .../timelion/public/services/saved_sheets.ts  |   2 +-
 .../saved_visualizations.ts                   |   8 +-
 .../test_suites/core_plugins/applications.ts  |  11 -
 .../test_suites/core_plugins/rendering.ts     |  14 +-
 .../public/providers/application.test.ts      |   1 -
 .../public/providers/get_app_results.test.ts  |  38 +--
 .../public/providers/get_app_results.ts       |  13 +-
 .../services/gis_map_saved_object_loader.js   |   2 +-
 124 files changed, 360 insertions(+), 2929 deletions(-)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.capabilities.md => kibana-plugin-core-public.app.capabilities.md} (59%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.category.md => kibana-plugin-core-public.app.category.md} (67%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.defaultpath.md => kibana-plugin-core-public.app.defaultpath.md} (77%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.euiicontype.md => kibana-plugin-core-public.app.euiicontype.md} (63%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.icon.md => kibana-plugin-core-public.app.icon.md} (65%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.id.md => kibana-plugin-core-public.app.id.md} (61%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.navlinkstatus.md => kibana-plugin-core-public.app.navlinkstatus.md} (70%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.order.md => kibana-plugin-core-public.app.order.md} (63%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.status.md => kibana-plugin-core-public.app.status.md} (62%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.title.md => kibana-plugin-core-public.app.title.md} (59%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.tooltip.md => kibana-plugin-core-public.app.tooltip.md} (60%)
 rename docs/development/core/public/{kibana-plugin-core-public.appbase.updater_.md => kibana-plugin-core-public.app.updater_.md} (86%)
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.appbase.chromeless.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.appbase.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.chromenavlink.active.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.chromenavlink.disablesuburltracking.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.chromenavlink.linktolastsuburl.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.chromenavlink.suburlbase.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacyapp.appurl.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacyapp.disablesuburltracking.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacyapp.linktolastsuburl.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacyapp.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacyapp.suburlbase.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacycoresetup.injectedmetadata.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacycoresetup.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacycorestart.injectedmetadata.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacycorestart.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.category.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.euiicontype.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.icon.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.id.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.order.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.title.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.legacynavlink.url.md
 delete mode 100644 docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md
 delete mode 100644 src/core/public/legacy/index.ts
 delete mode 100644 src/core/public/legacy/legacy_service.mock.ts
 delete mode 100644 src/core/public/legacy/legacy_service.test.ts
 delete mode 100644 src/core/public/legacy/legacy_service.ts
 delete mode 100644 src/core/server/legacy/plugins/__snapshots__/get_nav_links.test.ts.snap
 delete mode 100644 src/core/server/legacy/plugins/get_nav_links.test.ts
 delete mode 100644 src/core/server/legacy/plugins/get_nav_links.ts

diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.capabilities.md b/docs/development/core/public/kibana-plugin-core-public.app.capabilities.md
similarity index 59%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.capabilities.md
rename to docs/development/core/public/kibana-plugin-core-public.app.capabilities.md
index 3dd440c4253b32..4a027a6ab132cc 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.capabilities.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.capabilities.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [capabilities](./kibana-plugin-core-public.appbase.capabilities.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [capabilities](./kibana-plugin-core-public.app.capabilities.md)
 
-## AppBase.capabilities property
+## App.capabilities property
 
 Custom capabilities defined by the app.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.category.md b/docs/development/core/public/kibana-plugin-core-public.app.category.md
similarity index 67%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.category.md
rename to docs/development/core/public/kibana-plugin-core-public.app.category.md
index 29532a15747e16..a1e74f2bcf5e2f 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.category.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.category.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [category](./kibana-plugin-core-public.appbase.category.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [category](./kibana-plugin-core-public.app.category.md)
 
-## AppBase.category property
+## App.category property
 
 The category definition of the product See [AppCategory](./kibana-plugin-core-public.appcategory.md) See DEFAULT\_APP\_CATEGORIES for more reference
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.defaultpath.md b/docs/development/core/public/kibana-plugin-core-public.app.defaultpath.md
similarity index 77%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.defaultpath.md
rename to docs/development/core/public/kibana-plugin-core-public.app.defaultpath.md
index 51492756ef2327..3c952ec053e625 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.defaultpath.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.defaultpath.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [defaultPath](./kibana-plugin-core-public.appbase.defaultpath.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [defaultPath](./kibana-plugin-core-public.app.defaultpath.md)
 
-## AppBase.defaultPath property
+## App.defaultPath property
 
 Allow to define the default path a user should be directed to when navigating to the app. When defined, this value will be used as a default for the `path` option when calling [navigateToApp](./kibana-plugin-core-public.applicationstart.navigatetoapp.md)<!-- -->\`<!-- -->, and will also be appended to the [application navLink](./kibana-plugin-core-public.chromenavlink.md) in the navigation bar.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.euiicontype.md b/docs/development/core/public/kibana-plugin-core-public.app.euiicontype.md
similarity index 63%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.euiicontype.md
rename to docs/development/core/public/kibana-plugin-core-public.app.euiicontype.md
index e5bfa38097361f..ff79d832f92e2b 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.euiicontype.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.euiicontype.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [euiIconType](./kibana-plugin-core-public.appbase.euiicontype.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [euiIconType](./kibana-plugin-core-public.app.euiicontype.md)
 
-## AppBase.euiIconType property
+## App.euiIconType property
 
 A EUI iconType that will be used for the app's icon. This icon takes precendence over the `icon` property.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.icon.md b/docs/development/core/public/kibana-plugin-core-public.app.icon.md
similarity index 65%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.icon.md
rename to docs/development/core/public/kibana-plugin-core-public.app.icon.md
index 0bd67922dc39c9..98260da5d20219 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.icon.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.icon.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [icon](./kibana-plugin-core-public.appbase.icon.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [icon](./kibana-plugin-core-public.app.icon.md)
 
-## AppBase.icon property
+## App.icon property
 
 A URL to an image file used as an icon. Used as a fallback if `euiIconType` is not provided.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.id.md b/docs/development/core/public/kibana-plugin-core-public.app.id.md
similarity index 61%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.id.md
rename to docs/development/core/public/kibana-plugin-core-public.app.id.md
index 6c0ec462fa16ba..9899cfc0cf572e 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.id.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.id.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [id](./kibana-plugin-core-public.appbase.id.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [id](./kibana-plugin-core-public.app.id.md)
 
-## AppBase.id property
+## App.id property
 
 The unique identifier of the application
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.md b/docs/development/core/public/kibana-plugin-core-public.app.md
index 8dd60972549f9a..7bdee9dc4c53eb 100644
--- a/docs/development/core/public/kibana-plugin-core-public.app.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.md
@@ -4,12 +4,11 @@
 
 ## App interface
 
-Extension of [common app properties](./kibana-plugin-core-public.appbase.md) with the mount function.
 
 <b>Signature:</b>
 
 ```typescript
-export interface App<HistoryLocationState = unknown> extends AppBase 
+export interface App<HistoryLocationState = unknown> 
 ```
 
 ## Properties
@@ -17,7 +16,19 @@ export interface App<HistoryLocationState = unknown> extends AppBase
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [appRoute](./kibana-plugin-core-public.app.approute.md) | <code>string</code> | Override the application's routing path from <code>/app/${id}</code>. Must be unique across registered applications. Should not include the base path from HTTP. |
+|  [capabilities](./kibana-plugin-core-public.app.capabilities.md) | <code>Partial&lt;Capabilities&gt;</code> | Custom capabilities defined by the app. |
+|  [category](./kibana-plugin-core-public.app.category.md) | <code>AppCategory</code> | The category definition of the product See [AppCategory](./kibana-plugin-core-public.appcategory.md) See DEFAULT\_APP\_CATEGORIES for more reference |
 |  [chromeless](./kibana-plugin-core-public.app.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
+|  [defaultPath](./kibana-plugin-core-public.app.defaultpath.md) | <code>string</code> | Allow to define the default path a user should be directed to when navigating to the app. When defined, this value will be used as a default for the <code>path</code> option when calling [navigateToApp](./kibana-plugin-core-public.applicationstart.navigatetoapp.md)<!-- -->\`<!-- -->, and will also be appended to the [application navLink](./kibana-plugin-core-public.chromenavlink.md) in the navigation bar. |
+|  [euiIconType](./kibana-plugin-core-public.app.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
 |  [exactRoute](./kibana-plugin-core-public.app.exactroute.md) | <code>boolean</code> | If set to true, the application's route will only be checked against an exact match. Defaults to <code>false</code>. |
+|  [icon](./kibana-plugin-core-public.app.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
+|  [id](./kibana-plugin-core-public.app.id.md) | <code>string</code> | The unique identifier of the application |
 |  [mount](./kibana-plugin-core-public.app.mount.md) | <code>AppMount&lt;HistoryLocationState&gt; &#124; AppMountDeprecated&lt;HistoryLocationState&gt;</code> | A mount function called when the user navigates to this app's route. May have signature of [AppMount](./kibana-plugin-core-public.appmount.md) or [AppMountDeprecated](./kibana-plugin-core-public.appmountdeprecated.md)<!-- -->. |
+|  [navLinkStatus](./kibana-plugin-core-public.app.navlinkstatus.md) | <code>AppNavLinkStatus</code> | The initial status of the application's navLink. Defaulting to <code>visible</code> if <code>status</code> is <code>accessible</code> and <code>hidden</code> if status is <code>inaccessible</code> See [AppNavLinkStatus](./kibana-plugin-core-public.appnavlinkstatus.md) |
+|  [order](./kibana-plugin-core-public.app.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
+|  [status](./kibana-plugin-core-public.app.status.md) | <code>AppStatus</code> | The initial status of the application. Defaulting to <code>accessible</code> |
+|  [title](./kibana-plugin-core-public.app.title.md) | <code>string</code> | The title of the application. |
+|  [tooltip](./kibana-plugin-core-public.app.tooltip.md) | <code>string</code> | A tooltip shown when hovering over app link. |
+|  [updater$](./kibana-plugin-core-public.app.updater_.md) | <code>Observable&lt;AppUpdater&gt;</code> | An [AppUpdater](./kibana-plugin-core-public.appupdater.md) observable that can be used to update the application [AppUpdatableFields](./kibana-plugin-core-public.appupdatablefields.md) at runtime. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.navlinkstatus.md b/docs/development/core/public/kibana-plugin-core-public.app.navlinkstatus.md
similarity index 70%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.navlinkstatus.md
rename to docs/development/core/public/kibana-plugin-core-public.app.navlinkstatus.md
index decfb235b28583..c01a26e42e2373 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.navlinkstatus.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.navlinkstatus.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [navLinkStatus](./kibana-plugin-core-public.appbase.navlinkstatus.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [navLinkStatus](./kibana-plugin-core-public.app.navlinkstatus.md)
 
-## AppBase.navLinkStatus property
+## App.navLinkStatus property
 
 The initial status of the application's navLink. Defaulting to `visible` if `status` is `accessible` and `hidden` if status is `inaccessible` See [AppNavLinkStatus](./kibana-plugin-core-public.appnavlinkstatus.md)
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.order.md b/docs/development/core/public/kibana-plugin-core-public.app.order.md
similarity index 63%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.order.md
rename to docs/development/core/public/kibana-plugin-core-public.app.order.md
index 606a40e72d592c..bb6be116b6b587 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.order.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.order.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [order](./kibana-plugin-core-public.appbase.order.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [order](./kibana-plugin-core-public.app.order.md)
 
-## AppBase.order property
+## App.order property
 
 An ordinal used to sort nav links relative to one another for display.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.status.md b/docs/development/core/public/kibana-plugin-core-public.app.status.md
similarity index 62%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.status.md
rename to docs/development/core/public/kibana-plugin-core-public.app.status.md
index 4d6ba6ebd955ef..caa6ff1dcac9e7 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.status.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.status.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [status](./kibana-plugin-core-public.appbase.status.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [status](./kibana-plugin-core-public.app.status.md)
 
-## AppBase.status property
+## App.status property
 
 The initial status of the application. Defaulting to `accessible`
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.title.md b/docs/development/core/public/kibana-plugin-core-public.app.title.md
similarity index 59%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.title.md
rename to docs/development/core/public/kibana-plugin-core-public.app.title.md
index d6058badee8e89..c705e3ab8d2b13 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.title.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.title.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [title](./kibana-plugin-core-public.appbase.title.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [title](./kibana-plugin-core-public.app.title.md)
 
-## AppBase.title property
+## App.title property
 
 The title of the application.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.tooltip.md b/docs/development/core/public/kibana-plugin-core-public.app.tooltip.md
similarity index 60%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.tooltip.md
rename to docs/development/core/public/kibana-plugin-core-public.app.tooltip.md
index 0c0b0840eb9210..e901de0fdccc98 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.tooltip.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.tooltip.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [tooltip](./kibana-plugin-core-public.appbase.tooltip.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [tooltip](./kibana-plugin-core-public.app.tooltip.md)
 
-## AppBase.tooltip property
+## App.tooltip property
 
 A tooltip shown when hovering over app link.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.updater_.md b/docs/development/core/public/kibana-plugin-core-public.app.updater_.md
similarity index 86%
rename from docs/development/core/public/kibana-plugin-core-public.appbase.updater_.md
rename to docs/development/core/public/kibana-plugin-core-public.app.updater_.md
index c2c572755f9b20..67acccbd02965d 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.updater_.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.updater_.md
@@ -1,8 +1,8 @@
 <!-- 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; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [updater$](./kibana-plugin-core-public.appbase.updater_.md)
+[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [updater$](./kibana-plugin-core-public.app.updater_.md)
 
-## AppBase.updater$ property
+## App.updater$ property
 
 An [AppUpdater](./kibana-plugin-core-public.appupdater.md) observable that can be used to update the application [AppUpdatableFields](./kibana-plugin-core-public.appupdatablefields.md) at runtime.
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.chromeless.md b/docs/development/core/public/kibana-plugin-core-public.appbase.chromeless.md
deleted file mode 100644
index 793eab4b5bdfa1..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.chromeless.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-public](./kibana-plugin-core-public.md) &gt; [AppBase](./kibana-plugin-core-public.appbase.md) &gt; [chromeless](./kibana-plugin-core-public.appbase.chromeless.md)
-
-## AppBase.chromeless property
-
-Hide the UI chrome when the application is mounted. Defaults to `false`<!-- -->. Takes precedence over chrome service visibility settings.
-
-<b>Signature:</b>
-
-```typescript
-chromeless?: boolean;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appbase.md b/docs/development/core/public/kibana-plugin-core-public.appbase.md
deleted file mode 100644
index 7b624f12ac1df0..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.appbase.md
+++ /dev/null
@@ -1,31 +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; [AppBase](./kibana-plugin-core-public.appbase.md)
-
-## AppBase interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface AppBase 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [capabilities](./kibana-plugin-core-public.appbase.capabilities.md) | <code>Partial&lt;Capabilities&gt;</code> | Custom capabilities defined by the app. |
-|  [category](./kibana-plugin-core-public.appbase.category.md) | <code>AppCategory</code> | The category definition of the product See [AppCategory](./kibana-plugin-core-public.appcategory.md) See DEFAULT\_APP\_CATEGORIES for more reference |
-|  [chromeless](./kibana-plugin-core-public.appbase.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
-|  [defaultPath](./kibana-plugin-core-public.appbase.defaultpath.md) | <code>string</code> | Allow to define the default path a user should be directed to when navigating to the app. When defined, this value will be used as a default for the <code>path</code> option when calling [navigateToApp](./kibana-plugin-core-public.applicationstart.navigatetoapp.md)<!-- -->\`<!-- -->, and will also be appended to the [application navLink](./kibana-plugin-core-public.chromenavlink.md) in the navigation bar. |
-|  [euiIconType](./kibana-plugin-core-public.appbase.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
-|  [icon](./kibana-plugin-core-public.appbase.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
-|  [id](./kibana-plugin-core-public.appbase.id.md) | <code>string</code> | The unique identifier of the application |
-|  [navLinkStatus](./kibana-plugin-core-public.appbase.navlinkstatus.md) | <code>AppNavLinkStatus</code> | The initial status of the application's navLink. Defaulting to <code>visible</code> if <code>status</code> is <code>accessible</code> and <code>hidden</code> if status is <code>inaccessible</code> See [AppNavLinkStatus](./kibana-plugin-core-public.appnavlinkstatus.md) |
-|  [order](./kibana-plugin-core-public.appbase.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
-|  [status](./kibana-plugin-core-public.appbase.status.md) | <code>AppStatus</code> | The initial status of the application. Defaulting to <code>accessible</code> |
-|  [title](./kibana-plugin-core-public.appbase.title.md) | <code>string</code> | The title of the application. |
-|  [tooltip](./kibana-plugin-core-public.appbase.tooltip.md) | <code>string</code> | A tooltip shown when hovering over app link. |
-|  [updater$](./kibana-plugin-core-public.appbase.updater_.md) | <code>Observable&lt;AppUpdater&gt;</code> | An [AppUpdater](./kibana-plugin-core-public.appupdater.md) observable that can be used to update the application [AppUpdatableFields](./kibana-plugin-core-public.appupdatablefields.md) at runtime. |
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.applicationstart.applications_.md b/docs/development/core/public/kibana-plugin-core-public.applicationstart.applications_.md
index d428faa500faf0..bcc5435f35951a 100644
--- a/docs/development/core/public/kibana-plugin-core-public.applicationstart.applications_.md
+++ b/docs/development/core/public/kibana-plugin-core-public.applicationstart.applications_.md
@@ -9,7 +9,7 @@ Observable emitting the list of currently registered apps and their associated s
 <b>Signature:</b>
 
 ```typescript
-applications$: Observable<ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo>>;
+applications$: Observable<ReadonlyMap<string, PublicAppInfo>>;
 ```
 
 ## Remarks
diff --git a/docs/development/core/public/kibana-plugin-core-public.applicationstart.md b/docs/development/core/public/kibana-plugin-core-public.applicationstart.md
index 896de2de32dd51..00318f32984e9b 100644
--- a/docs/development/core/public/kibana-plugin-core-public.applicationstart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.applicationstart.md
@@ -15,7 +15,7 @@ export interface ApplicationStart
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [applications$](./kibana-plugin-core-public.applicationstart.applications_.md) | <code>Observable&lt;ReadonlyMap&lt;string, PublicAppInfo &#124; PublicLegacyAppInfo&gt;&gt;</code> | Observable emitting the list of currently registered apps and their associated status. |
+|  [applications$](./kibana-plugin-core-public.applicationstart.applications_.md) | <code>Observable&lt;ReadonlyMap&lt;string, PublicAppInfo&gt;&gt;</code> | Observable emitting the list of currently registered apps and their associated status. |
 |  [capabilities](./kibana-plugin-core-public.applicationstart.capabilities.md) | <code>RecursiveReadonly&lt;Capabilities&gt;</code> | Gets the read-only capabilities. |
 |  [currentAppId$](./kibana-plugin-core-public.applicationstart.currentappid_.md) | <code>Observable&lt;string &#124; undefined&gt;</code> | An observable that emits the current application id and each subsequent id update. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md b/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md
index 3d8b5d115c8a27..1232b7f9402552 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md
@@ -9,5 +9,5 @@ Defines the list of fields that can be updated via an [AppUpdater](./kibana-plug
 <b>Signature:</b>
 
 ```typescript
-export declare type AppUpdatableFields = Pick<AppBase, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'>;
+export declare type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appupdater.md b/docs/development/core/public/kibana-plugin-core-public.appupdater.md
index a1c1424132da63..744c52f221da77 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appupdater.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appupdater.md
@@ -9,5 +9,5 @@ Updater for applications. see [ApplicationSetup](./kibana-plugin-core-public.app
 <b>Signature:</b>
 
 ```typescript
-export declare type AppUpdater = (app: AppBase) => Partial<AppUpdatableFields> | undefined;
+export declare type AppUpdater = (app: App) => Partial<AppUpdatableFields> | undefined;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.active.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.active.md
deleted file mode 100644
index fb8a6eb691b420..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.active.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-public](./kibana-plugin-core-public.md) &gt; [ChromeNavLink](./kibana-plugin-core-public.chromenavlink.md) &gt; [active](./kibana-plugin-core-public.chromenavlink.active.md)
-
-## ChromeNavLink.active property
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-Indicates whether or not this app is currently on the screen.
-
-<b>Signature:</b>
-
-```typescript
-readonly active?: boolean;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disabled.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disabled.md
index 9e1aefb79ad398..2b4d22be187f9d 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disabled.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disabled.md
@@ -4,10 +4,6 @@
 
 ## ChromeNavLink.disabled property
 
-> Warning: This API is now obsolete.
-> 
-> 
-
 Disables a link from being clickable.
 
 <b>Signature:</b>
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disablesuburltracking.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disablesuburltracking.md
deleted file mode 100644
index 843fd959d262ae..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.disablesuburltracking.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-public](./kibana-plugin-core-public.md) &gt; [ChromeNavLink](./kibana-plugin-core-public.chromenavlink.md) &gt; [disableSubUrlTracking](./kibana-plugin-core-public.chromenavlink.disablesuburltracking.md)
-
-## ChromeNavLink.disableSubUrlTracking property
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-A flag that tells legacy chrome to ignore the link when tracking sub-urls
-
-<b>Signature:</b>
-
-```typescript
-readonly disableSubUrlTracking?: boolean;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.href.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.href.md
index a8af0c997ca780..f51fa7e5b1355c 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.href.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.href.md
@@ -9,5 +9,5 @@ Settled state between `url`<!-- -->, `baseUrl`<!-- -->, and `active`
 <b>Signature:</b>
 
 ```typescript
-readonly href?: string;
+readonly href: string;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.linktolastsuburl.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.linktolastsuburl.md
deleted file mode 100644
index 0b6d6ae1297440..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.linktolastsuburl.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-public](./kibana-plugin-core-public.md) &gt; [ChromeNavLink](./kibana-plugin-core-public.chromenavlink.md) &gt; [linkToLastSubUrl](./kibana-plugin-core-public.chromenavlink.linktolastsuburl.md)
-
-## ChromeNavLink.linkToLastSubUrl property
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-Whether or not the subUrl feature should be enabled.
-
-<b>Signature:</b>
-
-```typescript
-readonly linkToLastSubUrl?: boolean;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md
index 0349e865bff97f..dfe8f119505aa8 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md
@@ -15,20 +15,16 @@ export interface ChromeNavLink
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [active](./kibana-plugin-core-public.chromenavlink.active.md) | <code>boolean</code> | Indicates whether or not this app is currently on the screen. |
 |  [baseUrl](./kibana-plugin-core-public.chromenavlink.baseurl.md) | <code>string</code> | The base route used to open the root of an application. |
 |  [category](./kibana-plugin-core-public.chromenavlink.category.md) | <code>AppCategory</code> | The category the app lives in |
 |  [disabled](./kibana-plugin-core-public.chromenavlink.disabled.md) | <code>boolean</code> | Disables a link from being clickable. |
-|  [disableSubUrlTracking](./kibana-plugin-core-public.chromenavlink.disablesuburltracking.md) | <code>boolean</code> | A flag that tells legacy chrome to ignore the link when tracking sub-urls |
 |  [euiIconType](./kibana-plugin-core-public.chromenavlink.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precedence over the <code>icon</code> property. |
 |  [hidden](./kibana-plugin-core-public.chromenavlink.hidden.md) | <code>boolean</code> | Hides a link from the navigation. |
 |  [href](./kibana-plugin-core-public.chromenavlink.href.md) | <code>string</code> | Settled state between <code>url</code>, <code>baseUrl</code>, and <code>active</code> |
 |  [icon](./kibana-plugin-core-public.chromenavlink.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
 |  [id](./kibana-plugin-core-public.chromenavlink.id.md) | <code>string</code> | A unique identifier for looking up links. |
-|  [linkToLastSubUrl](./kibana-plugin-core-public.chromenavlink.linktolastsuburl.md) | <code>boolean</code> | Whether or not the subUrl feature should be enabled. |
 |  [order](./kibana-plugin-core-public.chromenavlink.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
-|  [subUrlBase](./kibana-plugin-core-public.chromenavlink.suburlbase.md) | <code>string</code> | A url base that legacy apps can set to match deep URLs to an application. |
 |  [title](./kibana-plugin-core-public.chromenavlink.title.md) | <code>string</code> | The title of the application. |
 |  [tooltip](./kibana-plugin-core-public.chromenavlink.tooltip.md) | <code>string</code> | A tooltip shown when hovering over an app link. |
-|  [url](./kibana-plugin-core-public.chromenavlink.url.md) | <code>string</code> | The route used to open the [default path](./kibana-plugin-core-public.appbase.defaultpath.md) of an application. If unset, <code>baseUrl</code> will be used instead. |
+|  [url](./kibana-plugin-core-public.chromenavlink.url.md) | <code>string</code> | The route used to open the  of an application. If unset, <code>baseUrl</code> will be used instead. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.suburlbase.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.suburlbase.md
deleted file mode 100644
index 047a1d83b137f8..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.suburlbase.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-public](./kibana-plugin-core-public.md) &gt; [ChromeNavLink](./kibana-plugin-core-public.chromenavlink.md) &gt; [subUrlBase](./kibana-plugin-core-public.chromenavlink.suburlbase.md)
-
-## ChromeNavLink.subUrlBase property
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-A url base that legacy apps can set to match deep URLs to an application.
-
-<b>Signature:</b>
-
-```typescript
-readonly subUrlBase?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md
index 1e0b8900159930..833930c4947862 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md
@@ -4,7 +4,7 @@
 
 ## ChromeNavLink.url property
 
-The route used to open the [default path](./kibana-plugin-core-public.appbase.defaultpath.md) of an application. If unset, `baseUrl` will be used instead.
+The route used to open the  of an application. If unset, `baseUrl` will be used instead.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlinks.update.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlinks.update.md
index 5741a4c98f8956..7948f2f8543fd8 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlinks.update.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlinks.update.md
@@ -6,7 +6,7 @@
 
 > Warning: This API is now obsolete.
 > 
-> Uses the [AppBase.updater$](./kibana-plugin-core-public.appbase.updater_.md) property when registering your application with [ApplicationSetup.register()](./kibana-plugin-core-public.applicationsetup.register.md) instead.
+> Uses the  property when registering your application with [ApplicationSetup.register()](./kibana-plugin-core-public.applicationsetup.register.md) instead.
 > 
 
 Update the navlink for the given id with the updated attributes. Returns the updated navlink or `undefined` if it does not exist.
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlinkupdateablefields.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlinkupdateablefields.md
index bd5a1399cded79..0445bb28bb355f 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlinkupdateablefields.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlinkupdateablefields.md
@@ -8,5 +8,5 @@
 <b>Signature:</b>
 
 ```typescript
-export declare type ChromeNavLinkUpdateableFields = Partial<Pick<ChromeNavLink, 'active' | 'disabled' | 'hidden' | 'url' | 'subUrlBase' | 'href'>>;
+export declare type ChromeNavLinkUpdateableFields = Partial<Pick<ChromeNavLink, 'disabled' | 'hidden' | 'url' | 'href'>>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.coresetup.injectedmetadata.md b/docs/development/core/public/kibana-plugin-core-public.coresetup.injectedmetadata.md
index b8f2699b677b0c..8c845c621e0d7e 100644
--- a/docs/development/core/public/kibana-plugin-core-public.coresetup.injectedmetadata.md
+++ b/docs/development/core/public/kibana-plugin-core-public.coresetup.injectedmetadata.md
@@ -8,7 +8,7 @@
 > 
 > 
 
-exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. Use the legacy platform API instead.
+exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.coresetup.md b/docs/development/core/public/kibana-plugin-core-public.coresetup.md
index 870fa33dce9000..b9f97b83af88ff 100644
--- a/docs/development/core/public/kibana-plugin-core-public.coresetup.md
+++ b/docs/development/core/public/kibana-plugin-core-public.coresetup.md
@@ -21,7 +21,7 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
 |  [fatalErrors](./kibana-plugin-core-public.coresetup.fatalerrors.md) | <code>FatalErrorsSetup</code> | [FatalErrorsSetup](./kibana-plugin-core-public.fatalerrorssetup.md) |
 |  [getStartServices](./kibana-plugin-core-public.coresetup.getstartservices.md) | <code>StartServicesAccessor&lt;TPluginsStart, TStart&gt;</code> | [StartServicesAccessor](./kibana-plugin-core-public.startservicesaccessor.md) |
 |  [http](./kibana-plugin-core-public.coresetup.http.md) | <code>HttpSetup</code> | [HttpSetup](./kibana-plugin-core-public.httpsetup.md) |
-|  [injectedMetadata](./kibana-plugin-core-public.coresetup.injectedmetadata.md) | <code>{</code><br/><code>        getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code>    }</code> | exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. Use the legacy platform API instead. |
+|  [injectedMetadata](./kibana-plugin-core-public.coresetup.injectedmetadata.md) | <code>{</code><br/><code>        getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code>    }</code> | exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. |
 |  [notifications](./kibana-plugin-core-public.coresetup.notifications.md) | <code>NotificationsSetup</code> | [NotificationsSetup](./kibana-plugin-core-public.notificationssetup.md) |
 |  [uiSettings](./kibana-plugin-core-public.coresetup.uisettings.md) | <code>IUiSettingsClient</code> | [IUiSettingsClient](./kibana-plugin-core-public.iuisettingsclient.md) |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.corestart.injectedmetadata.md b/docs/development/core/public/kibana-plugin-core-public.corestart.injectedmetadata.md
index 45f9349ae8c615..4e9bf7c4bc0d5a 100644
--- a/docs/development/core/public/kibana-plugin-core-public.corestart.injectedmetadata.md
+++ b/docs/development/core/public/kibana-plugin-core-public.corestart.injectedmetadata.md
@@ -8,7 +8,7 @@
 > 
 > 
 
-exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. Use the legacy platform API instead.
+exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.corestart.md b/docs/development/core/public/kibana-plugin-core-public.corestart.md
index cb4a825a825b13..a7b45b318d2c9e 100644
--- a/docs/development/core/public/kibana-plugin-core-public.corestart.md
+++ b/docs/development/core/public/kibana-plugin-core-public.corestart.md
@@ -22,7 +22,7 @@ export interface CoreStart
 |  [fatalErrors](./kibana-plugin-core-public.corestart.fatalerrors.md) | <code>FatalErrorsStart</code> | [FatalErrorsStart](./kibana-plugin-core-public.fatalerrorsstart.md) |
 |  [http](./kibana-plugin-core-public.corestart.http.md) | <code>HttpStart</code> | [HttpStart](./kibana-plugin-core-public.httpstart.md) |
 |  [i18n](./kibana-plugin-core-public.corestart.i18n.md) | <code>I18nStart</code> | [I18nStart](./kibana-plugin-core-public.i18nstart.md) |
-|  [injectedMetadata](./kibana-plugin-core-public.corestart.injectedmetadata.md) | <code>{</code><br/><code>        getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code>    }</code> | exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. Use the legacy platform API instead. |
+|  [injectedMetadata](./kibana-plugin-core-public.corestart.injectedmetadata.md) | <code>{</code><br/><code>        getInjectedVar: (name: string, defaultValue?: any) =&gt; unknown;</code><br/><code>    }</code> | exposed temporarily until https://github.com/elastic/kibana/issues/41990 done use \*only\* to retrieve config values. There is no way to set injected values in the new platform. |
 |  [notifications](./kibana-plugin-core-public.corestart.notifications.md) | <code>NotificationsStart</code> | [NotificationsStart](./kibana-plugin-core-public.notificationsstart.md) |
 |  [overlays](./kibana-plugin-core-public.corestart.overlays.md) | <code>OverlayStart</code> | [OverlayStart](./kibana-plugin-core-public.overlaystart.md) |
 |  [savedObjects](./kibana-plugin-core-public.corestart.savedobjects.md) | <code>SavedObjectsStart</code> | [SavedObjectsStart](./kibana-plugin-core-public.savedobjectsstart.md) |
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacyapp.appurl.md b/docs/development/core/public/kibana-plugin-core-public.legacyapp.appurl.md
deleted file mode 100644
index 292bf299628397..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacyapp.appurl.md
+++ /dev/null
@@ -1,11 +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; [LegacyApp](./kibana-plugin-core-public.legacyapp.md) &gt; [appUrl](./kibana-plugin-core-public.legacyapp.appurl.md)
-
-## LegacyApp.appUrl property
-
-<b>Signature:</b>
-
-```typescript
-appUrl: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacyapp.disablesuburltracking.md b/docs/development/core/public/kibana-plugin-core-public.legacyapp.disablesuburltracking.md
deleted file mode 100644
index af4d0eb7969d3d..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacyapp.disablesuburltracking.md
+++ /dev/null
@@ -1,11 +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; [LegacyApp](./kibana-plugin-core-public.legacyapp.md) &gt; [disableSubUrlTracking](./kibana-plugin-core-public.legacyapp.disablesuburltracking.md)
-
-## LegacyApp.disableSubUrlTracking property
-
-<b>Signature:</b>
-
-```typescript
-disableSubUrlTracking?: boolean;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacyapp.linktolastsuburl.md b/docs/development/core/public/kibana-plugin-core-public.legacyapp.linktolastsuburl.md
deleted file mode 100644
index fa1314b74fd83f..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacyapp.linktolastsuburl.md
+++ /dev/null
@@ -1,11 +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; [LegacyApp](./kibana-plugin-core-public.legacyapp.md) &gt; [linkToLastSubUrl](./kibana-plugin-core-public.legacyapp.linktolastsuburl.md)
-
-## LegacyApp.linkToLastSubUrl property
-
-<b>Signature:</b>
-
-```typescript
-linkToLastSubUrl?: boolean;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacyapp.md b/docs/development/core/public/kibana-plugin-core-public.legacyapp.md
deleted file mode 100644
index 06533aaa991708..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacyapp.md
+++ /dev/null
@@ -1,22 +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; [LegacyApp](./kibana-plugin-core-public.legacyapp.md)
-
-## LegacyApp interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface LegacyApp extends AppBase 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [appUrl](./kibana-plugin-core-public.legacyapp.appurl.md) | <code>string</code> |  |
-|  [disableSubUrlTracking](./kibana-plugin-core-public.legacyapp.disablesuburltracking.md) | <code>boolean</code> |  |
-|  [linkToLastSubUrl](./kibana-plugin-core-public.legacyapp.linktolastsuburl.md) | <code>boolean</code> |  |
-|  [subUrlBase](./kibana-plugin-core-public.legacyapp.suburlbase.md) | <code>string</code> |  |
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacyapp.suburlbase.md b/docs/development/core/public/kibana-plugin-core-public.legacyapp.suburlbase.md
deleted file mode 100644
index 44a1e52ccd2447..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacyapp.suburlbase.md
+++ /dev/null
@@ -1,11 +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; [LegacyApp](./kibana-plugin-core-public.legacyapp.md) &gt; [subUrlBase](./kibana-plugin-core-public.legacyapp.suburlbase.md)
-
-## LegacyApp.subUrlBase property
-
-<b>Signature:</b>
-
-```typescript
-subUrlBase?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacycoresetup.injectedmetadata.md b/docs/development/core/public/kibana-plugin-core-public.legacycoresetup.injectedmetadata.md
deleted file mode 100644
index 4014d27907e983..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacycoresetup.injectedmetadata.md
+++ /dev/null
@@ -1,15 +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; [LegacyCoreSetup](./kibana-plugin-core-public.legacycoresetup.md) &gt; [injectedMetadata](./kibana-plugin-core-public.legacycoresetup.injectedmetadata.md)
-
-## LegacyCoreSetup.injectedMetadata property
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-<b>Signature:</b>
-
-```typescript
-injectedMetadata: InjectedMetadataSetup;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacycoresetup.md b/docs/development/core/public/kibana-plugin-core-public.legacycoresetup.md
deleted file mode 100644
index 26220accbfaf31..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacycoresetup.md
+++ /dev/null
@@ -1,28 +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; [LegacyCoreSetup](./kibana-plugin-core-public.legacycoresetup.md)
-
-## LegacyCoreSetup interface
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-Setup interface exposed to the legacy platform via the `ui/new_platform` module.
-
-<b>Signature:</b>
-
-```typescript
-export interface LegacyCoreSetup extends CoreSetup<any, any> 
-```
-
-## Remarks
-
-Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreSetup](./kibana-plugin-core-public.coresetup.md)<!-- -->, unsupported methods will throw exceptions when called.
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [injectedMetadata](./kibana-plugin-core-public.legacycoresetup.injectedmetadata.md) | <code>InjectedMetadataSetup</code> |  |
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacycorestart.injectedmetadata.md b/docs/development/core/public/kibana-plugin-core-public.legacycorestart.injectedmetadata.md
deleted file mode 100644
index 288b288b1814d9..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacycorestart.injectedmetadata.md
+++ /dev/null
@@ -1,15 +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; [LegacyCoreStart](./kibana-plugin-core-public.legacycorestart.md) &gt; [injectedMetadata](./kibana-plugin-core-public.legacycorestart.injectedmetadata.md)
-
-## LegacyCoreStart.injectedMetadata property
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-<b>Signature:</b>
-
-```typescript
-injectedMetadata: InjectedMetadataStart;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacycorestart.md b/docs/development/core/public/kibana-plugin-core-public.legacycorestart.md
deleted file mode 100644
index 7714d0f325d2c9..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacycorestart.md
+++ /dev/null
@@ -1,28 +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; [LegacyCoreStart](./kibana-plugin-core-public.legacycorestart.md)
-
-## LegacyCoreStart interface
-
-> Warning: This API is now obsolete.
-> 
-> 
-
-Start interface exposed to the legacy platform via the `ui/new_platform` module.
-
-<b>Signature:</b>
-
-```typescript
-export interface LegacyCoreStart extends CoreStart 
-```
-
-## Remarks
-
-Some methods are not supported in the legacy platform and while present to make this type compatibile with [CoreStart](./kibana-plugin-core-public.corestart.md)<!-- -->, unsupported methods will throw exceptions when called.
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [injectedMetadata](./kibana-plugin-core-public.legacycorestart.injectedmetadata.md) | <code>InjectedMetadataStart</code> |  |
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.category.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.category.md
deleted file mode 100644
index a70aac70067de7..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.category.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [category](./kibana-plugin-core-public.legacynavlink.category.md)
-
-## LegacyNavLink.category property
-
-<b>Signature:</b>
-
-```typescript
-category?: AppCategory;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.euiicontype.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.euiicontype.md
deleted file mode 100644
index b360578f98cf14..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.euiicontype.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [euiIconType](./kibana-plugin-core-public.legacynavlink.euiicontype.md)
-
-## LegacyNavLink.euiIconType property
-
-<b>Signature:</b>
-
-```typescript
-euiIconType?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.icon.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.icon.md
deleted file mode 100644
index c2c6f89be0d784..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.icon.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [icon](./kibana-plugin-core-public.legacynavlink.icon.md)
-
-## LegacyNavLink.icon property
-
-<b>Signature:</b>
-
-```typescript
-icon?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.id.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.id.md
deleted file mode 100644
index fc79b6b4bd6dda..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.id.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [id](./kibana-plugin-core-public.legacynavlink.id.md)
-
-## LegacyNavLink.id property
-
-<b>Signature:</b>
-
-```typescript
-id: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.md
deleted file mode 100644
index b6402f991f965f..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.md
+++ /dev/null
@@ -1,25 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md)
-
-## LegacyNavLink interface
-
-
-<b>Signature:</b>
-
-```typescript
-export interface LegacyNavLink 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [category](./kibana-plugin-core-public.legacynavlink.category.md) | <code>AppCategory</code> |  |
-|  [euiIconType](./kibana-plugin-core-public.legacynavlink.euiicontype.md) | <code>string</code> |  |
-|  [icon](./kibana-plugin-core-public.legacynavlink.icon.md) | <code>string</code> |  |
-|  [id](./kibana-plugin-core-public.legacynavlink.id.md) | <code>string</code> |  |
-|  [order](./kibana-plugin-core-public.legacynavlink.order.md) | <code>number</code> |  |
-|  [title](./kibana-plugin-core-public.legacynavlink.title.md) | <code>string</code> |  |
-|  [url](./kibana-plugin-core-public.legacynavlink.url.md) | <code>string</code> |  |
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.order.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.order.md
deleted file mode 100644
index 6ad3081b81d4ba..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.order.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [order](./kibana-plugin-core-public.legacynavlink.order.md)
-
-## LegacyNavLink.order property
-
-<b>Signature:</b>
-
-```typescript
-order: number;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.title.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.title.md
deleted file mode 100644
index 70b0e37729f26d..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.title.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [title](./kibana-plugin-core-public.legacynavlink.title.md)
-
-## LegacyNavLink.title property
-
-<b>Signature:</b>
-
-```typescript
-title: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.url.md b/docs/development/core/public/kibana-plugin-core-public.legacynavlink.url.md
deleted file mode 100644
index 7e543f4a90c1dd..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.legacynavlink.url.md
+++ /dev/null
@@ -1,11 +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; [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) &gt; [url](./kibana-plugin-core-public.legacynavlink.url.md)
-
-## LegacyNavLink.url property
-
-<b>Signature:</b>
-
-```typescript
-url: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.md b/docs/development/core/public/kibana-plugin-core-public.md
index c931ce544f5d51..08b12190ef6383 100644
--- a/docs/development/core/public/kibana-plugin-core-public.md
+++ b/docs/development/core/public/kibana-plugin-core-public.md
@@ -41,8 +41,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 
 |  Interface | Description |
 |  --- | --- |
-|  [App](./kibana-plugin-core-public.app.md) | Extension of [common app properties](./kibana-plugin-core-public.appbase.md) with the mount function. |
-|  [AppBase](./kibana-plugin-core-public.appbase.md) |  |
+|  [App](./kibana-plugin-core-public.app.md) |  |
 |  [AppCategory](./kibana-plugin-core-public.appcategory.md) | A category definition for nav links to know where to sort them in the left hand nav |
 |  [AppLeaveConfirmAction](./kibana-plugin-core-public.appleaveconfirmaction.md) | Action to return from a [AppLeaveHandler](./kibana-plugin-core-public.appleavehandler.md) to show a confirmation message when trying to leave an application.<!-- -->See  |
 |  [AppLeaveDefaultAction](./kibana-plugin-core-public.appleavedefaultaction.md) | Action to return from a [AppLeaveHandler](./kibana-plugin-core-public.appleavehandler.md) to execute the default behaviour when leaving the application.<!-- -->See  |
@@ -90,10 +89,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [IHttpResponseInterceptorOverrides](./kibana-plugin-core-public.ihttpresponseinterceptoroverrides.md) | Properties that can be returned by HttpInterceptor.request to override the response. |
 |  [ImageValidation](./kibana-plugin-core-public.imagevalidation.md) |  |
 |  [IUiSettingsClient](./kibana-plugin-core-public.iuisettingsclient.md) | Client-side client that provides access to the advanced settings stored in elasticsearch. The settings provide control over the behavior of the Kibana application. For example, a user can specify how to display numeric or date fields. Users can adjust the settings via Management UI. [IUiSettingsClient](./kibana-plugin-core-public.iuisettingsclient.md) |
-|  [LegacyApp](./kibana-plugin-core-public.legacyapp.md) |  |
-|  [LegacyCoreSetup](./kibana-plugin-core-public.legacycoresetup.md) | Setup interface exposed to the legacy platform via the <code>ui/new_platform</code> module. |
-|  [LegacyCoreStart](./kibana-plugin-core-public.legacycorestart.md) | Start interface exposed to the legacy platform via the <code>ui/new_platform</code> module. |
-|  [LegacyNavLink](./kibana-plugin-core-public.legacynavlink.md) |  |
 |  [NavigateToAppOptions](./kibana-plugin-core-public.navigatetoappoptions.md) | Options for the [navigateToApp API](./kibana-plugin-core-public.applicationstart.navigatetoapp.md) |
 |  [NotificationsSetup](./kibana-plugin-core-public.notificationssetup.md) |  |
 |  [NotificationsStart](./kibana-plugin-core-public.notificationsstart.md) |  |
@@ -173,7 +168,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [PluginInitializer](./kibana-plugin-core-public.plugininitializer.md) | The <code>plugin</code> export at the root of a plugin's <code>public</code> directory should conform to this interface. |
 |  [PluginOpaqueId](./kibana-plugin-core-public.pluginopaqueid.md) |  |
 |  [PublicAppInfo](./kibana-plugin-core-public.publicappinfo.md) | Public information about a registered [application](./kibana-plugin-core-public.app.md) |
-|  [PublicLegacyAppInfo](./kibana-plugin-core-public.publiclegacyappinfo.md) | Information about a registered [legacy application](./kibana-plugin-core-public.legacyapp.md) |
 |  [PublicUiSettingsParams](./kibana-plugin-core-public.publicuisettingsparams.md) | A sub-set of [UiSettingsParams](./kibana-plugin-core-public.uisettingsparams.md) exposed to the client-side. |
 |  [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) |
diff --git a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md
index aa51e5706e3d76..b7c01fae4314fb 100644
--- a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md
+++ b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md
@@ -16,7 +16,7 @@ export interface NavigateToAppOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [path](./kibana-plugin-core-public.navigatetoappoptions.path.md) | <code>string</code> | optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.appbase.defaultpath.md)<!-- -->\` as default. |
+|  [path](./kibana-plugin-core-public.navigatetoappoptions.path.md) | <code>string</code> | optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md)<!-- -->\` as default. |
 |  [replace](./kibana-plugin-core-public.navigatetoappoptions.replace.md) | <code>boolean</code> | if true, will not create a new history entry when navigating (using <code>replace</code> instead of <code>push</code>) |
 |  [state](./kibana-plugin-core-public.navigatetoappoptions.state.md) | <code>unknown</code> | optional state to forward to the application |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md
index 58ce7e02d8dd88..095553d05778c9 100644
--- a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md
+++ b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md
@@ -4,7 +4,7 @@
 
 ## NavigateToAppOptions.path property
 
-optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.appbase.defaultpath.md)<!-- -->\` as default.
+optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md)<!-- -->\` as default.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.replace.md b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.replace.md
index 9530d034862995..8a7440025aedc7 100644
--- a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.replace.md
+++ b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.replace.md
@@ -11,8 +11,3 @@ if true, will not create a new history entry when navigating (using `replace` in
 ```typescript
 replace?: boolean;
 ```
-
-## Remarks
-
-This option not be used when navigating from and/or to legacy applications.
-
diff --git a/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md b/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
index 4b3b103c92731d..3717dc847db25b 100644
--- a/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
+++ b/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
@@ -10,7 +10,6 @@ Public information about a registered [application](./kibana-plugin-core-public.
 
 ```typescript
 export declare type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
-    legacy: false;
     status: AppStatus;
     navLinkStatus: AppNavLinkStatus;
     appRoute: string;
diff --git a/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md b/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.md
deleted file mode 100644
index 051638daabd12f..00000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.publiclegacyappinfo.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-public](./kibana-plugin-core-public.md) &gt; [PublicLegacyAppInfo](./kibana-plugin-core-public.publiclegacyappinfo.md)
-
-## PublicLegacyAppInfo type
-
-Information about a registered [legacy application](./kibana-plugin-core-public.legacyapp.md)
-
-<b>Signature:</b>
-
-```typescript
-export declare type PublicLegacyAppInfo = Omit<LegacyApp, 'updater$'> & {
-    legacy: true;
-    status: AppStatus;
-    navLinkStatus: AppNavLinkStatus;
-};
-```
diff --git a/src/core/public/application/application_service.mock.ts b/src/core/public/application/application_service.mock.ts
index 2bdf56ee342114..5609e7eb5d17db 100644
--- a/src/core/public/application/application_service.mock.ts
+++ b/src/core/public/application/application_service.mock.ts
@@ -28,7 +28,6 @@ import {
   ApplicationStart,
   InternalApplicationSetup,
   PublicAppInfo,
-  PublicLegacyAppInfo,
 } from './types';
 import { ApplicationServiceContract } from './test_types';
 
@@ -40,7 +39,6 @@ const createSetupContractMock = (): jest.Mocked<ApplicationSetup> => ({
 
 const createInternalSetupContractMock = (): jest.Mocked<InternalApplicationSetup> => ({
   register: jest.fn(),
-  registerLegacyApp: jest.fn(),
   registerAppUpdater: jest.fn(),
   registerMountContext: jest.fn(),
 });
@@ -49,7 +47,7 @@ const createStartContractMock = (): jest.Mocked<ApplicationStart> => {
   const currentAppId$ = new Subject<string | undefined>();
 
   return {
-    applications$: new BehaviorSubject<Map<string, PublicAppInfo | PublicLegacyAppInfo>>(new Map()),
+    applications$: new BehaviorSubject<Map<string, PublicAppInfo>>(new Map()),
     currentAppId$: currentAppId$.asObservable(),
     capabilities: capabilitiesServiceMock.createStartContract().capabilities,
     navigateToApp: jest.fn(),
@@ -85,7 +83,7 @@ const createInternalStartContractMock = (): jest.Mocked<InternalApplicationStart
   const currentAppId$ = new Subject<string | undefined>();
 
   return {
-    applications$: new BehaviorSubject<Map<string, PublicAppInfo | PublicLegacyAppInfo>>(new Map()),
+    applications$: new BehaviorSubject<Map<string, PublicAppInfo>>(new Map()),
     capabilities: capabilitiesServiceMock.createStartContract().capabilities,
     currentAppId$: currentAppId$.asObservable(),
     currentActionMenu$: new BehaviorSubject<MountPoint | undefined>(undefined),
diff --git a/src/core/public/application/application_service.test.ts b/src/core/public/application/application_service.test.ts
index d0c2ac111eb1f4..afcebc06506c26 100644
--- a/src/core/public/application/application_service.test.ts
+++ b/src/core/public/application/application_service.test.ts
@@ -28,21 +28,12 @@ import { BehaviorSubject, Subject } from 'rxjs';
 import { bufferCount, take, takeUntil } from 'rxjs/operators';
 import { shallow, mount } from 'enzyme';
 
-import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
 import { contextServiceMock } from '../context/context_service.mock';
 import { httpServiceMock } from '../http/http_service.mock';
 import { overlayServiceMock } from '../overlays/overlay_service.mock';
 import { MockLifecycle } from './test_types';
 import { ApplicationService } from './application_service';
-import {
-  App,
-  PublicAppInfo,
-  AppNavLinkStatus,
-  AppStatus,
-  AppUpdater,
-  LegacyApp,
-  PublicLegacyAppInfo,
-} from './types';
+import { App, PublicAppInfo, AppNavLinkStatus, AppStatus, AppUpdater } from './types';
 import { act } from 'react-dom/test-utils';
 
 const createApp = (props: Partial<App>): App => {
@@ -54,15 +45,6 @@ const createApp = (props: Partial<App>): App => {
   };
 };
 
-const createLegacyApp = (props: Partial<LegacyApp>): LegacyApp => {
-  return {
-    id: 'some-id',
-    title: 'some-title',
-    appUrl: '/my-url',
-    ...props,
-  };
-};
-
 let setupDeps: MockLifecycle<'setup'>;
 let startDeps: MockLifecycle<'start'>;
 let service: ApplicationService;
@@ -73,10 +55,8 @@ describe('#setup()', () => {
     setupDeps = {
       http,
       context: contextServiceMock.createSetupContract(),
-      injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
       redirectTo: jest.fn(),
     };
-    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(false);
     startDeps = { http, overlays: overlayServiceMock.createStartContract() };
     service = new ApplicationService();
   });
@@ -116,7 +96,6 @@ describe('#setup()', () => {
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.visible,
           status: AppStatus.accessible,
         })
@@ -124,7 +103,6 @@ describe('#setup()', () => {
       expect(applications.get('app2')).toEqual(
         expect.objectContaining({
           id: 'app2',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.visible,
           status: AppStatus.accessible,
         })
@@ -141,7 +119,6 @@ describe('#setup()', () => {
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.hidden,
           status: AppStatus.inaccessible,
           defaultPath: 'foo/bar',
@@ -151,7 +128,6 @@ describe('#setup()', () => {
       expect(applications.get('app2')).toEqual(
         expect.objectContaining({
           id: 'app2',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.visible,
           status: AppStatus.accessible,
         })
@@ -159,7 +135,7 @@ describe('#setup()', () => {
     });
 
     it('throws an error if an App with the same appRoute is registered', () => {
-      const { register, registerLegacyApp } = service.setup(setupDeps);
+      const { register } = service.setup(setupDeps);
 
       register(Symbol(), createApp({ id: 'app1' }));
 
@@ -168,7 +144,6 @@ describe('#setup()', () => {
       ).toThrowErrorMatchingInlineSnapshot(
         `"An application is already registered with the appRoute \\"/app/app1\\""`
       );
-      expect(() => registerLegacyApp(createLegacyApp({ id: 'app1' }))).toThrow();
 
       register(Symbol(), createApp({ id: 'app-next', appRoute: '/app/app3' }));
 
@@ -177,7 +152,6 @@ describe('#setup()', () => {
       ).toThrowErrorMatchingInlineSnapshot(
         `"An application is already registered with the appRoute \\"/app/app3\\""`
       );
-      expect(() => registerLegacyApp(createLegacyApp({ id: 'app3' }))).not.toThrow();
     });
 
     it('throws an error if an App starts with the HTTP base path', () => {
@@ -195,41 +169,6 @@ describe('#setup()', () => {
     });
   });
 
-  describe('registerLegacyApp', () => {
-    it('throws an error if two apps with the same id are registered', () => {
-      const { registerLegacyApp } = service.setup(setupDeps);
-
-      registerLegacyApp(createLegacyApp({ id: 'app2' }));
-      expect(() =>
-        registerLegacyApp(createLegacyApp({ id: 'app2' }))
-      ).toThrowErrorMatchingInlineSnapshot(
-        `"An application is already registered with the id \\"app2\\""`
-      );
-    });
-
-    it('throws error if additional apps are registered after setup', async () => {
-      const { registerLegacyApp } = service.setup(setupDeps);
-
-      await service.start(startDeps);
-      expect(() =>
-        registerLegacyApp(createLegacyApp({ id: 'app2' }))
-      ).toThrowErrorMatchingInlineSnapshot(`"Applications cannot be registered after \\"setup\\""`);
-    });
-
-    it('throws an error if a LegacyApp with the same appRoute is registered', () => {
-      const { register, registerLegacyApp } = service.setup(setupDeps);
-
-      registerLegacyApp(createLegacyApp({ id: 'app1' }));
-
-      expect(() =>
-        register(Symbol(), createApp({ id: 'app2', appRoute: '/app/app1' }))
-      ).toThrowErrorMatchingInlineSnapshot(
-        `"An application is already registered with the appRoute \\"/app/app1\\""`
-      );
-      expect(() => registerLegacyApp(createLegacyApp({ id: 'app1:other' }))).not.toThrow();
-    });
-  });
-
   describe('registerAppUpdater', () => {
     it('updates status fields', async () => {
       const setup = service.setup(setupDeps);
@@ -258,7 +197,6 @@ describe('#setup()', () => {
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.disabled,
           status: AppStatus.inaccessible,
           tooltip: 'App inaccessible due to reason',
@@ -267,7 +205,6 @@ describe('#setup()', () => {
       expect(applications.get('app2')).toEqual(
         expect.objectContaining({
           id: 'app2',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.visible,
           status: AppStatus.accessible,
           tooltip: 'App accessible',
@@ -307,7 +244,6 @@ describe('#setup()', () => {
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.disabled,
           status: AppStatus.inaccessible,
           tooltip: 'App inaccessible due to reason',
@@ -316,7 +252,6 @@ describe('#setup()', () => {
       expect(applications.get('app2')).toEqual(
         expect.objectContaining({
           id: 'app2',
-          legacy: false,
           status: AppStatus.inaccessible,
           navLinkStatus: AppNavLinkStatus.hidden,
         })
@@ -352,7 +287,6 @@ describe('#setup()', () => {
       expect(applications.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           navLinkStatus: AppNavLinkStatus.disabled,
           status: AppStatus.inaccessible,
         })
@@ -374,10 +308,7 @@ describe('#setup()', () => {
       setup.registerAppUpdater(statusUpdater);
 
       const start = await service.start(startDeps);
-      let latestValue: ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo> = new Map<
-        string,
-        PublicAppInfo | PublicLegacyAppInfo
-      >();
+      let latestValue: ReadonlyMap<string, PublicAppInfo> = new Map<string, PublicAppInfo>();
       start.applications$.subscribe((apps) => {
         latestValue = apps;
       });
@@ -385,7 +316,6 @@ describe('#setup()', () => {
       expect(latestValue.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           status: AppStatus.inaccessible,
           navLinkStatus: AppNavLinkStatus.disabled,
         })
@@ -401,43 +331,12 @@ describe('#setup()', () => {
       expect(latestValue.get('app1')).toEqual(
         expect.objectContaining({
           id: 'app1',
-          legacy: false,
           status: AppStatus.accessible,
           navLinkStatus: AppNavLinkStatus.hidden,
         })
       );
     });
 
-    it('also updates legacy apps', async () => {
-      const setup = service.setup(setupDeps);
-
-      setup.registerLegacyApp(createLegacyApp({ id: 'app1' }));
-
-      setup.registerAppUpdater(
-        new BehaviorSubject<AppUpdater>((app) => {
-          return {
-            status: AppStatus.inaccessible,
-            navLinkStatus: AppNavLinkStatus.hidden,
-            tooltip: 'App inaccessible due to reason',
-          };
-        })
-      );
-
-      const start = await service.start(startDeps);
-      const applications = await start.applications$.pipe(take(1)).toPromise();
-
-      expect(applications.size).toEqual(1);
-      expect(applications.get('app1')).toEqual(
-        expect.objectContaining({
-          id: 'app1',
-          legacy: true,
-          status: AppStatus.inaccessible,
-          navLinkStatus: AppNavLinkStatus.hidden,
-          tooltip: 'App inaccessible due to reason',
-        })
-      );
-    });
-
     it('allows to update the basePath', async () => {
       const setup = service.setup(setupDeps);
 
@@ -486,10 +385,8 @@ describe('#start()', () => {
     setupDeps = {
       http,
       context: contextServiceMock.createSetupContract(),
-      injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
       redirectTo: jest.fn(),
     };
-    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(false);
     startDeps = { http, overlays: overlayServiceMock.createStartContract() };
     service = new ApplicationService();
   });
@@ -507,11 +404,10 @@ describe('#start()', () => {
   });
 
   it('exposes available apps', async () => {
-    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-    const { register, registerLegacyApp } = service.setup(setupDeps);
+    const { register } = service.setup(setupDeps);
 
     register(Symbol(), createApp({ id: 'app1' }));
-    registerLegacyApp(createLegacyApp({ id: 'app2' }));
+    register(Symbol(), createApp({ id: 'app2' }));
 
     const { applications$ } = await service.start(startDeps);
     const availableApps = await applications$.pipe(take(1)).toPromise();
@@ -522,16 +418,14 @@ describe('#start()', () => {
       expect.objectContaining({
         appRoute: '/app/app1',
         id: 'app1',
-        legacy: false,
         navLinkStatus: AppNavLinkStatus.visible,
         status: AppStatus.accessible,
       })
     );
     expect(availableApps.get('app2')).toEqual(
       expect.objectContaining({
-        appUrl: '/my-url',
+        appRoute: '/app/app2',
         id: 'app2',
-        legacy: true,
         navLinkStatus: AppNavLinkStatus.visible,
         status: AppStatus.accessible,
       })
@@ -558,39 +452,19 @@ describe('#start()', () => {
         navLinks: {
           app1: true,
           app2: false,
-          legacyApp1: true,
-          legacyApp2: false,
         },
       },
     } as any);
 
-    const { register, registerLegacyApp } = service.setup(setupDeps);
+    const { register } = service.setup(setupDeps);
 
     register(Symbol(), createApp({ id: 'app1' }));
-    registerLegacyApp(createLegacyApp({ id: 'legacyApp1' }));
     register(Symbol(), createApp({ id: 'app2' }));
-    registerLegacyApp(createLegacyApp({ id: 'legacyApp2' }));
 
     const { applications$ } = await service.start(startDeps);
     const availableApps = await applications$.pipe(take(1)).toPromise();
 
-    expect([...availableApps.keys()]).toEqual(['app1', 'legacyApp1']);
-  });
-
-  describe('currentAppId$', () => {
-    it('emits the legacy app id when in legacy mode', async () => {
-      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-      setupDeps.injectedMetadata.getLegacyMetadata.mockReturnValue({
-        app: {
-          id: 'legacy',
-          title: 'Legacy App',
-        },
-      } as any);
-      await service.setup(setupDeps);
-      const { currentAppId$ } = await service.start(startDeps);
-
-      expect(await currentAppId$.pipe(take(1)).toPromise()).toEqual('legacy');
-    });
+    expect([...availableApps.keys()]).toEqual(['app1']);
   });
 
   describe('getComponent', () => {
@@ -602,16 +476,6 @@ describe('#start()', () => {
       expect(() => shallow(createElement(getComponent))).not.toThrow();
       expect(getComponent()).toMatchSnapshot();
     });
-
-    it('renders null when in legacy mode', async () => {
-      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-      service.setup(setupDeps);
-
-      const { getComponent } = await service.start(startDeps);
-
-      expect(() => shallow(createElement(getComponent))).not.toThrow();
-      expect(getComponent()).toBe(null);
-    });
   });
 
   describe('getUrlForApp', () => {
@@ -624,16 +488,14 @@ describe('#start()', () => {
     });
 
     it('creates URL for registered appId', async () => {
-      const { register, registerLegacyApp } = service.setup(setupDeps);
+      const { register } = service.setup(setupDeps);
 
       register(Symbol(), createApp({ id: 'app1' }));
-      registerLegacyApp(createLegacyApp({ id: 'legacyApp1' }));
       register(Symbol(), createApp({ id: 'app2', appRoute: '/custom/path' }));
 
       const { getUrlForApp } = await service.start(startDeps);
 
       expect(getUrlForApp('app1')).toBe('/base-path/app/app1');
-      expect(getUrlForApp('legacyApp1')).toBe('/base-path/app/legacyApp1');
       expect(getUrlForApp('app2')).toBe('/base-path/custom/path');
     });
 
@@ -800,16 +662,6 @@ describe('#start()', () => {
       expect(MockHistory.push).toHaveBeenCalledWith('/custom/path', 'my-state');
     });
 
-    it('redirects when in legacyMode', async () => {
-      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-      service.setup(setupDeps);
-
-      const { navigateToApp } = await service.start(startDeps);
-
-      await navigateToApp('myTestApp');
-      expect(setupDeps.redirectTo).toHaveBeenCalledWith('/base-path/app/myTestApp');
-    });
-
     it('updates currentApp$ after mounting', async () => {
       service.setup(setupDeps);
 
@@ -903,31 +755,6 @@ describe('#start()', () => {
       `);
     });
 
-    it('sets window.location.href when navigating to legacy apps', async () => {
-      setupDeps.http = httpServiceMock.createSetupContract({ basePath: '/test' });
-      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-      service.setup(setupDeps);
-
-      const { navigateToApp } = await service.start(startDeps);
-
-      await navigateToApp('alpha');
-      expect(setupDeps.redirectTo).toHaveBeenCalledWith('/test/app/alpha');
-    });
-
-    it('handles legacy apps with subapps', async () => {
-      setupDeps.http = httpServiceMock.createSetupContract({ basePath: '/test' });
-      setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-
-      const { registerLegacyApp } = service.setup(setupDeps);
-
-      registerLegacyApp(createLegacyApp({ id: 'baseApp:legacyApp1' }));
-
-      const { navigateToApp } = await service.start(startDeps);
-
-      await navigateToApp('baseApp:legacyApp1');
-      expect(setupDeps.redirectTo).toHaveBeenCalledWith('/test/app/baseApp');
-    });
-
     describe('when `replace` option is true', () => {
       it('use `history.replace` instead of `history.push`', async () => {
         service.setup(setupDeps);
@@ -973,16 +800,6 @@ describe('#start()', () => {
           undefined
         );
       });
-      it('do not change the behavior when in legacy mode', async () => {
-        setupDeps.http = httpServiceMock.createSetupContract({ basePath: '/test' });
-        setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(true);
-        service.setup(setupDeps);
-
-        const { navigateToApp } = await service.start(startDeps);
-
-        await navigateToApp('alpha', { replace: true });
-        expect(setupDeps.redirectTo).toHaveBeenCalledWith('/test/app/alpha');
-      });
     });
 
     describe('when `replace` option is false', () => {
@@ -1040,9 +857,7 @@ describe('#stop()', () => {
     setupDeps = {
       http,
       context: contextServiceMock.createSetupContract(),
-      injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
     };
-    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(false);
     startDeps = { http, overlays: overlayServiceMock.createStartContract() };
     service = new ApplicationService();
   });
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index df0f74c1914e9a..0d08f6f3007b02 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -23,7 +23,6 @@ import { map, shareReplay, takeUntil, distinctUntilChanged, filter } from 'rxjs/
 import { createBrowserHistory, History } from 'history';
 
 import { MountPoint } from '../types';
-import { InjectedMetadataSetup } from '../injected_metadata';
 import { HttpSetup, HttpStart } from '../http';
 import { OverlayStart } from '../overlays';
 import { ContextSetup, IContextContainer } from '../context';
@@ -32,7 +31,6 @@ import { AppRouter } from './ui';
 import { Capabilities, CapabilitiesService } from './capabilities';
 import {
   App,
-  AppBase,
   AppLeaveHandler,
   AppMount,
   AppMountDeprecated,
@@ -42,8 +40,6 @@ import {
   AppUpdater,
   InternalApplicationSetup,
   InternalApplicationStart,
-  LegacyApp,
-  LegacyAppMounter,
   Mounter,
   NavigateToAppOptions,
 } from './types';
@@ -53,9 +49,8 @@ import { appendAppPath, parseAppUrl, relativeToAbsolute, getAppInfo } from './ut
 interface SetupDeps {
   context: ContextSetup;
   http: HttpSetup;
-  injectedMetadata: InjectedMetadataSetup;
   history?: History<any>;
-  /** Used to redirect to external urls (and legacy apps) */
+  /** Used to redirect to external urls */
   redirectTo?: (path: string) => void;
 }
 
@@ -101,7 +96,7 @@ interface AppInternalState {
  * @internal
  */
 export class ApplicationService {
-  private readonly apps = new Map<string, App<any> | LegacyApp>();
+  private readonly apps = new Map<string, App<any>>();
   private readonly mounters = new Map<string, Mounter>();
   private readonly capabilities = new CapabilitiesService();
   private readonly appInternalStates = new Map<string, AppInternalState>();
@@ -119,28 +114,17 @@ export class ApplicationService {
   public setup({
     context,
     http: { basePath },
-    injectedMetadata,
     redirectTo = (path: string) => {
       window.location.assign(path);
     },
     history,
   }: SetupDeps): InternalApplicationSetup {
     const basename = basePath.get();
-    if (injectedMetadata.getLegacyMode()) {
-      this.currentAppId$.next(injectedMetadata.getLegacyMetadata().app.id);
-    } else {
-      // Only setup history if we're not in legacy mode
-      this.history = history || createBrowserHistory({ basename });
-    }
+    this.history = history || createBrowserHistory({ basename });
 
     this.navigate = (url, state, replace) => {
-      if (this.history) {
-        // basePath not needed here because `history` is configured with basename
-        return replace ? this.history.replace(url, state) : this.history.push(url, state);
-      } else {
-        // If we do not have history available (legacy mode), use redirectTo to do a full page refresh.
-        return redirectTo(basePath.prepend(url));
-      }
+      // basePath not needed here because `history` is configured with basename
+      return replace ? this.history!.replace(url, state) : this.history!.push(url, state);
     };
 
     this.redirectTo = redirectTo;
@@ -200,7 +184,6 @@ export class ApplicationService {
           ...appProps,
           status: app.status ?? AppStatus.accessible,
           navLinkStatus: app.navLinkStatus ?? AppNavLinkStatus.default,
-          legacy: false,
         });
         if (updater$) {
           registerStatusUpdater(app.id, updater$);
@@ -211,43 +194,6 @@ export class ApplicationService {
           exactRoute: app.exactRoute ?? false,
           mount: wrapMount(plugin, app),
           unmountBeforeMounting: false,
-          legacy: false,
-        });
-      },
-      registerLegacyApp: (app) => {
-        const appRoute = `/app/${app.id.split(':')[0]}`;
-
-        if (this.registrationClosed) {
-          throw new Error('Applications cannot be registered after "setup"');
-        } else if (this.apps.has(app.id)) {
-          throw new Error(`An application is already registered with the id "${app.id}"`);
-        } else if (basename && appRoute!.startsWith(`${basename}/`)) {
-          throw new Error('Cannot register an application route that includes HTTP base path');
-        }
-
-        const appBasePath = basePath.prepend(appRoute);
-        const mount: LegacyAppMounter = ({ history: appHistory }) => {
-          redirectTo(appHistory.createHref(appHistory.location));
-          window.location.reload();
-        };
-
-        const { updater$, ...appProps } = app;
-        this.apps.set(app.id, {
-          ...appProps,
-          status: app.status ?? AppStatus.accessible,
-          navLinkStatus: app.navLinkStatus ?? AppNavLinkStatus.default,
-          legacy: true,
-        });
-        if (updater$) {
-          registerStatusUpdater(app.id, updater$);
-        }
-        this.mounters.set(app.id, {
-          appRoute,
-          appBasePath,
-          exactRoute: false,
-          mount,
-          unmountBeforeMounting: true,
-          legacy: true,
         });
       },
       registerAppUpdater: (appUpdater$: Observable<AppUpdater>) =>
@@ -323,7 +269,7 @@ export class ApplicationService {
         distinctUntilChanged(),
         takeUntil(this.stop$)
       ),
-      history: this.history,
+      history: this.history!,
       registerMountContext: this.mountContext.registerContext,
       getUrlForApp: (
         appId,
@@ -421,7 +367,7 @@ export class ApplicationService {
   }
 }
 
-const updateStatus = <T extends AppBase>(app: T, statusUpdaters: AppUpdaterWrapper[]): T => {
+const updateStatus = (app: App, statusUpdaters: AppUpdaterWrapper[]): App => {
   let changes: Partial<AppUpdatableFields> = {};
   statusUpdaters.forEach((wrapper) => {
     if (wrapper.application !== allApplicationsFilter && wrapper.application !== app.id) {
diff --git a/src/core/public/application/index.ts b/src/core/public/application/index.ts
index 121f0c7ac07d67..4f3b113a29c9b1 100644
--- a/src/core/public/application/index.ts
+++ b/src/core/public/application/index.ts
@@ -22,7 +22,6 @@ export { Capabilities } from './capabilities';
 export { ScopedHistory } from './scoped_history';
 export {
   App,
-  AppBase,
   AppMount,
   AppMountDeprecated,
   AppUnmount,
@@ -39,10 +38,8 @@ export {
   AppLeaveAction,
   AppLeaveDefaultAction,
   AppLeaveConfirmAction,
-  LegacyApp,
   NavigateToAppOptions,
   PublicAppInfo,
-  PublicLegacyAppInfo,
   // Internal types
   InternalApplicationSetup,
   InternalApplicationStart,
diff --git a/src/core/public/application/integration_tests/application_service.test.tsx b/src/core/public/application/integration_tests/application_service.test.tsx
index 9eafddd6a61fed..d28486928b7e24 100644
--- a/src/core/public/application/integration_tests/application_service.test.tsx
+++ b/src/core/public/application/integration_tests/application_service.test.tsx
@@ -25,11 +25,9 @@ import { createRenderer } from './utils';
 import { ApplicationService } from '../application_service';
 import { httpServiceMock } from '../../http/http_service.mock';
 import { contextServiceMock } from '../../context/context_service.mock';
-import { injectedMetadataServiceMock } from '../../injected_metadata/injected_metadata_service.mock';
 import { MockLifecycle } from '../test_types';
 import { overlayServiceMock } from '../../overlays/overlay_service.mock';
 import { AppMountParameters } from '../types';
-import { ScopedHistory } from '../scoped_history';
 import { Observable } from 'rxjs';
 import { MountPoint } from 'kibana/public';
 
@@ -56,10 +54,8 @@ describe('ApplicationService', () => {
     setupDeps = {
       http,
       context: contextServiceMock.createSetupContract(),
-      injectedMetadata: injectedMetadataServiceMock.createSetupContract(),
       history: history as any,
     };
-    setupDeps.injectedMetadata.getLegacyMode.mockReturnValue(false);
     startDeps = { http, overlays: overlayServiceMock.createStartContract() };
     service = new ApplicationService();
   });
@@ -149,54 +145,6 @@ describe('ApplicationService', () => {
     });
   });
 
-  describe('redirects', () => {
-    beforeAll(() => {
-      Object.defineProperty(window, 'location', {
-        value: {
-          reload: jest.fn(),
-        },
-      });
-    });
-
-    it('to full path when navigating to legacy app', async () => {
-      const redirectTo = jest.fn();
-
-      // In the real application, we use a BrowserHistory instance configured with `basename`. However, in tests we must
-      // use MemoryHistory which does not support `basename`. In order to emulate this behavior, we will wrap this
-      // instance with a ScopedHistory configured with a basepath.
-      history.push(setupDeps.http.basePath.get()); // ScopedHistory constructor will fail if underlying history is not currently at basePath.
-      const { register, registerLegacyApp } = service.setup({
-        ...setupDeps,
-        redirectTo,
-        history: new ScopedHistory(history, setupDeps.http.basePath.get()),
-      });
-
-      register(Symbol(), {
-        id: 'app1',
-        title: 'App1',
-        mount: ({ onAppLeave }: AppMountParameters) => {
-          onAppLeave((actions) => actions.default());
-          return () => undefined;
-        },
-      });
-      registerLegacyApp({
-        id: 'myLegacyTestApp',
-        appUrl: '/app/myLegacyTestApp',
-        title: 'My Legacy Test App',
-      });
-
-      const { navigateToApp, getComponent } = await service.start(startDeps);
-
-      update = createRenderer(getComponent());
-
-      await navigate('/test/app/app1');
-      await act(() => navigateToApp('myLegacyTestApp', { path: '#/some-path' }));
-
-      expect(redirectTo).toHaveBeenCalledWith('/test/app/myLegacyTestApp#/some-path');
-      expect(window.location.reload).toHaveBeenCalled();
-    });
-  });
-
   describe('leaving an application that registered an app leave handler', () => {
     it('navigates to the new app if action is default', async () => {
       startDeps.overlays.openConfirm.mockResolvedValue(true);
diff --git a/src/core/public/application/integration_tests/router.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
index 6408b8123365e4..e3f992990f9f95 100644
--- a/src/core/public/application/integration_tests/router.test.tsx
+++ b/src/core/public/application/integration_tests/router.test.tsx
@@ -22,13 +22,12 @@ import { BehaviorSubject } from 'rxjs';
 import { createMemoryHistory, History, createHashHistory } from 'history';
 
 import { AppRouter, AppNotFound } from '../ui';
-import { EitherApp, MockedMounterMap, MockedMounterTuple } from '../test_types';
-import { createRenderer, createAppMounter, createLegacyAppMounter, getUnmounter } from './utils';
+import { MockedMounterMap, MockedMounterTuple } from '../test_types';
+import { createRenderer, createAppMounter, getUnmounter } from './utils';
 import { AppStatus } from '../types';
-import { ScopedHistory } from '../scoped_history';
 
 describe('AppRouter', () => {
-  let mounters: MockedMounterMap<EitherApp>;
+  let mounters: MockedMounterMap;
   let globalHistory: History;
   let update: ReturnType<typeof createRenderer>;
   let scopedAppHistory: History;
@@ -67,9 +66,7 @@ describe('AppRouter', () => {
   beforeEach(() => {
     mounters = new Map([
       createAppMounter({ appId: 'app1', html: '<span>App 1</span>' }),
-      createLegacyAppMounter('legacyApp1', jest.fn()),
       createAppMounter({ appId: 'app2', html: '<div>App 2</div>' }),
-      createLegacyAppMounter('baseApp:legacyApp2', jest.fn()),
       createAppMounter({
         appId: 'app3',
         html: '<div>Chromeless A</div>',
@@ -81,7 +78,6 @@ describe('AppRouter', () => {
         appRoute: '/chromeless-b/path',
       }),
       createAppMounter({ appId: 'disabledApp', html: '<div>Disabled app</div>' }),
-      createLegacyAppMounter('disabledLegacyApp', jest.fn()),
       createAppMounter({
         appId: 'scopedApp',
         extraMountHook: ({ history }) => {
@@ -99,7 +95,7 @@ describe('AppRouter', () => {
         html: '<div>App 6</div>',
         appRoute: '/app/my-app/app6',
       }),
-    ] as Array<MockedMounterTuple<EitherApp>>);
+    ] as MockedMounterTuple[]);
     globalHistory = createMemoryHistory();
     update = createMountersRenderer();
   });
@@ -384,26 +380,6 @@ describe('AppRouter', () => {
     expect(globalHistory.location.pathname).toEqual('/app/scopedApp/subpath');
   });
 
-  it('calls legacy mount handler', async () => {
-    await navigate('/app/legacyApp1');
-    expect(mounters.get('legacyApp1')!.mounter.mount.mock.calls[0][0]).toMatchObject({
-      appBasePath: '/app/legacyApp1',
-      element: expect.any(HTMLDivElement),
-      onAppLeave: expect.any(Function),
-      history: expect.any(ScopedHistory),
-    });
-  });
-
-  it('handles legacy apps with subapps', async () => {
-    await navigate('/app/baseApp');
-    expect(mounters.get('baseApp:legacyApp2')!.mounter.mount.mock.calls[0][0]).toMatchObject({
-      appBasePath: '/app/baseApp',
-      element: expect.any(HTMLDivElement),
-      onAppLeave: expect.any(Function),
-      history: expect.any(ScopedHistory),
-    });
-  });
-
   it('displays error page if no app is found', async () => {
     const dom = await navigate('/app/unknown');
 
@@ -415,10 +391,4 @@ describe('AppRouter', () => {
 
     expect(dom?.exists(AppNotFound)).toBe(true);
   });
-
-  it('displays error page if legacy app is inaccessible', async () => {
-    const dom = await navigate('/app/disabledLegacyApp');
-
-    expect(dom?.exists(AppNotFound)).toBe(true);
-  });
 });
diff --git a/src/core/public/application/integration_tests/utils.tsx b/src/core/public/application/integration_tests/utils.tsx
index 80a7fc2c2cad60..2ed9e0c495fb90 100644
--- a/src/core/public/application/integration_tests/utils.tsx
+++ b/src/core/public/application/integration_tests/utils.tsx
@@ -20,11 +20,10 @@
 import React, { ReactElement } from 'react';
 import { act } from 'react-dom/test-utils';
 import { mount } from 'enzyme';
-
 import { I18nProvider } from '@kbn/i18n/react';
 
-import { App, LegacyApp, AppMountParameters } from '../types';
-import { EitherApp, MockedMounter, MockedMounterTuple, Mountable } from '../test_types';
+import { AppMountParameters } from '../types';
+import { MockedMounterTuple, Mountable } from '../test_types';
 
 type Dom = ReturnType<typeof mount> | null;
 type Renderer = () => Dom | Promise<Dom>;
@@ -55,7 +54,7 @@ export const createAppMounter = ({
   appRoute?: string;
   exactRoute?: boolean;
   extraMountHook?: (params: AppMountParameters) => void;
-}): MockedMounterTuple<App> => {
+}): MockedMounterTuple => {
   const unmount = jest.fn();
   return [
     appId,
@@ -63,7 +62,6 @@ export const createAppMounter = ({
       mounter: {
         appRoute,
         appBasePath: appRoute,
-        legacy: false,
         exactRoute,
         mount: jest.fn(async (params: AppMountParameters) => {
           const { appBasePath: basename, element } = params;
@@ -82,24 +80,6 @@ export const createAppMounter = ({
   ];
 };
 
-export const createLegacyAppMounter = (
-  appId: string,
-  legacyMount: MockedMounter<LegacyApp>['mount']
-): MockedMounterTuple<LegacyApp> => [
-  appId,
-  {
-    mounter: {
-      appRoute: `/app/${appId.split(':')[0]}`,
-      appBasePath: `/app/${appId.split(':')[0]}`,
-      unmountBeforeMounting: true,
-      legacy: true,
-      exactRoute: false,
-      mount: legacyMount,
-    },
-    unmount: jest.fn(),
-  },
-];
-
-export function getUnmounter(app: Mountable<EitherApp>) {
+export function getUnmounter(app: Mountable) {
   return app.mounter.mount.mock.results[0].value;
 }
diff --git a/src/core/public/application/test_types.ts b/src/core/public/application/test_types.ts
index b822597e510cb9..64012f0c0b6c15 100644
--- a/src/core/public/application/test_types.ts
+++ b/src/core/public/application/test_types.ts
@@ -17,28 +17,26 @@
  * under the License.
  */
 
-import { App, LegacyApp, Mounter, AppUnmount } from './types';
+import { AppUnmount, Mounter } from './types';
 import { ApplicationService } from './application_service';
 
 /** @internal */
 export type ApplicationServiceContract = PublicMethodsOf<ApplicationService>;
 /** @internal */
-export type EitherApp = App | LegacyApp;
-/** @internal */
 export type MockedUnmount = jest.Mocked<AppUnmount>;
 
 /** @internal */
-export interface Mountable<T extends EitherApp> {
-  mounter: MockedMounter<T>;
+export interface Mountable {
+  mounter: MockedMounter;
   unmount: MockedUnmount;
 }
 
 /** @internal */
-export type MockedMounter<T extends EitherApp> = jest.Mocked<Mounter<jest.Mocked<T>>>;
+export type MockedMounter = jest.Mocked<Mounter>;
 /** @internal */
-export type MockedMounterTuple<T extends EitherApp> = [string, Mountable<T>];
+export type MockedMounterTuple = [string, Mountable];
 /** @internal */
-export type MockedMounterMap<T extends EitherApp> = Map<string, Mountable<T>>;
+export type MockedMounterMap = Map<string, Mountable>;
 /** @internal */
 export type MockLifecycle<
   T extends keyof ApplicationService,
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index 320416a8c2379a..df83b6e932aad9 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -36,8 +36,64 @@ import { SavedObjectsStart } from '../saved_objects';
 import { AppCategory } from '../../types';
 import { ScopedHistory } from './scoped_history';
 
-/** @public */
-export interface AppBase {
+/**
+ * Accessibility status of an application.
+ *
+ * @public
+ */
+export enum AppStatus {
+  /**
+   * Application is accessible.
+   */
+  accessible = 0,
+  /**
+   * Application is not accessible.
+   */
+  inaccessible = 1,
+}
+
+/**
+ * Status of the application's navLink.
+ *
+ * @public
+ */
+export enum AppNavLinkStatus {
+  /**
+   * The application navLink will be `visible` if the application's {@link AppStatus} is set to `accessible`
+   * and `hidden` if the application status is set to `inaccessible`.
+   */
+  default = 0,
+  /**
+   * The application navLink is visible and clickable in the navigation bar.
+   */
+  visible = 1,
+  /**
+   * The application navLink is visible but inactive and not clickable in the navigation bar.
+   */
+  disabled = 2,
+  /**
+   * The application navLink does not appear in the navigation bar.
+   */
+  hidden = 3,
+}
+
+/**
+ * Defines the list of fields that can be updated via an {@link AppUpdater}.
+ * @public
+ */
+export type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'>;
+
+/**
+ * Updater for applications.
+ * see {@link ApplicationSetup}
+ * @public
+ */
+export type AppUpdater = (app: App) => Partial<AppUpdatableFields> | undefined;
+
+/**
+ * @public
+ */
+export interface App<HistoryLocationState = unknown> {
   /**
    * The unique identifier of the application
    */
@@ -136,83 +192,12 @@ export interface AppBase {
    */
   capabilities?: Partial<Capabilities>;
 
-  /**
-   * Flag to keep track of legacy applications.
-   * For internal use only. any value will be overridden when registering an App.
-   *
-   * @internal
-   */
-  legacy?: boolean;
-
   /**
    * Hide the UI chrome when the application is mounted. Defaults to `false`.
    * Takes precedence over chrome service visibility settings.
    */
   chromeless?: boolean;
-}
 
-/**
- * Accessibility status of an application.
- *
- * @public
- */
-export enum AppStatus {
-  /**
-   * Application is accessible.
-   */
-  accessible = 0,
-  /**
-   * Application is not accessible.
-   */
-  inaccessible = 1,
-}
-
-/**
- * Status of the application's navLink.
- *
- * @public
- */
-export enum AppNavLinkStatus {
-  /**
-   * The application navLink will be `visible` if the application's {@link AppStatus} is set to `accessible`
-   * and `hidden` if the application status is set to `inaccessible`.
-   */
-  default = 0,
-  /**
-   * The application navLink is visible and clickable in the navigation bar.
-   */
-  visible = 1,
-  /**
-   * The application navLink is visible but inactive and not clickable in the navigation bar.
-   */
-  disabled = 2,
-  /**
-   * The application navLink does not appear in the navigation bar.
-   */
-  hidden = 3,
-}
-
-/**
- * Defines the list of fields that can be updated via an {@link AppUpdater}.
- * @public
- */
-export type AppUpdatableFields = Pick<
-  AppBase,
-  'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'
->;
-
-/**
- * Updater for applications.
- * see {@link ApplicationSetup}
- * @public
- */
-export type AppUpdater = (app: AppBase) => Partial<AppUpdatableFields> | undefined;
-
-/**
- * Extension of {@link AppBase | common app properties} with the mount function.
- * @public
- */
-export interface App<HistoryLocationState = unknown> extends AppBase {
   /**
    * A mount function called when the user navigates to this app's route. May have signature of {@link AppMount} or
    * {@link AppMountDeprecated}.
@@ -223,12 +208,6 @@ export interface App<HistoryLocationState = unknown> extends AppBase {
    */
   mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>;
 
-  /**
-   * Hide the UI chrome when the application is mounted. Defaults to `false`.
-   * Takes precedence over chrome service visibility settings.
-   */
-  chromeless?: boolean;
-
   /**
    * Override the application's routing path from `/app/${id}`.
    * Must be unique across registered applications. Should not include the
@@ -255,39 +234,18 @@ export interface App<HistoryLocationState = unknown> extends AppBase {
   exactRoute?: boolean;
 }
 
-/** @public */
-export interface LegacyApp extends AppBase {
-  appUrl: string;
-  subUrlBase?: string;
-  linkToLastSubUrl?: boolean;
-  disableSubUrlTracking?: boolean;
-}
-
 /**
  * Public information about a registered {@link App | application}
  *
  * @public
  */
 export type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
-  legacy: false;
   // remove optional on fields populated with default values
   status: AppStatus;
   navLinkStatus: AppNavLinkStatus;
   appRoute: string;
 };
 
-/**
- * Information about a registered {@link LegacyApp | legacy application}
- *
- * @public
- */
-export type PublicLegacyAppInfo = Omit<LegacyApp, 'updater$'> & {
-  legacy: true;
-  // remove optional on fields populated with default values
-  status: AppStatus;
-  navLinkStatus: AppNavLinkStatus;
-};
-
 /**
  * A mount function called when the user navigates to this app's route.
  *
@@ -300,6 +258,12 @@ export type AppMount<HistoryLocationState = unknown> = (
   params: AppMountParameters<HistoryLocationState>
 ) => AppUnmount | Promise<AppUnmount>;
 
+/**
+ * A function called when an application should be unmounted from the page. This function should be synchronous.
+ * @public
+ */
+export type AppUnmount = () => void;
+
 /**
  * A mount function called when the user navigates to this app's route.
  *
@@ -607,30 +571,14 @@ export interface AppLeaveActionFactory {
   default(): AppLeaveDefaultAction;
 }
 
-/**
- * A function called when an application should be unmounted from the page. This function should be synchronous.
- * @public
- */
-export type AppUnmount = () => void;
-
-/** @internal */
-export type AppMounter = (params: AppMountParameters) => Promise<AppUnmount>;
-
-/** @internal */
-export type LegacyAppMounter = (params: AppMountParameters) => void;
-
 /** @internal */
-export type Mounter<T = App | LegacyApp> = SelectivePartial<
-  {
-    appRoute: string;
-    appBasePath: string;
-    mount: T extends LegacyApp ? LegacyAppMounter : AppMounter;
-    legacy: boolean;
-    exactRoute: boolean;
-    unmountBeforeMounting: T extends LegacyApp ? true : boolean;
-  },
-  T extends LegacyApp ? never : 'unmountBeforeMounting'
->;
+export interface Mounter {
+  appRoute: string;
+  appBasePath: string;
+  mount: AppMount;
+  exactRoute: boolean;
+  unmountBeforeMounting?: boolean;
+}
 
 /** @internal */
 export interface ParsedAppUrl {
@@ -702,13 +650,6 @@ export interface InternalApplicationSetup extends Pick<ApplicationSetup, 'regist
     app: App<HistoryLocationState>
   ): void;
 
-  /**
-   * Register metadata about legacy applications. Legacy apps will not be mounted when navigated to.
-   * @param app
-   * @internal
-   */
-  registerLegacyApp(app: LegacyApp): void;
-
   /**
    * Register a context provider for application mounting. Will only be available to applications that depend on the
    * plugin that registered this context. Deprecated, use {@link CoreSetup.getStartServices}.
@@ -731,7 +672,7 @@ export interface InternalApplicationSetup extends Pick<ApplicationSetup, 'regist
 export interface NavigateToAppOptions {
   /**
    * optional path inside application to deep link to.
-   * If undefined, will use {@link AppBase.defaultPath | the app's default path}` as default.
+   * If undefined, will use {@link App.defaultPath | the app's default path}` as default.
    */
   path?: string;
   /**
@@ -740,9 +681,6 @@ export interface NavigateToAppOptions {
   state?: unknown;
   /**
    * if true, will not create a new history entry when navigating (using `replace` instead of `push`)
-   *
-   * @remarks
-   * This option not be used when navigating from and/or to legacy applications.
    */
   replace?: boolean;
 }
@@ -761,7 +699,7 @@ export interface ApplicationStart {
    * Applications disabled by {@link Capabilities} will not be present in the map. Applications manually disabled from
    * the client-side using an {@link AppUpdater | application updater} are present, with their status properly set as `inaccessible`.
    */
-  applications$: Observable<ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo>>;
+  applications$: Observable<ReadonlyMap<string, PublicAppInfo>>;
 
   /**
    * Navigate to a given app
@@ -861,14 +799,8 @@ export interface InternalApplicationStart extends Omit<ApplicationStart, 'regist
   currentActionMenu$: Observable<MountPoint | undefined>;
 
   /**
-   * The global history instance, exposed only to Core. Undefined when rendering a legacy application.
+   * The global history instance, exposed only to Core.
    * @internal
    */
-  history: History<unknown> | undefined;
+  history: History<unknown>;
 }
-
-/** @internal */
-type SelectivePartial<T, K extends keyof T> = Partial<Pick<T, K>> &
-  Required<Pick<T, Exclude<keyof T, K>>> extends infer U
-  ? { [P in keyof U]: U[P] }
-  : never;
diff --git a/src/core/public/application/ui/app_container.test.tsx b/src/core/public/application/ui/app_container.test.tsx
index e26fe7e59fd040..f6cde54e6f5025 100644
--- a/src/core/public/application/ui/app_container.test.tsx
+++ b/src/core/public/application/ui/app_container.test.tsx
@@ -55,7 +55,6 @@ describe('AppContainer', () => {
     appBasePath: '/base-path',
     appRoute: '/some-route',
     unmountBeforeMounting: false,
-    legacy: false,
     exactRoute: false,
     mount: async ({ element }: AppMountParameters) => {
       await promise;
@@ -146,7 +145,6 @@ describe('AppContainer', () => {
       appBasePath: '/base-path/some-route',
       appRoute: '/some-route',
       unmountBeforeMounting: false,
-      legacy: false,
       exactRoute: false,
       mount: async ({ element }: AppMountParameters) => {
         await waitPromise;
diff --git a/src/core/public/application/ui/app_router.tsx b/src/core/public/application/ui/app_router.tsx
index 5021dd3ae765ab..42bc9a53aee2dd 100644
--- a/src/core/public/application/ui/app_router.tsx
+++ b/src/core/public/application/ui/app_router.tsx
@@ -58,25 +58,21 @@ export const AppRouter: FunctionComponent<Props> = ({
   return (
     <Router history={history}>
       <Switch>
-        {[...mounters]
-          // legacy apps can have multiple sub-apps registered with the same route
-          // which needs additional logic that is handled in the catch-all route below
-          .filter(([_, mounter]) => !mounter.legacy)
-          .map(([appId, mounter]) => (
-            <Route
-              key={mounter.appRoute}
-              path={mounter.appRoute}
-              exact={mounter.exactRoute}
-              render={({ match: { path } }) => (
-                <AppContainer
-                  appPath={path}
-                  appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
-                  createScopedHistory={createScopedHistory}
-                  {...{ appId, mounter, setAppLeaveHandler, setAppActionMenu, setIsMounting }}
-                />
-              )}
-            />
-          ))}
+        {[...mounters].map(([appId, mounter]) => (
+          <Route
+            key={mounter.appRoute}
+            path={mounter.appRoute}
+            exact={mounter.exactRoute}
+            render={({ match: { path } }) => (
+              <AppContainer
+                appPath={path}
+                appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
+                createScopedHistory={createScopedHistory}
+                {...{ appId, mounter, setAppLeaveHandler, setAppActionMenu, setIsMounting }}
+              />
+            )}
+          />
+        ))}
         {/* handler for legacy apps and used as a catch-all to display 404 page on not existing /app/appId apps*/}
         <Route
           path="/app/:appId"
@@ -86,16 +82,13 @@ export const AppRouter: FunctionComponent<Props> = ({
               url,
             },
           }: RouteComponentProps<Params>) => {
-            // Find the mounter including legacy mounters with subapps:
-            const [id, mounter] = mounters.has(appId)
-              ? [appId, mounters.get(appId)]
-              : [...mounters].filter(([key]) => key.split(':')[0] === appId)[0] ?? [];
-
+            // the id/mounter retrieval can be removed once #76348 is addressed
+            const [id, mounter] = mounters.has(appId) ? [appId, mounters.get(appId)] : [];
             return (
               <AppContainer
                 appPath={url}
-                appId={id}
-                appStatus={appStatuses.get(id) ?? AppStatus.inaccessible}
+                appId={id ?? appId}
+                appStatus={appStatuses.get(appId) ?? AppStatus.inaccessible}
                 createScopedHistory={createScopedHistory}
                 {...{ mounter, setAppLeaveHandler, setAppActionMenu, setIsMounting }}
               />
diff --git a/src/core/public/application/utils.test.ts b/src/core/public/application/utils.test.ts
index 4663ca2db21e70..ee1d82a7a872e1 100644
--- a/src/core/public/application/utils.test.ts
+++ b/src/core/public/application/utils.test.ts
@@ -18,16 +18,9 @@
  */
 
 import { of } from 'rxjs';
-import { App, AppNavLinkStatus, AppStatus, LegacyApp } from './types';
+import { App, AppNavLinkStatus, AppStatus } from './types';
 import { BasePath } from '../http/base_path';
-import {
-  appendAppPath,
-  getAppInfo,
-  isLegacyApp,
-  parseAppUrl,
-  relativeToAbsolute,
-  removeSlashes,
-} from './utils';
+import { appendAppPath, getAppInfo, parseAppUrl, relativeToAbsolute, removeSlashes } from './utils';
 
 describe('removeSlashes', () => {
   it('only removes duplicates by default', () => {
@@ -70,9 +63,11 @@ describe('appendAppPath', () => {
     expect(appendAppPath('/app/my-app', '')).toEqual('/app/my-app');
   });
 
-  it('preserves the trailing slash only if included in the hash', () => {
+  it('preserves the trailing slash only if included in the hash or appPath', () => {
     expect(appendAppPath('/app/my-app', '/some-path/')).toEqual('/app/my-app/some-path');
     expect(appendAppPath('/app/my-app', '/some-path#/')).toEqual('/app/my-app/some-path#/');
+    expect(appendAppPath('/app/my-app#/', '')).toEqual('/app/my-app#/');
+    expect(appendAppPath('/app/my-app#', '/')).toEqual('/app/my-app#/');
     expect(appendAppPath('/app/my-app', '/some-path#/hash/')).toEqual(
       '/app/my-app/some-path#/hash/'
     );
@@ -80,29 +75,6 @@ describe('appendAppPath', () => {
   });
 });
 
-describe('isLegacyApp', () => {
-  it('returns true for legacy apps', () => {
-    expect(
-      isLegacyApp({
-        id: 'legacy',
-        title: 'Legacy App',
-        appUrl: '/some-url',
-        legacy: true,
-      })
-    ).toEqual(true);
-  });
-  it('returns false for non-legacy apps', () => {
-    expect(
-      isLegacyApp({
-        id: 'legacy',
-        title: 'Legacy App',
-        mount: () => () => undefined,
-        legacy: false,
-      })
-    ).toEqual(false);
-  });
-});
-
 describe('relativeToAbsolute', () => {
   it('converts a relative path to an absolute url', () => {
     const origin = window.location.origin;
@@ -113,7 +85,7 @@ describe('relativeToAbsolute', () => {
 });
 
 describe('parseAppUrl', () => {
-  let apps: Map<string, App<any> | LegacyApp>;
+  let apps: Map<string, App<any>>;
   let basePath: BasePath;
 
   const getOrigin = () => 'https://kibana.local:8080';
@@ -124,19 +96,6 @@ describe('parseAppUrl', () => {
       title: 'some-title',
       mount: () => () => undefined,
       ...props,
-      legacy: false,
-    };
-    apps.set(app.id, app);
-    return app;
-  };
-
-  const createLegacyApp = (props: Partial<LegacyApp>): LegacyApp => {
-    const app: LegacyApp = {
-      id: 'some-id',
-      title: 'some-title',
-      appUrl: '/my-url',
-      ...props,
-      legacy: true,
     };
     apps.set(app.id, app);
     return app;
@@ -153,10 +112,6 @@ describe('parseAppUrl', () => {
       id: 'bar',
       appRoute: '/custom-bar',
     });
-    createLegacyApp({
-      id: 'legacy',
-      appUrl: '/app/legacy',
-    });
   });
 
   describe('with relative paths', () => {
@@ -236,18 +191,6 @@ describe('parseAppUrl', () => {
         path: '/path#hash/bang?hello=dolly',
       });
     });
-    it('works with legacy apps', () => {
-      expect(parseAppUrl('/base-path/app/legacy', basePath, apps, getOrigin)).toEqual({
-        app: 'legacy',
-        path: undefined,
-      });
-      expect(
-        parseAppUrl('/base-path/app/legacy/path#hash?query=bar', basePath, apps, getOrigin)
-      ).toEqual({
-        app: 'legacy',
-        path: '/path#hash?query=bar',
-      });
-    });
     it('returns undefined when the app is not known', () => {
       expect(parseAppUrl('/base-path/app/non-registered', basePath, apps, getOrigin)).toEqual(
         undefined
@@ -409,25 +352,6 @@ describe('parseAppUrl', () => {
         path: '/path#hash/bang?hello=dolly',
       });
     });
-    it('works with legacy apps', () => {
-      expect(
-        parseAppUrl('https://kibana.local:8080/base-path/app/legacy', basePath, apps, getOrigin)
-      ).toEqual({
-        app: 'legacy',
-        path: undefined,
-      });
-      expect(
-        parseAppUrl(
-          'https://kibana.local:8080/base-path/app/legacy/path#hash?query=bar',
-          basePath,
-          apps,
-          getOrigin
-        )
-      ).toEqual({
-        app: 'legacy',
-        path: '/path#hash?query=bar',
-      });
-    });
     it('returns undefined when the app is not known', () => {
       expect(
         parseAppUrl(
@@ -471,18 +395,6 @@ describe('getAppInfo', () => {
     status: AppStatus.accessible,
     navLinkStatus: AppNavLinkStatus.default,
     appRoute: `/app/some-id`,
-    legacy: false,
-    ...props,
-  });
-
-  const createLegacyApp = (props: Partial<LegacyApp> = {}): LegacyApp => ({
-    appUrl: '/my-app-url',
-    updater$: of(() => undefined),
-    id: 'some-id',
-    title: 'some-title',
-    status: AppStatus.accessible,
-    navLinkStatus: AppNavLinkStatus.default,
-    legacy: true,
     ...props,
   });
 
@@ -496,21 +408,6 @@ describe('getAppInfo', () => {
       status: AppStatus.accessible,
       navLinkStatus: AppNavLinkStatus.visible,
       appRoute: `/app/some-id`,
-      legacy: false,
-    });
-  });
-
-  it('converts a legacy application and remove sensitive properties', () => {
-    const app = createLegacyApp();
-    const info = getAppInfo(app);
-
-    expect(info).toEqual({
-      appUrl: '/my-app-url',
-      id: 'some-id',
-      title: 'some-title',
-      status: AppStatus.accessible,
-      navLinkStatus: AppNavLinkStatus.visible,
-      legacy: true,
     });
   });
 
diff --git a/src/core/public/application/utils.ts b/src/core/public/application/utils.ts
index c5ed7b659f3aeb..85760526bf5442 100644
--- a/src/core/public/application/utils.ts
+++ b/src/core/public/application/utils.ts
@@ -18,15 +18,7 @@
  */
 
 import { IBasePath } from '../http';
-import {
-  App,
-  AppNavLinkStatus,
-  AppStatus,
-  LegacyApp,
-  ParsedAppUrl,
-  PublicAppInfo,
-  PublicLegacyAppInfo,
-} from './types';
+import { App, AppNavLinkStatus, AppStatus, ParsedAppUrl, PublicAppInfo } from './types';
 
 /**
  * Utility to remove trailing, leading or duplicate slashes.
@@ -55,8 +47,8 @@ export const removeSlashes = (
 export const appendAppPath = (appBasePath: string, path: string = '') => {
   // Only prepend slash if not a hash or query path
   path = path === '' || path.startsWith('#') || path.startsWith('?') ? path : `/${path}`;
-  // Do not remove trailing slash when in hashbang
-  const removeTrailing = path.indexOf('#') === -1;
+  // Do not remove trailing slash when in hashbang or basePath
+  const removeTrailing = path.indexOf('#') === -1 && appBasePath.indexOf('#') === -1;
   return removeSlashes(`${appBasePath}${path}`, {
     trailing: removeTrailing,
     duplicates: true,
@@ -64,10 +56,6 @@ export const appendAppPath = (appBasePath: string, path: string = '') => {
   });
 };
 
-export function isLegacyApp(app: App | LegacyApp): app is LegacyApp {
-  return app.legacy === true;
-}
-
 /**
  * Converts a relative path to an absolute url.
  * Implementation is based on a specified behavior of the browser to automatically convert
@@ -95,7 +83,7 @@ export const relativeToAbsolute = (url: string): string => {
 export const parseAppUrl = (
   url: string,
   basePath: IBasePath,
-  apps: Map<string, App<unknown> | LegacyApp>,
+  apps: Map<string, App<unknown>>,
   getOrigin: () => string = () => window.location.origin
 ): ParsedAppUrl | undefined => {
   url = removeBasePath(url, basePath, getOrigin());
@@ -104,7 +92,7 @@ export const parseAppUrl = (
   }
 
   for (const app of apps.values()) {
-    const appPath = isLegacyApp(app) ? app.appUrl : app.appRoute || `/app/${app.id}`;
+    const appPath = app.appRoute || `/app/${app.id}`;
 
     if (url.startsWith(appPath)) {
       const path = url.substr(appPath.length);
@@ -123,29 +111,18 @@ const removeBasePath = (url: string, basePath: IBasePath, origin: string): strin
   return basePath.remove(url);
 };
 
-export function getAppInfo(app: App<unknown> | LegacyApp): PublicAppInfo | PublicLegacyAppInfo {
+export function getAppInfo(app: App<unknown>): PublicAppInfo {
   const navLinkStatus =
     app.navLinkStatus === AppNavLinkStatus.default
       ? app.status === AppStatus.inaccessible
         ? AppNavLinkStatus.hidden
         : AppNavLinkStatus.visible
       : app.navLinkStatus!;
-  if (isLegacyApp(app)) {
-    const { updater$, ...infos } = app;
-    return {
-      ...infos,
-      status: app.status!,
-      navLinkStatus,
-      legacy: true,
-    };
-  } else {
-    const { updater$, mount, ...infos } = app;
-    return {
-      ...infos,
-      status: app.status!,
-      navLinkStatus,
-      appRoute: app.appRoute!,
-      legacy: false,
-    };
-  }
+  const { updater$, mount, ...infos } = app;
+  return {
+    ...infos,
+    status: app.status!,
+    navLinkStatus,
+    appRoute: app.appRoute!,
+  };
 }
diff --git a/src/core/public/chrome/chrome_service.mock.ts b/src/core/public/chrome/chrome_service.mock.ts
index c9a05ff4e08fe1..5862ee7175f717 100644
--- a/src/core/public/chrome/chrome_service.mock.ts
+++ b/src/core/public/chrome/chrome_service.mock.ts
@@ -47,9 +47,6 @@ const createStartContractMock = () => {
     docTitle: {
       change: jest.fn(),
       reset: jest.fn(),
-      __legacy: {
-        setBaseTitle: jest.fn(),
-      },
     },
     navControls: {
       registerLeft: jest.fn(),
diff --git a/src/core/public/chrome/chrome_service.tsx b/src/core/public/chrome/chrome_service.tsx
index ef9a682d609ec6..b96c34cd9fbe84 100644
--- a/src/core/public/chrome/chrome_service.tsx
+++ b/src/core/public/chrome/chrome_service.tsx
@@ -238,7 +238,6 @@ export class ChromeService {
           homeHref={http.basePath.prepend('/app/home')}
           isVisible$={this.isVisible$}
           kibanaVersion={injectedMetadata.getKibanaVersion()}
-          legacyMode={injectedMetadata.getLegacyMode()}
           navLinks$={navLinks.getNavLinks$()}
           recentlyAccessed$={recentlyAccessed.get$()}
           navControlsLeft$={navControls.getLeft$()}
diff --git a/src/core/public/chrome/doc_title/doc_title_service.test.ts b/src/core/public/chrome/doc_title/doc_title_service.test.ts
index 763e8c9ebd74a5..953baf7e7d1d5a 100644
--- a/src/core/public/chrome/doc_title/doc_title_service.test.ts
+++ b/src/core/public/chrome/doc_title/doc_title_service.test.ts
@@ -64,17 +64,4 @@ describe('DocTitleService', () => {
       expect(document.title).toEqual('InitialTitle');
     });
   });
-
-  describe('#__legacy.setBaseTitle()', () => {
-    it('allows to change the baseTitle after startup', async () => {
-      const start = getStart('InitialTitle');
-      start.change('WithInitial');
-      expect(document.title).toEqual('WithInitial - InitialTitle');
-      start.__legacy.setBaseTitle('NewBaseTitle');
-      start.change('WithNew');
-      expect(document.title).toEqual('WithNew - NewBaseTitle');
-      start.reset();
-      expect(document.title).toEqual('NewBaseTitle');
-    });
-  });
 });
diff --git a/src/core/public/chrome/doc_title/doc_title_service.ts b/src/core/public/chrome/doc_title/doc_title_service.ts
index c6e9ec7a40b77d..817a460acaf3fb 100644
--- a/src/core/public/chrome/doc_title/doc_title_service.ts
+++ b/src/core/public/chrome/doc_title/doc_title_service.ts
@@ -59,11 +59,6 @@ export interface ChromeDocTitle {
    * (meaning the one present in the title meta at application load.)
    */
   reset(): void;
-
-  /** @internal */
-  __legacy: {
-    setBaseTitle(baseTitle: string): void;
-  };
 }
 
 const defaultTitle: string[] = [];
@@ -85,11 +80,6 @@ export class DocTitleService {
       reset: () => {
         this.applyTitle(defaultTitle);
       },
-      __legacy: {
-        setBaseTitle: (baseTitle) => {
-          this.baseTitle = baseTitle;
-        },
-      },
     };
   }
 
diff --git a/src/core/public/chrome/nav_links/nav_link.ts b/src/core/public/chrome/nav_links/nav_link.ts
index 55b5c80526babd..4b82e0ced45057 100644
--- a/src/core/public/chrome/nav_links/nav_link.ts
+++ b/src/core/public/chrome/nav_links/nav_link.ts
@@ -74,54 +74,8 @@ export interface ChromeNavLink {
 
   /**
    * Settled state between `url`, `baseUrl`, and `active`
-   *
-   * @internalRemarks
-   * This should be required once legacy apps are gone.
-   */
-  readonly href?: string;
-
-  /** LEGACY FIELDS */
-
-  /**
-   * A url base that legacy apps can set to match deep URLs to an application.
-   *
-   * @internalRemarks
-   * This should be removed once legacy apps are gone.
-   *
-   * @deprecated
    */
-  readonly subUrlBase?: string;
-
-  /**
-   * A flag that tells legacy chrome to ignore the link when
-   * tracking sub-urls
-   *
-   * @internalRemarks
-   * This should be removed once legacy apps are gone.
-   *
-   * @deprecated
-   */
-  readonly disableSubUrlTracking?: boolean;
-
-  /**
-   * Whether or not the subUrl feature should be enabled.
-   *
-   * @internalRemarks
-   * Only read by legacy platform.
-   *
-   * @deprecated
-   */
-  readonly linkToLastSubUrl?: boolean;
-
-  /**
-   * Indicates whether or not this app is currently on the screen.
-   *
-   * @internalRemarks
-   * Remove this when ApplicationService is implemented and managing apps.
-   *
-   * @deprecated
-   */
-  readonly active?: boolean;
+  readonly href: string;
 
   /**
    * Disables a link from being clickable.
@@ -129,30 +83,18 @@ export interface ChromeNavLink {
    * @internalRemarks
    * This is only used by the ML and Graph plugins currently. They use this field
    * to disable the nav link when the license is expired.
-   *
-   * @deprecated
    */
   readonly disabled?: boolean;
 
   /**
    * Hides a link from the navigation.
-   *
-   * @internalRemarks
-   * Remove this when ApplicationService is implemented. Instead, plugins should only
-   * register an Application if needed.
    */
   readonly hidden?: boolean;
-
-  /**
-   * Used to separate links to legacy applications from NP applications
-   * @internal
-   */
-  readonly legacy: boolean;
 }
 
 /** @public */
 export type ChromeNavLinkUpdateableFields = Partial<
-  Pick<ChromeNavLink, 'active' | 'disabled' | 'hidden' | 'url' | 'subUrlBase' | 'href'>
+  Pick<ChromeNavLink, 'disabled' | 'hidden' | 'url' | 'href'>
 >;
 
 export class NavLinkWrapper {
@@ -170,7 +112,7 @@ export class NavLinkWrapper {
 
   public update(newProps: ChromeNavLinkUpdateableFields) {
     // Enforce limited properties at runtime for JS code
-    newProps = pick(newProps, ['active', 'disabled', 'hidden', 'url', 'subUrlBase', 'href']);
+    newProps = pick(newProps, ['disabled', 'hidden', 'url', 'href']);
     return new NavLinkWrapper({ ...this.properties, ...newProps });
   }
 }
diff --git a/src/core/public/chrome/nav_links/nav_links_service.test.ts b/src/core/public/chrome/nav_links/nav_links_service.test.ts
index 8f610e238b0fd8..a8413ed5b546ad 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.test.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.test.ts
@@ -19,7 +19,7 @@
 
 import { NavLinksService } from './nav_links_service';
 import { take, map, takeLast } from 'rxjs/operators';
-import { App, LegacyApp } from '../../application';
+import { App } from '../../application';
 import { BehaviorSubject } from 'rxjs';
 
 const availableApps = new Map([
@@ -34,32 +34,6 @@ const availableApps = new Map([
     },
   ],
   ['chromelessApp', { id: 'chromelessApp', order: 20, title: 'Chromless App', chromeless: true }],
-  [
-    'legacyApp1',
-    {
-      id: 'legacyApp1',
-      order: 5,
-      title: 'Legacy App 1',
-      icon: 'legacyApp1',
-      appUrl: '/app1',
-      legacy: true,
-    },
-  ],
-  [
-    'legacyApp2',
-    {
-      id: 'legacyApp2',
-      order: -10,
-      title: 'Legacy App 2',
-      euiIconType: 'canvasApp',
-      appUrl: '/app2',
-      legacy: true,
-    },
-  ],
-  [
-    'legacyApp3',
-    { id: 'legacyApp3', order: 20, title: 'Legacy App 3', appUrl: '/app3', legacy: true },
-  ],
 ]);
 
 const mockHttp = {
@@ -76,9 +50,7 @@ describe('NavLinksService', () => {
   beforeEach(() => {
     service = new NavLinksService();
     mockAppService = {
-      applications$: new BehaviorSubject<ReadonlyMap<string, App | LegacyApp>>(
-        availableApps as any
-      ),
+      applications$: new BehaviorSubject<ReadonlyMap<string, App>>(availableApps as any),
     };
     start = service.start({ application: mockAppService, http: mockHttp });
   });
@@ -105,19 +77,19 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['app2', 'legacyApp2', 'app1', 'legacyApp1', 'legacyApp3']);
+      ).toEqual(['app2', 'app1']);
     });
 
     it('emits multiple values', async () => {
       const navLinkIds$ = start.getNavLinks$().pipe(map((links) => links.map((l) => l.id)));
       const emittedLinks: string[][] = [];
       navLinkIds$.subscribe((r) => emittedLinks.push(r));
-      start.update('legacyApp1', { active: true });
+      start.update('app1', { href: '/foo' });
 
       service.stop();
       expect(emittedLinks).toEqual([
-        ['app2', 'legacyApp2', 'app1', 'legacyApp1', 'legacyApp3'],
-        ['app2', 'legacyApp2', 'app1', 'legacyApp1', 'legacyApp3'],
+        ['app2', 'app1'],
+        ['app2', 'app1'],
       ]);
     });
 
@@ -130,7 +102,7 @@ describe('NavLinksService', () => {
 
   describe('#get()', () => {
     it('returns link if exists', () => {
-      expect(start.get('legacyApp1')!.title).toEqual('Legacy App 1');
+      expect(start.get('app2')!.title).toEqual('App 2');
     });
 
     it('returns undefined if it does not exist', () => {
@@ -140,19 +112,13 @@ describe('NavLinksService', () => {
 
   describe('#getAll()', () => {
     it('returns a sorted array of navlinks', () => {
-      expect(start.getAll().map((l) => l.id)).toEqual([
-        'app2',
-        'legacyApp2',
-        'app1',
-        'legacyApp1',
-        'legacyApp3',
-      ]);
+      expect(start.getAll().map((l) => l.id)).toEqual(['app2', 'app1']);
     });
   });
 
   describe('#has()', () => {
     it('returns true if exists', () => {
-      expect(start.has('legacyApp1')).toBe(true);
+      expect(start.has('app2')).toBe(true);
     });
 
     it('returns false if it does not exist', () => {
@@ -171,7 +137,7 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['app2', 'legacyApp2', 'app1', 'legacyApp1', 'legacyApp3']);
+      ).toEqual(['app2', 'app1']);
     });
 
     it('does nothing on chromeless applications', async () => {
@@ -184,11 +150,11 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['app2', 'legacyApp2', 'app1', 'legacyApp1', 'legacyApp3']);
+      ).toEqual(['app2', 'app1']);
     });
 
     it('removes all other links', async () => {
-      start.showOnly('legacyApp1');
+      start.showOnly('app2');
       expect(
         await start
           .getNavLinks$()
@@ -197,11 +163,11 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['legacyApp1']);
+      ).toEqual(['app2']);
     });
 
     it('still removes all other links when availableApps are re-emitted', async () => {
-      start.showOnly('legacyApp2');
+      start.showOnly('app2');
       mockAppService.applications$.next(mockAppService.applications$.value);
       expect(
         await start
@@ -211,22 +177,19 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['legacyApp2']);
+      ).toEqual(['app2']);
     });
   });
 
   describe('#update()', () => {
     it('updates the navlinks and returns the updated link', async () => {
-      expect(start.update('legacyApp1', { hidden: true })).toEqual(
+      expect(start.update('app2', { hidden: true })).toEqual(
         expect.objectContaining({
-          appUrl: '/app1',
-          disabled: false,
           hidden: true,
-          icon: 'legacyApp1',
-          id: 'legacyApp1',
-          legacy: true,
-          order: 5,
-          title: 'Legacy App 1',
+          id: 'app2',
+          order: -10,
+          title: 'App 2',
+          euiIconType: 'canvasApp',
         })
       );
       const hiddenLinkIds = await start
@@ -236,7 +199,7 @@ describe('NavLinksService', () => {
           map((links) => links.filter((l) => l.hidden).map((l) => l.id))
         )
         .toPromise();
-      expect(hiddenLinkIds).toEqual(['legacyApp1']);
+      expect(hiddenLinkIds).toEqual(['app2']);
     });
 
     it('returns undefined if link does not exist', () => {
@@ -244,7 +207,7 @@ describe('NavLinksService', () => {
     });
 
     it('keeps the updated link when availableApps are re-emitted', async () => {
-      start.update('legacyApp1', { hidden: true });
+      start.update('app2', { hidden: true });
       mockAppService.applications$.next(mockAppService.applications$.value);
       const hiddenLinkIds = await start
         .getNavLinks$()
@@ -253,7 +216,7 @@ describe('NavLinksService', () => {
           map((links) => links.filter((l) => l.hidden).map((l) => l.id))
         )
         .toPromise();
-      expect(hiddenLinkIds).toEqual(['legacyApp1']);
+      expect(hiddenLinkIds).toEqual(['app2']);
     });
   });
 
diff --git a/src/core/public/chrome/nav_links/to_nav_link.test.ts b/src/core/public/chrome/nav_links/to_nav_link.test.ts
index ba04dbed49cd44..7e2c1fc1f89f8e 100644
--- a/src/core/public/chrome/nav_links/to_nav_link.test.ts
+++ b/src/core/public/chrome/nav_links/to_nav_link.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PublicAppInfo, AppNavLinkStatus, AppStatus, PublicLegacyAppInfo } from '../../application';
+import { PublicAppInfo, AppNavLinkStatus, AppStatus } from '../../application';
 import { toNavLink } from './to_nav_link';
 
 import { httpServiceMock } from '../../mocks';
@@ -28,17 +28,6 @@ const app = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
   status: AppStatus.accessible,
   navLinkStatus: AppNavLinkStatus.default,
   appRoute: `/app/some-id`,
-  legacy: false,
-  ...props,
-});
-
-const legacyApp = (props: Partial<PublicLegacyAppInfo> = {}): PublicLegacyAppInfo => ({
-  appUrl: '/my-app-url',
-  id: 'some-id',
-  title: 'some-title',
-  status: AppStatus.accessible,
-  navLinkStatus: AppNavLinkStatus.default,
-  legacy: true,
   ...props,
 });
 
@@ -67,11 +56,6 @@ describe('toNavLink', () => {
     );
   });
 
-  it('flags legacy apps when converting to navLink', () => {
-    expect(toNavLink(app({}), basePath).properties.legacy).toEqual(false);
-    expect(toNavLink(legacyApp({}), basePath).properties.legacy).toEqual(true);
-  });
-
   it('handles applications with custom app route', () => {
     const link = toNavLink(
       app({
@@ -103,32 +87,6 @@ describe('toNavLink', () => {
     );
   });
 
-  it('does not generate `url` for legacy app', () => {
-    const link = toNavLink(
-      legacyApp({
-        appUrl: '/my-legacy-app/#foo',
-        defaultPath: '/some/default/path',
-      }),
-      basePath
-    );
-    expect(link.properties.url).toBeUndefined();
-  });
-
-  it('uses appUrl when converting legacy applications', () => {
-    expect(
-      toNavLink(
-        legacyApp({
-          appUrl: '/my-legacy-app/#foo',
-        }),
-        basePath
-      ).properties
-    ).toEqual(
-      expect.objectContaining({
-        baseUrl: 'http://localhost/base-path/my-legacy-app/#foo',
-      })
-    );
-  });
-
   it('uses the application status when the navLinkStatus is set to default', () => {
     expect(
       toNavLink(
diff --git a/src/core/public/chrome/nav_links/to_nav_link.ts b/src/core/public/chrome/nav_links/to_nav_link.ts
index 2dedbfd5f36ace..703c1798b6fb8f 100644
--- a/src/core/public/chrome/nav_links/to_nav_link.ts
+++ b/src/core/public/chrome/nav_links/to_nav_link.ts
@@ -17,19 +17,14 @@
  * under the License.
  */
 
-import { PublicAppInfo, AppNavLinkStatus, AppStatus, PublicLegacyAppInfo } from '../../application';
+import { PublicAppInfo, AppNavLinkStatus, AppStatus } from '../../application';
 import { IBasePath } from '../../http';
 import { NavLinkWrapper } from './nav_link';
 import { appendAppPath } from '../../application/utils';
 
-export function toNavLink(
-  app: PublicAppInfo | PublicLegacyAppInfo,
-  basePath: IBasePath
-): NavLinkWrapper {
+export function toNavLink(app: PublicAppInfo, basePath: IBasePath): NavLinkWrapper {
   const useAppStatus = app.navLinkStatus === AppNavLinkStatus.default;
-  const relativeBaseUrl = isLegacyApp(app)
-    ? basePath.prepend(app.appUrl)
-    : basePath.prepend(app.appRoute!);
+  const relativeBaseUrl = basePath.prepend(app.appRoute!);
   const url = relativeToAbsolute(appendAppPath(relativeBaseUrl, app.defaultPath));
   const baseUrl = relativeToAbsolute(relativeBaseUrl);
 
@@ -39,14 +34,9 @@ export function toNavLink(
       ? app.status === AppStatus.inaccessible
       : app.navLinkStatus === AppNavLinkStatus.hidden,
     disabled: useAppStatus ? false : app.navLinkStatus === AppNavLinkStatus.disabled,
-    legacy: isLegacyApp(app),
     baseUrl,
-    ...(isLegacyApp(app)
-      ? {}
-      : {
-          href: url,
-          url,
-        }),
+    href: url,
+    url,
   });
 }
 
@@ -63,7 +53,3 @@ export function relativeToAbsolute(url: string) {
   a.setAttribute('href', url);
   return a.href;
 }
-
-function isLegacyApp(app: PublicAppInfo | PublicLegacyAppInfo): app is PublicLegacyAppInfo {
-  return app.legacy === true;
-}
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 79beaf79068ef7..a770ece8496e4c 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
@@ -71,7 +71,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
         "href": "Custom link",
         "id": "Custom link",
         "isActive": true,
-        "legacy": false,
         "title": "Custom link",
       },
       "closed": false,
@@ -123,7 +122,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
   id="collapsibe-nav"
   isLocked={false}
   isOpen={true}
-  legacyMode={false}
   navLinks$={
     BehaviorSubject {
       "_isScalar": false,
@@ -140,7 +138,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "discover",
           "id": "discover",
           "isActive": true,
-          "legacy": false,
           "title": "discover",
         },
         Object {
@@ -155,7 +152,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "siem",
           "id": "siem",
           "isActive": true,
-          "legacy": false,
           "title": "siem",
         },
         Object {
@@ -170,7 +166,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "metrics",
           "id": "metrics",
           "isActive": true,
-          "legacy": false,
           "title": "metrics",
         },
         Object {
@@ -184,7 +179,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "monitoring",
           "id": "monitoring",
           "isActive": true,
-          "legacy": false,
           "title": "monitoring",
         },
         Object {
@@ -199,7 +193,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "visualize",
           "id": "visualize",
           "isActive": true,
-          "legacy": false,
           "title": "visualize",
         },
         Object {
@@ -214,7 +207,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "dashboard",
           "id": "dashboard",
           "isActive": true,
-          "legacy": false,
           "title": "dashboard",
         },
         Object {
@@ -224,7 +216,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "canvas",
           "id": "canvas",
           "isActive": true,
-          "legacy": false,
           "title": "canvas",
         },
         Object {
@@ -239,7 +230,6 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "href": "logs",
           "id": "logs",
           "isActive": true,
-          "legacy": false,
           "title": "logs",
         },
       ],
@@ -2116,7 +2106,6 @@ exports[`CollapsibleNav renders the default nav 1`] = `
   id="collapsibe-nav"
   isLocked={false}
   isOpen={false}
-  legacyMode={false}
   navLinks$={
     BehaviorSubject {
       "_isScalar": false,
@@ -2351,7 +2340,6 @@ exports[`CollapsibleNav renders the default nav 2`] = `
   id="collapsibe-nav"
   isLocked={false}
   isOpen={true}
-  legacyMode={false}
   navLinks$={
     BehaviorSubject {
       "_isScalar": false,
@@ -3038,7 +3026,6 @@ exports[`CollapsibleNav renders the default nav 3`] = `
   id="collapsibe-nav"
   isLocked={true}
   isOpen={true}
-  legacyMode={false}
   navLinks$={
     BehaviorSubject {
       "_isScalar": false,
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 5ec7a4773967b2..128a0c5369e082 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
@@ -115,8 +115,8 @@ exports[`Header renders 1`] = `
       "_isScalar": false,
       "_value": Object {
         "baseUrl": "",
+        "href": "",
         "id": "cloud-deployment-link",
-        "legacy": false,
         "title": "Manage cloud deployment",
       },
       "closed": false,
@@ -362,7 +362,6 @@ exports[`Header renders 1`] = `
   }
   kibanaDocLink="/docs"
   kibanaVersion="1.0.0"
-  legacyMode={false}
   loadingCount$={
     BehaviorSubject {
       "_isScalar": false,
@@ -440,8 +439,8 @@ exports[`Header renders 1`] = `
       "_value": Array [
         Object {
           "baseUrl": "",
+          "href": "",
           "id": "kibana",
-          "legacy": false,
           "title": "kibana",
         },
       ],
@@ -850,8 +849,8 @@ exports[`Header renders 2`] = `
       "_isScalar": false,
       "_value": Object {
         "baseUrl": "",
+        "href": "",
         "id": "cloud-deployment-link",
-        "legacy": false,
         "title": "Manage cloud deployment",
       },
       "closed": false,
@@ -1889,7 +1888,6 @@ exports[`Header renders 2`] = `
   }
   kibanaDocLink="/docs"
   kibanaVersion="1.0.0"
-  legacyMode={false}
   loadingCount$={
     BehaviorSubject {
       "_isScalar": false,
@@ -2043,8 +2041,8 @@ exports[`Header renders 2`] = `
       "_value": Array [
         Object {
           "baseUrl": "",
+          "href": "",
           "id": "kibana",
-          "legacy": false,
           "title": "kibana",
         },
       ],
@@ -2415,8 +2413,8 @@ exports[`Header renders 2`] = `
                       "_value": Array [
                         Object {
                           "baseUrl": "",
+                          "href": "",
                           "id": "kibana",
-                          "legacy": false,
                           "title": "kibana",
                         },
                       ],
@@ -4587,8 +4585,8 @@ exports[`Header renders 2`] = `
           "_isScalar": false,
           "_value": Object {
             "baseUrl": "",
+            "href": "",
             "id": "cloud-deployment-link",
-            "legacy": false,
             "title": "Manage cloud deployment",
           },
           "closed": false,
@@ -4640,15 +4638,14 @@ exports[`Header renders 2`] = `
       id="mockId"
       isLocked={false}
       isOpen={false}
-      legacyMode={false}
       navLinks$={
         BehaviorSubject {
           "_isScalar": false,
           "_value": Array [
             Object {
               "baseUrl": "",
+              "href": "",
               "id": "kibana",
-              "legacy": false,
               "title": "kibana",
             },
           ],
@@ -5072,8 +5069,8 @@ exports[`Header renders 3`] = `
       "_isScalar": false,
       "_value": Object {
         "baseUrl": "",
+        "href": "",
         "id": "cloud-deployment-link",
-        "legacy": false,
         "title": "Manage cloud deployment",
       },
       "closed": false,
@@ -6111,7 +6108,6 @@ exports[`Header renders 3`] = `
   }
   kibanaDocLink="/docs"
   kibanaVersion="1.0.0"
-  legacyMode={false}
   loadingCount$={
     BehaviorSubject {
       "_isScalar": false,
@@ -6265,8 +6261,8 @@ exports[`Header renders 3`] = `
       "_value": Array [
         Object {
           "baseUrl": "",
+          "href": "",
           "id": "kibana",
-          "legacy": false,
           "title": "kibana",
         },
       ],
@@ -6637,8 +6633,8 @@ exports[`Header renders 3`] = `
                       "_value": Array [
                         Object {
                           "baseUrl": "",
+                          "href": "",
                           "id": "kibana",
-                          "legacy": false,
                           "title": "kibana",
                         },
                       ],
@@ -8809,8 +8805,8 @@ exports[`Header renders 3`] = `
           "_isScalar": false,
           "_value": Object {
             "baseUrl": "",
+            "href": "",
             "id": "cloud-deployment-link",
-            "legacy": false,
             "title": "Manage cloud deployment",
           },
           "closed": false,
@@ -8862,15 +8858,14 @@ exports[`Header renders 3`] = `
       id="mockId"
       isLocked={true}
       isOpen={false}
-      legacyMode={false}
       navLinks$={
         BehaviorSubject {
           "_isScalar": false,
           "_value": Array [
             Object {
               "baseUrl": "",
+              "href": "",
               "id": "kibana",
-              "legacy": false,
               "title": "kibana",
             },
           ],
@@ -9083,7 +9078,7 @@ exports[`Header renders 3`] = `
                             Array [
                               Object {
                                 "data-test-subj": "collapsibleNavCustomNavLink",
-                                "href": undefined,
+                                "href": "",
                                 "icon": undefined,
                                 "iconType": undefined,
                                 "isActive": false,
@@ -9107,6 +9102,7 @@ exports[`Header renders 3`] = `
                             <EuiListGroupItem
                               color="text"
                               data-test-subj="collapsibleNavCustomNavLink"
+                              href=""
                               isActive={false}
                               key="title-0"
                               label="Manage cloud deployment"
@@ -9480,6 +9476,7 @@ exports[`Header renders 3`] = `
                             <EuiListGroupItem
                               color="text"
                               data-test-subj="collapsibleNavAppLink"
+                              href=""
                               isActive={false}
                               label="kibana"
                               onClick={[Function]}
@@ -9935,8 +9932,8 @@ exports[`Header renders 4`] = `
       "_isScalar": false,
       "_value": Object {
         "baseUrl": "",
+        "href": "",
         "id": "cloud-deployment-link",
-        "legacy": false,
         "title": "Manage cloud deployment",
       },
       "closed": false,
@@ -10936,7 +10933,6 @@ exports[`Header renders 4`] = `
   }
   kibanaDocLink="/docs"
   kibanaVersion="1.0.0"
-  legacyMode={false}
   loadingCount$={
     BehaviorSubject {
       "_isScalar": false,
@@ -11090,8 +11086,8 @@ exports[`Header renders 4`] = `
       "_value": Array [
         Object {
           "baseUrl": "",
+          "href": "",
           "id": "kibana",
-          "legacy": false,
           "title": "kibana",
         },
       ],
@@ -11464,8 +11460,8 @@ exports[`Header renders 4`] = `
                       "_value": Array [
                         Object {
                           "baseUrl": "",
+                          "href": "",
                           "id": "kibana",
-                          "legacy": false,
                           "title": "kibana",
                         },
                       ],
@@ -13631,15 +13627,14 @@ exports[`Header renders 4`] = `
         }
       }
       isLocked={true}
-      legacyMode={false}
       navLinks$={
         BehaviorSubject {
           "_isScalar": false,
           "_value": Array [
             Object {
               "baseUrl": "",
+              "href": "",
               "id": "kibana",
-              "legacy": false,
               "title": "kibana",
             },
           ],
@@ -14086,7 +14081,7 @@ exports[`Header renders 4`] = `
                           Array [
                             Object {
                               "data-test-subj": "navDrawerAppsMenuLink",
-                              "href": undefined,
+                              "href": "",
                               "icon": undefined,
                               "iconType": undefined,
                               "isActive": false,
@@ -14109,7 +14104,7 @@ exports[`Header renders 4`] = `
                                 "className": "euiNavDrawerGroup__item",
                                 "data-name": "kibana",
                                 "data-test-subj": "navDrawerAppsMenuLink",
-                                "href": undefined,
+                                "href": "",
                                 "icon": <span
                                   className="euiNavDrawerGroup__itemDefaultIcon"
                                 >
@@ -14136,6 +14131,7 @@ exports[`Header renders 4`] = `
                               className="euiNavDrawerGroup__item"
                               data-name="kibana"
                               data-test-subj="navDrawerAppsMenuLink"
+                              href=""
                               icon={
                                 <span
                                   className="euiNavDrawerGroup__itemDefaultIcon"
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
index 97dd229cb1ead3..d4325e0caf88c4 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
@@ -40,7 +40,6 @@ function mockLink({ title = 'discover', category }: Partial<ChromeNavLink>) {
     id: title,
     href: title,
     baseUrl: '/',
-    legacy: false,
     isActive: true,
     'data-test-subj': title,
   };
@@ -62,7 +61,6 @@ function mockProps() {
     isLocked: false,
     isOpen: false,
     homeHref: '/',
-    legacyMode: false,
     navLinks$: new BehaviorSubject([]),
     recentlyAccessed$: new BehaviorSubject([]),
     storage: new StubBrowserStorage(),
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx
index 5abd14312f4a66..a5f42c09495626 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx
@@ -81,7 +81,6 @@ interface Props {
   isLocked: boolean;
   isOpen: boolean;
   homeHref: string;
-  legacyMode: boolean;
   navLinks$: Rx.Observable<ChromeNavLink[]>;
   recentlyAccessed$: Rx.Observable<ChromeRecentlyAccessedHistoryItem[]>;
   storage?: Storage;
@@ -97,7 +96,6 @@ export function CollapsibleNav({
   isLocked,
   isOpen,
   homeHref,
-  legacyMode,
   storage = window.localStorage,
   onIsLockedUpdate,
   closeNav,
@@ -116,7 +114,6 @@ export function CollapsibleNav({
   const readyForEUI = (link: ChromeNavLink, needsIcon: boolean = false) => {
     return createEuiListItem({
       link,
-      legacyMode,
       appId,
       dataTestSubj: 'collapsibleNavAppLink',
       navigateToApp,
@@ -148,7 +145,6 @@ export function CollapsibleNav({
                 listItems={[
                   createEuiListItem({
                     link: customNavLink,
-                    legacyMode,
                     basePath,
                     navigateToApp,
                     dataTestSubj: 'collapsibleNavCustomNavLink',
diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx
index a9fa15d43182be..04eb256f30f37c 100644
--- a/src/core/public/chrome/ui/header/header.test.tsx
+++ b/src/core/public/chrome/ui/header/header.test.tsx
@@ -50,7 +50,6 @@ function mockProps() {
     forceAppSwitcherNavigation$: new BehaviorSubject(false),
     helpExtension$: new BehaviorSubject(undefined),
     helpSupportUrl$: new BehaviorSubject(''),
-    legacyMode: false,
     navControlsLeft$: new BehaviorSubject([]),
     navControlsRight$: new BehaviorSubject([]),
     basePath: http.basePath,
@@ -74,13 +73,13 @@ describe('Header', () => {
     const isLocked$ = new BehaviorSubject(false);
     const navType$ = new BehaviorSubject('modern' as NavType);
     const navLinks$ = new BehaviorSubject([
-      { id: 'kibana', title: 'kibana', baseUrl: '', legacy: false },
+      { id: 'kibana', title: 'kibana', baseUrl: '', href: '' },
     ]);
     const customNavLink$ = new BehaviorSubject({
       id: 'cloud-deployment-link',
       title: 'Manage cloud deployment',
       baseUrl: '',
-      legacy: false,
+      href: '',
     });
     const recentlyAccessed$ = new BehaviorSubject([
       { link: '', label: 'dashboard', id: 'dashboard' },
diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx
index 0624d66a9598bb..c0b3fc72930dc4 100644
--- a/src/core/public/chrome/ui/header/header.tsx
+++ b/src/core/public/chrome/ui/header/header.tsx
@@ -67,7 +67,6 @@ export interface HeaderProps {
   forceAppSwitcherNavigation$: Observable<boolean>;
   helpExtension$: Observable<ChromeHelpExtension | undefined>;
   helpSupportUrl$: Observable<string>;
-  legacyMode: boolean;
   navControlsLeft$: Observable<readonly ChromeNavControl[]>;
   navControlsRight$: Observable<readonly ChromeNavControl[]>;
   basePath: HttpStart['basePath'];
@@ -93,7 +92,6 @@ function renderMenuTrigger(toggleOpen: () => void) {
 export function Header({
   kibanaVersion,
   kibanaDocLink,
-  legacyMode,
   application,
   basePath,
   onIsLockedUpdate,
@@ -195,7 +193,6 @@ export function Header({
             isOpen={isOpen}
             homeHref={homeHref}
             basePath={basePath}
-            legacyMode={legacyMode}
             navigateToApp={application.navigateToApp}
             onIsLockedUpdate={onIsLockedUpdate}
             closeNav={() => {
@@ -218,7 +215,6 @@ export function Header({
             appId$={application.currentAppId$}
             navigateToApp={application.navigateToApp}
             ref={navDrawerRef}
-            legacyMode={legacyMode}
           />
         )}
       </header>
diff --git a/src/core/public/chrome/ui/header/nav_drawer.tsx b/src/core/public/chrome/ui/header/nav_drawer.tsx
index ee4bff6cc0ac44..fc080fbafc3030 100644
--- a/src/core/public/chrome/ui/header/nav_drawer.tsx
+++ b/src/core/public/chrome/ui/header/nav_drawer.tsx
@@ -33,7 +33,6 @@ export interface Props {
   appId$: InternalApplicationStart['currentAppId$'];
   basePath: HttpStart['basePath'];
   isLocked?: boolean;
-  legacyMode: boolean;
   navLinks$: Observable<ChromeNavLink[]>;
   recentlyAccessed$: Observable<ChromeRecentlyAccessedHistoryItem[]>;
   navigateToApp: CoreStart['application']['navigateToApp'];
@@ -41,7 +40,7 @@ export interface Props {
 }
 
 function NavDrawerRenderer(
-  { isLocked, onIsLockedUpdate, basePath, legacyMode, navigateToApp, ...observables }: Props,
+  { isLocked, onIsLockedUpdate, basePath, navigateToApp, ...observables }: Props,
   ref: React.Ref<EuiNavDrawer>
 ) {
   const appId = useObservable(observables.appId$, '');
@@ -67,7 +66,6 @@ function NavDrawerRenderer(
         listItems={navLinks.map((link) =>
           createEuiListItem({
             link,
-            legacyMode,
             appId,
             basePath,
             navigateToApp,
diff --git a/src/core/public/chrome/ui/header/nav_link.tsx b/src/core/public/chrome/ui/header/nav_link.tsx
index c70a40f49643e0..04d9c5bf7a10a6 100644
--- a/src/core/public/chrome/ui/header/nav_link.tsx
+++ b/src/core/public/chrome/ui/header/nav_link.tsx
@@ -29,7 +29,6 @@ export const isModifiedOrPrevented = (event: React.MouseEvent<HTMLButtonElement,
 
 interface Props {
   link: ChromeNavLink;
-  legacyMode: boolean;
   appId?: string;
   basePath?: HttpStart['basePath'];
   dataTestSubj: string;
@@ -44,7 +43,6 @@ interface Props {
 // But FlyoutMenuItem isn't exported from EUI
 export function createEuiListItem({
   link,
-  legacyMode,
   appId,
   basePath,
   onClick = () => {},
@@ -52,12 +50,7 @@ export function createEuiListItem({
   dataTestSubj,
   externalLink = false,
 }: Props) {
-  const { legacy, active, id, title, disabled, euiIconType, icon, tooltip } = link;
-  let { href } = link;
-
-  if (legacy) {
-    href = link.url && !active ? link.url : link.baseUrl;
-  }
+  const { href, id, title, disabled, euiIconType, icon, tooltip } = link;
 
   return {
     label: tooltip ?? title,
@@ -70,8 +63,6 @@ export function createEuiListItem({
 
       if (
         !externalLink && // ignore external links
-        !legacyMode && // ignore when in legacy mode
-        !legacy && // ignore links to legacy apps
         event.button === 0 && // ignore everything but left clicks
         !isModifiedOrPrevented(event)
       ) {
@@ -79,8 +70,7 @@ export function createEuiListItem({
         navigateToApp(id);
       }
     },
-    // Legacy apps use `active` property, NP apps should match the current app
-    isActive: active || appId === id,
+    isActive: appId === id,
     isDisabled: disabled,
     'data-test-subj': dataTestSubj,
     ...(basePath && {
@@ -116,7 +106,7 @@ export function createRecentNavLink(
 ) {
   const { link, label } = recentLink;
   const href = relativeToAbsolute(basePath.prepend(link));
-  const navLink = navLinks.find((nl) => href.startsWith(nl.baseUrl ?? nl.subUrlBase));
+  const navLink = navLinks.find((nl) => href.startsWith(nl.baseUrl));
   let titleAndAriaLabel = label;
 
   if (navLink) {
diff --git a/src/core/public/core_system.test.mocks.ts b/src/core/public/core_system.test.mocks.ts
index b5b99418b44b4f..d0e457386ffca3 100644
--- a/src/core/public/core_system.test.mocks.ts
+++ b/src/core/public/core_system.test.mocks.ts
@@ -23,7 +23,6 @@ import { fatalErrorsServiceMock } from './fatal_errors/fatal_errors_service.mock
 import { httpServiceMock } from './http/http_service.mock';
 import { i18nServiceMock } from './i18n/i18n_service.mock';
 import { injectedMetadataServiceMock } from './injected_metadata/injected_metadata_service.mock';
-import { legacyPlatformServiceMock } from './legacy/legacy_service.mock';
 import { notificationServiceMock } from './notifications/notifications_service.mock';
 import { overlayServiceMock } from './overlays/overlay_service.mock';
 import { pluginsServiceMock } from './plugins/plugins_service.mock';
@@ -34,14 +33,6 @@ import { contextServiceMock } from './context/context_service.mock';
 import { integrationsServiceMock } from './integrations/integrations_service.mock';
 import { coreAppMock } from './core_app/core_app.mock';
 
-export const MockLegacyPlatformService = legacyPlatformServiceMock.create();
-export const LegacyPlatformServiceConstructor = jest
-  .fn()
-  .mockImplementation(() => MockLegacyPlatformService);
-jest.doMock('./legacy', () => ({
-  LegacyPlatformService: LegacyPlatformServiceConstructor,
-}));
-
 export const MockInjectedMetadataService = injectedMetadataServiceMock.create();
 export const InjectedMetadataServiceConstructor = jest
   .fn()
diff --git a/src/core/public/core_system.test.ts b/src/core/public/core_system.test.ts
index 4c1993c90a2e10..213237309c30bd 100644
--- a/src/core/public/core_system.test.ts
+++ b/src/core/public/core_system.test.ts
@@ -23,13 +23,11 @@ import {
   HttpServiceConstructor,
   I18nServiceConstructor,
   InjectedMetadataServiceConstructor,
-  LegacyPlatformServiceConstructor,
   MockChromeService,
   MockFatalErrorsService,
   MockHttpService,
   MockI18nService,
   MockInjectedMetadataService,
-  MockLegacyPlatformService,
   MockNotificationsService,
   MockOverlayService,
   MockPluginsService,
@@ -80,7 +78,6 @@ describe('constructor', () => {
     createCoreSystem();
 
     expect(InjectedMetadataServiceConstructor).toHaveBeenCalledTimes(1);
-    expect(LegacyPlatformServiceConstructor).toHaveBeenCalledTimes(1);
     expect(I18nServiceConstructor).toHaveBeenCalledTimes(1);
     expect(FatalErrorsServiceConstructor).toHaveBeenCalledTimes(1);
     expect(NotificationServiceConstructor).toHaveBeenCalledTimes(1);
@@ -106,25 +103,6 @@ describe('constructor', () => {
     });
   });
 
-  it('passes required params to LegacyPlatformService', () => {
-    const requireLegacyFiles = { requireLegacyFiles: true };
-    const requireLegacyBootstrapModule = { requireLegacyBootstrapModule: true };
-    const requireNewPlatformShimModule = { requireNewPlatformShimModule: true };
-
-    createCoreSystem({
-      requireLegacyFiles,
-      requireLegacyBootstrapModule,
-      requireNewPlatformShimModule,
-    });
-
-    expect(LegacyPlatformServiceConstructor).toHaveBeenCalledTimes(1);
-    expect(LegacyPlatformServiceConstructor).toHaveBeenCalledWith({
-      requireLegacyFiles,
-      requireLegacyBootstrapModule,
-      requireNewPlatformShimModule,
-    });
-  });
-
   it('passes browserSupportsCsp to ChromeService', () => {
     createCoreSystem();
 
@@ -190,7 +168,6 @@ describe('#setup()', () => {
       pluginDependencies: new Map([
         [pluginA, []],
         [pluginB, [pluginA]],
-        [MockLegacyPlatformService.legacyId, [pluginA, pluginB]],
       ]),
     });
   });
@@ -301,11 +278,6 @@ describe('#start()', () => {
     expect(MockPluginsService.start).toHaveBeenCalledTimes(1);
   });
 
-  it('calls legacyPlatform#start()', async () => {
-    await startCore();
-    expect(MockLegacyPlatformService.start).toHaveBeenCalledTimes(1);
-  });
-
   it('calls overlays#start()', async () => {
     await startCore();
     expect(MockOverlayService.start).toHaveBeenCalledTimes(1);
@@ -317,7 +289,6 @@ describe('#start()', () => {
     expect(MockRenderingService.start).toHaveBeenCalledWith({
       application: expect.any(Object),
       chrome: expect.any(Object),
-      injectedMetadata: expect.any(Object),
       overlays: expect.any(Object),
       targetDomElement: expect.any(HTMLElement),
     });
@@ -335,14 +306,6 @@ describe('#start()', () => {
 });
 
 describe('#stop()', () => {
-  it('calls legacyPlatform.stop()', () => {
-    const coreSystem = createCoreSystem();
-
-    expect(MockLegacyPlatformService.stop).not.toHaveBeenCalled();
-    coreSystem.stop();
-    expect(MockLegacyPlatformService.stop).toHaveBeenCalled();
-  });
-
   it('calls notifications.stop()', () => {
     const coreSystem = createCoreSystem();
 
@@ -422,7 +385,6 @@ describe('RenderingService targetDomElement', () => {
     let targetDomElementParentInStart: HTMLElement | null;
     MockRenderingService.start.mockImplementation(({ targetDomElement }) => {
       targetDomElementParentInStart = targetDomElement.parentElement;
-      return { legacyTargetDomElement: document.createElement('div') };
     });
 
     // Starting the core system should pass the targetDomElement as a child of the rootDomElement
@@ -432,24 +394,6 @@ describe('RenderingService targetDomElement', () => {
   });
 });
 
-describe('LegacyPlatformService targetDomElement', () => {
-  it('only mounts the element when start, after setting up the legacyPlatformService', async () => {
-    const core = createCoreSystem();
-
-    let targetDomElementInStart: HTMLElement | undefined;
-    MockLegacyPlatformService.start.mockImplementation(({ targetDomElement }) => {
-      targetDomElementInStart = targetDomElement;
-    });
-
-    await core.setup();
-    await core.start();
-    // Starting the core system should pass the legacyTargetDomElement to the LegacyPlatformService
-    const renderingLegacyTargetDomElement =
-      MockRenderingService.start.mock.results[0].value.legacyTargetDomElement;
-    expect(targetDomElementInStart!).toBe(renderingLegacyTargetDomElement);
-  });
-});
-
 describe('Notifications targetDomElement', () => {
   it('only mounts the element when started, after setting up the notificationsService', async () => {
     const rootDomElement = document.createElement('div');
diff --git a/src/core/public/core_system.ts b/src/core/public/core_system.ts
index e08841b0271d9d..006d0036f7a129 100644
--- a/src/core/public/core_system.ts
+++ b/src/core/public/core_system.ts
@@ -30,13 +30,12 @@ import {
   InjectedMetadataSetup,
   InjectedMetadataStart,
 } from './injected_metadata';
-import { LegacyPlatformParams, LegacyPlatformService } from './legacy';
 import { NotificationsService } from './notifications';
 import { OverlayService } from './overlays';
 import { PluginsService } from './plugins';
 import { UiSettingsService } from './ui_settings';
 import { ApplicationService } from './application';
-import { mapToObject, pick } from '../utils/';
+import { pick } from '../utils/';
 import { DocLinksService } from './doc_links';
 import { RenderingService } from './rendering';
 import { SavedObjectsService } from './saved_objects';
@@ -49,9 +48,6 @@ interface Params {
   rootDomElement: HTMLElement;
   browserSupportsCsp: boolean;
   injectedMetadata: InjectedMetadataParams['injectedMetadata'];
-  requireLegacyFiles?: LegacyPlatformParams['requireLegacyFiles'];
-  requireLegacyBootstrapModule?: LegacyPlatformParams['requireLegacyBootstrapModule'];
-  requireNewPlatformShimModule?: LegacyPlatformParams['requireNewPlatformShimModule'];
 }
 
 /** @internal */
@@ -86,7 +82,6 @@ export interface InternalCoreStart extends Omit<CoreStart, 'application'> {
 export class CoreSystem {
   private readonly fatalErrors: FatalErrorsService;
   private readonly injectedMetadata: InjectedMetadataService;
-  private readonly legacy: LegacyPlatformService;
   private readonly notifications: NotificationsService;
   private readonly http: HttpService;
   private readonly savedObjects: SavedObjectsService;
@@ -107,14 +102,7 @@ export class CoreSystem {
   private fatalErrorsSetup: FatalErrorsSetup | null = null;
 
   constructor(params: Params) {
-    const {
-      rootDomElement,
-      browserSupportsCsp,
-      injectedMetadata,
-      requireLegacyFiles,
-      requireLegacyBootstrapModule,
-      requireNewPlatformShimModule,
-    } = params;
+    const { rootDomElement, browserSupportsCsp, injectedMetadata } = params;
 
     this.rootDomElement = rootDomElement;
 
@@ -145,12 +133,6 @@ export class CoreSystem {
     this.context = new ContextService(this.coreContext);
     this.plugins = new PluginsService(this.coreContext, injectedMetadata.uiPlugins);
     this.coreApp = new CoreApp(this.coreContext);
-
-    this.legacy = new LegacyPlatformService({
-      requireLegacyFiles,
-      requireLegacyBootstrapModule,
-      requireNewPlatformShimModule,
-    });
   }
 
   public async setup() {
@@ -170,16 +152,9 @@ export class CoreSystem {
 
       const pluginDependencies = this.plugins.getOpaqueIds();
       const context = this.context.setup({
-        // We inject a fake "legacy plugin" with dependencies on every plugin so that legacy plugins:
-        // 1) Can access context from any NP plugin
-        // 2) Can register context providers that will only be available to other legacy plugins and will not leak into
-        //    New Platform plugins.
-        pluginDependencies: new Map([
-          ...pluginDependencies,
-          [this.legacy.legacyId, [...pluginDependencies.keys()]],
-        ]),
+        pluginDependencies: new Map([...pluginDependencies]),
       });
-      const application = this.application.setup({ context, http, injectedMetadata });
+      const application = this.application.setup({ context, http });
       this.coreApp.setup({ application, http, injectedMetadata, notifications });
 
       const core: InternalCoreSetup = {
@@ -193,12 +168,7 @@ export class CoreSystem {
       };
 
       // Services that do not expose contracts at setup
-      const plugins = await this.plugins.setup(core);
-
-      await this.legacy.setup({
-        core,
-        plugins: mapToObject(plugins.contracts),
-      });
+      await this.plugins.setup(core);
 
       return { fatalErrors: this.fatalErrorsSetup };
     } catch (error) {
@@ -277,7 +247,7 @@ export class CoreSystem {
         fatalErrors,
       };
 
-      const plugins = await this.plugins.start(core);
+      await this.plugins.start(core);
 
       // ensure the rootDomElement is empty
       this.rootDomElement.textContent = '';
@@ -286,20 +256,13 @@ export class CoreSystem {
       this.rootDomElement.appendChild(notificationsTargetDomElement);
       this.rootDomElement.appendChild(overlayTargetDomElement);
 
-      const rendering = this.rendering.start({
+      this.rendering.start({
         application,
         chrome,
-        injectedMetadata,
         overlays,
         targetDomElement: coreUiTargetDomElement,
       });
 
-      await this.legacy.start({
-        core,
-        plugins: mapToObject(plugins.contracts),
-        targetDomElement: rendering.legacyTargetDomElement,
-      });
-
       return {
         application,
       };
@@ -315,7 +278,6 @@ export class CoreSystem {
   }
 
   public stop() {
-    this.legacy.stop();
     this.plugins.stop();
     this.coreApp.stop();
     this.notifications.stop();
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 9176a277b3f434..a9774dafd2340a 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -61,7 +61,6 @@ import {
 import { FatalErrorsSetup, FatalErrorsStart, FatalErrorInfo } from './fatal_errors';
 import { HttpSetup, HttpStart } from './http';
 import { I18nStart } from './i18n';
-import { InjectedMetadataSetup, InjectedMetadataStart, LegacyNavLink } from './injected_metadata';
 import { NotificationsSetup, NotificationsStart } from './notifications';
 import { OverlayStart } from './overlays';
 import { Plugin, PluginInitializer, PluginInitializerContext, PluginOpaqueId } from './plugins';
@@ -106,7 +105,6 @@ export {
   ApplicationStart,
   App,
   PublicAppInfo,
-  AppBase,
   AppMount,
   AppMountDeprecated,
   AppUnmount,
@@ -122,8 +120,6 @@ export {
   AppUpdatableFields,
   AppUpdater,
   ScopedHistory,
-  LegacyApp,
-  PublicLegacyAppInfo,
   NavigateToAppOptions,
 } from './application';
 
@@ -230,7 +226,7 @@ export interface CoreSetup<TPluginsStart extends object = object, TStart = unkno
   /**
    * exposed temporarily until https://github.com/elastic/kibana/issues/41990 done
    * use *only* to retrieve config values. There is no way to set injected values
-   * in the new platform. Use the legacy platform API instead.
+   * in the new platform.
    * @deprecated
    * */
   injectedMetadata: {
@@ -285,7 +281,7 @@ export interface CoreStart {
   /**
    * exposed temporarily until https://github.com/elastic/kibana/issues/41990 done
    * use *only* to retrieve config values. There is no way to set injected values
-   * in the new platform. Use the legacy platform API instead.
+   * in the new platform.
    * @deprecated
    * */
   injectedMetadata: {
@@ -293,36 +289,6 @@ export interface CoreStart {
   };
 }
 
-/**
- * Setup interface exposed to the legacy platform via the `ui/new_platform` module.
- *
- * @remarks
- * Some methods are not supported in the legacy platform and while present to make this type compatibile with
- * {@link CoreSetup}, unsupported methods will throw exceptions when called.
- *
- * @public
- * @deprecated
- */
-export interface LegacyCoreSetup extends CoreSetup<any, any> {
-  /** @deprecated */
-  injectedMetadata: InjectedMetadataSetup;
-}
-
-/**
- * Start interface exposed to the legacy platform via the `ui/new_platform` module.
- *
- * @remarks
- * Some methods are not supported in the legacy platform and while present to make this type compatibile with
- * {@link CoreStart}, unsupported methods will throw exceptions when called.
- *
- * @public
- * @deprecated
- */
-export interface LegacyCoreStart extends CoreStart {
-  /** @deprecated */
-  injectedMetadata: InjectedMetadataStart;
-}
-
 export {
   Capabilities,
   ChromeBadge,
@@ -356,7 +322,6 @@ export {
   HttpSetup,
   HttpStart,
   I18nStart,
-  LegacyNavLink,
   NotificationsSetup,
   NotificationsStart,
   Plugin,
diff --git a/src/core/public/injected_metadata/index.ts b/src/core/public/injected_metadata/index.ts
index cebd0f017de698..925eeab1875357 100644
--- a/src/core/public/injected_metadata/index.ts
+++ b/src/core/public/injected_metadata/index.ts
@@ -23,5 +23,4 @@ export {
   InjectedMetadataSetup,
   InjectedMetadataStart,
   InjectedPluginMetadata,
-  LegacyNavLink,
 } from './injected_metadata_service';
diff --git a/src/core/public/injected_metadata/injected_metadata_service.mock.ts b/src/core/public/injected_metadata/injected_metadata_service.mock.ts
index e6b1c440519bd2..3bb4358406246b 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.mock.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.mock.ts
@@ -25,7 +25,6 @@ const createSetupContractMock = () => {
     getKibanaVersion: jest.fn(),
     getKibanaBranch: jest.fn(),
     getCspConfig: jest.fn(),
-    getLegacyMode: jest.fn(),
     getAnonymousStatusPage: jest.fn(),
     getLegacyMetadata: jest.fn(),
     getPlugins: jest.fn(),
@@ -35,7 +34,6 @@ const createSetupContractMock = () => {
   };
   setupContract.getCspConfig.mockReturnValue({ warnLegacyBrowsers: true });
   setupContract.getKibanaVersion.mockReturnValue('kibanaVersion');
-  setupContract.getLegacyMode.mockReturnValue(true);
   setupContract.getAnonymousStatusPage.mockReturnValue(false);
   setupContract.getLegacyMetadata.mockReturnValue({
     app: {
diff --git a/src/core/public/injected_metadata/injected_metadata_service.ts b/src/core/public/injected_metadata/injected_metadata_service.ts
index db4bfdf415bcc8..23630a5bcf228b 100644
--- a/src/core/public/injected_metadata/injected_metadata_service.ts
+++ b/src/core/public/injected_metadata/injected_metadata_service.ts
@@ -28,17 +28,6 @@ import {
 import { deepFreeze } from '../../utils/';
 import { AppCategory } from '../';
 
-/** @public */
-export interface LegacyNavLink {
-  id: string;
-  category?: AppCategory;
-  title: string;
-  order: number;
-  url: string;
-  icon?: string;
-  euiIconType?: string;
-}
-
 export interface InjectedPluginMetadata {
   id: PluginName;
   plugin: DiscoveredPlugin;
@@ -67,7 +56,6 @@ export interface InjectedMetadataParams {
       packageInfo: Readonly<PackageInfo>;
     };
     uiPlugins: InjectedPluginMetadata[];
-    legacyMode: boolean;
     anonymousStatusPage: boolean;
     legacyMetadata: {
       app: {
@@ -75,7 +63,6 @@ export interface InjectedMetadataParams {
         title: string;
       };
       bundleId: string;
-      nav: LegacyNavLink[];
       version: string;
       branch: string;
       buildNum: number;
@@ -137,10 +124,6 @@ export class InjectedMetadataService {
         return this.state.uiPlugins;
       },
 
-      getLegacyMode: () => {
-        return this.state.legacyMode;
-      },
-
       getLegacyMetadata: () => {
         return this.state.legacyMetadata;
       },
@@ -182,8 +165,6 @@ export interface InjectedMetadataSetup {
    * An array of frontend plugins in topological order.
    */
   getPlugins: () => InjectedPluginMetadata[];
-  /** Indicates whether or not we are rendering a known legacy app. */
-  getLegacyMode: () => boolean;
   getAnonymousStatusPage: () => boolean;
   getLegacyMetadata: () => {
     app: {
@@ -191,7 +172,6 @@ export interface InjectedMetadataSetup {
       title: string;
     };
     bundleId: string;
-    nav: LegacyNavLink[];
     version: string;
     branch: string;
     buildNum: number;
diff --git a/src/core/public/legacy/index.ts b/src/core/public/legacy/index.ts
deleted file mode 100644
index 1ea43d8deebbc4..00000000000000
--- a/src/core/public/legacy/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 { LegacyPlatformService, LegacyPlatformParams } from './legacy_service';
diff --git a/src/core/public/legacy/legacy_service.mock.ts b/src/core/public/legacy/legacy_service.mock.ts
deleted file mode 100644
index 0c8d9682185d5c..00000000000000
--- a/src/core/public/legacy/legacy_service.mock.ts
+++ /dev/null
@@ -1,35 +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 { LegacyPlatformService } from './legacy_service';
-
-// Use Required to get only public properties
-type LegacyPlatformServiceContract = Required<LegacyPlatformService>;
-const createMock = () => {
-  const mocked: jest.Mocked<LegacyPlatformServiceContract> = {
-    legacyId: Symbol(),
-    setup: jest.fn(),
-    start: jest.fn(),
-    stop: jest.fn(),
-  };
-  return mocked;
-};
-
-export const legacyPlatformServiceMock = {
-  create: createMock,
-};
diff --git a/src/core/public/legacy/legacy_service.test.ts b/src/core/public/legacy/legacy_service.test.ts
deleted file mode 100644
index cb29abc9b0ccc5..00000000000000
--- a/src/core/public/legacy/legacy_service.test.ts
+++ /dev/null
@@ -1,297 +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 angular from 'angular';
-
-import { chromeServiceMock } from '../chrome/chrome_service.mock';
-import { fatalErrorsServiceMock } from '../fatal_errors/fatal_errors_service.mock';
-import { httpServiceMock } from '../http/http_service.mock';
-import { i18nServiceMock } from '../i18n/i18n_service.mock';
-import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
-import { notificationServiceMock } from '../notifications/notifications_service.mock';
-import { overlayServiceMock } from '../overlays/overlay_service.mock';
-import { uiSettingsServiceMock } from '../ui_settings/ui_settings_service.mock';
-import { LegacyPlatformService } from './legacy_service';
-import { applicationServiceMock } from '../application/application_service.mock';
-import { docLinksServiceMock } from '../doc_links/doc_links_service.mock';
-import { savedObjectsServiceMock } from '../saved_objects/saved_objects_service.mock';
-import { contextServiceMock } from '../context/context_service.mock';
-
-const applicationSetup = applicationServiceMock.createInternalSetupContract();
-const contextSetup = contextServiceMock.createSetupContract();
-const docLinksSetup = docLinksServiceMock.createSetupContract();
-const fatalErrorsSetup = fatalErrorsServiceMock.createSetupContract();
-const httpSetup = httpServiceMock.createSetupContract();
-const injectedMetadataSetup = injectedMetadataServiceMock.createSetupContract();
-const notificationsSetup = notificationServiceMock.createSetupContract();
-const uiSettingsSetup = uiSettingsServiceMock.createSetupContract();
-
-const mockLoadOrder: string[] = [];
-const mockUiNewPlatformSetup = jest.fn();
-const mockUiNewPlatformStart = jest.fn();
-const mockUiChromeBootstrap = jest.fn();
-const defaultParams = {
-  requireLegacyFiles: jest.fn(() => {
-    mockLoadOrder.push('legacy files');
-  }),
-  requireLegacyBootstrapModule: jest.fn(() => {
-    mockLoadOrder.push('ui/chrome');
-    return {
-      bootstrap: mockUiChromeBootstrap,
-    };
-  }),
-  requireNewPlatformShimModule: jest.fn(() => ({
-    __setup__: mockUiNewPlatformSetup,
-    __start__: mockUiNewPlatformStart,
-  })),
-};
-
-const defaultSetupDeps = {
-  core: {
-    application: applicationSetup,
-    context: contextSetup,
-    docLinks: docLinksSetup,
-    fatalErrors: fatalErrorsSetup,
-    injectedMetadata: injectedMetadataSetup,
-    notifications: notificationsSetup,
-    http: httpSetup,
-    uiSettings: uiSettingsSetup,
-  },
-  plugins: {},
-};
-
-const applicationStart = applicationServiceMock.createInternalStartContract();
-const docLinksStart = docLinksServiceMock.createStartContract();
-const httpStart = httpServiceMock.createStartContract();
-const chromeStart = chromeServiceMock.createStartContract();
-const i18nStart = i18nServiceMock.createStartContract();
-const injectedMetadataStart = injectedMetadataServiceMock.createStartContract();
-const notificationsStart = notificationServiceMock.createStartContract();
-const overlayStart = overlayServiceMock.createStartContract();
-const uiSettingsStart = uiSettingsServiceMock.createStartContract();
-const savedObjectsStart = savedObjectsServiceMock.createStartContract();
-const fatalErrorsStart = fatalErrorsServiceMock.createStartContract();
-const mockStorage = { getItem: jest.fn() } as any;
-
-const defaultStartDeps = {
-  core: {
-    application: applicationStart,
-    docLinks: docLinksStart,
-    http: httpStart,
-    chrome: chromeStart,
-    i18n: i18nStart,
-    injectedMetadata: injectedMetadataStart,
-    notifications: notificationsStart,
-    overlays: overlayStart,
-    uiSettings: uiSettingsStart,
-    savedObjects: savedObjectsStart,
-    fatalErrors: fatalErrorsStart,
-  },
-  lastSubUrlStorage: mockStorage,
-  targetDomElement: document.createElement('div'),
-  plugins: {},
-};
-
-afterEach(() => {
-  jest.clearAllMocks();
-  jest.resetModules();
-  mockLoadOrder.length = 0;
-});
-
-describe('#setup()', () => {
-  describe('default', () => {
-    it('initializes new platform shim module with core APIs', () => {
-      const legacyPlatform = new LegacyPlatformService({
-        ...defaultParams,
-      });
-
-      legacyPlatform.setup(defaultSetupDeps);
-
-      expect(mockUiNewPlatformSetup).toHaveBeenCalledTimes(1);
-      expect(mockUiNewPlatformSetup).toHaveBeenCalledWith(expect.any(Object), {});
-    });
-
-    it('throws error if requireNewPlatformShimModule is undefined', () => {
-      const legacyPlatform = new LegacyPlatformService({
-        ...defaultParams,
-        requireNewPlatformShimModule: undefined,
-      });
-
-      expect(() => {
-        legacyPlatform.setup(defaultSetupDeps);
-      }).toThrowErrorMatchingInlineSnapshot(
-        `"requireNewPlatformShimModule must be specified when rendering a legacy application"`
-      );
-
-      expect(mockUiNewPlatformSetup).not.toHaveBeenCalled();
-    });
-  });
-});
-
-describe('#start()', () => {
-  it('fetches and sets legacy lastSubUrls', () => {
-    chromeStart.navLinks.getAll.mockReturnValue([
-      { id: 'link1', baseUrl: 'http://wowza.com/app1', legacy: true } as any,
-    ]);
-    mockStorage.getItem.mockReturnValue('http://wowza.com/app1/subUrl');
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-    });
-
-    legacyPlatform.setup(defaultSetupDeps);
-    legacyPlatform.start({ ...defaultStartDeps, lastSubUrlStorage: mockStorage });
-
-    expect(chromeStart.navLinks.update).toHaveBeenCalledWith('link1', {
-      url: 'http://wowza.com/app1/subUrl',
-    });
-  });
-
-  it('initializes ui/new_platform with core APIs', () => {
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-    });
-
-    legacyPlatform.setup(defaultSetupDeps);
-    legacyPlatform.start(defaultStartDeps);
-
-    expect(mockUiNewPlatformStart).toHaveBeenCalledTimes(1);
-    expect(mockUiNewPlatformStart).toHaveBeenCalledWith(expect.any(Object), {});
-  });
-
-  it('throws error if requireNewPlatformShimeModule is undefined', () => {
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-      requireNewPlatformShimModule: undefined,
-    });
-
-    expect(() => {
-      legacyPlatform.start(defaultStartDeps);
-    }).toThrowErrorMatchingInlineSnapshot(
-      `"requireNewPlatformShimModule must be specified when rendering a legacy application"`
-    );
-
-    expect(mockUiNewPlatformStart).not.toHaveBeenCalled();
-  });
-
-  it('resolves getStartServices with core and plugin APIs', async () => {
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-    });
-
-    legacyPlatform.setup(defaultSetupDeps);
-    legacyPlatform.start(defaultStartDeps);
-
-    const { getStartServices } = mockUiNewPlatformSetup.mock.calls[0][0];
-    const [coreStart, pluginsStart] = await getStartServices();
-    expect(coreStart).toEqual(expect.any(Object));
-    expect(pluginsStart).toBe(defaultStartDeps.plugins);
-  });
-
-  it('passes the targetDomElement to legacy bootstrap module', () => {
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-    });
-
-    legacyPlatform.setup(defaultSetupDeps);
-    legacyPlatform.start(defaultStartDeps);
-
-    expect(mockUiChromeBootstrap).toHaveBeenCalledTimes(1);
-    expect(mockUiChromeBootstrap).toHaveBeenCalledWith(defaultStartDeps.targetDomElement);
-  });
-
-  describe('load order', () => {
-    it('loads ui/modules before ui/chrome, and both before legacy files', () => {
-      const legacyPlatform = new LegacyPlatformService({
-        ...defaultParams,
-      });
-
-      expect(mockLoadOrder).toEqual([]);
-
-      legacyPlatform.setup(defaultSetupDeps);
-      legacyPlatform.start(defaultStartDeps);
-
-      expect(mockLoadOrder).toMatchInlineSnapshot(`
-        Array [
-          "ui/chrome",
-          "legacy files",
-        ]
-      `);
-    });
-  });
-});
-
-describe('#stop()', () => {
-  it('does nothing if angular was not bootstrapped to targetDomElement', () => {
-    const targetDomElement = document.createElement('div');
-    targetDomElement.innerHTML = `
-      <h1>this should not be removed</h1>
-    `;
-
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-    });
-
-    legacyPlatform.stop();
-    expect(targetDomElement).toMatchInlineSnapshot(`
-      <div>
-        
-            
-        <h1>
-          this should not be removed
-        </h1>
-        
-          
-      </div>
-    `);
-  });
-
-  it('destroys the angular scope and empties the targetDomElement if angular is bootstrapped to targetDomElement', async () => {
-    const targetDomElement = document.createElement('div');
-    const scopeDestroySpy = jest.fn();
-
-    const legacyPlatform = new LegacyPlatformService({
-      ...defaultParams,
-    });
-
-    // simulate bootstrapping with a module "foo"
-    angular.module('foo', []).directive('bar', () => ({
-      restrict: 'E',
-      link($scope) {
-        $scope.$on('$destroy', scopeDestroySpy);
-      },
-    }));
-
-    targetDomElement.innerHTML = `
-      <bar></bar>
-    `;
-
-    angular.bootstrap(targetDomElement, ['foo']);
-
-    await legacyPlatform.setup(defaultSetupDeps);
-    legacyPlatform.start({ ...defaultStartDeps, targetDomElement });
-    legacyPlatform.stop();
-
-    expect(targetDomElement).toMatchInlineSnapshot(`
-      <div
-        class="ng-scope"
-      />
-    `);
-    expect(scopeDestroySpy).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/src/core/public/legacy/legacy_service.ts b/src/core/public/legacy/legacy_service.ts
deleted file mode 100644
index 78a9219f3d6940..00000000000000
--- a/src/core/public/legacy/legacy_service.ts
+++ /dev/null
@@ -1,204 +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 angular from 'angular';
-import { first } from 'rxjs/operators';
-import { Subject } from 'rxjs';
-import { InternalCoreSetup, InternalCoreStart } from '../core_system';
-import { LegacyCoreSetup, LegacyCoreStart, MountPoint } from '../';
-
-/** @internal */
-export interface LegacyPlatformParams {
-  requireLegacyFiles?: () => void;
-  requireLegacyBootstrapModule?: () => BootstrapModule;
-  requireNewPlatformShimModule?: () => {
-    __setup__: (legacyCore: LegacyCoreSetup, plugins: Record<string, unknown>) => void;
-    __start__: (legacyCore: LegacyCoreStart, plugins: Record<string, unknown>) => void;
-  };
-}
-
-interface SetupDeps {
-  core: InternalCoreSetup;
-  plugins: Record<string, unknown>;
-}
-
-interface StartDeps {
-  core: InternalCoreStart;
-  plugins: Record<string, unknown>;
-  lastSubUrlStorage?: Storage;
-  targetDomElement?: HTMLElement;
-}
-
-interface BootstrapModule {
-  bootstrap: MountPoint;
-}
-
-/**
- * The LegacyPlatformService is responsible for initializing
- * the legacy platform by injecting parts of the new platform
- * services into the legacy platform modules, like ui/modules,
- * and then bootstrapping the ui/chrome or ~~ui/test_harness~~ to
- * setup either the app or browser tests.
- */
-export class LegacyPlatformService {
-  /** Symbol to represent the legacy platform as a fake "plugin". Used by the ContextService */
-  public readonly legacyId = Symbol();
-  private bootstrapModule?: BootstrapModule;
-  private targetDomElement?: HTMLElement;
-  private readonly startDependencies$ = new Subject<[LegacyCoreStart, object, {}]>();
-  private readonly startDependencies = this.startDependencies$.pipe(first()).toPromise();
-
-  constructor(private readonly params: LegacyPlatformParams) {}
-
-  public setup({ core, plugins }: SetupDeps) {
-    // Always register legacy apps, even if not in legacy mode.
-    core.injectedMetadata.getLegacyMetadata().nav.forEach((navLink: any) =>
-      core.application.registerLegacyApp({
-        id: navLink.id,
-        order: navLink.order,
-        title: navLink.title,
-        euiIconType: navLink.euiIconType,
-        icon: navLink.icon,
-        appUrl: navLink.url,
-        subUrlBase: navLink.subUrlBase,
-        linkToLastSubUrl: navLink.linkToLastSubUrl,
-        category: navLink.category,
-        disableSubUrlTracking: navLink.disableSubUrlTracking,
-      })
-    );
-
-    const legacyCore: LegacyCoreSetup = {
-      ...core,
-      getStartServices: () => this.startDependencies,
-      application: {
-        ...core.application,
-        register: notSupported(`core.application.register()`),
-        registerMountContext: notSupported(`core.application.registerMountContext()`),
-      },
-    };
-
-    // Inject parts of the new platform into parts of the legacy platform
-    // so that legacy APIs/modules can mimic their new platform counterparts
-    if (core.injectedMetadata.getLegacyMode()) {
-      if (!this.params.requireNewPlatformShimModule) {
-        throw new Error(
-          `requireNewPlatformShimModule must be specified when rendering a legacy application`
-        );
-      }
-
-      this.params.requireNewPlatformShimModule().__setup__(legacyCore, plugins);
-    }
-  }
-
-  public start({
-    core,
-    targetDomElement,
-    plugins,
-    lastSubUrlStorage = window.sessionStorage,
-  }: StartDeps) {
-    // Initialize legacy sub urls
-    core.chrome.navLinks
-      .getAll()
-      .filter((link) => link.legacy)
-      .forEach((navLink) => {
-        const lastSubUrl = lastSubUrlStorage.getItem(`lastSubUrl:${navLink.baseUrl}`);
-        core.chrome.navLinks.update(navLink.id, {
-          url: lastSubUrl || navLink.url || navLink.baseUrl,
-        });
-      });
-
-    // Only import and bootstrap legacy platform if we're in legacy mode.
-    if (!core.injectedMetadata.getLegacyMode()) {
-      return;
-    }
-
-    const legacyCore: LegacyCoreStart = {
-      ...core,
-      application: {
-        applications$: core.application.applications$,
-        currentAppId$: core.application.currentAppId$,
-        capabilities: core.application.capabilities,
-        getUrlForApp: core.application.getUrlForApp,
-        navigateToApp: core.application.navigateToApp,
-        navigateToUrl: core.application.navigateToUrl,
-        registerMountContext: notSupported(`core.application.registerMountContext()`),
-      },
-    };
-
-    this.startDependencies$.next([legacyCore, plugins, {}]);
-
-    if (!this.params.requireNewPlatformShimModule) {
-      throw new Error(
-        `requireNewPlatformShimModule must be specified when rendering a legacy application`
-      );
-    }
-    if (!this.params.requireLegacyBootstrapModule) {
-      throw new Error(
-        `requireLegacyBootstrapModule must be specified when rendering a legacy application`
-      );
-    }
-
-    // Inject parts of the new platform into parts of the legacy platform
-    // so that legacy APIs/modules can mimic their new platform counterparts
-    this.params.requireNewPlatformShimModule().__start__(legacyCore, plugins);
-
-    // Load the bootstrap module before loading the legacy platform files so that
-    // the bootstrap module can modify the environment a bit first
-    this.bootstrapModule = this.params.requireLegacyBootstrapModule();
-
-    // require the files that will tie into the legacy platform
-    if (this.params.requireLegacyFiles) {
-      this.params.requireLegacyFiles();
-    }
-
-    if (!this.bootstrapModule) {
-      throw new Error('Bootstrap module must be loaded before `start`');
-    }
-
-    this.targetDomElement = targetDomElement;
-
-    // `targetDomElement` is always defined when in legacy mode
-    this.bootstrapModule.bootstrap(this.targetDomElement!);
-  }
-
-  public stop() {
-    if (!this.targetDomElement) {
-      return;
-    }
-
-    const angularRoot = angular.element(this.targetDomElement);
-    const injector$ = angularRoot.injector();
-
-    // if we haven't gotten to the point of bootstrapping
-    // angular, injector$ won't be defined
-    if (!injector$) {
-      return;
-    }
-
-    // destroy the root angular scope
-    injector$.get('$rootScope').$destroy();
-
-    // clear the inner html of the root angular element
-    this.targetDomElement.textContent = '';
-  }
-}
-
-const notSupported = (methodName: string) => (...args: any[]) => {
-  throw new Error(`${methodName} is not supported in the legacy platform.`);
-};
diff --git a/src/core/public/mocks.ts b/src/core/public/mocks.ts
index aefcb830d40bf0..8ed415c09806c7 100644
--- a/src/core/public/mocks.ts
+++ b/src/core/public/mocks.ts
@@ -42,7 +42,6 @@ export { fatalErrorsServiceMock } from './fatal_errors/fatal_errors_service.mock
 export { httpServiceMock } from './http/http_service.mock';
 export { i18nServiceMock } from './i18n/i18n_service.mock';
 export { injectedMetadataServiceMock } from './injected_metadata/injected_metadata_service.mock';
-export { legacyPlatformServiceMock } from './legacy/legacy_service.mock';
 export { notificationServiceMock } from './notifications/notifications_service.mock';
 export { overlayServiceMock } from './overlays/overlay_service.mock';
 export { uiSettingsServiceMock } from './ui_settings/ui_settings_service.mock';
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index cc37a3c7c09246..c473ea67d9bcdc 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -42,25 +42,18 @@ import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/type
 // @internal (undocumented)
 export function __kbnBootstrap__(): void;
 
-// @public
-export interface App<HistoryLocationState = unknown> extends AppBase {
-    appRoute?: string;
-    chromeless?: boolean;
-    exactRoute?: boolean;
-    mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>;
-}
-
 // @public (undocumented)
-export interface AppBase {
+export interface App<HistoryLocationState = unknown> {
+    appRoute?: string;
     capabilities?: Partial<Capabilities>;
     category?: AppCategory;
     chromeless?: boolean;
     defaultPath?: string;
     euiIconType?: string;
+    exactRoute?: boolean;
     icon?: string;
     id: string;
-    // @internal
-    legacy?: boolean;
+    mount: AppMount<HistoryLocationState> | AppMountDeprecated<HistoryLocationState>;
     navLinkStatus?: AppNavLinkStatus;
     order?: number;
     status?: AppStatus;
@@ -124,7 +117,7 @@ export interface ApplicationSetup {
 
 // @public (undocumented)
 export interface ApplicationStart {
-    applications$: Observable<ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo>>;
+    applications$: Observable<ReadonlyMap<string, PublicAppInfo>>;
     capabilities: RecursiveReadonly<Capabilities>;
     currentAppId$: Observable<string | undefined>;
     getUrlForApp(appId: string, options?: {
@@ -189,10 +182,10 @@ export enum AppStatus {
 export type AppUnmount = () => void;
 
 // @public
-export type AppUpdatableFields = Pick<AppBase, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'>;
+export type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath'>;
 
 // @public
-export type AppUpdater = (app: AppBase) => Partial<AppUpdatableFields> | undefined;
+export type AppUpdater = (app: App) => Partial<AppUpdatableFields> | undefined;
 
 // @public
 export function assertNever(x: never): never;
@@ -230,10 +223,6 @@ export type ChromeBreadcrumb = EuiBreadcrumb;
 
 // @public
 export interface ChromeDocTitle {
-    // @internal (undocumented)
-    __legacy: {
-        setBaseTitle(baseTitle: string): void;
-    };
     change(newTitle: string | string[]): void;
     reset(): void;
 }
@@ -293,28 +282,18 @@ export interface ChromeNavControls {
 
 // @public (undocumented)
 export interface ChromeNavLink {
-    // @deprecated
-    readonly active?: boolean;
     readonly baseUrl: string;
     readonly category?: AppCategory;
-    // @deprecated
     readonly disabled?: boolean;
-    // @deprecated
-    readonly disableSubUrlTracking?: boolean;
     readonly euiIconType?: string;
     readonly hidden?: boolean;
-    readonly href?: string;
+    readonly href: string;
     readonly icon?: string;
     readonly id: string;
-    // @internal
-    readonly legacy: boolean;
-    // @deprecated
-    readonly linkToLastSubUrl?: boolean;
     readonly order?: number;
-    // @deprecated
-    readonly subUrlBase?: string;
     readonly title: string;
     readonly tooltip?: string;
+    // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "AppBase"
     readonly url?: string;
 }
 
@@ -327,12 +306,14 @@ export interface ChromeNavLinks {
     getNavLinks$(): Observable<Array<Readonly<ChromeNavLink>>>;
     has(id: string): boolean;
     showOnly(id: string): void;
+    // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "AppBase"
+    //
     // @deprecated
     update(id: string, values: ChromeNavLinkUpdateableFields): ChromeNavLink | undefined;
 }
 
 // @public (undocumented)
-export type ChromeNavLinkUpdateableFields = Partial<Pick<ChromeNavLink, 'active' | 'disabled' | 'hidden' | 'url' | 'subUrlBase' | 'href'>>;
+export type ChromeNavLinkUpdateableFields = Partial<Pick<ChromeNavLink, 'disabled' | 'hidden' | 'url' | 'href'>>;
 
 // @public
 export interface ChromeRecentlyAccessed {
@@ -884,52 +865,6 @@ export interface IUiSettingsClient {
     set: (key: string, value: any) => Promise<boolean>;
 }
 
-// @public (undocumented)
-export interface LegacyApp extends AppBase {
-    // (undocumented)
-    appUrl: string;
-    // (undocumented)
-    disableSubUrlTracking?: boolean;
-    // (undocumented)
-    linkToLastSubUrl?: boolean;
-    // (undocumented)
-    subUrlBase?: string;
-}
-
-// @public @deprecated
-export interface LegacyCoreSetup extends CoreSetup<any, any> {
-    // Warning: (ae-forgotten-export) The symbol "InjectedMetadataSetup" needs to be exported by the entry point index.d.ts
-    //
-    // @deprecated (undocumented)
-    injectedMetadata: InjectedMetadataSetup;
-}
-
-// @public @deprecated
-export interface LegacyCoreStart extends CoreStart {
-    // Warning: (ae-forgotten-export) The symbol "InjectedMetadataStart" needs to be exported by the entry point index.d.ts
-    //
-    // @deprecated (undocumented)
-    injectedMetadata: InjectedMetadataStart;
-}
-
-// @public (undocumented)
-export interface LegacyNavLink {
-    // (undocumented)
-    category?: AppCategory;
-    // (undocumented)
-    euiIconType?: string;
-    // (undocumented)
-    icon?: string;
-    // (undocumented)
-    id: string;
-    // (undocumented)
-    order: number;
-    // (undocumented)
-    title: string;
-    // (undocumented)
-    url: string;
-}
-
 // @public
 export function modifyUrl(url: string, urlModifier: (urlParts: URLMeaningfulParts) => Partial<URLMeaningfulParts> | void): string;
 
@@ -1043,19 +978,11 @@ export type PluginOpaqueId = symbol;
 
 // @public
 export type PublicAppInfo = Omit<App, 'mount' | 'updater$'> & {
-    legacy: false;
     status: AppStatus;
     navLinkStatus: AppNavLinkStatus;
     appRoute: string;
 };
 
-// @public
-export type PublicLegacyAppInfo = Omit<LegacyApp, 'updater$'> & {
-    legacy: true;
-    status: AppStatus;
-    navLinkStatus: AppNavLinkStatus;
-};
-
 // @public
 export type PublicUiSettingsParams = Omit<UiSettingsParams, 'schema'>;
 
@@ -1548,6 +1475,6 @@ export interface UserProvidedValues<T = any> {
 
 // Warnings were encountered during analysis:
 //
-// src/core/public/core_system.ts:215:21 - (ae-forgotten-export) The symbol "InternalApplicationStart" needs to be exported by the entry point index.d.ts
+// src/core/public/core_system.ts:185:21 - (ae-forgotten-export) The symbol "InternalApplicationStart" needs to be exported by the entry point index.d.ts
 
 ```
diff --git a/src/core/public/rendering/index.ts b/src/core/public/rendering/index.ts
index 7c1ea7031b763c..1de82a50a36b5b 100644
--- a/src/core/public/rendering/index.ts
+++ b/src/core/public/rendering/index.ts
@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export { RenderingService, RenderingStart } from './rendering_service';
+export { RenderingService } from './rendering_service';
diff --git a/src/core/public/rendering/rendering_service.mock.ts b/src/core/public/rendering/rendering_service.mock.ts
index bb4e7cb49f1509..bb4723e69ab5e8 100644
--- a/src/core/public/rendering/rendering_service.mock.ts
+++ b/src/core/public/rendering/rendering_service.mock.ts
@@ -17,25 +17,16 @@
  * under the License.
  */
 
-import { RenderingStart, RenderingService } from './rendering_service';
-
-const createStartContractMock = () => {
-  const setupContract: jest.Mocked<RenderingStart> = {
-    legacyTargetDomElement: document.createElement('div'),
-  };
-  return setupContract;
-};
+import { RenderingService } from './rendering_service';
 
 type RenderingServiceContract = PublicMethodsOf<RenderingService>;
 const createMock = () => {
   const mocked: jest.Mocked<RenderingServiceContract> = {
     start: jest.fn(),
   };
-  mocked.start.mockReturnValue(createStartContractMock());
   return mocked;
 };
 
 export const renderingServiceMock = {
   create: createMock,
-  createStartContract: createStartContractMock,
 };
diff --git a/src/core/public/rendering/rendering_service.test.tsx b/src/core/public/rendering/rendering_service.test.tsx
index 437a602a3d4473..37658cb51c46f4 100644
--- a/src/core/public/rendering/rendering_service.test.tsx
+++ b/src/core/public/rendering/rendering_service.test.tsx
@@ -23,7 +23,6 @@ import { act } from 'react-dom/test-utils';
 import { RenderingService } from './rendering_service';
 import { applicationServiceMock } from '../application/application_service.mock';
 import { chromeServiceMock } from '../chrome/chrome_service.mock';
-import { injectedMetadataServiceMock } from '../injected_metadata/injected_metadata_service.mock';
 import { overlayServiceMock } from '../overlays/overlay_service.mock';
 import { BehaviorSubject } from 'rxjs';
 
@@ -31,7 +30,6 @@ describe('RenderingService#start', () => {
   let application: ReturnType<typeof applicationServiceMock.createInternalStartContract>;
   let chrome: ReturnType<typeof chromeServiceMock.createStartContract>;
   let overlays: ReturnType<typeof overlayServiceMock.createStartContract>;
-  let injectedMetadata: ReturnType<typeof injectedMetadataServiceMock.createStartContract>;
   let targetDomElement: HTMLDivElement;
   let rendering: RenderingService;
 
@@ -45,8 +43,6 @@ describe('RenderingService#start', () => {
     overlays = overlayServiceMock.createStartContract();
     overlays.banners.getComponent.mockReturnValue(<div>I&apos;m a banner!</div>);
 
-    injectedMetadata = injectedMetadataServiceMock.createStartContract();
-
     targetDomElement = document.createElement('div');
 
     rendering = new RenderingService();
@@ -56,20 +52,14 @@ describe('RenderingService#start', () => {
     return rendering.start({
       application,
       chrome,
-      injectedMetadata,
       overlays,
       targetDomElement,
     });
   };
 
-  describe('standard mode', () => {
-    beforeEach(() => {
-      injectedMetadata.getLegacyMode.mockReturnValue(false);
-    });
-
-    it('renders application service into provided DOM element', () => {
-      startService();
-      expect(targetDomElement.querySelector('div.application')).toMatchInlineSnapshot(`
+  it('renders application service into provided DOM element', () => {
+    startService();
+    expect(targetDomElement.querySelector('div.application')).toMatchInlineSnapshot(`
               <div
                 class="application class-name"
               >
@@ -78,50 +68,50 @@ describe('RenderingService#start', () => {
                 </div>
               </div>
           `);
-    });
+  });
 
-    it('adds the `chrome-hidden` class to the AppWrapper when chrome is hidden', () => {
-      const isVisible$ = new BehaviorSubject(true);
-      chrome.getIsVisible$.mockReturnValue(isVisible$);
-      startService();
+  it('adds the `chrome-hidden` class to the AppWrapper when chrome is hidden', () => {
+    const isVisible$ = new BehaviorSubject(true);
+    chrome.getIsVisible$.mockReturnValue(isVisible$);
+    startService();
 
-      const appWrapper = targetDomElement.querySelector('div.app-wrapper')!;
-      expect(appWrapper.className).toEqual('app-wrapper');
+    const appWrapper = targetDomElement.querySelector('div.app-wrapper')!;
+    expect(appWrapper.className).toEqual('app-wrapper');
 
-      act(() => isVisible$.next(false));
-      expect(appWrapper.className).toEqual('app-wrapper hidden-chrome');
+    act(() => isVisible$.next(false));
+    expect(appWrapper.className).toEqual('app-wrapper hidden-chrome');
 
-      act(() => isVisible$.next(true));
-      expect(appWrapper.className).toEqual('app-wrapper');
-    });
+    act(() => isVisible$.next(true));
+    expect(appWrapper.className).toEqual('app-wrapper');
+  });
 
-    it('adds the application classes to the AppContainer', () => {
-      const applicationClasses$ = new BehaviorSubject<string[]>([]);
-      chrome.getApplicationClasses$.mockReturnValue(applicationClasses$);
-      startService();
+  it('adds the application classes to the AppContainer', () => {
+    const applicationClasses$ = new BehaviorSubject<string[]>([]);
+    chrome.getApplicationClasses$.mockReturnValue(applicationClasses$);
+    startService();
 
-      const appContainer = targetDomElement.querySelector('div.application')!;
-      expect(appContainer.className).toEqual('application');
+    const appContainer = targetDomElement.querySelector('div.application')!;
+    expect(appContainer.className).toEqual('application');
 
-      act(() => applicationClasses$.next(['classA', 'classB']));
-      expect(appContainer.className).toEqual('application classA classB');
+    act(() => applicationClasses$.next(['classA', 'classB']));
+    expect(appContainer.className).toEqual('application classA classB');
 
-      act(() => applicationClasses$.next(['classC']));
-      expect(appContainer.className).toEqual('application classC');
+    act(() => applicationClasses$.next(['classC']));
+    expect(appContainer.className).toEqual('application classC');
 
-      act(() => applicationClasses$.next([]));
-      expect(appContainer.className).toEqual('application');
-    });
+    act(() => applicationClasses$.next([]));
+    expect(appContainer.className).toEqual('application');
+  });
 
-    it('contains wrapper divs', () => {
-      startService();
-      expect(targetDomElement.querySelector('div.app-wrapper')).toBeDefined();
-      expect(targetDomElement.querySelector('div.app-wrapper-pannel')).toBeDefined();
-    });
+  it('contains wrapper divs', () => {
+    startService();
+    expect(targetDomElement.querySelector('div.app-wrapper')).toBeDefined();
+    expect(targetDomElement.querySelector('div.app-wrapper-pannel')).toBeDefined();
+  });
 
-    it('renders the banner UI', () => {
-      startService();
-      expect(targetDomElement.querySelector('#globalBannerList')).toMatchInlineSnapshot(`
+  it('renders the banner UI', () => {
+    startService();
+    expect(targetDomElement.querySelector('#globalBannerList')).toMatchInlineSnapshot(`
               <div
                 id="globalBannerList"
               >
@@ -130,36 +120,5 @@ describe('RenderingService#start', () => {
                 </div>
               </div>
           `);
-    });
-  });
-
-  describe('legacy mode', () => {
-    beforeEach(() => {
-      injectedMetadata.getLegacyMode.mockReturnValue(true);
-    });
-
-    it('renders into provided DOM element', () => {
-      startService();
-
-      expect(targetDomElement).toMatchInlineSnapshot(`
-          <div>
-            <div
-              class="content"
-              data-test-subj="kibanaChrome"
-            >
-              <div>
-                Hello chrome!
-              </div>
-              <div />
-            </div>
-          </div>
-      `);
-    });
-
-    it('returns a div for the legacy service to render into', () => {
-      const { legacyTargetDomElement } = startService();
-
-      expect(targetDomElement.contains(legacyTargetDomElement!)).toBe(true);
-    });
   });
 });
diff --git a/src/core/public/rendering/rendering_service.tsx b/src/core/public/rendering/rendering_service.tsx
index 58b8c1921e333b..a20e14dbf61c5b 100644
--- a/src/core/public/rendering/rendering_service.tsx
+++ b/src/core/public/rendering/rendering_service.tsx
@@ -23,14 +23,12 @@ import { I18nProvider } from '@kbn/i18n/react';
 
 import { InternalChromeStart } from '../chrome';
 import { InternalApplicationStart } from '../application';
-import { InjectedMetadataStart } from '../injected_metadata';
 import { OverlayStart } from '../overlays';
 import { AppWrapper, AppContainer } from './app_containers';
 
 interface StartDeps {
   application: InternalApplicationStart;
   chrome: InternalChromeStart;
-  injectedMetadata: InjectedMetadataStart;
   overlays: OverlayStart;
   targetDomElement: HTMLDivElement;
 }
@@ -41,53 +39,28 @@ interface StartDeps {
  * @internalRemarks Currently this only renders Chrome UI. Notifications and
  * Overlays UI should be moved here as well.
  *
- * @returns a DOM element for the legacy platform to render into.
- *
  * @internal
  */
 export class RenderingService {
-  start({
-    application,
-    chrome,
-    injectedMetadata,
-    overlays,
-    targetDomElement,
-  }: StartDeps): RenderingStart {
+  start({ application, chrome, overlays, targetDomElement }: StartDeps) {
     const chromeUi = chrome.getHeaderComponent();
     const appUi = application.getComponent();
     const bannerUi = overlays.banners.getComponent();
 
-    const legacyMode = injectedMetadata.getLegacyMode();
-    const legacyRef = legacyMode ? React.createRef<HTMLDivElement>() : null;
-
     ReactDOM.render(
       <I18nProvider>
         <div className="content" data-test-subj="kibanaChrome">
           {chromeUi}
 
-          {!legacyMode && (
-            <AppWrapper chromeVisible$={chrome.getIsVisible$()}>
-              <div className="app-wrapper-panel">
-                <div id="globalBannerList">{bannerUi}</div>
-                <AppContainer classes$={chrome.getApplicationClasses$()}>{appUi}</AppContainer>
-              </div>
-            </AppWrapper>
-          )}
-
-          {legacyMode && <div ref={legacyRef} />}
+          <AppWrapper chromeVisible$={chrome.getIsVisible$()}>
+            <div className="app-wrapper-panel">
+              <div id="globalBannerList">{bannerUi}</div>
+              <AppContainer classes$={chrome.getApplicationClasses$()}>{appUi}</AppContainer>
+            </div>
+          </AppWrapper>
         </div>
       </I18nProvider>,
       targetDomElement
     );
-
-    return {
-      // When in legacy mode, return legacy div, otherwise undefined.
-      legacyTargetDomElement: legacyRef ? legacyRef.current! : undefined,
-    };
   }
 }
-
-/** @internal */
-export interface RenderingStart {
-  legacyTargetDomElement?: HTMLDivElement;
-}
diff --git a/src/core/server/legacy/plugins/__snapshots__/get_nav_links.test.ts.snap b/src/core/server/legacy/plugins/__snapshots__/get_nav_links.test.ts.snap
deleted file mode 100644
index c1b7164908ed68..00000000000000
--- a/src/core/server/legacy/plugins/__snapshots__/get_nav_links.test.ts.snap
+++ /dev/null
@@ -1,56 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[` 1`] = `
-Array [
-  Object {
-    "category": undefined,
-    "disableSubUrlTracking": undefined,
-    "disabled": false,
-    "euiIconType": undefined,
-    "hidden": false,
-    "icon": undefined,
-    "id": "link-a",
-    "linkToLastSubUrl": true,
-    "order": 0,
-    "subUrlBase": "/some-custom-url",
-    "title": "AppA",
-    "tooltip": "",
-    "url": "/some-custom-url",
-  },
-  Object {
-    "category": undefined,
-    "disableSubUrlTracking": true,
-    "disabled": false,
-    "euiIconType": undefined,
-    "hidden": false,
-    "icon": undefined,
-    "id": "link-b",
-    "linkToLastSubUrl": true,
-    "order": 0,
-    "subUrlBase": "/url-b",
-    "title": "AppB",
-    "tooltip": "",
-    "url": "/url-b",
-  },
-  Object {
-    "category": undefined,
-    "euiIconType": undefined,
-    "icon": undefined,
-    "id": "app-a",
-    "linkToLastSubUrl": true,
-    "order": 0,
-    "title": "AppA",
-    "url": "/app/app-a",
-  },
-  Object {
-    "category": undefined,
-    "euiIconType": undefined,
-    "icon": undefined,
-    "id": "app-b",
-    "linkToLastSubUrl": true,
-    "order": 0,
-    "title": "AppB",
-    "url": "/app/app-b",
-  },
-]
-`;
diff --git a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
index f3ec2ed8335c5a..82e04496ffc3e6 100644
--- a/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
+++ b/src/core/server/legacy/plugins/find_legacy_plugin_specs.ts
@@ -31,7 +31,6 @@ import { collectUiExports as collectLegacyUiExports } from '../../../../legacy/u
 import { LoggerFactory } from '../../logging';
 import { PackageInfo } from '../../config';
 import { LegacyPluginSpec, LegacyPluginPack, LegacyConfig } from '../types';
-import { getNavLinks } from './get_nav_links';
 
 export async function findLegacyPluginSpecs(
   settings: unknown,
@@ -125,13 +124,12 @@ export async function findLegacyPluginSpecs(
     log$.pipe(toArray())
   ).toPromise();
   const uiExports = collectLegacyUiExports(pluginSpecs);
-  const navLinks = getNavLinks(uiExports, pluginSpecs);
 
   return {
     disabledPluginSpecs,
     pluginSpecs,
     pluginExtendedConfig: configToMutate,
     uiExports,
-    navLinks,
+    navLinks: [],
   };
 }
diff --git a/src/core/server/legacy/plugins/get_nav_links.test.ts b/src/core/server/legacy/plugins/get_nav_links.test.ts
deleted file mode 100644
index af10706d0ea088..00000000000000
--- a/src/core/server/legacy/plugins/get_nav_links.test.ts
+++ /dev/null
@@ -1,288 +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 { LegacyUiExports, LegacyPluginSpec, LegacyAppSpec, LegacyNavLinkSpec } from '../types';
-import { getNavLinks } from './get_nav_links';
-
-const createLegacyExports = ({
-  uiAppSpecs = [],
-  navLinkSpecs = [],
-}: {
-  uiAppSpecs?: LegacyAppSpec[];
-  navLinkSpecs?: LegacyNavLinkSpec[];
-}): LegacyUiExports => ({
-  uiAppSpecs,
-  navLinkSpecs,
-  injectedVarsReplacers: [],
-  defaultInjectedVarProviders: [],
-  savedObjectMappings: [],
-  savedObjectSchemas: {},
-  savedObjectMigrations: {},
-  savedObjectValidations: {},
-  savedObjectsManagement: {},
-});
-
-const createPluginSpecs = (...ids: string[]): LegacyPluginSpec[] =>
-  ids.map(
-    (id) =>
-      ({
-        getId: () => id,
-      } as LegacyPluginSpec)
-  );
-
-describe('getNavLinks', () => {
-  describe('generating from uiAppSpecs', () => {
-    it('generates navlinks from legacy app specs', () => {
-      const navlinks = getNavLinks(
-        createLegacyExports({
-          uiAppSpecs: [
-            {
-              id: 'app-a',
-              title: 'AppA',
-              pluginId: 'pluginA',
-            },
-            {
-              id: 'app-b',
-              title: 'AppB',
-              pluginId: 'pluginA',
-            },
-          ],
-        }),
-        createPluginSpecs('pluginA')
-      );
-
-      expect(navlinks.length).toEqual(2);
-      expect(navlinks[0]).toEqual(
-        expect.objectContaining({
-          id: 'app-a',
-          title: 'AppA',
-          url: '/app/app-a',
-        })
-      );
-      expect(navlinks[1]).toEqual(
-        expect.objectContaining({
-          id: 'app-b',
-          title: 'AppB',
-          url: '/app/app-b',
-        })
-      );
-    });
-
-    it('uses the app id to generates the navlink id even if pluginId is specified', () => {
-      const navlinks = getNavLinks(
-        createLegacyExports({
-          uiAppSpecs: [
-            {
-              id: 'app-a',
-              title: 'AppA',
-              pluginId: 'pluginA',
-            },
-            {
-              id: 'app-b',
-              title: 'AppB',
-              pluginId: 'pluginA',
-            },
-          ],
-        }),
-        createPluginSpecs('pluginA')
-      );
-
-      expect(navlinks.length).toEqual(2);
-      expect(navlinks[0].id).toEqual('app-a');
-      expect(navlinks[1].id).toEqual('app-b');
-    });
-
-    it('throws if an app reference a missing plugin', () => {
-      expect(() => {
-        getNavLinks(
-          createLegacyExports({
-            uiAppSpecs: [
-              {
-                id: 'app-a',
-                title: 'AppA',
-                pluginId: 'notExistingPlugin',
-              },
-            ],
-          }),
-          createPluginSpecs('pluginA')
-        );
-      }).toThrowErrorMatchingInlineSnapshot(`"Unknown plugin id \\"notExistingPlugin\\""`);
-    });
-
-    it('uses all known properties of the navlink', () => {
-      const navlinks = getNavLinks(
-        createLegacyExports({
-          uiAppSpecs: [
-            {
-              id: 'app-a',
-              title: 'AppA',
-              category: {
-                id: 'foo',
-                label: 'My Category',
-              },
-              order: 42,
-              url: '/some-custom-url',
-              icon: 'fa-snowflake',
-              euiIconType: 'euiIcon',
-              linkToLastSubUrl: true,
-              hidden: false,
-            },
-          ],
-        }),
-        []
-      );
-      expect(navlinks.length).toBe(1);
-      expect(navlinks[0]).toEqual({
-        id: 'app-a',
-        title: 'AppA',
-        category: {
-          id: 'foo',
-          label: 'My Category',
-        },
-        order: 42,
-        url: '/some-custom-url',
-        icon: 'fa-snowflake',
-        euiIconType: 'euiIcon',
-        linkToLastSubUrl: true,
-      });
-    });
-  });
-
-  describe('generating from navLinkSpecs', () => {
-    it('generates navlinks from legacy navLink specs', () => {
-      const navlinks = getNavLinks(
-        createLegacyExports({
-          navLinkSpecs: [
-            {
-              id: 'link-a',
-              title: 'AppA',
-              url: '/some-custom-url',
-            },
-            {
-              id: 'link-b',
-              title: 'AppB',
-              url: '/some-other-url',
-              disableSubUrlTracking: true,
-            },
-          ],
-        }),
-        createPluginSpecs('pluginA')
-      );
-
-      expect(navlinks.length).toEqual(2);
-      expect(navlinks[0]).toEqual(
-        expect.objectContaining({
-          id: 'link-a',
-          title: 'AppA',
-          url: '/some-custom-url',
-          hidden: false,
-          disabled: false,
-        })
-      );
-      expect(navlinks[1]).toEqual(
-        expect.objectContaining({
-          id: 'link-b',
-          title: 'AppB',
-          url: '/some-other-url',
-          disableSubUrlTracking: true,
-        })
-      );
-    });
-
-    it('only uses known properties to create the navlink', () => {
-      const navlinks = getNavLinks(
-        createLegacyExports({
-          navLinkSpecs: [
-            {
-              id: 'link-a',
-              title: 'AppA',
-              category: {
-                id: 'foo',
-                label: 'My Second Cat',
-              },
-              order: 72,
-              url: '/some-other-custom',
-              subUrlBase: '/some-other-custom/sub',
-              disableSubUrlTracking: true,
-              icon: 'fa-corn',
-              euiIconType: 'euiIconBis',
-              linkToLastSubUrl: false,
-              hidden: false,
-              tooltip: 'My other tooltip',
-            },
-          ],
-        }),
-        []
-      );
-      expect(navlinks.length).toBe(1);
-      expect(navlinks[0]).toEqual({
-        id: 'link-a',
-        title: 'AppA',
-        category: {
-          id: 'foo',
-          label: 'My Second Cat',
-        },
-        order: 72,
-        url: '/some-other-custom',
-        subUrlBase: '/some-other-custom/sub',
-        disableSubUrlTracking: true,
-        icon: 'fa-corn',
-        euiIconType: 'euiIconBis',
-        linkToLastSubUrl: false,
-        hidden: false,
-        disabled: false,
-        tooltip: 'My other tooltip',
-      });
-    });
-  });
-
-  describe('generating from both apps and navlinks', () => {
-    const navlinks = getNavLinks(
-      createLegacyExports({
-        uiAppSpecs: [
-          {
-            id: 'app-a',
-            title: 'AppA',
-          },
-          {
-            id: 'app-b',
-            title: 'AppB',
-          },
-        ],
-        navLinkSpecs: [
-          {
-            id: 'link-a',
-            title: 'AppA',
-            url: '/some-custom-url',
-          },
-          {
-            id: 'link-b',
-            title: 'AppB',
-            url: '/url-b',
-            disableSubUrlTracking: true,
-          },
-        ],
-      }),
-      []
-    );
-
-    expect(navlinks.length).toBe(4);
-    expect(navlinks).toMatchSnapshot();
-  });
-});
diff --git a/src/core/server/legacy/plugins/get_nav_links.ts b/src/core/server/legacy/plugins/get_nav_links.ts
deleted file mode 100644
index b1d22df41e3454..00000000000000
--- a/src/core/server/legacy/plugins/get_nav_links.ts
+++ /dev/null
@@ -1,82 +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 {
-  LegacyUiExports,
-  LegacyNavLink,
-  LegacyPluginSpec,
-  LegacyNavLinkSpec,
-  LegacyAppSpec,
-} from '../types';
-
-function legacyAppToNavLink(spec: LegacyAppSpec): LegacyNavLink {
-  if (!spec.id) {
-    throw new Error('Every app must specify an id');
-  }
-  return {
-    id: spec.id,
-    category: spec.category,
-    title: spec.title ?? spec.id,
-    order: typeof spec.order === 'number' ? spec.order : 0,
-    icon: spec.icon,
-    euiIconType: spec.euiIconType,
-    url: spec.url || `/app/${spec.id}`,
-    linkToLastSubUrl: spec.linkToLastSubUrl ?? true,
-  };
-}
-
-function legacyLinkToNavLink(spec: LegacyNavLinkSpec): LegacyNavLink {
-  return {
-    id: spec.id,
-    category: spec.category,
-    title: spec.title,
-    order: typeof spec.order === 'number' ? spec.order : 0,
-    url: spec.url,
-    subUrlBase: spec.subUrlBase || spec.url,
-    disableSubUrlTracking: spec.disableSubUrlTracking,
-    icon: spec.icon,
-    euiIconType: spec.euiIconType,
-    linkToLastSubUrl: spec.linkToLastSubUrl ?? true,
-    hidden: spec.hidden ?? false,
-    disabled: spec.disabled ?? false,
-    tooltip: spec.tooltip ?? '',
-  };
-}
-
-function isHidden(app: LegacyAppSpec) {
-  return app.listed === false || app.hidden === true;
-}
-
-export function getNavLinks(uiExports: LegacyUiExports, pluginSpecs: LegacyPluginSpec[]) {
-  const navLinkSpecs = uiExports.navLinkSpecs || [];
-  const appSpecs = (uiExports.uiAppSpecs || []).filter(
-    (app) => app !== undefined && !isHidden(app)
-  ) as LegacyAppSpec[];
-
-  const pluginIds = (pluginSpecs || []).map((spec) => spec.getId());
-  appSpecs.forEach((spec) => {
-    if (spec.pluginId && !pluginIds.includes(spec.pluginId)) {
-      throw new Error(`Unknown plugin id "${spec.pluginId}"`);
-    }
-  });
-
-  return [...navLinkSpecs.map(legacyLinkToNavLink), ...appSpecs.map(legacyAppToNavLink)].sort(
-    (a, b) => a.order - b.order
-  );
-}
diff --git a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
index 5ff5d69f96f707..ab828a1780425a 100644
--- a/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
+++ b/src/core/server/rendering/__snapshots__/rendering_service.test.ts.snap
@@ -46,7 +46,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -100,7 +99,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -158,7 +156,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -212,7 +209,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
@@ -266,7 +262,6 @@ Object {
     },
     "version": Any<String>,
   },
-  "legacyMode": false,
   "serverBasePath": "/mock-server-basepath",
   "uiPlugins": Array [],
   "vars": Object {},
diff --git a/src/core/server/rendering/rendering_service.tsx b/src/core/server/rendering/rendering_service.tsx
index e7ee0b16fce081..7761c89044f6fa 100644
--- a/src/core/server/rendering/rendering_service.tsx
+++ b/src/core/server/rendering/rendering_service.tsx
@@ -82,7 +82,6 @@ export class RenderingService implements CoreService<InternalRenderingServiceSet
             basePath,
             serverBasePath,
             env,
-            legacyMode: false,
             anonymousStatusPage: status.isStatusPageAnonymous(),
             i18n: {
               translationsUrl: `${basePath}/translations/${i18n.getLocale()}.json`,
diff --git a/src/core/server/rendering/types.ts b/src/core/server/rendering/types.ts
index d41c308ac66a4f..fb68921ca86364 100644
--- a/src/core/server/rendering/types.ts
+++ b/src/core/server/rendering/types.ts
@@ -45,7 +45,6 @@ export interface RenderingMetadata {
       mode: EnvironmentMode;
       packageInfo: PackageInfo;
     };
-    legacyMode: boolean;
     anonymousStatusPage: boolean;
     i18n: {
       translationsUrl: string;
diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
index 09357072a13a63..3bd4d66a693b1c 100644
--- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts
@@ -35,5 +35,5 @@ interface Services {
  */
 export function createSavedDashboardLoader(services: Services) {
   const SavedDashboard = createSavedDashboardClass(services);
-  return new SavedObjectLoader(SavedDashboard, services.savedObjectsClient, services.chrome);
+  return new SavedObjectLoader(SavedDashboard, services.savedObjectsClient);
 }
diff --git a/src/plugins/discover/public/saved_searches/saved_searches.ts b/src/plugins/discover/public/saved_searches/saved_searches.ts
index 09be10b1374943..0bc332ed8ec744 100644
--- a/src/plugins/discover/public/saved_searches/saved_searches.ts
+++ b/src/plugins/discover/public/saved_searches/saved_searches.ts
@@ -22,11 +22,7 @@ import { createSavedSearchClass } from './_saved_search';
 
 export function createSavedSearchesLoader(services: SavedObjectKibanaServices) {
   const SavedSearchClass = createSavedSearchClass(services);
-  const savedSearchLoader = new SavedObjectLoader(
-    SavedSearchClass,
-    services.savedObjectsClient,
-    services.chrome
-  );
+  const savedSearchLoader = new SavedObjectLoader(SavedSearchClass, services.savedObjectsClient);
   // Customize loader properties since adding an 's' on type doesn't work for type 'search' .
   savedSearchLoader.loaderProperties = {
     name: 'searches',
diff --git a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
index 780cff9f4be7e3..184178ba80e846 100644
--- a/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
+++ b/src/plugins/embeddable/public/lib/state_transfer/embeddable_state_transfer.ts
@@ -18,12 +18,7 @@
  */
 
 import { cloneDeep } from 'lodash';
-import {
-  ScopedHistory,
-  ApplicationStart,
-  PublicLegacyAppInfo,
-  PublicAppInfo,
-} from '../../../../../core/public';
+import { ScopedHistory, ApplicationStart, PublicAppInfo } from '../../../../../core/public';
 import {
   EmbeddableEditorState,
   isEmbeddableEditorState,
@@ -41,7 +36,7 @@ export class EmbeddableStateTransfer {
   constructor(
     private navigateToApp: ApplicationStart['navigateToApp'],
     private scopedHistory?: ScopedHistory,
-    private appList?: ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo> | undefined
+    private appList?: ReadonlyMap<string, PublicAppInfo> | undefined
   ) {}
 
   /**
diff --git a/src/plugins/embeddable/public/plugin.tsx b/src/plugins/embeddable/public/plugin.tsx
index fb09729ab71c32..2ca31994b722d8 100644
--- a/src/plugins/embeddable/public/plugin.tsx
+++ b/src/plugins/embeddable/public/plugin.tsx
@@ -29,7 +29,6 @@ import {
   Plugin,
   ScopedHistory,
   PublicAppInfo,
-  PublicLegacyAppInfo,
 } from '../../../core/public';
 import { EmbeddableFactoryRegistry, EmbeddableFactoryProvider } from './types';
 import { bootstrap } from './bootstrap';
@@ -92,7 +91,7 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
   private customEmbeddableFactoryProvider?: EmbeddableFactoryProvider;
   private outgoingOnlyStateTransfer: EmbeddableStateTransfer = {} as EmbeddableStateTransfer;
   private isRegistryReady = false;
-  private appList?: ReadonlyMap<string, PublicAppInfo | PublicLegacyAppInfo>;
+  private appList?: ReadonlyMap<string, PublicAppInfo>;
   private appListSubscription?: Subscription;
 
   constructor(initializerContext: PluginInitializerContext) {}
diff --git a/src/plugins/kibana_legacy/public/angular/angular_config.tsx b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
index eafcbfda3db003..9dae615bc3848d 100644
--- a/src/plugins/kibana_legacy/public/angular/angular_config.tsx
+++ b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
@@ -27,12 +27,12 @@ import {
 } from 'angular';
 import $ from 'jquery';
 import { set } from '@elastic/safer-lodash-set';
-import { cloneDeep, forOwn, get } from 'lodash';
+import { get } from 'lodash';
 import * as Rx from 'rxjs';
 import { ChromeBreadcrumb, EnvironmentMode, PackageInfo } from 'kibana/public';
 import { History } from 'history';
 
-import { CoreStart, LegacyCoreStart } from 'kibana/public';
+import { CoreStart } from 'kibana/public';
 import { isSystemApiRequest } from '../utils';
 import { formatAngularHttpError, isAngularHttpError } from '../notify/lib';
 
@@ -72,32 +72,18 @@ function isDummyRoute($route: any, isLocalAngular: boolean) {
 
 export const configureAppAngularModule = (
   angularModule: IModule,
-  newPlatform:
-    | LegacyCoreStart
-    | {
-        core: CoreStart;
-        readonly env: {
-          mode: Readonly<EnvironmentMode>;
-          packageInfo: Readonly<PackageInfo>;
-        };
-      },
+  newPlatform: {
+    core: CoreStart;
+    readonly env: {
+      mode: Readonly<EnvironmentMode>;
+      packageInfo: Readonly<PackageInfo>;
+    };
+  },
   isLocalAngular: boolean,
   getHistory?: () => History
 ) => {
   const core = 'core' in newPlatform ? newPlatform.core : newPlatform;
-  const packageInfo =
-    'env' in newPlatform
-      ? newPlatform.env.packageInfo
-      : newPlatform.injectedMetadata.getLegacyMetadata();
-
-  if ('injectedMetadata' in newPlatform) {
-    forOwn(newPlatform.injectedMetadata.getInjectedVars(), (val, name) => {
-      if (name !== undefined) {
-        // The legacy platform modifies some of these values, clone to an unfrozen object.
-        angularModule.value(name, cloneDeep(val));
-      }
-    });
-  }
+  const packageInfo = newPlatform.env.packageInfo;
 
   angularModule
     .value('kbnVersion', packageInfo.version)
@@ -105,13 +91,7 @@ export const configureAppAngularModule = (
     .value('buildSha', packageInfo.buildSha)
     .value('esUrl', getEsUrl(core))
     .value('uiCapabilities', core.application.capabilities)
-    .config(
-      setupCompileProvider(
-        'injectedMetadata' in newPlatform
-          ? newPlatform.injectedMetadata.getLegacyMetadata().devMode
-          : newPlatform.env.mode.dev
-      )
-    )
+    .config(setupCompileProvider(newPlatform.env.mode.dev))
     .config(setupLocationProvider())
     .config($setupXsrfRequestInterceptor(packageInfo.version))
     .run(capture$httpLoadingCount(core))
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
index e3133fd6d31c2a..e50469546417cb 100644
--- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
@@ -21,7 +21,7 @@ import { StubBrowserStorage } from 'test_utils/stub_browser_storage';
 import { createMemoryHistory, History } from 'history';
 import { createKbnUrlTracker, KbnUrlTracker } from './kbn_url_tracker';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { AppBase, AppUpdater, ToastsSetup } from 'kibana/public';
+import { App, AppUpdater, ToastsSetup } from 'kibana/public';
 import { coreMock } from '../../../../../core/public/mocks';
 import { unhashUrl } from './hash_unhash_url';
 
@@ -62,7 +62,7 @@ describe('kbnUrlTracker', () => {
   }
 
   function getActiveNavLinkUrl() {
-    return navLinkUpdaterSubject.getValue()({} as AppBase)?.defaultPath;
+    return navLinkUpdaterSubject.getValue()({} as App)?.defaultPath;
   }
 
   beforeEach(() => {
diff --git a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts b/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
index 9e7346f3b673cd..6c791f5339def4 100644
--- a/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
+++ b/src/plugins/saved_objects/public/saved_object/saved_object_loader.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ChromeStart, SavedObjectsClientContract, SavedObjectsFindOptions } from 'kibana/public';
+import { SavedObjectsClientContract, SavedObjectsFindOptions } from 'kibana/public';
 import { SavedObject } from '../types';
 import { StringUtils } from './helpers/string_utils';
 
@@ -36,8 +36,7 @@ export class SavedObjectLoader {
 
   constructor(
     SavedObjectClass: any,
-    private readonly savedObjectsClient: SavedObjectsClientContract,
-    private readonly chrome: ChromeStart
+    private readonly savedObjectsClient: SavedObjectsClientContract
   ) {
     this.type = SavedObjectClass.type;
     this.Class = SavedObjectClass;
@@ -78,19 +77,6 @@ export class SavedObjectLoader {
       return savedObject.delete();
     });
     await Promise.all(deletions);
-
-    const coreNavLinks = this.chrome.navLinks;
-    /**
-     * Modify last url for deleted saved objects to avoid loading pages with "Could not locate..."
-     */
-    coreNavLinks
-      .getAll()
-      .filter(
-        (link) =>
-          link.linkToLastSubUrl &&
-          idsUsed.find((deletedId) => link.url && link.url.includes(deletedId)) !== undefined
-      )
-      .forEach((link) => coreNavLinks.update(link.id, { url: link.baseUrl }));
   }
 
   /**
diff --git a/src/plugins/timelion/public/services/saved_sheets.ts b/src/plugins/timelion/public/services/saved_sheets.ts
index a3e7f66d9ee475..9ad529cb0134b6 100644
--- a/src/plugins/timelion/public/services/saved_sheets.ts
+++ b/src/plugins/timelion/public/services/saved_sheets.ts
@@ -33,7 +33,7 @@ export function initSavedSheetService(app: angular.IModule, deps: RenderDeps) {
 
   const SavedSheet = createSavedSheetClass(services, deps.core.uiSettings);
 
-  const savedSheetLoader = new SavedObjectLoader(SavedSheet, savedObjectsClient, deps.core.chrome);
+  const savedSheetLoader = new SavedObjectLoader(SavedSheet, savedObjectsClient);
   savedSheetLoader.urlFor = (id) => `#/${encodeURIComponent(id)}`;
   // Customize loader properties since adding an 's' on type doesn't work for type 'timelion-sheet'.
   savedSheetLoader.loaderProperties = {
diff --git a/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts b/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
index 94538b4081aef6..0ec3c0dab2e977 100644
--- a/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
+++ b/src/plugins/visualizations/public/saved_visualizations/saved_visualizations.ts
@@ -76,9 +76,7 @@ export function createSavedVisLoader(services: SavedObjectKibanaServicesWithVisu
     }
   }
   const SavedVis = createSavedVisClass(services);
-  return new SavedObjectLoaderVisualize(
-    SavedVis,
-    savedObjectsClient,
-    services.chrome
-  ) as SavedObjectLoader & { findListItems: (search: string, size: number) => any };
+  return new SavedObjectLoaderVisualize(SavedVis, savedObjectsClient) as SavedObjectLoader & {
+    findListItems: (search: string, size: number) => any;
+  };
 }
diff --git a/test/plugin_functional/test_suites/core_plugins/applications.ts b/test/plugin_functional/test_suites/core_plugins/applications.ts
index 9ecef65f5f09a1..4c72c091a2bee4 100644
--- a/test/plugin_functional/test_suites/core_plugins/applications.ts
+++ b/test/plugin_functional/test_suites/core_plugins/applications.ts
@@ -145,16 +145,5 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       const windowHeight = (await browser.getWindowSize()).height;
       expect(wrapperHeight).to.be.below(windowHeight);
     });
-
-    // Not sure if we need this test or not. If yes, we need to find another legacy app
-    it.skip('can navigate from NP apps to legacy apps', async () => {
-      await appsMenu.clickLink('Stack Management');
-      await testSubjects.existOrFail('managementNav');
-    });
-
-    it('can navigate from legacy apps to NP apps', async () => {
-      await appsMenu.clickLink('Foo');
-      await testSubjects.existOrFail('fooAppHome');
-    });
   });
 }
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index 5b83d2d5654111..9931a3fabcd8d3 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -51,11 +51,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       window.__RENDERING_SESSION__.push(window.location.pathname);
     });
   };
-  const getLegacyMode = () =>
-    browser.execute(() => {
-      return JSON.parse(document.querySelector('kbn-injected-metadata')!.getAttribute('data')!)
-        .legacyMode;
-    });
+
   const getUserSettings = () =>
     browser.execute(() => {
       return JSON.parse(document.querySelector('kbn-injected-metadata')!.getAttribute('data')!)
@@ -73,13 +69,11 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     it('renders "core" application', async () => {
       await navigateTo('/render/core');
 
-      const [loadingMessage, legacyMode, userSettings] = await Promise.all([
+      const [loadingMessage, userSettings] = await Promise.all([
         findLoadingMessage(),
-        getLegacyMode(),
         getUserSettings(),
       ]);
 
-      expect(legacyMode).to.be(false);
       expect(userSettings).to.not.be.empty();
 
       await find.waitForElementStale(loadingMessage);
@@ -90,13 +84,11 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     it('renders "core" application without user settings', async () => {
       await navigateTo('/render/core?includeUserSettings=false');
 
-      const [loadingMessage, legacyMode, userSettings] = await Promise.all([
+      const [loadingMessage, userSettings] = await Promise.all([
         findLoadingMessage(),
-        getLegacyMode(),
         getUserSettings(),
       ]);
 
-      expect(legacyMode).to.be(false);
       expect(userSettings).to.be.empty();
 
       await find.waitForElementStale(loadingMessage);
diff --git a/x-pack/plugins/global_search_providers/public/providers/application.test.ts b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
index 7d4143f9bcfa72..385ce91d8f9810 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.test.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.test.ts
@@ -25,7 +25,6 @@ const createApp = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
   id: 'app1',
   title: 'App 1',
   appRoute: '/app/app1',
-  legacy: false,
   status: AppStatus.accessible,
   navLinkStatus: AppNavLinkStatus.visible,
   chromeless: false,
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
index 1c5a446b8e5645..0c9daadf14fc62 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.test.ts
@@ -4,30 +4,19 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { AppNavLinkStatus, AppStatus, PublicAppInfo, PublicLegacyAppInfo } from 'src/core/public';
+import { AppNavLinkStatus, AppStatus, PublicAppInfo } from 'src/core/public';
 import { appToResult, getAppResults, scoreApp } from './get_app_results';
 
 const createApp = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
   id: 'app1',
   title: 'App 1',
   appRoute: '/app/app1',
-  legacy: false,
   status: AppStatus.accessible,
   navLinkStatus: AppNavLinkStatus.visible,
   chromeless: false,
   ...props,
 });
 
-const createLegacyApp = (props: Partial<PublicLegacyAppInfo> = {}): PublicLegacyAppInfo => ({
-  id: 'app1',
-  title: 'App 1',
-  appUrl: '/app/app1',
-  legacy: true,
-  status: AppStatus.accessible,
-  navLinkStatus: AppNavLinkStatus.visible,
-  ...props,
-});
-
 describe('getAppResults', () => {
   it('retrieves the matching results', () => {
     const apps = [
@@ -72,14 +61,6 @@ describe('scoreApp', () => {
       expect(scoreApp('1-2-3-4-5', createApp({ title: '123456789' }))).toBe(0);
     });
   });
-
-  it('works with legacy apps', () => {
-    expect(scoreApp('dashboard', createLegacyApp({ title: 'dashboard' }))).toBe(100);
-    expect(scoreApp('dash', createLegacyApp({ title: 'dashboard' }))).toBe(90);
-    expect(scoreApp('board', createLegacyApp({ title: 'dashboard' }))).toBe(75);
-    expect(scoreApp('0123456789', createLegacyApp({ title: '012345' }))).toBe(60);
-    expect(scoreApp('0123456789', createLegacyApp({ title: '12345' }))).toBe(0);
-  });
 });
 
 describe('appToResult', () => {
@@ -99,21 +80,4 @@ describe('appToResult', () => {
       score: 42,
     });
   });
-
-  it('converts a legacy app to a result', () => {
-    const app = createLegacyApp({
-      id: 'legacy',
-      title: 'Legacy',
-      euiIconType: 'legacyIcon',
-      appUrl: '/app/legacy',
-    });
-    expect(appToResult(app, 69)).toEqual({
-      id: 'legacy',
-      title: 'Legacy',
-      type: 'application',
-      icon: 'legacyIcon',
-      url: '/app/legacy',
-      score: 69,
-    });
-  });
 });
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
index 1a1939230105b2..4b2901254076cf 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
@@ -5,12 +5,12 @@
  */
 
 import levenshtein from 'js-levenshtein';
-import { PublicAppInfo, PublicLegacyAppInfo } from 'src/core/public';
+import { PublicAppInfo } from 'src/core/public';
 import { GlobalSearchProviderResult } from '../../../global_search/public';
 
 export const getAppResults = (
   term: string,
-  apps: Array<PublicAppInfo | PublicLegacyAppInfo>
+  apps: PublicAppInfo[]
 ): GlobalSearchProviderResult[] => {
   return apps
     .map((app) => ({ app, score: scoreApp(term, app) }))
@@ -18,7 +18,7 @@ export const getAppResults = (
     .map(({ app, score }) => appToResult(app, score));
 };
 
-export const scoreApp = (term: string, { title }: PublicAppInfo | PublicLegacyAppInfo): number => {
+export const scoreApp = (term: string, { title }: PublicAppInfo): number => {
   term = term.toLowerCase();
   title = title.toLowerCase();
 
@@ -43,16 +43,13 @@ export const scoreApp = (term: string, { title }: PublicAppInfo | PublicLegacyAp
   return 0;
 };
 
-export const appToResult = (
-  app: PublicAppInfo | PublicLegacyAppInfo,
-  score: number
-): GlobalSearchProviderResult => {
+export const appToResult = (app: PublicAppInfo, score: number): GlobalSearchProviderResult => {
   return {
     id: app.id,
     title: app.title,
     type: 'application',
     icon: app.euiIconType,
-    url: app.legacy ? app.appUrl : app.appRoute,
+    url: app.appRoute,
     score,
   };
 };
diff --git a/x-pack/plugins/maps/public/routing/bootstrap/services/gis_map_saved_object_loader.js b/x-pack/plugins/maps/public/routing/bootstrap/services/gis_map_saved_object_loader.js
index 6c7e141c2ab5a7..66af92c7a687ba 100644
--- a/x-pack/plugins/maps/public/routing/bootstrap/services/gis_map_saved_object_loader.js
+++ b/x-pack/plugins/maps/public/routing/bootstrap/services/gis_map_saved_object_loader.js
@@ -25,5 +25,5 @@ export const getMapsSavedObjectLoader = _.once(function () {
   };
   const SavedGisMap = createSavedGisMapClass(services);
 
-  return new SavedObjectLoader(SavedGisMap, getSavedObjectsClient(), getCoreChrome());
+  return new SavedObjectLoader(SavedGisMap, getSavedObjectsClient());
 });

From 2a547914b7c70e186e3c0d184648b65a9b5e3e34 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Thu, 3 Sep 2020 14:02:23 +0300
Subject: [PATCH 211/216] remove server_extensions mixin (#76606)

---
 src/legacy/server/kbn_server.d.ts             |   4 -
 src/legacy/server/kbn_server.js               |   3 -
 .../add_memoized_factory_to_request.test.js   | 161 ------------------
 src/legacy/server/server_extensions/index.js  |  20 ---
 .../server_extensions_mixin.js                |  64 -------
 5 files changed, 252 deletions(-)
 delete mode 100644 src/legacy/server/server_extensions/add_memoized_factory_to_request.test.js
 delete mode 100644 src/legacy/server/server_extensions/index.js
 delete mode 100644 src/legacy/server/server_extensions/server_extensions_mixin.js

diff --git a/src/legacy/server/kbn_server.d.ts b/src/legacy/server/kbn_server.d.ts
index 1a1f43b93f26ed..627e9f4f86bc36 100644
--- a/src/legacy/server/kbn_server.d.ts
+++ b/src/legacy/server/kbn_server.d.ts
@@ -73,10 +73,6 @@ declare module 'hapi' {
     ) => void;
     getInjectedUiAppVars: (pluginName: string) => { [key: string]: any };
     getUiNavLinks(): Array<{ _id: string }>;
-    addMemoizedFactoryToRequest: (
-      name: string,
-      factoryFn: (request: Request) => Record<string, any>
-    ) => void;
     logWithMetadata: (tags: string[], message: string, meta: Record<string, any>) => void;
     newPlatform: KbnServer['newPlatform'];
   }
diff --git a/src/legacy/server/kbn_server.js b/src/legacy/server/kbn_server.js
index 320086b6d65310..4692262d99bb54 100644
--- a/src/legacy/server/kbn_server.js
+++ b/src/legacy/server/kbn_server.js
@@ -34,7 +34,6 @@ import configCompleteMixin from './config/complete';
 import { optimizeMixin } from '../../optimize';
 import * as Plugins from './plugins';
 import { savedObjectsMixin } from './saved_objects/saved_objects_mixin';
-import { serverExtensionsMixin } from './server_extensions';
 import { uiMixin } from '../ui';
 import { i18nMixin } from './i18n';
 
@@ -91,8 +90,6 @@ export default class KbnServer {
 
         coreMixin,
 
-        // adds methods for extending this.server
-        serverExtensionsMixin,
         loggingMixin,
         warningsMixin,
         statusMixin,
diff --git a/src/legacy/server/server_extensions/add_memoized_factory_to_request.test.js b/src/legacy/server/server_extensions/add_memoized_factory_to_request.test.js
deleted file mode 100644
index 48bd0824680619..00000000000000
--- a/src/legacy/server/server_extensions/add_memoized_factory_to_request.test.js
+++ /dev/null
@@ -1,161 +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 { serverExtensionsMixin } from './server_extensions_mixin';
-
-describe('server.addMemoizedFactoryToRequest()', () => {
-  const setup = () => {
-    class Request {}
-
-    class Server {
-      constructor() {
-        sinon.spy(this, 'decorate');
-      }
-      decorate(type, name, value) {
-        switch (type) {
-          case 'request':
-            return (Request.prototype[name] = value);
-          case 'server':
-            return (Server.prototype[name] = value);
-          default:
-            throw new Error(`Unexpected decorate type ${type}`);
-        }
-      }
-    }
-
-    const server = new Server();
-    serverExtensionsMixin({}, server);
-    return { server, Request };
-  };
-
-  it('throws when propertyName is not a string', () => {
-    const { server } = setup();
-    expect(() => server.addMemoizedFactoryToRequest()).toThrowError('methodName must be a string');
-    expect(() => server.addMemoizedFactoryToRequest(null)).toThrowError(
-      'methodName must be a string'
-    );
-    expect(() => server.addMemoizedFactoryToRequest(1)).toThrowError('methodName must be a string');
-    expect(() => server.addMemoizedFactoryToRequest(true)).toThrowError(
-      'methodName must be a string'
-    );
-    expect(() => server.addMemoizedFactoryToRequest(/abc/)).toThrowError(
-      'methodName must be a string'
-    );
-    expect(() => server.addMemoizedFactoryToRequest(['foo'])).toThrowError(
-      'methodName must be a string'
-    );
-    expect(() => server.addMemoizedFactoryToRequest([1])).toThrowError(
-      'methodName must be a string'
-    );
-    expect(() => server.addMemoizedFactoryToRequest({})).toThrowError(
-      'methodName must be a string'
-    );
-  });
-
-  it('throws when factory is not a function', () => {
-    const { server } = setup();
-    expect(() => server.addMemoizedFactoryToRequest('name')).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', null)).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', 1)).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', true)).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', /abc/)).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', ['foo'])).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', [1])).toThrowError(
-      'factory must be a function'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', {})).toThrowError(
-      'factory must be a function'
-    );
-  });
-
-  it('throws when factory takes more than one arg', () => {
-    const { server } = setup();
-    /* eslint-disable no-unused-vars */
-    expect(() => server.addMemoizedFactoryToRequest('name', () => {})).not.toThrowError(
-      'more than one argument'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', (a) => {})).not.toThrowError(
-      'more than one argument'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', (a, b) => {})).toThrowError(
-      'more than one argument'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', (a, b, c) => {})).toThrowError(
-      'more than one argument'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', (a, b, c, d) => {})).toThrowError(
-      'more than one argument'
-    );
-    expect(() => server.addMemoizedFactoryToRequest('name', (a, b, c, d, e) => {})).toThrowError(
-      'more than one argument'
-    );
-    /* eslint-enable no-unused-vars */
-  });
-
-  it('decorates request objects with a function at `propertyName`', () => {
-    const { server, Request } = setup();
-
-    expect(new Request()).not.toHaveProperty('decorated');
-    server.addMemoizedFactoryToRequest('decorated', () => {});
-    expect(typeof new Request().decorated).toBe('function');
-  });
-
-  it('caches invocations of the factory to the request instance', () => {
-    const { server, Request } = setup();
-    const factory = sinon.stub().returnsArg(0);
-    server.addMemoizedFactoryToRequest('foo', factory);
-
-    const request1 = new Request();
-    const request2 = new Request();
-
-    // call `foo()` on both requests a bunch of times, each time
-    // the return value should be exactly the same
-    expect(request1.foo()).toBe(request1);
-    expect(request1.foo()).toBe(request1);
-    expect(request1.foo()).toBe(request1);
-    expect(request1.foo()).toBe(request1);
-    expect(request1.foo()).toBe(request1);
-    expect(request1.foo()).toBe(request1);
-
-    expect(request2.foo()).toBe(request2);
-    expect(request2.foo()).toBe(request2);
-    expect(request2.foo()).toBe(request2);
-    expect(request2.foo()).toBe(request2);
-
-    // only two different requests, so factory should have only been
-    // called twice with the two request objects
-    sinon.assert.calledTwice(factory);
-    sinon.assert.calledWithExactly(factory, request1);
-    sinon.assert.calledWithExactly(factory, request2);
-  });
-});
diff --git a/src/legacy/server/server_extensions/index.js b/src/legacy/server/server_extensions/index.js
deleted file mode 100644
index e17bd488897f73..00000000000000
--- a/src/legacy/server/server_extensions/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 { serverExtensionsMixin } from './server_extensions_mixin';
diff --git a/src/legacy/server/server_extensions/server_extensions_mixin.js b/src/legacy/server/server_extensions/server_extensions_mixin.js
deleted file mode 100644
index 19c0b24ae15a15..00000000000000
--- a/src/legacy/server/server_extensions/server_extensions_mixin.js
+++ /dev/null
@@ -1,64 +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 function serverExtensionsMixin(kbnServer, server) {
-  /**
-   *  Decorate all request objects with a new method, `methodName`,
-   *  that will call the `factory` on first invocation and return
-   *  the result of the first call to subsequent invocations.
-   *
-   *  @method server.addMemoizedFactoryToRequest
-   *  @param {string} methodName location on the request this
-   *                             factory should be added
-   *  @param {Function} factory the factory to add to the request,
-   *                            which will be called once per request
-   *                            with a single argument, the request.
-   *  @return {undefined}
-   */
-  server.decorate('server', 'addMemoizedFactoryToRequest', (methodName, factory) => {
-    if (typeof methodName !== 'string') {
-      throw new TypeError('methodName must be a string');
-    }
-
-    if (typeof factory !== 'function') {
-      throw new TypeError('factory must be a function');
-    }
-
-    if (factory.length > 1) {
-      throw new TypeError(`
-        factory must not take more than one argument, the request object.
-        Memoization is done based on the request instance and is cached and reused
-        regardless of other arguments. If you want to have a per-request cache that
-        also does some sort of secondary memoization then return an object or function
-        from the memoized decorator and do secondary memoization there.
-      `);
-    }
-
-    const requestCache = new WeakMap();
-    server.decorate('request', methodName, function () {
-      const request = this;
-
-      if (!requestCache.has(request)) {
-        requestCache.set(request, factory(request));
-      }
-
-      return requestCache.get(request);
-    });
-  });
-}

From e32c282bc5e57caa901bfe0a2e6d6e61d09c3228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Fern=C3=A1ndez=20Haro?=
 <alejandro.haro@elastic.co>
Date: Thu, 3 Sep 2020 12:06:49 +0100
Subject: [PATCH 212/216] [Newsfeed] Ensure the version format when calling the
 API (#76381)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/plugins/newsfeed/public/lib/api.test.ts        | 14 +++++++-------
 src/plugins/newsfeed/public/lib/api.ts             |  8 ++++++--
 .../fixtures/plugins/newsfeed/server/plugin.ts     |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/plugins/newsfeed/public/lib/api.test.ts b/src/plugins/newsfeed/public/lib/api.test.ts
index be4274e8bc0541..21331b9d825755 100644
--- a/src/plugins/newsfeed/public/lib/api.test.ts
+++ b/src/plugins/newsfeed/public/lib/api.test.ts
@@ -48,7 +48,7 @@ Object.defineProperty(window, 'sessionStorage', {
 });
 
 describe('NewsfeedApiDriver', () => {
-  const kibanaVersion = 'test_version';
+  const kibanaVersion = '99.999.9-test_version'; // It'll remove the `-test_version` bit
   const userLanguage = 'en';
   const fetchInterval = 2000;
   const getDriver = () => new NewsfeedApiDriver(kibanaVersion, userLanguage, fetchInterval);
@@ -179,7 +179,7 @@ describe('NewsfeedApiDriver', () => {
           "error": null,
           "feedItems": Array [],
           "hasNew": false,
-          "kibanaVersion": "test_version",
+          "kibanaVersion": "99.999.9",
         }
       `);
     });
@@ -227,7 +227,7 @@ describe('NewsfeedApiDriver', () => {
           },
         ],
         hasNew: true,
-        kibanaVersion: 'test_version',
+        kibanaVersion: '99.999.9',
       });
     });
 
@@ -309,7 +309,7 @@ describe('NewsfeedApiDriver', () => {
           },
         ],
         hasNew: true,
-        kibanaVersion: 'test_version',
+        kibanaVersion: '99.999.9',
       });
     });
 
@@ -375,7 +375,7 @@ describe('NewsfeedApiDriver', () => {
           },
         ],
         hasNew: true,
-        kibanaVersion: 'test_version',
+        kibanaVersion: '99.999.9',
       });
     });
 
@@ -405,7 +405,7 @@ describe('NewsfeedApiDriver', () => {
           "error": null,
           "feedItems": Array [],
           "hasNew": false,
-          "kibanaVersion": "test_version",
+          "kibanaVersion": "99.999.9",
         }
       `);
     });
@@ -436,7 +436,7 @@ describe('NewsfeedApiDriver', () => {
           "error": null,
           "feedItems": Array [],
           "hasNew": false,
-          "kibanaVersion": "test_version",
+          "kibanaVersion": "99.999.9",
         }
       `);
     });
diff --git a/src/plugins/newsfeed/public/lib/api.ts b/src/plugins/newsfeed/public/lib/api.ts
index ac38e064d26866..7253c0f3e294ca 100644
--- a/src/plugins/newsfeed/public/lib/api.ts
+++ b/src/plugins/newsfeed/public/lib/api.ts
@@ -32,13 +32,17 @@ import { ApiItem, NewsfeedItem, FetchResult, NewsfeedPluginBrowserConfig } from
 type ApiConfig = NewsfeedPluginBrowserConfig['service'];
 
 export class NewsfeedApiDriver {
+  private readonly kibanaVersion: string;
   private readonly loadedTime = moment().utc(); // the date is compared to time in UTC format coming from the service
 
   constructor(
-    private readonly kibanaVersion: string,
+    kibanaVersion: string,
     private readonly userLanguage: string,
     private readonly fetchInterval: number
-  ) {}
+  ) {
+    // The API only accepts versions in the format `X.Y.Z`, so we need to drop the `-SNAPSHOT` or any other label after it
+    this.kibanaVersion = kibanaVersion.replace(/^(\d+\.\d+\.\d+).*/, '$1');
+  }
 
   shouldFetch(): boolean {
     const lastFetchUtc: string | null = sessionStorage.getItem(NEWSFEED_LAST_FETCH_STORAGE_KEY);
diff --git a/test/common/fixtures/plugins/newsfeed/server/plugin.ts b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
index 60044d4e0b2dfd..3d64c7ff58e5d0 100644
--- a/test/common/fixtures/plugins/newsfeed/server/plugin.ts
+++ b/test/common/fixtures/plugins/newsfeed/server/plugin.ts
@@ -25,7 +25,7 @@ export class NewsFeedSimulatorPlugin implements Plugin {
 
   public setup({ http }: CoreSetup) {
     const router = http.createRouter();
-    const version = this.initializerContext.env.packageInfo.version;
+    const version = this.initializerContext.env.packageInfo.version.replace('-SNAPSHOT', '');
 
     router.get(
       {

From 4c5e75e437e1002e2f0c1d2bbf0cdd04a5b9ddf2 Mon Sep 17 00:00:00 2001
From: Liza Katz <lizka.k@gmail.com>
Date: Thu, 3 Sep 2020 15:17:23 +0300
Subject: [PATCH 213/216] fix bad merge (#76629)

Merged to fix master
---
 .../public/hosts/containers/authentications/index.tsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
index c11de9100e71ed..19294fc5e47804 100644
--- a/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
+++ b/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
@@ -136,7 +136,7 @@ export const useAuthentications = ({
         const searchSubscription$ = data.search
           .search<AuthenticationsRequestOptions, AuthenticationsStrategyResponse>(request, {
             strategy: 'securitySolutionSearchStrategy',
-            signal: abortCtrl.current.signal,
+            abortSignal: abortCtrl.current.signal,
           })
           .subscribe({
             next: (response) => {

From e9e0ca37820e8a2d00d5180b6357ae386d56d619 Mon Sep 17 00:00:00 2001
From: Mikhail Shustov <restrry@gmail.com>
Date: Thu, 3 Sep 2020 15:20:04 +0300
Subject: [PATCH 214/216] Introduce TS incremental builds & move src/test_utils
 to TS project  (#76082)

* move test_helpers to the core

* create base tsconfig

* all tsconfigs use the base one

* use test_helpers exposed from the src/core

* move getFieldFormatsRegistry to data plugin

* add test_utils project

* compile types after checkout

* add a stub for platform tsconfig.json

* fix broken import

* fix broken path to the base config

* set tsBuildInfoFile for project without outDir

* do not commit tsbuildinfo file

* do not check output d.ts files

* fix type error

* use separate config to build types

* rollback changes to include paths

* mute import zone error

* rename files to avoid references to tsd

* do not use tsd for type tests

* include all ts files in project

* run buildRefs before type check to ensure the latest version

* store tsbuildinfo locally

* update paths to base config

* comment out core/tsconfig.json

* remove ui path

* fix wrong tsbuildinfo path
---
 .gitignore                                    |  3 +
 examples/alerting_example/tsconfig.json       |  2 +-
 examples/bfetch_explorer/tsconfig.json        |  2 +-
 .../tsconfig.json                             |  2 +-
 examples/developer_examples/tsconfig.json     |  2 +-
 examples/embeddable_examples/tsconfig.json    |  2 +-
 examples/embeddable_explorer/tsconfig.json    |  2 +-
 examples/routing_example/tsconfig.json        |  2 +-
 examples/search_examples/tsconfig.json        |  2 +-
 .../state_containers_examples/tsconfig.json   |  2 +-
 examples/ui_action_examples/tsconfig.json     |  2 +-
 examples/ui_actions_explorer/tsconfig.json    |  2 +-
 .../url_generators_examples/tsconfig.json     |  2 +-
 .../url_generators_explorer/tsconfig.json     |  2 +-
 package.json                                  |  2 +-
 packages/elastic-datemath/tsconfig.json       |  7 ++-
 .../elastic-safer-lodash-set/package.json     |  5 +-
 .../elastic-safer-lodash-set/scripts/tsd.sh   | 17 -----
 .../test/{fp.test-d.ts => fp.ts}              |  0
 .../test/{fp_assoc.test-d.ts => fp_assoc.ts}  |  0
 ...fp_assocPath.test-d.ts => fp_assocPath.ts} |  0
 .../test/{fp_set.test-d.ts => fp_set.ts}      |  0
 .../{fp_setWith.test-d.ts => fp_setWith.ts}   |  0
 .../test/{index.test-d.ts => index.ts}        |  2 +-
 .../test/{set.test-d.ts => set.ts}            |  0
 .../test/{setWith.test-d.ts => setWith.ts}    |  0
 .../elastic-safer-lodash-set/tsconfig.json    | 10 +--
 packages/kbn-analytics/scripts/build.js       |  1 -
 packages/kbn-analytics/tsconfig.json          |  7 ++-
 packages/kbn-config-schema/tsconfig.json      |  2 +-
 packages/kbn-dev-utils/tsconfig.json          |  2 +-
 packages/kbn-es-archiver/tsconfig.json        |  2 +-
 packages/kbn-es/tsconfig.json                 |  7 ++-
 packages/kbn-expect/tsconfig.json             |  5 +-
 packages/kbn-i18n/scripts/build.js            |  1 -
 packages/kbn-i18n/tsconfig.json               |  5 +-
 packages/kbn-interpreter/tsconfig.json        |  5 +-
 packages/kbn-monaco/tsconfig.json             |  2 +-
 packages/kbn-optimizer/tsconfig.json          |  5 +-
 packages/kbn-plugin-generator/tsconfig.json   |  2 +-
 packages/kbn-plugin-helpers/tsconfig.json     |  2 +-
 packages/kbn-pm/tsconfig.json                 |  5 +-
 packages/kbn-release-notes/tsconfig.json      |  2 +-
 packages/kbn-telemetry-tools/tsconfig.json    |  5 +-
 packages/kbn-test-subj-selector/tsconfig.json |  7 ++-
 packages/kbn-test/tsconfig.json               |  5 +-
 packages/kbn-ui-shared-deps/tsconfig.json     |  5 +-
 packages/kbn-utility-types/tsconfig.json      |  2 +-
 scripts/build_ts_refs.js                      | 20 ++++++
 src/core/TESTING.md                           |  2 +-
 .../ui_settings/ui_settings_api.test.ts       |  2 +-
 .../config_deprecation.test.ts                |  2 +-
 .../default_route_provider_config.test.ts     |  2 +-
 .../integration_tests/static_assets.test.ts   |  2 +-
 .../integration_tests/core_services.test.ts   |  2 +-
 .../http_resources_service.test.ts            |  2 +-
 .../integration_tests/legacy_service.test.ts  |  2 +-
 .../legacy/integration_tests/logging.test.ts  |  2 +-
 .../logging/integration_tests/logging.test.ts |  2 +-
 .../routes/integration_tests/migrate.test.ts  |  2 +-
 .../create_or_upgrade.test.ts                 |  2 +-
 .../integration_tests/lib/servers.ts          |  2 +-
 .../integration_tests/routes.test.ts          |  2 +-
 .../test_helpers}/http_test_setup.ts          |  6 +-
 .../test_helpers}/kbn_server.ts               | 12 ++--
 src/core/tsconfig.json                        | 23 +++++++
 src/dev/typescript/build_refs.ts              | 37 +++++++++++
 src/dev/typescript/projects.ts                |  1 +
 src/dev/typescript/run_type_check_cli.ts      | 14 ++++-
 .../max_payload_size.test.js                  |  2 +-
 .../lib/spec_definitions/js/mappings.ts       | 45 ++++++--------
 .../field_formats_registry.stub.ts}           |  9 +--
 .../index_patterns_api_client.test.mock.ts    |  2 +-
 src/plugins/data/public/test_utils.ts         | 20 ++++++
 .../public/agg_table/agg_table.test.js        |  2 +-
 .../public/agg_table/agg_table_group.test.js  |  2 +-
 .../components/lib/tick_formatter.test.js     |  2 +-
 src/test_utils/public/stub_index_pattern.js   |  3 +-
 src/test_utils/tsconfig.json                  | 16 +++++
 .../plugins/kbn_tp_run_pipeline/tsconfig.json |  2 +-
 .../plugins/app_link_test/tsconfig.json       |  2 +-
 .../plugins/core_app_status/tsconfig.json     |  2 +-
 .../plugins/core_plugin_a/tsconfig.json       |  2 +-
 .../core_plugin_appleave/tsconfig.json        |  2 +-
 .../plugins/core_plugin_b/tsconfig.json       |  2 +-
 .../core_plugin_chromeless/tsconfig.json      |  2 +-
 .../core_plugin_route_timeouts/tsconfig.json  |  2 +-
 .../core_plugin_static_assets/tsconfig.json   |  2 +-
 .../core_provider_plugin/tsconfig.json        |  2 +-
 .../plugins/doc_views_plugin/tsconfig.json    |  2 +-
 .../elasticsearch_client_plugin/tsconfig.json |  2 +-
 .../plugins/index_patterns/tsconfig.json      |  2 +-
 .../kbn_sample_panel_action/tsconfig.json     |  2 +-
 .../plugins/kbn_top_nav/tsconfig.json         |  2 +-
 .../tsconfig.json                             |  6 +-
 .../management_test_plugin/tsconfig.json      |  2 +-
 .../plugins/rendering_plugin/tsconfig.json    |  2 +-
 .../plugins/ui_settings_plugin/tsconfig.json  |  2 +-
 test/tsconfig.json                            | 10 +--
 tsconfig.base.json                            | 60 ++++++++++++++++++
 tsconfig.browser.json                         |  2 +-
 tsconfig.json                                 | 62 +++----------------
 tsconfig.refs.json                            |  6 ++
 tsconfig.types.json                           |  4 +-
 .../tsconfig.json                             |  4 +-
 x-pack/plugins/apm/e2e/tsconfig.json          |  2 +-
 x-pack/plugins/apm/scripts/tsconfig.json      |  2 +-
 .../canvas/storybook/addon/tsconfig.json      |  2 +-
 .../routes/apidoc_scripts/tsconfig.json       |  2 +-
 x-pack/plugins/ml/tsconfig.json               |  3 -
 .../session_timeout_http_interceptor.test.ts  |  2 +-
 ...thorized_response_http_interceptor.test.ts |  2 +-
 .../security_solution/cypress/tsconfig.json   |  3 +-
 .../on_post_auth_interceptor.test.ts          |  2 +-
 .../on_request_interceptor.test.ts            |  2 +-
 x-pack/test/tsconfig.json                     |  3 +-
 x-pack/tsconfig.json                          | 11 +---
 117 files changed, 381 insertions(+), 240 deletions(-)
 delete mode 100755 packages/elastic-safer-lodash-set/scripts/tsd.sh
 rename packages/elastic-safer-lodash-set/test/{fp.test-d.ts => fp.ts} (100%)
 rename packages/elastic-safer-lodash-set/test/{fp_assoc.test-d.ts => fp_assoc.ts} (100%)
 rename packages/elastic-safer-lodash-set/test/{fp_assocPath.test-d.ts => fp_assocPath.ts} (100%)
 rename packages/elastic-safer-lodash-set/test/{fp_set.test-d.ts => fp_set.ts} (100%)
 rename packages/elastic-safer-lodash-set/test/{fp_setWith.test-d.ts => fp_setWith.ts} (100%)
 rename packages/elastic-safer-lodash-set/test/{index.test-d.ts => index.ts} (96%)
 rename packages/elastic-safer-lodash-set/test/{set.test-d.ts => set.ts} (100%)
 rename packages/elastic-safer-lodash-set/test/{setWith.test-d.ts => setWith.ts} (100%)
 create mode 100644 scripts/build_ts_refs.js
 rename src/{test_utils/public => core/test_helpers}/http_test_setup.ts (85%)
 rename src/{test_utils => core/test_helpers}/kbn_server.ts (96%)
 create mode 100644 src/core/tsconfig.json
 create mode 100644 src/dev/typescript/build_refs.ts
 rename src/{test_utils/public/stub_field_formats.ts => plugins/data/public/field_formats/field_formats_registry.stub.ts} (81%)
 create mode 100644 src/plugins/data/public/test_utils.ts
 create mode 100644 src/test_utils/tsconfig.json
 create mode 100644 tsconfig.base.json
 create mode 100644 tsconfig.refs.json
 delete mode 100644 x-pack/plugins/ml/tsconfig.json

diff --git a/.gitignore b/.gitignore
index 1d12ef2a9cff3a..1bbd38debbf0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,6 @@ apm.tsconfig.json
 # release notes script output
 report.csv
 report.asciidoc
+
+# TS incremental build cache
+*.tsbuildinfo
diff --git a/examples/alerting_example/tsconfig.json b/examples/alerting_example/tsconfig.json
index fbcec9de439bdb..09c130aca46429 100644
--- a/examples/alerting_example/tsconfig.json
+++ b/examples/alerting_example/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target"
   },
diff --git a/examples/bfetch_explorer/tsconfig.json b/examples/bfetch_explorer/tsconfig.json
index d508076b331990..798a9c222c5ab7 100644
--- a/examples/bfetch_explorer/tsconfig.json
+++ b/examples/bfetch_explorer/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/dashboard_embeddable_examples/tsconfig.json b/examples/dashboard_embeddable_examples/tsconfig.json
index d508076b331990..798a9c222c5ab7 100644
--- a/examples/dashboard_embeddable_examples/tsconfig.json
+++ b/examples/dashboard_embeddable_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/developer_examples/tsconfig.json b/examples/developer_examples/tsconfig.json
index d508076b331990..798a9c222c5ab7 100644
--- a/examples/developer_examples/tsconfig.json
+++ b/examples/developer_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/embeddable_examples/tsconfig.json b/examples/embeddable_examples/tsconfig.json
index 7fa03739119b43..caeed2c1a434fa 100644
--- a/examples/embeddable_examples/tsconfig.json
+++ b/examples/embeddable_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/embeddable_explorer/tsconfig.json b/examples/embeddable_explorer/tsconfig.json
index d508076b331990..798a9c222c5ab7 100644
--- a/examples/embeddable_explorer/tsconfig.json
+++ b/examples/embeddable_explorer/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/routing_example/tsconfig.json b/examples/routing_example/tsconfig.json
index 9bbd9021b2e0a2..761a5c4da65ba9 100644
--- a/examples/routing_example/tsconfig.json
+++ b/examples/routing_example/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/search_examples/tsconfig.json b/examples/search_examples/tsconfig.json
index 8a3ced743d0fa3..8bec69ca40ccc0 100644
--- a/examples/search_examples/tsconfig.json
+++ b/examples/search_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/state_containers_examples/tsconfig.json b/examples/state_containers_examples/tsconfig.json
index 3f43072c2aade0..007322e2d95257 100644
--- a/examples/state_containers_examples/tsconfig.json
+++ b/examples/state_containers_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/ui_action_examples/tsconfig.json b/examples/ui_action_examples/tsconfig.json
index d508076b331990..798a9c222c5ab7 100644
--- a/examples/ui_action_examples/tsconfig.json
+++ b/examples/ui_action_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/ui_actions_explorer/tsconfig.json b/examples/ui_actions_explorer/tsconfig.json
index 199fbe1fcfa269..119209114a7bb8 100644
--- a/examples/ui_actions_explorer/tsconfig.json
+++ b/examples/ui_actions_explorer/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/url_generators_examples/tsconfig.json b/examples/url_generators_examples/tsconfig.json
index 091130487791bd..327b4642a8e7f8 100644
--- a/examples/url_generators_examples/tsconfig.json
+++ b/examples/url_generators_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/examples/url_generators_explorer/tsconfig.json b/examples/url_generators_explorer/tsconfig.json
index 091130487791bd..327b4642a8e7f8 100644
--- a/examples/url_generators_explorer/tsconfig.json
+++ b/examples/url_generators_explorer/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/package.json b/package.json
index 28f2025300f395..c734e69affbdb2 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "kbn:watch": "node scripts/kibana --dev --logging.json=false",
     "build:types": "tsc --p tsconfig.types.json",
     "docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
-    "kbn:bootstrap": "node scripts/register_git_hook",
+    "kbn:bootstrap": "node scripts/build_ts_refs && node scripts/register_git_hook",
     "spec_to_console": "node scripts/spec_to_console",
     "backport-skip-ci": "backport --prDescription \"[skip-ci]\"",
     "storybook": "node scripts/storybook",
diff --git a/packages/elastic-datemath/tsconfig.json b/packages/elastic-datemath/tsconfig.json
index 3604f1004cf6c4..cbfe1e80474336 100644
--- a/packages/elastic-datemath/tsconfig.json
+++ b/packages/elastic-datemath/tsconfig.json
@@ -1,6 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/elastic-datemath"
+  },
   "include": [
     "index.d.ts"
-  ],
+  ]
 }
diff --git a/packages/elastic-safer-lodash-set/package.json b/packages/elastic-safer-lodash-set/package.json
index f0f425661f605a..7602f2fa5924fd 100644
--- a/packages/elastic-safer-lodash-set/package.json
+++ b/packages/elastic-safer-lodash-set/package.json
@@ -16,7 +16,7 @@
   "scripts": {
     "lint": "dependency-check --no-dev package.json set.js setWith.js fp/*.js",
     "test": "npm run lint && tape test/*.js && npm run test:types",
-    "test:types": "./scripts/tsd.sh",
+    "test:types": "tsc --noEmit",
     "update": "./scripts/update.sh",
     "save_state": "./scripts/save_state.sh"
   },
@@ -42,8 +42,5 @@
     "ignore": [
       "/lodash/"
     ]
-  },
-  "tsd": {
-    "directory": "test"
   }
 }
diff --git a/packages/elastic-safer-lodash-set/scripts/tsd.sh b/packages/elastic-safer-lodash-set/scripts/tsd.sh
deleted file mode 100755
index 4572367df415df..00000000000000
--- a/packages/elastic-safer-lodash-set/scripts/tsd.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# Elasticsearch B.V licenses this file to you under the MIT License.
-# See `packages/elastic-safer-lodash-set/LICENSE` for more information.
-
-# tsd will get confused if it finds a tsconfig.json file in the project
-# directory and start to scan the entirety of Kibana. We don't want that.
-mv tsconfig.json tsconfig.tmp
-
-clean_up () {
-  exit_code=$?
-  mv tsconfig.tmp tsconfig.json
-  exit $exit_code
-}
-trap clean_up EXIT
-
-./node_modules/.bin/tsd
diff --git a/packages/elastic-safer-lodash-set/test/fp.test-d.ts b/packages/elastic-safer-lodash-set/test/fp.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/fp.test-d.ts
rename to packages/elastic-safer-lodash-set/test/fp.ts
diff --git a/packages/elastic-safer-lodash-set/test/fp_assoc.test-d.ts b/packages/elastic-safer-lodash-set/test/fp_assoc.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/fp_assoc.test-d.ts
rename to packages/elastic-safer-lodash-set/test/fp_assoc.ts
diff --git a/packages/elastic-safer-lodash-set/test/fp_assocPath.test-d.ts b/packages/elastic-safer-lodash-set/test/fp_assocPath.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/fp_assocPath.test-d.ts
rename to packages/elastic-safer-lodash-set/test/fp_assocPath.ts
diff --git a/packages/elastic-safer-lodash-set/test/fp_set.test-d.ts b/packages/elastic-safer-lodash-set/test/fp_set.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/fp_set.test-d.ts
rename to packages/elastic-safer-lodash-set/test/fp_set.ts
diff --git a/packages/elastic-safer-lodash-set/test/fp_setWith.test-d.ts b/packages/elastic-safer-lodash-set/test/fp_setWith.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/fp_setWith.test-d.ts
rename to packages/elastic-safer-lodash-set/test/fp_setWith.ts
diff --git a/packages/elastic-safer-lodash-set/test/index.test-d.ts b/packages/elastic-safer-lodash-set/test/index.ts
similarity index 96%
rename from packages/elastic-safer-lodash-set/test/index.test-d.ts
rename to packages/elastic-safer-lodash-set/test/index.ts
index ab29d7de5a03fb..2090c1adcfce14 100644
--- a/packages/elastic-safer-lodash-set/test/index.test-d.ts
+++ b/packages/elastic-safer-lodash-set/test/index.ts
@@ -4,7 +4,7 @@
  */
 
 import { expectType } from 'tsd';
-import { set, setWith } from '../';
+import { set, setWith } from '..';
 
 const someObj: object = {};
 const anyValue: any = 'any value';
diff --git a/packages/elastic-safer-lodash-set/test/set.test-d.ts b/packages/elastic-safer-lodash-set/test/set.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/set.test-d.ts
rename to packages/elastic-safer-lodash-set/test/set.ts
diff --git a/packages/elastic-safer-lodash-set/test/setWith.test-d.ts b/packages/elastic-safer-lodash-set/test/setWith.ts
similarity index 100%
rename from packages/elastic-safer-lodash-set/test/setWith.test-d.ts
rename to packages/elastic-safer-lodash-set/test/setWith.ts
diff --git a/packages/elastic-safer-lodash-set/tsconfig.json b/packages/elastic-safer-lodash-set/tsconfig.json
index bc1d1a3a7e413d..6517e5c60ee01a 100644
--- a/packages/elastic-safer-lodash-set/tsconfig.json
+++ b/packages/elastic-safer-lodash-set/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/elastic-safer-lodash-set"
+  },
   "include": [
-    "**/*"
+    "**/*",
   ],
-  "exclude": [
-    "**/*.test-d.ts"
-  ]
 }
diff --git a/packages/kbn-analytics/scripts/build.js b/packages/kbn-analytics/scripts/build.js
index 448d1ca9332f24..0e00a144d0b92c 100644
--- a/packages/kbn-analytics/scripts/build.js
+++ b/packages/kbn-analytics/scripts/build.js
@@ -71,7 +71,6 @@ run(
         proc.run(padRight(10, 'tsc'), {
           cmd: 'tsc',
           args: [
-            '--emitDeclarationOnly',
             ...(flags.watch ? ['--watch', '--preserveWatchOutput', 'true'] : []),
             ...(flags['source-maps'] ? ['--declarationMap', 'true'] : []),
           ],
diff --git a/packages/kbn-analytics/tsconfig.json b/packages/kbn-analytics/tsconfig.json
index fdd9e8281fba88..861e0204a31a28 100644
--- a/packages/kbn-analytics/tsconfig.json
+++ b/packages/kbn-analytics/tsconfig.json
@@ -1,8 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
-    "declarationDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "outDir": "./target/types",
     "stripInternal": true,
     "declarationMap": true,
     "types": [
@@ -11,7 +12,7 @@
     ]
   },
   "include": [
-    "./src/**/*.ts"
+    "src/**/*"
   ],
   "exclude": [
     "target"
diff --git a/packages/kbn-config-schema/tsconfig.json b/packages/kbn-config-schema/tsconfig.json
index f6c61268da17c9..6a268f2e7c0165 100644
--- a/packages/kbn-config-schema/tsconfig.json
+++ b/packages/kbn-config-schema/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
     "declarationDir": "./target/types",
diff --git a/packages/kbn-dev-utils/tsconfig.json b/packages/kbn-dev-utils/tsconfig.json
index 0ec058eeb8a280..1c6c671d0b7683 100644
--- a/packages/kbn-dev-utils/tsconfig.json
+++ b/packages/kbn-dev-utils/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target",
     "target": "ES2019",
diff --git a/packages/kbn-es-archiver/tsconfig.json b/packages/kbn-es-archiver/tsconfig.json
index 6ffa64d91fba0f..02209a29e58171 100644
--- a/packages/kbn-es-archiver/tsconfig.json
+++ b/packages/kbn-es-archiver/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "declaration": true,
diff --git a/packages/kbn-es/tsconfig.json b/packages/kbn-es/tsconfig.json
index 6bb61453c99e75..9487a282326845 100644
--- a/packages/kbn-es/tsconfig.json
+++ b/packages/kbn-es/tsconfig.json
@@ -1,6 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-es"
+  },
   "include": [
-    "src/**/*.ts"
+    "src/**/*"
   ]
 }
diff --git a/packages/kbn-expect/tsconfig.json b/packages/kbn-expect/tsconfig.json
index a09ae2d7ae6415..ae7e9ff090cc28 100644
--- a/packages/kbn-expect/tsconfig.json
+++ b/packages/kbn-expect/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-expect"
+  },
   "include": [
     "expect.js.d.ts"
   ]
diff --git a/packages/kbn-i18n/scripts/build.js b/packages/kbn-i18n/scripts/build.js
index 62e1a35f003994..1d2b5031e37d74 100644
--- a/packages/kbn-i18n/scripts/build.js
+++ b/packages/kbn-i18n/scripts/build.js
@@ -71,7 +71,6 @@ run(
         proc.run(padRight(10, 'tsc'), {
           cmd: 'tsc',
           args: [
-            '--emitDeclarationOnly',
             ...(flags.watch ? ['--watch', '--preserveWatchOutput', 'true'] : []),
             ...(flags['source-maps'] ? ['--declarationMap', 'true'] : []),
           ],
diff --git a/packages/kbn-i18n/tsconfig.json b/packages/kbn-i18n/tsconfig.json
index d3dae3078c1d7d..c6380f1cde9697 100644
--- a/packages/kbn-i18n/tsconfig.json
+++ b/packages/kbn-i18n/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",
@@ -11,7 +11,8 @@
   ],
   "compilerOptions": {
     "declaration": true,
-    "declarationDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "outDir": "./target/types",
     "types": [
       "jest",
       "node"
diff --git a/packages/kbn-interpreter/tsconfig.json b/packages/kbn-interpreter/tsconfig.json
index 63376a7ca1ae8b..3b81bbb118a55e 100644
--- a/packages/kbn-interpreter/tsconfig.json
+++ b/packages/kbn-interpreter/tsconfig.json
@@ -1,4 +1,7 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-interpreter"
+  },
   "include": ["index.d.ts", "src/**/*.d.ts"]
 }
diff --git a/packages/kbn-monaco/tsconfig.json b/packages/kbn-monaco/tsconfig.json
index 95acfd32b24dd3..6d3f433c6a6d10 100644
--- a/packages/kbn-monaco/tsconfig.json
+++ b/packages/kbn-monaco/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "declaration": true,
diff --git a/packages/kbn-optimizer/tsconfig.json b/packages/kbn-optimizer/tsconfig.json
index e2994f4d024149..20b06b5658cbcb 100644
--- a/packages/kbn-optimizer/tsconfig.json
+++ b/packages/kbn-optimizer/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-optimizer"
+  },
   "include": [
     "index.d.ts",
     "src/**/*"
diff --git a/packages/kbn-plugin-generator/tsconfig.json b/packages/kbn-plugin-generator/tsconfig.json
index fc88223dae4b20..c54ff041d7065b 100644
--- a/packages/kbn-plugin-generator/tsconfig.json
+++ b/packages/kbn-plugin-generator/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target",
     "target": "ES2019",
diff --git a/packages/kbn-plugin-helpers/tsconfig.json b/packages/kbn-plugin-helpers/tsconfig.json
index e794b11b14afad..651bc79d6e7071 100644
--- a/packages/kbn-plugin-helpers/tsconfig.json
+++ b/packages/kbn-plugin-helpers/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target",
     "declaration": true,
diff --git a/packages/kbn-pm/tsconfig.json b/packages/kbn-pm/tsconfig.json
index c13a9243c50aa9..175c4701f2e5ba 100644
--- a/packages/kbn-pm/tsconfig.json
+++ b/packages/kbn-pm/tsconfig.json
@@ -1,12 +1,13 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "include": [
     "./index.d.ts",
     "./src/**/*.ts",
-    "./dist/*.d.ts",
+    "./dist/*.d.ts"
   ],
   "exclude": [],
   "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-pm",
     "types": [
       "jest",
       "node"
diff --git a/packages/kbn-release-notes/tsconfig.json b/packages/kbn-release-notes/tsconfig.json
index 6ffa64d91fba0f..02209a29e58171 100644
--- a/packages/kbn-release-notes/tsconfig.json
+++ b/packages/kbn-release-notes/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "declaration": true,
diff --git a/packages/kbn-telemetry-tools/tsconfig.json b/packages/kbn-telemetry-tools/tsconfig.json
index 13ce8ef2bad60b..98512053a5c92b 100644
--- a/packages/kbn-telemetry-tools/tsconfig.json
+++ b/packages/kbn-telemetry-tools/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-telemetry-tools"
+  },
   "include": [
     "src/**/*",
   ]
diff --git a/packages/kbn-test-subj-selector/tsconfig.json b/packages/kbn-test-subj-selector/tsconfig.json
index 3604f1004cf6c4..a1e1c1af372c69 100644
--- a/packages/kbn-test-subj-selector/tsconfig.json
+++ b/packages/kbn-test-subj-selector/tsconfig.json
@@ -1,6 +1,9 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-test-subj-selector"
+  },
   "include": [
     "index.d.ts"
-  ],
+  ]
 }
diff --git a/packages/kbn-test/tsconfig.json b/packages/kbn-test/tsconfig.json
index fdb53de52687bb..fec35e45b2a159 100644
--- a/packages/kbn-test/tsconfig.json
+++ b/packages/kbn-test/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-test"
+  },
   "include": [
     "types/**/*",
     "src/**/*",
diff --git a/packages/kbn-ui-shared-deps/tsconfig.json b/packages/kbn-ui-shared-deps/tsconfig.json
index cef9a442d17bc0..88699027f85de8 100644
--- a/packages/kbn-ui-shared-deps/tsconfig.json
+++ b/packages/kbn-ui-shared-deps/tsconfig.json
@@ -1,5 +1,8 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/packages/kbn-ui-shared-deps"
+  },
   "include": [
     "index.d.ts",
     "theme.ts"
diff --git a/packages/kbn-utility-types/tsconfig.json b/packages/kbn-utility-types/tsconfig.json
index 202df37faf5615..03cace5b9cb2c3 100644
--- a/packages/kbn-utility-types/tsconfig.json
+++ b/packages/kbn-utility-types/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
     "declarationDir": "./target",
diff --git a/scripts/build_ts_refs.js b/scripts/build_ts_refs.js
new file mode 100644
index 00000000000000..29fd66bab4ca99
--- /dev/null
+++ b/scripts/build_ts_refs.js
@@ -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.
+ */
+require('../src/setup_node_env');
+require('../src/dev/typescript/build_refs').runBuildRefs();
diff --git a/src/core/TESTING.md b/src/core/TESTING.md
index a62922d9b5d64b..a0fd0a6ffc2552 100644
--- a/src/core/TESTING.md
+++ b/src/core/TESTING.md
@@ -330,7 +330,7 @@ Cons:
 To have access to Kibana TestUtils, you should create `integration_tests` folder and import `test_utils` within a test file:
 ```typescript
 // src/plugins/my_plugin/server/integration_tests/formatter.test.ts
-import * as kbnTestServer from 'src/test_utils/kbn_server';
+import * as kbnTestServer from 'src/core/test_helpers/kbn_server';
 
 describe('myPlugin', () => {
   describe('GET /myPlugin/formatter', () => {
diff --git a/src/core/public/ui_settings/ui_settings_api.test.ts b/src/core/public/ui_settings/ui_settings_api.test.ts
index 14791407d25508..b15754e5f13839 100644
--- a/src/core/public/ui_settings/ui_settings_api.test.ts
+++ b/src/core/public/ui_settings/ui_settings_api.test.ts
@@ -22,7 +22,7 @@ import fetchMock from 'fetch-mock/es5/client';
 import * as Rx from 'rxjs';
 import { takeUntil, toArray } from 'rxjs/operators';
 
-import { setup as httpSetup } from '../../../test_utils/public/http_test_setup';
+import { setup as httpSetup } from '../../test_helpers/http_test_setup';
 import { UiSettingsApi } from './ui_settings_api';
 
 function setup() {
diff --git a/src/core/server/config/integration_tests/config_deprecation.test.ts b/src/core/server/config/integration_tests/config_deprecation.test.ts
index 65f5bbdac52489..3ebf6d507a2fdf 100644
--- a/src/core/server/config/integration_tests/config_deprecation.test.ts
+++ b/src/core/server/config/integration_tests/config_deprecation.test.ts
@@ -19,7 +19,7 @@
 
 import { mockLoggingSystem } from './config_deprecation.test.mocks';
 import { loggingSystemMock } from '../../logging/logging_system.mock';
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 
 describe('configuration deprecations', () => {
   let root: ReturnType<typeof kbnTestServer.createRoot>;
diff --git a/src/core/server/core_app/integration_tests/default_route_provider_config.test.ts b/src/core/server/core_app/integration_tests/default_route_provider_config.test.ts
index 3284be5ba4750e..340f45a0a2c189 100644
--- a/src/core/server/core_app/integration_tests/default_route_provider_config.test.ts
+++ b/src/core/server/core_app/integration_tests/default_route_provider_config.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 import { Root } from '../../root';
 
 const { startES } = kbnTestServer.createTestServers({
diff --git a/src/core/server/core_app/integration_tests/static_assets.test.ts b/src/core/server/core_app/integration_tests/static_assets.test.ts
index 160ef064a14d96..ca03c4228221ff 100644
--- a/src/core/server/core_app/integration_tests/static_assets.test.ts
+++ b/src/core/server/core_app/integration_tests/static_assets.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 import { Root } from '../../root';
 
 describe('Platform assets', function () {
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
index 2b9193a280aeca..f30ff66ed803a8 100644
--- a/src/core/server/http/integration_tests/core_services.test.ts
+++ b/src/core/server/http/integration_tests/core_services.test.ts
@@ -30,7 +30,7 @@ import { LegacyElasticsearchErrorHelpers } from '../../elasticsearch/legacy';
 
 import { elasticsearchClientMock } from '../../elasticsearch/client/mocks';
 import { ResponseError } from '@elastic/elasticsearch/lib/errors';
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 import { InternalElasticsearchServiceStart } from '../../elasticsearch';
 
 interface User {
diff --git a/src/core/server/http_resources/integration_tests/http_resources_service.test.ts b/src/core/server/http_resources/integration_tests/http_resources_service.test.ts
index eee7dc27860761..624cdbb7f9655a 100644
--- a/src/core/server/http_resources/integration_tests/http_resources_service.test.ts
+++ b/src/core/server/http_resources/integration_tests/http_resources_service.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { schema } from '@kbn/config-schema';
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 
 describe('http resources service', () => {
   describe('register', () => {
diff --git a/src/core/server/legacy/integration_tests/legacy_service.test.ts b/src/core/server/legacy/integration_tests/legacy_service.test.ts
index 1dc8d53e7c3d64..ca3573e730d3f4 100644
--- a/src/core/server/legacy/integration_tests/legacy_service.test.ts
+++ b/src/core/server/legacy/integration_tests/legacy_service.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 
 describe('legacy service', () => {
   describe('http server', () => {
diff --git a/src/core/server/legacy/integration_tests/logging.test.ts b/src/core/server/legacy/integration_tests/logging.test.ts
index 2581c85debf267..2ebe17ea92978c 100644
--- a/src/core/server/legacy/integration_tests/logging.test.ts
+++ b/src/core/server/legacy/integration_tests/logging.test.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 
 import {
   getPlatformLogsFromMock,
diff --git a/src/core/server/logging/integration_tests/logging.test.ts b/src/core/server/logging/integration_tests/logging.test.ts
index 841c1ce15af472..7f6059567c46ef 100644
--- a/src/core/server/logging/integration_tests/logging.test.ts
+++ b/src/core/server/logging/integration_tests/logging.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 import { InternalCoreSetup } from '../../internal_types';
 import { LoggerContextConfigInput } from '../logging_config';
 import { Subject } from 'rxjs';
diff --git a/src/core/server/saved_objects/routes/integration_tests/migrate.test.ts b/src/core/server/saved_objects/routes/integration_tests/migrate.test.ts
index 7a0e39b71afb81..e003d564c1ea25 100644
--- a/src/core/server/saved_objects/routes/integration_tests/migrate.test.ts
+++ b/src/core/server/saved_objects/routes/integration_tests/migrate.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { migratorInstanceMock } from './migrate.test.mocks';
-import * as kbnTestServer from '../../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../../test_helpers/kbn_server';
 
 describe('SavedObjects /_migrate endpoint', () => {
   let root: ReturnType<typeof kbnTestServer.createRoot>;
diff --git a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
index d2e31dad58e55e..61b71f8c5de07d 100644
--- a/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
+++ b/src/core/server/ui_settings/create_or_upgrade_saved_config/integration_tests/create_or_upgrade.test.ts
@@ -24,7 +24,7 @@ import {
   TestElasticsearchUtils,
   TestKibanaUtils,
   TestUtils,
-} from '../../../../../test_utils/kbn_server';
+} from '../../../../test_helpers/kbn_server';
 import { createOrUpgradeSavedConfig } from '../create_or_upgrade_saved_config';
 import { loggingSystemMock } from '../../../logging/logging_system.mock';
 import { httpServerMock } from '../../../http/http_server.mocks';
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 04979b69b32b9a..297deb0233c57e 100644
--- a/src/core/server/ui_settings/integration_tests/lib/servers.ts
+++ b/src/core/server/ui_settings/integration_tests/lib/servers.ts
@@ -24,7 +24,7 @@ import {
   TestElasticsearchUtils,
   TestKibanaUtils,
   TestUtils,
-} from '../../../../../test_utils/kbn_server';
+} from '../../../../test_helpers/kbn_server';
 import { LegacyAPICaller } from '../../../elasticsearch/';
 import { httpServerMock } from '../../../http/http_server.mocks';
 
diff --git a/src/core/server/ui_settings/integration_tests/routes.test.ts b/src/core/server/ui_settings/integration_tests/routes.test.ts
index b18cc370fac3cd..063d68e3866b71 100644
--- a/src/core/server/ui_settings/integration_tests/routes.test.ts
+++ b/src/core/server/ui_settings/integration_tests/routes.test.ts
@@ -18,7 +18,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../test_helpers/kbn_server';
 
 describe('ui settings service', () => {
   describe('routes', () => {
diff --git a/src/test_utils/public/http_test_setup.ts b/src/core/test_helpers/http_test_setup.ts
similarity index 85%
rename from src/test_utils/public/http_test_setup.ts
rename to src/core/test_helpers/http_test_setup.ts
index 7c70f64887af11..50ea43fb22b5e4 100644
--- a/src/test_utils/public/http_test_setup.ts
+++ b/src/core/test_helpers/http_test_setup.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { HttpService } from '../../core/public/http';
-import { fatalErrorsServiceMock } from '../../core/public/fatal_errors/fatal_errors_service.mock';
-import { injectedMetadataServiceMock } from '../../core/public/injected_metadata/injected_metadata_service.mock';
+import { HttpService } from '../public/http';
+import { fatalErrorsServiceMock } from '../public/fatal_errors/fatal_errors_service.mock';
+import { injectedMetadataServiceMock } from '../public/injected_metadata/injected_metadata_service.mock';
 
 export type SetupTap = (
   injectedMetadata: ReturnType<typeof injectedMetadataServiceMock.createSetupContract>,
diff --git a/src/test_utils/kbn_server.ts b/src/core/test_helpers/kbn_server.ts
similarity index 96%
rename from src/test_utils/kbn_server.ts
rename to src/core/test_helpers/kbn_server.ts
index e44ce0de403d94..a494c6aa31d6fe 100644
--- a/src/test_utils/kbn_server.ts
+++ b/src/core/test_helpers/kbn_server.ts
@@ -26,16 +26,16 @@ import {
   kibanaServerTestUser,
   kibanaTestUser,
   setupUsers,
-  // @ts-ignore: implicit any for JS file
 } from '@kbn/test';
 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 { LegacyAPICaller } from '../server/elasticsearch';
+import { CliArgs, Env } from '../server/config';
+import { Root } from '../server/root';
+import KbnServer from '../../legacy/server/kbn_server';
 
 export type HttpMethod = 'delete' | 'get' | 'head' | 'post' | 'put';
 
@@ -53,7 +53,7 @@ const DEFAULTS_SETTINGS = {
 };
 
 const DEFAULT_SETTINGS_WITH_CORE_PLUGINS = {
-  plugins: { scanDirs: [resolve(__dirname, '../legacy/core_plugins')] },
+  plugins: { scanDirs: [resolve(__dirname, '../../legacy/core_plugins')] },
   elasticsearch: {
     hosts: [esTestConfig.getUrl()],
     username: kibanaServerTestUser.username,
diff --git a/src/core/tsconfig.json b/src/core/tsconfig.json
new file mode 100644
index 00000000000000..1a9e6253bff705
--- /dev/null
+++ b/src/core/tsconfig.json
@@ -0,0 +1,23 @@
+// {
+//   "extends": "../../tsconfig.base.json",
+//   "compilerOptions": {
+// //    "composite": true,
+//     "outDir": "./target",
+//     "emitDeclarationOnly": true,
+//     "declaration": true,
+//     "declarationMap": true
+//   },
+//   "include": [
+//     "public",
+//     "server",
+//     "types",
+//     "test_helpers",
+//     "utils",
+//     "index.ts",
+//     "../../kibana.d.ts",
+//     "../../typings/**/*"
+//   ],
+//   "references": [
+//     { "path": "../test_utils" }
+//   ]
+// }
diff --git a/src/dev/typescript/build_refs.ts b/src/dev/typescript/build_refs.ts
new file mode 100644
index 00000000000000..cbb596c185f8b3
--- /dev/null
+++ b/src/dev/typescript/build_refs.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 execa from 'execa';
+import { run, ToolingLog } from '@kbn/dev-utils';
+
+export async function buildRefs(log: ToolingLog) {
+  try {
+    log.info('Building TypeScript projects refs...');
+    await execa(require.resolve('typescript/bin/tsc'), ['-b', 'tsconfig.refs.json']);
+  } catch (e) {
+    log.error(e);
+    process.exit(1);
+  }
+}
+
+export async function runBuildRefs() {
+  run(async ({ log }) => {
+    await buildRefs(log);
+  });
+}
diff --git a/src/dev/typescript/projects.ts b/src/dev/typescript/projects.ts
index 065321e355256a..e18c82b5b9e96e 100644
--- a/src/dev/typescript/projects.ts
+++ b/src/dev/typescript/projects.ts
@@ -24,6 +24,7 @@ import { Project } from './project';
 
 export const PROJECTS = [
   new Project(resolve(REPO_ROOT, 'tsconfig.json')),
+  new Project(resolve(REPO_ROOT, 'src/test_utils/tsconfig.json')),
   new Project(resolve(REPO_ROOT, 'test/tsconfig.json'), { name: 'kibana/test' }),
   new Project(resolve(REPO_ROOT, 'x-pack/tsconfig.json')),
   new Project(resolve(REPO_ROOT, 'x-pack/test/tsconfig.json'), { name: 'x-pack/test' }),
diff --git a/src/dev/typescript/run_type_check_cli.ts b/src/dev/typescript/run_type_check_cli.ts
index 9eeaeb4da70424..e1fca23274a5aa 100644
--- a/src/dev/typescript/run_type_check_cli.ts
+++ b/src/dev/typescript/run_type_check_cli.ts
@@ -24,8 +24,9 @@ import getopts from 'getopts';
 
 import { execInProjects } from './exec_in_projects';
 import { filterProjectsByFlag } from './projects';
+import { buildRefs } from './build_refs';
 
-export function runTypeCheckCli() {
+export async function runTypeCheckCli() {
   const extraFlags: string[] = [];
   const opts = getopts(process.argv.slice(2), {
     boolean: ['skip-lib-check', 'help'],
@@ -79,7 +80,16 @@ export function runTypeCheckCli() {
     process.exit();
   }
 
-  const tscArgs = ['--noEmit', '--pretty', ...(opts['skip-lib-check'] ? ['--skipLibCheck'] : [])];
+  await buildRefs(log);
+
+  const tscArgs = [
+    // composite project cannot be used with --noEmit
+    ...['--composite', 'false'],
+    ...['--emitDeclarationOnly', 'false'],
+    '--noEmit',
+    '--pretty',
+    ...(opts['skip-lib-check'] ? ['--skipLibCheck'] : []),
+  ];
   const projects = filterProjectsByFlag(opts.project).filter((p) => !p.disableTypeCheck);
 
   if (!projects.length) {
diff --git a/src/legacy/server/http/integration_tests/max_payload_size.test.js b/src/legacy/server/http/integration_tests/max_payload_size.test.js
index 789a54f681ba67..2d0718dd356064 100644
--- a/src/legacy/server/http/integration_tests/max_payload_size.test.js
+++ b/src/legacy/server/http/integration_tests/max_payload_size.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import * as kbnTestServer from '../../../../test_utils/kbn_server';
+import * as kbnTestServer from '../../../../core/test_helpers/kbn_server';
 
 let root;
 beforeAll(async () => {
diff --git a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts
index d09637b05a3cb5..aa09278d075538 100644
--- a/src/plugins/console/server/lib/spec_definitions/js/mappings.ts
+++ b/src/plugins/console/server/lib/spec_definitions/js/mappings.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-import _ from 'lodash';
-
 import { SpecDefinitionsService } from '../../../services';
 
 import { BOOLEAN } from './shared';
@@ -159,28 +157,25 @@ export const mappings = (specService: SpecDefinitionsService) => {
 
           // dates
           format: {
-            __one_of: _.flatten([
-              _.map(
-                [
-                  'date',
-                  'date_time',
-                  'date_time_no_millis',
-                  'ordinal_date',
-                  'ordinal_date_time',
-                  'ordinal_date_time_no_millis',
-                  'time',
-                  'time_no_millis',
-                  't_time',
-                  't_time_no_millis',
-                  'week_date',
-                  'week_date_time',
-                  'week_date_time_no_millis',
-                ],
-                function (s) {
-                  return ['basic_' + s, 'strict_' + s];
-                }
-              ),
-              [
+            __one_of: [
+              ...[
+                'date',
+                'date_time',
+                'date_time_no_millis',
+                'ordinal_date',
+                'ordinal_date_time',
+                'ordinal_date_time_no_millis',
+                'time',
+                'time_no_millis',
+                't_time',
+                't_time_no_millis',
+                'week_date',
+                'week_date_time',
+                'week_date_time_no_millis',
+              ].map(function (s) {
+                return ['basic_' + s, 'strict_' + s];
+              }),
+              ...[
                 'date',
                 'date_hour',
                 'date_hour_minute',
@@ -214,7 +209,7 @@ export const mappings = (specService: SpecDefinitionsService) => {
                 'epoch_millis',
                 'epoch_second',
               ],
-            ]),
+            ],
           },
 
           fielddata: {
diff --git a/src/test_utils/public/stub_field_formats.ts b/src/plugins/data/public/field_formats/field_formats_registry.stub.ts
similarity index 81%
rename from src/test_utils/public/stub_field_formats.ts
rename to src/plugins/data/public/field_formats/field_formats_registry.stub.ts
index 589e93fd600c2c..e8741ca41036ba 100644
--- a/src/test_utils/public/stub_field_formats.ts
+++ b/src/plugins/data/public/field_formats/field_formats_registry.stub.ts
@@ -16,10 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { CoreSetup } from 'kibana/public';
-import { DataPublicPluginStart, fieldFormats } from '../../plugins/data/public';
-import { deserializeFieldFormat } from '../../plugins/data/public/field_formats/utils/deserialize';
-import { baseFormattersPublic } from '../../plugins/data/public';
+
+import { CoreSetup } from 'src/core/public';
+import { deserializeFieldFormat } from './utils/deserialize';
+import { baseFormattersPublic } from './constants';
+import { DataPublicPluginStart, fieldFormats } from '..';
 
 export const getFieldFormatsRegistry = (core: CoreSetup) => {
   const fieldFormatsRegistry = new fieldFormats.FieldFormatsRegistry();
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts
index 5e0eeaee3c0d09..f1f5f8737b389b 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns_api_client.test.mock.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { setup } from 'test_utils/http_test_setup';
+import { setup } from '../../../../../core/test_helpers/http_test_setup';
 
 export const { http } = setup((injectedMetadata) => {
   injectedMetadata.getBasePath.mockReturnValue('/hola/daro/');
diff --git a/src/plugins/data/public/test_utils.ts b/src/plugins/data/public/test_utils.ts
new file mode 100644
index 00000000000000..f04b20e96fa1da
--- /dev/null
+++ b/src/plugins/data/public/test_utils.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 { getFieldFormatsRegistry } from './field_formats/field_formats_registry.stub';
diff --git a/src/plugins/vis_type_table/public/agg_table/agg_table.test.js b/src/plugins/vis_type_table/public/agg_table/agg_table.test.js
index 0362bd55963d9b..29a10151a9418b 100644
--- a/src/plugins/vis_type_table/public/agg_table/agg_table.test.js
+++ b/src/plugins/vis_type_table/public/agg_table/agg_table.test.js
@@ -24,7 +24,7 @@ import 'angular-mocks';
 import sinon from 'sinon';
 import { round } from 'lodash';
 
-import { getFieldFormatsRegistry } from '../../../../test_utils/public/stub_field_formats';
+import { getFieldFormatsRegistry } from '../../../data/public/test_utils';
 import { coreMock } from '../../../../core/public/mocks';
 import { initAngularBootstrap } from '../../../kibana_legacy/public';
 import { setUiSettings } from '../../../data/public/services';
diff --git a/src/plugins/vis_type_table/public/agg_table/agg_table_group.test.js b/src/plugins/vis_type_table/public/agg_table/agg_table_group.test.js
index 43913eed32f90a..04cf624331d819 100644
--- a/src/plugins/vis_type_table/public/agg_table/agg_table_group.test.js
+++ b/src/plugins/vis_type_table/public/agg_table/agg_table_group.test.js
@@ -22,7 +22,7 @@ import angular from 'angular';
 import 'angular-mocks';
 import expect from '@kbn/expect';
 
-import { getFieldFormatsRegistry } from '../../../../test_utils/public/stub_field_formats';
+import { getFieldFormatsRegistry } from '../../../data/public/test_utils';
 import { coreMock } from '../../../../core/public/mocks';
 import { initAngularBootstrap } from '../../../kibana_legacy/public';
 import { setUiSettings } from '../../../data/public/services';
diff --git a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js
index 308579126eeb1d..7aa7d53554d576 100644
--- a/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js
+++ b/src/plugins/vis_type_timeseries/public/application/components/lib/tick_formatter.test.js
@@ -18,7 +18,7 @@
  */
 
 import { createTickFormatter } from './tick_formatter';
-import { getFieldFormatsRegistry } from '../../../../../../test_utils/public/stub_field_formats';
+import { getFieldFormatsRegistry } from '../../../../../data/public/test_utils';
 import { setFieldFormats } from '../../../services';
 import { UI_SETTINGS } from '../../../../../data/public';
 
diff --git a/src/test_utils/public/stub_index_pattern.js b/src/test_utils/public/stub_index_pattern.js
index 3289610a062b0e..6130a7f9f9e877 100644
--- a/src/test_utils/public/stub_index_pattern.js
+++ b/src/test_utils/public/stub_index_pattern.js
@@ -22,6 +22,7 @@ import sinon from 'sinon';
 // because it is one of the few places that we need to access the IndexPattern class itself, rather
 // than just the type. Doing this as a temporary measure; it will be left behind when migrating to NP.
 
+import { getFieldFormatsRegistry } from '../../plugins/data/public/test_utils';
 import { IndexPattern, indexPatterns, KBN_FIELD_TYPES, fieldList } from '../../plugins/data/public';
 
 import { setFieldFormats } from '../../plugins/data/public/services';
@@ -33,8 +34,6 @@ setFieldFormats({
   }),
 });
 
-import { getFieldFormatsRegistry } from './stub_field_formats';
-
 export default function StubIndexPattern(pattern, getConfig, timeField, fields, core) {
   const registeredFieldFormats = getFieldFormatsRegistry(core);
 
diff --git a/src/test_utils/tsconfig.json b/src/test_utils/tsconfig.json
new file mode 100644
index 00000000000000..2fa89e29898914
--- /dev/null
+++ b/src/test_utils/tsconfig.json
@@ -0,0 +1,16 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "composite": true,
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": [
+    "public/**/*"
+  ],
+  "exclude": [
+    "target"
+  ]
+}
diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/tsconfig.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/tsconfig.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/app_link_test/tsconfig.json b/test/plugin_functional/plugins/app_link_test/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/plugin_functional/plugins/app_link_test/tsconfig.json
+++ b/test/plugin_functional/plugins/app_link_test/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_app_status/tsconfig.json b/test/plugin_functional/plugins/core_app_status/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/plugin_functional/plugins/core_app_status/tsconfig.json
+++ b/test/plugin_functional/plugins/core_app_status/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_plugin_a/tsconfig.json b/test/plugin_functional/plugins/core_plugin_a/tsconfig.json
index 1ba21f11b7de2a..ccbffc34bce4a4 100644
--- a/test/plugin_functional/plugins/core_plugin_a/tsconfig.json
+++ b/test/plugin_functional/plugins/core_plugin_a/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_plugin_appleave/tsconfig.json b/test/plugin_functional/plugins/core_plugin_appleave/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/plugin_functional/plugins/core_plugin_appleave/tsconfig.json
+++ b/test/plugin_functional/plugins/core_plugin_appleave/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_plugin_b/tsconfig.json b/test/plugin_functional/plugins/core_plugin_b/tsconfig.json
index 1ba21f11b7de2a..ccbffc34bce4a4 100644
--- a/test/plugin_functional/plugins/core_plugin_b/tsconfig.json
+++ b/test/plugin_functional/plugins/core_plugin_b/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_plugin_chromeless/tsconfig.json b/test/plugin_functional/plugins/core_plugin_chromeless/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/plugin_functional/plugins/core_plugin_chromeless/tsconfig.json
+++ b/test/plugin_functional/plugins/core_plugin_chromeless/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json b/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json
index d0751f31ecc5ea..0e27246a49980d 100644
--- a/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json
+++ b/test/plugin_functional/plugins/core_plugin_route_timeouts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_plugin_static_assets/tsconfig.json b/test/plugin_functional/plugins/core_plugin_static_assets/tsconfig.json
index 4a564ee1e5578f..433b041b9af3f6 100644
--- a/test/plugin_functional/plugins/core_plugin_static_assets/tsconfig.json
+++ b/test/plugin_functional/plugins/core_plugin_static_assets/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
index baedb5f2f621bf..0aac2eb570987c 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json b/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json
index 4a564ee1e5578f..433b041b9af3f6 100644
--- a/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/doc_views_plugin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json b/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json
index d0751f31ecc5ea..0e27246a49980d 100644
--- a/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/elasticsearch_client_plugin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/index_patterns/tsconfig.json b/test/plugin_functional/plugins/index_patterns/tsconfig.json
index 6f0c32ad30601f..d5ccf7adddb2dc 100644
--- a/test/plugin_functional/plugins/index_patterns/tsconfig.json
+++ b/test/plugin_functional/plugins/index_patterns/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/tsconfig.json b/test/plugin_functional/plugins/kbn_sample_panel_action/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/tsconfig.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/kbn_top_nav/tsconfig.json b/test/plugin_functional/plugins/kbn_top_nav/tsconfig.json
index 1ba21f11b7de2a..ccbffc34bce4a4 100644
--- a/test/plugin_functional/plugins/kbn_top_nav/tsconfig.json
+++ b/test/plugin_functional/plugins/kbn_top_nav/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json
index d8096d9aab27ab..7e2f7c97eb0586 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true,
@@ -13,7 +13,7 @@
     "index.ts",
     "public/**/*.ts",
     "public/**/*.tsx",
-    "../../../../typings/**/*",
+    "../../../../typings/**/*"
   ],
   "exclude": []
-}
\ No newline at end of file
+}
diff --git a/test/plugin_functional/plugins/management_test_plugin/tsconfig.json b/test/plugin_functional/plugins/management_test_plugin/tsconfig.json
index 5fcaeafbb0d852..4d979fbf7f15fd 100644
--- a/test/plugin_functional/plugins/management_test_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/management_test_plugin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/rendering_plugin/tsconfig.json b/test/plugin_functional/plugins/rendering_plugin/tsconfig.json
index 1ba21f11b7de2a..ccbffc34bce4a4 100644
--- a/test/plugin_functional/plugins/rendering_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/rendering_plugin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
index 7c170405bbfc7f..33b2d6c0f64ad8 100644
--- a/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/ui_settings_plugin/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
diff --git a/test/tsconfig.json b/test/tsconfig.json
index 87e79b295315f0..325db489780226 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,19 +1,15 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
+    "tsBuildInfoFile": "../build/tsbuildinfo/test",
     "types": [
       "node",
       "mocha",
       "flot"
-    ],
-    "lib": [
-      "esnext",
-      "dom"
     ]
   },
   "include": [
-    "**/*.ts",
-    "**/*.tsx",
+    "**/*",
     "../typings/elastic__node_crypto.d.ts",
     "typings/**/*"
   ],
diff --git a/tsconfig.base.json b/tsconfig.base.json
new file mode 100644
index 00000000000000..58a6237846a547
--- /dev/null
+++ b/tsconfig.base.json
@@ -0,0 +1,60 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      // Allows for importing from `kibana` package for the exported types.
+      "kibana": ["./kibana"],
+      "kibana/public": ["src/core/public"],
+      "kibana/server": ["src/core/server"],
+      "plugins/*": ["src/legacy/core_plugins/*/public/"],
+      "test_utils/*": [
+        "src/test_utils/public/*"
+      ],
+      "fixtures/*": ["src/fixtures/*"]
+    },
+    // Support .tsx files and transform JSX into calls to React.createElement
+    "jsx": "react",
+    // Enables all strict type checking options.
+    "strict": true,
+    // save information about the project graph on disk
+    "incremental": true,
+    // enables "core language features"
+    "lib": [
+      "esnext",
+      // includes support for browser APIs
+      "dom"
+    ],
+    // Node 8 should support everything output by esnext, we override this
+    // in webpack with loader-level compiler options
+    "target": "esnext",
+    // Use commonjs for node, overridden in webpack to keep import statements
+    // to maintain support for things like `await import()`
+    "module": "commonjs",
+    // Allows default imports from modules with no default export. This does not affect code emit, just type checking.
+    // We have to enable this option explicitly since `esModuleInterop` doesn't enable it automatically when ES2015 or
+    // ESNext module format is used.
+    "allowSyntheticDefaultImports": true,
+    // Emits __importStar and __importDefault helpers for runtime babel ecosystem compatibility.
+    "esModuleInterop": true,
+    // Resolve modules in the same way as Node.js. Aka make `require` works the
+    // same in TypeScript as it does in Node.js.
+    "moduleResolution": "node",
+    // Disallow inconsistently-cased references to the same file.
+    "forceConsistentCasingInFileNames": true,
+    // Forbid unused local variables as the rule was deprecated by ts-lint
+    "noUnusedLocals": true,
+    // Provide full support for iterables in for..of, spread and destructuring when targeting ES5 or ES3.
+    "downlevelIteration": true,
+    // import tslib helpers rather than inlining helpers for iteration or spreading, for instance
+    "importHelpers": true,
+    // adding global typings
+    "types": [
+      "node",
+      "jest",
+      "react",
+      "flot",
+      "jest-styled-components",
+      "@testing-library/jest-dom"
+    ]
+  }
+}
diff --git a/tsconfig.browser.json b/tsconfig.browser.json
index fdfc868157e0d7..b0886bf3e5e289 100644
--- a/tsconfig.browser.json
+++ b/tsconfig.browser.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "target": "es5",
     "module": "esnext",
diff --git a/tsconfig.json b/tsconfig.json
index 819cb5dc4c1e3c..21a817213c62f4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,59 +1,7 @@
 {
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      // Allows for importing from `kibana` package for the exported types.
-      "kibana": ["./kibana"],
-      "kibana/public": ["src/core/public"],
-      "kibana/server": ["src/core/server"],
-      "plugins/*": ["src/legacy/core_plugins/*/public/"],
-      "test_utils/*": [
-        "src/test_utils/public/*"
-      ],
-      "fixtures/*": ["src/fixtures/*"]
-    },
-    // Support .tsx files and transform JSX into calls to React.createElement
-    "jsx": "react",
-    // Enables all strict type checking options.
-    "strict": true,
-    // enables "core language features"
-    "lib": [
-      "esnext",
-      // includes support for browser APIs
-      "dom"
-    ],
-    // Node 8 should support everything output by esnext, we override this
-    // in webpack with loader-level compiler options
-    "target": "esnext",
-    // Use commonjs for node, overridden in webpack to keep import statements
-    // to maintain support for things like `await import()`
-    "module": "commonjs",
-    // Allows default imports from modules with no default export. This does not affect code emit, just type checking.
-    // We have to enable this option explicitly since `esModuleInterop` doesn't enable it automatically when ES2015 or
-    // ESNext module format is used.
-    "allowSyntheticDefaultImports": true,
-    // Emits __importStar and __importDefault helpers for runtime babel ecosystem compatibility.
-    "esModuleInterop": true,
-    // Resolve modules in the same way as Node.js. Aka make `require` works the
-    // same in TypeScript as it does in Node.js.
-    "moduleResolution": "node",
-    // Disallow inconsistently-cased references to the same file.
-    "forceConsistentCasingInFileNames": true,
-    // Forbid unused local variables as the rule was deprecated by ts-lint
-    "noUnusedLocals": true,
-    // Provide full support for iterables in for..of, spread and destructuring when targeting ES5 or ES3.
-    "downlevelIteration": true,
-    // import tslib helpers rather than inlining helpers for iteration or spreading, for instance
-    "importHelpers": true,
-    // adding global typings
-    "types": [
-      "node",
-      "jest",
-      "react",
-      "flot",
-      "jest-styled-components",
-      "@testing-library/jest-dom"
-    ]
+    "tsBuildInfoFile": "./build/tsbuildinfo/kibana",
   },
   "include": [
     "kibana.d.ts",
@@ -62,11 +10,15 @@
     "test_utils/**/*"
   ],
   "exclude": [
-    "src/**/__fixtures__/**/*"
+    "src/**/__fixtures__/**/*",
+    "src/test_utils/**/*"
     // In the build we actually exclude **/public/**/* from this config so that
     // we can run the TSC on both this and the .browser version of this config
     // file, but if we did it during development IDEs would not be able to find
     // the tsconfig.json file for public files correctly.
     // "src/**/public/**/*"
+  ],
+  "references": [
+    { "path": "./src/test_utils/tsconfig.json" }
   ]
 }
diff --git a/tsconfig.refs.json b/tsconfig.refs.json
new file mode 100644
index 00000000000000..0e4cc1bd32da30
--- /dev/null
+++ b/tsconfig.refs.json
@@ -0,0 +1,6 @@
+{
+  "include": [],
+  "references": [
+    { "path": "./src/test_utils" }
+  ]
+}
diff --git a/tsconfig.types.json b/tsconfig.types.json
index 2f5919e413e514..e8cd0a5209bbeb 100644
--- a/tsconfig.types.json
+++ b/tsconfig.types.json
@@ -1,8 +1,8 @@
 {
-  "extends": "./tsconfig",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "declaration": true,
-    "declarationDir": "./target/types",
+    "outDir": "./target/types",
     "stripInternal": false,
     "emitDeclarationOnly": true,
     "declarationMap": true
diff --git a/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json b/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json
index d508076b331990..cae75bb81c7232 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json
+++ b/x-pack/examples/ui_actions_enhanced_examples/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "skipLibCheck": true
@@ -9,7 +9,7 @@
     "public/**/*.ts",
     "public/**/*.tsx",
     "server/**/*.ts",
-    "../../typings/**/*",
+    "../../typings/**/*"
   ],
   "exclude": []
 }
diff --git a/x-pack/plugins/apm/e2e/tsconfig.json b/x-pack/plugins/apm/e2e/tsconfig.json
index a7091a20186b2c..c4587349c7ad77 100644
--- a/x-pack/plugins/apm/e2e/tsconfig.json
+++ b/x-pack/plugins/apm/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "exclude": ["tmp"],
   "include": ["./**/*"],
   "compilerOptions": {
diff --git a/x-pack/plugins/apm/scripts/tsconfig.json b/x-pack/plugins/apm/scripts/tsconfig.json
index 350db55e72446a..64602bc6b27699 100644
--- a/x-pack/plugins/apm/scripts/tsconfig.json
+++ b/x-pack/plugins/apm/scripts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "include": [
     "./**/*"
   ],
diff --git a/x-pack/plugins/canvas/storybook/addon/tsconfig.json b/x-pack/plugins/canvas/storybook/addon/tsconfig.json
index 9cab0af235f2e5..2ab1856de661a1 100644
--- a/x-pack/plugins/canvas/storybook/addon/tsconfig.json
+++ b/x-pack/plugins/canvas/storybook/addon/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../../tsconfig.base.json",
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx"
diff --git a/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json b/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json
index e3108b8c759f4d..6d01a853698b8e 100644
--- a/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json
+++ b/x-pack/plugins/ml/server/routes/apidoc_scripts/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./target",
     "target": "es6",
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
deleted file mode 100644
index 4082f16a5d91ce..00000000000000
--- a/x-pack/plugins/ml/tsconfig.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "../../tsconfig.json"
-}
diff --git a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts
index 40cbd00858b5f0..0a795ad7678985 100644
--- a/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts
+++ b/x-pack/plugins/security/public/session/session_timeout_http_interceptor.test.ts
@@ -7,7 +7,7 @@
 // @ts-ignore
 import fetchMock from 'fetch-mock/es5/client';
 import { SessionTimeoutHttpInterceptor } from './session_timeout_http_interceptor';
-import { setup } from '../../../../../src/test_utils/public/http_test_setup';
+import { setup } from '../../../../../src/core/test_helpers/http_test_setup';
 import { createSessionTimeoutMock } from './session_timeout.mock';
 
 const mockCurrentUrl = (url: string) => window.history.pushState({}, '', url);
diff --git a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
index 78c82cbc3a9a66..71ef6496ef6cad 100644
--- a/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
+++ b/x-pack/plugins/security/public/session/unauthorized_response_http_interceptor.test.ts
@@ -7,7 +7,7 @@
 // @ts-ignore
 import fetchMock from 'fetch-mock/es5/client';
 import { SessionExpired } from './session_expired';
-import { setup } from '../../../../../src/test_utils/public/http_test_setup';
+import { setup } from '../../../../../src/core/test_helpers/http_test_setup';
 import { UnauthorizedResponseHttpInterceptor } from './unauthorized_response_http_interceptor';
 jest.mock('./session_expired');
 
diff --git a/x-pack/plugins/security_solution/cypress/tsconfig.json b/x-pack/plugins/security_solution/cypress/tsconfig.json
index 929a3fb39babb0..d0669ccb782818 100644
--- a/x-pack/plugins/security_solution/cypress/tsconfig.json
+++ b/x-pack/plugins/security_solution/cypress/tsconfig.json
@@ -1,10 +1,11 @@
 {
-  "extends": "../../../../tsconfig.json",
+  "extends": "../../../../tsconfig.base.json",
   "exclude": [],
   "include": [
     "./**/*"
   ],
   "compilerOptions": {
+    "tsBuildInfoFile": "../../../../build/tsbuildinfo/security_solution/cypress",
     "types": [
       "cypress",
       "node"
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
index 8375296d869e6d..dabdcf553edb4a 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_post_auth_interceptor.test.ts
@@ -20,7 +20,7 @@ import {
   loggingSystemMock,
   coreMock,
 } from '../../../../../../src/core/server/mocks';
-import * as kbnTestServer from '../../../../../../src/test_utils/kbn_server';
+import * as kbnTestServer from '../../../../../../src/core/test_helpers/kbn_server';
 import { SpacesService } from '../../spaces_service';
 import { SpacesAuditLogger } from '../audit_logger';
 import { convertSavedObjectToSpace } from '../../routes/lib';
diff --git a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
index 1558c6425f542d..998c6ca18983d7 100644
--- a/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
+++ b/x-pack/plugins/spaces/server/lib/request_interceptors/on_request_interceptor.test.ts
@@ -15,7 +15,7 @@ import {
   IRouter,
 } from '../../../../../../src/core/server';
 
-import * as kbnTestServer from '../../../../../../src/test_utils/kbn_server';
+import * as kbnTestServer from '../../../../../../src/core/test_helpers/kbn_server';
 import { elasticsearchServiceMock } from 'src/core/server/mocks';
 
 // FAILING: https://github.com/elastic/kibana/issues/58942
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index df1d7e789507b3..d0e2ea952e1089 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -1,6 +1,7 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
+    "tsBuildInfoFile": "../../build/tsbuildinfo/x-pack/test",
     "types": [
       "mocha",
       "node",
diff --git a/x-pack/tsconfig.json b/x-pack/tsconfig.json
index 7c6210bb9ce191..b5080f83f2edad 100644
--- a/x-pack/tsconfig.json
+++ b/x-pack/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "include": [
     "mocks.ts",
     "typings/**/*",
@@ -33,12 +33,7 @@
       "plugins/*": ["src/legacy/core_plugins/*/public/"],
       "fixtures/*": ["src/fixtures/*"],
     },
-    "types": [
-      "node",
-      "jest",
-      "flot",
-      "jest-styled-components",
-      "@testing-library/jest-dom"
-    ]
+    // overhead is too significant
+    "incremental": false,
   }
 }

From 299c3f5a54bd75d73f4a3fa65b826d3aeb6a9da6 Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Thu, 3 Sep 2020 09:10:32 -0400
Subject: [PATCH 215/216] [Security Solution] add an excess validation instead
 of the exact match (#76472)

* add an excess validation instead of the exact match

* fix readble type + unit test

* review I

* remove buildRouteValidation to use buildRouteValidationWithExcess
---
 .../routes/__mocks__/request_responses.ts     |  16 +-
 .../routes/clean_draft_timelines_route.ts     |   4 +-
 .../timeline/routes/create_timelines_route.ts |   4 +-
 .../routes/export_timelines_route.test.ts     |   4 +-
 .../timeline/routes/export_timelines_route.ts |   6 +-
 .../routes/get_draft_timelines_route.ts       |   4 +-
 .../lib/timeline/routes/get_timeline_route.ts |   4 +-
 .../routes/import_timelines_route.test.ts     | 102 ++++----
 .../timeline/routes/import_timelines_route.ts |   7 +-
 .../routes/schemas/create_timelines_schema.ts |  10 +-
 .../routes/schemas/export_timelines_schema.ts |   8 +-
 .../schemas/get_timeline_by_id_schema.ts      |  11 +-
 .../routes/schemas/import_timelines_schema.ts |  31 ++-
 .../timeline/routes/update_timelines_route.ts |   4 +-
 .../build_validation/route_validation.test.ts | 245 +++++++++++++-----
 .../build_validation/route_validation.ts      |  18 ++
 .../server/utils/runtime_types.ts             | 130 ++++++++++
 17 files changed, 442 insertions(+), 166 deletions(-)
 create mode 100644 x-pack/plugins/security_solution/server/utils/runtime_types.ts

diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts
index c5d69398b7f0c7..026ec1fa847f99 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/__mocks__/request_responses.ts
@@ -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 path, { join, resolve } from 'path';
 import * as rt from 'io-ts';
-import stream from 'stream';
 
 import {
   TIMELINE_DRAFT_URL,
@@ -20,8 +21,8 @@ import { requestMock } from '../../../detection_engine/routes/__mocks__';
 import { updateTimelineSchema } from '../schemas/update_timelines_schema';
 import { createTimelineSchema } from '../schemas/create_timelines_schema';
 import { GetTimelineByIdSchemaQuery } from '../schemas/get_timeline_by_id_schema';
+import { getReadables } from '../utils/common';
 
-const readable = new stream.Readable();
 export const getExportTimelinesRequest = () =>
   requestMock.create({
     method: 'get',
@@ -34,15 +35,20 @@ export const getExportTimelinesRequest = () =>
     },
   });
 
-export const getImportTimelinesRequest = (filename?: string) =>
-  requestMock.create({
+export const getImportTimelinesRequest = async (fileName?: string) => {
+  const dir = resolve(join(__dirname, '../../../detection_engine/rules/prepackaged_timelines'));
+  const file = fileName ?? 'index.ndjson';
+  const dataPath = path.join(dir, file);
+  const readable = await getReadables(dataPath);
+  return requestMock.create({
     method: 'post',
     path: TIMELINE_IMPORT_URL,
     query: { overwrite: false },
     body: {
-      file: { ...readable, hapi: { filename: filename ?? 'filename.ndjson' } },
+      file: { ...readable, hapi: { filename: file } },
     },
   });
+};
 
 export const inputTimeline: SavedTimeline = {
   columns: [
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts
index 8cabd84a965b75..67fc3167a4a29f 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/clean_draft_timelines_route.ts
@@ -11,7 +11,7 @@ import { transformError, buildSiemResponse } from '../../detection_engine/routes
 import { TIMELINE_DRAFT_URL } from '../../../../common/constants';
 import { buildFrameworkRequest } from './utils/common';
 import { SetupPlugins } from '../../../plugin';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { getDraftTimeline, resetTimeline, getTimeline, persistTimeline } from '../saved_object';
 import { draftTimelineDefaults } from '../default_timeline';
 import { cleanDraftTimelineSchema } from './schemas/clean_draft_timelines_schema';
@@ -26,7 +26,7 @@ export const cleanDraftTimelinesRoute = (
     {
       path: TIMELINE_DRAFT_URL,
       validate: {
-        body: buildRouteValidation(cleanDraftTimelineSchema),
+        body: buildRouteValidationWithExcess(cleanDraftTimelineSchema),
       },
       options: {
         tags: ['access:securitySolution'],
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
index 7abcb390d0221c..77cd49406baa16 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/create_timelines_route.ts
@@ -9,7 +9,7 @@ import { TIMELINE_URL } from '../../../../common/constants';
 
 import { ConfigType } from '../../..';
 import { SetupPlugins } from '../../../plugin';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 
 import { transformError, buildSiemResponse } from '../../detection_engine/routes/utils';
 
@@ -31,7 +31,7 @@ export const createTimelinesRoute = (
     {
       path: TIMELINE_URL,
       validate: {
-        body: buildRouteValidation(createTimelineSchema),
+        body: buildRouteValidationWithExcess(createTimelineSchema),
       },
       options: {
         tags: ['access:securitySolution'],
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts
index 5a976ee7521af4..5d7cb1c8d3f6cf 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.test.ts
@@ -96,7 +96,7 @@ describe('export timelines', () => {
       const result = server.validate(request);
 
       expect(result.badRequest.mock.calls[0][0]).toEqual(
-        'Invalid value "undefined" supplied to "file_name"'
+        'Invalid value {"id":"someId"}, excess properties: ["id"]'
       );
     });
 
@@ -110,7 +110,7 @@ describe('export timelines', () => {
       const result = server.validate(request);
 
       expect(result.badRequest.mock.calls[0][0]).toEqual(
-        'Invalid value "someId" supplied to "ids",Invalid value "{"ids":"someId"}" supplied to "(Partial<{ ids: (Array<string> | null) }> | null)"'
+        'Invalid value "someId" supplied to "ids"'
       );
     });
   });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.ts
index 89e38753ac9263..38ee51fb7aa0c8 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/export_timelines_route.ts
@@ -14,7 +14,7 @@ import {
   exportTimelinesQuerySchema,
   exportTimelinesRequestBodySchema,
 } from './schemas/export_timelines_schema';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { buildFrameworkRequest } from './utils/common';
 import { SetupPlugins } from '../../../plugin';
 
@@ -27,8 +27,8 @@ export const exportTimelinesRoute = (
     {
       path: TIMELINE_EXPORT_URL,
       validate: {
-        query: buildRouteValidation(exportTimelinesQuerySchema),
-        body: buildRouteValidation(exportTimelinesRequestBodySchema),
+        query: buildRouteValidationWithExcess(exportTimelinesQuerySchema),
+        body: buildRouteValidationWithExcess(exportTimelinesRequestBodySchema),
       },
       options: {
         tags: ['access:securitySolution'],
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/get_draft_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/get_draft_timelines_route.ts
index 4db434ec816aa5..43129f0e15f0e6 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/get_draft_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/get_draft_timelines_route.ts
@@ -10,7 +10,7 @@ import { transformError, buildSiemResponse } from '../../detection_engine/routes
 import { TIMELINE_DRAFT_URL } from '../../../../common/constants';
 import { buildFrameworkRequest } from './utils/common';
 import { SetupPlugins } from '../../../plugin';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { getDraftTimeline, persistTimeline } from '../saved_object';
 import { draftTimelineDefaults } from '../default_timeline';
 import { getDraftTimelineSchema } from './schemas/get_draft_timelines_schema';
@@ -24,7 +24,7 @@ export const getDraftTimelinesRoute = (
     {
       path: TIMELINE_DRAFT_URL,
       validate: {
-        query: buildRouteValidation(getDraftTimelineSchema),
+        query: buildRouteValidationWithExcess(getDraftTimelineSchema),
       },
       options: {
         tags: ['access:securitySolution'],
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/get_timeline_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/get_timeline_route.ts
index f36adb648cc036..e46a644d6820e5 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/get_timeline_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/get_timeline_route.ts
@@ -10,7 +10,7 @@ import { TIMELINE_URL } from '../../../../common/constants';
 
 import { ConfigType } from '../../..';
 import { SetupPlugins } from '../../../plugin';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 
 import { buildSiemResponse, transformError } from '../../detection_engine/routes/utils';
 
@@ -28,7 +28,7 @@ export const getTimelineRoute = (
   router.get(
     {
       path: `${TIMELINE_URL}`,
-      validate: { query: buildRouteValidation(getTimelineByIdSchemaQuery) },
+      validate: { query: buildRouteValidationWithExcess(getTimelineByIdSchemaQuery) },
       options: {
         tags: ['access:securitySolution'],
       },
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
index 388ab5db3e852b..13cc71840ec962 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.test.ts
@@ -155,31 +155,31 @@ describe('import timelines', () => {
     });
 
     test('should use given timelineId to check if the timeline savedObject already exist', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockGetTimeline.mock.calls[0][1]).toEqual(mockUniqueParsedObjects[0].savedObjectId);
     });
 
     test('should Create a new timeline savedObject', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline).toHaveBeenCalled();
     });
 
     test('should Create a new timeline savedObject without timelineId', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][1]).toBeNull();
     });
 
     test('should Create a new timeline savedObject without timeline version', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][2]).toBeNull();
     });
 
     test('should Create a new timeline savedObject with given timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
         ...mockParsedTimelineObject,
@@ -199,7 +199,7 @@ describe('import timelines', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       const response = await server.inject(mockRequest, context);
       expect(response.body).toEqual({
         success: false,
@@ -219,19 +219,19 @@ describe('import timelines', () => {
     });
 
     test('should Create new pinned events', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistPinnedEventOnTimeline).toHaveBeenCalled();
     });
 
     test('should Create a new pinned event without pinnedEventSavedObjectId', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistPinnedEventOnTimeline.mock.calls[0][1]).toBeNull();
     });
 
     test('should Create a new pinned event with pinnedEventId', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistPinnedEventOnTimeline.mock.calls[0][2]).toEqual(
         mockUniqueParsedObjects[0].pinnedEventIds[0]
@@ -239,7 +239,7 @@ describe('import timelines', () => {
     });
 
     test('should Create a new pinned event with new timelineSavedObjectId', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistPinnedEventOnTimeline.mock.calls[0][3]).toEqual(
         mockCreatedTimeline.savedObjectId
@@ -247,7 +247,7 @@ describe('import timelines', () => {
     });
 
     test('should Check if note exists', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockGetNote.mock.calls[0][1]).toEqual(
         mockUniqueParsedObjects[0].globalNotes[0].noteId
@@ -255,31 +255,31 @@ describe('import timelines', () => {
     });
 
     test('should Create notes', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote).toHaveBeenCalled();
     });
 
     test('should provide no noteSavedObjectId when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][1]).toBeNull();
     });
 
     test('should provide new timeline version when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][1]).toBeNull();
     });
 
     test('should provide note content when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][2]).toEqual(mockCreatedTimeline.version);
     });
 
     test('should provide new notes with original author info when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][3]).toEqual({
         eventId: undefined,
@@ -314,7 +314,7 @@ describe('import timelines', () => {
       mockGetNote.mockReset();
       mockGetNote.mockRejectedValue(new Error());
 
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][3]).toEqual({
         created: mockUniqueParsedObjects[0].globalNotes[0].created,
@@ -346,7 +346,8 @@ describe('import timelines', () => {
     });
 
     test('returns 200 when import timeline successfully', async () => {
-      const response = await server.inject(getImportTimelinesRequest(), context);
+      const mockRequest = await getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
       expect(response.status).toEqual(200);
     });
   });
@@ -379,7 +380,8 @@ describe('import timelines', () => {
     });
 
     test('returns error message', async () => {
-      const response = await server.inject(getImportTimelinesRequest(), context);
+      const mockRequest = await getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
       expect(response.body).toEqual({
         success: false,
         success_count: 0,
@@ -407,7 +409,7 @@ describe('import timelines', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       const response = await server.inject(mockRequest, context);
       expect(response.body).toEqual({
         success: false,
@@ -436,7 +438,7 @@ describe('import timelines', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       const response = await server.inject(mockRequest, context);
       expect(response.body).toEqual({
         success: false,
@@ -494,7 +496,7 @@ describe('import timelines', () => {
       const result = server.validate(request);
 
       expect(result.badRequest).toHaveBeenCalledWith(
-        'Invalid value "undefined" supplied to "file"'
+        'Invalid value {"id":"someId"}, excess properties: ["id"]'
       );
     });
   });
@@ -592,7 +594,7 @@ describe('import timeline templates', () => {
     });
 
     test('should use given timelineId to check if the timeline savedObject already exist', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockGetTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
@@ -600,7 +602,7 @@ describe('import timeline templates', () => {
     });
 
     test('should use given templateTimelineId to check if the timeline savedObject already exist', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId
@@ -608,25 +610,25 @@ describe('import timeline templates', () => {
     });
 
     test('should Create a new timeline savedObject', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline).toHaveBeenCalled();
     });
 
     test('should Create a new timeline savedObject without timelineId', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][1]).toBeNull();
     });
 
     test('should Create a new timeline savedObject without timeline version', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][2]).toBeNull();
     });
 
     test('should Create a new timeline savedObject witn given timeline and skip the omitted fields', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][3]).toEqual({
         ...mockParsedTemplateTimelineObject,
@@ -635,25 +637,25 @@ describe('import timeline templates', () => {
     });
 
     test('should NOT Create new pinned events', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistPinnedEventOnTimeline).not.toHaveBeenCalled();
     });
 
     test('should provide no noteSavedObjectId when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][1]).toBeNull();
     });
 
     test('should provide new timeline version when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][2]).toEqual(mockCreatedTemplateTimeline.version);
     });
 
     test('should exclude event notes when creating notes', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][3]).toEqual({
         eventId: undefined,
@@ -667,7 +669,8 @@ describe('import timeline templates', () => {
     });
 
     test('returns 200 when import timeline successfully', async () => {
-      const response = await server.inject(getImportTimelinesRequest(), context);
+      const mockRequest = await getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
       expect(response.status).toEqual(200);
     });
 
@@ -681,7 +684,7 @@ describe('import timeline templates', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][3].templateTimelineId).toEqual(
         mockNewTemplateTimelineId
@@ -699,7 +702,7 @@ describe('import timeline templates', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       const result = await server.inject(mockRequest, context);
       expect(result.body).toEqual({
         errors: [],
@@ -743,7 +746,7 @@ describe('import timeline templates', () => {
     });
 
     test('should use given timelineId to check if the timeline savedObject already exist', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockGetTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
@@ -751,7 +754,7 @@ describe('import timeline templates', () => {
     });
 
     test('should use given templateTimelineId to check if the timeline savedObject already exist', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockGetTemplateTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].templateTimelineId
@@ -759,13 +762,13 @@ describe('import timeline templates', () => {
     });
 
     test('should UPDATE timeline savedObject', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline).toHaveBeenCalled();
     });
 
     test('should UPDATE timeline savedObject with timelineId', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][1]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].savedObjectId
@@ -773,7 +776,7 @@ describe('import timeline templates', () => {
     });
 
     test('should UPDATE timeline savedObject without timeline version', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][2]).toEqual(
         mockUniqueParsedTemplateTimelineObjects[0].version
@@ -781,31 +784,31 @@ describe('import timeline templates', () => {
     });
 
     test('should UPDATE a new timeline savedObject witn given timeline and skip the omitted fields', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistTimeline.mock.calls[0][3]).toEqual(mockParsedTemplateTimelineObject);
     });
 
     test('should NOT Create new pinned events', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistPinnedEventOnTimeline).not.toHaveBeenCalled();
     });
 
     test('should provide noteSavedObjectId when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][1]).toBeNull();
     });
 
     test('should provide new timeline version when Creating notes for a timeline', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][2]).toEqual(mockCreatedTemplateTimeline.version);
     });
 
     test('should exclude event notes when creating notes', async () => {
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       await server.inject(mockRequest, context);
       expect(mockPersistNote.mock.calls[0][3]).toEqual({
         eventId: undefined,
@@ -819,7 +822,8 @@ describe('import timeline templates', () => {
     });
 
     test('returns 200 when import timeline successfully', async () => {
-      const response = await server.inject(getImportTimelinesRequest(), context);
+      const mockRequest = await getImportTimelinesRequest();
+      const response = await server.inject(mockRequest, context);
       expect(response.status).toEqual(200);
     });
 
@@ -833,7 +837,7 @@ describe('import timeline templates', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       const response = await server.inject(mockRequest, context);
       expect(response.body).toEqual({
         success: false,
@@ -862,7 +866,7 @@ describe('import timeline templates', () => {
           },
         ],
       ]);
-      const mockRequest = getImportTimelinesRequest();
+      const mockRequest = await getImportTimelinesRequest();
       const response = await server.inject(mockRequest, context);
       expect(response.body).toEqual({
         success: false,
@@ -920,7 +924,7 @@ describe('import timeline templates', () => {
       const result = server.validate(request);
 
       expect(result.badRequest).toHaveBeenCalledWith(
-        'Invalid value "undefined" supplied to "file"'
+        'Invalid value {"id":"someId"}, excess properties: ["id"]'
       );
     });
   });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
index c93983e499fb54..811d4531b86a71 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/import_timelines_route.ts
@@ -5,6 +5,7 @@
  */
 
 import { extname } from 'path';
+import { Readable } from 'stream';
 
 import { IRouter } from '../../../../../../../src/core/server';
 
@@ -12,7 +13,7 @@ import { TIMELINE_IMPORT_URL } from '../../../../common/constants';
 
 import { SetupPlugins } from '../../../plugin';
 import { ConfigType } from '../../../config';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { buildSiemResponse, transformError } from '../../detection_engine/routes/utils';
 
 import { importTimelines } from './utils/import_timelines';
@@ -28,7 +29,7 @@ export const importTimelinesRoute = (
     {
       path: `${TIMELINE_IMPORT_URL}`,
       validate: {
-        body: buildRouteValidation(ImportTimelinesPayloadSchemaRt),
+        body: buildRouteValidationWithExcess(ImportTimelinesPayloadSchemaRt),
       },
       options: {
         tags: ['access:securitySolution'],
@@ -60,7 +61,7 @@ export const importTimelinesRoute = (
         const frameworkRequest = await buildFrameworkRequest(context, security, request);
 
         const res = await importTimelines(
-          file,
+          (file as unknown) as Readable,
           config.maxTimelineImportExportSize,
           frameworkRequest,
           isImmutable === 'true'
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/create_timelines_schema.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/create_timelines_schema.ts
index 241d266a14c78f..8d542201f61086 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/create_timelines_schema.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/create_timelines_schema.ts
@@ -5,7 +5,11 @@
  */
 import * as rt from 'io-ts';
 
-import { SavedTimelineRuntimeType } from '../../../../../common/types/timeline';
+import {
+  SavedTimelineRuntimeType,
+  TimelineStatusLiteralRt,
+  TimelineTypeLiteralRt,
+} from '../../../../../common/types/timeline';
 import { unionWithNullType } from '../../../../../common/utility_types';
 
 export const createTimelineSchema = rt.intersection([
@@ -13,7 +17,11 @@ export const createTimelineSchema = rt.intersection([
     timeline: SavedTimelineRuntimeType,
   }),
   rt.partial({
+    status: unionWithNullType(TimelineStatusLiteralRt),
     timelineId: unionWithNullType(rt.string),
+    templateTimelineId: unionWithNullType(rt.string),
+    templateTimelineVersion: unionWithNullType(rt.number),
+    timelineType: unionWithNullType(TimelineTypeLiteralRt),
     version: unionWithNullType(rt.string),
   }),
 ]);
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/export_timelines_schema.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/export_timelines_schema.ts
index ce8eb93bdbdbd4..4599d2bb571a2e 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/export_timelines_schema.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/export_timelines_schema.ts
@@ -11,8 +11,6 @@ export const exportTimelinesQuerySchema = rt.type({
   file_name: rt.string,
 });
 
-export const exportTimelinesRequestBodySchema = unionWithNullType(
-  rt.partial({
-    ids: unionWithNullType(rt.array(rt.string)),
-  })
-);
+export const exportTimelinesRequestBodySchema = rt.partial({
+  ids: unionWithNullType(rt.array(rt.string)),
+});
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/get_timeline_by_id_schema.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/get_timeline_by_id_schema.ts
index 65c956ed604400..2c6098bc75500f 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/get_timeline_by_id_schema.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/get_timeline_by_id_schema.ts
@@ -4,13 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import * as rt from 'io-ts';
-import { unionWithNullType } from '../../../../../common/utility_types';
 
-export const getTimelineByIdSchemaQuery = unionWithNullType(
-  rt.partial({
-    template_timeline_id: rt.string,
-    id: rt.string,
-  })
-);
+export const getTimelineByIdSchemaQuery = rt.partial({
+  template_timeline_id: rt.string,
+  id: rt.string,
+});
 
 export type GetTimelineByIdSchemaQuery = rt.TypeOf<typeof getTimelineByIdSchemaQuery>;
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/import_timelines_schema.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/import_timelines_schema.ts
index afce9d6cdcb24e..89f3f9ddec1fc1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/import_timelines_schema.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/schemas/import_timelines_schema.ts
@@ -5,9 +5,6 @@
  */
 import * as rt from 'io-ts';
 
-import { Readable } from 'stream';
-import { either } from 'fp-ts/lib/Either';
-
 import { SavedTimelineRuntimeType } from '../../../../../common/types/timeline';
 
 import { eventNotes, globalNotes, pinnedEventIds } from './schemas';
@@ -28,16 +25,17 @@ export const ImportTimelinesSchemaRt = rt.intersection([
 
 export type ImportTimelinesSchema = rt.TypeOf<typeof ImportTimelinesSchemaRt>;
 
-const ReadableRt = new rt.Type<Readable, Readable, unknown>(
-  'ReadableRt',
-  (u): u is Readable => u instanceof Readable,
-  (u, c) =>
-    either.chain(rt.object.validate(u, c), (s) => {
-      const d = s as Readable;
-      return d.readable ? rt.success(d) : rt.failure(u, c);
-    }),
-  (a) => a
-);
+const ReadableRt = rt.partial({
+  _maxListeners: rt.unknown,
+  _readableState: rt.unknown,
+  _read: rt.unknown,
+  readable: rt.boolean,
+  _events: rt.unknown,
+  _eventsCount: rt.number,
+  _data: rt.unknown,
+  _position: rt.number,
+  _encoding: rt.string,
+});
 
 const booleanInString = rt.union([rt.literal('true'), rt.literal('false')]);
 
@@ -46,9 +44,14 @@ export const ImportTimelinesPayloadSchemaRt = rt.intersection([
     file: rt.intersection([
       ReadableRt,
       rt.type({
-        hapi: rt.type({ filename: rt.string }),
+        hapi: rt.type({
+          filename: rt.string,
+          headers: rt.unknown,
+        }),
       }),
     ]),
   }),
   rt.partial({ isImmutable: booleanInString }),
 ]);
+
+export type ImportTimelinesPayloadSchema = rt.TypeOf<typeof ImportTimelinesPayloadSchemaRt>;
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
index 07ce9a7336d4d7..6b8ceea80c31a1 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/update_timelines_route.ts
@@ -9,7 +9,7 @@ import { IRouter } from '../../../../../../../src/core/server';
 import { TIMELINE_URL } from '../../../../common/constants';
 
 import { SetupPlugins } from '../../../plugin';
-import { buildRouteValidation } from '../../../utils/build_validation/route_validation';
+import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { ConfigType } from '../../..';
 
 import { transformError, buildSiemResponse } from '../../detection_engine/routes/utils';
@@ -28,7 +28,7 @@ export const updateTimelinesRoute = (
     {
       path: TIMELINE_URL,
       validate: {
-        body: buildRouteValidation(updateTimelineSchema),
+        body: buildRouteValidationWithExcess(updateTimelineSchema),
       },
       options: {
         tags: ['access:securitySolution'],
diff --git a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
index 9559e442e2159d..ffc12d2bce2612 100644
--- a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.test.ts
@@ -3,84 +3,195 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { buildRouteValidation } from './route_validation';
 import * as rt from 'io-ts';
 import { RouteValidationResultFactory } from 'src/core/server';
 
-describe('buildRouteValidation', () => {
-  const schema = rt.exact(
-    rt.type({
-      ids: rt.array(rt.string),
-    })
-  );
-  type Schema = rt.TypeOf<typeof schema>;
-
-  /**
-   * If your schema is using exact all the way down then the validation will
-   * catch any additional keys that should not be present within the validation
-   * when the route_validation uses the exact check.
-   */
-  const deepSchema = rt.exact(
-    rt.type({
-      topLevel: rt.exact(
-        rt.type({
-          secondLevel: rt.exact(
-            rt.type({
-              thirdLevel: rt.string,
-            })
-          ),
-        })
-      ),
-    })
-  );
-  type DeepSchema = rt.TypeOf<typeof deepSchema>;
-
-  const validationResult: RouteValidationResultFactory = {
-    ok: jest.fn().mockImplementation((validatedInput) => validatedInput),
-    badRequest: jest.fn().mockImplementation((e) => e),
-  };
-
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
+import { buildRouteValidation, buildRouteValidationWithExcess } from './route_validation';
 
-  test('return validation error', () => {
-    const input: Omit<Schema, 'ids'> & { id: string } = { id: 'someId' };
-    const result = buildRouteValidation(schema)(input, validationResult);
+describe('Route Validation with ', () => {
+  describe('buildRouteValidation', () => {
+    const schema = rt.exact(
+      rt.type({
+        ids: rt.array(rt.string),
+      })
+    );
+    type Schema = rt.TypeOf<typeof schema>;
 
-    expect(result).toEqual('Invalid value "undefined" supplied to "ids"');
-  });
+    /**
+     * If your schema is using exact all the way down then the validation will
+     * catch any additional keys that should not be present within the validation
+     * when the route_validation uses the exact check.
+     */
+    const deepSchema = rt.exact(
+      rt.type({
+        topLevel: rt.exact(
+          rt.type({
+            secondLevel: rt.exact(
+              rt.type({
+                thirdLevel: rt.string,
+              })
+            ),
+          })
+        ),
+      })
+    );
+    type DeepSchema = rt.TypeOf<typeof deepSchema>;
 
-  test('return validated input', () => {
-    const input: Schema = { ids: ['someId'] };
-    const result = buildRouteValidation(schema)(input, validationResult);
+    const validationResult: RouteValidationResultFactory = {
+      ok: jest.fn().mockImplementation((validatedInput) => validatedInput),
+      badRequest: jest.fn().mockImplementation((e) => e),
+    };
 
-    expect(result).toEqual(input);
-  });
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
 
-  test('returns validation error if given extra keys on input for an array', () => {
-    const input: Schema & { somethingExtra: string } = {
-      ids: ['someId'],
-      somethingExtra: 'hello',
-    };
-    const result = buildRouteValidation(schema)(input, validationResult);
-    expect(result).toEqual('invalid keys "somethingExtra"');
-  });
+    test('return validation error', () => {
+      const input: Omit<Schema, 'ids'> & { id: string } = { id: 'someId' };
+      const result = buildRouteValidation(schema)(input, validationResult);
+
+      expect(result).toEqual('Invalid value "undefined" supplied to "ids"');
+    });
+
+    test('return validated input', () => {
+      const input: Schema = { ids: ['someId'] };
+      const result = buildRouteValidation(schema)(input, validationResult);
+
+      expect(result).toEqual(input);
+    });
 
-  test('return validation input for a deep 3rd level object', () => {
-    const input: DeepSchema = { topLevel: { secondLevel: { thirdLevel: 'hello' } } };
-    const result = buildRouteValidation(deepSchema)(input, validationResult);
-    expect(result).toEqual(input);
+    test('returns validation error if given extra keys on input for an array', () => {
+      const input: Schema & { somethingExtra: string } = {
+        ids: ['someId'],
+        somethingExtra: 'hello',
+      };
+      const result = buildRouteValidation(schema)(input, validationResult);
+      expect(result).toEqual('invalid keys "somethingExtra"');
+    });
+
+    test('return validation input for a deep 3rd level object', () => {
+      const input: DeepSchema = { topLevel: { secondLevel: { thirdLevel: 'hello' } } };
+      const result = buildRouteValidation(deepSchema)(input, validationResult);
+      expect(result).toEqual(input);
+    });
+
+    test('return validation error for a deep 3rd level object that has an extra key value of "somethingElse"', () => {
+      const input: DeepSchema & {
+        topLevel: { secondLevel: { thirdLevel: string; somethingElse: string } };
+      } = {
+        topLevel: { secondLevel: { thirdLevel: 'hello', somethingElse: 'extraKey' } },
+      };
+      const result = buildRouteValidation(deepSchema)(input, validationResult);
+      expect(result).toEqual('invalid keys "somethingElse"');
+    });
   });
 
-  test('return validation error for a deep 3rd level object that has an extra key value of "somethingElse"', () => {
-    const input: DeepSchema & {
-      topLevel: { secondLevel: { thirdLevel: string; somethingElse: string } };
-    } = {
-      topLevel: { secondLevel: { thirdLevel: 'hello', somethingElse: 'extraKey' } },
+  describe('buildRouteValidationwithExcess', () => {
+    const schema = rt.type({
+      ids: rt.array(rt.string),
+    });
+    type Schema = rt.TypeOf<typeof schema>;
+
+    /**
+     * If your schema is using exact all the way down then the validation will
+     * catch any additional keys that should not be present within the validation
+     * when the route_validation uses the exact check.
+     */
+    const deepSchema = rt.type({
+      topLevel: rt.type({
+        secondLevel: rt.type({
+          thirdLevel: rt.string,
+        }),
+      }),
+    });
+    type DeepSchema = rt.TypeOf<typeof deepSchema>;
+
+    const validationResult: RouteValidationResultFactory = {
+      ok: jest.fn().mockImplementation((validatedInput) => validatedInput),
+      badRequest: jest.fn().mockImplementation((e) => e),
     };
-    const result = buildRouteValidation(deepSchema)(input, validationResult);
-    expect(result).toEqual('invalid keys "somethingElse"');
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+
+    test('return validation error', () => {
+      const input: Omit<Schema, 'ids'> & { id: string } = { id: 'someId' };
+      const result = buildRouteValidationWithExcess(schema)(input, validationResult);
+
+      expect(result).toEqual('Invalid value {"id":"someId"}, excess properties: ["id"]');
+    });
+
+    test('return validation error with intersection', () => {
+      const schemaI = rt.intersection([
+        rt.type({
+          ids: rt.array(rt.string),
+        }),
+        rt.partial({
+          valid: rt.array(rt.string),
+        }),
+      ]);
+      type SchemaI = rt.TypeOf<typeof schemaI>;
+      const input: Omit<SchemaI, 'ids'> & { id: string } = { id: 'someId', valid: ['yes'] };
+      const result = buildRouteValidationWithExcess(schemaI)(input, validationResult);
+
+      expect(result).toEqual(
+        'Invalid value {"id":"someId","valid":["yes"]}, excess properties: ["id"]'
+      );
+    });
+
+    test('return NO validation error with a partial intersection', () => {
+      const schemaI = rt.intersection([
+        rt.type({
+          id: rt.array(rt.string),
+        }),
+        rt.partial({
+          valid: rt.array(rt.string),
+        }),
+      ]);
+      const input = { id: ['someId'] };
+      const result = buildRouteValidationWithExcess(schemaI)(input, validationResult);
+
+      expect(result).toEqual({ id: ['someId'] });
+    });
+
+    test('return validated input', () => {
+      const input: Schema = { ids: ['someId'] };
+      const result = buildRouteValidationWithExcess(schema)(input, validationResult);
+
+      expect(result).toEqual(input);
+    });
+
+    test('returns validation error if given extra keys on input for an array', () => {
+      const input: Schema & { somethingExtra: string } = {
+        ids: ['someId'],
+        somethingExtra: 'hello',
+      };
+      const result = buildRouteValidationWithExcess(schema)(input, validationResult);
+      expect(result).toEqual(
+        'Invalid value {"ids":["someId"],"somethingExtra":"hello"}, excess properties: ["somethingExtra"]'
+      );
+    });
+
+    test('return validation input for a deep 3rd level object', () => {
+      const input: DeepSchema = { topLevel: { secondLevel: { thirdLevel: 'hello' } } };
+      const result = buildRouteValidationWithExcess(deepSchema)(input, validationResult);
+      expect(result).toEqual(input);
+    });
+
+    test('return validation error for a deep 3rd level object that has an extra key value of "somethingElse"', () => {
+      const input: DeepSchema & {
+        topLevel: { secondLevel: { thirdLevel: string; somethingElse: string } };
+      } = {
+        topLevel: { secondLevel: { thirdLevel: 'hello', somethingElse: 'extraKey' } },
+      };
+      const result = buildRouteValidationWithExcess(deepSchema)(input, validationResult);
+      expect(result).toEqual(
+        'Invalid value {"topLevel":{"secondLevel":{"thirdLevel":"hello","somethingElse":"extraKey"}}}, excess properties: ["somethingElse"]'
+      );
+    });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
index d7ab9affa6c1c1..51f807d6aad818 100644
--- a/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
+++ b/x-pack/plugins/security_solution/server/utils/build_validation/route_validation.ts
@@ -14,6 +14,7 @@ import {
   RouteValidationResultFactory,
   RouteValidationError,
 } from '../../../../../../src/core/server';
+import { excess, GenericIntersectionC } from '../runtime_types';
 
 type RequestValidationResult<T> =
   | {
@@ -39,3 +40,20 @@ export const buildRouteValidation = <T extends rt.Mixed, A = rt.TypeOf<T>>(
       (validatedInput: A) => validationResult.ok(validatedInput)
     )
   );
+
+export const buildRouteValidationWithExcess = <
+  T extends rt.InterfaceType<rt.Props> | GenericIntersectionC | rt.PartialType<rt.Props>,
+  A = rt.TypeOf<T>
+>(
+  schema: T
+): RouteValidationFunction<A> => (
+  inputValue: unknown,
+  validationResult: RouteValidationResultFactory
+) =>
+  pipe(
+    excess(schema).decode(inputValue),
+    fold<rt.Errors, A, RequestValidationResult<A>>(
+      (errors: rt.Errors) => validationResult.badRequest(formatErrors(errors).join()),
+      (validatedInput: A) => validationResult.ok(validatedInput)
+    )
+  );
diff --git a/x-pack/plugins/security_solution/server/utils/runtime_types.ts b/x-pack/plugins/security_solution/server/utils/runtime_types.ts
new file mode 100644
index 00000000000000..7177cc5765f8a5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/utils/runtime_types.ts
@@ -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 { either, fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { pipe } from 'fp-ts/lib/pipeable';
+import * as rt from 'io-ts';
+import { failure } from 'io-ts/lib/PathReporter';
+import get from 'lodash/get';
+
+type ErrorFactory = (message: string) => Error;
+
+export type GenericIntersectionC =
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  | rt.IntersectionC<[any, any]>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  | rt.IntersectionC<[any, any, any]>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  | rt.IntersectionC<[any, any, any, any]>
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  | rt.IntersectionC<[any, any, any, any, any]>;
+
+export const createPlainError = (message: string) => new Error(message);
+
+export const throwErrors = (createError: ErrorFactory) => (errors: rt.Errors) => {
+  throw createError(failure(errors).join('\n'));
+};
+
+export const decodeOrThrow = <A, O, I>(
+  runtimeType: rt.Type<A, O, I>,
+  createError: ErrorFactory = createPlainError
+) => (inputValue: I) =>
+  pipe(runtimeType.decode(inputValue), fold(throwErrors(createError), identity));
+
+const getProps = (
+  codec:
+    | rt.HasProps
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    | rt.RecordC<rt.StringC, any>
+    | GenericIntersectionC
+): rt.Props | null => {
+  if (codec == null) {
+    return null;
+  }
+  switch (codec._tag) {
+    case 'DictionaryType':
+      if (codec.codomain.props != null) {
+        return codec.codomain.props;
+      }
+      const dTypes: rt.HasProps[] = codec.codomain.types;
+      return dTypes.reduce<rt.Props>((props, type) => Object.assign(props, getProps(type)), {});
+    case 'RefinementType':
+    case 'ReadonlyType':
+      return getProps(codec.type);
+    case 'InterfaceType':
+    case 'StrictType':
+    case 'PartialType':
+      return codec.props;
+    case 'IntersectionType':
+      const iTypes = codec.types as rt.HasProps[];
+      return iTypes.reduce<rt.Props>((props, type) => {
+        return Object.assign(props, getProps(type) as rt.Props);
+      }, {} as rt.Props) as rt.Props;
+    default:
+      return null;
+  }
+};
+
+const getExcessProps = (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  props: rt.Props | rt.RecordC<rt.StringC, any>,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  r: any
+): string[] => {
+  return Object.keys(r).reduce<string[]>((acc, k) => {
+    const codecChildren = get(props, [k]);
+    const childrenProps = getProps(codecChildren);
+    const childrenObject = r[k] as Record<string, unknown>;
+    if (codecChildren != null && childrenProps != null && codecChildren._tag === 'DictionaryType') {
+      const keys = Object.keys(childrenObject);
+      return [
+        ...acc,
+        ...keys.reduce<string[]>(
+          (kAcc, i) => [...kAcc, ...getExcessProps(childrenProps, childrenObject[i])],
+          []
+        ),
+      ];
+    }
+    if (codecChildren != null && childrenProps != null) {
+      return [...acc, ...getExcessProps(childrenProps, childrenObject)];
+    } else if (codecChildren == null) {
+      return [...acc, k];
+    }
+    return acc;
+  }, []);
+};
+
+export const excess = <
+  C extends rt.InterfaceType<rt.Props> | GenericIntersectionC | rt.PartialType<rt.Props>
+>(
+  codec: C
+): C => {
+  const codecProps = getProps(codec);
+
+  const r = new rt.InterfaceType(
+    codec.name,
+    codec.is,
+    (i, c) =>
+      either.chain(rt.UnknownRecord.validate(i, c), (s) => {
+        if (codecProps == null) {
+          return rt.failure(i, c, 'unknown codec');
+        }
+        const ex = getExcessProps(codecProps, s);
+
+        return ex.length > 0
+          ? rt.failure(
+              i,
+              c,
+              `Invalid value ${JSON.stringify(i)}, excess properties: ${JSON.stringify(ex)}`
+            )
+          : codec.validate(i, c);
+      }),
+    codec.encode,
+    codecProps
+  );
+  return r as C;
+};

From 2db789598bb9353fd3e690f43b1eacbd2e75839c Mon Sep 17 00:00:00 2001
From: John Schulz <john.schulz@elastic.co>
Date: Thu, 3 Sep 2020 09:12:43 -0400
Subject: [PATCH 216/216] [Ingest Manager] Split Registry errors into
 Connection & Response (#76558)

* Split Registry errors into Connection & Response

* Ensure a url in ResponseError message. Add tests
---
 .../plugins/ingest_manager/server/errors.ts   | 11 +--
 .../services/epm/registry/requests.test.ts    | 98 ++++++++++++++++---
 .../server/services/epm/registry/requests.ts  | 32 +++---
 3 files changed, 108 insertions(+), 33 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/server/errors.ts b/x-pack/plugins/ingest_manager/server/errors.ts
index 401211409ebf75..e6ef4a51284b04 100644
--- a/x-pack/plugins/ingest_manager/server/errors.ts
+++ b/x-pack/plugins/ingest_manager/server/errors.ts
@@ -17,15 +17,14 @@ export const getHTTPResponseCode = (error: IngestManagerError): number => {
     return 502; // Bad Gateway
   }
   if (error instanceof PackageNotFoundError) {
-    return 404;
-  }
-  if (error instanceof PackageOutdatedError) {
-    return 400;
-  } else {
-    return 400; // Bad Request
+    return 404; // Not Found
   }
+
+  return 400; // Bad Request
 };
 
 export class RegistryError extends IngestManagerError {}
+export class RegistryConnectionError extends RegistryError {}
+export class RegistryResponseError extends RegistryError {}
 export class PackageNotFoundError extends IngestManagerError {}
 export class PackageOutdatedError extends IngestManagerError {}
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts
index f836a133a78a01..2f1d4000187407 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { fetchUrl } from './requests';
-import { RegistryError } from '../../../errors';
+import { RegistryError, RegistryConnectionError, RegistryResponseError } from '../../../errors';
 jest.mock('node-fetch');
 
 const { Response, FetchError } = jest.requireActual('node-fetch');
@@ -53,13 +53,7 @@ describe('setupIngestManager', () => {
             throw new FetchError('message 3', 'system', { code: 'ESOMETHING' });
           })
           // this one succeeds
-          .mockImplementationOnce(() => Promise.resolve(new Response(successValue)))
-          .mockImplementationOnce(() => {
-            throw new FetchError('message 5', 'system', { code: 'ESOMETHING' });
-          })
-          .mockImplementationOnce(() => {
-            throw new FetchError('message 6', 'system', { code: 'ESOMETHING' });
-          });
+          .mockImplementationOnce(() => Promise.resolve(new Response(successValue)));
 
         const promise = fetchUrl('');
         await expect(promise).resolves.toEqual(successValue);
@@ -69,7 +63,7 @@ describe('setupIngestManager', () => {
         expect(actualResultsOrder).toEqual(['throw', 'throw', 'throw', 'return']);
       });
 
-      it('or error after 1 failure & 5 retries with RegistryError', async () => {
+      it('or error after 1 failure & 5 retries with RegistryConnectionError', async () => {
         fetchMock
           .mockImplementationOnce(() => {
             throw new FetchError('message 1', 'system', { code: 'ESOMETHING' });
@@ -88,21 +82,93 @@ describe('setupIngestManager', () => {
           })
           .mockImplementationOnce(() => {
             throw new FetchError('message 6', 'system', { code: 'ESOMETHING' });
-          })
-          .mockImplementationOnce(() => {
-            throw new FetchError('message 7', 'system', { code: 'ESOMETHING' });
-          })
-          .mockImplementationOnce(() => {
-            throw new FetchError('message 8', 'system', { code: 'ESOMETHING' });
           });
 
         const promise = fetchUrl('');
-        await expect(promise).rejects.toThrow(RegistryError);
+        await expect(promise).rejects.toThrow(RegistryConnectionError);
         // doesn't retry after 1 failure & 5 failed retries
         expect(fetchMock).toHaveBeenCalledTimes(6);
         const actualResultsOrder = fetchMock.mock.results.map(({ type }: { type: string }) => type);
         expect(actualResultsOrder).toEqual(['throw', 'throw', 'throw', 'throw', 'throw', 'throw']);
       });
     });
+
+    describe('4xx or 5xx from Registry become RegistryResponseError', () => {
+      it('404', async () => {
+        fetchMock.mockImplementationOnce(() => ({
+          ok: false,
+          status: 404,
+          statusText: 'Not Found',
+          url: 'https://example.com',
+        }));
+        const promise = fetchUrl('');
+        await expect(promise).rejects.toThrow(RegistryResponseError);
+        await expect(promise).rejects.toThrow(
+          `'404 Not Found' error response from package registry at https://example.com`
+        );
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+      });
+
+      it('429', async () => {
+        fetchMock.mockImplementationOnce(() => ({
+          ok: false,
+          status: 429,
+          statusText: 'Too Many Requests',
+          url: 'https://example.com',
+        }));
+        const promise = fetchUrl('');
+        await expect(promise).rejects.toThrow(RegistryResponseError);
+        await expect(promise).rejects.toThrow(
+          `'429 Too Many Requests' error response from package registry at https://example.com`
+        );
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+      });
+
+      it('500', async () => {
+        fetchMock.mockImplementationOnce(() => ({
+          ok: false,
+          status: 500,
+          statusText: 'Internal Server Error',
+          url: 'https://example.com',
+        }));
+        const promise = fetchUrl('');
+        await expect(promise).rejects.toThrow(RegistryResponseError);
+        await expect(promise).rejects.toThrow(
+          `'500 Internal Server Error' error response from package registry at https://example.com`
+        );
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('url in RegistryResponseError message is response.url || requested_url', () => {
+      it('given response.url, use that', async () => {
+        fetchMock.mockImplementationOnce(() => ({
+          ok: false,
+          status: 404,
+          statusText: 'Not Found',
+          url: 'https://example.com/?from_response=true',
+        }));
+        const promise = fetchUrl('https://example.com/?requested=true');
+        await expect(promise).rejects.toThrow(RegistryResponseError);
+        await expect(promise).rejects.toThrow(
+          `'404 Not Found' error response from package registry at https://example.com/?from_response=true`
+        );
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+      });
+
+      it('no response.url, use requested url', async () => {
+        fetchMock.mockImplementationOnce(() => ({
+          ok: false,
+          status: 404,
+          statusText: 'Not Found',
+        }));
+        const promise = fetchUrl('https://example.com/?requested=true');
+        await expect(promise).rejects.toThrow(RegistryResponseError);
+        await expect(promise).rejects.toThrow(
+          `'404 Not Found' error response from package registry at https://example.com/?requested=true`
+        );
+        expect(fetchMock).toHaveBeenCalledTimes(1);
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
index 5939dc204aae66..e549d6b1f71aa1 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/registry/requests.ts
@@ -7,7 +7,7 @@
 import fetch, { FetchError, Response } from 'node-fetch';
 import pRetry from 'p-retry';
 import { streamToString } from './streams';
-import { RegistryError } from '../../../errors';
+import { RegistryError, RegistryConnectionError, RegistryResponseError } from '../../../errors';
 
 type FailedAttemptErrors = pRetry.FailedAttemptError | FetchError | Error;
 
@@ -19,10 +19,13 @@ async function registryFetch(url: string) {
     return response;
   } else {
     // 4xx & 5xx responses
-    // exit without retry & throw RegistryError
-    throw new pRetry.AbortError(
-      new RegistryError(`Error connecting to package registry at ${url}: ${response.statusText}`)
-    );
+    const { status, statusText, url: resUrl } = response;
+    const message = `'${status} ${statusText}' error response from package registry at ${
+      resUrl || url
+    }`;
+    const responseError = new RegistryResponseError(message);
+
+    throw new pRetry.AbortError(responseError);
   }
 }
 
@@ -38,17 +41,24 @@ export async function getResponse(url: string): Promise<Response> {
         // and let the others through without retrying
         //
         // throwing in onFailedAttempt will abandon all retries & fail the request
-        // we only want to retry system errors, so throw a RegistryError for everything else
+        // we only want to retry system errors, so re-throw for everything else
         if (!isSystemError(error)) {
-          throw new RegistryError(
-            `Error connecting to package registry at ${url}: ${error.message}`
-          );
+          throw error;
         }
       },
     });
     return response;
-  } catch (e) {
-    throw new RegistryError(`Error connecting to package registry at ${url}: ${e.message}`);
+  } catch (error) {
+    // isSystemError here means we didn't succeed after max retries
+    if (isSystemError(error)) {
+      throw new RegistryConnectionError(`Error connecting to package registry: ${error.message}`);
+    }
+    // don't wrap our own errors
+    if (error instanceof RegistryError) {
+      throw error;
+    } else {
+      throw new RegistryError(error);
+    }
   }
 }