diff --git a/docs/siem/images/detections-ui.png b/docs/siem/images/detections-ui.png
new file mode 100644
index 0000000000000..3139ffea0767d
Binary files /dev/null and b/docs/siem/images/detections-ui.png differ
diff --git a/docs/siem/images/hosts-ui.png b/docs/siem/images/hosts-ui.png
index 2569df8f419b8..be9fd29246b51 100644
Binary files a/docs/siem/images/hosts-ui.png and b/docs/siem/images/hosts-ui.png differ
diff --git a/docs/siem/images/network-ui.png b/docs/siem/images/network-ui.png
index 406ac854cd0a2..de8ce89273a02 100644
Binary files a/docs/siem/images/network-ui.png and b/docs/siem/images/network-ui.png differ
diff --git a/docs/siem/images/overview-ui.png b/docs/siem/images/overview-ui.png
index a34b2fea061c9..6ac02104d6123 100644
Binary files a/docs/siem/images/overview-ui.png and b/docs/siem/images/overview-ui.png differ
diff --git a/docs/siem/siem-ui.asciidoc b/docs/siem/siem-ui.asciidoc
index 7294cfbc414f4..f01575a21b9f6 100644
--- a/docs/siem/siem-ui.asciidoc
+++ b/docs/siem/siem-ui.asciidoc
@@ -33,6 +33,23 @@ investigation.
 [role="screenshot"]
 image::siem/images/network-ui.png[]
 
+[float]
+[[detections-ui]]
+=== Detections
+
+The Detections feature automatically searches for threats and creates 
+signals when they are detected. Signal detection rules define the conditions 
+for creating signals. The SIEM app comes with prebuilt rules that search for 
+suspicious activity on your network and hosts. Additionally, you can
+create your own rules.
+
+See {siem-guide}/detection-engine-overview.html[Detections] in the SIEM 
+Guide for information on managing detection rules and signals via the UI 
+or the Detections API.
+
+[role="screenshot"]
+image::siem/images/detections-ui.png[]
+
 [float]
 [[timelines-ui]]
 === Timeline
diff --git a/src/legacy/core_plugins/data/public/search/aggs/agg_config.ts b/src/legacy/core_plugins/data/public/search/aggs/agg_config.ts
index 769347a26c34c..ba7faf8c34b59 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/agg_config.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/agg_config.ts
@@ -58,6 +58,11 @@ const unknownSchema: Schema = {
   defaults: {},
   editor: false,
   group: AggGroupNames.Metrics,
+  aggSettings: {
+    top_hits: {
+      allowStrings: true,
+    },
+  },
 };
 
 const getTypeFromRegistry = (type: string): IAggType => {
@@ -438,7 +443,7 @@ export class AggConfig {
 
     if (fieldParam) {
       // @ts-ignore
-      availableFields = fieldParam.getAvailableFields(this.getIndexPattern().fields);
+      availableFields = fieldParam.getAvailableFields(this);
     }
 
     // clear out the previous params except for a few special ones
diff --git a/src/legacy/core_plugins/data/public/search/aggs/metrics/metric_agg_type.ts b/src/legacy/core_plugins/data/public/search/aggs/metrics/metric_agg_type.ts
index e7d286c187ef8..3bae7b92618dc 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/metrics/metric_agg_type.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/metrics/metric_agg_type.ts
@@ -24,6 +24,7 @@ import { AggParamType } from '../param_types/agg';
 import { AggConfig } from '../agg_config';
 import { METRIC_TYPES } from './metric_agg_types';
 import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { FilterFieldTypes } from '../param_types/field';
 
 export interface IMetricAggConfig extends AggConfig {
   type: InstanceType<typeof MetricAggType>;
@@ -31,7 +32,7 @@ export interface IMetricAggConfig extends AggConfig {
 
 export interface MetricAggParam<TMetricAggConfig extends AggConfig>
   extends AggParamType<TMetricAggConfig> {
-  filterFieldTypes?: KBN_FIELD_TYPES | KBN_FIELD_TYPES[] | '*';
+  filterFieldTypes?: FilterFieldTypes;
   onlyAggregatable?: boolean;
 }
 
diff --git a/src/legacy/core_plugins/data/public/search/aggs/metrics/top_hit.ts b/src/legacy/core_plugins/data/public/search/aggs/metrics/top_hit.ts
index 81bd14ded75b0..3112d882bb87e 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/metrics/top_hit.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/metrics/top_hit.ts
@@ -20,7 +20,6 @@
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { IMetricAggConfig, MetricAggType } from './metric_agg_type';
-import { aggTypeFieldFilters } from '../param_types/filter';
 import { METRIC_TYPES } from './metric_agg_types';
 import { KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
 
@@ -33,17 +32,6 @@ const isNumericFieldSelected = (agg: IMetricAggConfig) => {
   return field && field.type && field.type === KBN_FIELD_TYPES.NUMBER;
 };
 
-aggTypeFieldFilters.addFilter((field, aggConfig) => {
-  if (
-    aggConfig.type.name !== METRIC_TYPES.TOP_HITS ||
-    _.get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false)
-  ) {
-    return true;
-  }
-
-  return field.type === KBN_FIELD_TYPES.NUMBER;
-});
-
 export const topHitMetricAgg = new MetricAggType({
   name: METRIC_TYPES.TOP_HITS,
   title: i18n.translate('data.search.aggs.metrics.topHitTitle', {
@@ -75,7 +63,10 @@ export const topHitMetricAgg = new MetricAggType({
       name: 'field',
       type: 'field',
       onlyAggregatable: false,
-      filterFieldTypes: '*',
+      filterFieldTypes: (aggConfig: IMetricAggConfig) =>
+        _.get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false)
+          ? '*'
+          : KBN_FIELD_TYPES.NUMBER,
       write(agg, output) {
         const field = agg.getParam('field');
         output.params = {};
diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/field.test.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/field.test.ts
index d0fa711d89c70..fa88754ac60b9 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/param_types/field.test.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/param_types/field.test.ts
@@ -17,9 +17,13 @@
  * under the License.
  */
 
+import { get } from 'lodash';
 import { BaseParamType } from './base';
 import { FieldParamType } from './field';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
+import { IAggConfig } from '../agg_config';
+import { IMetricAggConfig } from '../metrics/metric_agg_type';
+import { Schema } from '../schemas';
 
 jest.mock('ui/new_platform');
 
@@ -45,7 +49,11 @@ describe('Field', () => {
         searchable: true,
       },
     ],
-  } as any;
+  };
+
+  const agg = ({
+    getIndexPattern: jest.fn(() => indexPattern),
+  } as unknown) as IAggConfig;
 
   describe('constructor', () => {
     it('it is an instance of BaseParamType', () => {
@@ -65,7 +73,7 @@ describe('Field', () => {
         type: 'field',
       });
 
-      const fields = aggParam.getAvailableFields(indexPattern.fields);
+      const fields = aggParam.getAvailableFields(agg);
 
       expect(fields.length).toBe(1);
 
@@ -82,7 +90,58 @@ describe('Field', () => {
 
       aggParam.onlyAggregatable = false;
 
-      const fields = aggParam.getAvailableFields(indexPattern.fields);
+      const fields = aggParam.getAvailableFields(agg);
+
+      expect(fields.length).toBe(2);
+    });
+
+    it('should return all fields if filterFieldTypes was not specified', () => {
+      const aggParam = new FieldParamType({
+        name: 'field',
+        type: 'field',
+      });
+
+      indexPattern.fields[1].aggregatable = true;
+
+      const fields = aggParam.getAvailableFields(agg);
+
+      expect(fields.length).toBe(2);
+    });
+
+    it('should return only numeric fields if filterFieldTypes was specified as a function', () => {
+      const aggParam = new FieldParamType({
+        name: 'field',
+        type: 'field',
+        filterFieldTypes: (aggConfig: IMetricAggConfig) =>
+          get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false)
+            ? '*'
+            : KBN_FIELD_TYPES.NUMBER,
+      });
+      const fields = aggParam.getAvailableFields(agg);
+
+      expect(fields.length).toBe(1);
+      expect(fields[0].type).toBe(KBN_FIELD_TYPES.NUMBER);
+    });
+
+    it('should return all fields if filterFieldTypes was specified as a function and aggSettings allow string type fields', () => {
+      const aggParam = new FieldParamType({
+        name: 'field',
+        type: 'field',
+        filterFieldTypes: (aggConfig: IMetricAggConfig) =>
+          get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false)
+            ? '*'
+            : KBN_FIELD_TYPES.NUMBER,
+      });
+
+      agg.schema = {
+        aggSettings: {
+          top_hits: {
+            allowStrings: true,
+          },
+        },
+      } as Schema;
+
+      const fields = aggParam.getAvailableFields(agg);
 
       expect(fields.length).toBe(2);
     });
diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/field.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/field.ts
index c41c159ad0f78..9a204bb151e2d 100644
--- a/src/legacy/core_plugins/data/public/search/aggs/param_types/field.ts
+++ b/src/legacy/core_plugins/data/public/search/aggs/param_types/field.ts
@@ -17,24 +17,27 @@
  * under the License.
  */
 
-// @ts-ignore
 import { i18n } from '@kbn/i18n';
+import { isFunction } from 'lodash';
 import { npStart } from 'ui/new_platform';
-import { AggConfig } from '../agg_config';
+import { IAggConfig } from '../agg_config';
 import { SavedObjectNotFound } from '../../../../../../../plugins/kibana_utils/public';
 import { BaseParamType } from './base';
 import { propFilter } from '../filter';
-import { Field, IFieldList, isNestedField } from '../../../../../../../plugins/data/public';
+import { IMetricAggConfig } from '../metrics/metric_agg_type';
+import { Field, isNestedField, KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
 
 const filterByType = propFilter('type');
 
+type FieldTypes = KBN_FIELD_TYPES | KBN_FIELD_TYPES[] | '*';
+export type FilterFieldTypes = ((aggConfig: IMetricAggConfig) => FieldTypes) | FieldTypes;
 // TODO need to make a more explicit interface for this
 export type IFieldParamType = FieldParamType;
 
 export class FieldParamType extends BaseParamType {
   required = true;
   scriptable = true;
-  filterFieldTypes: string;
+  filterFieldTypes: FilterFieldTypes;
   onlyAggregatable: boolean;
 
   constructor(config: Record<string, any>) {
@@ -44,7 +47,7 @@ export class FieldParamType extends BaseParamType {
     this.onlyAggregatable = config.onlyAggregatable !== false;
 
     if (!config.write) {
-      this.write = (aggConfig: AggConfig, output: Record<string, any>) => {
+      this.write = (aggConfig: IAggConfig, output: Record<string, any>) => {
         const field = aggConfig.getField();
 
         if (!field) {
@@ -73,7 +76,7 @@ export class FieldParamType extends BaseParamType {
       return field.name;
     };
 
-    this.deserialize = (fieldName: string, aggConfig?: AggConfig) => {
+    this.deserialize = (fieldName: string, aggConfig?: IAggConfig) => {
       if (!aggConfig) {
         throw new Error('aggConfig was not provided to FieldParamType deserialize function');
       }
@@ -84,9 +87,7 @@ export class FieldParamType extends BaseParamType {
       }
 
       // @ts-ignore
-      const validField = this.getAvailableFields(aggConfig.getIndexPattern().fields).find(
-        (f: any) => f.name === fieldName
-      );
+      const validField = this.getAvailableFields(aggConfig).find((f: any) => f.name === fieldName);
       if (!validField) {
         npStart.core.notifications.toasts.addDanger(
           i18n.translate(
@@ -109,7 +110,8 @@ export class FieldParamType extends BaseParamType {
   /**
    * filter the fields to the available ones
    */
-  getAvailableFields = (fields: IFieldList) => {
+  getAvailableFields = (aggConfig: IAggConfig) => {
+    const fields = aggConfig.getIndexPattern().fields;
     const filteredFields = fields.filter((field: Field) => {
       const { onlyAggregatable, scriptable, filterFieldTypes } = this;
 
@@ -120,8 +122,10 @@ export class FieldParamType extends BaseParamType {
         return false;
       }
 
-      if (!filterFieldTypes) {
-        return true;
+      if (isFunction(filterFieldTypes)) {
+        const filter = filterFieldTypes(aggConfig as IMetricAggConfig);
+
+        return filterByType([field], filter).length !== 0;
       }
 
       return filterByType([field], filterFieldTypes).length !== 0;
diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 8c35044b52c9e..395e0da218307 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -97,13 +97,8 @@ export default function(kibana) {
           }),
           order: -1001,
           url: `${kbnBaseUrl}#/dashboards`,
-          // The subUrlBase is the common substring of all urls for this app. If not given, it defaults to the url
-          // above. This app has to use a different subUrlBase, in addition to the url above, because "#/dashboard"
-          // routes to a page that creates a new dashboard. When we introduced a landing page, we needed to change
-          // the url above in order to preserve the original url for BWC. The subUrlBase helps the Chrome api nav
-          // to determine what url to use for the app link.
-          subUrlBase: `${kbnBaseUrl}#/dashboard`,
           euiIconType: 'dashboardApp',
+          disableSubUrlTracking: true,
           category: DEFAULT_APP_CATEGORIES.analyze,
         },
         {
diff --git a/src/legacy/core_plugins/kibana/public/.eslintrc.js b/src/legacy/core_plugins/kibana/public/.eslintrc.js
index 9b45217287dc8..b3ee0a8fa7b04 100644
--- a/src/legacy/core_plugins/kibana/public/.eslintrc.js
+++ b/src/legacy/core_plugins/kibana/public/.eslintrc.js
@@ -17,8 +17,15 @@
  * under the License.
  */
 
+const topLevelConfig = require('../../../../../.eslintrc.js');
 const path = require('path');
 
+const topLevelRestricedZones = topLevelConfig.overrides.find(
+  override =>
+    override.files[0] === '**/*.{js,ts,tsx}' &&
+    Object.keys(override.rules)[0] === '@kbn/eslint/no-restricted-paths'
+).rules['@kbn/eslint/no-restricted-paths'][1].zones;
+
 /**
  * Builds custom restricted paths configuration for the shimmed plugins within the kibana plugin.
  * These custom rules extend the default checks in the top level `eslintrc.js` by also checking two other things:
@@ -28,34 +35,37 @@ const path = require('path');
  * @returns zones configuration for the no-restricted-paths linter
  */
 function buildRestrictedPaths(shimmedPlugins) {
-  return shimmedPlugins.map(shimmedPlugin => ([{
-    target: [
-      `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/np_ready/**/*`,
-    ],
-    from: [
-      'ui/**/*',
-      'src/legacy/ui/**/*',
-      'src/legacy/core_plugins/kibana/public/**/*',
-      'src/legacy/core_plugins/data/public/**/*',
-      '!src/legacy/core_plugins/data/public/index.ts',
-      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
-    ],
-    allowSameFolder: false,
-    errorMessage: `${shimmedPlugin} is a shimmed plugin that is not allowed to import modules from the legacy platform. If you need legacy modules for the transition period, import them either in the legacy_imports, kibana_services or index module.`,
-  }, {
-    target: [
-      'src/**/*',
-      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
-      'x-pack/**/*',
-    ],
-    from: [
-      `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
-      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/index.ts`,
-      `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/legacy.ts`,
-    ],
-    allowSameFolder: false,
-    errorMessage: `kibana/public/${shimmedPlugin} is behaving like a NP plugin and does not allow deep imports. If you need something from within ${shimmedPlugin} in another plugin, consider re-exporting it from the top level index module`,
-  }])).reduce((acc, part) => [...acc, ...part], []);
+  return shimmedPlugins
+    .map(shimmedPlugin => [
+      {
+        target: [`src/legacy/core_plugins/kibana/public/${shimmedPlugin}/np_ready/**/*`],
+        from: [
+          'ui/**/*',
+          'src/legacy/ui/**/*',
+          'src/legacy/core_plugins/kibana/public/**/*',
+          'src/legacy/core_plugins/data/public/**/*',
+          '!src/legacy/core_plugins/data/public/index.ts',
+          `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+        ],
+        allowSameFolder: false,
+        errorMessage: `${shimmedPlugin} is a shimmed plugin that is not allowed to import modules from the legacy platform. If you need legacy modules for the transition period, import them either in the legacy_imports, kibana_services or index module.`,
+      },
+      {
+        target: [
+          'src/**/*',
+          `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+          'x-pack/**/*',
+        ],
+        from: [
+          `src/legacy/core_plugins/kibana/public/${shimmedPlugin}/**/*`,
+          `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/index.ts`,
+          `!src/legacy/core_plugins/kibana/public/${shimmedPlugin}/legacy.ts`,
+        ],
+        allowSameFolder: false,
+        errorMessage: `kibana/public/${shimmedPlugin} is behaving like a NP plugin and does not allow deep imports. If you need something from within ${shimmedPlugin} in another plugin, consider re-exporting it from the top level index module`,
+      },
+    ])
+    .reduce((acc, part) => [...acc, ...part], []);
 }
 
 module.exports = {
@@ -66,7 +76,9 @@ module.exports = {
       'error',
       {
         basePath: path.resolve(__dirname, '../../../../../'),
-        zones: buildRestrictedPaths(['visualize', 'discover', 'dashboard', 'devTools', 'home']),
+        zones: topLevelRestricedZones.concat(
+          buildRestrictedPaths(['visualize', 'discover', 'dashboard', 'devTools', 'home'])
+        ),
       },
     ],
   },
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts
index acbc4c4b6c47f..ca2dc9d5fb4f5 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts
@@ -41,6 +41,7 @@ async function getAngularDependencies(): Promise<LegacyAngularInjectedDependenci
   const instance = plugin({} as PluginInitializerContext);
   instance.setup(npSetup.core, {
     ...npSetup.plugins,
+    npData: npSetup.plugins.data,
     __LEGACY: {
       getAngularDependencies,
     },
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
index f1fd93fd09b3d..b0e4785edcb0b 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts
@@ -73,7 +73,6 @@ export const renderApp = (element: HTMLElement, appBasePath: string, deps: Rende
     angularModuleInstance = createLocalAngularModule(deps.core, deps.navigation);
     // global routing stuff
     configureAppAngularModule(angularModuleInstance, deps.core as LegacyCoreStart, true);
-    // custom routing stuff
     initDashboardApp(angularModuleInstance, deps);
   }
 
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts
index d5e61936f67cf..60b2a33f720ec 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { searchSourceMock } from '../../../../../../../plugins/data/public/search/search_source/mocks';
+import { searchSourceMock } from '../../../../../../../plugins/data/public/mocks';
 import { SavedObjectDashboard } from '../../saved_dashboard/saved_dashboard';
 
 export function getSavedDashboardMock(
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
index 227bcb53ca0df..016bfac751875 100644
--- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
+++ b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { BehaviorSubject } from 'rxjs';
 import {
   App,
   CoreSetup,
@@ -28,7 +29,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { RenderDeps } from './np_ready/application';
 import { DataStart } from '../../../data/public';
-import { DataPublicPluginStart as NpDataStart } from '../../../../../plugins/data/public';
+import {
+  DataPublicPluginStart as NpDataStart,
+  DataPublicPluginSetup as NpDataSetup,
+} from '../../../../../plugins/data/public';
 import { IEmbeddableStart } from '../../../../../plugins/embeddable/public';
 import { Storage } from '../../../../../plugins/kibana_utils/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public';
@@ -38,8 +42,13 @@ import {
   HomePublicPluginSetup,
 } from '../../../../../plugins/home/public';
 import { SharePluginStart } from '../../../../../plugins/share/public';
-import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
+import {
+  AngularRenderedAppUpdater,
+  KibanaLegacySetup,
+} from '../../../../../plugins/kibana_legacy/public';
 import { createSavedDashboardLoader } from './saved_dashboard/saved_dashboards';
+import { createKbnUrlTracker } from '../../../../../plugins/kibana_utils/public';
+import { getQueryStateContainer } from '../../../../../plugins/data/public';
 
 export interface LegacyAngularInjectedDependencies {
   dashboardConfig: any;
@@ -59,6 +68,7 @@ export interface DashboardPluginSetupDependencies {
   };
   home: HomePublicPluginSetup;
   kibana_legacy: KibanaLegacySetup;
+  npData: NpDataSetup;
 }
 
 export class DashboardPlugin implements Plugin {
@@ -70,10 +80,38 @@ export class DashboardPlugin implements Plugin {
     share: SharePluginStart;
   } | null = null;
 
+  private appStateUpdater = new BehaviorSubject<AngularRenderedAppUpdater>(() => ({}));
+  private stopUrlTracking: (() => void) | undefined = undefined;
+
   public setup(
     core: CoreSetup,
-    { __LEGACY: { getAngularDependencies }, home, kibana_legacy }: DashboardPluginSetupDependencies
+    {
+      __LEGACY: { getAngularDependencies },
+      home,
+      kibana_legacy,
+      npData,
+    }: DashboardPluginSetupDependencies
   ) {
+    const { querySyncStateContainer, stop: stopQuerySyncStateContainer } = getQueryStateContainer(
+      npData.query
+    );
+    const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({
+      baseUrl: core.http.basePath.prepend('/app/kibana'),
+      defaultSubUrl: '#/dashboards',
+      storageKey: 'lastUrl:dashboard',
+      navLinkUpdater$: this.appStateUpdater,
+      toastNotifications: core.notifications.toasts,
+      stateParams: [
+        {
+          kbnUrlKey: '_g',
+          stateUpdate$: querySyncStateContainer.state$,
+        },
+      ],
+    });
+    this.stopUrlTracking = () => {
+      stopQuerySyncStateContainer();
+      stopUrlTracker();
+    };
     const app: App = {
       id: '',
       title: 'Dashboards',
@@ -81,6 +119,7 @@ export class DashboardPlugin implements Plugin {
         if (this.startDependencies === null) {
           throw new Error('not started yet');
         }
+        appMounted();
         const {
           savedObjectsClient,
           embeddables,
@@ -114,10 +153,20 @@ export class DashboardPlugin implements Plugin {
           localStorage: new Storage(localStorage),
         };
         const { renderApp } = await import('./np_ready/application');
-        return renderApp(params.element, params.appBasePath, deps);
+        const unmount = renderApp(params.element, params.appBasePath, deps);
+        return () => {
+          unmount();
+          appUnMounted();
+        };
       },
     };
-    kibana_legacy.registerLegacyApp({ ...app, id: 'dashboard' });
+    kibana_legacy.registerLegacyApp({
+      ...app,
+      id: 'dashboard',
+      // only register the updater in once app, otherwise all updates would happen twice
+      updater$: this.appStateUpdater.asObservable(),
+      navLinkId: 'kibana:dashboard',
+    });
     kibana_legacy.registerLegacyApp({ ...app, id: 'dashboards' });
 
     home.featureCatalogue.register({
@@ -147,4 +196,10 @@ export class DashboardPlugin implements Plugin {
       share,
     };
   }
+
+  stop() {
+    if (this.stopUrlTracking) {
+      this.stopUrlTracking();
+    }
+  }
 }
diff --git a/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
index 15bda33534185..631ef1d6e0e42 100644
--- a/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
+++ b/src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/instruction_set.js
@@ -22,7 +22,7 @@ import PropTypes from 'prop-types';
 import { Instruction } from './instruction';
 import { ParameterForm } from './parameter_form';
 import { Content } from './content';
-import { getDisplayText } from '../../../../../../../../plugins/home/server/tutorials/instructions/instruction_variant';
+import { getDisplayText } from '../../../../../../../../plugins/home/public';
 import {
   EuiTabs,
   EuiTab,
diff --git a/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts b/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts
index d52bec8304ff9..c84a3e1eacbd2 100644
--- a/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts
+++ b/src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts
@@ -79,6 +79,17 @@ export class LocalApplicationService {
           })();
         },
       });
+
+      if (app.updater$) {
+        app.updater$.subscribe(updater => {
+          const updatedFields = updater(app);
+          if (updatedFields && updatedFields.activeUrl) {
+            npStart.core.chrome.navLinks.update(app.navLinkId || app.id, {
+              url: updatedFields.activeUrl,
+            });
+          }
+        });
+      }
     });
 
     npStart.plugins.kibana_legacy.getForwards().forEach(({ legacyAppId, newAppId, keepPrefix }) => {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
index c990efaf43547..e10f033ed8165 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/step_index_pattern/step_index_pattern.js
@@ -279,13 +279,12 @@ export class StepIndexPattern extends Component {
 
   render() {
     const { isIncludingSystemIndices, allIndices } = this.props;
-    const { query, partialMatchedIndices, exactMatchedIndices } = this.state;
+    const { partialMatchedIndices, exactMatchedIndices } = this.state;
 
     const matchedIndices = getMatchedIndices(
       allIndices,
       partialMatchedIndices,
       exactMatchedIndices,
-      query,
       isIncludingSystemIndices
     );
 
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/constants/index.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/constants/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/constants/index.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/constants/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.error.json b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.error.json
deleted file mode 100644
index acb9a9ecd0206..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.error.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "statusCode": 400,
-  "error": "Bad Request"
-}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.exception.json b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.exception.json
deleted file mode 100644
index 1406b06813637..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.exception.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "body": {
-    "error": {
-      "root_cause": [
-        {
-          "type": "index_not_found_exception",
-          "reason": "no such index",
-          "index_uuid": "_na_",
-          "resource.type": "index_or_alias",
-          "resource.id": "t",
-          "index": "t"
-        }
-      ],
-      "type": "transport_exception",
-      "reason": "unable to communicate with remote cluster [cluster_one]",
-      "caused_by": {
-        "type": "index_not_found_exception",
-        "reason": "no such index",
-        "index_uuid": "_na_",
-        "resource.type": "index_or_alias",
-        "resource.id": "t",
-        "index": "t"
-      }
-    }
-  },
-  "status": 500
-}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.success.json b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.success.json
deleted file mode 100644
index 1b261243ca728..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/api/get_indices.success.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "hits": {
-    "total": 1,
-    "max_score": 0.0,
-    "hits": []
-  },
-  "aggregations": {
-    "indices": {
-      "doc_count_error_upper_bound": 0,
-      "sum_other_doc_count": 0,
-      "buckets": [{
-        "key": "1",
-        "doc_count": 1
-      },{
-        "key": "2",
-        "doc_count": 1
-      }]
-    }
-  }
-}
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/get_indices.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/get_indices.test.js
deleted file mode 100644
index 924b0dc46d74d..0000000000000
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/get_indices.test.js
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { getIndices } from '../get_indices';
-import successfulResponse from './api/get_indices.success.json';
-import errorResponse from './api/get_indices.error.json';
-import exceptionResponse from './api/get_indices.exception.json';
-const mockIndexPatternCreationType = {
-  getIndexPatternType: () => 'default',
-  getIndexPatternName: () => 'name',
-  checkIndicesForErrors: () => false,
-  getShowSystemIndices: () => false,
-  renderPrompt: () => {},
-  getIndexPatternMappings: () => {
-    return {};
-  },
-  getIndexTags: () => {
-    return [];
-  },
-};
-
-describe('getIndices', () => {
-  it('should work in a basic case', async () => {
-    const es = {
-      search: () => new Promise(resolve => resolve(successfulResponse)),
-    };
-
-    const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1);
-    expect(result.length).toBe(2);
-    expect(result[0].name).toBe('1');
-    expect(result[1].name).toBe('2');
-  });
-
-  it('should ignore ccs query-all', async () => {
-    expect((await getIndices(null, mockIndexPatternCreationType, '*:')).length).toBe(0);
-  });
-
-  it('should ignore a single comma', async () => {
-    expect((await getIndices(null, mockIndexPatternCreationType, ',')).length).toBe(0);
-    expect((await getIndices(null, mockIndexPatternCreationType, ',*')).length).toBe(0);
-    expect((await getIndices(null, mockIndexPatternCreationType, ',foobar')).length).toBe(0);
-  });
-
-  it('should trim the input', async () => {
-    let index;
-    const es = {
-      search: jest.fn().mockImplementation(params => {
-        index = params.index;
-      }),
-    };
-
-    await getIndices(es, mockIndexPatternCreationType, 'kibana          ', 1);
-    expect(index).toBe('kibana');
-  });
-
-  it('should use the limit', async () => {
-    let limit;
-    const es = {
-      search: jest.fn().mockImplementation(params => {
-        limit = params.body.aggs.indices.terms.size;
-      }),
-    };
-
-    await getIndices(es, mockIndexPatternCreationType, 'kibana', 10);
-    expect(limit).toBe(10);
-  });
-
-  describe('errors', () => {
-    it('should handle errors gracefully', async () => {
-      const es = {
-        search: () => new Promise(resolve => resolve(errorResponse)),
-      };
-
-      const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1);
-      expect(result.length).toBe(0);
-    });
-
-    it('should throw exceptions', async () => {
-      const es = {
-        search: () => {
-          throw new Error('Fail');
-        },
-      };
-
-      await expect(getIndices(es, mockIndexPatternCreationType, 'kibana', 1)).rejects.toThrow();
-    });
-
-    it('should handle index_not_found_exception errors gracefully', async () => {
-      const es = {
-        search: () => new Promise((resolve, reject) => reject(exceptionResponse)),
-      };
-
-      const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1);
-      expect(result.length).toBe(0);
-    });
-
-    it('should throw an exception if no limit is provided', async () => {
-      await expect(getIndices({}, mockIndexPatternCreationType, 'kibana')).rejects.toThrow();
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/can_append_wildcard.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.test.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/can_append_wildcard.test.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.test.ts
index 055632bdd19e0..14139c2e08dc0 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/can_append_wildcard.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.test.ts
@@ -17,13 +17,9 @@
  * under the License.
  */
 
-import { canAppendWildcard } from '../can_append_wildcard';
+import { canAppendWildcard } from './can_append_wildcard';
 
 describe('canAppendWildcard', () => {
-  test('ignores no data', () => {
-    expect(canAppendWildcard({})).toBeFalsy();
-  });
-
   test('ignores symbols', () => {
     expect(canAppendWildcard('%')).toBeFalsy();
   });
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.ts
similarity index 94%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.ts
index b47e645730aef..e9c4f75e4313b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/can_append_wildcard.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-export const canAppendWildcard = keyPressed => {
+export const canAppendWildcard = (keyPressed: string) => {
   // If it's not a letter, number or is something longer, reject it
   if (!keyPressed || !/[a-z0-9]/i.test(keyPressed) || keyPressed.length !== 1) {
     return false;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_illegal_characters.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_illegal_characters.ts
similarity index 90%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_illegal_characters.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_illegal_characters.ts
index 31485bb3daaa2..ca4fc8122903c 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_illegal_characters.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_illegal_characters.ts
@@ -17,6 +17,6 @@
  * under the License.
  */
 
-export function containsIllegalCharacters(pattern, illegalCharacters) {
+export function containsIllegalCharacters(pattern: string, illegalCharacters: string[]) {
   return illegalCharacters.some(char => pattern.includes(char));
 }
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/contains_invalid_characters.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts
similarity index 93%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/contains_invalid_characters.test.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts
index 05c4aba2571bd..640908d3db6d1 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/contains_invalid_characters.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/contains_invalid_characters.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { containsIllegalCharacters } from '../contains_illegal_characters';
+import { containsIllegalCharacters } from './contains_illegal_characters';
 
 describe('containsIllegalCharacters', () => {
   it('returns true with illegal characters', () => {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/ensure_minimum_time.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts
similarity index 96%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/ensure_minimum_time.test.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts
index 99724cbf3a2a7..e5fcfe056923a 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/ensure_minimum_time.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { ensureMinimumTime } from '../ensure_minimum_time';
+import { ensureMinimumTime } from './ensure_minimum_time';
 
 describe('ensureMinimumTime', () => {
   it('resolves single promise', async done => {
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.ts
similarity index 97%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.ts
index 0a6d3fcfbbdf0..84852ece485eb 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/ensure_minimum_time.ts
@@ -27,7 +27,7 @@
 export const DEFAULT_MINIMUM_TIME_MS = 300;
 
 export async function ensureMinimumTime(
-  promiseOrPromises,
+  promiseOrPromises: Promise<any> | Array<Promise<any>>,
   minimumTimeMs = DEFAULT_MINIMUM_TIME_MS
 ) {
   let returnValue;
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/extract_time_fields.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.test.ts
similarity index 89%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/extract_time_fields.test.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.test.ts
index ec420e19817c7..4cd28090420a7 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/extract_time_fields.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.test.ts
@@ -17,11 +17,14 @@
  * under the License.
  */
 
-import { extractTimeFields } from '../extract_time_fields';
+import { extractTimeFields } from './extract_time_fields';
 
 describe('extractTimeFields', () => {
   it('should handle no date fields', () => {
-    const fields = [{ type: 'text' }, { type: 'text' }];
+    const fields = [
+      { type: 'text', name: 'name' },
+      { type: 'text', name: 'name' },
+    ];
 
     expect(extractTimeFields(fields)).toEqual([
       { display: `The indices which match this index pattern don't contain any time fields.` },
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.ts
similarity index 92%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.ts
index 1a9deefb217f2..0b95ec0a120da 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/extract_time_fields.ts
@@ -18,8 +18,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { IFieldType } from '../../../../../../../../../plugins/data/public';
 
-export function extractTimeFields(fields) {
+export function extractTimeFields(fields: IFieldType[]) {
   const dateFields = fields.filter(field => field.type === 'date');
   const label = i18n.translate('kbn.management.createIndexPattern.stepTime.noTimeFieldsLabel', {
     defaultMessage: "The indices which match this index pattern don't contain any time fields.",
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.test.ts b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.test.ts
new file mode 100644
index 0000000000000..cd7c8278adcc7
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.test.ts
@@ -0,0 +1,167 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { getIndices } from './get_indices';
+import { IndexPatternCreationConfig } from './../../../../../../../management/public';
+import { LegacyApiCaller } from '../../../../../../../../../plugins/data/public';
+
+export const successfulResponse = {
+  hits: {
+    total: 1,
+    max_score: 0.0,
+    hits: [],
+  },
+  aggregations: {
+    indices: {
+      doc_count_error_upper_bound: 0,
+      sum_other_doc_count: 0,
+      buckets: [
+        {
+          key: '1',
+          doc_count: 1,
+        },
+        {
+          key: '2',
+          doc_count: 1,
+        },
+      ],
+    },
+  },
+};
+
+export const exceptionResponse = {
+  body: {
+    error: {
+      root_cause: [
+        {
+          type: 'index_not_found_exception',
+          reason: 'no such index',
+          index_uuid: '_na_',
+          'resource.type': 'index_or_alias',
+          'resource.id': 't',
+          index: 't',
+        },
+      ],
+      type: 'transport_exception',
+      reason: 'unable to communicate with remote cluster [cluster_one]',
+      caused_by: {
+        type: 'index_not_found_exception',
+        reason: 'no such index',
+        index_uuid: '_na_',
+        'resource.type': 'index_or_alias',
+        'resource.id': 't',
+        index: 't',
+      },
+    },
+  },
+  status: 500,
+};
+
+export const errorResponse = {
+  statusCode: 400,
+  error: 'Bad Request',
+};
+
+const mockIndexPatternCreationType = new IndexPatternCreationConfig({
+  type: 'default',
+  name: 'name',
+  showSystemIndices: false,
+  httpClient: {},
+  isBeta: false,
+});
+
+function esClientFactory(search: (params: any) => any): LegacyApiCaller {
+  return {
+    search,
+    msearch: () => ({
+      abort: () => {},
+      ...new Promise(resolve => resolve({})),
+    }),
+  };
+}
+
+const es = esClientFactory(() => successfulResponse);
+
+describe('getIndices', () => {
+  it('should work in a basic case', async () => {
+    const result = await getIndices(es, mockIndexPatternCreationType, 'kibana', 1);
+    expect(result.length).toBe(2);
+    expect(result[0].name).toBe('1');
+    expect(result[1].name).toBe('2');
+  });
+
+  it('should ignore ccs query-all', async () => {
+    expect((await getIndices(es, mockIndexPatternCreationType, '*:', 10)).length).toBe(0);
+  });
+
+  it('should ignore a single comma', async () => {
+    expect((await getIndices(es, mockIndexPatternCreationType, ',', 10)).length).toBe(0);
+    expect((await getIndices(es, mockIndexPatternCreationType, ',*', 10)).length).toBe(0);
+    expect((await getIndices(es, mockIndexPatternCreationType, ',foobar', 10)).length).toBe(0);
+  });
+
+  it('should trim the input', async () => {
+    let index;
+    const esClient = esClientFactory(
+      jest.fn().mockImplementation(params => {
+        index = params.index;
+      })
+    );
+
+    await getIndices(esClient, mockIndexPatternCreationType, 'kibana          ', 1);
+    expect(index).toBe('kibana');
+  });
+
+  it('should use the limit', async () => {
+    let limit;
+    const esClient = esClientFactory(
+      jest.fn().mockImplementation(params => {
+        limit = params.body.aggs.indices.terms.size;
+      })
+    );
+    await getIndices(esClient, mockIndexPatternCreationType, 'kibana', 10);
+    expect(limit).toBe(10);
+  });
+
+  describe('errors', () => {
+    it('should handle errors gracefully', async () => {
+      const esClient = esClientFactory(() => errorResponse);
+      const result = await getIndices(esClient, mockIndexPatternCreationType, 'kibana', 1);
+      expect(result.length).toBe(0);
+    });
+
+    it('should throw exceptions', async () => {
+      const esClient = esClientFactory(() => {
+        throw new Error('Fail');
+      });
+
+      await expect(
+        getIndices(esClient, mockIndexPatternCreationType, 'kibana', 1)
+      ).rejects.toThrow();
+    });
+
+    it('should handle index_not_found_exception errors gracefully', async () => {
+      const esClient = esClientFactory(
+        () => new Promise((resolve, reject) => reject(exceptionResponse))
+      );
+      const result = await getIndices(esClient, mockIndexPatternCreationType, 'kibana', 1);
+      expect(result.length).toBe(0);
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.ts
similarity index 83%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.ts
index 8159fff8220bd..3848c425e2d49 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_indices.ts
@@ -18,8 +18,16 @@
  */
 
 import { get, sortBy } from 'lodash';
+import { IndexPatternCreationConfig } from '../../../../../../../management/public';
+import { DataPublicPluginStart } from '../../../../../../../../../plugins/data/public';
+import { MatchedIndex } from '../types';
 
-export async function getIndices(es, indexPatternCreationType, rawPattern, limit) {
+export async function getIndices(
+  es: DataPublicPluginStart['search']['__LEGACY']['esClient'],
+  indexPatternCreationType: IndexPatternCreationConfig,
+  rawPattern: string,
+  limit: number
+): Promise<MatchedIndex[]> {
   const pattern = rawPattern.trim();
 
   // Searching for `*:` fails for CCS environments. The search request
@@ -70,10 +78,10 @@ export async function getIndices(es, indexPatternCreationType, rawPattern, limit
 
     return sortBy(
       response.aggregations.indices.buckets
-        .map(bucket => {
+        .map((bucket: { key: string; doc_count: number }) => {
           return bucket.key;
         })
-        .map(indexName => {
+        .map((indexName: string) => {
           return {
             name: indexName,
             tags: indexPatternCreationType.getIndexTags(indexName),
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/get_matched_indices.test.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.test.ts
similarity index 53%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/get_matched_indices.test.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.test.ts
index 625c128181ffe..7aba50a7ca12b 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/__jest__/get_matched_indices.test.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.test.ts
@@ -17,24 +17,32 @@
  * under the License.
  */
 
-import { getMatchedIndices } from '../get_matched_indices';
+import { getMatchedIndices } from './get_matched_indices';
 
-jest.mock('../../constants', () => ({
+jest.mock('./../constants', () => ({
   MAX_NUMBER_OF_MATCHING_INDICES: 6,
 }));
 
+const tags: string[] = [];
 const indices = [
-  { name: 'kibana' },
-  { name: 'es' },
-  { name: 'logstash' },
-  { name: 'packetbeat' },
-  { name: 'metricbeat' },
-  { name: '.kibana' },
+  { name: 'kibana', tags },
+  { name: 'es', tags },
+  { name: 'logstash', tags },
+  { name: 'packetbeat', tags },
+  { name: 'metricbeat', tags },
+  { name: '.kibana', tags },
 ];
 
-const partialIndices = [{ name: 'kibana' }, { name: 'es' }, { name: '.kibana' }];
+const partialIndices = [
+  { name: 'kibana', tags },
+  { name: 'es', tags },
+  { name: '.kibana', tags },
+];
 
-const exactIndices = [{ name: 'kibana' }, { name: '.kibana' }];
+const exactIndices = [
+  { name: 'kibana', tags },
+  { name: '.kibana', tags },
+];
 
 describe('getMatchedIndices', () => {
   it('should return all indices', () => {
@@ -43,26 +51,32 @@ describe('getMatchedIndices', () => {
       exactMatchedIndices,
       partialMatchedIndices,
       visibleIndices,
-    } = getMatchedIndices(indices, partialIndices, exactIndices, '*', true);
+    } = getMatchedIndices(indices, partialIndices, exactIndices, true);
 
     expect(allIndices).toEqual([
-      { name: 'kibana' },
-      { name: 'es' },
-      { name: 'logstash' },
-      { name: 'packetbeat' },
-      { name: 'metricbeat' },
-      { name: '.kibana' },
+      { name: 'kibana', tags },
+      { name: 'es', tags },
+      { name: 'logstash', tags },
+      { name: 'packetbeat', tags },
+      { name: 'metricbeat', tags },
+      { name: '.kibana', tags },
     ]);
 
-    expect(exactMatchedIndices).toEqual([{ name: 'kibana' }, { name: '.kibana' }]);
+    expect(exactMatchedIndices).toEqual([
+      { name: 'kibana', tags },
+      { name: '.kibana', tags },
+    ]);
 
     expect(partialMatchedIndices).toEqual([
-      { name: 'kibana' },
-      { name: 'es' },
-      { name: '.kibana' },
+      { name: 'kibana', tags },
+      { name: 'es', tags },
+      { name: '.kibana', tags },
     ]);
 
-    expect(visibleIndices).toEqual([{ name: 'kibana' }, { name: '.kibana' }]);
+    expect(visibleIndices).toEqual([
+      { name: 'kibana', tags },
+      { name: '.kibana', tags },
+    ]);
   });
 
   it('should return all indices except for system indices', () => {
@@ -71,31 +85,38 @@ describe('getMatchedIndices', () => {
       exactMatchedIndices,
       partialMatchedIndices,
       visibleIndices,
-    } = getMatchedIndices(indices, partialIndices, exactIndices, '*', false);
+    } = getMatchedIndices(indices, partialIndices, exactIndices, false);
 
     expect(allIndices).toEqual([
-      { name: 'kibana' },
-      { name: 'es' },
-      { name: 'logstash' },
-      { name: 'packetbeat' },
-      { name: 'metricbeat' },
+      { name: 'kibana', tags },
+      { name: 'es', tags },
+      { name: 'logstash', tags },
+      { name: 'packetbeat', tags },
+      { name: 'metricbeat', tags },
     ]);
 
-    expect(exactMatchedIndices).toEqual([{ name: 'kibana' }]);
+    expect(exactMatchedIndices).toEqual([{ name: 'kibana', tags }]);
 
-    expect(partialMatchedIndices).toEqual([{ name: 'kibana' }, { name: 'es' }]);
+    expect(partialMatchedIndices).toEqual([
+      { name: 'kibana', tags },
+      { name: 'es', tags },
+    ]);
 
-    expect(visibleIndices).toEqual([{ name: 'kibana' }]);
+    expect(visibleIndices).toEqual([{ name: 'kibana', tags }]);
   });
 
   it('should return partial matches as visible if there are no exact', () => {
-    const { visibleIndices } = getMatchedIndices(indices, partialIndices, [], '*', true);
+    const { visibleIndices } = getMatchedIndices(indices, partialIndices, [], true);
 
-    expect(visibleIndices).toEqual([{ name: 'kibana' }, { name: 'es' }, { name: '.kibana' }]);
+    expect(visibleIndices).toEqual([
+      { name: 'kibana', tags },
+      { name: 'es', tags },
+      { name: '.kibana', tags },
+    ]);
   });
 
   it('should return all indices as visible if there are no exact or partial', () => {
-    const { visibleIndices } = getMatchedIndices(indices, [], [], '*', true);
+    const { visibleIndices } = getMatchedIndices(indices, [], [], true);
 
     expect(visibleIndices).toEqual(indices);
   });
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.ts
similarity index 86%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.ts
index 19a829a83a2b2..cc3fd4075aa0e 100644
--- a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.js
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/get_matched_indices.ts
@@ -19,19 +19,21 @@
 
 import { MAX_NUMBER_OF_MATCHING_INDICES } from '../constants';
 
-function isSystemIndex(index) {
+function isSystemIndex(index: string): boolean {
   if (index.startsWith('.')) {
     return true;
   }
 
   if (index.includes(':')) {
-    return index.split(':').reduce((isSystem, index) => isSystem || isSystemIndex(index), false);
+    return index
+      .split(':')
+      .reduce((isSystem: boolean, idx) => isSystem || isSystemIndex(idx), false);
   }
 
   return false;
 }
 
-function filterSystemIndices(indices, isIncludingSystemIndices) {
+function filterSystemIndices(indices: MatchedIndex[], isIncludingSystemIndices: boolean) {
   if (!indices) {
     return indices;
   }
@@ -62,12 +64,14 @@ function filterSystemIndices(indices, isIncludingSystemIndices) {
     This is the result of searching against a query that already ends in `*`.
     We call this `exact` matches because ES is telling us exactly what it matches
  */
+
+import { MatchedIndex } from '../types';
+
 export function getMatchedIndices(
-  unfilteredAllIndices,
-  unfilteredPartialMatchedIndices,
-  unfilteredExactMatchedIndices,
-  query,
-  isIncludingSystemIndices
+  unfilteredAllIndices: MatchedIndex[],
+  unfilteredPartialMatchedIndices: MatchedIndex[],
+  unfilteredExactMatchedIndices: MatchedIndex[],
+  isIncludingSystemIndices: boolean = false
 ) {
   const allIndices = filterSystemIndices(unfilteredAllIndices, isIncludingSystemIndices);
   const partialMatchedIndices = filterSystemIndices(
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/index.js b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/index.ts
similarity index 100%
rename from src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/index.js
rename to src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/lib/index.ts
diff --git a/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/types.ts b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/types.ts
new file mode 100644
index 0000000000000..93bb6920c6981
--- /dev/null
+++ b/src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/types.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface MatchedIndex {
+  name: string;
+  tags: string[];
+}
diff --git a/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/config.ts b/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/config.ts
index 0598c88c80ba7..b68b2e40aad9e 100644
--- a/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/config.ts
+++ b/src/legacy/core_plugins/management/public/np_ready/services/index_pattern_management/creation/config.ts
@@ -102,7 +102,7 @@ export class IndexPatternCreationConfig {
     return this.showSystemIndices;
   }
 
-  public getIndexTags() {
+  public getIndexTags(indexName: string) {
     return [];
   }
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
index b9fb81fccd32c..f3bee80baa1ba 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
@@ -17,9 +17,9 @@
  * under the License.
  */
 
-import { IndexPattern, Field } from 'src/plugins/data/public';
+import { IndexPattern } from 'src/plugins/data/public';
 import { VisState } from 'src/legacy/core_plugins/visualizations/public';
-import { IAggConfig, IAggType, AggGroupNames, BUCKET_TYPES, IndexedArray } from '../legacy_imports';
+import { IAggConfig, IAggType, AggGroupNames, BUCKET_TYPES } from '../legacy_imports';
 import {
   getAggParamsToRender,
   getAggTypeOptions,
@@ -105,8 +105,10 @@ describe('DefaultEditorAggParams helpers', () => {
               name: 'field',
               type: 'field',
               filterFieldTypes,
-              getAvailableFields: jest.fn((fields: IndexedArray<Field>) =>
-                fields.filter(({ type }) => filterFieldTypes.includes(type))
+              getAvailableFields: jest.fn((aggConfig: IAggConfig) =>
+                aggConfig
+                  .getIndexPattern()
+                  .fields.filter(({ type }) => filterFieldTypes.includes(type))
               ),
             },
             {
diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
index 25aa21fc83b31..124c41a50c0df 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -73,9 +73,7 @@ function getAggParamsToRender({ agg, editorConfig, metricAggs, state }: ParamIns
     }
     // if field param exists, compute allowed fields
     if (param.type === 'field') {
-      const availableFields: Field[] = (param as IFieldParamType).getAvailableFields(
-        agg.getIndexPattern().fields
-      );
+      const availableFields: Field[] = (param as IFieldParamType).getAvailableFields(agg);
       fields = aggTypeFieldFilters.filter(availableFields, agg);
       indexedFields = groupAndSortBy(fields, 'type', 'name');
 
diff --git a/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts b/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts
index a700995ec596b..b7fd6b1e9ebb6 100644
--- a/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts
+++ b/src/legacy/core_plugins/vis_default_editor/public/legacy_imports.ts
@@ -49,7 +49,6 @@ export { AggParamOption } from 'ui/agg_types';
 export { CidrMask } from 'ui/agg_types';
 
 export { PersistedState } from 'ui/persisted_state';
-export { IndexedArray } from 'ui/indexed_array';
 export { getDocLink } from 'ui/documentation_links';
 export { documentationLinks } from 'ui/documentation_links/documentation_links';
 export { move } from 'ui/utils/collection';
diff --git a/src/legacy/ui/public/chrome/api/nav.ts b/src/legacy/ui/public/chrome/api/nav.ts
index 771314d9e1481..ae32473e451b7 100644
--- a/src/legacy/ui/public/chrome/api/nav.ts
+++ b/src/legacy/ui/public/chrome/api/nav.ts
@@ -146,7 +146,7 @@ export function initChromeNavApi(chrome: any, internals: NavInternals) {
   // link.active and link.lastUrl properties
   coreNavLinks
     .getAll()
-    .filter(link => link.subUrlBase)
+    .filter(link => link.subUrlBase && !link.disableSubUrlTracking)
     .forEach(link => {
       coreNavLinks.update(link.id, {
         subUrlBase: relativeToAbsolute(chrome.addBasePath(link.subUrlBase)),
diff --git a/src/plugins/data/public/index_patterns/index.ts b/src/plugins/data/public/index_patterns/index.ts
index 3d902ebbb7c23..ecddd893d1a54 100644
--- a/src/plugins/data/public/index_patterns/index.ts
+++ b/src/plugins/data/public/index_patterns/index.ts
@@ -44,7 +44,7 @@ export const indexPatterns = {
   isDefault,
 };
 
-export { Field, FieldList, IFieldList } from './fields';
+export { Field, FieldList } from './fields';
 
 // TODO: figure out how to replace IndexPatterns in get_inner_angular.
 export {
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
index 919115d40b068..f21a1610f29e2 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.test.ts
@@ -19,7 +19,12 @@
 
 // eslint-disable-next-line max-classes-per-file
 import { IndexPatterns } from './index_patterns';
-import { SavedObjectsClientContract, IUiSettingsClient, HttpSetup } from 'kibana/public';
+import {
+  SavedObjectsClientContract,
+  IUiSettingsClient,
+  HttpSetup,
+  SavedObjectsFindResponsePublic,
+} from 'kibana/public';
 
 jest.mock('./index_pattern', () => {
   class IndexPattern {
@@ -45,9 +50,17 @@ jest.mock('./index_patterns_api_client', () => {
 
 describe('IndexPatterns', () => {
   let indexPatterns: IndexPatterns;
+  let savedObjectsClient: SavedObjectsClientContract;
 
   beforeEach(() => {
-    const savedObjectsClient = {} as SavedObjectsClientContract;
+    savedObjectsClient = {} as SavedObjectsClientContract;
+    savedObjectsClient.find = jest.fn(
+      () =>
+        Promise.resolve({
+          savedObjects: [{ id: 'id', attributes: { title: 'title' } }],
+        }) as Promise<SavedObjectsFindResponsePublic<any>>
+    );
+
     const uiSettings = {} as IUiSettingsClient;
     const http = {} as HttpSetup;
 
@@ -61,4 +74,27 @@ describe('IndexPatterns', () => {
     expect(indexPattern).toBeDefined();
     expect(indexPattern).toBe(await indexPatterns.get(id));
   });
+
+  test('savedObjectCache pre-fetches only title', async () => {
+    expect(await indexPatterns.getIds()).toEqual(['id']);
+    expect(savedObjectsClient.find).toHaveBeenCalledWith({
+      type: 'index-pattern',
+      fields: ['title'],
+      perPage: 10000,
+    });
+  });
+
+  test('caches saved objects', async () => {
+    await indexPatterns.getIds();
+    await indexPatterns.getTitles();
+    await indexPatterns.getFields(['id', 'title']);
+    expect(savedObjectsClient.find).toHaveBeenCalledTimes(1);
+  });
+
+  test('can refresh the saved objects caches', async () => {
+    await indexPatterns.getIds();
+    await indexPatterns.getTitles(true);
+    await indexPatterns.getFields(['id', 'title'], true);
+    expect(savedObjectsClient.find).toHaveBeenCalledTimes(3);
+  });
 });
diff --git a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
index 8d7dd0f054366..2c93ed7fb79bf 100644
--- a/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/public/index_patterns/index_patterns/index_patterns.ts
@@ -30,6 +30,8 @@ import { IndexPatternsApiClient, GetFieldsOptions } from './index_patterns_api_c
 
 const indexPatternCache = createIndexPatternCache();
 
+type IndexPatternCachedFieldType = 'id' | 'title';
+
 export class IndexPatterns {
   private config: IUiSettingsClient;
   private savedObjectsClient: SavedObjectsClientContract;
@@ -50,7 +52,7 @@ export class IndexPatterns {
     this.savedObjectsCache = (
       await this.savedObjectsClient.find({
         type: 'index-pattern',
-        fields: [],
+        fields: ['title'],
         perPage: 10000,
       })
     ).savedObjects;
@@ -76,7 +78,7 @@ export class IndexPatterns {
     return this.savedObjectsCache.map(obj => obj?.attributes?.title);
   };
 
-  getFields = async (fields: string[], refresh: boolean = false) => {
+  getFields = async (fields: IndexPatternCachedFieldType[], refresh: boolean = false) => {
     if (!this.savedObjectsCache || refresh) {
       await this.refreshSavedObjectsCache();
     }
@@ -84,8 +86,10 @@ export class IndexPatterns {
       return [];
     }
     return this.savedObjectsCache.map((obj: Record<string, any>) => {
-      const result: Record<string, any> = {};
-      fields.forEach((f: string) => (result[f] = obj[f] || obj?.attributes?.[f]));
+      const result: Partial<Record<IndexPatternCachedFieldType, string>> = {};
+      fields.forEach(
+        (f: IndexPatternCachedFieldType) => (result[f] = obj[f] || obj?.attributes?.[f])
+      );
       return result;
     });
   };
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index 847d79fdc87d1..726cd6cfb18f0 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -101,6 +101,8 @@ const createStartContract = (): Start => {
   return startContract;
 };
 
+export { searchSourceMock } from './search/mocks';
+
 export const dataPluginMock = {
   createSetupContract,
   createStartContract,
diff --git a/src/plugins/data/public/query/state_sync/index.ts b/src/plugins/data/public/query/state_sync/index.ts
index 7eefda0d0aec1..27e02940765cf 100644
--- a/src/plugins/data/public/query/state_sync/index.ts
+++ b/src/plugins/data/public/query/state_sync/index.ts
@@ -17,5 +17,5 @@
  * under the License.
  */
 
-export { syncQuery } from './sync_query';
+export { syncQuery, getQueryStateContainer } from './sync_query';
 export { syncAppFilters } from './sync_app_filters';
diff --git a/src/plugins/data/public/query/state_sync/sync_query.test.ts b/src/plugins/data/public/query/state_sync/sync_query.test.ts
index 0973af13cacd5..4796da4f5fd4b 100644
--- a/src/plugins/data/public/query/state_sync/sync_query.test.ts
+++ b/src/plugins/data/public/query/state_sync/sync_query.test.ts
@@ -31,7 +31,7 @@ import {
 import { QueryService, QueryStart } from '../query_service';
 import { StubBrowserStorage } from 'test_utils/stub_browser_storage';
 import { TimefilterContract } from '../timefilter';
-import { QuerySyncState, syncQuery } from './sync_query';
+import { getQueryStateContainer, QuerySyncState, syncQuery } from './sync_query';
 
 const setupMock = coreMock.createSetup();
 const startMock = coreMock.createStart();
@@ -163,4 +163,69 @@ describe('sync_query', () => {
     expect(spy).not.toBeCalled();
     stop();
   });
+
+  describe('getQueryStateContainer', () => {
+    test('state is initialized with state from query service', () => {
+      const { stop, querySyncStateContainer, initialState } = getQueryStateContainer(
+        queryServiceStart
+      );
+      expect(querySyncStateContainer.getState()).toMatchInlineSnapshot(`
+        Object {
+          "filters": Array [],
+          "refreshInterval": Object {
+            "pause": true,
+            "value": 0,
+          },
+          "time": Object {
+            "from": "now-15m",
+            "to": "now",
+          },
+        }
+      `);
+      expect(initialState).toEqual(querySyncStateContainer.getState());
+      stop();
+    });
+
+    test('state takes initial overrides into account', () => {
+      const { stop, querySyncStateContainer, initialState } = getQueryStateContainer(
+        queryServiceStart,
+        {
+          time: { from: 'now-99d', to: 'now' },
+        }
+      );
+      expect(querySyncStateContainer.getState().time).toEqual({
+        from: 'now-99d',
+        to: 'now',
+      });
+      expect(initialState).toEqual(querySyncStateContainer.getState());
+      stop();
+    });
+
+    test('when filters change, state container contains updated global filters', () => {
+      const { stop, querySyncStateContainer } = getQueryStateContainer(queryServiceStart);
+      filterManager.setFilters([gF, aF]);
+      expect(querySyncStateContainer.getState().filters).toHaveLength(1);
+      stop();
+    });
+
+    test('when time range changes, state container contains updated time range', () => {
+      const { stop, querySyncStateContainer } = getQueryStateContainer(queryServiceStart);
+      timefilter.setTime({ from: 'now-30m', to: 'now' });
+      expect(querySyncStateContainer.getState().time).toEqual({
+        from: 'now-30m',
+        to: 'now',
+      });
+      stop();
+    });
+
+    test('when refresh interval changes, state container contains updated refresh interval', () => {
+      const { stop, querySyncStateContainer } = getQueryStateContainer(queryServiceStart);
+      timefilter.setRefreshInterval({ pause: true, value: 100 });
+      expect(querySyncStateContainer.getState().refreshInterval).toEqual({
+        pause: true,
+        value: 100,
+      });
+      stop();
+    });
+  });
 });
diff --git a/src/plugins/data/public/query/state_sync/sync_query.ts b/src/plugins/data/public/query/state_sync/sync_query.ts
index be641e89f9b76..9a4e9cbba2990 100644
--- a/src/plugins/data/public/query/state_sync/sync_query.ts
+++ b/src/plugins/data/public/query/state_sync/sync_query.ts
@@ -27,7 +27,7 @@ import {
 } from '../../../../kibana_utils/public';
 import { COMPARE_ALL_OPTIONS, compareFilters } from '../filter_manager/lib/compare_filters';
 import { esFilters, RefreshInterval, TimeRange } from '../../../common';
-import { QueryStart } from '../query_service';
+import { QuerySetup, QueryStart } from '../query_service';
 
 const GLOBAL_STATE_STORAGE_KEY = '_g';
 
@@ -40,16 +40,11 @@ export interface QuerySyncState {
 /**
  * Helper utility to set up syncing between query services and url's '_g' query param
  */
-export const syncQuery = (
-  { timefilter: { timefilter }, filterManager }: QueryStart,
-  urlStateStorage: IKbnUrlStateStorage
-) => {
-  const defaultState: QuerySyncState = {
-    time: timefilter.getTime(),
-    refreshInterval: timefilter.getRefreshInterval(),
-    filters: filterManager.getGlobalFilters(),
-  };
-
+export const syncQuery = (queryStart: QueryStart, urlStateStorage: IKbnUrlStateStorage) => {
+  const {
+    timefilter: { timefilter },
+    filterManager,
+  } = queryStart;
   // retrieve current state from `_g` url
   const initialStateFromUrl = urlStateStorage.get<QuerySyncState>(GLOBAL_STATE_STORAGE_KEY);
 
@@ -58,10 +53,82 @@ export const syncQuery = (
     initialStateFromUrl && Object.keys(initialStateFromUrl).length
   );
 
-  // prepare initial state, whatever was in URL takes precedences over current state in services
+  const {
+    querySyncStateContainer,
+    stop: stopPullQueryState,
+    initialState,
+  } = getQueryStateContainer(queryStart, initialStateFromUrl || {});
+
+  const pushQueryStateSubscription = querySyncStateContainer.state$.subscribe(
+    ({ time, filters: globalFilters, refreshInterval }) => {
+      // cloneDeep is required because services are mutating passed objects
+      // and state in state container is frozen
+      if (time && !_.isEqual(time, timefilter.getTime())) {
+        timefilter.setTime(_.cloneDeep(time));
+      }
+
+      if (refreshInterval && !_.isEqual(refreshInterval, timefilter.getRefreshInterval())) {
+        timefilter.setRefreshInterval(_.cloneDeep(refreshInterval));
+      }
+
+      if (
+        globalFilters &&
+        !compareFilters(globalFilters, filterManager.getGlobalFilters(), COMPARE_ALL_OPTIONS)
+      ) {
+        filterManager.setGlobalFilters(_.cloneDeep(globalFilters));
+      }
+    }
+  );
+
+  // if there weren't any initial state in url,
+  // then put _g key into url
+  if (!initialStateFromUrl) {
+    urlStateStorage.set<QuerySyncState>(GLOBAL_STATE_STORAGE_KEY, initialState, {
+      replace: true,
+    });
+  }
+
+  // trigger initial syncing from state container to services if needed
+  querySyncStateContainer.set(initialState);
+
+  const { start, stop: stopSyncState } = syncState({
+    stateStorage: urlStateStorage,
+    stateContainer: {
+      ...querySyncStateContainer,
+      set: state => {
+        if (state) {
+          // syncState utils requires to handle incoming "null" value
+          querySyncStateContainer.set(state);
+        }
+      },
+    },
+    storageKey: GLOBAL_STATE_STORAGE_KEY,
+  });
+
+  start();
+  return {
+    stop: () => {
+      stopSyncState();
+      pushQueryStateSubscription.unsubscribe();
+      stopPullQueryState();
+    },
+    hasInheritedQueryFromUrl,
+  };
+};
+
+export const getQueryStateContainer = (
+  { timefilter: { timefilter }, filterManager }: QuerySetup,
+  initialStateOverrides: Partial<QuerySyncState> = {}
+) => {
+  const defaultState: QuerySyncState = {
+    time: timefilter.getTime(),
+    refreshInterval: timefilter.getRefreshInterval(),
+    filters: filterManager.getGlobalFilters(),
+  };
+
   const initialState: QuerySyncState = {
     ...defaultState,
-    ...initialStateFromUrl,
+    ...initialStateOverrides,
   };
 
   // create state container, which will be used for syncing with syncState() util
@@ -109,59 +176,13 @@ export const syncQuery = (
       .subscribe(newGlobalFilters => {
         querySyncStateContainer.transitions.setFilters(newGlobalFilters);
       }),
-    querySyncStateContainer.state$.subscribe(
-      ({ time, filters: globalFilters, refreshInterval }) => {
-        // cloneDeep is required because services are mutating passed objects
-        // and state in state container is frozen
-        if (time && !_.isEqual(time, timefilter.getTime())) {
-          timefilter.setTime(_.cloneDeep(time));
-        }
-
-        if (refreshInterval && !_.isEqual(refreshInterval, timefilter.getRefreshInterval())) {
-          timefilter.setRefreshInterval(_.cloneDeep(refreshInterval));
-        }
-
-        if (
-          globalFilters &&
-          !compareFilters(globalFilters, filterManager.getGlobalFilters(), COMPARE_ALL_OPTIONS)
-        ) {
-          filterManager.setGlobalFilters(_.cloneDeep(globalFilters));
-        }
-      }
-    ),
   ];
 
-  // if there weren't any initial state in url,
-  // then put _g key into url
-  if (!initialStateFromUrl) {
-    urlStateStorage.set<QuerySyncState>(GLOBAL_STATE_STORAGE_KEY, initialState, {
-      replace: true,
-    });
-  }
-
-  // trigger initial syncing from state container to services if needed
-  querySyncStateContainer.set(initialState);
-
-  const { start, stop } = syncState({
-    stateStorage: urlStateStorage,
-    stateContainer: {
-      ...querySyncStateContainer,
-      set: state => {
-        if (state) {
-          // syncState utils requires to handle incoming "null" value
-          querySyncStateContainer.set(state);
-        }
-      },
-    },
-    storageKey: GLOBAL_STATE_STORAGE_KEY,
-  });
-
-  start();
   return {
+    querySyncStateContainer,
     stop: () => {
       subs.forEach(s => s.unsubscribe());
-      stop();
     },
-    hasInheritedQueryFromUrl,
+    initialState,
   };
 };
diff --git a/src/plugins/data/public/search/mocks.ts b/src/plugins/data/public/search/mocks.ts
index 81a028007bc94..821bd45f731e8 100644
--- a/src/plugins/data/public/search/mocks.ts
+++ b/src/plugins/data/public/search/mocks.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+export * from './search_source/mocks';
+
 export const searchSetupMock = {
   registerSearchStrategyContext: jest.fn(),
   registerSearchStrategyProvider: jest.fn(),
diff --git a/src/plugins/home/server/tutorials/instructions/instruction_variant.ts b/src/plugins/home/common/instruction_variant.ts
similarity index 100%
rename from src/plugins/home/server/tutorials/instructions/instruction_variant.ts
rename to src/plugins/home/common/instruction_variant.ts
diff --git a/src/plugins/home/public/index.ts b/src/plugins/home/public/index.ts
index 114d442b40943..2a445cf242729 100644
--- a/src/plugins/home/public/index.ts
+++ b/src/plugins/home/public/index.ts
@@ -26,6 +26,7 @@ export {
   HomePublicPluginStart,
 } from './plugin';
 export { FeatureCatalogueEntry, FeatureCatalogueCategory, Environment } from './services';
+export * from '../common/instruction_variant';
 import { HomePublicPlugin } from './plugin';
 
 export const plugin = (initializerContext: PluginInitializerContext) =>
diff --git a/src/plugins/home/server/index.ts b/src/plugins/home/server/index.ts
index 02f4c91a414cc..75ace84344216 100644
--- a/src/plugins/home/server/index.ts
+++ b/src/plugins/home/server/index.ts
@@ -36,5 +36,5 @@ export const config: PluginConfigDescriptor<ConfigSchema> = {
 
 export const plugin = (initContext: PluginInitializerContext) => new HomeServerPlugin(initContext);
 
-export { INSTRUCTION_VARIANT } from './tutorials/instructions/instruction_variant';
+export { INSTRUCTION_VARIANT } from '../common/instruction_variant';
 export { ArtifactsSchema, TutorialsCategory } from './services/tutorials';
diff --git a/src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts
index 6a9dba69b193f..4c85ad3985b3d 100644
--- a/src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/auditbeat_instructions.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from './instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
diff --git a/src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts
index 176a3901821f1..66efa36ec9bcd 100644
--- a/src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/filebeat_instructions.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from './instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
diff --git a/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts
index 385880ba9780f..ee13b9c5eefd8 100644
--- a/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/functionbeat_instructions.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from './instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
diff --git a/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts
index 406bf55da4321..33f5defc0273f 100644
--- a/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/heartbeat_instructions.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from './instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { Platform, TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
diff --git a/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts
index 77efe0958a615..9fdc70e0703a4 100644
--- a/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/metricbeat_instructions.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from './instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
diff --git a/src/plugins/home/server/tutorials/instructions/winlogbeat_instructions.ts b/src/plugins/home/server/tutorials/instructions/winlogbeat_instructions.ts
index cc18f2ce9705d..9d7d0660d3d6c 100644
--- a/src/plugins/home/server/tutorials/instructions/winlogbeat_instructions.ts
+++ b/src/plugins/home/server/tutorials/instructions/winlogbeat_instructions.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { INSTRUCTION_VARIANT } from './instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createTrycloudOption1, createTrycloudOption2 } from './onprem_cloud_instructions';
 import { getSpaceIdForBeatsTutorial } from './get_space_id_for_beats_tutorial';
 import { TutorialContext } from '../../services/tutorials/lib/tutorials_registry_types';
diff --git a/src/plugins/home/server/tutorials/netflow/elastic_cloud.ts b/src/plugins/home/server/tutorials/netflow/elastic_cloud.ts
index ac64aef730004..fbedc6abfbb8a 100644
--- a/src/plugins/home/server/tutorials/netflow/elastic_cloud.ts
+++ b/src/plugins/home/server/tutorials/netflow/elastic_cloud.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { INSTRUCTION_VARIANT } from '../instructions/instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createLogstashInstructions } from '../instructions/logstash_instructions';
 import { createCommonNetflowInstructions } from './common_instructions';
 
diff --git a/src/plugins/home/server/tutorials/netflow/on_prem.ts b/src/plugins/home/server/tutorials/netflow/on_prem.ts
index c7cd36d073632..ef8c3e172af87 100644
--- a/src/plugins/home/server/tutorials/netflow/on_prem.ts
+++ b/src/plugins/home/server/tutorials/netflow/on_prem.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { INSTRUCTION_VARIANT } from '../instructions/instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createLogstashInstructions } from '../instructions/logstash_instructions';
 import { createCommonNetflowInstructions } from './common_instructions';
 
diff --git a/src/plugins/home/server/tutorials/netflow/on_prem_elastic_cloud.ts b/src/plugins/home/server/tutorials/netflow/on_prem_elastic_cloud.ts
index c01a9a5382f88..85aa694970491 100644
--- a/src/plugins/home/server/tutorials/netflow/on_prem_elastic_cloud.ts
+++ b/src/plugins/home/server/tutorials/netflow/on_prem_elastic_cloud.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { INSTRUCTION_VARIANT } from '../instructions/instruction_variant';
+import { INSTRUCTION_VARIANT } from '../../../common/instruction_variant';
 import { createLogstashInstructions } from '../instructions/logstash_instructions';
 import {
   createTrycloudOption1,
diff --git a/src/plugins/kibana_legacy/public/plugin.ts b/src/plugins/kibana_legacy/public/plugin.ts
index b9a61a1c9b200..7c4b3428cbb6d 100644
--- a/src/plugins/kibana_legacy/public/plugin.ts
+++ b/src/plugins/kibana_legacy/public/plugin.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { App, PluginInitializerContext } from 'kibana/public';
-
+import { App, AppBase, PluginInitializerContext, AppUpdatableFields } from 'kibana/public';
+import { Observable } from 'rxjs';
 import { ConfigSchema } from '../config';
 
 interface ForwardDefinition {
@@ -27,8 +27,26 @@ interface ForwardDefinition {
   keepPrefix: boolean;
 }
 
+export type AngularRenderedAppUpdater = (
+  app: AppBase
+) => Partial<AppUpdatableFields & { activeUrl: string }> | undefined;
+
+export interface AngularRenderedApp extends App {
+  /**
+   * Angular rendered apps are able to update the active url in the nav link (which is currently not
+   * possible for actual NP apps). When regular applications have the same functionality, this type
+   * override can be removed.
+   */
+  updater$?: Observable<AngularRenderedAppUpdater>;
+  /**
+   * If the active url is updated via the updater$ subject, the app id is assumed to be identical with
+   * the nav link id. If this is not the case, it is possible to provide another nav link id here.
+   */
+  navLinkId?: string;
+}
+
 export class KibanaLegacyPlugin {
-  private apps: App[] = [];
+  private apps: AngularRenderedApp[] = [];
   private forwards: ForwardDefinition[] = [];
 
   constructor(private readonly initializerContext: PluginInitializerContext<ConfigSchema>) {}
@@ -52,7 +70,7 @@ export class KibanaLegacyPlugin {
        *
        * @param app The app descriptor
        */
-      registerLegacyApp: (app: App) => {
+      registerLegacyApp: (app: AngularRenderedApp) => {
         this.apps.push(app);
       },
 
diff --git a/src/plugins/kibana_react/public/adapters/index.ts b/src/plugins/kibana_react/public/adapters/index.ts
new file mode 100644
index 0000000000000..9912967022793
--- /dev/null
+++ b/src/plugins/kibana_react/public/adapters/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './react_to_ui_component';
+export * from './ui_to_react_component';
diff --git a/src/plugins/kibana_react/public/adapters/react_to_ui_component.test.tsx b/src/plugins/kibana_react/public/adapters/react_to_ui_component.test.tsx
new file mode 100644
index 0000000000000..14fe02c6bf652
--- /dev/null
+++ b/src/plugins/kibana_react/public/adapters/react_to_ui_component.test.tsx
@@ -0,0 +1,86 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as React from 'react';
+import { reactToUiComponent } from './react_to_ui_component';
+
+const ReactComp: React.FC<{ cnt?: number }> = ({ cnt = 0 }) => {
+  return <div>cnt: {cnt}</div>;
+};
+
+describe('reactToUiComponent', () => {
+  test('can render UI component', () => {
+    const UiComp = reactToUiComponent(ReactComp);
+    const div = document.createElement('div');
+
+    const instance = UiComp();
+    instance.render(div, {});
+
+    expect(div.innerHTML).toBe('<div>cnt: 0</div>');
+  });
+
+  test('can pass in props', async () => {
+    const UiComp = reactToUiComponent(ReactComp);
+    const div = document.createElement('div');
+
+    const instance = UiComp();
+    instance.render(div, { cnt: 5 });
+
+    expect(div.innerHTML).toBe('<div>cnt: 5</div>');
+  });
+
+  test('can re-render multiple times', async () => {
+    const UiComp = reactToUiComponent(ReactComp);
+    const div = document.createElement('div');
+    const instance = UiComp();
+
+    instance.render(div, { cnt: 1 });
+
+    expect(div.innerHTML).toBe('<div>cnt: 1</div>');
+
+    instance.render(div, { cnt: 2 });
+
+    expect(div.innerHTML).toBe('<div>cnt: 2</div>');
+  });
+
+  test('renders React component only when .render() method is called', () => {
+    let renderCnt = 0;
+    const MyReactComp: React.FC<{ cnt?: number }> = ({ cnt = 0 }) => {
+      renderCnt++;
+      return <div>cnt: {cnt}</div>;
+    };
+    const UiComp = reactToUiComponent(MyReactComp);
+    const instance = UiComp();
+    const div = document.createElement('div');
+
+    expect(renderCnt).toBe(0);
+
+    instance.render(div, { cnt: 1 });
+
+    expect(renderCnt).toBe(1);
+
+    instance.render(div, { cnt: 2 });
+
+    expect(renderCnt).toBe(2);
+
+    instance.render(div, { cnt: 3 });
+
+    expect(renderCnt).toBe(3);
+  });
+});
diff --git a/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts b/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
new file mode 100644
index 0000000000000..b4007b30cf8ca
--- /dev/null
+++ b/src/plugins/kibana_react/public/adapters/react_to_ui_component.ts
@@ -0,0 +1,49 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { ComponentType, createElement as h } from 'react';
+import { render as renderReact, unmountComponentAtNode } from 'react-dom';
+import { UiComponent, UiComponentInstance } from '../../../kibana_utils/common';
+
+/**
+ * Transform a React component into a `UiComponent`.
+ *
+ * @param ReactComp A React component.
+ */
+export const reactToUiComponent = <Props extends object>(
+  ReactComp: ComponentType<Props>
+): UiComponent<Props> => () => {
+  let lastEl: HTMLElement | undefined;
+
+  const render: UiComponentInstance<Props>['render'] = (el, props) => {
+    lastEl = el;
+    renderReact(h(ReactComp, props), el);
+  };
+
+  const unmount: UiComponentInstance<Props>['unmount'] = () => {
+    if (lastEl) unmountComponentAtNode(lastEl);
+  };
+
+  const comp: UiComponentInstance<Props> = {
+    render,
+    unmount,
+  };
+
+  return comp;
+};
diff --git a/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx b/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
new file mode 100644
index 0000000000000..939d372b9997f
--- /dev/null
+++ b/src/plugins/kibana_react/public/adapters/ui_to_react_component.test.tsx
@@ -0,0 +1,149 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { UiComponent } from '../../../kibana_utils/common';
+import { uiToReactComponent } from './ui_to_react_component';
+import { reactToUiComponent } from './react_to_ui_component';
+
+const UiComp: UiComponent<{ cnt?: number }> = () => ({
+  render: (el, { cnt = 0 }) => {
+    el.innerHTML = `cnt: ${cnt}`;
+  },
+});
+
+describe('uiToReactComponent', () => {
+  test('can render React component', () => {
+    const ReactComp = uiToReactComponent(UiComp);
+    const div = document.createElement('div');
+
+    ReactDOM.render(<ReactComp />, div);
+
+    expect(div.innerHTML).toBe('<div>cnt: 0</div>');
+  });
+
+  test('can pass in props', async () => {
+    const ReactComp = uiToReactComponent(UiComp);
+    const div = document.createElement('div');
+
+    ReactDOM.render(<ReactComp cnt={5} />, div);
+
+    expect(div.innerHTML).toBe('<div>cnt: 5</div>');
+  });
+
+  test('re-renders when React component is re-rendered', async () => {
+    const ReactComp = uiToReactComponent(UiComp);
+    const div = document.createElement('div');
+
+    ReactDOM.render(<ReactComp cnt={1} />, div);
+
+    expect(div.innerHTML).toBe('<div>cnt: 1</div>');
+
+    ReactDOM.render(<ReactComp cnt={2} />, div);
+
+    expect(div.innerHTML).toBe('<div>cnt: 2</div>');
+  });
+
+  test('does not crash if .unmount() not provided', () => {
+    const UiComp2: UiComponent<{ cnt?: number }> = () => ({
+      render: (el, { cnt = 0 }) => {
+        el.innerHTML = `cnt: ${cnt}`;
+      },
+    });
+    const ReactComp = uiToReactComponent(UiComp2);
+    const div = document.createElement('div');
+
+    ReactDOM.render(<ReactComp cnt={1} />, div);
+    ReactDOM.unmountComponentAtNode(div);
+
+    expect(div.innerHTML).toBe('');
+  });
+
+  test('calls .unmount() method once when component un-mounts', () => {
+    const unmount = jest.fn();
+    const UiComp2: UiComponent<{ cnt?: number }> = () => ({
+      render: (el, { cnt = 0 }) => {
+        el.innerHTML = `cnt: ${cnt}`;
+      },
+      unmount,
+    });
+    const ReactComp = uiToReactComponent(UiComp2);
+    const div = document.createElement('div');
+
+    expect(unmount).toHaveBeenCalledTimes(0);
+
+    ReactDOM.render(<ReactComp cnt={1} />, div);
+
+    expect(unmount).toHaveBeenCalledTimes(0);
+
+    ReactDOM.unmountComponentAtNode(div);
+
+    expect(unmount).toHaveBeenCalledTimes(1);
+  });
+
+  test('calls .render() method only once when components mounts, and once on every re-render', () => {
+    const render = jest.fn((el, { cnt = 0 }) => {
+      el.innerHTML = `cnt: ${cnt}`;
+    });
+    const UiComp2: UiComponent<{ cnt?: number }> = () => ({
+      render,
+    });
+    const ReactComp = uiToReactComponent(UiComp2);
+    const div = document.createElement('div');
+
+    expect(render).toHaveBeenCalledTimes(0);
+
+    ReactDOM.render(<ReactComp cnt={1} />, div);
+
+    expect(render).toHaveBeenCalledTimes(1);
+
+    ReactDOM.render(<ReactComp cnt={2} />, div);
+
+    expect(render).toHaveBeenCalledTimes(2);
+
+    ReactDOM.render(<ReactComp cnt={3} />, div);
+
+    expect(render).toHaveBeenCalledTimes(3);
+  });
+
+  test('can specify wrapper element', async () => {
+    const ReactComp = uiToReactComponent(UiComp, 'span');
+    const div = document.createElement('div');
+
+    ReactDOM.render(<ReactComp cnt={5} />, div);
+
+    expect(div.innerHTML).toBe('<span>cnt: 5</span>');
+  });
+});
+
+test('can adapt component many times', () => {
+  const ReactComp = uiToReactComponent(
+    reactToUiComponent(uiToReactComponent(reactToUiComponent(uiToReactComponent(UiComp))))
+  );
+  const div = document.createElement('div');
+
+  ReactDOM.render(<ReactComp />, div);
+
+  expect(div.textContent).toBe('cnt: 0');
+
+  ReactDOM.render(<ReactComp cnt={123} />, div);
+
+  expect(div.textContent).toBe('cnt: 123');
+});
diff --git a/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts b/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
new file mode 100644
index 0000000000000..9b34880cf4fe3
--- /dev/null
+++ b/src/plugins/kibana_react/public/adapters/ui_to_react_component.ts
@@ -0,0 +1,48 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { FC, createElement as h, useRef, useLayoutEffect, useMemo } from 'react';
+import { UiComponent, UiComponentInstance } from '../../../kibana_utils/common';
+
+/**
+ * Transforms `UiComponent` into a React component.
+ */
+export const uiToReactComponent = <Props extends object>(
+  Comp: UiComponent<Props>,
+  as: string = 'div'
+): FC<Props> => props => {
+  const ref = useRef<HTMLDivElement>();
+  const comp = useMemo<UiComponentInstance<Props>>(() => Comp(), [Comp]);
+
+  useLayoutEffect(() => {
+    if (!ref.current) return;
+    comp.render(ref.current, props);
+  });
+
+  useLayoutEffect(() => {
+    if (!comp.unmount) return;
+    return () => {
+      if (comp.unmount) comp.unmount();
+    };
+  }, [comp]);
+
+  return h(as, {
+    ref,
+  });
+};
diff --git a/src/plugins/kibana_react/public/index.ts b/src/plugins/kibana_react/public/index.ts
index 81f2e694e8e5b..e1f90b9c60199 100644
--- a/src/plugins/kibana_react/public/index.ts
+++ b/src/plugins/kibana_react/public/index.ts
@@ -26,5 +26,6 @@ export * from './ui_settings';
 export * from './field_icon';
 export * from './table_list_view';
 export * from './split_panel';
+export { reactToUiComponent, uiToReactComponent } from './adapters';
 export { useUrlTracker } from './use_url_tracker';
 export { toMountPoint } from './util';
diff --git a/src/plugins/kibana_utils/common/index.ts b/src/plugins/kibana_utils/common/index.ts
index 444c10194a8e3..fb608a0db1ac2 100644
--- a/src/plugins/kibana_utils/common/index.ts
+++ b/src/plugins/kibana_utils/common/index.ts
@@ -19,6 +19,7 @@
 
 export * from './defer';
 export * from './of';
+export * from './ui';
 export * from './state_containers';
 export { createGetterSetter, Get, Set } from './create_getter_setter';
 export { distinctUntilChangedWithInitialValue } from './distinct_until_changed_with_initial_value';
diff --git a/src/plugins/kibana_utils/common/ui/index.ts b/src/plugins/kibana_utils/common/ui/index.ts
new file mode 100644
index 0000000000000..0cfb2f13c8a5d
--- /dev/null
+++ b/src/plugins/kibana_utils/common/ui/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export * from './ui_component';
diff --git a/src/plugins/kibana_utils/common/ui/ui_component.ts b/src/plugins/kibana_utils/common/ui/ui_component.ts
new file mode 100644
index 0000000000000..6984ab9b78e5f
--- /dev/null
+++ b/src/plugins/kibana_utils/common/ui/ui_component.ts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * In many places in Kibana we want to be agnostic to frontend view library,
+ * i.e. instead of exposing React-specific APIs we want to expose APIs that
+ * are orthogonal to any rendering library. This interface represents such UI
+ * components. UI component receives a DOM element and `props` through `render()`
+ * method, the `render()` method can be called many times.
+ *
+ * Although Kibana aims to be library agnostic, Kibana itself is written in React,
+ * thus here we define `UiComponent` which is an abstract unit of UI that can be
+ * implemented in any framework, but it maps easily to React components, i.e.
+ * `UiComponent<Props>` is like `React.ComponentType<Props>`.
+ */
+export type UiComponent<Props extends object = object> = () => UiComponentInstance<Props>;
+
+/**
+ * Instance of an UiComponent, corresponds to React virtual DOM node.
+ */
+export interface UiComponentInstance<Props extends object = object> {
+  /**
+   * Call this method on initial render and on all subsequent updates.
+   *
+   * @param el DOM element.
+   * @param props Component props, same as props in React.
+   */
+  render(el: HTMLElement, props: Props): void;
+
+  /**
+   * Un-mount UI component. Call it to remove view from DOM. Implementers of this
+   * interface should clear DOM from this UI component and destroy any internal state.
+   */
+  unmount?(): void;
+}
diff --git a/src/plugins/kibana_utils/public/index.ts b/src/plugins/kibana_utils/public/index.ts
index 5b6d304e14c2e..883f28da45223 100644
--- a/src/plugins/kibana_utils/public/index.ts
+++ b/src/plugins/kibana_utils/public/index.ts
@@ -17,7 +17,16 @@
  * under the License.
  */
 
-export { defer, Defer, of, createGetterSetter, Get, Set } from '../common';
+export {
+  defer,
+  Defer,
+  of,
+  createGetterSetter,
+  Get,
+  Set,
+  UiComponent,
+  UiComponentInstance,
+} from '../common';
 export * from './core';
 export * from './errors';
 export * from './field_mapping';
@@ -40,6 +49,7 @@ export {
   unhashUrl,
   unhashQuery,
   createUrlTracker,
+  createKbnUrlTracker,
   createKbnUrlControls,
   getStateFromKbnUrl,
   getStatesFromKbnUrl,
diff --git a/src/plugins/kibana_utils/public/state_management/url/index.ts b/src/plugins/kibana_utils/public/state_management/url/index.ts
index 40491bf7a274b..e28d183c6560a 100644
--- a/src/plugins/kibana_utils/public/state_management/url/index.ts
+++ b/src/plugins/kibana_utils/public/state_management/url/index.ts
@@ -25,4 +25,5 @@ export {
   getStatesFromKbnUrl,
   IKbnUrlControls,
 } from './kbn_url_storage';
+export { createKbnUrlTracker } from './kbn_url_tracker';
 export { createUrlTracker } from './url_tracker';
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
new file mode 100644
index 0000000000000..4b17d8517328b
--- /dev/null
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.test.ts
@@ -0,0 +1,184 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { StubBrowserStorage } from 'test_utils/stub_browser_storage';
+import { createMemoryHistory, History } from 'history';
+import { createKbnUrlTracker, KbnUrlTracker } from './kbn_url_tracker';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { AppBase, ToastsSetup } from 'kibana/public';
+import { coreMock } from '../../../../../core/public/mocks';
+import { unhashUrl } from './hash_unhash_url';
+
+jest.mock('./hash_unhash_url', () => ({
+  unhashUrl: jest.fn(x => x),
+}));
+
+describe('kbnUrlTracker', () => {
+  let storage: StubBrowserStorage;
+  let history: History;
+  let urlTracker: KbnUrlTracker;
+  let state1Subject: Subject<{ key1: string }>;
+  let state2Subject: Subject<{ key2: string }>;
+  let navLinkUpdaterSubject: BehaviorSubject<(app: AppBase) => { activeUrl?: string } | undefined>;
+  let toastService: jest.Mocked<ToastsSetup>;
+
+  function createTracker() {
+    urlTracker = createKbnUrlTracker({
+      baseUrl: '/app/test',
+      defaultSubUrl: '#/start',
+      storageKey: 'storageKey',
+      history,
+      storage,
+      stateParams: [
+        {
+          kbnUrlKey: 'state1',
+          stateUpdate$: state1Subject.asObservable(),
+        },
+        {
+          kbnUrlKey: 'state2',
+          stateUpdate$: state2Subject.asObservable(),
+        },
+      ],
+      navLinkUpdater$: navLinkUpdaterSubject,
+      toastNotifications: toastService,
+    });
+  }
+
+  function getActiveNavLinkUrl() {
+    return navLinkUpdaterSubject.getValue()({} as AppBase)?.activeUrl;
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    toastService = coreMock.createSetup().notifications.toasts;
+    storage = new StubBrowserStorage();
+    history = createMemoryHistory();
+    state1Subject = new Subject<{ key1: string }>();
+    state2Subject = new Subject<{ key2: string }>();
+    navLinkUpdaterSubject = new BehaviorSubject<
+      (app: AppBase) => { activeUrl?: string } | undefined
+    >(() => undefined);
+  });
+
+  test('do not touch nav link to default if nothing else is set', () => {
+    createTracker();
+    expect(getActiveNavLinkUrl()).toEqual(undefined);
+  });
+
+  test('set nav link to session storage value if defined', () => {
+    storage.setItem('storageKey', '#/deep/path');
+    createTracker();
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/deep/path');
+  });
+
+  test('set nav link to default if app gets mounted', () => {
+    storage.setItem('storageKey', '#/deep/path');
+    createTracker();
+    urlTracker.appMounted();
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/start');
+  });
+
+  test('keep nav link to default if path gets changed while app mounted', () => {
+    storage.setItem('storageKey', '#/deep/path');
+    createTracker();
+    urlTracker.appMounted();
+    history.push('/deep/path/2');
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/start');
+  });
+
+  test('change nav link to last visited url within app after unmount', () => {
+    createTracker();
+    urlTracker.appMounted();
+    history.push('/deep/path/2');
+    history.push('/deep/path/3');
+    urlTracker.appUnMounted();
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/deep/path/3');
+  });
+
+  test('unhash all urls that are recorded while app is mounted', () => {
+    (unhashUrl as jest.Mock).mockImplementation(x => x + '?unhashed');
+    createTracker();
+    urlTracker.appMounted();
+    history.push('/deep/path/2');
+    history.push('/deep/path/3');
+    urlTracker.appUnMounted();
+    expect(unhashUrl).toHaveBeenCalledTimes(2);
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/deep/path/3?unhashed');
+  });
+
+  test('show warning and use hashed url if unhashing does not work', () => {
+    (unhashUrl as jest.Mock).mockImplementation(() => {
+      throw new Error('unhash broke');
+    });
+    createTracker();
+    urlTracker.appMounted();
+    history.push('/deep/path/2');
+    urlTracker.appUnMounted();
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/deep/path/2');
+    expect(toastService.addDanger).toHaveBeenCalledWith('unhash broke');
+  });
+
+  test('change nav link back to default if app gets mounted again', () => {
+    createTracker();
+    urlTracker.appMounted();
+    history.push('/deep/path/2');
+    history.push('/deep/path/3');
+    urlTracker.appUnMounted();
+    urlTracker.appMounted();
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/start');
+  });
+
+  test('update state param when app is not mounted', () => {
+    createTracker();
+    state1Subject.next({ key1: 'abc' });
+    expect(getActiveNavLinkUrl()).toMatchInlineSnapshot(`"/app/test#/start?state1=(key1:abc)"`);
+  });
+
+  test('update state param without overwriting rest of the url when app is not mounted', () => {
+    storage.setItem('storageKey', '#/deep/path?extrastate=1');
+    createTracker();
+    state1Subject.next({ key1: 'abc' });
+    expect(getActiveNavLinkUrl()).toMatchInlineSnapshot(
+      `"/app/test#/deep/path?extrastate=1&state1=(key1:abc)"`
+    );
+  });
+
+  test('not update state param when app is mounted', () => {
+    createTracker();
+    urlTracker.appMounted();
+    state1Subject.next({ key1: 'abc' });
+    expect(getActiveNavLinkUrl()).toEqual('/app/test#/start');
+  });
+
+  test('update state param multiple times when app is not mounted', () => {
+    createTracker();
+    state1Subject.next({ key1: 'abc' });
+    state1Subject.next({ key1: 'def' });
+    expect(getActiveNavLinkUrl()).toMatchInlineSnapshot(`"/app/test#/start?state1=(key1:def)"`);
+  });
+
+  test('update multiple state params when app is not mounted', () => {
+    createTracker();
+    state1Subject.next({ key1: 'abc' });
+    state2Subject.next({ key2: 'def' });
+    expect(getActiveNavLinkUrl()).toMatchInlineSnapshot(
+      `"/app/test#/start?state1=(key1:abc)&state2=(key2:def)"`
+    );
+  });
+});
diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
new file mode 100644
index 0000000000000..6f3f64ea7b941
--- /dev/null
+++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts
@@ -0,0 +1,192 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { createHashHistory, History, UnregisterCallback } from 'history';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { AppBase, ToastsSetup } from 'kibana/public';
+import { setStateToKbnUrl } from './kbn_url_storage';
+import { unhashUrl } from './hash_unhash_url';
+
+export interface KbnUrlTracker {
+  /**
+   * Callback to invoke when the app is mounted
+   */
+  appMounted: () => void;
+  /**
+   * Callback to invoke when the app is unmounted
+   */
+  appUnMounted: () => void;
+  /**
+   * Unregistering the url tracker. This won't reset the current state of the nav link
+   */
+  stop: () => void;
+}
+
+/**
+ * Listens to history changes and optionally to global state changes and updates the nav link url of
+ * a given app to point to the last visited page within the app.
+ *
+ * This includes the following parts:
+ * * When the app is currently active, the nav link points to the configurable default url of the app.
+ * * When the app is not active the last visited url is set to the nav link.
+ * * When a provided observable emits a new value, the state parameter in the url of the nav link is updated
+ * as long as the app is not active.
+ */
+export function createKbnUrlTracker({
+  baseUrl,
+  defaultSubUrl,
+  storageKey,
+  stateParams,
+  navLinkUpdater$,
+  toastNotifications,
+  history,
+  storage,
+}: {
+  /**
+   * Base url of the current app. This will be used as a prefix for the
+   * nav link in the side bar
+   */
+  baseUrl: string;
+  /**
+   * Default sub url for this app. If the app is currently active or no sub url is already stored in session storage and the app hasn't been visited yet, the nav link will be set to this url.
+   */
+  defaultSubUrl: string;
+  /**
+   * List of URL mapped states that should get updated even when the app is not currently active
+   */
+  stateParams: Array<{
+    /**
+     * Key of the query parameter containing the state
+     */
+    kbnUrlKey: string;
+    /**
+     * Observable providing updates to the state
+     */
+    stateUpdate$: Observable<unknown>;
+  }>;
+  /**
+   * Key used to store the current sub url in session storage. This key should only be used for one active url tracker at any given ntime.
+   */
+  storageKey: string;
+  /**
+   * App updater subject passed into the application definition to change nav link url.
+   */
+  navLinkUpdater$: BehaviorSubject<(app: AppBase) => { activeUrl?: string } | undefined>;
+  /**
+   * Toast notifications service to show toasts in error cases.
+   */
+  toastNotifications: ToastsSetup;
+  /**
+   * History object to use to track url changes. If this isn't provided, a local history instance will be created.
+   */
+  history?: History;
+  /**
+   * Storage object to use to persist currently active url. If this isn't provided, the browser wide session storage instance will be used.
+   */
+  storage?: Storage;
+}): KbnUrlTracker {
+  const historyInstance = history || createHashHistory();
+  const storageInstance = storage || sessionStorage;
+
+  // local state storing current listeners and active url
+  let activeUrl: string = '';
+  let unsubscribeURLHistory: UnregisterCallback | undefined;
+  let unsubscribeGlobalState: Subscription[] | undefined;
+
+  function setNavLink(hash: string) {
+    navLinkUpdater$.next(() => ({ activeUrl: baseUrl + hash }));
+  }
+
+  function getActiveSubUrl(url: string) {
+    // remove baseUrl prefix (just storing the sub url part)
+    return url.substr(baseUrl.length);
+  }
+
+  function unsubscribe() {
+    if (unsubscribeURLHistory) {
+      unsubscribeURLHistory();
+      unsubscribeURLHistory = undefined;
+    }
+
+    if (unsubscribeGlobalState) {
+      unsubscribeGlobalState.forEach(sub => sub.unsubscribe());
+      unsubscribeGlobalState = undefined;
+    }
+  }
+
+  function onMountApp() {
+    unsubscribe();
+    // track current hash when within app
+    unsubscribeURLHistory = historyInstance.listen(location => {
+      const urlWithHashes = baseUrl + '#' + location.pathname + location.search;
+      let urlWithStates = '';
+      try {
+        urlWithStates = unhashUrl(urlWithHashes);
+      } catch (e) {
+        toastNotifications.addDanger(e.message);
+      }
+
+      activeUrl = getActiveSubUrl(urlWithStates || urlWithHashes);
+      storageInstance.setItem(storageKey, activeUrl);
+    });
+  }
+
+  function onUnmountApp() {
+    unsubscribe();
+    // propagate state updates when in other apps
+    unsubscribeGlobalState = stateParams.map(({ stateUpdate$, kbnUrlKey }) =>
+      stateUpdate$.subscribe(state => {
+        const updatedUrl = setStateToKbnUrl(
+          kbnUrlKey,
+          state,
+          { useHash: false },
+          baseUrl + (activeUrl || defaultSubUrl)
+        );
+        // remove baseUrl prefix (just storing the sub url part)
+        activeUrl = getActiveSubUrl(updatedUrl);
+        storageInstance.setItem(storageKey, activeUrl);
+        setNavLink(activeUrl);
+      })
+    );
+  }
+
+  // register listeners for unmounted app initially
+  onUnmountApp();
+
+  // initialize nav link and internal state
+  const storedUrl = storageInstance.getItem(storageKey);
+  if (storedUrl) {
+    activeUrl = storedUrl;
+    setNavLink(storedUrl);
+  }
+
+  return {
+    appMounted() {
+      onMountApp();
+      setNavLink(defaultSubUrl);
+    },
+    appUnMounted() {
+      onUnmountApp();
+      setNavLink(activeUrl);
+    },
+    stop() {
+      unsubscribe();
+    },
+  };
+}
diff --git a/src/plugins/ui_actions/public/actions/i_action.ts b/src/plugins/ui_actions/public/actions/i_action.ts
index 20fdda9033f6a..544b66b26c974 100644
--- a/src/plugins/ui_actions/public/actions/i_action.ts
+++ b/src/plugins/ui_actions/public/actions/i_action.ts
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { UiComponent } from 'src/plugins/kibana_utils/common';
+
 export interface IAction<ActionContext extends {} = {}> {
   /**
    * Determined the order when there is more than one action matched to a trigger.
@@ -39,6 +41,12 @@ export interface IAction<ActionContext extends {} = {}> {
    */
   getDisplayName(context: ActionContext): string;
 
+  /**
+   * `UiComponent` to render when displaying this action as a context menu item.
+   * If not provided, `getDisplayName` will be used instead.
+   */
+  MenuItem?: UiComponent<{ context: ActionContext }>;
+
   /**
    * Returns a promise that resolves to true if this action is compatible given the context,
    * otherwise resolves to false.
diff --git a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.ts b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
similarity index 89%
rename from src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.ts
rename to src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
index 8de447f5acf9c..3b76ff66f3aea 100644
--- a/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.ts
+++ b/src/plugins/ui_actions/public/context_menu/build_eui_context_menu_panels.tsx
@@ -17,9 +17,11 @@
  * under the License.
  */
 
+import * as React from 'react';
 import { EuiContextMenuPanelDescriptor, EuiContextMenuPanelItemDescriptor } from '@elastic/eui';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
+import { uiToReactComponent } from '../../../kibana_react/public';
 import { IAction } from '../actions';
 
 /**
@@ -98,7 +100,12 @@ function convertPanelActionToContextMenuItem<A>({
   closeMenu: () => void;
 }): EuiContextMenuPanelItemDescriptor {
   const menuPanelItem: EuiContextMenuPanelItemDescriptor = {
-    name: action.getDisplayName(actionContext),
+    name: action.MenuItem
+      ? // Cast to `any` because `name` typed to string.
+        (React.createElement(uiToReactComponent(action.MenuItem), {
+          context: actionContext,
+        }) as any)
+      : action.getDisplayName(actionContext),
     icon: action.getIconType(actionContext),
     panel: _.get(action, 'childContextMenuPanel.id'),
     'data-test-subj': `embeddablePanelAction-${action.id}`,
diff --git a/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx b/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
index 9e3d206c9a6dc..4e18b8ec27fb9 100644
--- a/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
+++ b/src/plugins/ui_actions/public/tests/test_samples/hello_world_action.tsx
@@ -18,16 +18,31 @@
  */
 
 import React from 'react';
-import { EuiFlyout } from '@elastic/eui';
+import { EuiFlyout, EuiFlexGroup, EuiFlexItem, EuiBadge } from '@elastic/eui';
 import { CoreStart } from 'src/core/public';
 import { createAction, IAction } from '../../actions';
-import { toMountPoint } from '../../../../kibana_react/public';
+import { toMountPoint, reactToUiComponent } from '../../../../kibana_react/public';
+
+const ReactMenuItem: React.FC = () => {
+  return (
+    <EuiFlexGroup alignItems="center">
+      <EuiFlexItem>Hello world!</EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiBadge color={'danger'}>{'secret'}</EuiBadge>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
+const UiMenuItem = reactToUiComponent(ReactMenuItem);
 
 export const HELLO_WORLD_ACTION_ID = 'HELLO_WORLD_ACTION_ID';
 
 export function createHelloWorldAction(overlays: CoreStart['overlays']): IAction {
   return createAction({
     type: HELLO_WORLD_ACTION_ID,
+    getIconType: () => 'lock',
+    MenuItem: UiMenuItem,
     execute: async () => {
       const flyoutSession = overlays.openFlyout(
         toMountPoint(
diff --git a/x-pack/legacy/plugins/apm/common/projections/typings.ts b/x-pack/legacy/plugins/apm/common/projections/typings.ts
index 2b55395b70c6b..08a7bee5412a5 100644
--- a/x-pack/legacy/plugins/apm/common/projections/typings.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/typings.ts
@@ -4,11 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESSearchRequest, ESSearchBody } from '../../typings/elasticsearch';
+import {
+  ESSearchRequest,
+  ESSearchBody
+} from '../../../../../plugins/apm/typings/elasticsearch';
 import {
   AggregationOptionsByType,
   AggregationInputMap
-} from '../../typings/elasticsearch/aggregations';
+} from '../../../../../plugins/apm/typings/elasticsearch/aggregations';
 
 export type Projection = Omit<ESSearchRequest, 'body'> & {
   body: Omit<ESSearchBody, 'aggs'> & {
diff --git a/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts b/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts
index 6a5089733bb33..ef6089872b786 100644
--- a/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts
+++ b/x-pack/legacy/plugins/apm/common/projections/util/merge_projection/index.ts
@@ -5,11 +5,11 @@
  */
 import { merge, isPlainObject, cloneDeep } from 'lodash';
 import { DeepPartial } from 'utility-types';
-import { AggregationInputMap } from '../../../../typings/elasticsearch/aggregations';
+import { AggregationInputMap } from '../../../../../../../plugins/apm/typings/elasticsearch/aggregations';
 import {
   ESSearchRequest,
   ESSearchBody
-} from '../../../../typings/elasticsearch';
+} from '../../../../../../../plugins/apm/typings/elasticsearch';
 import { Projection } from '../../typings';
 
 type PlainObject = Record<string | number | symbol, any>;
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
index 07ea97f442b7f..38e86e4a0d1c9 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Controls.tsx
@@ -11,7 +11,6 @@ import React, { useContext, useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { CytoscapeContext } from './Cytoscape';
 import { animationOptions, nodeHeight } from './cytoscapeOptions';
-import { FullscreenPanel } from './FullscreenPanel';
 
 const ControlsContainer = styled('div')`
   left: ${theme.gutterTypes.gutterMedium};
@@ -87,7 +86,6 @@ export function Controls() {
   const minZoom = cy.minZoom();
   const isMinZoom = zoom === minZoom;
   const increment = (maxZoom - minZoom) / steps;
-  const mapDomElement = cy.container();
   const zoomInLabel = i18n.translate('xpack.apm.serviceMap.zoomIn', {
     defaultMessage: 'Zoom in'
   });
@@ -127,7 +125,6 @@ export function Controls() {
           title={centerLabel}
         />
       </EuiPanel>
-      <FullscreenPanel element={mapDomElement} />
     </ControlsContainer>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/FullscreenPanel.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/FullscreenPanel.tsx
deleted file mode 100644
index 851bf0ebf56fd..0000000000000
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/FullscreenPanel.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiButtonIcon, EuiPanel } from '@elastic/eui';
-import styled from 'styled-components';
-import theme from '@elastic/eui/dist/eui_theme_light.json';
-import { i18n } from '@kbn/i18n';
-
-const Button = styled(EuiButtonIcon)`
-  display: block;
-  margin: ${theme.paddingSizes.xs};
-`;
-
-interface FullscreenPanelProps {
-  element: Element | null;
-}
-
-export function FullscreenPanel({ element }: FullscreenPanelProps) {
-  const canDoFullscreen =
-    element && element.ownerDocument && element.ownerDocument.fullscreenEnabled;
-
-  if (!canDoFullscreen) {
-    return null;
-  }
-
-  function doFullscreen() {
-    if (element && element.ownerDocument && canDoFullscreen) {
-      const isFullscreen = element.ownerDocument.fullscreenElement !== null;
-
-      if (isFullscreen) {
-        element.ownerDocument.exitFullscreen();
-      } else {
-        element.requestFullscreen();
-      }
-    }
-  }
-
-  const label = i18n.translate('xpack.apm.serviceMap.fullscreen', {
-    defaultMessage: 'Full screen'
-  });
-
-  return (
-    <EuiPanel hasShadow={true} paddingSize="none">
-      <Button
-        aria-label={label}
-        color="text"
-        iconType="fullScreen"
-        onClick={doFullscreen}
-        title={label}
-      />
-    </EuiPanel>
-  );
-}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
index 722f64c6a7e58..7d362f92154fb 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons.ts
@@ -46,10 +46,23 @@ const serviceIcons: { [key: string]: string } = {
 
 export const defaultIcon = getAvatarIcon();
 
+// IE 11 does not properly load some SVGs, which causes a runtime error and the
+// map to not work at all. We would prefer to do some kind of feature detection
+// rather than browser detection, but IE 11 does support SVG, just not well
+// enough for our use in loading icons.
+//
+// This method of detecting IE is from a Stack Overflow answer:
+// https://stackoverflow.com/a/21825207
+//
+// @ts-ignore `documentMode` is not recognized as a valid property of `document`.
+const isIE11 = !!window.MSInputMethodContext && !!document.documentMode;
+
 export function iconForNode(node: cytoscape.NodeSingular) {
   const type = node.data('type');
   if (type === 'service') {
     return serviceIcons[node.data('agentName') as string];
+  } else if (isIE11) {
+    return defaultIcon;
   } else {
     return icons[type];
   }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/documents.svg b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/documents.svg
index b0648d14f20ba..debe180e45661 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/documents.svg
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/icons/documents.svg
@@ -1 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" class="euiIcon euiIcon--medium euiIcon-isLoaded" focusable="false" role="img" aria-hidden="true"><title></title><path d="M8.8 0c.274 0 .537.113.726.312l3.2 3.428c.176.186.274.433.274.689V13a1 1 0 01-1 1H2a1 1 0 01-1-1V1a1 1 0 011-1h6.8zM12 5H8.5a.5.5 0 01-.5-.5V1H2v12h10V5zm-7.5 6a.5.5 0 110-1h5a.5.5 0 110 1h-5zm0-3a.5.5 0 010-1h5a.5.5 0 110 1h-5zm1 8a.5.5 0 110-1H14V6.5a.5.5 0 111 0V15a1 1 0 01-1 1H5.5z"></path></svg>
+<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M8.8 0c.274 0 .537.113.726.312l3.2 3.428c.176.186.274.433.274.689V13a1 1 0 01-1 1H2a1 1 0 01-1-1V1a1 1 0 011-1h6.8zM12 5H8.5a.5.5 0 01-.5-.5V1H2v12h10V5zm-7.5 6a.5.5 0 110-1h5a.5.5 0 110 1h-5zm0-3a.5.5 0 010-1h5a.5.5 0 110 1h-5zm1 8a.5.5 0 110-1H14V6.5a.5.5 0 111 0V15a1 1 0 01-1 1H5.5z"></path></svg>
diff --git a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts
index f4628524cced5..23feeed4b0418 100644
--- a/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts
+++ b/x-pack/legacy/plugins/apm/public/components/shared/KueryBar/get_bool_filter.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import {
   TRANSACTION_TYPE,
   ERROR_GROUP_ID,
diff --git a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
index e42b9536362e0..187a051b1b044 100644
--- a/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
+++ b/x-pack/legacy/plugins/apm/public/services/rest/ml.ts
@@ -12,7 +12,7 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { getMlJobId, getMlPrefix } from '../../../common/ml_job_constants';
 import { callApi } from './callApi';
-import { ESFilter } from '../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../plugins/apm/typings/elasticsearch';
 import { createCallApmApi, APMClient } from './createCallApmApi';
 
 interface MlResponseItem {
diff --git a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
index 862c982d6b5ac..3d34f016c6591 100644
--- a/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
+++ b/x-pack/legacy/plugins/apm/public/utils/testHelpers.tsx
@@ -23,7 +23,7 @@ import {
   ESFilter,
   ESSearchResponse,
   ESSearchRequest
-} from '../../typings/elasticsearch';
+} from '../../../../../plugins/apm/typings/elasticsearch';
 import {
   ApmPluginContext,
   ApmPluginContextValue
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts
index 9274f96d58d83..0f6ace39aeca3 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/distribution/get_buckets.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import {
   ERROR_GROUP_ID,
   PROCESSOR_EVENT,
diff --git a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts
index aaa4ca9fb8223..92ee6a0a71f00 100644
--- a/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/errors/get_error_groups.ts
@@ -20,7 +20,7 @@ import {
 } from '../helpers/setup_request';
 import { getErrorGroupsProjection } from '../../../common/projections/errors';
 import { mergeProjection } from '../../../common/projections/util/merge_projection';
-import { SortOptions } from '../../../typings/elasticsearch/aggregations';
+import { SortOptions } from '../../../../../../plugins/apm/typings/elasticsearch/aggregations';
 
 export type ErrorGroupListAPIResponse = PromiseReturnType<
   typeof getErrorGroups
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
index 0f0a11a868d6d..b5061e303a40d 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/__test__/get_environment_ui_filter_es.test.ts
@@ -7,7 +7,7 @@
 import { getEnvironmentUiFilterES } from '../get_environment_ui_filter_es';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../../common/environment_filter_values';
 import { SERVICE_ENVIRONMENT } from '../../../../../common/elasticsearch_fieldnames';
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../../plugins/apm/typings/elasticsearch';
 
 describe('getEnvironmentUiFilterES', () => {
   it('should return undefined, when environment is undefined', () => {
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
index 57feaf6a6fd0e..dcf2334ab4de2 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_environment_ui_filter_es.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../../common/environment_filter_values';
 import { SERVICE_ENVIRONMENT } from '../../../../common/elasticsearch_fieldnames';
 
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
index a6f6d36ecfc81..126ee49fd4218 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/convert_ui_filters/get_ui_filters_es.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import { UIFilters } from '../../../../typings/ui-filters';
 import { getEnvironmentUiFilterES } from './get_environment_ui_filter_es';
 import {
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
index 737eeac95516e..2795c95a50034 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/es_client.ts
@@ -18,7 +18,7 @@ import { OBSERVER_VERSION_MAJOR } from '../../../common/elasticsearch_fieldnames
 import {
   ESSearchResponse,
   ESSearchRequest
-} from '../../../typings/elasticsearch';
+} from '../../../../../../plugins/apm/typings/elasticsearch';
 import { APMRequestHandlerContext } from '../../routes/typings';
 import { pickKeys } from '../../../public/utils/pickKeys';
 import { getApmIndices } from '../settings/apm_indices/get_apm_indices';
diff --git a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
index 56c9255844009..f8946997e6e18 100644
--- a/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/helpers/setup_request.ts
@@ -12,7 +12,7 @@ import {
   getApmIndices,
   ApmIndicesConfig
 } from '../settings/apm_indices/get_apm_indices';
-import { ESFilter } from '../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../plugins/apm/typings/elasticsearch';
 import { ESClient } from './es_client';
 import { getUiFiltersES } from './convert_ui_filters/get_ui_filters_es';
 import { APMRequestHandlerContext } from '../../routes/typings';
diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts b/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
index 76460bb40bedb..410d659a924fd 100644
--- a/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/metrics/fetch_and_transform_metrics.ts
@@ -15,7 +15,7 @@ import { ChartBase } from './types';
 import { transformDataToMetricsChart } from './transform_metrics_chart';
 import { getMetricsProjection } from '../../../common/projections/metrics';
 import { mergeProjection } from '../../../common/projections/util/merge_projection';
-import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations';
+import { AggregationOptionsByType } from '../../../../../../plugins/apm/typings/elasticsearch/aggregations';
 
 interface Aggs {
   [key: string]: Unionize<{
diff --git a/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts b/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
index 03f21e4f26e7b..8e7c969eec96a 100644
--- a/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/metrics/transform_metrics_chart.ts
@@ -9,8 +9,8 @@ import { ChartBase } from './types';
 import {
   ESSearchResponse,
   ESSearchRequest
-} from '../../../typings/elasticsearch';
-import { AggregationOptionsByType } from '../../../typings/elasticsearch/aggregations';
+} from '../../../../../../plugins/apm/typings/elasticsearch';
+import { AggregationOptionsByType } from '../../../../../../plugins/apm/typings/elasticsearch/aggregations';
 import { getVizColorForIndex } from '../../../common/viz_colors';
 
 export type GenericMetricsChart = ReturnType<
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
index 6c4d540103cec..cff2d8570349e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
@@ -5,7 +5,7 @@
  */
 
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
-import { ESFilter } from '../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../plugins/apm/typings/elasticsearch';
 import { rangeFilter } from '../helpers/range_filter';
 import {
   PROCESSOR_EVENT,
diff --git a/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts b/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
index acf113b426608..bb5fcabb6c9d7 100644
--- a/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/service_map/get_trace_sample_ids.ts
@@ -10,7 +10,7 @@ import {
   SetupTimeRange
 } from '../helpers/setup_request';
 import { rangeFilter } from '../helpers/range_filter';
-import { ESFilter } from '../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../plugins/apm/typings/elasticsearch';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,
diff --git a/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.ts b/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.ts
index c03746ca220ee..9c8e4f2281b5e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/services/annotations/index.ts
@@ -5,7 +5,7 @@
  */
 import { isNumber } from 'lodash';
 import { Annotation, AnnotationType } from '../../../../common/annotations';
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT,
diff --git a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts
index 766baead006b6..3f4225eaf22d6 100644
--- a/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/settings/agent_configuration/search.ts
@@ -3,7 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { ESSearchHit } from '../../../../typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import {
   SERVICE_NAME,
   SERVICE_ENVIRONMENT
diff --git a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts
index a4885f2884976..18c61df0cfa7e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transaction_groups/fetcher.ts
@@ -13,7 +13,7 @@ import {
 import { getTransactionGroupsProjection } from '../../../common/projections/transaction_groups';
 import { mergeProjection } from '../../../common/projections/util/merge_projection';
 import { PromiseReturnType } from '../../../typings/common';
-import { SortOptions } from '../../../typings/elasticsearch/aggregations';
+import { SortOptions } from '../../../../../../plugins/apm/typings/elasticsearch/aggregations';
 import { Transaction } from '../../../typings/es_schemas/ui/Transaction';
 import {
   Setup,
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/__fixtures__/responses.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/__fixtures__/responses.ts
index 3f0f8a84dc62f..9a9bfc31c21d4 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/__fixtures__/responses.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/__fixtures__/responses.ts
@@ -7,7 +7,7 @@
 import {
   ESSearchResponse,
   ESSearchRequest
-} from '../../../../../typings/elasticsearch';
+} from '../../../../../../../../plugins/apm/typings/elasticsearch';
 
 export const response = ({
   hits: {
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/fetcher.ts
index 8a96a25aef50e..9b0d704dbb43e 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/fetcher.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/avg_duration_by_browser/fetcher.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import { PromiseReturnType } from '../../../../typings/common';
 import {
   PROCESSOR_EVENT,
diff --git a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
index 8a2e01c9a7891..67b807da59b9b 100644
--- a/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/transactions/charts/get_timeseries_data/fetcher.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ESFilter } from '../../../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../../../plugins/apm/typings/elasticsearch';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,
diff --git a/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts b/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts
index 50c1926d1e4a0..05985ee95a207 100644
--- a/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts
+++ b/x-pack/legacy/plugins/apm/server/lib/ui_filters/get_environments.ts
@@ -12,7 +12,7 @@ import {
 import { rangeFilter } from '../helpers/range_filter';
 import { Setup, SetupTimeRange } from '../helpers/setup_request';
 import { ENVIRONMENT_NOT_DEFINED } from '../../../common/environment_filter_values';
-import { ESFilter } from '../../../typings/elasticsearch';
+import { ESFilter } from '../../../../../../plugins/apm/typings/elasticsearch';
 
 export async function getEnvironments(
   setup: Setup & SetupTimeRange,
diff --git a/x-pack/legacy/plugins/lens/index.ts b/x-pack/legacy/plugins/lens/index.ts
index a4eb24d4a4de4..bb0bf9b67ee2c 100644
--- a/x-pack/legacy/plugins/lens/index.ts
+++ b/x-pack/legacy/plugins/lens/index.ts
@@ -7,11 +7,12 @@
 import * as Joi from 'joi';
 import { resolve } from 'path';
 import { LegacyPluginInitializer } from 'src/legacy/types';
-import KbnServer, { Server } from 'src/legacy/server/kbn_server';
 import mappings from './mappings.json';
-import { PLUGIN_ID, getEditPath, NOT_INTERNATIONALIZED_PRODUCT_NAME } from './common';
-import { lensServerPlugin } from './server';
-import { getTaskManagerSetup, getTaskManagerStart } from '../task_manager/server';
+import {
+  PLUGIN_ID,
+  getEditPath,
+  NOT_INTERNATIONALIZED_PRODUCT_NAME,
+} from '../../../plugins/lens/common';
 
 export const lens: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
@@ -51,31 +52,5 @@ export const lens: LegacyPluginInitializer = kibana => {
         enabled: Joi.boolean().default(true),
       }).default();
     },
-
-    init(server: Server) {
-      const kbnServer = (server as unknown) as KbnServer;
-
-      // Set up with the new platform plugin lifecycle API.
-      const plugin = lensServerPlugin();
-      const { usageCollection } = server.newPlatform.setup.plugins;
-
-      plugin.setup(kbnServer.newPlatform.setup.core, {
-        usageCollection,
-        // Legacy APIs
-        savedObjects: server.savedObjects,
-        config: server.config(),
-        server,
-        taskManager: getTaskManagerSetup(server)!,
-      });
-
-      plugin.start(kbnServer.newPlatform.start.core, {
-        server,
-        taskManager: getTaskManagerStart(server)!,
-      });
-
-      server.events.on('stop', () => {
-        plugin.stop();
-      });
-    },
   });
 };
diff --git a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
index f7d9ae5741afb..5efbd4b613a3e 100644
--- a/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
+++ b/x-pack/legacy/plugins/lens/public/app_plugin/plugin.tsx
@@ -40,7 +40,7 @@ import {
   stopReportManager,
   trackUiEvent,
 } from '../lens_ui_telemetry';
-import { NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../common';
+import { NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../../../../plugins/lens/common';
 import { KibanaLegacySetup } from '../../../../../../src/plugins/kibana_legacy/public';
 import { EditorFrameStart } from '../types';
 import {
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable_factory.ts b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable_factory.ts
index 03a21a9b364c1..629efdbdb460b 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable_factory.ts
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_plugin/embeddable/embeddable_factory.ts
@@ -19,7 +19,7 @@ import {
 } from '../../../../../../../src/legacy/core_plugins/embeddable_api/public/np_ready/public';
 import { Embeddable } from './embeddable';
 import { SavedObjectIndexStore, DOC_TYPE } from '../../persistence';
-import { getEditPath } from '../../../common';
+import { getEditPath } from '../../../../../../plugins/lens/common';
 
 export class EmbeddableFactory extends AbstractEmbeddableFactory {
   type = DOC_TYPE;
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
index b62585f5da09a..7720af8ee9001 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/auto_date.ts
@@ -10,7 +10,7 @@ import {
   ExpressionFunction,
   KibanaContext,
 } from '../../../../../../src/plugins/expressions/public';
-import { DateRange } from '../../common';
+import { DateRange } from '../../../../../plugins/lens/common';
 
 interface LensAutoDateProps {
   aggConfigs: string;
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
index dfeb8632d096e..972c396f93b43 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/dimension_panel/dimension_panel.tsx
@@ -19,7 +19,7 @@ import { changeColumn, deleteColumn } from '../state_helpers';
 import { isDraggedField, hasField } from '../utils';
 import { IndexPatternPrivateState, IndexPatternField } from '../types';
 import { trackUiEvent } from '../../lens_ui_telemetry';
-import { DateRange } from '../../../common';
+import { DateRange } from '../../../../../../plugins/lens/common';
 
 export type IndexPatternDimensionPanelProps = DatasourceDimensionPanelProps & {
   state: IndexPatternPrivateState;
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx
index 4a58f0354882a..2aec28181f02b 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/field_item.tsx
@@ -44,7 +44,7 @@ import {
 import { DraggedField } from './indexpattern';
 import { DragDrop } from '../drag_drop';
 import { DatasourceDataPanelProps, DataType } from '../types';
-import { BucketedAggregation, FieldStatsResponse } from '../../common';
+import { BucketedAggregation, FieldStatsResponse } from '../../../../../plugins/lens/common';
 import { IndexPattern, IndexPatternField } from './types';
 import { getColorForDataType, LensFieldIcon } from './lens_field_icon';
 import { trackUiEvent } from '../lens_ui_telemetry';
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
index f0692f120f9b5..e37c5db09ca74 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/loader.ts
@@ -17,8 +17,8 @@ import {
   IndexPatternField,
 } from './types';
 import { updateLayerIndexPattern } from './state_helpers';
-import { DateRange, ExistingFields } from '../../common/types';
-import { BASE_API_URL } from '../../common';
+import { DateRange, ExistingFields } from '../../../../../plugins/lens/common/types';
+import { BASE_API_URL } from '../../../../../plugins/lens/common';
 import { documentField } from './document_field';
 import { isNestedField, IFieldType, TypeMeta } from '../../../../../../src/plugins/data/public';
 
diff --git a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts
index 63e4564878e31..f357038be41a4 100644
--- a/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts
+++ b/x-pack/legacy/plugins/lens/public/indexpattern_plugin/operations/definitions/index.ts
@@ -14,7 +14,7 @@ import { countOperation } from './count';
 import { DimensionPriority, StateSetter, OperationMetadata } from '../../../types';
 import { BaseIndexPatternColumn } from './column_types';
 import { IndexPatternPrivateState, IndexPattern, IndexPatternField } from '../../types';
-import { DateRange } from '../../../../common';
+import { DateRange } from '../../../../../../../plugins/lens/common';
 
 // List of all operation definitions registered to this data source.
 // If you want to implement a new operation, add it to this array and
diff --git a/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts b/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts
index babc65969afb5..73750a65c50b8 100644
--- a/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts
+++ b/x-pack/legacy/plugins/lens/public/lens_ui_telemetry/factory.ts
@@ -8,7 +8,7 @@ import moment from 'moment';
 import { HttpSetup } from 'src/core/public';
 
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
-import { BASE_API_URL } from '../../common';
+import { BASE_API_URL } from '../../../../../plugins/lens/common';
 
 const STORAGE_KEY = 'lens-ui-telemetry';
 
diff --git a/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts b/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
index 0c4e6d9f7cb10..f71796268065b 100644
--- a/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
+++ b/x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts
@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 import { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
-import { getBasePath, getEditPath } from '../common';
+import { getBasePath, getEditPath } from '../../../../plugins/lens/common';
 
 visualizations.types.registerAlias({
   aliasUrl: getBasePath(),
diff --git a/x-pack/legacy/plugins/lens/public/types.ts b/x-pack/legacy/plugins/lens/public/types.ts
index 923e0aff5ae0e..e2157deb43e49 100644
--- a/x-pack/legacy/plugins/lens/public/types.ts
+++ b/x-pack/legacy/plugins/lens/public/types.ts
@@ -11,7 +11,7 @@ import { SavedQuery } from 'src/legacy/core_plugins/data/public';
 import { KibanaDatatable } from '../../../../../src/plugins/expressions/public';
 import { DragContextState } from './drag_drop';
 import { Document } from './persistence';
-import { DateRange } from '../common';
+import { DateRange } from '../../../../plugins/lens/common';
 import { Query, esFilters } from '../../../../../src/plugins/data/public';
 
 // eslint-disable-next-line
diff --git a/x-pack/legacy/plugins/lens/server/plugin.tsx b/x-pack/legacy/plugins/lens/server/plugin.tsx
deleted file mode 100644
index f80d52248b484..0000000000000
--- a/x-pack/legacy/plugins/lens/server/plugin.tsx
+++ /dev/null
@@ -1,57 +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 { Server, KibanaConfig } from 'src/legacy/server/kbn_server';
-import { Plugin, CoreSetup, CoreStart, SavedObjectsLegacyService } from 'src/core/server';
-import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { Subject } from 'rxjs';
-import { first } from 'rxjs/operators';
-import {
-  TaskManagerSetupContract,
-  TaskManagerStartContract,
-} from '../../../../plugins/task_manager/server';
-import { setupRoutes } from './routes';
-import {
-  registerLensUsageCollector,
-  initializeLensTelemetry,
-  scheduleLensTelemetry,
-} from './usage';
-
-export interface PluginSetupContract {
-  savedObjects: SavedObjectsLegacyService;
-  usageCollection: UsageCollectionSetup;
-  config: KibanaConfig;
-  server: Server;
-  taskManager: TaskManagerSetupContract;
-}
-
-export interface PluginStartContract {
-  server: Server;
-  taskManager: TaskManagerStartContract;
-}
-
-const taskManagerStartContract$ = new Subject<TaskManagerStartContract>();
-
-export class LensServer implements Plugin<{}, {}, {}, {}> {
-  setup(core: CoreSetup, plugins: PluginSetupContract) {
-    setupRoutes(core, plugins);
-    registerLensUsageCollector(
-      plugins.usageCollection,
-      taskManagerStartContract$.pipe(first()).toPromise()
-    );
-    initializeLensTelemetry(plugins.server, plugins.taskManager);
-    return {};
-  }
-
-  start(core: CoreStart, plugins: PluginStartContract) {
-    scheduleLensTelemetry(plugins.server, plugins.taskManager);
-    taskManagerStartContract$.next(plugins.taskManager);
-    taskManagerStartContract$.complete();
-    return {};
-  }
-
-  stop() {}
-}
diff --git a/x-pack/legacy/plugins/ml/public/application/services/job_service.js b/x-pack/legacy/plugins/ml/public/application/services/job_service.js
index 54e0dd1f535f2..fe3663d6a3ddb 100644
--- a/x-pack/legacy/plugins/ml/public/application/services/job_service.js
+++ b/x-pack/legacy/plugins/ml/public/application/services/job_service.js
@@ -5,7 +5,6 @@
  */
 
 import _ from 'lodash';
-import angular from 'angular';
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 
@@ -116,8 +115,7 @@ class JobService {
 
       ml.getJobs()
         .then(resp => {
-          // make deep copy of jobs
-          angular.copy(resp.jobs, jobs);
+          jobs = resp.jobs;
 
           // load jobs stats
           ml.getJobStats()
@@ -131,14 +129,13 @@ class JobService {
                 job.datafeed_config = {};
 
                 for (let j = 0; j < statsResp.jobs.length; j++) {
-                  if (job.job_id === statsResp.jobs[j].job_id) {
-                    const jobStats = angular.copy(statsResp.jobs[j]);
-
+                  const jobStats = statsResp.jobs[j];
+                  if (job.job_id === jobStats.job_id) {
                     job.state = jobStats.state;
-                    job.data_counts = jobStats.data_counts;
-                    job.model_size_stats = jobStats.model_size_stats;
+                    job.data_counts = _.cloneDeep(jobStats.data_counts);
+                    job.model_size_stats = _.cloneDeep(jobStats.model_size_stats);
                     if (jobStats.node) {
-                      job.node = jobStats.node;
+                      job.node = _.cloneDeep(jobStats.node);
                     }
                     if (jobStats.open_time) {
                       job.open_time = jobStats.open_time;
@@ -199,9 +196,8 @@ class JobService {
     return new Promise((resolve, reject) => {
       ml.getJobs({ jobId })
         .then(resp => {
-          const newJob = {};
           if (resp.jobs && resp.jobs.length) {
-            angular.copy(resp.jobs[0], newJob);
+            const newJob = resp.jobs[0];
 
             // load jobs stats
             ml.getJobStats({ jobId })
@@ -213,10 +209,10 @@ class JobService {
                     newJob.state = statsJob.state;
                     newJob.data_counts = {};
                     newJob.model_size_stats = {};
-                    angular.copy(statsJob.data_counts, newJob.data_counts);
-                    angular.copy(statsJob.model_size_stats, newJob.model_size_stats);
+                    newJob.data_counts = _.cloneDeep(statsJob.data_counts);
+                    newJob.model_size_stats = _.cloneDeep(statsJob.model_size_stats);
                     if (newJob.node) {
-                      angular.copy(statsJob.node, newJob.node);
+                      newJob.node = _.cloneDeep(statsJob.node);
                     }
 
                     if (statsJob.open_time) {
@@ -273,7 +269,6 @@ class JobService {
 
   loadDatafeeds(datafeedId) {
     return new Promise((resolve, reject) => {
-      const datafeeds = [];
       const sId = datafeedId !== undefined ? { datafeed_id: datafeedId } : undefined;
 
       ml.getDatafeeds(sId)
@@ -281,7 +276,7 @@ class JobService {
           // console.log('loadDatafeeds query response:', resp);
 
           // make deep copy of datafeeds
-          angular.copy(resp.datafeeds, datafeeds);
+          const datafeeds = resp.datafeeds;
 
           // load datafeeds stats
           ml.getDatafeedStats()
@@ -357,7 +352,7 @@ class JobService {
     // create a deep copy of a job object
     // also remove items from the job which are set by the server and not needed
     // in the future this formatting could be optional
-    const tempJob = angular.copy(job);
+    const tempJob = _.cloneDeep(job);
 
     // remove all of the items which should not be copied
     // such as counts, state and times
@@ -421,7 +416,7 @@ class JobService {
         return { success: true };
       })
       .catch(err => {
-        msgs.error(
+        msgs.notify.error(
           i18n.translate('xpack.ml.jobService.couldNotUpdateJobErrorMessage', {
             defaultMessage: 'Could not update job: {jobId}',
             values: { jobId },
@@ -440,7 +435,7 @@ class JobService {
         return { success: true, messages };
       })
       .catch(err => {
-        msgs.error(
+        msgs.notify.error(
           i18n.translate('xpack.ml.jobService.jobValidationErrorMessage', {
             defaultMessage: 'Job Validation Error: {errorMessage}',
             values: { errorMessage: err.message },
@@ -633,7 +628,7 @@ class JobService {
         return { success: true };
       })
       .catch(err => {
-        msgs.error(
+        msgs.notify.error(
           i18n.translate('xpack.ml.jobService.couldNotUpdateDatafeedErrorMessage', {
             defaultMessage: 'Could not update datafeed: {datafeedId}',
             values: { datafeedId },
@@ -664,7 +659,7 @@ class JobService {
         })
         .catch(err => {
           console.log('jobService error starting datafeed:', err);
-          msgs.error(
+          msgs.notify.error(
             i18n.translate('xpack.ml.jobService.couldNotStartDatafeedErrorMessage', {
               defaultMessage: 'Could not start datafeed for {jobId}',
               values: { jobId },
@@ -697,15 +692,15 @@ class JobService {
           );
 
           if (err.statusCode === 500) {
-            msgs.error(couldNotStopDatafeedErrorMessage);
-            msgs.error(
+            msgs.notify.error(couldNotStopDatafeedErrorMessage);
+            msgs.notify.error(
               i18n.translate('xpack.ml.jobService.requestMayHaveTimedOutErrorMessage', {
                 defaultMessage:
                   'Request may have timed out and may still be running in the background.',
               })
             );
           } else {
-            msgs.error(couldNotStopDatafeedErrorMessage, err);
+            msgs.notify.error(couldNotStopDatafeedErrorMessage, err);
           }
           reject(err);
         });
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/anomaly_detectors_schema.ts b/x-pack/legacy/plugins/ml/server/new_platform/anomaly_detectors_schema.ts
new file mode 100644
index 0000000000000..392d3bfd84768
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/new_platform/anomaly_detectors_schema.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+const detectorSchema = schema.object({
+  identifier: schema.maybe(schema.string()),
+  function: schema.string(),
+  field_name: schema.maybe(schema.string()),
+  by_field_name: schema.maybe(schema.string()),
+  over_field_name: schema.maybe(schema.string()),
+  partition_field_name: schema.maybe(schema.string()),
+  detector_description: schema.maybe(schema.string()),
+});
+
+const customUrlSchema = {
+  url_name: schema.string(),
+  url_value: schema.string(),
+  time_range: schema.maybe(schema.any()),
+};
+
+const customSettingsSchema = schema.object({
+  created_by: schema.maybe(schema.string()),
+  custom_urls: schema.maybe(schema.arrayOf(schema.maybe(schema.object({ ...customUrlSchema })))),
+});
+
+export const anomalyDetectionUpdateJobSchema = {
+  description: schema.maybe(schema.string()),
+  detectors: schema.maybe(
+    schema.arrayOf(
+      schema.maybe(
+        schema.object({
+          detector_index: schema.number(),
+          custom_rules: schema.arrayOf(
+            schema.maybe(
+              schema.object({
+                actions: schema.arrayOf(schema.string()),
+                conditions: schema.arrayOf(schema.any()),
+                scope: schema.maybe(schema.any()),
+              })
+            )
+          ),
+        })
+      )
+    )
+  ),
+  custom_settings: schema.maybe(customSettingsSchema),
+  analysis_limits: schema.object({
+    categorization_examples_limit: schema.maybe(schema.number()),
+    model_memory_limit: schema.maybe(schema.string()),
+  }),
+  groups: schema.maybe(schema.arrayOf(schema.maybe(schema.string()))),
+};
+
+export const anomalyDetectionJobSchema = {
+  analysis_config: schema.object({
+    bucket_span: schema.maybe(schema.string()),
+    summary_count_field_name: schema.maybe(schema.string()),
+    detectors: schema.arrayOf(detectorSchema),
+    influencers: schema.arrayOf(schema.maybe(schema.string())),
+    categorization_field_name: schema.maybe(schema.string()),
+  }),
+  analysis_limits: schema.object({
+    categorization_examples_limit: schema.maybe(schema.number()),
+    model_memory_limit: schema.maybe(schema.string()),
+  }),
+  create_time: schema.maybe(schema.number()),
+  custom_settings: schema.maybe(customSettingsSchema),
+  allow_lazy_open: schema.maybe(schema.any()),
+  data_counts: schema.maybe(schema.any()),
+  data_description: schema.object({
+    time_field: schema.string(),
+    time_format: schema.maybe(schema.string()),
+  }),
+  datafeed_config: schema.maybe(schema.any()),
+  description: schema.maybe(schema.string()),
+  established_model_memory: schema.maybe(schema.number()),
+  finished_time: schema.maybe(schema.number()),
+  job_id: schema.string(),
+  job_type: schema.maybe(schema.string()),
+  job_version: schema.maybe(schema.string()),
+  groups: schema.arrayOf(schema.maybe(schema.string())),
+  model_plot_config: schema.maybe(schema.any()),
+  model_size_stats: schema.maybe(schema.any()),
+  model_snapshot_id: schema.maybe(schema.string()),
+  model_snapshot_min_version: schema.maybe(schema.string()),
+  model_snapshot_retention_days: schema.maybe(schema.number()),
+  results_index_name: schema.maybe(schema.string()),
+  state: schema.maybe(schema.string()),
+};
diff --git a/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js b/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js
deleted file mode 100644
index 54d447c288151..0000000000000
--- a/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.js
+++ /dev/null
@@ -1,202 +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 { callWithRequestFactory } from '../client/call_with_request_factory';
-import { wrapError } from '../client/errors';
-
-export function jobRoutes({ commonRouteConfig, elasticsearchPlugin, route }) {
-  route({
-    method: 'GET',
-    path: '/api/ml/anomaly_detectors',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.jobs').catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/anomaly_detectors/{jobId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const jobId = request.params.jobId;
-      return callWithRequest('ml.jobs', { jobId }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/anomaly_detectors/_stats',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.jobStats').catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/anomaly_detectors/{jobId}/_stats',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const jobId = request.params.jobId;
-      return callWithRequest('ml.jobStats', { jobId }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'PUT',
-    path: '/api/ml/anomaly_detectors/{jobId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const jobId = request.params.jobId;
-      const body = request.payload;
-      return callWithRequest('ml.addJob', { jobId, body }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/anomaly_detectors/{jobId}/_update',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const jobId = request.params.jobId;
-      const body = request.payload;
-      return callWithRequest('ml.updateJob', { jobId, body }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/anomaly_detectors/{jobId}/_open',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const jobId = request.params.jobId;
-      return callWithRequest('ml.openJob', { jobId }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/anomaly_detectors/{jobId}/_close',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const options = {
-        jobId: request.params.jobId,
-      };
-      const force = request.query.force;
-      if (force !== undefined) {
-        options.force = force;
-      }
-      return callWithRequest('ml.closeJob', options).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'DELETE',
-    path: '/api/ml/anomaly_detectors/{jobId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const options = {
-        jobId: request.params.jobId,
-      };
-      const force = request.query.force;
-      if (force !== undefined) {
-        options.force = force;
-      }
-      return callWithRequest('ml.deleteJob', options).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/anomaly_detectors/_validate/detector',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const body = request.payload;
-      return callWithRequest('ml.validateDetector', { body }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/anomaly_detectors/{jobId}/_forecast',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const jobId = request.params.jobId;
-      const duration = request.payload.duration;
-      return callWithRequest('ml.forecast', { jobId, duration }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'POST',
-    path: '/api/ml/anomaly_detectors/{jobId}/results/overall_buckets',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return callWithRequest('ml.overallBuckets', {
-        jobId: request.params.jobId,
-        top_n: request.payload.topN,
-        bucket_span: request.payload.bucketSpan,
-        start: request.payload.start,
-        end: request.payload.end,
-      }).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/anomaly_detectors/{jobId}/results/categories/{categoryId}',
-    handler(request, reply) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const options = {
-        jobId: request.params.jobId,
-        categoryId: request.params.categoryId,
-      };
-      return callWithRequest('ml.categories', options)
-        .then(resp => reply(resp))
-        .catch(resp => reply(wrapError(resp)));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.ts b/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.ts
new file mode 100644
index 0000000000000..64af1f67bce29
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/routes/anomaly_detectors.ts
@@ -0,0 +1,459 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { wrapError } from '../client/error_wrapper';
+import { licensePreRoutingFactory } from '../new_platform/licence_check_pre_routing_factory';
+import { RouteInitialization } from '../new_platform/plugin';
+import {
+  anomalyDetectionJobSchema,
+  anomalyDetectionUpdateJobSchema,
+} from '../new_platform/anomaly_detectors_schema';
+
+/**
+ * Routes for the anomaly detectors
+ */
+export function jobRoutes({ xpackMainPlugin, router }: RouteInitialization) {
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {get} /api/ml/anomaly_detectors Get anomaly detectors data
+   * @apiName GetAnomalyDetectors
+   * @apiDescription Returns the list of anomaly detection jobs.
+   *
+   * @apiSuccess {Number} count
+   * @apiSuccess {Object[]} jobs
+   */
+  router.get(
+    {
+      path: '/api/ml/anomaly_detectors',
+      validate: false,
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.jobs');
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {get} /api/ml/anomaly_detectors/:jobId Get anomaly detection data by id
+   * @apiName GetAnomalyDetectorsById
+   * @apiDescription Returns the anomaly detection job.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.get(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { jobId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.jobs', { jobId });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {get} /api/ml/anomaly_detectors/_stats Get anomaly detection stats
+   * @apiName GetAnomalyDetectorsStats
+   * @apiDescription Returns anomaly detection jobs statistics.
+   *
+   * @apiSuccess {Number} count
+   * @apiSuccess {Object[]} jobs
+   */
+  router.get(
+    {
+      path: '/api/ml/anomaly_detectors/_stats',
+      validate: false,
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.jobStats');
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {get} /api/ml/anomaly_detectors/:jobId/_stats Get stats for requested anomaly detection job
+   * @apiName GetAnomalyDetectorsStatsById
+   * @apiDescription Returns anomaly detection job statistics.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.get(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/_stats',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { jobId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.jobStats', { jobId });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {put} /api/ml/anomaly_detectors/:jobId Instantiate an anomaly detection job
+   * @apiName CreateAnomalyDetectors
+   * @apiDescription Creates an anomaly detection job.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.put(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+        body: schema.object({ ...anomalyDetectionJobSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { jobId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.addJob', {
+          jobId,
+          body: request.body,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {post} /api/ml/anomaly_detectors/:jobId/_update Update an anomaly detection job
+   * @apiName UpdateAnomalyDetectors
+   * @apiDescription Updates certain properties of an anomaly detection job.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.post(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/_update',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+        body: schema.object({ ...anomalyDetectionUpdateJobSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { jobId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.updateJob', {
+          jobId,
+          body: request.body,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {post} /api/ml/anomaly_detectors/:jobId/_open Open specified job
+   * @apiName OpenAnomalyDetectorsJob
+   * @apiDescription Opens an anomaly detection job.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.post(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/_open',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { jobId } = request.params;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.openJob', {
+          jobId,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {post} /api/ml/anomaly_detectors/:jobId/_close Close specified job
+   * @apiName CloseAnomalyDetectorsJob
+   * @apiDescription Closes an anomaly detection job.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.post(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/_close',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const options: { jobId: string; force?: boolean } = {
+          jobId: request.params.jobId,
+        };
+        const force = request.query.force;
+        if (force !== undefined) {
+          options.force = force;
+        }
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.closeJob', options);
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {delete} /api/ml/anomaly_detectors/:jobId Delete specified job
+   * @apiName DeleteAnomalyDetectorsJob
+   * @apiDescription Deletes specified anomaly detection job.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.delete(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const options: { jobId: string; force?: boolean } = {
+          jobId: request.params.jobId,
+        };
+        const force = request.query.force;
+        if (force !== undefined) {
+          options.force = force;
+        }
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.deleteJob', options);
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {post} /api/ml/anomaly_detectors/_validate/detector Validate detector
+   * @apiName ValidateAnomalyDetector
+   * @apiDescription Validates specified detector.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.post(
+    {
+      path: '/api/ml/anomaly_detectors/_validate/detector',
+      validate: {
+        body: schema.any(),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.validateDetector', {
+          body: request.body,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {post} /api/ml/anomaly_detectors/:jobId/_forecast Create forecast for specified job
+   * @apiName ForecastAnomalyDetector
+   * @apiDescription Creates a forecast for the specified anomaly detection job, predicting the future behavior of a time series by using its historical behavior.
+   *
+   * @apiParam {String} jobId Job ID.
+   */
+  router.post(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/_forecast',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+        body: schema.object({ duration: schema.any() }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const jobId = request.params.jobId;
+        const duration = request.body.duration;
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.forecast', {
+          jobId,
+          duration,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {post} /api/ml/anomaly_detectors/:jobId/results/overall_buckets  Obtain overall bucket scores for the specified job ID
+   * @apiName GetOverallBuckets
+   * @apiDescription Retrieves overall bucket results that summarize the bucket results of multiple anomaly detection jobs.
+   *
+   * @apiParam {String} jobId Job ID.
+   *
+   * @apiSuccess {Number} count
+   * @apiSuccess {Object[]} overall_buckets
+   */
+  router.post(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/results/overall_buckets',
+      validate: {
+        params: schema.object({
+          jobId: schema.string(),
+        }),
+        body: schema.object({
+          topN: schema.number(),
+          bucketSpan: schema.string(),
+          start: schema.number(),
+          end: schema.number(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.overallBuckets', {
+          jobId: request.params.jobId,
+          top_n: request.body.topN,
+          bucket_span: request.body.bucketSpan,
+          start: request.body.start,
+          end: request.body.end,
+        });
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  /**
+   * @apiGroup AnomalyDetectors
+   *
+   * @api {get} /api/ml/anomaly_detectors/:jobId/results/categories/:categoryId Get results category data by job id and category id
+   * @apiName GetCategories
+   * @apiDescription Returns the categories results for the specified job ID and category ID.
+   *
+   * @apiParam {String} jobId Job ID.
+   * @apiParam {String} categoryId Category ID.
+   */
+  router.get(
+    {
+      path: '/api/ml/anomaly_detectors/{jobId}/results/categories/{categoryId}',
+      validate: {
+        params: schema.object({
+          categoryId: schema.string(),
+          jobId: schema.string(),
+        }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const options = {
+          jobId: request.params.jobId,
+          categoryId: request.params.categoryId,
+        };
+        const results = await context.ml!.mlClient.callAsCurrentUser('ml.categories', options);
+        return response.ok({
+          body: { ...results },
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+}
diff --git a/x-pack/legacy/plugins/ml/server/routes/apidoc.json b/x-pack/legacy/plugins/ml/server/routes/apidoc.json
index 4a3b93b9b866f..f2ed202ae4777 100644
--- a/x-pack/legacy/plugins/ml/server/routes/apidoc.json
+++ b/x-pack/legacy/plugins/ml/server/routes/apidoc.json
@@ -19,6 +19,20 @@
     "GetDataFrameAnalyticsMessages",
     "DataVisualizer",
     "GetOverallStats",
-    "GetStatsForFields"
+    "GetStatsForFields",
+    "AnomalyDetectors",
+    "GetAnomalyDetectors",
+    "GetAnomalyDetectorsById",
+    "GetAnomalyDetectorsStats",
+    "GetAnomalyDetectorsStatsById",
+    "CreateAnomalyDetectors",
+    "UpdateAnomalyDetectors",
+    "OpenAnomalyDetectorsJob",
+    "CloseAnomalyDetectorsJob",
+    "DeleteAnomalyDetectorsJob",
+    "ValidateAnomalyDetector",
+    "ForecastAnomalyDetector",
+    "GetOverallBuckets",
+    "GetCategories"
   ]
 }
diff --git a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
index 0b7b301df12bf..4c7525645a2c2 100644
--- a/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/server/lib/tasks/visualizations/task_runner.ts
@@ -9,7 +9,7 @@ import { APICaller, CoreSetup } from 'kibana/server';
 import { getNextMidnight } from '../../get_next_midnight';
 import { VisState } from '../../../../../../../../src/legacy/core_plugins/visualizations/public';
 import { TaskInstance } from '../../../../../../../plugins/task_manager/server';
-import { ESSearchHit } from '../../../../../apm/typings/elasticsearch';
+import { ESSearchHit } from '../../../../../../../plugins/apm/typings/elasticsearch';
 import { LegacyConfig } from '../../../plugin';
 
 interface VisSummary {
diff --git a/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts b/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
index 0695fda3c2c94..8a8a5d18cd5f7 100644
--- a/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
+++ b/x-pack/legacy/plugins/oss_telemetry/test_utils/index.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { APICaller, CoreSetup } from 'kibana/server';
+import { APICaller, CoreSetup } from 'src/core/server';
 
 import {
   ConcreteTaskInstance,
diff --git a/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js b/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
index 82a4c5a888594..f0eb21a219442 100644
--- a/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
+++ b/x-pack/legacy/plugins/rollup/public/index_pattern_creation/rollup_index_pattern_creation_config.js
@@ -56,7 +56,6 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig
     this.rollupJobs = [];
     this.rollupIndicesCapabilities = {};
     this.rollupIndices = [];
-    this.settingUp = this.setRollupIndices();
   }
 
   async setRollupIndices() {
@@ -77,7 +76,7 @@ export class RollupIndexPatternCreationConfig extends IndexPatternCreationConfig
   }
 
   async getIndexPatternCreationOption(urlHandler) {
-    await this.settingUp;
+    await this.setRollupIndices();
     return this.rollupIndices && this.rollupIndices.length
       ? {
           text: rollupIndexPatternButtonText,
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
index 8ddb07b3093d0..45b073086d212 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
@@ -50,8 +50,8 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           totalSummaryCount,
           { summaries, nextPagePagination, prevPagePagination },
         ] = await Promise.all([
-          libs.pings.getDocCount({ callES: APICaller }),
-          libs.monitorStates.getMonitorStates({
+          libs.requests.getDocCount({ callES: APICaller }),
+          libs.requests.getMonitorStates({
             callES: APICaller,
             dateRangeStart,
             dateRangeEnd,
@@ -71,7 +71,7 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
         };
       },
       async getStatesIndexStatus(_resolver, {}, { APICaller }): Promise<StatesIndexStatus> {
-        return await libs.monitorStates.statesIndexExists({ callES: APICaller });
+        return await libs.requests.getStatesIndexStatus({ callES: APICaller });
       },
     },
   };
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
index cc5744eac6ea1..19f23fa1bb934 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/monitors/resolvers.ts
@@ -29,7 +29,7 @@ export const createMonitorsResolvers: CreateUMGraphQLResolvers = (
       { monitorId, dateRangeStart, dateRangeEnd, location },
       { APICaller }
     ): Promise<MonitorChart> {
-      return libs.monitors.getMonitorChartsData({
+      return await libs.requests.getMonitorCharts({
         callES: APICaller,
         monitorId,
         dateRangeStart,
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
index 373e1467433a2..dea7469ab6217 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
@@ -38,7 +38,7 @@ export const createPingsResolvers: CreateUMGraphQLResolvers = (
       { monitorId, sort, size, status, dateRangeStart, dateRangeEnd, location },
       { APICaller }
     ): Promise<PingResults> {
-      return await libs.pings.getAll({
+      return await libs.requests.getPings({
         callES: APICaller,
         dateRangeStart,
         dateRangeEnd,
@@ -50,7 +50,7 @@ export const createPingsResolvers: CreateUMGraphQLResolvers = (
       });
     },
     async getDocCount(_resolver, _args, { APICaller }): Promise<DocCount> {
-      return libs.pings.getDocCount({ callES: APICaller });
+      return libs.requests.getDocCount({ callES: APICaller });
     },
   },
 });
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/types.ts b/x-pack/legacy/plugins/uptime/server/graphql/types.ts
index 529ab41a62b3b..8508066a71f98 100644
--- a/x-pack/legacy/plugins/uptime/server/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/server/graphql/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandlerContext, CallAPIOptions } from 'kibana/server';
+import { RequestHandlerContext, CallAPIOptions } from 'src/core/server';
 import { UMServerLibs } from '../lib/lib';
 
 export type UMContext = RequestHandlerContext & {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
index fbef70f106dd8..9b3b11712b99b 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
@@ -5,8 +5,4 @@
  */
 
 export * from './framework';
-export * from './monitor_states';
-export * from './monitors';
-export * from './pings';
-export * from './stub_index_pattern';
 export * from './telemetry';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts
deleted file mode 100644
index 4104a9287a28d..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts
+++ /dev/null
@@ -1,64 +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 {
-  MonitorSummary,
-  CursorDirection,
-  SortOrder,
-  StatesIndexStatus,
-} from '../../../../common/graphql/types';
-import { UMElasticsearchQueryFn } from '../framework';
-import { Snapshot } from '../../../../common/runtime_types';
-
-export interface MonitorStatesParams {
-  dateRangeStart: string;
-  dateRangeEnd: string;
-  pagination?: CursorPagination;
-  filters?: string | null;
-  statusFilter?: string;
-}
-
-export interface GetSnapshotCountParams {
-  dateRangeStart: string;
-  dateRangeEnd: string;
-  filters?: string | null;
-  statusFilter?: string;
-}
-
-export interface UMMonitorStatesAdapter {
-  getMonitorStates: UMElasticsearchQueryFn<MonitorStatesParams, GetMonitorStatesResult>;
-  getSnapshotCount: UMElasticsearchQueryFn<GetSnapshotCountParams, Snapshot>;
-  statesIndexExists: UMElasticsearchQueryFn<{}, StatesIndexStatus>;
-}
-
-export interface CursorPagination {
-  cursorKey?: any;
-  cursorDirection: CursorDirection;
-  sortOrder: SortOrder;
-}
-
-export interface GetMonitorStatesResult {
-  summaries: MonitorSummary[];
-  nextPagePagination: string | null;
-  prevPagePagination: string | null;
-}
-
-export interface LegacyMonitorStatesQueryResult {
-  result: any;
-  statusFilter?: any;
-  searchAfter: any;
-}
-
-export interface MonitorStatesCheckGroupsResult {
-  checkGroups: string[];
-  searchAfter: any;
-}
-
-export interface EnrichMonitorStatesResult {
-  monitors: any[];
-  nextPagePagination: any | null;
-  prevPagePagination: any | null;
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
deleted file mode 100644
index 7ed973e6f057d..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts
+++ /dev/null
@@ -1,154 +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 { UMMonitorStatesAdapter } from './adapter_types';
-import { INDEX_NAMES, CONTEXT_DEFAULTS } from '../../../../common/constants';
-import { fetchPage } from './search';
-import { MonitorGroupIterator } from './search/monitor_group_iterator';
-import { Snapshot } from '../../../../common/runtime_types';
-import { QueryContext } from './search/query_context';
-
-export const elasticsearchMonitorStatesAdapter: UMMonitorStatesAdapter = {
-  // Gets a page of monitor states.
-  getMonitorStates: async ({
-    callES,
-    dateRangeStart,
-    dateRangeEnd,
-    pagination,
-    filters,
-    statusFilter,
-  }) => {
-    pagination = pagination || CONTEXT_DEFAULTS.CURSOR_PAGINATION;
-    statusFilter = statusFilter === null ? undefined : statusFilter;
-    const size = 10;
-
-    const queryContext = new QueryContext(
-      callES,
-      dateRangeStart,
-      dateRangeEnd,
-      pagination,
-      filters && filters !== '' ? JSON.parse(filters) : null,
-      size,
-      statusFilter
-    );
-
-    const page = await fetchPage(queryContext);
-
-    return {
-      summaries: page.items,
-      nextPagePagination: jsonifyPagination(page.nextPagePagination),
-      prevPagePagination: jsonifyPagination(page.prevPagePagination),
-    };
-  },
-
-  getSnapshotCount: async ({
-    callES,
-    dateRangeStart,
-    dateRangeEnd,
-    filters,
-    statusFilter,
-  }): Promise<Snapshot> => {
-    if (!(statusFilter === 'up' || statusFilter === 'down' || statusFilter === undefined)) {
-      throw new Error(`Invalid status filter value '${statusFilter}'`);
-    }
-
-    const context = new QueryContext(
-      callES,
-      dateRangeStart,
-      dateRangeEnd,
-      CONTEXT_DEFAULTS.CURSOR_PAGINATION,
-      filters && filters !== '' ? JSON.parse(filters) : null,
-      Infinity,
-      statusFilter
-    );
-
-    // Calculate the total, up, and down counts.
-    const counts = await fastStatusCount(context);
-
-    // Check if the last count was accurate, if not, we need to perform a slower count with the
-    // MonitorGroupsIterator.
-    if (!(await context.hasTimespan())) {
-      // Figure out whether 'up' or 'down' is more common. It's faster to count the lower cardinality
-      // one then use subtraction to figure out its opposite.
-      const [leastCommonStatus, mostCommonStatus]: Array<'up' | 'down'> =
-        counts.up > counts.down ? ['down', 'up'] : ['up', 'down'];
-      counts[leastCommonStatus] = await slowStatusCount(context, leastCommonStatus);
-      counts[mostCommonStatus] = counts.total - counts[leastCommonStatus];
-    }
-
-    return {
-      total: statusFilter ? counts[statusFilter] : counts.total,
-      up: statusFilter === 'down' ? 0 : counts.up,
-      down: statusFilter === 'up' ? 0 : counts.down,
-    };
-  },
-
-  statesIndexExists: async ({ callES }) => {
-    // TODO: adapt this to the states index in future release
-    const {
-      _shards: { total },
-      count,
-    } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
-    return {
-      indexExists: total > 0,
-      docCount: {
-        count,
-      },
-    };
-  },
-};
-
-// To simplify the handling of the group of pagination vars they're passed back to the client as a string
-const jsonifyPagination = (p: any): string | null => {
-  if (!p) {
-    return null;
-  }
-
-  return JSON.stringify(p);
-};
-
-const fastStatusCount = async (context: QueryContext): Promise<Snapshot> => {
-  const params = {
-    index: INDEX_NAMES.HEARTBEAT,
-    body: {
-      size: 0,
-      query: { bool: { filter: await context.dateAndCustomFilters() } },
-      aggs: {
-        unique: {
-          // We set the precision threshold to 40k which is the max precision supported by cardinality
-          cardinality: { field: 'monitor.id', precision_threshold: 40000 },
-        },
-        down: {
-          filter: { range: { 'summary.down': { gt: 0 } } },
-          aggs: {
-            unique: { cardinality: { field: 'monitor.id', precision_threshold: 40000 } },
-          },
-        },
-      },
-    },
-  };
-
-  const statistics = await context.search(params);
-  const total = statistics.aggregations.unique.value;
-  const down = statistics.aggregations.down.unique.value;
-
-  return {
-    total,
-    down,
-    up: total - down,
-  };
-};
-
-const slowStatusCount = async (context: QueryContext, status: string): Promise<number> => {
-  const downContext = context.clone();
-  downContext.statusFilter = status;
-  const iterator = new MonitorGroupIterator(downContext);
-  let count = 0;
-  while (await iterator.next()) {
-    count++;
-  }
-  return count;
-};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts
deleted file mode 100644
index a3fc71ad48cb3..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './adapter_types';
-export { elasticsearchMonitorStatesAdapter } from './elasticsearch_monitor_states_adapter';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
deleted file mode 100644
index 8523d9c75f51f..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/adapter_types.ts
+++ /dev/null
@@ -1,70 +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 { MonitorChart } from '../../../../common/graphql/types';
-import { UMElasticsearchQueryFn } from '../framework';
-import {
-  MonitorDetails,
-  MonitorLocations,
-  OverviewFilters,
-} from '../../../../common/runtime_types';
-
-export interface GetMonitorChartsDataParams {
-  /** @member monitorId ID value for the selected monitor */
-  monitorId: string;
-  /** @member dateRangeStart timestamp bounds */
-  dateRangeStart: string;
-  /** @member dateRangeEnd timestamp bounds */
-  dateRangeEnd: string;
-  /** @member location optional location value for use in filtering*/
-  location?: string | null;
-}
-
-export interface GetFilterBarParams {
-  /** @param dateRangeStart timestamp bounds */
-  dateRangeStart: string;
-  /** @member dateRangeEnd timestamp bounds */
-  dateRangeEnd: string;
-  /** @member search this value should correspond to Elasticsearch DSL
-   *  generated from KQL text the user provided.
-   */
-  search?: Record<string, any>;
-  filterOptions: Record<string, string[] | number[]>;
-}
-
-export interface GetMonitorDetailsParams {
-  monitorId: string;
-  dateStart: string;
-  dateEnd: string;
-}
-
-/**
- * Fetch data for the monitor page title.
- */
-export interface GetMonitorLocationsParams {
-  /**
-   * @member monitorId the ID to query
-   */
-  monitorId: string;
-  dateStart: string;
-  dateEnd: string;
-}
-
-export interface UMMonitorsAdapter {
-  /**
-   * Fetches data used to populate monitor charts
-   */
-  getMonitorChartsData: UMElasticsearchQueryFn<GetMonitorChartsDataParams, MonitorChart>;
-
-  /**
-   * Fetch options for the filter bar.
-   */
-  getFilterBar: UMElasticsearchQueryFn<GetFilterBarParams, OverviewFilters>;
-
-  getMonitorDetails: UMElasticsearchQueryFn<GetMonitorDetailsParams, MonitorDetails>;
-
-  getMonitorLocations: UMElasticsearchQueryFn<GetMonitorLocationsParams, MonitorLocations>;
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
deleted file mode 100644
index e433931f03c8e..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
+++ /dev/null
@@ -1,385 +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 { get } from 'lodash';
-import { INDEX_NAMES, UNNAMED_LOCATION } from '../../../../common/constants';
-import { MonitorChart, LocationDurationLine } from '../../../../common/graphql/types';
-import { getHistogramIntervalFormatted } from '../../helper';
-import { MonitorError, MonitorLocation } from '../../../../common/runtime_types';
-import { UMMonitorsAdapter } from './adapter_types';
-import { generateFilterAggs } from './generate_filter_aggs';
-import { OverviewFilters } from '../../../../common/runtime_types';
-
-export const combineRangeWithFilters = (
-  dateRangeStart: string,
-  dateRangeEnd: string,
-  filters?: Record<string, any>
-) => {
-  const range = {
-    range: {
-      '@timestamp': {
-        gte: dateRangeStart,
-        lte: dateRangeEnd,
-      },
-    },
-  };
-  if (!filters) return range;
-  const clientFiltersList = Array.isArray(filters?.bool?.filter ?? {})
-    ? // i.e. {"bool":{"filter":{ ...some nested filter objects }}}
-      filters.bool.filter
-    : // i.e. {"bool":{"filter":[ ...some listed filter objects ]}}
-      Object.keys(filters?.bool?.filter ?? {}).map(key => ({
-        ...filters?.bool?.filter?.[key],
-      }));
-  filters.bool.filter = [...clientFiltersList, range];
-  return filters;
-};
-
-type SupportedFields = 'locations' | 'ports' | 'schemes' | 'tags';
-
-export const extractFilterAggsResults = (
-  responseAggregations: Record<string, any>,
-  keys: SupportedFields[]
-): OverviewFilters => {
-  const values: OverviewFilters = {
-    locations: [],
-    ports: [],
-    schemes: [],
-    tags: [],
-  };
-  keys.forEach(key => {
-    const buckets = responseAggregations[key]?.term?.buckets ?? [];
-    values[key] = buckets.map((item: { key: string | number }) => item.key);
-  });
-  return values;
-};
-
-const formatStatusBuckets = (time: any, buckets: any, docCount: any) => {
-  let up = null;
-  let down = null;
-
-  buckets.forEach((bucket: any) => {
-    if (bucket.key === 'up') {
-      up = bucket.doc_count;
-    } else if (bucket.key === 'down') {
-      down = bucket.doc_count;
-    }
-  });
-
-  return {
-    x: time,
-    up,
-    down,
-    total: docCount,
-  };
-};
-
-export const elasticsearchMonitorsAdapter: UMMonitorsAdapter = {
-  getMonitorChartsData: async ({ callES, dateRangeStart, dateRangeEnd, monitorId, location }) => {
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        query: {
-          bool: {
-            filter: [
-              { range: { '@timestamp': { gte: dateRangeStart, lte: dateRangeEnd } } },
-              { term: { 'monitor.id': monitorId } },
-              { term: { 'monitor.status': 'up' } },
-              // if location is truthy, add it as a filter. otherwise add nothing
-              ...(!!location ? [{ term: { 'observer.geo.name': location } }] : []),
-            ],
-          },
-        },
-        size: 0,
-        aggs: {
-          timeseries: {
-            date_histogram: {
-              field: '@timestamp',
-              fixed_interval: getHistogramIntervalFormatted(dateRangeStart, dateRangeEnd),
-              min_doc_count: 0,
-            },
-            aggs: {
-              location: {
-                terms: {
-                  field: 'observer.geo.name',
-                  missing: 'N/A',
-                },
-                aggs: {
-                  status: { terms: { field: 'monitor.status', size: 2, shard_size: 2 } },
-                  duration: { stats: { field: 'monitor.duration.us' } },
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-
-    const result = await callES('search', params);
-
-    const dateHistogramBuckets = get<any[]>(result, 'aggregations.timeseries.buckets', []);
-    /**
-     * The code below is responsible for formatting the aggregation data we fetched above in a way
-     * that the chart components used by the client understands.
-     * There are five required values. Two are lists of points that conform to a simple (x,y) structure.
-     *
-     * The third list is for an area chart expressing a range, and it requires an (x,y,y0) structure,
-     * where y0 is the min value for the point and y is the max.
-     *
-     * Additionally, we supply the maximum value for duration and status, so the corresponding charts know
-     * what the domain size should be.
-     */
-    const monitorChartsData: MonitorChart = {
-      locationDurationLines: [],
-      status: [],
-      durationMaxValue: 0,
-      statusMaxCount: 0,
-    };
-
-    /**
-     * The following section of code enables us to provide buckets per location
-     * that have a `null` value if there is no data at the given timestamp.
-     *
-     * We maintain two `Set`s. One is per bucket, the other is persisted for the
-     * entire collection. At the end of a bucket's evaluation, if there was no object
-     * parsed for a given location line that was already started, we insert an element
-     * to the given line with a null value. Without this, our charts on the client will
-     * display a continuous line for each of the points they are provided.
-     */
-
-    // a set of all the locations found for this result
-    const resultLocations = new Set<string>();
-    const linesByLocation: { [key: string]: LocationDurationLine } = {};
-    dateHistogramBuckets.forEach(dateHistogramBucket => {
-      const x = get(dateHistogramBucket, 'key');
-      const docCount = get(dateHistogramBucket, 'doc_count', 0);
-      // a set of all the locations for the current bucket
-      const bucketLocations = new Set<string>();
-
-      dateHistogramBucket.location.buckets.forEach(
-        (locationBucket: { key: string; duration: { avg: number } }) => {
-          const locationName = locationBucket.key;
-          // store the location name in each set
-          bucketLocations.add(locationName);
-          resultLocations.add(locationName);
-
-          // create a new line for this location if it doesn't exist
-          let currentLine: LocationDurationLine = get(linesByLocation, locationName);
-          if (!currentLine) {
-            currentLine = { name: locationName, line: [] };
-            linesByLocation[locationName] = currentLine;
-            monitorChartsData.locationDurationLines.push(currentLine);
-          }
-          // add the entry for the current location's duration average
-          currentLine.line.push({ x, y: get(locationBucket, 'duration.avg', null) });
-        }
-      );
-
-      // if there are more lines in the result than are represented in the current bucket,
-      // we must add null entries
-      if (dateHistogramBucket.location.buckets.length < resultLocations.size) {
-        resultLocations.forEach(resultLocation => {
-          // the current bucket has a value for this location, do nothing
-          if (location && location !== resultLocation) return;
-          // the current bucket had no value for this location, insert a null value
-          if (!bucketLocations.has(resultLocation)) {
-            const locationLine = monitorChartsData.locationDurationLines.find(
-              ({ name }) => name === resultLocation
-            );
-            // in practice, there should always be a line present, but `find` can return `undefined`
-            if (locationLine) {
-              // this will create a gap in the line like we desire
-              locationLine.line.push({ x, y: null });
-            }
-          }
-        });
-      }
-
-      monitorChartsData.status.push(
-        formatStatusBuckets(x, get(dateHistogramBucket, 'status.buckets', []), docCount)
-      );
-    });
-
-    return monitorChartsData;
-  },
-
-  getFilterBar: async ({ callES, dateRangeStart, dateRangeEnd, search, filterOptions }) => {
-    const aggs = generateFilterAggs(
-      [
-        { aggName: 'locations', filterName: 'locations', field: 'observer.geo.name' },
-        { aggName: 'ports', filterName: 'ports', field: 'url.port' },
-        { aggName: 'schemes', filterName: 'schemes', field: 'monitor.type' },
-        { aggName: 'tags', filterName: 'tags', field: 'tags' },
-      ],
-      filterOptions
-    );
-    const filters = combineRangeWithFilters(dateRangeStart, dateRangeEnd, search);
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        size: 0,
-        query: {
-          ...filters,
-        },
-        aggs,
-      },
-    };
-
-    const { aggregations } = await callES('search', params);
-    return extractFilterAggsResults(aggregations, ['tags', 'locations', 'ports', 'schemes']);
-  },
-
-  getMonitorDetails: async ({ callES, monitorId, dateStart, dateEnd }) => {
-    const queryFilters: any = [
-      {
-        range: {
-          '@timestamp': {
-            gte: dateStart,
-            lte: dateEnd,
-          },
-        },
-      },
-      {
-        term: {
-          'monitor.id': monitorId,
-        },
-      },
-    ];
-
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        size: 1,
-        _source: ['error', '@timestamp'],
-        query: {
-          bool: {
-            must: [
-              {
-                exists: {
-                  field: 'error',
-                },
-              },
-            ],
-            filter: queryFilters,
-          },
-        },
-        sort: [
-          {
-            '@timestamp': {
-              order: 'desc',
-            },
-          },
-        ],
-      },
-    };
-
-    const result = await callES('search', params);
-
-    const data = result.hits.hits[0]?._source;
-
-    const monitorError: MonitorError | undefined = data?.error;
-    const errorTimeStamp: string | undefined = data?.['@timestamp'];
-
-    return {
-      monitorId,
-      error: monitorError,
-      timestamp: errorTimeStamp,
-    };
-  },
-
-  getMonitorLocations: async ({ callES, monitorId, dateStart, dateEnd }) => {
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        size: 0,
-        query: {
-          bool: {
-            filter: [
-              {
-                match: {
-                  'monitor.id': monitorId,
-                },
-              },
-              {
-                exists: {
-                  field: 'summary',
-                },
-              },
-              {
-                range: {
-                  '@timestamp': {
-                    gte: dateStart,
-                    lte: dateEnd,
-                  },
-                },
-              },
-            ],
-          },
-        },
-        aggs: {
-          location: {
-            terms: {
-              field: 'observer.geo.name',
-              missing: '__location_missing__',
-            },
-            aggs: {
-              most_recent: {
-                top_hits: {
-                  size: 1,
-                  sort: {
-                    '@timestamp': {
-                      order: 'desc',
-                    },
-                  },
-                  _source: ['monitor', 'summary', 'observer', '@timestamp'],
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-
-    const result = await callES('search', params);
-    const locations = result?.aggregations?.location?.buckets ?? [];
-
-    const getGeo = (locGeo: { name: string; location?: string }) => {
-      if (locGeo) {
-        const { name, location } = locGeo;
-        const latLon = location?.trim().split(',');
-        return {
-          name,
-          location: latLon
-            ? {
-                lat: latLon[0],
-                lon: latLon[1],
-              }
-            : undefined,
-        };
-      } else {
-        return {
-          name: UNNAMED_LOCATION,
-        };
-      }
-    };
-
-    const monLocs: MonitorLocation[] = [];
-    locations.forEach((loc: any) => {
-      const mostRecentLocation = loc.most_recent.hits.hits[0]._source;
-      const location: MonitorLocation = {
-        summary: mostRecentLocation?.summary,
-        geo: getGeo(mostRecentLocation?.observer?.geo),
-        timestamp: mostRecentLocation['@timestamp'],
-      };
-      monLocs.push(location);
-    });
-
-    return {
-      monitorId,
-      locations: monLocs,
-    };
-  },
-};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts
deleted file mode 100644
index d02068a11e8d8..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './adapter_types';
-export { elasticsearchMonitorsAdapter } from './elasticsearch_monitors_adapter';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
deleted file mode 100644
index 866ab110928b4..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts
+++ /dev/null
@@ -1,495 +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 { set } from 'lodash';
-import { elasticsearchPingsAdapter as adapter } from '../es_pings';
-
-describe('ElasticsearchPingsAdapter class', () => {
-  let mockHits: any[];
-  let mockEsSearchResult: any;
-  let mockEsCountResult: any;
-  const standardMockResponse: any = {
-    aggregations: {
-      timeseries: {
-        buckets: [
-          {
-            key: 1,
-            up: {
-              doc_count: 2,
-            },
-            down: {
-              doc_count: 1,
-            },
-          },
-          {
-            key: 2,
-            up: {
-              doc_count: 2,
-            },
-            down: {
-              bucket_count: 1,
-            },
-          },
-        ],
-        interval: '1s',
-      },
-    },
-  };
-
-  beforeEach(() => {
-    mockHits = [
-      {
-        _source: {
-          '@timestamp': '2018-10-30T18:51:59.792Z',
-        },
-      },
-      {
-        _source: {
-          '@timestamp': '2018-10-30T18:53:59.792Z',
-        },
-      },
-      {
-        _source: {
-          '@timestamp': '2018-10-30T18:55:59.792Z',
-        },
-      },
-    ];
-    mockEsSearchResult = {
-      hits: {
-        total: {
-          value: mockHits.length,
-        },
-        hits: mockHits,
-      },
-      aggregations: {
-        locations: {
-          buckets: [{ key: 'foo' }],
-        },
-      },
-    };
-    mockEsCountResult = {
-      count: mockHits.length,
-    };
-  });
-
-  describe('getPingHistogram', () => {
-    it('returns a single bucket if array has 1', async () => {
-      expect.assertions(2);
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue({
-        aggregations: {
-          timeseries: {
-            buckets: [
-              {
-                key: 1,
-                up: {
-                  doc_count: 2,
-                },
-                down: {
-                  doc_count: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-      const result = await adapter.getPingHistogram({
-        callES: mockEsClient,
-        dateStart: 'now-15m',
-        dateEnd: 'now',
-        filters: '',
-      });
-      result.interval = '10s';
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(result).toMatchSnapshot();
-    });
-
-    it('returns expected result for no status filter', async () => {
-      expect.assertions(2);
-      const mockEsClient = jest.fn();
-
-      mockEsClient.mockReturnValue(standardMockResponse);
-
-      const result = await adapter.getPingHistogram({
-        callES: mockEsClient,
-        dateStart: 'now-15m',
-        dateEnd: 'now',
-        filters: '',
-      });
-      result.interval = '1m';
-
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(result).toMatchSnapshot();
-    });
-
-    it('handles status + additional user queries', async () => {
-      expect.assertions(2);
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue({
-        aggregations: {
-          timeseries: {
-            buckets: [
-              {
-                key: 1,
-                up: {
-                  doc_count: 2,
-                },
-                down: {
-                  doc_count: 1,
-                },
-              },
-              {
-                key: 2,
-                up: {
-                  doc_count: 2,
-                },
-                down: {
-                  doc_count: 2,
-                },
-              },
-              {
-                key: 3,
-                up: {
-                  doc_count: 3,
-                },
-                down: {
-                  doc_count: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-      const searchFilter = {
-        bool: {
-          must: [
-            { match: { 'monitor.id': { query: 'auto-http-0X89BB0F9A6C81D178', operator: 'and' } } },
-            { match: { 'monitor.name': { query: 'my-new-test-site-name', operator: 'and' } } },
-          ],
-        },
-      };
-      const result = await adapter.getPingHistogram({
-        callES: mockEsClient,
-        dateStart: '1234',
-        dateEnd: '5678',
-        filters: JSON.stringify(searchFilter),
-        monitorId: undefined,
-        statusFilter: 'down',
-      });
-      result.interval = '1h';
-
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(result).toMatchSnapshot();
-    });
-
-    it('handles simple_text_query without issues', async () => {
-      expect.assertions(2);
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue({
-        aggregations: {
-          timeseries: {
-            buckets: [
-              {
-                key: 1,
-                up: {
-                  doc_count: 2,
-                },
-                down: {
-                  doc_count: 1,
-                },
-              },
-              {
-                key: 2,
-                up: {
-                  doc_count: 1,
-                },
-                down: {
-                  doc_count: 2,
-                },
-              },
-              {
-                key: 3,
-                up: {
-                  doc_count: 3,
-                },
-                down: {
-                  doc_count: 1,
-                },
-              },
-            ],
-          },
-        },
-      });
-      const filters = `{"bool":{"must":[{"simple_query_string":{"query":"http"}}]}}`;
-      const result = await adapter.getPingHistogram({
-        callES: mockEsClient,
-        dateStart: 'now-15m',
-        dateEnd: 'now',
-        filters,
-      });
-
-      result.interval = '1m';
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(result).toMatchSnapshot();
-    });
-
-    it('returns a down-filtered array for when filtered by down status', async () => {
-      expect.assertions(2);
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(standardMockResponse);
-      const result = await adapter.getPingHistogram({
-        callES: mockEsClient,
-        dateStart: '1234',
-        dateEnd: '5678',
-        filters: '',
-        monitorId: undefined,
-        statusFilter: 'down',
-      });
-
-      result.interval = '1d';
-
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(result).toMatchSnapshot();
-    });
-
-    it('returns a down-filtered array for when filtered by up status', async () => {
-      expect.assertions(2);
-      const mockEsClient = jest.fn();
-
-      mockEsClient.mockReturnValue(standardMockResponse);
-
-      const result = await adapter.getPingHistogram({
-        callES: mockEsClient,
-        dateStart: '1234',
-        dateEnd: '5678',
-        filters: '',
-        monitorId: undefined,
-        statusFilter: 'up',
-      });
-
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(result).toMatchSnapshot();
-    });
-  });
-
-  describe('getDocCount', () => {
-    it('returns data in appropriate shape', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsCountResult);
-      const { count } = await adapter.getDocCount({ callES: mockEsClient });
-      expect(count).toEqual(3);
-    });
-  });
-
-  describe('getAll', () => {
-    let expectedGetAllParams: any;
-    beforeEach(() => {
-      expectedGetAllParams = {
-        index: 'heartbeat-8*',
-        body: {
-          query: {
-            bool: {
-              filter: [{ range: { '@timestamp': { gte: 'now-1h', lte: 'now' } } }],
-            },
-          },
-          aggregations: {
-            locations: {
-              terms: {
-                field: 'observer.geo.name',
-                missing: 'N/A',
-                size: 1000,
-              },
-            },
-          },
-          sort: [{ '@timestamp': { order: 'desc' } }],
-          size: 12,
-        },
-      };
-    });
-
-    it('returns data in the appropriate shape', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsSearchResult);
-      const result = await adapter.getAll({
-        callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        sort: 'asc',
-        size: 12,
-      });
-      const count = 3;
-
-      expect(result.total).toBe(count);
-
-      const pings = result.pings!;
-      expect(pings).toHaveLength(count);
-      expect(pings[0].timestamp).toBe('2018-10-30T18:51:59.792Z');
-      expect(pings[1].timestamp).toBe('2018-10-30T18:53:59.792Z');
-      expect(pings[2].timestamp).toBe('2018-10-30T18:55:59.792Z');
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-    });
-
-    it('creates appropriate sort and size parameters', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsSearchResult);
-      await adapter.getAll({
-        callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        sort: 'asc',
-        size: 12,
-      });
-      set(expectedGetAllParams, 'body.sort[0]', { '@timestamp': { order: 'asc' } });
-
-      expect(mockEsClient).toHaveBeenCalledTimes(1);
-      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
-    });
-
-    it('omits the sort param when no sort passed', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsSearchResult);
-      await adapter.getAll({
-        callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        size: 12,
-      });
-
-      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
-    });
-
-    it('omits the size param when no size passed', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsSearchResult);
-      await adapter.getAll({
-        callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        sort: 'desc',
-      });
-      delete expectedGetAllParams.body.size;
-      set(expectedGetAllParams, 'body.sort[0].@timestamp.order', 'desc');
-
-      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
-    });
-
-    it('adds a filter for monitor ID', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsSearchResult);
-      await adapter.getAll({
-        callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        monitorId: 'testmonitorid',
-      });
-      delete expectedGetAllParams.body.size;
-      expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.id': 'testmonitorid' } });
-
-      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
-    });
-
-    it('adds a filter for monitor status', async () => {
-      const mockEsClient = jest.fn();
-      mockEsClient.mockReturnValue(mockEsSearchResult);
-      await adapter.getAll({
-        callES: mockEsClient,
-        dateRangeStart: 'now-1h',
-        dateRangeEnd: 'now',
-        status: 'down',
-      });
-      delete expectedGetAllParams.body.size;
-      expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.status': 'down' } });
-
-      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
-    });
-  });
-
-  describe('getLatestMonitorStatus', () => {
-    let expectedGetLatestSearchParams: any;
-    beforeEach(() => {
-      expectedGetLatestSearchParams = {
-        index: 'heartbeat-8*',
-        body: {
-          query: {
-            bool: {
-              filter: [
-                {
-                  range: {
-                    '@timestamp': {
-                      gte: 'now-1h',
-                      lte: 'now',
-                    },
-                  },
-                },
-                {
-                  term: { 'monitor.id': 'testMonitor' },
-                },
-              ],
-            },
-          },
-          aggs: {
-            by_id: {
-              terms: {
-                field: 'monitor.id',
-                size: 1000,
-              },
-              aggs: {
-                latest: {
-                  top_hits: {
-                    size: 1,
-                    sort: {
-                      '@timestamp': { order: 'desc' },
-                    },
-                  },
-                },
-              },
-            },
-          },
-          size: 0,
-        },
-      };
-      mockEsSearchResult = {
-        aggregations: {
-          by_id: {
-            buckets: [
-              {
-                latest: {
-                  hits: {
-                    hits: [
-                      {
-                        _source: {
-                          '@timestamp': 123456,
-                          monitor: {
-                            id: 'testMonitor',
-                          },
-                        },
-                      },
-                    ],
-                  },
-                },
-              },
-            ],
-          },
-        },
-      };
-    });
-
-    it('returns data in expected shape', async () => {
-      const mockEsClient = jest.fn(async (_request: any, _params: any) => mockEsSearchResult);
-      const result = await adapter.getLatestMonitorStatus({
-        callES: mockEsClient,
-        dateStart: 'now-1h',
-        dateEnd: 'now',
-        monitorId: 'testMonitor',
-      });
-      expect(result.timestamp).toBe(123456);
-      expect(result.monitor).not.toBeFalsy();
-      // @ts-ignore monitor will be defined
-      expect(result.monitor.id).toBe('testMonitor');
-      expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetLatestSearchParams);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/es_pings.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/es_pings.ts
deleted file mode 100644
index 93e3a1bd9397b..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/es_pings.ts
+++ /dev/null
@@ -1,183 +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 { get } from 'lodash';
-import { INDEX_NAMES } from '../../../../common/constants';
-import { HttpBody, Ping, PingResults } from '../../../../common/graphql/types';
-import { UMPingsAdapter } from './types';
-import { esGetPingHistogram } from './es_get_ping_historgram';
-
-export const elasticsearchPingsAdapter: UMPingsAdapter = {
-  getAll: async ({
-    callES,
-    dateRangeStart,
-    dateRangeEnd,
-    monitorId,
-    status,
-    sort,
-    size,
-    location,
-  }) => {
-    const sortParam = { sort: [{ '@timestamp': { order: sort ?? 'desc' } }] };
-    const sizeParam = size ? { size } : undefined;
-    const filter: any[] = [{ range: { '@timestamp': { gte: dateRangeStart, lte: dateRangeEnd } } }];
-    if (monitorId) {
-      filter.push({ term: { 'monitor.id': monitorId } });
-    }
-    if (status) {
-      filter.push({ term: { 'monitor.status': status } });
-    }
-
-    let postFilterClause = {};
-    if (location) {
-      postFilterClause = { post_filter: { term: { 'observer.geo.name': location } } };
-    }
-    const queryContext = { bool: { filter } };
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        query: {
-          ...queryContext,
-        },
-        ...sortParam,
-        ...sizeParam,
-        aggregations: {
-          locations: {
-            terms: {
-              field: 'observer.geo.name',
-              missing: 'N/A',
-              size: 1000,
-            },
-          },
-        },
-        ...postFilterClause,
-      },
-    };
-
-    const {
-      hits: { hits, total },
-      aggregations: aggs,
-    } = await callES('search', params);
-
-    const locations = get(aggs, 'locations', { buckets: [{ key: 'N/A', doc_count: 0 }] });
-
-    const pings: Ping[] = hits.map(({ _id, _source }: any) => {
-      const timestamp = _source['@timestamp'];
-
-      // Calculate here the length of the content string in bytes, this is easier than in client JS, where
-      // we don't have access to Buffer.byteLength. There are some hacky ways to do this in the
-      // client but this is cleaner.
-      const httpBody = get<HttpBody>(_source, 'http.response.body');
-      if (httpBody && httpBody.content) {
-        httpBody.content_bytes = Buffer.byteLength(httpBody.content);
-      }
-
-      return { id: _id, timestamp, ..._source };
-    });
-
-    const results: PingResults = {
-      total: total.value,
-      locations: locations.buckets.map((bucket: { key: string }) => bucket.key),
-      pings,
-    };
-
-    return results;
-  },
-
-  // Get The monitor latest state sorted by timestamp with date range
-  getLatestMonitorStatus: async ({ callES, dateStart, dateEnd, monitorId }) => {
-    // TODO: Write tests for this function
-
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        query: {
-          bool: {
-            filter: [
-              {
-                range: {
-                  '@timestamp': {
-                    gte: dateStart,
-                    lte: dateEnd,
-                  },
-                },
-              },
-              ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
-            ],
-          },
-        },
-        size: 0,
-        aggs: {
-          by_id: {
-            terms: {
-              field: 'monitor.id',
-              size: 1000,
-            },
-            aggs: {
-              latest: {
-                top_hits: {
-                  size: 1,
-                  sort: {
-                    '@timestamp': { order: 'desc' },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-
-    const result = await callES('search', params);
-    const ping: any = result.aggregations.by_id.buckets?.[0]?.latest.hits?.hits?.[0] ?? {};
-
-    return {
-      ...ping?._source,
-      timestamp: ping?._source?.['@timestamp'],
-    };
-  },
-
-  // Get the monitor meta info regardless of timestamp
-  getMonitor: async ({ callES, monitorId }) => {
-    const params = {
-      index: INDEX_NAMES.HEARTBEAT,
-      body: {
-        size: 1,
-        _source: ['url', 'monitor', 'observer'],
-        query: {
-          bool: {
-            filter: [
-              {
-                term: {
-                  'monitor.id': monitorId,
-                },
-              },
-            ],
-          },
-        },
-        sort: [
-          {
-            '@timestamp': {
-              order: 'desc',
-            },
-          },
-        ],
-      },
-    };
-
-    const result = await callES('search', params);
-
-    return result.hits.hits[0]?._source;
-  },
-
-  getPingHistogram: esGetPingHistogram,
-
-  getDocCount: async ({ callES }) => {
-    const { count } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
-
-    return { count };
-  },
-};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts
deleted file mode 100644
index 37324a8f521f6..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export * from './types';
-export { elasticsearchPingsAdapter } from './es_pings';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/index.ts
deleted file mode 100644
index 4ef6e3fa8a6bd..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export { StubIndexPatternAdapter, stubIndexPatternAdapter } from './stub_index_pattern';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/stub_index_pattern.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/stub_index_pattern.ts
deleted file mode 100644
index 49ec86af25040..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/stub_index_pattern.ts
+++ /dev/null
@@ -1,54 +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 { APICaller } from 'kibana/server';
-import {
-  IndexPatternsFetcher,
-  IIndexPattern,
-} from '../../../../../../../../src/plugins/data/server';
-import { INDEX_NAMES } from '../../../../common/constants';
-import { UMElasticsearchQueryFn } from '../framework';
-
-export interface StubIndexPatternAdapter {
-  getUptimeIndexPattern: UMElasticsearchQueryFn<any>;
-}
-
-export const stubIndexPatternAdapter: StubIndexPatternAdapter = {
-  getUptimeIndexPattern: async callES => {
-    const indexPatternsFetcher = new IndexPatternsFetcher((...rest: Parameters<APICaller>) =>
-      callES(...rest)
-    );
-
-    // Since `getDynamicIndexPattern` is called in setup_request (and thus by every endpoint)
-    // and since `getFieldsForWildcard` will throw if the specified indices don't exist,
-    // we have to catch errors here to avoid all endpoints returning 500 for users without APM data
-    // (would be a bad first time experience)
-    try {
-      const fields = await indexPatternsFetcher.getFieldsForWildcard({
-        pattern: INDEX_NAMES.HEARTBEAT,
-      });
-
-      const indexPattern: IIndexPattern = {
-        fields,
-        title: INDEX_NAMES.HEARTBEAT,
-      };
-
-      return indexPattern;
-    } catch (e) {
-      const notExists = e.output?.statusCode === 404;
-      if (notExists) {
-        // eslint-disable-next-line no-console
-        console.error(
-          `Could not get dynamic index pattern because indices "${INDEX_NAMES.HEARTBEAT}" don't exist`
-        );
-        return;
-      }
-
-      // re-throw
-      throw e;
-    }
-  },
-};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts b/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
index b44a890de3819..875a5d9dc8c5c 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
@@ -5,23 +5,19 @@
  */
 
 import { UMKibanaBackendFrameworkAdapter } from '../adapters/framework';
-import { elasticsearchMonitorsAdapter } from '../adapters/monitors';
-import { elasticsearchPingsAdapter } from '../adapters/pings';
+import * as requests from '../requests';
 import { licenseCheck } from '../domains';
 import { UMDomainLibs, UMServerLibs } from '../lib';
-import { elasticsearchMonitorStatesAdapter } from '../adapters/monitor_states';
-import { stubIndexPatternAdapter } from '../adapters/stub_index_pattern';
 import { UptimeCorePlugins, UptimeCoreSetup } from '../adapters/framework';
 
 export function compose(server: UptimeCoreSetup, plugins: UptimeCorePlugins): UMServerLibs {
   const framework = new UMKibanaBackendFrameworkAdapter(server);
 
   const domainLibs: UMDomainLibs = {
+    requests: {
+      ...requests,
+    },
     license: licenseCheck,
-    monitors: elasticsearchMonitorsAdapter,
-    monitorStates: elasticsearchMonitorStatesAdapter,
-    pings: elasticsearchPingsAdapter,
-    stubIndexPattern: stubIndexPatternAdapter,
   };
 
   return {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts b/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts
index eae8023b66ff4..0dcbc0a424b5e 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/helper/index.ts
@@ -5,6 +5,7 @@
  */
 
 export { getFilterClause } from './get_filter_clause';
+export { parseRelativeDate } from './get_histogram_interval';
 export { getHistogramIntervalFormatted } from './get_histogram_interval_formatted';
 export { parseFilterQuery } from './parse_filter_query';
 export { assertCloseTo } from './assert_close_to';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/lib.ts b/x-pack/legacy/plugins/uptime/server/lib/lib.ts
index e5ab9940d482d..a7121eaec6679 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/lib.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/lib.ts
@@ -4,21 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  UMBackendFrameworkAdapter,
-  UMMonitorsAdapter,
-  UMMonitorStatesAdapter,
-  UMPingsAdapter,
-  StubIndexPatternAdapter,
-} from './adapters';
+import { UMBackendFrameworkAdapter } from './adapters';
 import { UMLicenseCheck } from './domains';
+import { UptimeRequests } from './requests';
 
 export interface UMDomainLibs {
+  requests: UptimeRequests;
   license: UMLicenseCheck;
-  monitors: UMMonitorsAdapter;
-  monitorStates: UMMonitorStatesAdapter;
-  pings: UMPingsAdapter;
-  stubIndexPattern: StubIndexPatternAdapter;
 }
 
 export interface UMServerLibs extends UMDomainLibs {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/extract_filter_aggs_results.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/extract_filter_aggs_results.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/extract_filter_aggs_results.test.ts.snap
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/extract_filter_aggs_results.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/generate_filter_aggs.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/generate_filter_aggs.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/generate_filter_aggs.test.ts.snap
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/generate_filter_aggs.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/__snapshots__/elasticsearch_monitors_adapter.test.ts.snap
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_ping_histogram.test.ts.snap
similarity index 70%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_ping_histogram.test.ts.snap
index 1b31f44557df0..0dafa5144c25a 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/__tests__/__snapshots__/elasticsearch_pings_adapter.test.ts.snap
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_ping_histogram.test.ts.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ElasticsearchPingsAdapter class getPingHistogram handles simple_text_query without issues 1`] = `
+exports[`getPingHistogram handles simple_text_query without issues 1`] = `
 Object {
   "histogram": Array [
     Object {
@@ -26,7 +26,7 @@ Object {
 }
 `;
 
-exports[`ElasticsearchPingsAdapter class getPingHistogram handles status + additional user queries 1`] = `
+exports[`getPingHistogram handles status + additional user queries 1`] = `
 Object {
   "histogram": Array [
     Object {
@@ -52,7 +52,7 @@ Object {
 }
 `;
 
-exports[`ElasticsearchPingsAdapter class getPingHistogram returns a down-filtered array for when filtered by down status 1`] = `
+exports[`getPingHistogram returns a down-filtered array for when filtered by down status 1`] = `
 Object {
   "histogram": Array [
     Object {
@@ -72,7 +72,7 @@ Object {
 }
 `;
 
-exports[`ElasticsearchPingsAdapter class getPingHistogram returns a down-filtered array for when filtered by up status 1`] = `
+exports[`getPingHistogram returns a down-filtered array for when filtered by up status 1`] = `
 Object {
   "histogram": Array [
     Object {
@@ -92,7 +92,7 @@ Object {
 }
 `;
 
-exports[`ElasticsearchPingsAdapter class getPingHistogram returns a single bucket if array has 1 1`] = `
+exports[`getPingHistogram returns a single bucket if array has 1 1`] = `
 Object {
   "histogram": Array [
     Object {
@@ -106,7 +106,7 @@ Object {
 }
 `;
 
-exports[`ElasticsearchPingsAdapter class getPingHistogram returns expected result for no status filter 1`] = `
+exports[`getPingHistogram returns expected result for no status filter 1`] = `
 Object {
   "histogram": Array [
     Object {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/combine_range_with_filters.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/combine_range_with_filters.test.ts
similarity index 96%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/combine_range_with_filters.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/combine_range_with_filters.test.ts
index 2075b3a8fbe0f..31d19dab290da 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/combine_range_with_filters.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/combine_range_with_filters.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { combineRangeWithFilters } from '../elasticsearch_monitors_adapter';
+import { combineRangeWithFilters } from '../get_filter_bar';
 
 describe('combineRangeWithFilters', () => {
   it('combines filters that have no filter clause', () => {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/extract_filter_aggs_results.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/extract_filter_aggs_results.test.ts
similarity index 96%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/extract_filter_aggs_results.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/extract_filter_aggs_results.test.ts
index 954cffd4c9522..19fd0fda8d83e 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/extract_filter_aggs_results.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/extract_filter_aggs_results.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { extractFilterAggsResults } from '../elasticsearch_monitors_adapter';
+import { extractFilterAggsResults } from '../get_filter_bar';
 
 describe('extractFilterAggsResults', () => {
   it('extracts the bucket values of the expected filter fields', () => {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/generate_filter_aggs.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/generate_filter_aggs.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/generate_filter_aggs.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/generate_filter_aggs.test.ts
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_doc_count.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_doc_count.test.ts
new file mode 100644
index 0000000000000..7dfb0314fe8dd
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_doc_count.test.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getDocCount } from '../get_doc_count';
+
+describe('getDocCount', () => {
+  let mockHits: any[];
+  let mockEsCountResult: any;
+
+  beforeEach(() => {
+    mockHits = [
+      {
+        _source: {
+          '@timestamp': '2018-10-30T18:51:59.792Z',
+        },
+      },
+      {
+        _source: {
+          '@timestamp': '2018-10-30T18:53:59.792Z',
+        },
+      },
+      {
+        _source: {
+          '@timestamp': '2018-10-30T18:55:59.792Z',
+        },
+      },
+    ];
+    mockEsCountResult = {
+      count: mockHits.length,
+    };
+  });
+
+  it('returns data in appropriate shape', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsCountResult);
+    const { count } = await getDocCount({ callES: mockEsClient });
+    expect(count).toEqual(3);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
new file mode 100644
index 0000000000000..ad0987a7f6faf
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getLatestMonitor } from '../get_latest_monitor';
+
+describe('getLatestMonitor', () => {
+  let expectedGetLatestSearchParams: any;
+  let mockEsSearchResult: any;
+  beforeEach(() => {
+    expectedGetLatestSearchParams = {
+      index: 'heartbeat-8*',
+      body: {
+        query: {
+          bool: {
+            filter: [
+              {
+                range: {
+                  '@timestamp': {
+                    gte: 'now-1h',
+                    lte: 'now',
+                  },
+                },
+              },
+              {
+                term: { 'monitor.id': 'testMonitor' },
+              },
+            ],
+          },
+        },
+        aggs: {
+          by_id: {
+            terms: {
+              field: 'monitor.id',
+              size: 1000,
+            },
+            aggs: {
+              latest: {
+                top_hits: {
+                  size: 1,
+                  sort: {
+                    '@timestamp': { order: 'desc' },
+                  },
+                },
+              },
+            },
+          },
+        },
+        size: 0,
+      },
+    };
+    mockEsSearchResult = {
+      aggregations: {
+        by_id: {
+          buckets: [
+            {
+              latest: {
+                hits: {
+                  hits: [
+                    {
+                      _source: {
+                        '@timestamp': 123456,
+                        monitor: {
+                          id: 'testMonitor',
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          ],
+        },
+      },
+    };
+  });
+
+  it('returns data in expected shape', async () => {
+    const mockEsClient = jest.fn(async (_request: any, _params: any) => mockEsSearchResult);
+    const result = await getLatestMonitor({
+      callES: mockEsClient,
+      dateStart: 'now-1h',
+      dateEnd: 'now',
+      monitorId: 'testMonitor',
+    });
+    expect(result.timestamp).toBe(123456);
+    expect(result.monitor).not.toBeFalsy();
+    expect(result?.monitor?.id).toBe('testMonitor');
+    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetLatestSearchParams);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
similarity index 88%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
index e3e81fe360718..205f9cf745db1 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/elasticsearch_monitors_adapter.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts
@@ -5,17 +5,16 @@
  */
 
 import { get, set } from 'lodash';
-import { elasticsearchMonitorsAdapter as adapter } from '../elasticsearch_monitors_adapter';
 import mockChartsData from './monitor_charts_mock.json';
-import { assertCloseTo } from '../../../helper';
+import { assertCloseTo } from '../../helper';
+import { getMonitorCharts } from '../get_monitor_charts';
 
-// FIXME: there are many untested functions in this adapter. They should be tested.
 describe('ElasticsearchMonitorsAdapter', () => {
   it('getMonitorChartsData will run expected parameters when no location is specified', async () => {
     expect.assertions(3);
     const searchMock = jest.fn();
     const search = searchMock.bind({});
-    await adapter.getMonitorChartsData({
+    await getMonitorCharts({
       callES: search,
       monitorId: 'fooID',
       dateRangeStart: 'now-15m',
@@ -50,7 +49,7 @@ describe('ElasticsearchMonitorsAdapter', () => {
     expect.assertions(3);
     const searchMock = jest.fn();
     const search = searchMock.bind({});
-    await adapter.getMonitorChartsData({
+    await getMonitorCharts({
       callES: search,
       monitorId: 'fooID',
       dateRangeStart: 'now-15m',
@@ -87,7 +86,7 @@ describe('ElasticsearchMonitorsAdapter', () => {
     searchMock.mockReturnValue(mockChartsData);
     const search = searchMock.bind({});
     expect(
-      await adapter.getMonitorChartsData({
+      await getMonitorCharts({
         callES: search,
         monitorId: 'id',
         dateRangeStart: 'now-15m',
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts
new file mode 100644
index 0000000000000..7d98b77069264
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_ping_histogram.test.ts
@@ -0,0 +1,241 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getPingHistogram } from '../get_ping_histogram';
+
+describe('getPingHistogram', () => {
+  const standardMockResponse: any = {
+    aggregations: {
+      timeseries: {
+        buckets: [
+          {
+            key: 1,
+            up: {
+              doc_count: 2,
+            },
+            down: {
+              doc_count: 1,
+            },
+          },
+          {
+            key: 2,
+            up: {
+              doc_count: 2,
+            },
+            down: {
+              bucket_count: 1,
+            },
+          },
+        ],
+      },
+    },
+  };
+
+  it('returns a single bucket if array has 1', async () => {
+    expect.assertions(2);
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue({
+      aggregations: {
+        timeseries: {
+          buckets: [
+            {
+              key: 1,
+              up: {
+                doc_count: 2,
+              },
+              down: {
+                doc_count: 1,
+              },
+            },
+          ],
+          interval: '10s',
+        },
+      },
+    });
+
+    const result = await getPingHistogram({
+      callES: mockEsClient,
+      from: 'now-15m',
+      to: 'now',
+      filters: null,
+    });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('returns expected result for no status filter', async () => {
+    expect.assertions(2);
+    const mockEsClient = jest.fn();
+
+    standardMockResponse.aggregations.timeseries.interval = '1m';
+    mockEsClient.mockReturnValue(standardMockResponse);
+
+    const result = await getPingHistogram({
+      callES: mockEsClient,
+      from: 'now-15m',
+      to: 'now',
+      filters: null,
+    });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('handles status + additional user queries', async () => {
+    expect.assertions(2);
+    const mockEsClient = jest.fn();
+
+    mockEsClient.mockReturnValue({
+      aggregations: {
+        timeseries: {
+          buckets: [
+            {
+              key: 1,
+              up: {
+                doc_count: 2,
+              },
+              down: {
+                doc_count: 1,
+              },
+            },
+            {
+              key: 2,
+              up: {
+                doc_count: 2,
+              },
+              down: {
+                doc_count: 2,
+              },
+            },
+            {
+              key: 3,
+              up: {
+                doc_count: 3,
+              },
+              down: {
+                doc_count: 1,
+              },
+            },
+          ],
+          interval: '1h',
+        },
+      },
+    });
+
+    const searchFilter = {
+      bool: {
+        must: [
+          { match: { 'monitor.id': { query: 'auto-http-0X89BB0F9A6C81D178', operator: 'and' } } },
+          { match: { 'monitor.name': { query: 'my-new-test-site-name', operator: 'and' } } },
+        ],
+      },
+    };
+
+    const result = await getPingHistogram({
+      callES: mockEsClient,
+      from: '1234',
+      to: '5678',
+      filters: JSON.stringify(searchFilter),
+      monitorId: undefined,
+      statusFilter: 'down',
+    });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('handles simple_text_query without issues', async () => {
+    expect.assertions(2);
+    const mockEsClient = jest.fn();
+
+    mockEsClient.mockReturnValue({
+      aggregations: {
+        timeseries: {
+          buckets: [
+            {
+              key: 1,
+              up: {
+                doc_count: 2,
+              },
+              down: {
+                doc_count: 1,
+              },
+            },
+            {
+              key: 2,
+              up: {
+                doc_count: 1,
+              },
+              down: {
+                doc_count: 2,
+              },
+            },
+            {
+              key: 3,
+              up: {
+                doc_count: 3,
+              },
+              down: {
+                doc_count: 1,
+              },
+            },
+          ],
+          interval: '1m',
+        },
+      },
+    });
+
+    const filters = `{"bool":{"must":[{"simple_query_string":{"query":"http"}}]}}`;
+    const result = await getPingHistogram({
+      callES: mockEsClient,
+      from: 'now-15m',
+      to: 'now',
+      filters,
+    });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('returns a down-filtered array for when filtered by down status', async () => {
+    expect.assertions(2);
+    const mockEsClient = jest.fn();
+    standardMockResponse.aggregations.timeseries.interval = '1d';
+    mockEsClient.mockReturnValue(standardMockResponse);
+    const result = await getPingHistogram({
+      callES: mockEsClient,
+      from: '1234',
+      to: '5678',
+      filters: '',
+      monitorId: undefined,
+      statusFilter: 'down',
+    });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(result).toMatchSnapshot();
+  });
+
+  it('returns a down-filtered array for when filtered by up status', async () => {
+    expect.assertions(2);
+    const mockEsClient = jest.fn();
+
+    standardMockResponse.aggregations.timeseries.interval = '1s';
+    mockEsClient.mockReturnValue(standardMockResponse);
+
+    const result = await getPingHistogram({
+      callES: mockEsClient,
+      from: '1234',
+      to: '5678',
+      filters: '',
+      monitorId: undefined,
+      statusFilter: 'up',
+    });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(result).toMatchSnapshot();
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
new file mode 100644
index 0000000000000..ab20a958f3d97
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_pings.test.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 { getPings } from '../get_pings';
+import { set } from 'lodash';
+
+describe('getAll', () => {
+  let mockEsSearchResult: any;
+  let mockHits: any;
+  let expectedGetAllParams: any;
+  beforeEach(() => {
+    mockHits = [
+      {
+        _source: {
+          '@timestamp': '2018-10-30T18:51:59.792Z',
+        },
+      },
+      {
+        _source: {
+          '@timestamp': '2018-10-30T18:53:59.792Z',
+        },
+      },
+      {
+        _source: {
+          '@timestamp': '2018-10-30T18:55:59.792Z',
+        },
+      },
+    ];
+    mockEsSearchResult = {
+      hits: {
+        total: {
+          value: mockHits.length,
+        },
+        hits: mockHits,
+      },
+      aggregations: {
+        locations: {
+          buckets: [{ key: 'foo' }],
+        },
+      },
+    };
+    expectedGetAllParams = {
+      index: 'heartbeat-8*',
+      body: {
+        query: {
+          bool: {
+            filter: [{ range: { '@timestamp': { gte: 'now-1h', lte: 'now' } } }],
+          },
+        },
+        aggregations: {
+          locations: {
+            terms: {
+              field: 'observer.geo.name',
+              missing: 'N/A',
+              size: 1000,
+            },
+          },
+        },
+        sort: [{ '@timestamp': { order: 'desc' } }],
+        size: 12,
+      },
+    };
+  });
+
+  it('returns data in the appropriate shape', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsSearchResult);
+    const result = await getPings({
+      callES: mockEsClient,
+      dateRangeStart: 'now-1h',
+      dateRangeEnd: 'now',
+      sort: 'asc',
+      size: 12,
+    });
+    const count = 3;
+
+    expect(result.total).toBe(count);
+
+    const pings = result.pings!;
+    expect(pings).toHaveLength(count);
+    expect(pings[0].timestamp).toBe('2018-10-30T18:51:59.792Z');
+    expect(pings[1].timestamp).toBe('2018-10-30T18:53:59.792Z');
+    expect(pings[2].timestamp).toBe('2018-10-30T18:55:59.792Z');
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+  });
+
+  it('creates appropriate sort and size parameters', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsSearchResult);
+    await getPings({
+      callES: mockEsClient,
+      dateRangeStart: 'now-1h',
+      dateRangeEnd: 'now',
+      sort: 'asc',
+      size: 12,
+    });
+    set(expectedGetAllParams, 'body.sort[0]', { '@timestamp': { order: 'asc' } });
+
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+  });
+
+  it('omits the sort param when no sort passed', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsSearchResult);
+    await getPings({
+      callES: mockEsClient,
+      dateRangeStart: 'now-1h',
+      dateRangeEnd: 'now',
+      size: 12,
+    });
+
+    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+  });
+
+  it('omits the size param when no size passed', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsSearchResult);
+    await getPings({
+      callES: mockEsClient,
+      dateRangeStart: 'now-1h',
+      dateRangeEnd: 'now',
+      sort: 'desc',
+    });
+    delete expectedGetAllParams.body.size;
+    set(expectedGetAllParams, 'body.sort[0].@timestamp.order', 'desc');
+
+    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+  });
+
+  it('adds a filter for monitor ID', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsSearchResult);
+    await getPings({
+      callES: mockEsClient,
+      dateRangeStart: 'now-1h',
+      dateRangeEnd: 'now',
+      monitorId: 'testmonitorid',
+    });
+    delete expectedGetAllParams.body.size;
+    expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.id': 'testmonitorid' } });
+
+    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+  });
+
+  it('adds a filter for monitor status', async () => {
+    const mockEsClient = jest.fn();
+    mockEsClient.mockReturnValue(mockEsSearchResult);
+    await getPings({
+      callES: mockEsClient,
+      dateRangeStart: 'now-1h',
+      dateRangeEnd: 'now',
+      status: 'down',
+    });
+    delete expectedGetAllParams.body.size;
+    expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.status': 'down' } });
+
+    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/monitor_charts_mock.json b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/monitor_charts_mock.json
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/__tests__/monitor_charts_mock.json
rename to x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/monitor_charts_mock.json
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/generate_filter_aggs.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/generate_filter_aggs.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/generate_filter_aggs.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/generate_filter_aggs.ts
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_doc_count.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_doc_count.ts
new file mode 100644
index 0000000000000..68c122aaaa9fb
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_doc_count.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DocCount } from '../../../common/graphql/types';
+import { INDEX_NAMES } from '../../../common/constants';
+import { UMElasticsearchQueryFn } from '../adapters';
+
+export const getDocCount: UMElasticsearchQueryFn<{}, DocCount> = async ({ callES }) => {
+  const { count } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
+
+  return { count };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_filter_bar.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_filter_bar.ts
new file mode 100644
index 0000000000000..79259afe2b9eb
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_filter_bar.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { OverviewFilters } from '../../../common/runtime_types';
+import { generateFilterAggs } from './generate_filter_aggs';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export interface GetFilterBarParams {
+  /** @param dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+  /** @member search this value should correspond to Elasticsearch DSL
+   *  generated from KQL text the user provided.
+   */
+  search?: Record<string, any>;
+  filterOptions: Record<string, string[] | number[]>;
+}
+
+export const combineRangeWithFilters = (
+  dateRangeStart: string,
+  dateRangeEnd: string,
+  filters?: Record<string, any>
+) => {
+  const range = {
+    range: {
+      '@timestamp': {
+        gte: dateRangeStart,
+        lte: dateRangeEnd,
+      },
+    },
+  };
+  if (!filters) return range;
+  const clientFiltersList = Array.isArray(filters?.bool?.filter ?? {})
+    ? // i.e. {"bool":{"filter":{ ...some nested filter objects }}}
+      filters.bool.filter
+    : // i.e. {"bool":{"filter":[ ...some listed filter objects ]}}
+      Object.keys(filters?.bool?.filter ?? {}).map(key => ({
+        ...filters?.bool?.filter?.[key],
+      }));
+  filters.bool.filter = [...clientFiltersList, range];
+  return filters;
+};
+
+type SupportedFields = 'locations' | 'ports' | 'schemes' | 'tags';
+
+export const extractFilterAggsResults = (
+  responseAggregations: Record<string, any>,
+  keys: SupportedFields[]
+): OverviewFilters => {
+  const values: OverviewFilters = {
+    locations: [],
+    ports: [],
+    schemes: [],
+    tags: [],
+  };
+  keys.forEach(key => {
+    const buckets = responseAggregations[key]?.term?.buckets ?? [];
+    values[key] = buckets.map((item: { key: string | number }) => item.key);
+  });
+  return values;
+};
+
+export const getFilterBar: UMElasticsearchQueryFn<GetFilterBarParams, OverviewFilters> = async ({
+  callES,
+  dateRangeStart,
+  dateRangeEnd,
+  search,
+  filterOptions,
+}) => {
+  const aggs = generateFilterAggs(
+    [
+      { aggName: 'locations', filterName: 'locations', field: 'observer.geo.name' },
+      { aggName: 'ports', filterName: 'ports', field: 'url.port' },
+      { aggName: 'schemes', filterName: 'schemes', field: 'monitor.type' },
+      { aggName: 'tags', filterName: 'tags', field: 'tags' },
+    ],
+    filterOptions
+  );
+  const filters = combineRangeWithFilters(dateRangeStart, dateRangeEnd, search);
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      size: 0,
+      query: {
+        ...filters,
+      },
+      aggs,
+    },
+  };
+
+  const { aggregations } = await callES('search', params);
+  return extractFilterAggsResults(aggregations, ['tags', 'locations', 'ports', 'schemes']);
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_index_pattern.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_index_pattern.ts
new file mode 100644
index 0000000000000..4b40f800b6779
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_index_pattern.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { APICaller } from 'src/core/server';
+import { UMElasticsearchQueryFn } from '../adapters';
+import { IndexPatternsFetcher, IIndexPattern } from '../../../../../../../src/plugins/data/server';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export const getUptimeIndexPattern: UMElasticsearchQueryFn<any, {}> = async callES => {
+  const indexPatternsFetcher = new IndexPatternsFetcher((...rest: Parameters<APICaller>) =>
+    callES(...rest)
+  );
+
+  // Since `getDynamicIndexPattern` is called in setup_request (and thus by every endpoint)
+  // and since `getFieldsForWildcard` will throw if the specified indices don't exist,
+  // we have to catch errors here to avoid all endpoints returning 500 for users without APM data
+  // (would be a bad first time experience)
+  try {
+    const fields = await indexPatternsFetcher.getFieldsForWildcard({
+      pattern: INDEX_NAMES.HEARTBEAT,
+    });
+
+    const indexPattern: IIndexPattern = {
+      fields,
+      title: INDEX_NAMES.HEARTBEAT,
+    };
+
+    return indexPattern;
+  } catch (e) {
+    const notExists = e.output?.statusCode === 404;
+    if (notExists) {
+      // eslint-disable-next-line no-console
+      console.error(
+        `Could not get dynamic index pattern because indices "${INDEX_NAMES.HEARTBEAT}" don't exist`
+      );
+      return;
+    }
+
+    // re-throw
+    throw e;
+  }
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_latest_monitor.ts
new file mode 100644
index 0000000000000..bfaee3f2bf7ee
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { Ping } from '../../../common/graphql/types';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export interface GetLatestMonitorParams {
+  /** @member dateRangeStart timestamp bounds */
+  dateStart: string;
+
+  /** @member dateRangeEnd timestamp bounds */
+  dateEnd: string;
+
+  /** @member monitorId optional limit to monitorId */
+  monitorId?: string | null;
+}
+
+// Get The monitor latest state sorted by timestamp with date range
+export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Ping> = async ({
+  callES,
+  dateStart,
+  dateEnd,
+  monitorId,
+}) => {
+  // TODO: Write tests for this function
+
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      query: {
+        bool: {
+          filter: [
+            {
+              range: {
+                '@timestamp': {
+                  gte: dateStart,
+                  lte: dateEnd,
+                },
+              },
+            },
+            ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
+          ],
+        },
+      },
+      size: 0,
+      aggs: {
+        by_id: {
+          terms: {
+            field: 'monitor.id',
+            size: 1000,
+          },
+          aggs: {
+            latest: {
+              top_hits: {
+                size: 1,
+                sort: {
+                  '@timestamp': { order: 'desc' },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  };
+
+  const result = await callES('search', params);
+  const ping: any = result.aggregations.by_id.buckets?.[0]?.latest.hits?.hits?.[0] ?? {};
+
+  return {
+    ...ping?._source,
+    timestamp: ping?._source?.['@timestamp'],
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor.ts
new file mode 100644
index 0000000000000..94175616f374e
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { Ping } from '../../../common/graphql/types';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export interface GetMonitorParams {
+  /** @member monitorId optional limit to monitorId */
+  monitorId?: string | null;
+}
+
+// Get the monitor meta info regardless of timestamp
+export const getMonitor: UMElasticsearchQueryFn<GetMonitorParams, Ping> = async ({
+  callES,
+  monitorId,
+}) => {
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      size: 1,
+      _source: ['url', 'monitor', 'observer'],
+      query: {
+        bool: {
+          filter: [
+            {
+              term: {
+                'monitor.id': monitorId,
+              },
+            },
+          ],
+        },
+      },
+      sort: [
+        {
+          '@timestamp': {
+            order: 'desc',
+          },
+        },
+      ],
+    },
+  };
+
+  const result = await callES('search', params);
+
+  return result.hits.hits[0]?._source;
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_charts.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_charts.ts
new file mode 100644
index 0000000000000..b97cc7287e921
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_charts.ts
@@ -0,0 +1,176 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { INDEX_NAMES } from '../../../common/constants';
+import { getHistogramIntervalFormatted } from '../helper';
+import { MonitorChart, LocationDurationLine } from '../../../common/graphql/types';
+
+export interface GetMonitorChartsParams {
+  /** @member monitorId ID value for the selected monitor */
+  monitorId: string;
+  /** @member dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+  /** @member location optional location value for use in filtering*/
+  location?: string | null;
+}
+
+const formatStatusBuckets = (time: any, buckets: any, docCount: any) => {
+  let up = null;
+  let down = null;
+
+  buckets.forEach((bucket: any) => {
+    if (bucket.key === 'up') {
+      up = bucket.doc_count;
+    } else if (bucket.key === 'down') {
+      down = bucket.doc_count;
+    }
+  });
+
+  return {
+    x: time,
+    up,
+    down,
+    total: docCount,
+  };
+};
+
+/**
+ * Fetches data used to populate monitor charts
+ */
+export const getMonitorCharts: UMElasticsearchQueryFn<
+  GetMonitorChartsParams,
+  MonitorChart
+> = async ({ callES, dateRangeStart, dateRangeEnd, monitorId, location }) => {
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      query: {
+        bool: {
+          filter: [
+            { range: { '@timestamp': { gte: dateRangeStart, lte: dateRangeEnd } } },
+            { term: { 'monitor.id': monitorId } },
+            { term: { 'monitor.status': 'up' } },
+            // if location is truthy, add it as a filter. otherwise add nothing
+            ...(!!location ? [{ term: { 'observer.geo.name': location } }] : []),
+          ],
+        },
+      },
+      size: 0,
+      aggs: {
+        timeseries: {
+          date_histogram: {
+            field: '@timestamp',
+            fixed_interval: getHistogramIntervalFormatted(dateRangeStart, dateRangeEnd),
+            min_doc_count: 0,
+          },
+          aggs: {
+            location: {
+              terms: {
+                field: 'observer.geo.name',
+                missing: 'N/A',
+              },
+              aggs: {
+                status: { terms: { field: 'monitor.status', size: 2, shard_size: 2 } },
+                duration: { stats: { field: 'monitor.duration.us' } },
+              },
+            },
+          },
+        },
+      },
+    },
+  };
+
+  const result = await callES('search', params);
+
+  const dateHistogramBuckets: any[] = result?.aggregations?.timeseries?.buckets ?? [];
+
+  /**
+   * The code below is responsible for formatting the aggregation data we fetched above in a way
+   * that the chart components used by the client understands.
+   * There are five required values. Two are lists of points that conform to a simple (x,y) structure.
+   *
+   * The third list is for an area chart expressing a range, and it requires an (x,y,y0) structure,
+   * where y0 is the min value for the point and y is the max.
+   *
+   * Additionally, we supply the maximum value for duration and status, so the corresponding charts know
+   * what the domain size should be.
+   */
+  const monitorChartsData: MonitorChart = {
+    locationDurationLines: [],
+    status: [],
+    durationMaxValue: 0,
+    statusMaxCount: 0,
+  };
+
+  /**
+   * The following section of code enables us to provide buckets per location
+   * that have a `null` value if there is no data at the given timestamp.
+   *
+   * We maintain two `Set`s. One is per bucket, the other is persisted for the
+   * entire collection. At the end of a bucket's evaluation, if there was no object
+   * parsed for a given location line that was already started, we insert an element
+   * to the given line with a null value. Without this, our charts on the client will
+   * display a continuous line for each of the points they are provided.
+   */
+
+  // a set of all the locations found for this result
+  const resultLocations = new Set<string>();
+  const linesByLocation: { [key: string]: LocationDurationLine } = {};
+  dateHistogramBuckets.forEach(dateHistogramBucket => {
+    const x = dateHistogramBucket.key;
+    const docCount = dateHistogramBucket?.doc_count ?? 0;
+    // a set of all the locations for the current bucket
+    const bucketLocations = new Set<string>();
+
+    dateHistogramBucket.location.buckets.forEach(
+      (locationBucket: { key: string; duration: { avg: number } }) => {
+        const locationName = locationBucket.key;
+        // store the location name in each set
+        bucketLocations.add(locationName);
+        resultLocations.add(locationName);
+
+        // create a new line for this location if it doesn't exist
+        let currentLine: LocationDurationLine = linesByLocation?.[locationName] ?? undefined;
+        if (!currentLine) {
+          currentLine = { name: locationName, line: [] };
+          linesByLocation[locationName] = currentLine;
+          monitorChartsData.locationDurationLines.push(currentLine);
+        }
+        // add the entry for the current location's duration average
+        currentLine.line.push({ x, y: locationBucket?.duration?.avg ?? null });
+      }
+    );
+
+    // if there are more lines in the result than are represented in the current bucket,
+    // we must add null entries
+    if (dateHistogramBucket.location.buckets.length < resultLocations.size) {
+      resultLocations.forEach(resultLocation => {
+        // the current bucket has a value for this location, do nothing
+        if (location && location !== resultLocation) return;
+        // the current bucket had no value for this location, insert a null value
+        if (!bucketLocations.has(resultLocation)) {
+          const locationLine = monitorChartsData.locationDurationLines.find(
+            ({ name }) => name === resultLocation
+          );
+          // in practice, there should always be a line present, but `find` can return `undefined`
+          if (locationLine) {
+            // this will create a gap in the line like we desire
+            locationLine.line.push({ x, y: null });
+          }
+        }
+      });
+    }
+
+    monitorChartsData.status.push(
+      formatStatusBuckets(x, dateHistogramBucket?.status?.buckets ?? [], docCount)
+    );
+  });
+
+  return monitorChartsData;
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_details.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_details.ts
new file mode 100644
index 0000000000000..b516fde1ce844
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_details.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { MonitorDetails, MonitorError } from '../../../common/runtime_types';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export interface GetMonitorDetailsParams {
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+}
+
+export const getMonitorDetails: UMElasticsearchQueryFn<
+  GetMonitorDetailsParams,
+  MonitorDetails
+> = async ({ callES, monitorId, dateStart, dateEnd }) => {
+  const queryFilters: any = [
+    {
+      range: {
+        '@timestamp': {
+          gte: dateStart,
+          lte: dateEnd,
+        },
+      },
+    },
+    {
+      term: {
+        'monitor.id': monitorId,
+      },
+    },
+  ];
+
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      size: 1,
+      _source: ['error', '@timestamp'],
+      query: {
+        bool: {
+          must: [
+            {
+              exists: {
+                field: 'error',
+              },
+            },
+          ],
+          filter: queryFilters,
+        },
+      },
+      sort: [
+        {
+          '@timestamp': {
+            order: 'desc',
+          },
+        },
+      ],
+    },
+  };
+
+  const result = await callES('search', params);
+
+  const data = result.hits.hits[0]?._source;
+
+  const monitorError: MonitorError | undefined = data?.error;
+  const errorTimeStamp: string | undefined = data?.['@timestamp'];
+
+  return {
+    monitorId,
+    error: monitorError,
+    timestamp: errorTimeStamp,
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_locations.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_locations.ts
new file mode 100644
index 0000000000000..e1a0e14fe951d
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_locations.ts
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { INDEX_NAMES, UNNAMED_LOCATION } from '../../../common/constants';
+import { MonitorLocations, MonitorLocation } from '../../../common/runtime_types';
+
+/**
+ * Fetch data for the monitor page title.
+ */
+export interface GetMonitorLocationsParams {
+  /**
+   * @member monitorId the ID to query
+   */
+  monitorId: string;
+  dateStart: string;
+  dateEnd: string;
+}
+
+export const getMonitorLocations: UMElasticsearchQueryFn<
+  GetMonitorLocationsParams,
+  MonitorLocations
+> = async ({ callES, monitorId, dateStart, dateEnd }) => {
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      size: 0,
+      query: {
+        bool: {
+          filter: [
+            {
+              match: {
+                'monitor.id': monitorId,
+              },
+            },
+            {
+              exists: {
+                field: 'summary',
+              },
+            },
+            {
+              range: {
+                '@timestamp': {
+                  gte: dateStart,
+                  lte: dateEnd,
+                },
+              },
+            },
+          ],
+        },
+      },
+      aggs: {
+        location: {
+          terms: {
+            field: 'observer.geo.name',
+            missing: '__location_missing__',
+          },
+          aggs: {
+            most_recent: {
+              top_hits: {
+                size: 1,
+                sort: {
+                  '@timestamp': {
+                    order: 'desc',
+                  },
+                },
+                _source: ['monitor', 'summary', 'observer', '@timestamp'],
+              },
+            },
+          },
+        },
+      },
+    },
+  };
+
+  const result = await callES('search', params);
+  const locations = result?.aggregations?.location?.buckets ?? [];
+
+  const getGeo = (locGeo: { name: string; location?: string }) => {
+    if (locGeo) {
+      const { name, location } = locGeo;
+      const latLon = location?.trim().split(',');
+      return {
+        name,
+        location: latLon
+          ? {
+              lat: latLon[0],
+              lon: latLon[1],
+            }
+          : undefined,
+      };
+    } else {
+      return {
+        name: UNNAMED_LOCATION,
+      };
+    }
+  };
+
+  const monLocs: MonitorLocation[] = [];
+  locations.forEach((loc: any) => {
+    const mostRecentLocation = loc.most_recent.hits.hits[0]._source;
+    const location: MonitorLocation = {
+      summary: mostRecentLocation?.summary,
+      geo: getGeo(mostRecentLocation?.observer?.geo),
+      timestamp: mostRecentLocation['@timestamp'],
+    };
+    monLocs.push(location);
+  });
+
+  return {
+    monitorId,
+    locations: monLocs,
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_states.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_states.ts
new file mode 100644
index 0000000000000..32c82b1fa2098
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_monitor_states.ts
@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CONTEXT_DEFAULTS } from '../../../common/constants';
+import { fetchPage } from './search';
+import { UMElasticsearchQueryFn } from '../adapters';
+import { MonitorSummary, SortOrder, CursorDirection } from '../../../common/graphql/types';
+import { QueryContext } from './search';
+
+export interface CursorPagination {
+  cursorKey?: any;
+  cursorDirection: CursorDirection;
+  sortOrder: SortOrder;
+}
+
+export interface GetMonitorStatesParams {
+  dateRangeStart: string;
+  dateRangeEnd: string;
+  pagination?: CursorPagination;
+  filters?: string | null;
+  statusFilter?: string;
+}
+
+export interface GetMonitorStatesResult {
+  summaries: MonitorSummary[];
+  nextPagePagination: string | null;
+  prevPagePagination: string | null;
+}
+
+// To simplify the handling of the group of pagination vars they're passed back to the client as a string
+const jsonifyPagination = (p: any): string | null => {
+  if (!p) {
+    return null;
+  }
+
+  return JSON.stringify(p);
+};
+
+// Gets a page of monitor states.
+export const getMonitorStates: UMElasticsearchQueryFn<
+  GetMonitorStatesParams,
+  GetMonitorStatesResult
+> = async ({ callES, dateRangeStart, dateRangeEnd, pagination, filters, statusFilter }) => {
+  pagination = pagination || CONTEXT_DEFAULTS.CURSOR_PAGINATION;
+  statusFilter = statusFilter === null ? undefined : statusFilter;
+  const size = 10;
+
+  const queryContext = new QueryContext(
+    callES,
+    dateRangeStart,
+    dateRangeEnd,
+    pagination,
+    filters && filters !== '' ? JSON.parse(filters) : null,
+    size,
+    statusFilter
+  );
+
+  const page = await fetchPage(queryContext);
+
+  return {
+    summaries: page.items,
+    nextPagePagination: jsonifyPagination(page.nextPagePagination),
+    prevPagePagination: jsonifyPagination(page.prevPagePagination),
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/es_get_ping_historgram.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_ping_histogram.ts
similarity index 60%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/pings/es_get_ping_historgram.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/get_ping_histogram.ts
index 66cae497eb081..3b448dc31659b 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/es_get_ping_historgram.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_ping_histogram.ts
@@ -4,17 +4,29 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { get } from 'lodash';
-import { INDEX_NAMES, QUERY } from '../../../../common/constants';
-import { parseFilterQuery, getFilterClause } from '../../helper';
-import { UMElasticsearchQueryFn } from '../framework';
-import { GetPingHistogramParams, HistogramResult } from '../../../../common/types';
+import { UMElasticsearchQueryFn } from '../adapters';
+import { parseFilterQuery, getFilterClause } from '../helper';
+import { INDEX_NAMES, QUERY } from '../../../common/constants';
 import { HistogramQueryResult } from './types';
+import { HistogramResult } from '../../../common/types';
 
-export const esGetPingHistogram: UMElasticsearchQueryFn<
+export interface GetPingHistogramParams {
+  /** @member dateRangeStart timestamp bounds */
+  from: string;
+  /** @member dateRangeEnd timestamp bounds */
+  to: string;
+  /** @member filters user-defined filters */
+  filters?: string | null;
+  /** @member monitorId optional limit to monitorId */
+  monitorId?: string | null;
+  /** @member statusFilter special filter targeting the latest status of each monitor */
+  statusFilter?: string | null;
+}
+
+export const getPingHistogram: UMElasticsearchQueryFn<
   GetPingHistogramParams,
   HistogramResult
-> = async ({ callES, dateStart, dateEnd, filters, monitorId, statusFilter }) => {
+> = async ({ callES, from, to, filters, monitorId, statusFilter }) => {
   const boolFilters = parseFilterQuery(filters);
   const additionalFilters = [];
   if (monitorId) {
@@ -23,7 +35,7 @@ export const esGetPingHistogram: UMElasticsearchQueryFn<
   if (boolFilters) {
     additionalFilters.push(boolFilters);
   }
-  const filter = getFilterClause(dateStart, dateEnd, additionalFilters);
+  const filter = getFilterClause(from, to, additionalFilters);
 
   const params = {
     index: INDEX_NAMES.HEARTBEAT,
@@ -63,11 +75,11 @@ export const esGetPingHistogram: UMElasticsearchQueryFn<
 
   const result = await callES('search', params);
   const interval = result.aggregations.timeseries?.interval;
-  const buckets: HistogramQueryResult[] = get(result, 'aggregations.timeseries.buckets', []);
+  const buckets: HistogramQueryResult[] = result?.aggregations?.timeseries?.buckets ?? [];
   const histogram = buckets.map(bucket => {
-    const x: number = get(bucket, 'key');
-    const downCount: number = get(bucket, 'down.doc_count');
-    const upCount: number = get(bucket, 'up.doc_count');
+    const x: number = bucket.key;
+    const downCount: number = bucket.down.doc_count;
+    const upCount: number = bucket.up.doc_count;
     return {
       x,
       downCount: statusFilter && statusFilter !== 'down' ? 0 : downCount,
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_pings.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_pings.ts
new file mode 100644
index 0000000000000..381aca720dc1d
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_pings.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters/framework';
+import { PingResults, Ping, HttpBody } from '../../../common/graphql/types';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export interface GetPingsParams {
+  /** @member dateRangeStart timestamp bounds */
+  dateRangeStart: string;
+
+  /** @member dateRangeEnd timestamp bounds */
+  dateRangeEnd: string;
+
+  /** @member monitorId optional limit by monitorId */
+  monitorId?: string | null;
+
+  /** @member status optional limit by check statuses */
+  status?: string | null;
+
+  /** @member sort optional sort by timestamp */
+  sort?: string | null;
+
+  /** @member size optional limit query size */
+  size?: number | null;
+
+  /** @member location optional location value for use in filtering*/
+  location?: string | null;
+}
+
+export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingResults> = async ({
+  callES,
+  dateRangeStart,
+  dateRangeEnd,
+  monitorId,
+  status,
+  sort,
+  size,
+  location,
+}) => {
+  const sortParam = { sort: [{ '@timestamp': { order: sort ?? 'desc' } }] };
+  const sizeParam = size ? { size } : undefined;
+  const filter: any[] = [{ range: { '@timestamp': { gte: dateRangeStart, lte: dateRangeEnd } } }];
+  if (monitorId) {
+    filter.push({ term: { 'monitor.id': monitorId } });
+  }
+  if (status) {
+    filter.push({ term: { 'monitor.status': status } });
+  }
+
+  let postFilterClause = {};
+  if (location) {
+    postFilterClause = { post_filter: { term: { 'observer.geo.name': location } } };
+  }
+  const queryContext = { bool: { filter } };
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      query: {
+        ...queryContext,
+      },
+      ...sortParam,
+      ...sizeParam,
+      aggregations: {
+        locations: {
+          terms: {
+            field: 'observer.geo.name',
+            missing: 'N/A',
+            size: 1000,
+          },
+        },
+      },
+      ...postFilterClause,
+    },
+  };
+
+  const {
+    hits: { hits, total },
+    aggregations: aggs,
+  } = await callES('search', params);
+
+  const locations = aggs?.locations ?? { buckets: [{ key: 'N/A', doc_count: 0 }] };
+
+  const pings: Ping[] = hits.map(({ _id, _source }: any) => {
+    const timestamp = _source['@timestamp'];
+
+    // Calculate here the length of the content string in bytes, this is easier than in client JS, where
+    // we don't have access to Buffer.byteLength. There are some hacky ways to do this in the
+    // client but this is cleaner.
+    const httpBody: HttpBody | undefined = _source?.http?.response?.body;
+    if (httpBody && httpBody.content) {
+      httpBody.content_bytes = Buffer.byteLength(httpBody.content);
+    }
+
+    return { id: _id, timestamp, ..._source };
+  });
+
+  const results: PingResults = {
+    total: total.value,
+    locations: locations.buckets.map((bucket: { key: string }) => bucket.key),
+    pings,
+  };
+
+  return results;
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_snapshot_counts.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
new file mode 100644
index 0000000000000..6236971146015
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_snapshot_counts.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { Snapshot } from '../../../common/runtime_types';
+import { QueryContext, MonitorGroupIterator } from './search';
+import { CONTEXT_DEFAULTS, INDEX_NAMES } from '../../../common/constants';
+
+export interface GetSnapshotCountParams {
+  dateRangeStart: string;
+  dateRangeEnd: string;
+  filters?: string | null;
+  statusFilter?: string;
+}
+
+const fastStatusCount = async (context: QueryContext): Promise<Snapshot> => {
+  const params = {
+    index: INDEX_NAMES.HEARTBEAT,
+    body: {
+      size: 0,
+      query: { bool: { filter: await context.dateAndCustomFilters() } },
+      aggs: {
+        unique: {
+          // We set the precision threshold to 40k which is the max precision supported by cardinality
+          cardinality: { field: 'monitor.id', precision_threshold: 40000 },
+        },
+        down: {
+          filter: { range: { 'summary.down': { gt: 0 } } },
+          aggs: {
+            unique: { cardinality: { field: 'monitor.id', precision_threshold: 40000 } },
+          },
+        },
+      },
+    },
+  };
+
+  const statistics = await context.search(params);
+  const total = statistics.aggregations.unique.value;
+  const down = statistics.aggregations.down.unique.value;
+
+  return {
+    total,
+    down,
+    up: total - down,
+  };
+};
+
+const slowStatusCount = async (context: QueryContext, status: string): Promise<number> => {
+  const downContext = context.clone();
+  downContext.statusFilter = status;
+  const iterator = new MonitorGroupIterator(downContext);
+  let count = 0;
+  while (await iterator.next()) {
+    count++;
+  }
+  return count;
+};
+
+export const getSnapshotCount: UMElasticsearchQueryFn<GetSnapshotCountParams, Snapshot> = async ({
+  callES,
+  dateRangeStart,
+  dateRangeEnd,
+  filters,
+  statusFilter,
+}): Promise<Snapshot> => {
+  if (!(statusFilter === 'up' || statusFilter === 'down' || statusFilter === undefined)) {
+    throw new Error(`Invalid status filter value '${statusFilter}'`);
+  }
+
+  const context = new QueryContext(
+    callES,
+    dateRangeStart,
+    dateRangeEnd,
+    CONTEXT_DEFAULTS.CURSOR_PAGINATION,
+    filters && filters !== '' ? JSON.parse(filters) : null,
+    Infinity,
+    statusFilter
+  );
+
+  // Calculate the total, up, and down counts.
+  const counts = await fastStatusCount(context);
+
+  // Check if the last count was accurate, if not, we need to perform a slower count with the
+  // MonitorGroupsIterator.
+  if (!(await context.hasTimespan())) {
+    // Figure out whether 'up' or 'down' is more common. It's faster to count the lower cardinality
+    // one then use subtraction to figure out its opposite.
+    const [leastCommonStatus, mostCommonStatus]: Array<'up' | 'down'> =
+      counts.up > counts.down ? ['down', 'up'] : ['up', 'down'];
+    counts[leastCommonStatus] = await slowStatusCount(context, leastCommonStatus);
+    counts[mostCommonStatus] = counts.total - counts[leastCommonStatus];
+  }
+
+  return {
+    total: statusFilter ? counts[statusFilter] : counts.total,
+    up: statusFilter === 'down' ? 0 : counts.up,
+    down: statusFilter === 'up' ? 0 : counts.down,
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_states_index_status.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_states_index_status.ts
new file mode 100644
index 0000000000000..5044b9a6932cf
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/get_states_index_status.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import { StatesIndexStatus } from '../../../common/graphql/types';
+import { INDEX_NAMES } from '../../../common/constants';
+
+export const getStatesIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({
+  callES,
+}) => {
+  const {
+    _shards: { total },
+    count,
+  } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
+  return {
+    indexExists: total > 0,
+    docCount: {
+      count,
+    },
+  };
+};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/index.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/index.ts
new file mode 100644
index 0000000000000..f41b7257524fd
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/index.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.
+ */
+
+export { getDocCount } from './get_doc_count';
+export { getFilterBar, GetFilterBarParams } from './get_filter_bar';
+export { getUptimeIndexPattern as getIndexPattern } from './get_index_pattern';
+export { getLatestMonitor, GetLatestMonitorParams } from './get_latest_monitor';
+export { getMonitor, GetMonitorParams } from './get_monitor';
+export { getMonitorCharts, GetMonitorChartsParams } from './get_monitor_charts';
+export { getMonitorDetails, GetMonitorDetailsParams } from './get_monitor_details';
+export { getMonitorLocations, GetMonitorLocationsParams } from './get_monitor_locations';
+export { getMonitorStates, GetMonitorStatesParams } from './get_monitor_states';
+export { getPings, GetPingsParams } from './get_pings';
+export { getPingHistogram, GetPingHistogramParams } from './get_ping_histogram';
+export { UptimeRequests } from './uptime_requests';
+export { getSnapshotCount, GetSnapshotCountParams } from './get_snapshot_counts';
+export { getStatesIndexStatus } from './get_states_index_status';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts
similarity index 97%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts
index 0bbdaa87a5e66..d519a4e75463f 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/fetch_page.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/fetch_page.test.ts
@@ -12,7 +12,7 @@ import {
   MonitorGroupsPage,
 } from '../fetch_page';
 import { QueryContext } from '../query_context';
-import { MonitorSummary } from '../../../../../../common/graphql/types';
+import { MonitorSummary } from '../../../../../common/graphql/types';
 import { nextPagination, prevPagination, simpleQueryContext } from './test_helpers';
 
 const simpleFixture: MonitorGroups[] = [
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/find_potential_matches_test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/find_potential_matches_test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/find_potential_matches_test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/find_potential_matches_test.ts
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/monitor_group_iterator.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/monitor_group_iterator.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/monitor_group_iterator.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/monitor_group_iterator.test.ts
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/query_context.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
similarity index 94%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/query_context.test.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
index 8924d07ac0c4d..86506c2c4c044 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/query_context.test.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/query_context.test.ts
@@ -5,8 +5,8 @@
  */
 
 import { QueryContext } from '../query_context';
-import { CursorPagination } from '../..';
-import { CursorDirection, SortOrder } from '../../../../../../common/graphql/types';
+import { CursorPagination } from '../types';
+import { CursorDirection, SortOrder } from '../../../../../common/graphql/types';
 
 describe(QueryContext, () => {
   // 10 minute range
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
similarity index 85%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
index bb3f3da3e289d..98b192d14f91a 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/__tests__/test_helpers.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/__tests__/test_helpers.ts
@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { CursorPagination } from '../../adapter_types';
-import { CursorDirection, SortOrder } from '../../../../../../common/graphql/types';
+import { CursorPagination } from '../types';
+import { CursorDirection, SortOrder } from '../../../../../common/graphql/types';
 import { QueryContext } from '../query_context';
 
 export const prevPagination = (key: any): CursorPagination => {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
similarity index 98%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
index b64015424ff40..e37c749e63566 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/enrich_monitor_groups.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts
@@ -6,15 +6,15 @@
 
 import { get, sortBy } from 'lodash';
 import { QueryContext } from './query_context';
-import { getHistogramIntervalFormatted } from '../../../helper';
-import { INDEX_NAMES, STATES } from '../../../../../common/constants';
+import { getHistogramIntervalFormatted } from '../../helper';
+import { INDEX_NAMES, STATES } from '../../../../common/constants';
 import {
   MonitorSummary,
   SummaryHistogram,
   Check,
   CursorDirection,
   SortOrder,
-} from '../../../../../common/graphql/types';
+} from '../../../../common/graphql/types';
 import { MonitorEnricher } from './fetch_page';
 
 export const enrichMonitorGroups: MonitorEnricher = async (
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_chunk.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/fetch_chunk.ts
similarity index 100%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_chunk.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/fetch_chunk.ts
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/fetch_page.ts
similarity index 97%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/fetch_page.ts
index 046bdc8a8d07d..6440850dc0ffc 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/fetch_page.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/fetch_page.ts
@@ -5,10 +5,10 @@
  */
 
 import { flatten } from 'lodash';
-import { CursorPagination } from '../adapter_types';
+import { CursorPagination } from './types';
 import { QueryContext } from './query_context';
-import { QUERY } from '../../../../../common/constants';
-import { CursorDirection, MonitorSummary, SortOrder } from '../../../../../common/graphql/types';
+import { QUERY } from '../../../../common/constants';
+import { CursorDirection, MonitorSummary, SortOrder } from '../../../../common/graphql/types';
 import { enrichMonitorGroups } from './enrich_monitor_groups';
 import { MonitorGroupIterator } from './monitor_group_iterator';
 
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
similarity index 96%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
index 634d6369531d8..fc0e35b279e0b 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/find_potential_matches.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/find_potential_matches.ts
@@ -5,8 +5,8 @@
  */
 
 import { get, set } from 'lodash';
-import { CursorDirection } from '../../../../../common/graphql/types';
-import { INDEX_NAMES } from '../../../../../common/constants';
+import { CursorDirection } from '../../../../common/graphql/types';
+import { INDEX_NAMES } from '../../../../common/constants';
 import { QueryContext } from './query_context';
 
 // This is the first phase of the query. In it, we find the most recent check groups that matched the given query.
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/index.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/index.ts
similarity index 89%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/index.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/index.ts
index 040c256935692..8de5687808d61 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/index.ts
@@ -6,3 +6,4 @@
 
 export { fetchPage, MonitorGroups, MonitorLocCheckGroup, MonitorGroupsPage } from './fetch_page';
 export { MonitorGroupIterator } from './monitor_group_iterator';
+export { QueryContext } from './query_context';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts
similarity index 98%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts
index 27c16863a37ab..ced557dbf62e0 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/monitor_group_iterator.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/monitor_group_iterator.ts
@@ -5,10 +5,10 @@
  */
 
 import { QueryContext } from './query_context';
-import { CursorPagination } from '../adapter_types';
 import { fetchChunk } from './fetch_chunk';
-import { CursorDirection } from '../../../../../common/graphql/types';
+import { CursorDirection } from '../../../../common/graphql/types';
 import { MonitorGroups } from './fetch_page';
+import { CursorPagination } from './types';
 
 // Hardcoded chunk size for how many monitors to fetch at a time when querying
 export const CHUNK_SIZE = 1000;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/query_context.ts
similarity index 94%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/query_context.ts
index a51931ba11630..f5b13c165d87d 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/query_context.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/query_context.ts
@@ -5,10 +5,10 @@
  */
 
 import moment from 'moment';
-import { APICaller } from 'kibana/server';
-import { CursorPagination } from '../adapter_types';
-import { INDEX_NAMES } from '../../../../../common/constants';
-import { parseRelativeDate } from '../../../helper/get_histogram_interval';
+import { APICaller } from 'src/core/server';
+import { INDEX_NAMES } from '../../../../common/constants';
+import { CursorPagination } from './types';
+import { parseRelativeDate } from '../../helper';
 
 export class QueryContext {
   callES: APICaller;
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
similarity index 97%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
index f8347d0737521..a55301555c8bf 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/search/refine_potential_matches.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/refine_potential_matches.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { INDEX_NAMES } from '../../../../../common/constants';
+import { INDEX_NAMES } from '../../../../common/constants';
 import { QueryContext } from './query_context';
-import { CursorDirection } from '../../../../../common/graphql/types';
+import { CursorDirection } from '../../../../common/graphql/types';
 import { MonitorGroups, MonitorLocCheckGroup } from './fetch_page';
 
 /**
diff --git a/x-pack/legacy/plugins/lens/server/index.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/search/types.ts
similarity index 55%
rename from x-pack/legacy/plugins/lens/server/index.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/search/types.ts
index ae14d1c5a0052..dc6021a91146a 100644
--- a/x-pack/legacy/plugins/lens/server/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/search/types.ts
@@ -4,8 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { LensServer } from './plugin';
+import { CursorDirection, SortOrder } from '../../../../common/graphql/types';
 
-export * from './plugin';
-
-export const lensServerPlugin = () => new LensServer();
+export interface CursorPagination {
+  cursorKey?: any;
+  cursorDirection: CursorDirection;
+  sortOrder: SortOrder;
+}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/types.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/types.ts
similarity index 88%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/pings/types.ts
rename to x-pack/legacy/plugins/uptime/server/lib/requests/types.ts
index b1b1589af2ca7..7f65e80113d8f 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/pings/types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/types.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DocCount, Ping, PingResults } from '../../../../common/graphql/types';
-import { UMElasticsearchQueryFn } from '../framework';
-import { GetPingHistogramParams, HistogramResult } from '../../../../common/types';
+import { DocCount, Ping, PingResults } from '../../../common/graphql/types';
+import { UMElasticsearchQueryFn } from '../adapters';
+import { GetPingHistogramParams, HistogramResult } from '../../../common/types';
 
 export interface GetAllParams {
   /** @member dateRangeStart timestamp bounds */
@@ -63,13 +63,12 @@ export interface UMPingsAdapter {
 
 export interface HistogramQueryResult {
   key: number;
+  key_as_string: string;
   doc_count: number;
-  bucket_total: {
-    value: number;
-  };
   down: {
-    bucket_count: {
-      value: number;
-    };
+    doc_count: number;
+  };
+  up: {
+    doc_count: number;
   };
 }
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/uptime_requests.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/uptime_requests.ts
new file mode 100644
index 0000000000000..182c944e8388a
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/requests/uptime_requests.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMElasticsearchQueryFn } from '../adapters';
+import {
+  DocCount,
+  Ping,
+  MonitorChart,
+  PingResults,
+  StatesIndexStatus,
+} from '../../../common/graphql/types';
+import {
+  GetFilterBarParams,
+  GetLatestMonitorParams,
+  GetMonitorParams,
+  GetMonitorChartsParams,
+  GetMonitorDetailsParams,
+  GetMonitorLocationsParams,
+  GetMonitorStatesParams,
+  GetPingsParams,
+  GetPingHistogramParams,
+} from '.';
+import {
+  OverviewFilters,
+  MonitorDetails,
+  MonitorLocations,
+  Snapshot,
+} from '../../../common/runtime_types';
+import { GetMonitorStatesResult } from './get_monitor_states';
+import { GetSnapshotCountParams } from './get_snapshot_counts';
+import { HistogramResult } from '../../../common/types';
+
+type ESQ<P, R> = UMElasticsearchQueryFn<P, R>;
+
+export interface UptimeRequests {
+  getDocCount: ESQ<{}, DocCount>;
+  getFilterBar: ESQ<GetFilterBarParams, OverviewFilters>;
+  getIndexPattern: ESQ<any, {}>;
+  getLatestMonitor: ESQ<GetLatestMonitorParams, Ping>;
+  getMonitor: ESQ<GetMonitorParams, Ping>;
+  getMonitorCharts: ESQ<GetMonitorChartsParams, MonitorChart>;
+  getMonitorDetails: ESQ<GetMonitorDetailsParams, MonitorDetails>;
+  getMonitorLocations: ESQ<GetMonitorLocationsParams, MonitorLocations>;
+  getMonitorStates: ESQ<GetMonitorStatesParams, GetMonitorStatesResult>;
+  getPings: ESQ<GetPingsParams, PingResults>;
+  getPingHistogram: ESQ<GetPingHistogramParams, HistogramResult>;
+  getSnapshotCount: ESQ<GetSnapshotCountParams, Snapshot>;
+  getStatesIndexStatus: ESQ<{}, StatesIndexStatus>;
+}
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/index.ts b/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
index 91936b499d8e6..aa3b36ec7d919 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/index.ts
@@ -5,7 +5,7 @@
  */
 
 import { createGetOverviewFilters } from './overview_filters';
-import { createGetAllRoute } from './pings';
+import { createGetPingsRoute } from './pings';
 import { createGetIndexPatternRoute } from './index_pattern';
 import { createLogMonitorPageRoute, createLogOverviewPageRoute } from './telemetry';
 import { createGetSnapshotCount } from './snapshot';
@@ -23,7 +23,7 @@ export { createRouteWithAuth } from './create_route_with_auth';
 export { uptimeRouteWrapper } from './uptime_route_wrapper';
 export const restApiRoutes: UMRestApiRouteFactory[] = [
   createGetOverviewFilters,
-  createGetAllRoute,
+  createGetPingsRoute,
   createGetIndexPatternRoute,
   createGetMonitorRoute,
   createGetMonitorDetailsRoute,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts b/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
index cee8eaf3f9cae..cc65749153c1d 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
@@ -18,7 +18,7 @@ export const createGetIndexPatternRoute: UMRestApiRouteFactory = (libs: UMServer
     try {
       return response.ok({
         body: {
-          ...(await libs.stubIndexPattern.getUptimeIndexPattern(callES)),
+          ...(await libs.requests.getIndexPattern(callES)),
         },
       });
     } catch (e) {
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
index b2356ae0a88bf..f8c7666f53f7d 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitor_locations.ts
@@ -26,7 +26,7 @@ export const createGetMonitorLocationsRoute: UMRestApiRouteFactory = (libs: UMSe
 
     return response.ok({
       body: {
-        ...(await libs.monitors.getMonitorLocations({
+        ...(await libs.requests.getMonitorLocations({
           callES,
           monitorId,
           dateStart,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
index 9e1bc6f0d6a96..ca88dd965c1ad 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/monitors_details.ts
@@ -25,7 +25,7 @@ export const createGetMonitorDetailsRoute: UMRestApiRouteFactory = (libs: UMServ
     const { monitorId, dateStart, dateEnd } = request.query;
     return response.ok({
       body: {
-        ...(await libs.monitors.getMonitorDetails({
+        ...(await libs.requests.getMonitorDetails({
           callES,
           monitorId,
           dateStart,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts
index 8b1bc04b45110..8dac50c9f5905 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/monitors/status.ts
@@ -24,7 +24,7 @@ export const createGetMonitorRoute: UMRestApiRouteFactory = (libs: UMServerLibs)
 
     return response.ok({
       body: {
-        ...(await libs.pings.getMonitor({ callES, monitorId })),
+        ...(await libs.requests.getMonitor({ callES, monitorId })),
       },
     });
   },
@@ -45,7 +45,7 @@ export const createGetStatusBarRoute: UMRestApiRouteFactory = (libs: UMServerLib
   },
   handler: async ({ callES }, _context, request, response): Promise<any> => {
     const { monitorId, dateStart, dateEnd } = request.query;
-    const result = await libs.pings.getLatestMonitorStatus({
+    const result = await libs.requests.getLatestMonitor({
       callES,
       monitorId,
       dateStart,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts b/x-pack/legacy/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts
index ef93253bb5b70..02e54cb441838 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/overview_filters/get_overview_filters.ts
@@ -43,7 +43,7 @@ export const createGetOverviewFilters: UMRestApiRouteFactory = (libs: UMServerLi
       }
     }
 
-    const filtersResponse = await libs.monitors.getFilterBar({
+    const filtersResponse = await libs.requests.getFilterBar({
       callES,
       dateRangeStart,
       dateRangeEnd,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts b/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
index c8eb2a1e40ad4..93ba4490fa31f 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_ping_histogram.ts
@@ -26,10 +26,10 @@ export const createGetPingHistogramRoute: UMRestApiRouteFactory = (libs: UMServe
   handler: async ({ callES }, _context, request, response): Promise<any> => {
     const { dateStart, dateEnd, statusFilter, monitorId, filters } = request.query;
 
-    const result = await libs.pings.getPingHistogram({
+    const result = await libs.requests.getPingHistogram({
       callES,
-      dateStart,
-      dateEnd,
+      from: dateStart,
+      to: dateEnd,
       monitorId,
       statusFilter,
       filters,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts b/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_pings.ts
similarity index 90%
rename from x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts
rename to x-pack/legacy/plugins/uptime/server/rest_api/pings/get_pings.ts
index 824035954ea28..e57951c98b6fc 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_all.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/pings/get_pings.ts
@@ -8,7 +8,7 @@ import { schema } from '@kbn/config-schema';
 import { UMServerLibs } from '../../lib/lib';
 import { UMRestApiRouteFactory } from '../types';
 
-export const createGetAllRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
+export const createGetPingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: '/api/uptime/pings',
   validate: {
@@ -28,7 +28,7 @@ export const createGetAllRoute: UMRestApiRouteFactory = (libs: UMServerLibs) =>
   handler: async ({ callES }, _context, request, response): Promise<any> => {
     const { dateRangeStart, dateRangeEnd, location, monitorId, size, sort, status } = request.query;
 
-    const result = await libs.pings.getAll({
+    const result = await libs.requests.getPings({
       callES,
       dateRangeStart,
       dateRangeEnd,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/pings/index.ts b/x-pack/legacy/plugins/uptime/server/rest_api/pings/index.ts
index 43acf5410c8ed..abb7da26f994f 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/pings/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/pings/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { createGetAllRoute } from './get_all';
+export { createGetPingsRoute } from './get_pings';
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts b/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
index 986ac797d63b6..c51806e323307 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts
@@ -24,7 +24,7 @@ export const createGetSnapshotCount: UMRestApiRouteFactory = (libs: UMServerLibs
   },
   handler: async ({ callES }, _context, request, response): Promise<any> => {
     const { dateRangeStart, dateRangeEnd, filters, statusFilter } = request.query;
-    const result = await libs.monitorStates.getSnapshotCount({
+    const result = await libs.requests.getSnapshotCount({
       callES,
       dateRangeStart,
       dateRangeEnd,
diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/types.ts b/x-pack/legacy/plugins/uptime/server/rest_api/types.ts
index e0c8ba4a286cf..a0566c225eae7 100644
--- a/x-pack/legacy/plugins/uptime/server/rest_api/types.ts
+++ b/x-pack/legacy/plugins/uptime/server/rest_api/types.ts
@@ -15,7 +15,7 @@ import {
   KibanaRequest,
   KibanaResponseFactory,
   IKibanaResponse,
-} from 'kibana/server';
+} from 'src/core/server';
 import { UMServerLibs } from '../lib/lib';
 
 /**
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
similarity index 91%
rename from x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
rename to x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
index 6d3620f11a87b..2ee8df7b5d1e1 100644
--- a/x-pack/legacy/plugins/apm/typings/elasticsearch/aggregations.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
@@ -147,19 +147,13 @@ type BucketSubAggregationResponse<
   ? AggregationResponseMap<TAggregationInputMap, TDocument>
   : {};
 
-interface AggregationResponsePart<
-  TAggregationOptionsMap extends AggregationOptionsMap,
-  TDocument
-> {
+interface AggregationResponsePart<TAggregationOptionsMap extends AggregationOptionsMap, TDocument> {
   terms: {
     buckets: Array<
       {
         doc_count: number;
         key: string | number;
-      } & BucketSubAggregationResponse<
-        TAggregationOptionsMap['aggs'],
-        TDocument
-      >
+      } & BucketSubAggregationResponse<TAggregationOptionsMap['aggs'], TDocument>
     >;
   };
   histogram: {
@@ -167,10 +161,7 @@ interface AggregationResponsePart<
       {
         doc_count: number;
         key: number;
-      } & BucketSubAggregationResponse<
-        TAggregationOptionsMap['aggs'],
-        TDocument
-      >
+      } & BucketSubAggregationResponse<TAggregationOptionsMap['aggs'], TDocument>
     >;
   };
   date_histogram: {
@@ -179,10 +170,7 @@ interface AggregationResponsePart<
         doc_count: number;
         key: number;
         key_as_string: string;
-      } & BucketSubAggregationResponse<
-        TAggregationOptionsMap['aggs'],
-        TDocument
-      >
+      } & BucketSubAggregationResponse<TAggregationOptionsMap['aggs'], TDocument>
     >;
   };
   avg: MetricsAggregationResponsePart;
@@ -227,10 +215,7 @@ interface AggregationResponsePart<
   } & AggregationResponseMap<TAggregationOptionsMap['aggs'], TDocument>;
   filters: TAggregationOptionsMap extends { filters: { filters: any[] } }
     ? Array<
-        { doc_count: number } & AggregationResponseMap<
-          TAggregationOptionsMap['aggs'],
-          TDocument
-        >
+        { doc_count: number } & AggregationResponseMap<TAggregationOptionsMap['aggs'], TDocument>
       >
     : TAggregationOptionsMap extends {
         filters: {
@@ -264,10 +249,7 @@ interface AggregationResponsePart<
       {
         key: Record<GetCompositeKeys<TAggregationOptionsMap>, number>;
         doc_count: number;
-      } & BucketSubAggregationResponse<
-        TAggregationOptionsMap['aggs'],
-        TDocument
-      >
+      } & BucketSubAggregationResponse<TAggregationOptionsMap['aggs'], TDocument>
     >;
   };
   diversified_sampler: {
diff --git a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts b/x-pack/plugins/apm/typings/elasticsearch/index.ts
similarity index 84%
rename from x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
rename to x-pack/plugins/apm/typings/elasticsearch/index.ts
index 064b684cf9aa6..e1d4aaeb597e2 100644
--- a/x-pack/legacy/plugins/apm/typings/elasticsearch/index.ts
+++ b/x-pack/plugins/apm/typings/elasticsearch/index.ts
@@ -31,10 +31,7 @@ export type ESSearchResponse<
 > = Omit<SearchResponse<TDocument>, 'aggregations' | 'hits'> &
   (TSearchRequest extends { body: { aggs: AggregationInputMap } }
     ? {
-        aggregations?: AggregationResponseMap<
-          TSearchRequest['body']['aggs'],
-          TDocument
-        >;
+        aggregations?: AggregationResponseMap<TSearchRequest['body']['aggs'], TDocument>;
       }
     : {}) & {
     hits: Omit<SearchResponse<TDocument>['hits'], 'total'> &
@@ -52,12 +49,6 @@ export type ESSearchResponse<
 
 export interface ESFilter {
   [key: string]: {
-    [key: string]:
-      | string
-      | string[]
-      | number
-      | boolean
-      | Record<string, unknown>
-      | ESFilter[];
+    [key: string]: string | string[] | number | boolean | Record<string, unknown> | ESFilter[];
   };
 }
diff --git a/x-pack/legacy/plugins/lens/common/api.ts b/x-pack/plugins/lens/common/api.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/common/api.ts
rename to x-pack/plugins/lens/common/api.ts
diff --git a/x-pack/legacy/plugins/lens/common/constants.ts b/x-pack/plugins/lens/common/constants.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/common/constants.ts
rename to x-pack/plugins/lens/common/constants.ts
diff --git a/x-pack/legacy/plugins/lens/common/index.ts b/x-pack/plugins/lens/common/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/common/index.ts
rename to x-pack/plugins/lens/common/index.ts
diff --git a/x-pack/legacy/plugins/lens/common/types.ts b/x-pack/plugins/lens/common/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/common/types.ts
rename to x-pack/plugins/lens/common/types.ts
diff --git a/x-pack/plugins/lens/kibana.json b/x-pack/plugins/lens/kibana.json
new file mode 100644
index 0000000000000..867a7454f0448
--- /dev/null
+++ b/x-pack/plugins/lens/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "lens",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": false,
+  "optionalPlugins": ["usageCollection", "taskManager"]
+}
diff --git a/x-pack/plugins/lens/server/index.ts b/x-pack/plugins/lens/server/index.ts
new file mode 100644
index 0000000000000..3b9e94986d247
--- /dev/null
+++ b/x-pack/plugins/lens/server/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { LensServerPlugin } from './plugin';
+
+export * from './plugin';
+
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new LensServerPlugin(initializerContext);
diff --git a/x-pack/plugins/lens/server/plugin.tsx b/x-pack/plugins/lens/server/plugin.tsx
new file mode 100644
index 0000000000000..e805f9f7e0a92
--- /dev/null
+++ b/x-pack/plugins/lens/server/plugin.tsx
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from 'src/core/server';
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+import { Observable } from 'rxjs';
+import { TaskManagerSetupContract, TaskManagerStartContract } from '../../task_manager/server';
+import { setupRoutes } from './routes';
+import {
+  registerLensUsageCollector,
+  initializeLensTelemetry,
+  scheduleLensTelemetry,
+} from './usage';
+
+export interface PluginSetupContract {
+  usageCollection?: UsageCollectionSetup;
+  taskManager?: TaskManagerSetupContract;
+}
+
+export interface PluginStartContract {
+  taskManager?: TaskManagerStartContract;
+}
+
+export class LensServerPlugin implements Plugin<{}, {}, {}, {}> {
+  private readonly kibanaIndexConfig: Observable<{ kibana: { index: string } }>;
+  private readonly telemetryLogger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.kibanaIndexConfig = initializerContext.config.legacy.globalConfig$;
+    this.telemetryLogger = initializerContext.logger.get('telemetry');
+  }
+  setup(core: CoreSetup<PluginStartContract>, plugins: PluginSetupContract) {
+    setupRoutes(core);
+    if (plugins.usageCollection && plugins.taskManager) {
+      registerLensUsageCollector(
+        plugins.usageCollection,
+        core
+          .getStartServices()
+          .then(([_, { taskManager }]) => taskManager as TaskManagerStartContract)
+      );
+      initializeLensTelemetry(
+        this.telemetryLogger,
+        core,
+        this.kibanaIndexConfig,
+        plugins.taskManager
+      );
+    }
+    return {};
+  }
+
+  start(core: CoreStart, plugins: PluginStartContract) {
+    if (plugins.taskManager) {
+      scheduleLensTelemetry(this.telemetryLogger, plugins.taskManager);
+    }
+    return {};
+  }
+
+  stop() {}
+}
diff --git a/x-pack/legacy/plugins/lens/server/routes/existing_fields.test.ts b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/server/routes/existing_fields.test.ts
rename to x-pack/plugins/lens/server/routes/existing_fields.test.ts
diff --git a/x-pack/legacy/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
similarity index 98%
rename from x-pack/legacy/plugins/lens/server/routes/existing_fields.ts
rename to x-pack/plugins/lens/server/routes/existing_fields.ts
index 30ded3572cae7..a059e32585909 100644
--- a/x-pack/legacy/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -6,11 +6,10 @@
 
 import Boom from 'boom';
 import { schema } from '@kbn/config-schema';
-import _ from 'lodash';
 import { IScopedClusterClient, SavedObject, RequestHandlerContext } from 'src/core/server';
 import { CoreSetup } from 'src/core/server';
 import { BASE_API_URL } from '../../common';
-import { IndexPatternsFetcher } from '../../../../../../src/plugins/data/server';
+import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
 
 /**
  * The number of docs to sample to determine field empty status.
diff --git a/x-pack/legacy/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/server/routes/field_stats.ts
rename to x-pack/plugins/lens/server/routes/field_stats.ts
diff --git a/x-pack/legacy/plugins/lens/server/routes/index.ts b/x-pack/plugins/lens/server/routes/index.ts
similarity index 59%
rename from x-pack/legacy/plugins/lens/server/routes/index.ts
rename to x-pack/plugins/lens/server/routes/index.ts
index 79690b40395d6..8bc04a56e16d5 100644
--- a/x-pack/legacy/plugins/lens/server/routes/index.ts
+++ b/x-pack/plugins/lens/server/routes/index.ts
@@ -4,20 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaConfig } from 'src/legacy/server/kbn_server';
-import { CoreSetup, SavedObjectsLegacyService } from 'src/core/server';
+import { CoreSetup } from 'src/core/server';
 import { existingFieldsRoute } from './existing_fields';
 import { initFieldsRoute } from './field_stats';
 import { initLensUsageRoute } from './telemetry';
 
-export function setupRoutes(
-  setup: CoreSetup,
-  plugins: {
-    savedObjects: SavedObjectsLegacyService;
-    config: KibanaConfig;
-  }
-) {
+export function setupRoutes(setup: CoreSetup) {
   existingFieldsRoute(setup);
   initFieldsRoute(setup);
-  initLensUsageRoute(setup, plugins);
+  initLensUsageRoute(setup);
 }
diff --git a/x-pack/legacy/plugins/lens/server/routes/telemetry.ts b/x-pack/plugins/lens/server/routes/telemetry.ts
similarity index 75%
rename from x-pack/legacy/plugins/lens/server/routes/telemetry.ts
rename to x-pack/plugins/lens/server/routes/telemetry.ts
index 895b77cfa8978..7925416ff5df2 100644
--- a/x-pack/legacy/plugins/lens/server/routes/telemetry.ts
+++ b/x-pack/plugins/lens/server/routes/telemetry.ts
@@ -5,29 +5,13 @@
  */
 
 import Boom from 'boom';
-import { KibanaConfig } from 'src/legacy/server/kbn_server';
-import { CoreSetup, SavedObjectsLegacyService } from 'src/core/server';
+import { CoreSetup } from 'src/core/server';
 import { schema } from '@kbn/config-schema';
 import { BASE_API_URL } from '../../common';
 
-export function getSavedObjectsClient(
-  savedObjects: SavedObjectsLegacyService,
-  callAsInternalUser: unknown
-) {
-  const { SavedObjectsClient, getSavedObjectsRepository } = savedObjects;
-  const internalRepository = getSavedObjectsRepository(callAsInternalUser);
-  return new SavedObjectsClient(internalRepository);
-}
-
 // This route is responsible for taking a batch of click events from the browser
 // and writing them to saved objects
-export async function initLensUsageRoute(
-  setup: CoreSetup,
-  plugins: {
-    savedObjects: SavedObjectsLegacyService;
-    config: KibanaConfig;
-  }
-) {
+export async function initLensUsageRoute(setup: CoreSetup) {
   const router = setup.http.createRouter();
   router.post(
     {
@@ -43,12 +27,10 @@ export async function initLensUsageRoute(
       },
     },
     async (context, req, res) => {
-      const { dataClient } = context.core.elasticsearch;
-
       const { events, suggestionEvents } = req.body;
 
       try {
-        const client = getSavedObjectsClient(plugins.savedObjects, dataClient.callAsCurrentUser);
+        const client = context.core.savedObjects.client;
 
         const allEvents: Array<{
           type: 'lens-ui-telemetry';
diff --git a/x-pack/legacy/plugins/lens/server/usage/collectors.ts b/x-pack/plugins/lens/server/usage/collectors.ts
similarity index 97%
rename from x-pack/legacy/plugins/lens/server/usage/collectors.ts
rename to x-pack/plugins/lens/server/usage/collectors.ts
index 666b3718d5125..52de0df6fed13 100644
--- a/x-pack/legacy/plugins/lens/server/usage/collectors.ts
+++ b/x-pack/plugins/lens/server/usage/collectors.ts
@@ -7,7 +7,7 @@
 import moment from 'moment';
 import { get } from 'lodash';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
-import { TaskManagerStartContract } from '../../../../../plugins/task_manager/server';
+import { TaskManagerStartContract } from '../../../task_manager/server';
 
 import { LensUsage, LensTelemetryState } from './types';
 
diff --git a/x-pack/legacy/plugins/lens/server/usage/index.ts b/x-pack/plugins/lens/server/usage/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/server/usage/index.ts
rename to x-pack/plugins/lens/server/usage/index.ts
diff --git a/x-pack/legacy/plugins/lens/server/usage/task.ts b/x-pack/plugins/lens/server/usage/task.ts
similarity index 62%
rename from x-pack/legacy/plugins/lens/server/usage/task.ts
rename to x-pack/plugins/lens/server/usage/task.ts
index 26b44832feaa6..e2462be149745 100644
--- a/x-pack/legacy/plugins/lens/server/usage/task.ts
+++ b/x-pack/plugins/lens/server/usage/task.ts
@@ -4,24 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { APICaller, CoreSetup, Logger } from 'kibana/server';
+import { Observable } from 'rxjs';
 import moment from 'moment';
-import KbnServer, { Server } from 'src/legacy/server/kbn_server';
-import { CallClusterOptions } from 'src/legacy/core_plugins/elasticsearch';
-import {
-  SearchParams,
-  DeleteDocumentByQueryParams,
-  SearchResponse,
-  DeleteDocumentByQueryResponse,
-} from 'elasticsearch';
-import { ESSearchResponse } from '../../../apm/typings/elasticsearch';
-import { XPackMainPlugin } from '../../../xpack_main/server/xpack_main';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
-} from '../../../../../plugins/task_manager/server';
+} from '../../../task_manager/server';
 
 import { getVisualizationCounts } from './visualization_counts';
+import { ESSearchResponse } from '../../../apm/typings/elasticsearch';
 
 // This task is responsible for running daily and aggregating all the Lens click event objects
 // into daily rolled-up documents, which will be used in reporting click stats
@@ -30,74 +23,53 @@ const TELEMETRY_TASK_TYPE = 'lens_telemetry';
 
 export const TASK_ID = `Lens-${TELEMETRY_TASK_TYPE}`;
 
-type ClusterSearchType = (
-  endpoint: 'search',
-  params: SearchParams & {
-    rest_total_hits_as_int: boolean;
-  },
-  options?: CallClusterOptions
-) => Promise<SearchResponse<unknown>>;
-type ClusterDeleteType = (
-  endpoint: 'deleteByQuery',
-  params: DeleteDocumentByQueryParams,
-  options?: CallClusterOptions
-) => Promise<DeleteDocumentByQueryResponse>;
-
-export function initializeLensTelemetry(server: Server, taskManager?: TaskManagerSetupContract) {
-  if (!taskManager) {
-    server.log(['debug', 'telemetry'], `Task manager is not available`);
-  } else {
-    registerLensTelemetryTask(server, taskManager);
-  }
+export function initializeLensTelemetry(
+  logger: Logger,
+  core: CoreSetup,
+  config: Observable<{ kibana: { index: string } }>,
+  taskManager: TaskManagerSetupContract
+) {
+  registerLensTelemetryTask(logger, core, config, taskManager);
 }
 
-export function scheduleLensTelemetry(server: Server, taskManager?: TaskManagerStartContract) {
+export function scheduleLensTelemetry(logger: Logger, taskManager?: TaskManagerStartContract) {
   if (taskManager) {
-    scheduleTasks(server, taskManager);
+    scheduleTasks(logger, taskManager);
   }
 }
 
-function registerLensTelemetryTask(server: Server, taskManager: TaskManagerSetupContract) {
+function registerLensTelemetryTask(
+  logger: Logger,
+  core: CoreSetup,
+  config: Observable<{ kibana: { index: string } }>,
+  taskManager: TaskManagerSetupContract
+) {
   taskManager.registerTaskDefinitions({
     [TELEMETRY_TASK_TYPE]: {
       title: 'Lens telemetry fetch task',
       type: TELEMETRY_TASK_TYPE,
       timeout: '1m',
-      createTaskRunner: telemetryTaskRunner(server),
+      createTaskRunner: telemetryTaskRunner(logger, core, config),
     },
   });
 }
 
-function scheduleTasks(server: Server, taskManager: TaskManagerStartContract) {
-  const { kbnServer } = (server.plugins.xpack_main as XPackMainPlugin & {
-    status: { plugin: { kbnServer: KbnServer } };
-  }).status.plugin;
-
-  kbnServer.afterPluginsInit(() => {
-    // The code block below can't await directly within "afterPluginsInit"
-    // callback due to circular dependency The server isn't "ready" until
-    // this code block finishes. Migrations wait for server to be ready before
-    // executing. Saved objects repository waits for migrations to finish before
-    // finishing the request. To avoid this, we'll await within a separate
-    // function block.
-    (async () => {
-      try {
-        await taskManager.ensureScheduled({
-          id: TASK_ID,
-          taskType: TELEMETRY_TASK_TYPE,
-          state: { byDate: {}, suggestionsByDate: {}, saved: {}, runs: 0 },
-          params: {},
-        });
-      } catch (e) {
-        server.log(['debug', 'telemetry'], `Error scheduling task, received ${e.message}`);
-      }
-    })();
-  });
+async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContract) {
+  try {
+    await taskManager.ensureScheduled({
+      id: TASK_ID,
+      taskType: TELEMETRY_TASK_TYPE,
+      state: { byDate: {}, suggestionsByDate: {}, saved: {}, runs: 0 },
+      params: {},
+    });
+  } catch (e) {
+    logger.debug(`Error scheduling task, received ${e.message}`);
+  }
 }
 
 export async function getDailyEvents(
   kibanaIndex: string,
-  callCluster: ClusterSearchType & ClusterDeleteType
+  callCluster: APICaller
 ): Promise<{
   byDate: Record<string, Record<string, number>>;
   suggestionsByDate: Record<string, Record<string, number>>;
@@ -205,18 +177,22 @@ export async function getDailyEvents(
   };
 }
 
-export function telemetryTaskRunner(server: Server) {
+export function telemetryTaskRunner(
+  logger: Logger,
+  core: CoreSetup,
+  config: Observable<{ kibana: { index: string } }>
+) {
   return ({ taskInstance }: RunContext) => {
     const { state } = taskInstance;
-    const callCluster = server.plugins.elasticsearch.getCluster('admin').callWithInternalUser;
+    const callCluster = core.elasticsearch.adminClient.callAsInternalUser;
 
     return {
       async run() {
-        const kibanaIndex = server.config().get<string>('kibana.index');
+        const kibanaIndex = (await config.toPromise()).kibana.index;
 
         return Promise.all([
           getDailyEvents(kibanaIndex, callCluster),
-          getVisualizationCounts(callCluster, server.config()),
+          getVisualizationCounts(callCluster, kibanaIndex),
         ])
           .then(([lensTelemetry, lensVisualizations]) => {
             return {
@@ -229,9 +205,7 @@ export function telemetryTaskRunner(server: Server) {
               runAt: getNextMidnight(),
             };
           })
-          .catch(errMsg =>
-            server.log(['warning'], `Error executing lens telemetry task: ${errMsg}`)
-          );
+          .catch(errMsg => logger.warn(`Error executing lens telemetry task: ${errMsg}`));
       },
     };
   };
diff --git a/x-pack/legacy/plugins/lens/server/usage/types.ts b/x-pack/plugins/lens/server/usage/types.ts
similarity index 100%
rename from x-pack/legacy/plugins/lens/server/usage/types.ts
rename to x-pack/plugins/lens/server/usage/types.ts
diff --git a/x-pack/legacy/plugins/lens/server/usage/visualization_counts.ts b/x-pack/plugins/lens/server/usage/visualization_counts.ts
similarity index 85%
rename from x-pack/legacy/plugins/lens/server/usage/visualization_counts.ts
rename to x-pack/plugins/lens/server/usage/visualization_counts.ts
index 7c1dc5fca6d85..00b84fe100224 100644
--- a/x-pack/legacy/plugins/lens/server/usage/visualization_counts.ts
+++ b/x-pack/plugins/lens/server/usage/visualization_counts.ts
@@ -4,22 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { KibanaConfig } from 'src/legacy/server/kbn_server';
-import { CallClusterOptions } from 'src/legacy/core_plugins/elasticsearch';
-import { SearchParams, SearchResponse } from 'elasticsearch';
+import { APICaller } from 'kibana/server';
 import { LensVisualizationUsage } from './types';
 
-type ClusterSearchType = (
-  endpoint: 'search',
-  params: SearchParams & {
-    rest_total_hits_as_int: boolean;
-  },
-  options?: CallClusterOptions
-) => Promise<SearchResponse<unknown>>;
-
 export async function getVisualizationCounts(
-  callCluster: ClusterSearchType,
-  config: KibanaConfig
+  callCluster: APICaller,
+  kibanaIndex: string
 ): Promise<LensVisualizationUsage> {
   const scriptedMetric = {
     scripted_metric: {
@@ -53,7 +43,7 @@ export async function getVisualizationCounts(
   };
 
   const results = await callCluster('search', {
-    index: config.get('kibana.index'),
+    index: kibanaIndex,
     rest_total_hits_as_int: true,
     body: {
       query: {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b98eabad466ed..ae5445a2c3828 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -3873,7 +3873,6 @@
     "xpack.apm.serviceDetails.metricsTabLabel": "メトリック",
     "xpack.apm.serviceDetails.nodesTabLabel": "JVM",
     "xpack.apm.serviceDetails.transactionsTabLabel": "トランザクション",
-    "xpack.apm.serviceMap.fullscreen": "全画面",
     "xpack.apm.serviceMap.zoomIn": "ズームイン",
     "xpack.apm.serviceMap.zoomOut": "ズームアウト",
     "xpack.apm.serviceNodeMetrics.containerId": "コンテナー ID",
@@ -13198,4 +13197,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
     "xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 1c87541ae107a..c3a18c99ae550 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -3873,7 +3873,6 @@
     "xpack.apm.serviceDetails.metricsTabLabel": "指标",
     "xpack.apm.serviceDetails.nodesTabLabel": "JVM",
     "xpack.apm.serviceDetails.transactionsTabLabel": "事务",
-    "xpack.apm.serviceMap.fullscreen": "全屏",
     "xpack.apm.serviceMap.zoomIn": "放大",
     "xpack.apm.serviceMap.zoomOut": "缩小",
     "xpack.apm.serviceNodeMetrics.containerId": "容器 ID",
@@ -13197,4 +13196,4 @@
     "xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
     "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
   }
-}
+}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 5e6830c8f4689..653df453c2560 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -6,14 +6,13 @@
 
 import moment from 'moment';
 import expect from '@kbn/expect';
-import { KibanaConfig } from 'src/legacy/server/kbn_server';
 import { Client, SearchParams } from 'elasticsearch';
+import { APICaller } from 'kibana/server';
 
-import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-import { getDailyEvents } from '../../../../legacy/plugins/lens/server/usage/task';
-import { getVisualizationCounts } from '../../../../legacy/plugins/lens/server/usage/visualization_counts';
+import { getDailyEvents } from '../../../../plugins/lens/server/usage/task';
+import { getVisualizationCounts } from '../../../../plugins/lens/server/usage/visualization_counts';
 
 const COMMON_HEADERS = {
   'kbn-xsrf': 'some-xsrf-token',
@@ -23,9 +22,9 @@ const COMMON_HEADERS = {
 export default ({ getService }: FtrProviderContext) => {
   const supertest = getService('supertest');
   const es: Client = getService('legacyEs');
-  const callCluster: CallCluster = (((path: 'search', searchParams: SearchParams) => {
+  const callCluster: APICaller = (((path: 'search', searchParams: SearchParams) => {
     return es[path].call(es, searchParams);
-  }) as unknown) as CallCluster;
+  }) as unknown) as APICaller;
 
   async function assertExpectedSavedObjects(num: number) {
     // Make sure that new/deleted docs are available to search
@@ -189,13 +188,7 @@ export default ({ getService }: FtrProviderContext) => {
 
       await esArchiver.loadIfNeeded('lens/basic');
 
-      const results = await getVisualizationCounts(callCluster, {
-        // Fake KibanaConfig service
-        get() {
-          return '.kibana';
-        },
-        has: () => false,
-      } as KibanaConfig);
+      const results = await getVisualizationCounts(callCluster, '.kibana');
 
       expect(results).to.have.keys([
         'saved_overall',
diff --git a/x-pack/test/functional/services/uptime.ts b/x-pack/test/functional/services/uptime.ts
index 1d8e0c97b99c4..938be2c71ae74 100644
--- a/x-pack/test/functional/services/uptime.ts
+++ b/x-pack/test/functional/services/uptime.ts
@@ -9,6 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 export function UptimeProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
+  const retry = getService('retry');
 
   return {
     async assertExists(key: string) {
@@ -17,7 +18,9 @@ export function UptimeProvider({ getService }: FtrProviderContext) {
       }
     },
     async monitorIdExists(key: string) {
-      await testSubjects.existOrFail(key);
+      await retry.tryForTime(10000, async () => {
+        await testSubjects.existOrFail(key);
+      });
     },
     async monitorPageLinkExists(monitorId: string) {
       await testSubjects.existOrFail(`monitor-page-link-${monitorId}`);