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 01/23] [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 6aed16e937713..3c4c983efa9fa 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 dc6ac4919a4c4..0555b95648bc1 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 093ef4d6f1873..59d952d08c181 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 ea04b1e14d959..6641eede91e66 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 02/23] [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 0000000000000..9ba22e83b4b4d
--- /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 0000000000000..c25979cbcdcee
--- /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 0000000000000..19b16bd4bc6d2
--- /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 0000000000000..0071fe3deeb1f
--- /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 a27899e454074..dc81c0a9137f8 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 6905f2be38966..474002c93f24f 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 53fe185ef9a65..63c3f3ea81d98 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 e8bd0c58f9ace..8e2b47769adf3 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 84682fd14ac6b..759b34cd258d5 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 efd80c5c590ed..c11de9100e71e 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 0000000000000..95ff6363a3870
--- /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 6e1ebbfd1e7bb..bc711d08065e2 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 f766f068f099f..a72ef0ff1c46e 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 ada713d135c22..c8cd36e40d6e0 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 6c8eb9eb04941..084d4b699e8eb 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 ae50f6919dce1..d71953eec026f 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 77c6446fbb3d0..1c2604ee65552 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 d2b66207d8602..4fdacb2621abd 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 0000000000000..4da319d5b1e42
--- /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 0000000000000..35e4d2cc8e1fe
--- /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 0000000000000..722445a7275a1
--- /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 0000000000000..d07c239dfab86
--- /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 a7ec822839d21..48e210d822918 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 34676fc1932fe..ddd2a458b3b8c 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 b6c26cd533de2..c0205ccce63cc 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 03/23] 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 3be2599c64201..9ab1de22af57c 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 04/23] 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 9ab1de22af57c..a37ae19b15a06 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 05/23] [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 c5839df4c603b..05d27d7337a6e 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 6575e44f509eb..c4a366930d22a 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 9c8c1417d48db..29c11ffa1cef8 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 ad134e7d36b10..40f0f6380c21c 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 de4a17ce2bd3c..d13d0909243be 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 0000000000000..6bd0486532576
--- /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 0000000000000..322e6a4182c5c
--- /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 0000000000000..30bcf9ad2d7fd
--- /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 0000000000000..dcc7762b93214
--- /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 0000000000000..ce9071ad7b9d0
--- /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 0000000000000..bd988854225fb
--- /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 23e24e343937d..6a51b49869eaf 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 189f8278f1b07..6532e06f7051c 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 f700088cb67a0..ede776b6e0dce 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 8960d6fa9b67b..f7d73cb232b8d 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 892de5cfee35e..cc08febf41f45 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 5280f094e3a5d..2435d8a9aaf04 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 06/23] [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 e02c7f212277e..88858c36643ec 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 07/23] [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 8c9ede1fde9ba..d75a914e080d7 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 4a50938049a7b..cf8d3ab1c908a 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 4683727ed51ac..aa9fbc20fc0b0 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 1929955cac84c..1d1c2f79bf6cb 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 1901b8c0c7039..5fb718f91b876 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 4162060363381..87e8a0977e3ba 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 e5bba3d6deab3..61669ab876d80 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 c02a5e5878ee9..90d623b8a4be9 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 8a91cabe78d00..fefbe1fa82a0c 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 08367bf2a97bf..15f71689ecdfa 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 766bdc2e2c193..b8fbb4f1835a6 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 b072990727e3c..e3e2975777e17 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 c7b8edd0c332e..65375a076e9a4 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 aaed189ae3ddd..33b9dc617075b 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 0b719d8a67df7..564f5d03e9450 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 bcb9a7797f26a..5445a46fbe2b4 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 81893b1e78338..b81d44c40f8eb 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 3e80a74dc2b11..2bce8daa6637e 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 d1e54fe4fb3a1..5df695d248f5b 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 cc178e1038e2e..7eb3df2346106 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 2d6e2f67225e3..7c04acf4798f9 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 bbd91b97a86c9..6400d6e215f9b 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 cd35b2a43426c..d920ad4e6cb71 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 d19a73604b4f0..04e3c453da94c 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 aabb85dadabc2..dcba42af6d788 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 2c97bba0cac45..a03a3b7f59fba 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 aa9bef7bb5417..cfde474c6290d 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 5ef01c00dbf16..1093aed0608d5 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 b55da0798c5f0..410b0fe093002 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 c9fa80c88762b..1613ca9d11ee6 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 8dc4e5c232b80..2b4bb335dfc5c 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 79f6cfae175e1..fbfc94a0840b0 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 2d14a7a10e668..1d5b682d71c7a 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 dc05b7a4dd792..65fbdabe8bd79 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 93f656ea952d2..eef0d3beb69d0 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 23563c6f43bbe..1ee00ed720169 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 d1ff8731183ba..d24e438fa13ea 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 275462072919b..6c5d552a51eb9 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 c88f03de59615..113fbeca494d8 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 756eaa8ea49ba..53a400d2fd9eb 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 e74d88f3538e4..3c4cb93ee3ff3 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 d5106f5549924..17a4182fe9371 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 08/23] [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 0000000000000..1498334013d1a
--- /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 0000000000000..03dd894067afc
--- /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 0000000000000..b742a770b70c8
--- /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 0000000000000..4794d76cc7f84
--- /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 0000000000000..28b7f2588628e
--- /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 a90afbe0c4d25..738b9d5793d06 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 0000000000000..447d1ed5b1c53
--- /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 0000000000000..e11b36d77106a
--- /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 0000000000000..eb2e3d3087d4a
--- /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 0000000000000..12e20696b0510
--- /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 0000000000000..c061b969b3c09
--- /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 0000000000000..d86da178f0c1b
--- /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 0000000000000..e88c512a38653
--- /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 0000000000000..e4d9835106f12
--- /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 0000000000000..fefb18be14780
--- /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 0000000000000..2c073f67f82a8
--- /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 0000000000000..d9458e9a11c33
--- /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 0000000000000..01b89f93e5af0
--- /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 0000000000000..fe2ba1fcdf31c
--- /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 0000000000000..e0736d220ba5c
--- /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 0000000000000..1c9b59449bd92
--- /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 09/23] [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 645c6c276a6f9..95204f9ba09fc 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 10/23] 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 eb2d0d2581a34..9a3bb1c687032 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 a37ae19b15a06..56530a0ab4fdc 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 11/23] [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 b72a52f0a0eb7..366bf7a1df1f2 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 7535b23a10e8a..7c0de84b637c9 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 977683ab55495..a3e6f54f3eee8 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 1302b10533ccf..5f502555ee153 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 488c8390411b0..2325036ef40ae 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 0000000000000..13c8bcfc20793
--- /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 12/23] [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 0000000000000..7789d0caba345
--- /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 0000000000000..0294803042ada
--- /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 0000000000000..1e7324d9581a7
--- /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 0000000000000..23eff13915401
--- /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 0000000000000..c1c3c3b3ee9ee
--- /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 0000000000000..d241989f1aff1
--- /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 0000000000000..f8f6415dea22b
--- /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 0000000000000..40b65df3a1ce3
--- /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 0000000000000..d16f293fde6dc
--- /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 0000000000000..c4b4176560d5b
--- /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 0000000000000..ee824f730aca6
--- /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 0000000000000..22630f533dcbf
--- /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 0000000000000..59469d814e35f
--- /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 0000000000000..5f93694da09b8
--- /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 0000000000000..224bb822a581c
--- /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 0000000000000..71750fb6e25a0
--- /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 0000000000000..159408ea02938
--- /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 0000000000000..fdce5d02da3cd
--- /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 0000000000000..1856e5e3ce1af
--- /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 0000000000000..2680bc99cc367
--- /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 0000000000000..4500c494c23b7
--- /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 0000000000000..510c438a28195
--- /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 0000000000000..2d0c09db4e1c3
--- /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 0000000000000..8724be9da88cf
--- /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 0000000000000..14dbd0289da84
--- /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 0000000000000..f7bc1fda0c9ac
--- /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 0000000000000..da0d11cc1fdc5
--- /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 0000000000000..dd37ba9b6d859
--- /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 0000000000000..ddbe327a40a30
--- /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 0000000000000..f7a99b59837a5
--- /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 0000000000000..2bde3b70f82b5
--- /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 0000000000000..17ca8e58a80fa
--- /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 0000000000000..bb5f490ed472b
--- /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 0000000000000..dfac8525471b4
--- /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 0000000000000..184aadc1dad84
--- /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 0000000000000..1598ee760c059
--- /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 0000000000000..14d4dfecd0094
--- /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 0000000000000..04f5b9a477058
--- /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 0000000000000..e9ee92bed68ca
--- /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 0000000000000..f8c1d00047825
--- /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 0000000000000..28ea303d14eaf
--- /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 0000000000000..cc4650d70dad0
--- /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 0000000000000..20d2732e8c82a
--- /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 0000000000000..45866c10a5b21
--- /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 0000000000000..9f313a6995ad5
--- /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 0000000000000..d03c0abb441b9
--- /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 993a1a378e738..e833dde4c1b72 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 a8348a6f69a39..3866da738cbb6 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 3c476be8d10e6..441f45a947a49 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 13/23] 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 0145ca2a18092..6a68bd530cf63 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 14/23] [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 0000000000000..44f33aa329e7a
--- /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 0000000000000..234be8b6faf90
--- /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 8a43ae12deb21..44979a1b9c60a 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 0000000000000..48385ad3ae6a8
--- /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 f2db970bf5057..96d41be03a142 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 babb557105270..0560c3150a424 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 23a16ba84ef92..b832bfb2549c6 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 4d697bcda1a06..e0ed2ea6cf5e0 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 56c9a19723fba..22a17c4ea089a 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 62d7e82a214b5..2f2fc77283ef7 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 0000000000000..c4aebb108e7b9
--- /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 0000000000000..57cfc52045282
--- /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 0000000000000..8cf10a2acb64f
--- /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 0000000000000..24693df5025d9
--- /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 0000000000000..1579b187278c4
--- /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 0000000000000..55bc6d3668de7
--- /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 0000000000000..b69260d8d4157
--- /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 214b393a0fda9..3e8ab99e341ad 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 e327befcf7293..e4d7cfa32c2cd 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 21dde12404957..0000000000000
--- 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 4e08c57c0b2e0..0000000000000
--- 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 902cc907a0eff..28f12ead7924b 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 15/23] [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 7e79b212f69cb..b02a82f98af91 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 203c84b2943fd..3f5ec80320503 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 16/23] 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 9f9613a5a68f7..0000000000000
--- 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 ae3d82f0cc3ea..0000000000000
--- 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 da29a4de9acc8..0000000000000
--- 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 af368d003423a..0000000000000
--- 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 16bae3ee7c555..0000000000000
--- 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 012b069430290..79bcaf9700cf0 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 149410adb3550..0000000000000
--- 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 92a45349ad005..0000000000000
--- 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 5330440e6b96a..0000000000000
--- 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 e646339feb495..0000000000000
--- 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 c718e47b31b50..0000000000000
--- 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 6f42fb32fdb7b..3ff2afafcc514 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 1fb4084c25d34..52238ea2a00ca 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 b068c4804c0dd..b1e13ffaabd07 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 0000000000000..fd20f2944c5be
--- /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 10b65bdccdf87..5d467a7a9cbce 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 f28d5b1bca7e5..0000000000000
--- 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 3d145cce9d07d..0000000000000
--- 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 713b29ea3a3d3..215188ffa2607 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 5037cb0049e82..1d80c90991f55 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 09702df4fdb54..0ab86e0f4dab2 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 77a2954428f8d..d106f3a35a91c 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 d1863bebce4f0..6f8ee9d9eebf0 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 bacbd6e757114..cc37a3c7c0924 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 05afad5a4f7a4..2128eb077211f 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 10b4dab3f46ef..28ba0ab629e8f 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 9c81bb011e127..e7dce82c725d2 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 4b46adf399363..dbc3693c99779 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 daa44b2b0f85b..af956a20c0dc5 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 0000000000000..3d92bae1968fb
--- /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 e61593f6bfb27..4279dd320ad62 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 d2489a5d1f7e3..4cf6075869851 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 0cd0fe8324809..3c4fac81c2c7c 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 965f1a7f63065..7f72bfe55c7cd 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 558b5b57dce40..5814760601a67 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 51a642b775c29..08f478404be2c 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 047ac836a87d1..a0c380ec55bf6 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 a0597ed4b9026..b47fef107258a 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 f7e1156170f03..2350cbb67683e 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 ea91a9bb14e1f..c82bf7d759328 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 0ad9ae8f2014f..fe0d14b2d9c19 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 a443eacee731c..f6fcc29805dc4 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 bf1136159dfe8..16a5586858ab9 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 2ee604c1bf25d..1e3839038b0f7 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 1a7deafb548ae..7c09d2e64e8b7 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 b57d530ef40e8..dc1d0ec0a152f 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 30af970f55aa9..b53ae44c05075 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 95de19b96abd4..ccd1cf6e358b4 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 eda35a77afa5f..f9a3acb990fbf 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 46e0b62d0f8d7..d0a6174b011fc 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 b23b03db6a9ec..b8241e04ea1ee 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 91a357b635950..169b234845274 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 5c8483cf21369..1363d38748c8b 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 c6bba56f73ec7..4815ab0ac56dc 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 a157d225c839c..32737f7b7237d 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 a3b9b0b344823..2ad20c3807819 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 27b16c57ffecf..a9714a95ff338 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 0c4465ae7f4b9..b09e957944b65 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 7968c80628531..7cc336a1c20e9 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 9f114f2132009..9497a41b45ff9 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 6d1238e02c7fb..b03b37da40908 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 1f27766a1756d..361c0707fef6b 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 e055d644e1f91..0ee279ac5b727 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 87401818c4907..8746883a5d968 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 41d3393672474..13051f88c9591 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 00e00aa8e2991..c96a8f5ce17b9 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 47cabc4df662f..45253f6ad27c0 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 411bbe23e4761..319b9b2b3fce2 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 90f81a88b3da0..23977aac7fa7a 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 6c9d6db8de130..3bc9cd34f2984 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 b422de93de7a9..91c5cc1afdb49 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 96d3fc549ece0..b0385a61a72ac 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 91e8f1b26164b..da2dc7bab7cf7 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 f7b65930b683d..3289610a062b0 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 56b830e9ff098..d51ca46fd98ff 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 516ad25f933f6..348cd5e552258 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 1a5d22e7320a5..b66dac15b1364 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 0d98a0f2f26ff..073cb46d3949a 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 17/23] 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 5d71bf8651d88..a4a158bc7dbde 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 18/23] 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 1d0f6fc50ee9b..b4563dd1f9a9c 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 19/23] 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 feda5c1386e98..49db8696c1134 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 20/23] 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 37db063e284ec..4c53af3f8970e 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 0ae04bb424d44..0000000000000
--- 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 a10b549a7b9eb..0000000000000
--- 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 2350cbb67683e..f037a71b508a2 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 c82bf7d759328..2feeb5441ab83 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 b09e957944b65..e72fea160cc28 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 16d9e0c5418fa..1f2c97b128e3f 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 21/23] [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 fad8ecc86277b..ec3871b673888 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 1556ef5a5dab9..37da5fbcd1a1b 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 1f6c65919b063..361837bdef229 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 e28d1969b3976..564254b6a7596 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 22/23] [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 0000000000000..b21cd84684fbc
--- /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 64f2f223a3073..a9f39d2db6080 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 7c752bca49dbd..e7aab2fa5d219 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 a70258c2684b6..a72d641fbaf78 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 fe3eb79a6f610..73dc30f238c7e 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 589116c901c30..216ed0cbe264d 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 3a0a5b04c5874..680ca78fc222e 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 00141c9a453d8..cf27fa97b1479 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 c6ea269e1a355..6f5f3361d2b3e 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 a5bbc0465ccc1..166bb90113aef 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 434a33ac37722..f4a40b771c9fa 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 f9279ce639534..8178f5ae5ba1d 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 e36f08703dae5..891af4b8ca80e 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 0a899562d61c2..802b9472a4487 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 a7213c30eb3fb..b8311182f3ca8 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 9d688736a9846..da17d4a1f123a 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 a2e2fec3309c3..d053a8e1089ad 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 92cc9be69839f..dc09c6d5386fc 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 4b4f5147c9a42..cbe756064b72b 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 386eda5281f0c..ff565c05848f9 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 23/23] [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 e1552852d0349..d689abf4c4e05 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 0bef5bc5f32d4..9f7eb9d9e1aa4 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 0e9aef37aa253..bf093fed30747 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 1cde473aae6fa..0b00c8a8bf093 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 1658c36e8a92f..8291d94d91c48 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 2a7d11bb57ca5..5b50eb953d896 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 830e3719b11f9..d8dcc71f5051d 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 012256db3ab98..57ef2d49291c4 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 4a271019e06db..9d58ed142dab7 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 d4be4da2ae1c5..83fab95bc91c9 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 0000000000000..b5bbdfc14d9d3
--- /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 56530a0ab4fdc..98092d71caebb 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"