From 66066c3bab9989b21cfa558b875fa02dc1399a53 Mon Sep 17 00:00:00 2001
From: Melissa Alvarez <melissa.alvarez@elastic.co>
Date: Thu, 30 Jan 2020 09:59:38 -0500
Subject: [PATCH 01/23] [ML] New Platform server shim: update calendar routes
 to use new platform router (#56264) (#56379)

* migrate calendar routes to NP

* add proper types for calendars and events

* set actual client in constructor so isLegacy is not stored

* remove unnecessary comments

* fix calendar schema for missing calendar_id and event_id properties
---
 ...alendar_manager.js => calendar_manager.ts} |  88 ++++++----
 .../{event_manager.js => event_manager.ts}    |  39 +++--
 .../models/calendar/{index.js => index.ts}    |   2 +-
 .../ml/server/models/job_service/groups.js    |   2 +-
 .../ml/server/models/job_service/jobs.js      |   2 +-
 .../server/new_platform/calendars_schema.ts   |  25 +++
 .../plugins/ml/server/new_platform/plugin.ts  |   2 -
 .../plugins/ml/server/routes/calendars.js     | 110 -------------
 .../plugins/ml/server/routes/calendars.ts     | 155 ++++++++++++++++++
 9 files changed, 268 insertions(+), 157 deletions(-)
 rename x-pack/legacy/plugins/ml/server/models/calendar/{calendar_manager.js => calendar_manager.ts} (53%)
 rename x-pack/legacy/plugins/ml/server/models/calendar/{event_manager.js => event_manager.ts} (51%)
 rename x-pack/legacy/plugins/ml/server/models/calendar/{index.js => index.ts} (75%)
 create mode 100644 x-pack/legacy/plugins/ml/server/new_platform/calendars_schema.ts
 delete mode 100644 x-pack/legacy/plugins/ml/server/routes/calendars.js
 create mode 100644 x-pack/legacy/plugins/ml/server/routes/calendars.ts

diff --git a/x-pack/legacy/plugins/ml/server/models/calendar/calendar_manager.js b/x-pack/legacy/plugins/ml/server/models/calendar/calendar_manager.ts
similarity index 53%
rename from x-pack/legacy/plugins/ml/server/models/calendar/calendar_manager.js
rename to x-pack/legacy/plugins/ml/server/models/calendar/calendar_manager.ts
index e74a81e92420f..2487943b5efc0 100644
--- a/x-pack/legacy/plugins/ml/server/models/calendar/calendar_manager.js
+++ b/x-pack/legacy/plugins/ml/server/models/calendar/calendar_manager.ts
@@ -4,23 +4,44 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import _ from 'lodash';
+import { difference } from 'lodash';
 import Boom from 'boom';
-import { EventManager } from './event_manager';
+import { EventManager, CalendarEvent } from './event_manager';
+
+interface BasicCalendar {
+  job_ids: string[];
+  description?: string;
+  events: CalendarEvent[];
+}
+
+export interface Calendar extends BasicCalendar {
+  calendar_id: string;
+}
+
+export interface FormCalendar extends BasicCalendar {
+  calendarId: string;
+}
 
 export class CalendarManager {
-  constructor(callWithRequest) {
-    this.callWithRequest = callWithRequest;
-    this.eventManager = new EventManager(callWithRequest);
+  private _client: any;
+  private _eventManager: any;
+
+  constructor(isLegacy: boolean, client: any) {
+    const actualClient = isLegacy === true ? client : client.ml!.mlClient.callAsCurrentUser;
+    this._client = actualClient;
+    this._eventManager = new EventManager(actualClient);
   }
 
-  async getCalendar(calendarId) {
+  async getCalendar(calendarId: string) {
     try {
-      const resp = await this.callWithRequest('ml.calendars', { calendarId });
+      const resp = await this._client('ml.calendars', {
+        calendarId,
+      });
+
       const calendars = resp.calendars;
       if (calendars.length) {
         const calendar = calendars[0];
-        calendar.events = await this.eventManager.getCalendarEvents(calendarId);
+        calendar.events = await this._eventManager.getCalendarEvents(calendarId);
         return calendar;
       } else {
         throw Boom.notFound(`Calendar with the id "${calendarId}" not found`);
@@ -32,9 +53,10 @@ export class CalendarManager {
 
   async getAllCalendars() {
     try {
-      const calendarsResp = await this.callWithRequest('ml.calendars');
-      const events = await this.eventManager.getAllEvents();
-      const calendars = calendarsResp.calendars;
+      const calendarsResp = await this._client('ml.calendars');
+
+      const events: CalendarEvent[] = await this._eventManager.getAllEvents();
+      const calendars: Calendar[] = calendarsResp.calendars;
       calendars.forEach(cal => (cal.events = []));
 
       // loop events and combine with related calendars
@@ -55,24 +77,28 @@ export class CalendarManager {
    * @param calendarIds
    * @returns {Promise<*>}
    */
-  async getCalendarsByIds(calendarIds) {
+  async getCalendarsByIds(calendarIds: string) {
     try {
-      const calendars = await this.getAllCalendars();
+      const calendars: Calendar[] = await this.getAllCalendars();
       return calendars.filter(calendar => calendarIds.includes(calendar.calendar_id));
     } catch (error) {
       throw Boom.badRequest(error);
     }
   }
 
-  async newCalendar(calendar) {
+  async newCalendar(calendar: FormCalendar) {
     const calendarId = calendar.calendarId;
     const events = calendar.events;
     delete calendar.calendarId;
     delete calendar.events;
     try {
-      await this.callWithRequest('ml.addCalendar', { calendarId, body: calendar });
+      await this._client('ml.addCalendar', {
+        calendarId,
+        body: calendar,
+      });
+
       if (events.length) {
-        await this.eventManager.addEvents(calendarId, events);
+        await this._eventManager.addEvents(calendarId, events);
       }
 
       // return the newly created calendar
@@ -82,38 +108,38 @@ export class CalendarManager {
     }
   }
 
-  async updateCalendar(calendarId, calendar) {
-    const origCalendar = await this.getCalendar(calendarId);
+  async updateCalendar(calendarId: string, calendar: Calendar) {
+    const origCalendar: Calendar = await this.getCalendar(calendarId);
     try {
       // update job_ids
-      const jobsToAdd = _.difference(calendar.job_ids, origCalendar.job_ids);
-      const jobsToRemove = _.difference(origCalendar.job_ids, calendar.job_ids);
+      const jobsToAdd = difference(calendar.job_ids, origCalendar.job_ids);
+      const jobsToRemove = difference(origCalendar.job_ids, calendar.job_ids);
 
       // workout the differences between the original events list and the new one
       // if an event has no event_id, it must be new
       const eventsToAdd = calendar.events.filter(
-        event => origCalendar.events.find(e => this.eventManager.isEqual(e, event)) === undefined
+        event => origCalendar.events.find(e => this._eventManager.isEqual(e, event)) === undefined
       );
 
       // if an event in the original calendar cannot be found, it must have been deleted
-      const eventsToRemove = origCalendar.events.filter(
-        event => calendar.events.find(e => this.eventManager.isEqual(e, event)) === undefined
+      const eventsToRemove: CalendarEvent[] = origCalendar.events.filter(
+        event => calendar.events.find(e => this._eventManager.isEqual(e, event)) === undefined
       );
 
       // note, both of the loops below could be removed if the add and delete endpoints
       // allowed multiple job_ids
 
-      //add all new jobs
+      // add all new jobs
       if (jobsToAdd.length) {
-        await this.callWithRequest('ml.addJobToCalendar', {
+        await this._client('ml.addJobToCalendar', {
           calendarId,
           jobId: jobsToAdd.join(','),
         });
       }
 
-      //remove all removed jobs
+      // remove all removed jobs
       if (jobsToRemove.length) {
-        await this.callWithRequest('ml.removeJobFromCalendar', {
+        await this._client('ml.removeJobFromCalendar', {
           calendarId,
           jobId: jobsToRemove.join(','),
         });
@@ -121,13 +147,13 @@ export class CalendarManager {
 
       // add all new events
       if (eventsToAdd.length !== 0) {
-        await this.eventManager.addEvents(calendarId, eventsToAdd);
+        await this._eventManager.addEvents(calendarId, eventsToAdd);
       }
 
       // remove all removed events
       await Promise.all(
         eventsToRemove.map(async event => {
-          await this.eventManager.deleteEvent(calendarId, event.event_id);
+          await this._eventManager.deleteEvent(calendarId, event.event_id);
         })
       );
     } catch (error) {
@@ -138,7 +164,7 @@ export class CalendarManager {
     return await this.getCalendar(calendarId);
   }
 
-  async deleteCalendar(calendarId) {
-    return this.callWithRequest('ml.deleteCalendar', { calendarId });
+  async deleteCalendar(calendarId: string) {
+    return this._client('ml.deleteCalendar', { calendarId });
   }
 }
diff --git a/x-pack/legacy/plugins/ml/server/models/calendar/event_manager.js b/x-pack/legacy/plugins/ml/server/models/calendar/event_manager.ts
similarity index 51%
rename from x-pack/legacy/plugins/ml/server/models/calendar/event_manager.js
rename to x-pack/legacy/plugins/ml/server/models/calendar/event_manager.ts
index 8bdb5dcf4a3e3..19f2eda466179 100644
--- a/x-pack/legacy/plugins/ml/server/models/calendar/event_manager.js
+++ b/x-pack/legacy/plugins/ml/server/models/calendar/event_manager.ts
@@ -6,14 +6,24 @@
 
 import Boom from 'boom';
 
+export interface CalendarEvent {
+  calendar_id?: string;
+  event_id?: string;
+  description: string;
+  start_time: number;
+  end_time: number;
+}
+
 export class EventManager {
-  constructor(callWithRequest) {
-    this.callWithRequest = callWithRequest;
+  private _client: any;
+  constructor(client: any) {
+    this._client = client;
   }
 
-  async getCalendarEvents(calendarId) {
+  async getCalendarEvents(calendarId: string) {
     try {
-      const resp = await this.callWithRequest('ml.events', { calendarId });
+      const resp = await this._client('ml.events', { calendarId });
+
       return resp.events;
     } catch (error) {
       throw Boom.badRequest(error);
@@ -21,31 +31,38 @@ export class EventManager {
   }
 
   // jobId is optional
-  async getAllEvents(jobId) {
+  async getAllEvents(jobId?: string) {
     const calendarId = '_all';
     try {
-      const resp = await this.callWithRequest('ml.events', { calendarId, jobId });
+      const resp = await this._client('ml.events', {
+        calendarId,
+        jobId,
+      });
+
       return resp.events;
     } catch (error) {
       throw Boom.badRequest(error);
     }
   }
 
-  async addEvents(calendarId, events) {
+  async addEvents(calendarId: string, events: CalendarEvent[]) {
     const body = { events };
 
     try {
-      return await this.callWithRequest('ml.addEvent', { calendarId, body });
+      return await this._client('ml.addEvent', {
+        calendarId,
+        body,
+      });
     } catch (error) {
       throw Boom.badRequest(error);
     }
   }
 
-  async deleteEvent(calendarId, eventId) {
-    return this.callWithRequest('ml.deleteEvent', { calendarId, eventId });
+  async deleteEvent(calendarId: string, eventId: string) {
+    return this._client('ml.deleteEvent', { calendarId, eventId });
   }
 
-  isEqual(ev1, ev2) {
+  isEqual(ev1: CalendarEvent, ev2: CalendarEvent) {
     return (
       ev1.event_id === ev2.event_id &&
       ev1.description === ev2.description &&
diff --git a/x-pack/legacy/plugins/ml/server/models/calendar/index.js b/x-pack/legacy/plugins/ml/server/models/calendar/index.ts
similarity index 75%
rename from x-pack/legacy/plugins/ml/server/models/calendar/index.js
rename to x-pack/legacy/plugins/ml/server/models/calendar/index.ts
index 11f99bc8fd922..2364c3ac73811 100644
--- a/x-pack/legacy/plugins/ml/server/models/calendar/index.js
+++ b/x-pack/legacy/plugins/ml/server/models/calendar/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { CalendarManager } from './calendar_manager';
+export { CalendarManager, Calendar, FormCalendar } from './calendar_manager';
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/groups.js b/x-pack/legacy/plugins/ml/server/models/job_service/groups.js
index 91f82f04a9a0c..58237b2a8a730 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/groups.js
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/groups.js
@@ -7,7 +7,7 @@
 import { CalendarManager } from '../calendar';
 
 export function groupsProvider(callWithRequest) {
-  const calMngr = new CalendarManager(callWithRequest);
+  const calMngr = new CalendarManager(true, callWithRequest);
 
   async function getAllGroups() {
     const groups = {};
diff --git a/x-pack/legacy/plugins/ml/server/models/job_service/jobs.js b/x-pack/legacy/plugins/ml/server/models/job_service/jobs.js
index b4b476c1f926e..e60593c9f0ed5 100644
--- a/x-pack/legacy/plugins/ml/server/models/job_service/jobs.js
+++ b/x-pack/legacy/plugins/ml/server/models/job_service/jobs.js
@@ -22,7 +22,7 @@ export function jobsProvider(callWithRequest) {
   const { forceDeleteDatafeed, getDatafeedIdsByJobId } = datafeedsProvider(callWithRequest);
   const { getAuditMessagesSummary } = jobAuditMessagesProvider(callWithRequest);
   const { getLatestBucketTimestampByJob } = resultsServiceProvider(callWithRequest);
-  const calMngr = new CalendarManager(callWithRequest);
+  const calMngr = new CalendarManager(true, callWithRequest);
 
   async function forceDeleteJob(jobId) {
     return callWithRequest('ml.deleteJob', { jobId, force: true });
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/calendars_schema.ts b/x-pack/legacy/plugins/ml/server/new_platform/calendars_schema.ts
new file mode 100644
index 0000000000000..f5e59d983a9aa
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/new_platform/calendars_schema.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+export const calendarSchema = {
+  calendar_id: schema.maybe(schema.string()),
+  calendarId: schema.string(),
+  job_ids: schema.arrayOf(schema.maybe(schema.string())),
+  description: schema.maybe(schema.string()),
+  events: schema.arrayOf(
+    schema.maybe(
+      schema.object({
+        event_id: schema.maybe(schema.string()),
+        calendar_id: schema.maybe(schema.string()),
+        description: schema.maybe(schema.string()),
+        start_time: schema.any(),
+        end_time: schema.any(),
+      })
+    )
+  ),
+};
diff --git a/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts b/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
index 681b2ff20c8aa..2b9219b2226f5 100644
--- a/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
+++ b/x-pack/legacy/plugins/ml/server/new_platform/plugin.ts
@@ -41,13 +41,11 @@ import { makeMlUsageCollector } from '../lib/ml_telemetry';
 import { notificationRoutes } from '../routes/notification_settings';
 // @ts-ignore: could not find declaration file for module
 import { systemRoutes } from '../routes/system';
-// @ts-ignore: could not find declaration file for module
 import { dataFrameAnalyticsRoutes } from '../routes/data_frame_analytics';
 // @ts-ignore: could not find declaration file for module
 import { dataRecognizer } from '../routes/modules';
 // @ts-ignore: could not find declaration file for module
 import { dataVisualizerRoutes } from '../routes/data_visualizer';
-// @ts-ignore: could not find declaration file for module
 import { calendars } from '../routes/calendars';
 // @ts-ignore: could not find declaration file for module
 import { fieldsService } from '../routes/fields_service';
diff --git a/x-pack/legacy/plugins/ml/server/routes/calendars.js b/x-pack/legacy/plugins/ml/server/routes/calendars.js
deleted file mode 100644
index 7a0f341ef9666..0000000000000
--- a/x-pack/legacy/plugins/ml/server/routes/calendars.js
+++ /dev/null
@@ -1,110 +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';
-import { CalendarManager } from '../models/calendar';
-
-function getAllCalendars(callWithRequest) {
-  const cal = new CalendarManager(callWithRequest);
-  return cal.getAllCalendars();
-}
-
-function getCalendar(callWithRequest, calendarId) {
-  const cal = new CalendarManager(callWithRequest);
-  return cal.getCalendar(calendarId);
-}
-
-function newCalendar(callWithRequest, calendar) {
-  const cal = new CalendarManager(callWithRequest);
-  return cal.newCalendar(calendar);
-}
-
-function updateCalendar(callWithRequest, calendarId, calendar) {
-  const cal = new CalendarManager(callWithRequest);
-  return cal.updateCalendar(calendarId, calendar);
-}
-
-function deleteCalendar(callWithRequest, calendarId) {
-  const cal = new CalendarManager(callWithRequest);
-  return cal.deleteCalendar(calendarId);
-}
-
-function getCalendarsByIds(callWithRequest, calendarIds) {
-  const cal = new CalendarManager(callWithRequest);
-  return cal.getCalendarsByIds(calendarIds);
-}
-
-export function calendars({ commonRouteConfig, elasticsearchPlugin, route }) {
-  route({
-    method: 'GET',
-    path: '/api/ml/calendars',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      return getAllCalendars(callWithRequest).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'GET',
-    path: '/api/ml/calendars/{calendarIds}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const calendarIds = request.params.calendarIds.split(',');
-      if (calendarIds.length === 1) {
-        return getCalendar(callWithRequest, calendarIds[0]).catch(resp => wrapError(resp));
-      } else {
-        return getCalendarsByIds(callWithRequest, calendarIds).catch(resp => wrapError(resp));
-      }
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'PUT',
-    path: '/api/ml/calendars',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const body = request.payload;
-      return newCalendar(callWithRequest, body).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'PUT',
-    path: '/api/ml/calendars/{calendarId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const calendarId = request.params.calendarId;
-      const body = request.payload;
-      return updateCalendar(callWithRequest, calendarId, body).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-
-  route({
-    method: 'DELETE',
-    path: '/api/ml/calendars/{calendarId}',
-    handler(request) {
-      const callWithRequest = callWithRequestFactory(elasticsearchPlugin, request);
-      const calendarId = request.params.calendarId;
-      return deleteCalendar(callWithRequest, calendarId).catch(resp => wrapError(resp));
-    },
-    config: {
-      ...commonRouteConfig,
-    },
-  });
-}
diff --git a/x-pack/legacy/plugins/ml/server/routes/calendars.ts b/x-pack/legacy/plugins/ml/server/routes/calendars.ts
new file mode 100644
index 0000000000000..19d614a4e6a22
--- /dev/null
+++ b/x-pack/legacy/plugins/ml/server/routes/calendars.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { RequestHandlerContext } from 'src/core/server';
+import { schema } from '@kbn/config-schema';
+import { licensePreRoutingFactory } from '../new_platform/licence_check_pre_routing_factory';
+import { wrapError } from '../client/error_wrapper';
+import { RouteInitialization } from '../new_platform/plugin';
+import { calendarSchema } from '../new_platform/calendars_schema';
+import { CalendarManager, Calendar, FormCalendar } from '../models/calendar';
+
+function getAllCalendars(context: RequestHandlerContext) {
+  const cal = new CalendarManager(false, context);
+  return cal.getAllCalendars();
+}
+
+function getCalendar(context: RequestHandlerContext, calendarId: string) {
+  const cal = new CalendarManager(false, context);
+  return cal.getCalendar(calendarId);
+}
+
+function newCalendar(context: RequestHandlerContext, calendar: FormCalendar) {
+  const cal = new CalendarManager(false, context);
+  return cal.newCalendar(calendar);
+}
+
+function updateCalendar(context: RequestHandlerContext, calendarId: string, calendar: Calendar) {
+  const cal = new CalendarManager(false, context);
+  return cal.updateCalendar(calendarId, calendar);
+}
+
+function deleteCalendar(context: RequestHandlerContext, calendarId: string) {
+  const cal = new CalendarManager(false, context);
+  return cal.deleteCalendar(calendarId);
+}
+
+function getCalendarsByIds(context: RequestHandlerContext, calendarIds: string) {
+  const cal = new CalendarManager(false, context);
+  return cal.getCalendarsByIds(calendarIds);
+}
+
+export function calendars({ xpackMainPlugin, router }: RouteInitialization) {
+  router.get(
+    {
+      path: '/api/ml/calendars',
+      validate: false,
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const resp = await getAllCalendars(context);
+
+        return response.ok({
+          body: resp,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.get(
+    {
+      path: '/api/ml/calendars/{calendarIds}',
+      validate: {
+        params: schema.object({ calendarIds: schema.string() }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      let returnValue;
+      try {
+        const calendarIds = request.params.calendarIds.split(',');
+
+        if (calendarIds.length === 1) {
+          returnValue = await getCalendar(context, calendarIds[0]);
+        } else {
+          returnValue = await getCalendarsByIds(context, calendarIds);
+        }
+
+        return response.ok({
+          body: returnValue,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.put(
+    {
+      path: '/api/ml/calendars',
+      validate: {
+        body: schema.object({ ...calendarSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const body = request.body;
+        const resp = await newCalendar(context, body);
+
+        return response.ok({
+          body: resp,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.put(
+    {
+      path: '/api/ml/calendars/{calendarId}',
+      validate: {
+        params: schema.object({ calendarId: schema.string() }),
+        body: schema.object({ ...calendarSchema }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { calendarId } = request.params;
+        const body = request.body;
+        const resp = await updateCalendar(context, calendarId, body);
+
+        return response.ok({
+          body: resp,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+
+  router.delete(
+    {
+      path: '/api/ml/calendars/{calendarId}',
+      validate: {
+        params: schema.object({ calendarId: schema.string() }),
+      },
+    },
+    licensePreRoutingFactory(xpackMainPlugin, async (context, request, response) => {
+      try {
+        const { calendarId } = request.params;
+        const resp = await deleteCalendar(context, calendarId);
+
+        return response.ok({
+          body: resp,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    })
+  );
+}

From 077a37bc19ceb2474adea5692db2874ae5fdf28d Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 30 Jan 2020 16:16:24 +0100
Subject: [PATCH 02/23] [Console] Move out of legacy + migrate server side to
 New Platform (#55690) (#56360)

* Initial move of public and setup of server skeleton

* Fix public paths and types

* Use new usage stats dependency directly in tracker also mark as an optional dependency

* WiP on getting server side working

* Restore proxy route behaviour for base case, still need to test custom proxy and SSL

* Add new type and lib files

* Clean up legacy start up code and add comment about issue in kibana.yml config for console

* Move console_extensions to new platform and introduce ConsoleSetup API for extending autocomplete
Add TODO regarding exposing legacy ES config

* Re-introduce injected elasticsearch variable and use it in public

* Don't pass stateSetter prop through to checkbox

* Refactor of proxy route (split into separate files). Easier testing for now.
Refactor file name of request.ts -> proxy_request.ts. This is consistent with the exported function now
Started fixing server side tests for the proxy route
  - Migrated away from sinon
  - Completed the body.js -> body.test.ts. Still have to do the rest

* headers.js test -> headers.test.ts and moved some of the proxy route mocking logic to a common space

* Finish migration of rest of proxy route test away from hapi
Add test for custom route validation

* Bring console application in line with https://github.com/elastic/kibana/blob/master/src/core/CONVENTIONS.md#applications
Change log from info level to debug level for console_extensions plugin

* Update i18nrc file for console

* Add setHeaders when passing back error response

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

# Conflicts:
#	.github/CODEOWNERS
#	src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
#	src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
#	src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_context.json
#	x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
#	x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json
---
 .i18nrc.json                                  |   2 +-
 .../server/http/router/response_adapter.ts    |  13 +-
 .../core_plugins/console/__tests__/index.js   |  75 ------
 src/legacy/core_plugins/console/index.ts      | 187 ---------------
 src/legacy/core_plugins/console/package.json  |   8 -
 .../core_plugins/console/public/legacy.ts     |  53 -----
 .../server/__tests__/proxy_route/headers.js   |  96 --------
 .../server/__tests__/proxy_route/params.js    | 170 --------------
 .../__tests__/proxy_route/query_string.js     | 137 -----------
 .../console/server/proxy_route.ts             | 171 --------------
 .../core_plugins/console_legacy/index.ts      |  51 ++++
 .../core_plugins/console_legacy/package.json  |   4 +
 .../public}/styles/_app.scss                  |   0
 .../public}/styles/components/_help.scss      |   0
 .../public}/styles/components/_history.scss   |   0
 .../public}/styles/components/_index.scss     |   0
 .../public}/styles/index.scss                 |   0
 .../console/common/text_object.ts             |   0
 src/plugins/console/common/types/index.ts     |  21 ++
 .../console/common/types/models.ts}           |   2 +-
 .../console/common/types/plugin_config.ts     |  22 ++
 .../public => plugins/console}/kibana.json    |   2 +-
 .../application/components/console_menu.tsx   |   0
 .../components/editor_content_spinner.tsx     |   0
 .../application/components/editor_example.tsx |   0
 .../application/components/help_panel.tsx     |   0
 .../public}/application/components/index.ts   |   0
 .../application/components/settings_modal.tsx |   5 +-
 .../something_went_wrong_callout.tsx          |   0
 .../application/components/top_nav_menu.tsx   |   0
 .../application/components/welcome_panel.tsx  |   0
 .../application/constants/help_example.txt    |   0
 .../console_history/console_history.tsx       |   0
 .../console_history/history_viewer.tsx        |   0
 .../containers/console_history/index.ts       |   0
 .../application/containers/editor/editor.tsx  |   2 +-
 .../application/containers/editor/index.ts    |   0
 .../console_editor/apply_editor_settings.ts   |   0
 .../console_editor/editor.test.mock.tsx       |   0
 .../legacy/console_editor/editor.test.tsx     |   2 +-
 .../editor/legacy/console_editor/editor.tsx   |   0
 .../legacy/console_editor/editor_output.tsx   |   0
 .../editor/legacy/console_editor/index.ts     |   0
 .../console_editor/keyboard_shortcuts.ts      |   0
 .../editor/legacy/console_menu_actions.ts     |   0
 .../containers/editor/legacy/index.ts         |   0
 .../subscribe_console_resize_checker.ts       |   3 +-
 .../legacy/use_ui_ace_keyboard_mode.tsx       |   0
 .../public}/application/containers/index.ts   |   0
 .../containers/main/get_top_nav.ts            |   0
 .../application/containers/main/index.ts      |   0
 .../application/containers/main/main.tsx      |   0
 .../application/containers/settings.tsx       |   0
 .../contexts/create_use_context.ts            |   0
 .../editor_context/editor_context.tsx         |   0
 .../editor_context/editor_registry.ts         |   0
 .../contexts/editor_context/index.ts          |   0
 .../public}/application/contexts/index.ts     |   0
 .../application/contexts/request_context.tsx  |   0
 .../application/contexts/services_context.tsx |   2 +-
 .../public}/application/factories/index.ts    |   0
 .../application/factories/token_iterator.ts   |   0
 .../public}/application/hooks/index.ts        |   0
 .../hooks/use_data_init/data_migration.ts     |   2 +-
 .../application/hooks/use_data_init/index.ts  |   0
 .../hooks/use_data_init/use_data_init.ts      |   0
 .../use_restore_request_from_history/index.ts |   0
 .../restore_request_from_history.ts           |   0
 .../use_restore_request_from_history.ts       |   0
 .../hooks/use_save_current_text_object.ts     |   0
 .../use_send_current_request_to_es/index.ts   |   0
 .../send_request_to_es.ts                     |   0
 .../use_send_current_request_to_es/track.ts   |   0
 .../use_send_current_request_to_es.ts         |   0
 .../application/hooks/use_set_input_editor.ts |   0
 .../console/public}/application/index.tsx     |  26 ++-
 .../console/public}/application/logo.svg      |   0
 .../public}/application/models/index.ts       |   0
 .../__tests__/input_tokenization.test.js      |   0
 .../__tests__/output_tokenization.test.js     |   0
 .../models/legacy_core_editor/create.ts       |   0
 .../legacy_core_editor/create_readonly.ts     |   0
 .../models/legacy_core_editor/index.ts        |   0
 .../legacy_core_editor.test.mocks.ts          |   0
 .../legacy_core_editor/legacy_core_editor.ts  |   0
 .../mode/elasticsearch_sql_highlight_rules.ts |   0
 .../models/legacy_core_editor/mode/input.js   |   0
 .../mode/input_highlight_rules.js             |   0
 .../models/legacy_core_editor/mode/output.js  |   0
 .../mode/output_highlight_rules.js            |   0
 .../models/legacy_core_editor/mode/script.js  |   0
 .../mode/script_highlight_rules.js            |   0
 .../legacy_core_editor/mode/worker/index.js   |   0
 .../legacy_core_editor/mode/worker/worker.js  |   0
 .../mode/x_json_highlight_rules.js            |   0
 .../models/legacy_core_editor/smart_resize.ts |   0
 .../legacy_core_editor/theme_sense_dark.js    |   0
 .../sense_editor/__tests__/editor_input1.txt  |   0
 .../__tests__/integration.test.js             |   0
 .../__tests__/sense_editor.test.js            |   0
 .../application/models/sense_editor/create.ts |   0
 .../application/models/sense_editor/curl.ts   |   0
 .../application/models/sense_editor/index.ts  |   0
 .../sense_editor/sense_editor.test.mocks.ts   |   0
 .../models/sense_editor/sense_editor.ts       |   0
 .../public}/application/stores/editor.ts      |   2 +-
 .../public}/application/stores/request.ts     |   0
 .../console/public}/index.ts                  |   6 +-
 .../public}/lib/ace_token_provider/index.ts   |   0
 .../ace_token_provider/token_provider.test.ts |   0
 .../lib/ace_token_provider/token_provider.ts  |   0
 .../__tests__/url_autocomplete.test.js        |   0
 .../autocomplete/__tests__/url_params.test.js |   0
 .../public}/lib/autocomplete/autocomplete.ts  |   0
 .../lib/autocomplete/body_completer.js        |   0
 .../components/accept_endpoint_component.js   |   0
 .../components/autocomplete_component.js      |   0
 .../components/conditional_proxy.js           |   0
 .../components/constant_component.js          |   0
 .../field_autocomplete_component.js           |   0
 .../components/full_request_component.ts      |   0
 .../components/global_only_component.js       |   0
 .../components/id_autocomplete_component.js   |   0
 .../lib/autocomplete/components/index.js      |   0
 .../index_autocomplete_component.js           |   0
 .../autocomplete/components/list_component.js |   0
 .../components/object_component.js            |   0
 .../components/shared_component.js            |   0
 .../components/simple_param_component.js      |   0
 .../template_autocomplete_component.js        |   0
 .../components/type_autocomplete_component.js |   0
 .../components/url_pattern_matcher.js         |   0
 .../username_autocomplete_component.js        |   0
 .../public}/lib/autocomplete/engine.js        |   0
 .../get_endpoint_from_position.ts             |   0
 .../public}/lib/autocomplete/url_params.js    |   0
 .../__tests__/curl_parsing.test.js            |   0
 .../curl_parsing/__tests__/curl_parsing.txt   |   0
 .../console/public}/lib/curl_parsing/curl.js  |   0
 .../lib/es/__tests__/content_type.test.js     |   0
 .../console/public}/lib/es/es.js              |   0
 .../public}/lib/kb/__tests__/kb.test.js       |   0
 .../console/public}/lib/kb/api.js             |   0
 .../console/public}/lib/kb/index.js           |   0
 .../console/public}/lib/kb/kb.js              |   0
 .../lib/local_storage_object_client/create.ts |   4 +-
 .../lib/local_storage_object_client/index.ts  |   0
 .../local_storage_object_client.ts            |   2 +-
 .../lib/mappings/__tests__/mapping.test.js    |   0
 .../console/public}/lib/mappings/mappings.js  |   0
 .../console/public}/lib/row_parser.ts         |   0
 .../public}/lib/token_iterator/index.ts       |   0
 .../lib/token_iterator/token_iterator.test.ts |   0
 .../lib/token_iterator/token_iterator.ts      |   0
 .../public}/lib/utils/__tests__/utils.test.js |   0
 .../__tests__/utils_string_collapsing.txt     |   0
 .../__tests__/utils_string_expanding.txt      |   0
 .../console/public}/lib/utils/utils.ts        |   0
 .../console/public}/plugin.ts                 |  53 +++--
 .../console/public}/services/history.ts       |   0
 .../console/public}/services/index.ts         |   0
 .../console/public}/services/settings.ts      |   0
 .../console/public}/services/storage.ts       |   0
 .../console/public}/services/tracker.ts       |  19 +-
 .../console/public}/types/common.ts           |   0
 .../console/public}/types/core_editor.ts      |   0
 .../console/public}/types/index.ts            |   1 +
 .../public/types/plugin_dependencies.ts       |  27 +++
 .../console/public}/types/token.ts            |   0
 .../console/public}/types/tokens_provider.ts  |   0
 .../__tests__/elasticsearch_proxy_config.js   |   2 +-
 .../console/server/__tests__/proxy_config.js  |   2 +-
 .../__tests__/proxy_config_collection.js      |   2 +-
 .../__tests__/proxy_route/body.test.ts}       |  64 +++---
 .../__tests__/proxy_route/headers.test.ts     |  89 +++++++
 .../server/__tests__/proxy_route/mocks.ts     |  44 ++++
 .../__tests__/proxy_route/params.test.ts      |  87 +++++++
 .../proxy_route/query_string.test.ts          |  76 ++++++
 .../proxy_route/route_validation.test.ts      |  52 +++++
 .../server/__tests__/proxy_route/stubs.ts}    |  36 ++-
 .../console/server/__tests__/set_headers.js   |   2 +-
 .../server/__tests__/wildcard_matcher.js      |   2 +-
 src/plugins/console/server/config.ts          |  55 +++++
 src/plugins/console/server/index.ts           |  31 +++
 .../server/lib}/elasticsearch_proxy_config.ts |   3 +-
 .../console/server/lib/index.ts}              |   5 +-
 .../console/server/lib/proxy_config.ts}       |  30 ++-
 .../server/lib/proxy_config_collection.ts}    |  14 +-
 .../console/server/lib/proxy_request.test.ts} |   4 +-
 .../console/server/lib/proxy_request.ts}      |   2 +-
 .../console/server/lib/set_headers.ts}        |   2 +-
 .../server/lib/spec_definitions}/api.js       |   0
 .../server/lib/spec_definitions}/es_6_0.js    |   0
 .../spec_definitions}/es_6_0/aggregations.js  |   0
 .../lib/spec_definitions}/es_6_0/aliases.js   |   0
 .../lib/spec_definitions}/es_6_0/document.js  |   0
 .../lib/spec_definitions}/es_6_0/filter.js    |   0
 .../lib/spec_definitions}/es_6_0/globals.js   |   0
 .../lib/spec_definitions}/es_6_0/ingest.js    |   0
 .../lib/spec_definitions}/es_6_0/mappings.js  |   0
 .../lib/spec_definitions}/es_6_0/query/dsl.js |   0
 .../spec_definitions}/es_6_0/query/index.js   |   0
 .../es_6_0/query/templates.js                 |   0
 .../lib/spec_definitions}/es_6_0/reindex.js   |   0
 .../lib/spec_definitions}/es_6_0/search.js    |   0
 .../server/lib/spec_definitions/index.d.ts    |  24 ++
 .../server/lib/spec_definitions/index.js      |  24 ++
 .../server/lib/spec_definitions}/server.js    |   4 +-
 .../lib/spec_definitions}/server.test.js      |   0
 .../lib/spec_definitions}/spec/.eslintrc      |   0
 .../spec/generated/_common.json               |   0
 .../spec/generated/bulk.json                  |   0
 .../spec/generated/cat.aliases.json           |   0
 .../spec/generated/cat.allocation.json        |   0
 .../spec/generated/cat.count.json             |   0
 .../spec/generated/cat.fielddata.json         |   0
 .../spec/generated/cat.health.json            |   0
 .../spec/generated/cat.help.json              |   0
 .../spec/generated/cat.indices.json           |   0
 .../spec/generated/cat.master.json            |   0
 .../spec/generated/cat.nodeattrs.json         |   0
 .../spec/generated/cat.nodes.json             |   0
 .../spec/generated/cat.pending_tasks.json     |   0
 .../spec/generated/cat.plugins.json           |   0
 .../spec/generated/cat.recovery.json          |   0
 .../spec/generated/cat.repositories.json      |   0
 .../spec/generated/cat.segments.json          |   0
 .../spec/generated/cat.shards.json            |   0
 .../spec/generated/cat.snapshots.json         |   0
 .../spec/generated/cat.tasks.json             |   0
 .../spec/generated/cat.templates.json         |   0
 .../spec/generated/cat.thread_pool.json       |   0
 .../spec/generated/clear_scroll.json          |   0
 .../generated/cluster.allocation_explain.json |   0
 .../spec/generated/cluster.get_settings.json  |   0
 .../spec/generated/cluster.health.json        |   0
 .../spec/generated/cluster.pending_tasks.json |   0
 .../spec/generated/cluster.put_settings.json  |   0
 .../spec/generated/cluster.remote_info.json   |   0
 .../spec/generated/cluster.reroute.json       |   0
 .../spec/generated/cluster.state.json         |   0
 .../spec/generated/cluster.stats.json         |   0
 .../spec/generated/count.json                 |   0
 .../spec/generated/create.json                |   0
 .../spec/generated/delete.json                |   0
 .../spec/generated/delete_by_query.json       |   0
 .../generated/delete_by_query_rethrottle.json |   0
 .../spec/generated/delete_script.json         |   0
 .../spec/generated/exists.json                |   0
 .../spec/generated/exists_source.json         |   0
 .../spec/generated/explain.json               |   0
 .../spec/generated/field_caps.json            |   0
 .../spec_definitions}/spec/generated/get.json |   0
 .../spec/generated/get_script.json            |   0
 .../spec/generated/get_script_context.json    |  10 +
 .../spec/generated/get_script_languages.json  |   0
 .../spec/generated/get_source.json            |   0
 .../spec/generated/index.json                 |   0
 .../spec/generated/indices.analyze.json       |   0
 .../spec/generated/indices.clear_cache.json   |   0
 .../spec/generated/indices.clone.json         |   0
 .../spec/generated/indices.close.json         |   0
 .../spec/generated/indices.create.json        |   0
 .../spec/generated/indices.delete.json        |   0
 .../spec/generated/indices.delete_alias.json  |   0
 .../generated/indices.delete_template.json    |   0
 .../spec/generated/indices.exists.json        |   0
 .../spec/generated/indices.exists_alias.json  |   0
 .../generated/indices.exists_template.json    |   0
 .../spec/generated/indices.exists_type.json   |   0
 .../spec/generated/indices.flush.json         |   0
 .../spec/generated/indices.flush_synced.json  |   0
 .../spec/generated/indices.forcemerge.json    |   0
 .../spec/generated/indices.get.json           |   0
 .../spec/generated/indices.get_alias.json     |   0
 .../generated/indices.get_field_mapping.json  |   0
 .../spec/generated/indices.get_mapping.json   |   0
 .../spec/generated/indices.get_settings.json  |   0
 .../spec/generated/indices.get_template.json  |   0
 .../spec/generated/indices.get_upgrade.json   |   0
 .../spec/generated/indices.open.json          |   0
 .../spec/generated/indices.put_alias.json     |   0
 .../spec/generated/indices.put_mapping.json   |   0
 .../spec/generated/indices.put_settings.json  |   0
 .../spec/generated/indices.put_template.json  |   0
 .../spec/generated/indices.recovery.json      |   0
 .../spec/generated/indices.refresh.json       |   0
 .../spec/generated/indices.rollover.json      |   0
 .../spec/generated/indices.segments.json      |   0
 .../spec/generated/indices.shard_stores.json  |   0
 .../spec/generated/indices.shrink.json        |   0
 .../spec/generated/indices.split.json         |   0
 .../spec/generated/indices.stats.json         |   0
 .../generated/indices.update_aliases.json     |   0
 .../spec/generated/indices.upgrade.json       |   0
 .../generated/indices.validate_query.json     |   0
 .../spec/generated/info.json                  |   0
 .../generated/ingest.delete_pipeline.json     |   0
 .../spec/generated/ingest.get_pipeline.json   |   0
 .../spec/generated/ingest.processor_grok.json |   0
 .../spec/generated/ingest.put_pipeline.json   |   0
 .../spec/generated/ingest.simulate.json       |   0
 .../spec/generated/mget.json                  |   0
 .../spec/generated/msearch.json               |   0
 .../spec/generated/msearch_template.json      |   0
 .../spec/generated/mtermvectors.json          |   0
 .../spec/generated/nodes.hot_threads.json     |   0
 .../spec/generated/nodes.info.json            |   0
 .../nodes.reload_secure_settings.json         |   0
 .../spec/generated/nodes.stats.json           |   0
 .../spec/generated/nodes.usage.json           |   0
 .../spec/generated/ping.json                  |   0
 .../spec/generated/put_script.json            |   0
 .../spec/generated/rank_eval.json             |   0
 .../spec/generated/reindex.json               |   0
 .../spec/generated/reindex_rethrottle.json    |   0
 .../generated/render_search_template.json     |   0
 .../generated/scripts_painless_execute.json   |   0
 .../spec/generated/scroll.json                |   0
 .../spec/generated/search.json                |   0
 .../spec/generated/search_shards.json         |   0
 .../spec/generated/search_template.json       |   0
 .../snapshot.cleanup_repository.json          |   0
 .../spec/generated/snapshot.create.json       |   0
 .../generated/snapshot.create_repository.json |   0
 .../spec/generated/snapshot.delete.json       |   0
 .../generated/snapshot.delete_repository.json |   0
 .../spec/generated/snapshot.get.json          |   0
 .../generated/snapshot.get_repository.json    |   0
 .../spec/generated/snapshot.restore.json      |   0
 .../spec/generated/snapshot.status.json       |   0
 .../generated/snapshot.verify_repository.json |   0
 .../spec/generated/tasks.cancel.json          |   0
 .../spec/generated/tasks.get.json             |   0
 .../spec/generated/tasks.list.json            |   0
 .../spec/generated/termvectors.json           |   0
 .../spec/generated/update.json                |   0
 .../spec/generated/update_by_query.json       |   0
 .../generated/update_by_query_rethrottle.json |   0
 .../lib/spec_definitions}/spec/index.js       |   0
 .../spec/overrides/clear_scroll.json          |   0
 .../spec/overrides/cluster.health.json        |   0
 .../spec/overrides/cluster.put_settings.json  |   0
 .../spec/overrides/cluster.reroute.json       |   0
 .../spec/overrides/count.json                 |   0
 .../spec/overrides/indices.analyze.json       |   0
 .../spec/overrides/indices.clone.json         |   0
 .../spec/overrides/indices.create.json        |   0
 .../overrides/indices.delete_template.json    |   0
 .../overrides/indices.exists_template.json    |   0
 .../overrides/indices.get_field_mapping.json  |   0
 .../spec/overrides/indices.get_mapping.json   |   0
 .../spec/overrides/indices.get_template.json  |   0
 .../spec/overrides/indices.put_alias.json     |   0
 .../spec/overrides/indices.put_settings.json  |   0
 .../spec/overrides/indices.put_template.json  |   0
 .../spec/overrides/indices.rollover.json      |   0
 .../overrides/indices.update_aliases.json     |   0
 .../overrides/indices.validate_query.json     |   0
 .../spec/overrides/snapshot.create.json       |   0
 .../overrides/snapshot.create_repository.json |   0
 .../spec/overrides/snapshot.restore.json      |   0
 .../console/server/lib/wildcard_matcher.ts}   |  12 +-
 src/plugins/console/server/plugin.ts          |  81 +++++++
 .../api/console/proxy/create_handler.ts       | 217 ++++++++++++++++++
 .../server/routes/api/console/proxy/index.ts  |  44 ++++
 .../api/console/proxy/validation_config.ts    |  44 ++++
 .../api/console/spec_definitions/index.ts     |  48 ++++
 src/plugins/console/server/types.ts           |  34 +++
 x-pack/index.js                               |   2 -
 .../plugins/console_extensions/index.js       |  47 ----
 x-pack/plugins/console_extensions/kibana.json |   8 +
 .../console_extensions/server/config.ts       |  12 +
 .../console_extensions/server/index.ts        |  15 ++
 .../console_extensions/server/plugin.ts       |  32 +++
 .../ccr.delete_auto_follow_pattern.json       |   0
 .../server}/spec/generated/ccr.follow.json    |   0
 .../spec/generated/ccr.follow_info.json       |   0
 .../spec/generated/ccr.follow_stats.json      |   0
 .../spec/generated/ccr.forget_follower.json   |   0
 .../ccr.get_auto_follow_pattern.json          |   0
 .../ccr.pause_auto_follow_pattern.json        |   0
 .../spec/generated/ccr.pause_follow.json      |   0
 .../ccr.put_auto_follow_pattern.json          |   0
 .../ccr.resume_auto_follow_pattern.json       |   0
 .../spec/generated/ccr.resume_follow.json     |   0
 .../server}/spec/generated/ccr.stats.json     |   0
 .../server}/spec/generated/ccr.unfollow.json  |   0
 .../spec/generated/enrich.delete_policy.json  |   0
 .../spec/generated/enrich.execute_policy.json |   0
 .../spec/generated/enrich.get_policy.json     |   0
 .../spec/generated/enrich.put_policy.json     |   0
 .../server}/spec/generated/enrich.stats.json  |   0
 .../server}/spec/generated/graph.explore.json |   0
 .../spec/generated/ilm.delete_lifecycle.json  |   0
 .../spec/generated/ilm.explain_lifecycle.json |   0
 .../spec/generated/ilm.get_lifecycle.json     |   0
 .../spec/generated/ilm.get_status.json        |   0
 .../spec/generated/ilm.move_to_step.json      |   0
 .../spec/generated/ilm.put_lifecycle.json     |   0
 .../spec/generated/ilm.remove_policy.json     |   0
 .../server}/spec/generated/ilm.retry.json     |   0
 .../spec/generated/ilm.set_policy.json        |   0
 .../server}/spec/generated/ilm.start.json     |   0
 .../server}/spec/generated/ilm.stop.json      |   0
 .../spec/generated/indices.freeze.json        |   0
 .../indices.reload_search_analyzers.json      |   0
 .../spec/generated/indices.unfreeze.json      |   0
 .../spec/generated/license.delete.json        |   0
 .../server}/spec/generated/license.get.json   |   0
 .../generated/license.get_basic_status.json   |   0
 .../generated/license.get_trial_status.json   |   0
 .../server}/spec/generated/license.post.json  |   0
 .../generated/license.post_start_basic.json   |   0
 .../generated/license.post_start_trial.json   |   0
 .../generated/migration.deprecations.json     |   0
 .../generated/migration.get_assistance.json   |   0
 .../spec/generated/migration.upgrade.json     |   0
 .../server}/spec/generated/ml.close_job.json  |   0
 .../spec/generated/ml.delete_calendar.json    |   0
 .../generated/ml.delete_calendar_event.json   |   0
 .../generated/ml.delete_calendar_job.json     |   0
 .../ml.delete_data_frame_analytics.json       |   0
 .../spec/generated/ml.delete_datafeed.json    |   0
 .../generated/ml.delete_expired_data.json     |   0
 .../spec/generated/ml.delete_filter.json      |   0
 .../spec/generated/ml.delete_forecast.json    |   0
 .../server}/spec/generated/ml.delete_job.json |   0
 .../generated/ml.delete_model_snapshot.json   |   0
 .../generated/ml.delete_trained_model.json    |   0
 .../generated/ml.estimate_memory_usage.json   |   0
 .../generated/ml.evaluate_data_frame.json     |   0
 .../ml.explain_data_frame_analytics.json      |   0
 .../generated/ml.find_file_structure.json     |   0
 .../server}/spec/generated/ml.flush_job.json  |   0
 .../server}/spec/generated/ml.forecast.json   |   0
 .../spec/generated/ml.get_buckets.json        |   0
 .../generated/ml.get_calendar_events.json     |   0
 .../spec/generated/ml.get_calendars.json      |   0
 .../spec/generated/ml.get_categories.json     |   0
 .../ml.get_data_frame_analytics.json          |   0
 .../ml.get_data_frame_analytics_stats.json    |   0
 .../spec/generated/ml.get_datafeed_stats.json |   0
 .../spec/generated/ml.get_datafeeds.json      |   0
 .../spec/generated/ml.get_filters.json        |   0
 .../spec/generated/ml.get_influencers.json    |   0
 .../spec/generated/ml.get_job_stats.json      |   0
 .../server}/spec/generated/ml.get_jobs.json   |   0
 .../generated/ml.get_model_snapshots.json     |   0
 .../generated/ml.get_overall_buckets.json     |   0
 .../spec/generated/ml.get_records.json        |   0
 .../spec/generated/ml.get_trained_models.json |   0
 .../ml.get_trained_models_stats.json          |   0
 .../server}/spec/generated/ml.info.json       |   0
 .../server}/spec/generated/ml.open_job.json   |   0
 .../generated/ml.post_calendar_events.json    |   0
 .../server}/spec/generated/ml.post_data.json  |   0
 .../spec/generated/ml.preview_datafeed.json   |   0
 .../spec/generated/ml.put_calendar.json       |   0
 .../spec/generated/ml.put_calendar_job.json   |   0
 .../ml.put_data_frame_analytics.json          |   0
 .../spec/generated/ml.put_datafeed.json       |   0
 .../server}/spec/generated/ml.put_filter.json |   0
 .../server}/spec/generated/ml.put_job.json    |   0
 .../spec/generated/ml.put_trained_model.json  |   0
 .../generated/ml.revert_model_snapshot.json   |   0
 .../spec/generated/ml.set_upgrade_mode.json   |   0
 .../ml.start_data_frame_analytics.json        |   0
 .../spec/generated/ml.start_datafeed.json     |   0
 .../ml.stop_data_frame_analytics.json         |   0
 .../spec/generated/ml.stop_datafeed.json      |   0
 .../spec/generated/ml.update_datafeed.json    |   0
 .../spec/generated/ml.update_filter.json      |   0
 .../server}/spec/generated/ml.update_job.json |   0
 .../generated/ml.update_model_snapshot.json   |   0
 .../server}/spec/generated/ml.upgrade.json    |   0
 .../server}/spec/generated/ml.validate.json   |   0
 .../spec/generated/ml.validate_detector.json  |   0
 .../spec/generated/monitoring.bulk.json       |   0
 .../spec/generated/rollup.delete_job.json     |   0
 .../spec/generated/rollup.get_jobs.json       |   0
 .../generated/rollup.get_rollup_caps.json     |   0
 .../rollup.get_rollup_index_caps.json         |   0
 .../spec/generated/rollup.put_job.json        |   0
 .../spec/generated/rollup.rollup_search.json  |   0
 .../spec/generated/rollup.start_job.json      |   0
 .../spec/generated/rollup.stop_job.json       |   0
 .../spec/generated/security.authenticate.json |   0
 .../generated/security.change_password.json   |   0
 .../security.clear_cached_realms.json         |   0
 .../security.clear_cached_roles.json          |   0
 .../generated/security.create_api_key.json    |   0
 .../generated/security.delete_privileges.json |   0
 .../spec/generated/security.delete_role.json  |   0
 .../security.delete_role_mapping.json         |   0
 .../spec/generated/security.delete_user.json  |   0
 .../spec/generated/security.disable_user.json |   0
 .../spec/generated/security.enable_user.json  |   0
 .../spec/generated/security.get_api_key.json  |   0
 .../security.get_builtin_privileges.json      |   0
 .../generated/security.get_privileges.json    |   0
 .../spec/generated/security.get_role.json     |   0
 .../generated/security.get_role_mapping.json  |   0
 .../spec/generated/security.get_token.json    |   0
 .../spec/generated/security.get_user.json     |   0
 .../security.get_user_privileges.json         |   0
 .../generated/security.has_privileges.json    |   0
 .../security.invalidate_api_key.json          |   0
 .../generated/security.invalidate_token.json  |   0
 .../generated/security.put_privileges.json    |   0
 .../spec/generated/security.put_role.json     |   0
 .../generated/security.put_role_mapping.json  |   0
 .../spec/generated/security.put_user.json     |   0
 .../spec/generated/slm.delete_lifecycle.json  |   0
 .../spec/generated/slm.execute_lifecycle.json |   0
 .../spec/generated/slm.execute_retention.json |   0
 .../spec/generated/slm.get_lifecycle.json     |   0
 .../server}/spec/generated/slm.get_stats.json |   0
 .../spec/generated/slm.get_status.json        |   0
 .../spec/generated/slm.put_lifecycle.json     |   0
 .../server}/spec/generated/slm.start.json     |   0
 .../server}/spec/generated/slm.stop.json      |   0
 .../spec/generated/sql.clear_cursor.json      |   0
 .../server}/spec/generated/sql.query.json     |   0
 .../server}/spec/generated/sql.translate.json |   0
 .../spec/generated/ssl.certificates.json      |   0
 .../generated/transform.delete_transform.json |   0
 .../generated/transform.get_transform.json    |   0
 .../transform.get_transform_stats.json        |   0
 .../transform.preview_transform.json          |   0
 .../generated/transform.put_transform.json    |   0
 .../generated/transform.start_transform.json  |   0
 .../generated/transform.stop_transform.json   |   0
 .../generated/transform.update_transform.json |   0
 .../spec/generated/watcher.ack_watch.json     |   0
 .../generated/watcher.activate_watch.json     |   0
 .../generated/watcher.deactivate_watch.json   |   0
 .../spec/generated/watcher.delete_watch.json  |   0
 .../spec/generated/watcher.execute_watch.json |   0
 .../spec/generated/watcher.get_watch.json     |   0
 .../spec/generated/watcher.put_watch.json     |   0
 .../server}/spec/generated/watcher.start.json |   0
 .../server}/spec/generated/watcher.stats.json |   0
 .../server}/spec/generated/watcher.stop.json  |   0
 .../server}/spec/generated/xpack.info.json    |   0
 .../generated/xpack.ssl.certificates.json     |   0
 .../server}/spec/generated/xpack.usage.json   |   0
 .../server/spec/ingest/index.ts}              |   0
 .../server}/spec/overrides/ccr.follow.json    |   0
 .../spec/overrides/ccr.forget_follower.json   |   0
 .../ccr.put_auto_follow_pattern.json          |   0
 .../spec/overrides/ccr.resume_follow.json     |   0
 .../spec/overrides/enrich.put_policy.json     |   0
 .../spec/overrides/ilm.move_to_step.json      |   0
 .../spec/overrides/ilm.put_lifecycle.json     |   0
 .../overrides/ml.estimate_memory_usage.json   |   0
 .../overrides/ml.evaluate_data_frame.json     |   0
 .../ml.explain_data_frame_analytics.json      |   0
 .../spec/overrides/ml.get_buckets.json        |   0
 .../overrides/ml.get_calendar_events.json     |   0
 .../spec/overrides/ml.get_calendars.json      |   0
 .../spec/overrides/ml.get_categories.json     |   0
 .../spec/overrides/ml.get_influencers.json    |   0
 .../overrides/ml.get_model_snapshots.json     |   0
 .../overrides/ml.get_overall_buckets.json     |   0
 .../spec/overrides/ml.get_records.json        |   0
 .../overrides/ml.post_calendar_events.json    |   0
 .../spec/overrides/ml.put_calendar.json       |   0
 .../ml.put_data_frame_analytics.json          |   0
 .../spec/overrides/ml.put_datafeed.json       |   0
 .../server}/spec/overrides/ml.put_job.json    |   0
 .../spec/overrides/ml.put_trained_model.json  |   0
 .../overrides/ml.revert_model_snapshot.json   |   0
 .../spec/overrides/ml.update_datafeed.json    |   0
 .../server}/spec/overrides/ml.update_job.json |   0
 .../overrides/ml.update_model_snapshot.json   |   0
 .../spec/overrides/security.authenticate.json |   0
 .../overrides/security.change_password.json   |   0
 .../overrides/security.create_api_key.json    |   0
 .../overrides/security.delete_privileges.json |   3 +
 .../spec/overrides/security.get_token.json    |   0
 .../overrides/security.has_privileges.json    |   0
 .../security.invalidate_api_key.json          |   0
 .../overrides/security.invalidate_token.json  |   0
 .../overrides/security.put_privileges.json    |   3 +
 .../spec/overrides/security.put_role.json     |   0
 .../overrides/security.put_role_mapping.json  |   0
 .../spec/overrides/security.put_user.json     |   0
 .../spec/overrides/slm.put_lifecycle.json     |   0
 .../server}/spec/overrides/slm.start.json     |   0
 .../server}/spec/overrides/slm.stop.json      |   0
 .../server}/spec/overrides/sql.query.json     |   0
 .../transform.get_transform_stats.json        |   0
 .../transform.preview_transform.json          |   0
 .../overrides/transform.put_transform.json    |   0
 .../overrides/transform.stop_transform.json   |   0
 .../overrides/transform.update_transform.json |   0
 .../spec/overrides/xpack.graph.explore.json   |   0
 .../server}/spec/overrides/xpack.info.json    |   0
 .../spec/overrides/xpack.license.post.json    |   0
 .../overrides/xpack.rollup.delete_job.json    |   0
 .../spec/overrides/xpack.rollup.put_job.json  |   0
 .../overrides/xpack.rollup.rollup_search.json |   0
 .../xpack.security.authenticate.json          |   0
 .../xpack.security.change_password.json       |   0
 .../overrides/xpack.security.get_token.json   |   0
 .../xpack.security.invalidate_token.json      |   0
 .../overrides/xpack.security.put_role.json    |   0
 .../xpack.security.put_role_mapping.json      |   0
 .../overrides/xpack.security.put_user.json    |   0
 .../xpack.watcher.execute_watch.json          |   0
 .../overrides/xpack.watcher.put_watch.json    |   0
 612 files changed, 1359 insertions(+), 1079 deletions(-)
 delete mode 100644 src/legacy/core_plugins/console/__tests__/index.js
 delete mode 100644 src/legacy/core_plugins/console/index.ts
 delete mode 100644 src/legacy/core_plugins/console/package.json
 delete mode 100644 src/legacy/core_plugins/console/public/legacy.ts
 delete mode 100644 src/legacy/core_plugins/console/server/__tests__/proxy_route/headers.js
 delete mode 100644 src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
 delete mode 100644 src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
 delete mode 100644 src/legacy/core_plugins/console/server/proxy_route.ts
 create mode 100644 src/legacy/core_plugins/console_legacy/index.ts
 create mode 100644 src/legacy/core_plugins/console_legacy/package.json
 rename src/legacy/core_plugins/{console/public/np_ready/application => console_legacy/public}/styles/_app.scss (100%)
 rename src/legacy/core_plugins/{console/public/np_ready/application => console_legacy/public}/styles/components/_help.scss (100%)
 rename src/legacy/core_plugins/{console/public/np_ready/application => console_legacy/public}/styles/components/_history.scss (100%)
 rename src/legacy/core_plugins/{console/public/np_ready/application => console_legacy/public}/styles/components/_index.scss (100%)
 rename src/legacy/core_plugins/{console/public/np_ready/application => console_legacy/public}/styles/index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/console/common/text_object.ts (100%)
 create mode 100644 src/plugins/console/common/types/index.ts
 rename src/{legacy/core_plugins/console/common/types.ts => plugins/console/common/types/models.ts} (97%)
 create mode 100644 src/plugins/console/common/types/plugin_config.ts
 rename src/{legacy/core_plugins/console/public => plugins/console}/kibana.json (73%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/console_menu.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/editor_content_spinner.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/editor_example.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/help_panel.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/settings_modal.tsx (98%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/something_went_wrong_callout.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/top_nav_menu.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/components/welcome_panel.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/constants/help_example.txt (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/console_history/console_history.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/console_history/history_viewer.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/console_history/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/editor.tsx (96%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/apply_editor_settings.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/editor.test.mock.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/editor.test.tsx (99%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/editor.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/editor_output.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/console_menu_actions.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/subscribe_console_resize_checker.ts (93%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/main/get_top_nav.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/main/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/main/main.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/containers/settings.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/create_use_context.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/editor_context/editor_context.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/editor_context/editor_registry.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/editor_context/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/request_context.tsx (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/contexts/services_context.tsx (96%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/factories/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/factories/token_iterator.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_data_init/data_migration.ts (95%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_data_init/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_data_init/use_data_init.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_restore_request_from_history/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_restore_request_from_history/restore_request_from_history.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_restore_request_from_history/use_restore_request_from_history.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_save_current_text_object.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_send_current_request_to_es/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_send_current_request_to_es/send_request_to_es.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_send_current_request_to_es/track.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/hooks/use_set_input_editor.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/index.tsx (81%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/logo.svg (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/__tests__/input_tokenization.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/__tests__/output_tokenization.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/create.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/create_readonly.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/legacy_core_editor.test.mocks.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/legacy_core_editor.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/elasticsearch_sql_highlight_rules.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/input.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/input_highlight_rules.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/output.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/output_highlight_rules.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/script.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/script_highlight_rules.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/worker/index.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/worker/worker.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/mode/x_json_highlight_rules.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/smart_resize.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/legacy_core_editor/theme_sense_dark.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/__tests__/editor_input1.txt (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/__tests__/integration.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/__tests__/sense_editor.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/create.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/curl.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/sense_editor.test.mocks.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/models/sense_editor/sense_editor.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/stores/editor.ts (96%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/application/stores/request.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/index.ts (85%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/ace_token_provider/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/ace_token_provider/token_provider.test.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/ace_token_provider/token_provider.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/__tests__/url_autocomplete.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/__tests__/url_params.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/autocomplete.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/body_completer.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/accept_endpoint_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/conditional_proxy.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/constant_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/field_autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/full_request_component.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/global_only_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/id_autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/index.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/index_autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/list_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/object_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/shared_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/simple_param_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/template_autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/type_autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/url_pattern_matcher.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/components/username_autocomplete_component.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/engine.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/get_endpoint_from_position.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/autocomplete/url_params.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/curl_parsing/__tests__/curl_parsing.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/curl_parsing/__tests__/curl_parsing.txt (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/curl_parsing/curl.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/es/__tests__/content_type.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/es/es.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/kb/__tests__/kb.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/kb/api.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/kb/index.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/kb/kb.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/local_storage_object_client/create.ts (88%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/local_storage_object_client/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/local_storage_object_client/local_storage_object_client.ts (96%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/mappings/__tests__/mapping.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/mappings/mappings.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/row_parser.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/token_iterator/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/token_iterator/token_iterator.test.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/token_iterator/token_iterator.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/utils/__tests__/utils.test.js (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/utils/__tests__/utils_string_collapsing.txt (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/utils/__tests__/utils_string_expanding.txt (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/lib/utils/utils.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/plugin.ts (58%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/services/history.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/services/index.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/services/settings.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/services/storage.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/services/tracker.ts (62%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/types/common.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/types/core_editor.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/types/index.ts (95%)
 create mode 100644 src/plugins/console/public/types/plugin_dependencies.ts
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/types/token.ts (100%)
 rename src/{legacy/core_plugins/console/public/np_ready => plugins/console/public}/types/tokens_provider.ts (100%)
 rename src/{legacy/core_plugins => plugins}/console/server/__tests__/elasticsearch_proxy_config.js (98%)
 rename src/{legacy/core_plugins => plugins}/console/server/__tests__/proxy_config.js (99%)
 rename src/{legacy/core_plugins => plugins}/console/server/__tests__/proxy_config_collection.js (98%)
 rename src/{legacy/core_plugins/console/server/__tests__/proxy_route/body.js => plugins/console/server/__tests__/proxy_route/body.test.ts} (63%)
 create mode 100644 src/plugins/console/server/__tests__/proxy_route/headers.test.ts
 create mode 100644 src/plugins/console/server/__tests__/proxy_route/mocks.ts
 create mode 100644 src/plugins/console/server/__tests__/proxy_route/params.test.ts
 create mode 100644 src/plugins/console/server/__tests__/proxy_route/query_string.test.ts
 create mode 100644 src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts
 rename src/{legacy/core_plugins/console/server/__tests__/proxy_route/stubs.js => plugins/console/server/__tests__/proxy_route/stubs.ts} (65%)
 rename src/{legacy/core_plugins => plugins}/console/server/__tests__/set_headers.js (97%)
 rename src/{legacy/core_plugins => plugins}/console/server/__tests__/wildcard_matcher.js (98%)
 create mode 100644 src/plugins/console/server/config.ts
 create mode 100644 src/plugins/console/server/index.ts
 rename src/{legacy/core_plugins/console/server => plugins/console/server/lib}/elasticsearch_proxy_config.ts (94%)
 rename src/{legacy/core_plugins/console/server/index.js => plugins/console/server/lib/index.ts} (80%)
 rename src/{legacy/core_plugins/console/server/proxy_config.js => plugins/console/server/lib/proxy_config.ts} (80%)
 rename src/{legacy/core_plugins/console/server/proxy_config_collection.js => plugins/console/server/lib/proxy_config_collection.ts} (83%)
 rename src/{legacy/core_plugins/console/server/request.test.ts => plugins/console/server/lib/proxy_request.test.ts} (96%)
 rename src/{legacy/core_plugins/console/server/request.ts => plugins/console/server/lib/proxy_request.ts} (99%)
 rename src/{legacy/core_plugins/console/server/set_headers.js => plugins/console/server/lib/set_headers.ts} (94%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/api.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/aggregations.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/aliases.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/document.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/filter.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/globals.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/ingest.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/mappings.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/query/dsl.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/query/index.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/query/templates.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/reindex.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/es_6_0/search.js (100%)
 create mode 100644 src/plugins/console/server/lib/spec_definitions/index.d.ts
 create mode 100644 src/plugins/console/server/lib/spec_definitions/index.js
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/server.js (91%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/server.test.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/.eslintrc (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/_common.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/bulk.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.aliases.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.allocation.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.count.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.fielddata.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.health.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.help.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.indices.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.master.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.nodeattrs.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.nodes.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.pending_tasks.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.plugins.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.recovery.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.repositories.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.segments.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.shards.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.snapshots.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.tasks.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.templates.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cat.thread_pool.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/clear_scroll.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.allocation_explain.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.get_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.health.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.pending_tasks.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.put_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.remote_info.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.reroute.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.state.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/cluster.stats.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/count.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/create.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/delete.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/delete_by_query.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/delete_by_query_rethrottle.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/delete_script.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/exists.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/exists_source.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/explain.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/field_caps.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/get.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/get_script.json (100%)
 create mode 100644 src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_context.json
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/get_script_languages.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/get_source.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/index.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.analyze.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.clear_cache.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.clone.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.close.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.create.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.delete.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.delete_alias.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.delete_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.exists.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.exists_alias.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.exists_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.exists_type.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.flush.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.flush_synced.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.forcemerge.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get_alias.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get_field_mapping.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get_mapping.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.get_upgrade.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.open.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.put_alias.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.put_mapping.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.put_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.put_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.recovery.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.refresh.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.rollover.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.segments.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.shard_stores.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.shrink.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.split.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.stats.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.update_aliases.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.upgrade.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/indices.validate_query.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/info.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/ingest.delete_pipeline.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/ingest.get_pipeline.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/ingest.processor_grok.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/ingest.put_pipeline.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/ingest.simulate.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/mget.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/msearch.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/msearch_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/mtermvectors.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/nodes.hot_threads.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/nodes.info.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/nodes.reload_secure_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/nodes.stats.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/nodes.usage.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/ping.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/put_script.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/rank_eval.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/reindex.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/reindex_rethrottle.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/render_search_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/scripts_painless_execute.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/scroll.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/search.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/search_shards.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/search_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.cleanup_repository.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.create.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.create_repository.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.delete.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.delete_repository.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.get.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.get_repository.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.restore.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.status.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/snapshot.verify_repository.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/tasks.cancel.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/tasks.get.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/tasks.list.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/termvectors.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/update.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/update_by_query.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/generated/update_by_query_rethrottle.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/index.js (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/clear_scroll.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/cluster.health.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/cluster.put_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/cluster.reroute.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/count.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.analyze.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.clone.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.create.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.delete_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.exists_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.get_field_mapping.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.get_mapping.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.get_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.put_alias.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.put_settings.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.put_template.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.rollover.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.update_aliases.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/indices.validate_query.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/snapshot.create.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/snapshot.create_repository.json (100%)
 rename src/{legacy/core_plugins/console/server/api_server => plugins/console/server/lib/spec_definitions}/spec/overrides/snapshot.restore.json (100%)
 rename src/{legacy/core_plugins/console/server/wildcard_matcher.js => plugins/console/server/lib/wildcard_matcher.ts} (81%)
 create mode 100644 src/plugins/console/server/plugin.ts
 create mode 100644 src/plugins/console/server/routes/api/console/proxy/create_handler.ts
 create mode 100644 src/plugins/console/server/routes/api/console/proxy/index.ts
 create mode 100644 src/plugins/console/server/routes/api/console/proxy/validation_config.ts
 create mode 100644 src/plugins/console/server/routes/api/console/spec_definitions/index.ts
 create mode 100644 src/plugins/console/server/types.ts
 delete mode 100644 x-pack/legacy/plugins/console_extensions/index.js
 create mode 100644 x-pack/plugins/console_extensions/kibana.json
 create mode 100644 x-pack/plugins/console_extensions/server/config.ts
 create mode 100644 x-pack/plugins/console_extensions/server/index.ts
 create mode 100644 x-pack/plugins/console_extensions/server/plugin.ts
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.delete_auto_follow_pattern.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.follow.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.follow_info.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.follow_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.forget_follower.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.get_auto_follow_pattern.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.pause_auto_follow_pattern.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.pause_follow.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.put_auto_follow_pattern.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.resume_auto_follow_pattern.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.resume_follow.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ccr.unfollow.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/enrich.delete_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/enrich.execute_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/enrich.get_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/enrich.put_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/enrich.stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/graph.explore.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.delete_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.explain_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.get_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.get_status.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.move_to_step.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.put_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.remove_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.retry.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.set_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.start.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ilm.stop.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/indices.freeze.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/indices.reload_search_analyzers.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/indices.unfreeze.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.delete.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.get.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.get_basic_status.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.get_trial_status.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.post.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.post_start_basic.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/license.post_start_trial.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/migration.deprecations.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/migration.get_assistance.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/migration.upgrade.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.close_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_calendar.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_calendar_event.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_calendar_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_expired_data.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_filter.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_forecast.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_model_snapshot.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.delete_trained_model.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.estimate_memory_usage.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.evaluate_data_frame.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.explain_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.find_file_structure.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.flush_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.forecast.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_buckets.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_calendar_events.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_calendars.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_categories.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_data_frame_analytics_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_datafeed_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_datafeeds.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_filters.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_influencers.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_job_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_jobs.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_model_snapshots.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_overall_buckets.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_records.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_trained_models.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.get_trained_models_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.info.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.open_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.post_calendar_events.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.post_data.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.preview_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_calendar.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_calendar_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_filter.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.put_trained_model.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.revert_model_snapshot.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.set_upgrade_mode.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.start_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.start_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.stop_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.stop_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.update_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.update_filter.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.update_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.update_model_snapshot.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.upgrade.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.validate.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ml.validate_detector.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/monitoring.bulk.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.delete_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.get_jobs.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.get_rollup_caps.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.get_rollup_index_caps.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.put_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.rollup_search.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.start_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/rollup.stop_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.authenticate.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.change_password.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.clear_cached_realms.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.clear_cached_roles.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.create_api_key.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.delete_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.delete_role.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.delete_role_mapping.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.delete_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.disable_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.enable_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_api_key.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_builtin_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_role.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_role_mapping.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_token.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.get_user_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.has_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.invalidate_api_key.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.invalidate_token.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.put_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.put_role.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.put_role_mapping.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/security.put_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.delete_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.execute_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.execute_retention.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.get_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.get_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.get_status.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.put_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.start.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/slm.stop.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/sql.clear_cursor.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/sql.query.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/sql.translate.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/ssl.certificates.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.delete_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.get_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.get_transform_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.preview_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.put_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.start_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.stop_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/transform.update_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.ack_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.activate_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.deactivate_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.delete_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.execute_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.get_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.put_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.start.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/watcher.stop.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/xpack.info.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/xpack.ssl.certificates.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/generated/xpack.usage.json (100%)
 rename x-pack/{legacy/plugins/console_extensions/spec/ingest/index.js => plugins/console_extensions/server/spec/ingest/index.ts} (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ccr.follow.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ccr.forget_follower.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ccr.put_auto_follow_pattern.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ccr.resume_follow.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/enrich.put_policy.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ilm.move_to_step.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ilm.put_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.estimate_memory_usage.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.evaluate_data_frame.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.explain_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_buckets.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_calendar_events.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_calendars.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_categories.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_influencers.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_model_snapshots.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_overall_buckets.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.get_records.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.post_calendar_events.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.put_calendar.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.put_data_frame_analytics.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.put_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.put_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.put_trained_model.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.revert_model_snapshot.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.update_datafeed.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.update_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/ml.update_model_snapshot.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.authenticate.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.change_password.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.create_api_key.json (100%)
 create mode 100644 x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.get_token.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.has_privileges.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.invalidate_api_key.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.invalidate_token.json (100%)
 create mode 100644 x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.put_role.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.put_role_mapping.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/security.put_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/slm.put_lifecycle.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/slm.start.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/slm.stop.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/sql.query.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/transform.get_transform_stats.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/transform.preview_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/transform.put_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/transform.stop_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/transform.update_transform.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.graph.explore.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.info.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.license.post.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.rollup.delete_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.rollup.put_job.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.rollup.rollup_search.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.authenticate.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.change_password.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.get_token.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.invalidate_token.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.put_role.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.put_role_mapping.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.security.put_user.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.watcher.execute_watch.json (100%)
 rename x-pack/{legacy/plugins/console_extensions => plugins/console_extensions/server}/spec/overrides/xpack.watcher.put_watch.json (100%)

diff --git a/.i18nrc.json b/.i18nrc.json
index af21f3426d75e..98c36b43e5d8f 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -1,7 +1,7 @@
 {
   "paths": {
     "common.ui": "src/legacy/ui",
-    "console": "src/legacy/core_plugins/console",
+    "console": "src/plugins/console",
     "core": "src/core",
     "dashboardEmbeddableContainer": "src/plugins/dashboard_embeddable_container",
     "data": [
diff --git a/src/core/server/http/router/response_adapter.ts b/src/core/server/http/router/response_adapter.ts
index e5dabc99f4442..948b4596e2658 100644
--- a/src/core/server/http/router/response_adapter.ts
+++ b/src/core/server/http/router/response_adapter.ts
@@ -19,6 +19,7 @@
 import { ResponseObject as HapiResponseObject, ResponseToolkit as HapiResponseToolkit } from 'hapi';
 import typeDetect from 'type-detect';
 import Boom from 'boom';
+import * as stream from 'stream';
 
 import {
   HttpResponsePayload,
@@ -112,8 +113,18 @@ export class HapiResponseAdapter {
     return response;
   }
 
-  private toError(kibanaResponse: KibanaResponse<ResponseError>) {
+  private toError(kibanaResponse: KibanaResponse<ResponseError | Buffer | stream.Readable>) {
     const { payload } = kibanaResponse;
+
+    // Special case for when we are proxying requests and want to enable streaming back error responses opaquely.
+    if (Buffer.isBuffer(payload) || payload instanceof stream.Readable) {
+      const response = this.responseToolkit
+        .response(kibanaResponse.payload)
+        .code(kibanaResponse.status);
+      setHeaders(response, kibanaResponse.options.headers);
+      return response;
+    }
+
     // we use for BWC with Boom payload for error responses - {error: string, message: string, statusCode: string}
     const error = new Boom('', {
       statusCode: kibanaResponse.status,
diff --git a/src/legacy/core_plugins/console/__tests__/index.js b/src/legacy/core_plugins/console/__tests__/index.js
deleted file mode 100644
index c811bb3f89bba..0000000000000
--- a/src/legacy/core_plugins/console/__tests__/index.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Deprecations } from '../../../deprecation';
-import expect from '@kbn/expect';
-import index from '../index';
-import { noop } from 'lodash';
-import sinon from 'sinon';
-
-describe('plugins/console', function() {
-  describe('#deprecate()', function() {
-    let transformDeprecations;
-
-    before(function() {
-      const Plugin = function(options) {
-        this.deprecations = options.deprecations;
-      };
-
-      const plugin = index({ Plugin });
-
-      const deprecations = plugin.deprecations(Deprecations);
-      transformDeprecations = (settings, log = noop) => {
-        deprecations.forEach(deprecation => deprecation(settings, log));
-      };
-    });
-
-    describe('proxyConfig', function() {
-      it('leaves the proxyConfig settings', function() {
-        const proxyConfigOne = {};
-        const proxyConfigTwo = {};
-        const settings = {
-          proxyConfig: [proxyConfigOne, proxyConfigTwo],
-        };
-
-        transformDeprecations(settings);
-        expect(settings.proxyConfig[0]).to.be(proxyConfigOne);
-        expect(settings.proxyConfig[1]).to.be(proxyConfigTwo);
-      });
-
-      it('logs a warning when proxyConfig is specified', function() {
-        const settings = {
-          proxyConfig: [],
-        };
-
-        const log = sinon.spy();
-        transformDeprecations(settings, log);
-        expect(log.calledOnce).to.be(true);
-      });
-
-      it(`doesn't log a warning when proxyConfig isn't specified`, function() {
-        const settings = {};
-
-        const log = sinon.spy();
-        transformDeprecations(settings, log);
-        expect(log.called).to.be(false);
-      });
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/console/index.ts b/src/legacy/core_plugins/console/index.ts
deleted file mode 100644
index cec6d0a4219ae..0000000000000
--- a/src/legacy/core_plugins/console/index.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Boom from 'boom';
-import { first } from 'rxjs/operators';
-import { resolve, join } from 'path';
-import url from 'url';
-import { has, isEmpty, head, pick } from 'lodash';
-
-// @ts-ignore
-import { addProcessorDefinition } from './server/api_server/es_6_0/ingest';
-// @ts-ignore
-import { resolveApi } from './server/api_server/server';
-// @ts-ignore
-import { addExtensionSpecFilePath } from './server/api_server/spec';
-// @ts-ignore
-import { setHeaders } from './server/set_headers';
-// @ts-ignore
-import { ProxyConfigCollection, getElasticsearchProxyConfig, createProxyRoute } from './server';
-
-function filterHeaders(originalHeaders: any, headersToKeep: any) {
-  const normalizeHeader = function(header: any) {
-    if (!header) {
-      return '';
-    }
-    header = header.toString();
-    return header.trim().toLowerCase();
-  };
-
-  // Normalize list of headers we want to allow in upstream request
-  const headersToKeepNormalized = headersToKeep.map(normalizeHeader);
-
-  return pick(originalHeaders, headersToKeepNormalized);
-}
-
-// eslint-disable-next-line
-export default function(kibana: any) {
-  const npSrc = resolve(__dirname, 'public/np_ready');
-
-  let defaultVars: any;
-  return new kibana.Plugin({
-    id: 'console',
-    require: ['elasticsearch'],
-
-    config(Joi: any) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-        proxyFilter: Joi.array()
-          .items(Joi.string())
-          .single()
-          .default(['.*']),
-        ssl: Joi.object({
-          verify: Joi.boolean(),
-        }).default(),
-        proxyConfig: Joi.array()
-          .items(
-            Joi.object().keys({
-              match: Joi.object().keys({
-                protocol: Joi.string().default('*'),
-                host: Joi.string().default('*'),
-                port: Joi.string().default('*'),
-                path: Joi.string().default('*'),
-              }),
-
-              timeout: Joi.number(),
-              ssl: Joi.object()
-                .keys({
-                  verify: Joi.boolean(),
-                  ca: Joi.array()
-                    .single()
-                    .items(Joi.string()),
-                  cert: Joi.string(),
-                  key: Joi.string(),
-                })
-                .default(),
-            })
-          )
-          .default(),
-      }).default();
-    },
-
-    deprecations() {
-      return [
-        (settings: any, log: any) => {
-          if (has(settings, 'proxyConfig')) {
-            log(
-              'Config key "proxyConfig" is deprecated. Configuration can be inferred from the "elasticsearch" settings'
-            );
-          }
-        },
-      ];
-    },
-
-    uiCapabilities() {
-      return {
-        dev_tools: {
-          show: true,
-          save: true,
-        },
-      };
-    },
-
-    async init(server: any, options: any) {
-      server.expose('addExtensionSpecFilePath', addExtensionSpecFilePath);
-      server.expose('addProcessorDefinition', addProcessorDefinition);
-
-      if (options.ssl && options.ssl.verify) {
-        throw new Error('sense.ssl.verify is no longer supported.');
-      }
-
-      const config = server.config();
-      const legacyEsConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
-        .pipe(first())
-        .toPromise();
-      const proxyConfigCollection = new ProxyConfigCollection(options.proxyConfig);
-      const proxyPathFilters = options.proxyFilter.map((str: string) => new RegExp(str));
-
-      defaultVars = {
-        elasticsearchUrl: url.format(
-          Object.assign(url.parse(head(legacyEsConfig.hosts)), { auth: false })
-        ),
-      };
-
-      server.route(
-        createProxyRoute({
-          hosts: legacyEsConfig.hosts,
-          pathFilters: proxyPathFilters,
-          getConfigForReq(req: any, uri: any) {
-            const filteredHeaders = filterHeaders(
-              req.headers,
-              legacyEsConfig.requestHeadersWhitelist
-            );
-            const headers = setHeaders(filteredHeaders, legacyEsConfig.customHeaders);
-
-            if (!isEmpty(config.get('console.proxyConfig'))) {
-              return {
-                ...proxyConfigCollection.configForUri(uri),
-                headers,
-              };
-            }
-
-            return {
-              ...getElasticsearchProxyConfig(legacyEsConfig),
-              headers,
-            };
-          },
-        })
-      );
-
-      server.route({
-        path: '/api/console/api_server',
-        method: ['GET', 'POST'],
-        handler(req: any, h: any) {
-          const { sense_version: version, apis } = req.query;
-          if (!apis) {
-            throw Boom.badRequest('"apis" is a required param.');
-          }
-
-          return resolveApi(version, apis.split(','), h);
-        },
-      });
-    },
-
-    uiExports: {
-      devTools: [resolve(__dirname, 'public/legacy')],
-      styleSheetPaths: resolve(npSrc, 'application/styles/index.scss'),
-      injectDefaultVars: () => defaultVars,
-      noParse: [join(npSrc, 'application/models/legacy_core_editor/mode/worker/worker.js')],
-    },
-  } as any);
-}
diff --git a/src/legacy/core_plugins/console/package.json b/src/legacy/core_plugins/console/package.json
deleted file mode 100644
index 84ebcb95889c7..0000000000000
--- a/src/legacy/core_plugins/console/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "author": "Boaz Leskes <boaz@elastic.co>",
-  "contributors": [
-    "Spencer Alger <spencer.alger@elastic.co>"
-  ],
-  "name": "console",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/console/public/legacy.ts b/src/legacy/core_plugins/console/public/legacy.ts
deleted file mode 100644
index d151a27d27e5c..0000000000000
--- a/src/legacy/core_plugins/console/public/legacy.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { npSetup, npStart } from 'ui/new_platform';
-import { I18nContext } from 'ui/i18n';
-import chrome from 'ui/chrome';
-import { FeatureCatalogueCategory } from 'ui/registry/feature_catalogue';
-
-import { plugin } from './np_ready';
-import { DevToolsSetup } from '../../../../plugins/dev_tools/public';
-import { HomePublicPluginSetup } from '../../../../plugins/home/public';
-import { UsageCollectionSetup } from '../../../../plugins/usage_collection/public';
-
-export interface XPluginSet {
-  usageCollection: UsageCollectionSetup;
-  dev_tools: DevToolsSetup;
-  home: HomePublicPluginSetup;
-  __LEGACY: {
-    I18nContext: any;
-    elasticsearchUrl: string;
-    category: FeatureCatalogueCategory;
-  };
-}
-
-const pluginInstance = plugin({} as any);
-
-(async () => {
-  await pluginInstance.setup(npSetup.core, {
-    ...npSetup.plugins,
-    __LEGACY: {
-      elasticsearchUrl: chrome.getInjected('elasticsearchUrl'),
-      I18nContext,
-      category: FeatureCatalogueCategory.ADMIN,
-    },
-  });
-  await pluginInstance.start(npStart.core);
-})();
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/headers.js b/src/legacy/core_plugins/console/server/__tests__/proxy_route/headers.js
deleted file mode 100644
index 3a8233775f9b7..0000000000000
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/headers.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { request } from 'http';
-
-import sinon from 'sinon';
-import expect from '@kbn/expect';
-import { Server } from 'hapi';
-import * as requestModule from '../../request';
-
-import { createProxyRoute } from '../../';
-
-import { createResponseStub } from './stubs';
-
-describe('Console Proxy Route', () => {
-  const sandbox = sinon.createSandbox();
-  const teardowns = [];
-  let setup;
-
-  beforeEach(() => {
-    sandbox.stub(requestModule, 'sendRequest').callsFake(createResponseStub());
-
-    setup = () => {
-      const server = new Server();
-      server.route(
-        createProxyRoute({
-          hosts: ['http://localhost:9200'],
-        })
-      );
-
-      teardowns.push(() => server.stop());
-
-      return { server };
-    };
-  });
-
-  afterEach(async () => {
-    sandbox.restore();
-    await Promise.all(teardowns.splice(0).map(fn => fn()));
-  });
-
-  describe('headers', function() {
-    this.timeout(Infinity);
-
-    it('forwards the remote header info', async () => {
-      const { server } = setup();
-      await server.start();
-
-      const resp = await new Promise(resolve => {
-        request(
-          {
-            protocol: server.info.protocol + ':',
-            host: server.info.address,
-            port: server.info.port,
-            method: 'POST',
-            path: '/api/console/proxy?method=GET&path=/',
-          },
-          resolve
-        ).end();
-      });
-
-      resp.destroy();
-
-      sinon.assert.calledOnce(requestModule.sendRequest);
-      const { headers } = requestModule.sendRequest.getCall(0).args[0];
-      expect(headers)
-        .to.have.property('x-forwarded-for')
-        .and.not.be('');
-      expect(headers)
-        .to.have.property('x-forwarded-port')
-        .and.not.be('');
-      expect(headers)
-        .to.have.property('x-forwarded-proto')
-        .and.not.be('');
-      expect(headers)
-        .to.have.property('x-forwarded-host')
-        .and.not.be('');
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js b/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
deleted file mode 100644
index 0069a08400c57..0000000000000
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/params.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Agent } from 'http';
-
-import sinon from 'sinon';
-import * as requestModule from '../../request';
-import expect from '@kbn/expect';
-import { Server } from 'hapi';
-
-import { createProxyRoute } from '../../';
-
-import { createResponseStub } from './stubs';
-
-describe('Console Proxy Route', () => {
-  const sandbox = sinon.createSandbox();
-  const teardowns = [];
-  let setup;
-
-  beforeEach(() => {
-    sandbox.stub(requestModule, 'sendRequest').callsFake(createResponseStub());
-
-    setup = () => {
-      const server = new Server();
-      teardowns.push(() => server.stop());
-      return { server };
-    };
-  });
-
-  afterEach(async () => {
-    sandbox.restore();
-    await Promise.all(teardowns.splice(0).map(fn => fn()));
-  });
-
-  describe('params', () => {
-    describe('pathFilters', () => {
-      describe('no matches', () => {
-        it('rejects with 403', async () => {
-          const { server } = setup();
-          server.route(
-            createProxyRoute({
-              pathFilters: [/^\/foo\//, /^\/bar\//],
-            })
-          );
-
-          const { statusCode } = await server.inject({
-            method: 'POST',
-            url: '/api/console/proxy?method=GET&path=/baz/type/id',
-          });
-
-          expect(statusCode).to.be(403);
-        });
-      });
-      describe('one match', () => {
-        it('allows the request', async () => {
-          const { server } = setup();
-          server.route(
-            createProxyRoute({
-              hosts: ['http://localhost:9200'],
-              pathFilters: [/^\/foo\//, /^\/bar\//],
-            })
-          );
-
-          const { statusCode } = await server.inject({
-            method: 'POST',
-            url: '/api/console/proxy?method=GET&path=/foo/type/id',
-          });
-
-          expect(statusCode).to.be(200);
-          sinon.assert.calledOnce(requestModule.sendRequest);
-        });
-      });
-      describe('all match', () => {
-        it('allows the request', async () => {
-          const { server } = setup();
-          server.route(
-            createProxyRoute({
-              hosts: ['http://localhost:9200'],
-              pathFilters: [/^\/foo\//, /^\/bar\//],
-            })
-          );
-
-          const { statusCode } = await server.inject({
-            method: 'POST',
-            url: '/api/console/proxy?method=GET&path=/foo/type/id',
-          });
-
-          expect(statusCode).to.be(200);
-          sinon.assert.calledOnce(requestModule.sendRequest);
-        });
-      });
-    });
-
-    describe('getConfigForReq()', () => {
-      it('passes the request and targeted uri', async () => {
-        const { server } = setup();
-
-        const getConfigForReq = sinon.stub().returns({});
-
-        server.route(createProxyRoute({ hosts: ['http://localhost:9200'], getConfigForReq }));
-        await server.inject({
-          method: 'POST',
-          url: '/api/console/proxy?method=HEAD&path=/index/type/id',
-        });
-
-        sinon.assert.calledOnce(getConfigForReq);
-        const args = getConfigForReq.getCall(0).args;
-        expect(args[0]).to.have.property('path', '/api/console/proxy');
-        expect(args[0]).to.have.property('method', 'post');
-        expect(args[0])
-          .to.have.property('query')
-          .eql({ method: 'HEAD', path: '/index/type/id' });
-        expect(args[1]).to.be('http://localhost:9200/index/type/id?pretty=true');
-      });
-
-      it('sends the returned timeout, agent, and base headers to request', async () => {
-        const { server } = setup();
-
-        const timeout = Math.round(Math.random() * 10000);
-        const agent = new Agent();
-        const rejectUnauthorized = !!Math.round(Math.random());
-        const headers = {
-          foo: 'bar',
-          baz: 'bop',
-        };
-
-        server.route(
-          createProxyRoute({
-            hosts: ['http://localhost:9200'],
-            getConfigForReq: () => ({
-              timeout,
-              agent,
-              headers,
-              rejectUnauthorized,
-            }),
-          })
-        );
-
-        await server.inject({
-          method: 'POST',
-          url: '/api/console/proxy?method=HEAD&path=/index/type/id',
-        });
-
-        sinon.assert.calledOnce(requestModule.sendRequest);
-        const opts = requestModule.sendRequest.getCall(0).args[0];
-        expect(opts).to.have.property('timeout', timeout);
-        expect(opts).to.have.property('agent', agent);
-        expect(opts).to.have.property('rejectUnauthorized', rejectUnauthorized);
-        expect(opts.headers).to.have.property('foo', 'bar');
-        expect(opts.headers).to.have.property('baz', 'bop');
-      });
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js b/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
deleted file mode 100644
index 4f96b032d9cc6..0000000000000
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/query_string.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import sinon from 'sinon';
-import * as requestModule from '../../request';
-import expect from '@kbn/expect';
-import { Server } from 'hapi';
-
-import { createProxyRoute } from '../../';
-
-import { createResponseStub } from './stubs';
-
-describe('Console Proxy Route', () => {
-  const sandbox = sinon.createSandbox();
-  const teardowns = [];
-  let request;
-
-  beforeEach(() => {
-    sandbox.stub(requestModule, 'sendRequest').callsFake(createResponseStub());
-
-    request = async (method, path) => {
-      const server = new Server();
-      server.route(
-        createProxyRoute({
-          hosts: ['http://localhost:9200'],
-        })
-      );
-
-      teardowns.push(() => server.stop());
-
-      const params = [];
-      if (path != null) params.push(`path=${path}`);
-      if (method != null) params.push(`method=${method}`);
-      return await server.inject({
-        method: 'POST',
-        url: `/api/console/proxy${params.length ? `?${params.join('&')}` : ''}`,
-      });
-    };
-  });
-
-  afterEach(async () => {
-    sandbox.restore();
-    await Promise.all(teardowns.splice(0).map(fn => fn()));
-  });
-
-  describe('query string', () => {
-    describe('path', () => {
-      describe('contains full url', () => {
-        it('treats the url as a path', async () => {
-          await request('GET', 'http://evil.com/test');
-          sinon.assert.calledOnce(requestModule.sendRequest);
-          const args = requestModule.sendRequest.getCall(0).args;
-          expect(args[0].uri.href).to.be('http://localhost:9200/http://evil.com/test?pretty=true');
-        });
-      });
-      describe('is missing', () => {
-        it('returns a 400 error', async () => {
-          const { statusCode } = await request('GET', undefined);
-          expect(statusCode).to.be(400);
-          sinon.assert.notCalled(requestModule.sendRequest);
-        });
-      });
-      describe('is empty', () => {
-        it('returns a 400 error', async () => {
-          const { statusCode } = await request('GET', '');
-          expect(statusCode).to.be(400);
-          sinon.assert.notCalled(requestModule.sendRequest);
-        });
-      });
-      describe('starts with a slash', () => {
-        it('combines well with the base url', async () => {
-          await request('GET', '/index/type/id');
-          sinon.assert.calledOnce(requestModule.sendRequest);
-          expect(requestModule.sendRequest.getCall(0).args[0].uri.href).to.be(
-            'http://localhost:9200/index/type/id?pretty=true'
-          );
-        });
-      });
-      describe(`doesn't start with a slash`, () => {
-        it('combines well with the base url', async () => {
-          await request('GET', 'index/type/id');
-          sinon.assert.calledOnce(requestModule.sendRequest);
-          expect(requestModule.sendRequest.getCall(0).args[0].uri.href).to.be(
-            'http://localhost:9200/index/type/id?pretty=true'
-          );
-        });
-      });
-    });
-    describe('method', () => {
-      describe('is missing', () => {
-        it('returns a 400 error', async () => {
-          const { statusCode } = await request(null, '/');
-          expect(statusCode).to.be(400);
-          sinon.assert.notCalled(requestModule.sendRequest);
-        });
-      });
-      describe('is empty', () => {
-        it('returns a 400 error', async () => {
-          const { statusCode } = await request('', '/');
-          expect(statusCode).to.be(400);
-          sinon.assert.notCalled(requestModule.sendRequest);
-        });
-      });
-      describe('is an invalid http method', () => {
-        it('returns a 400 error', async () => {
-          const { statusCode } = await request('foo', '/');
-          expect(statusCode).to.be(400);
-          sinon.assert.notCalled(requestModule.sendRequest);
-        });
-      });
-      describe('is mixed case', () => {
-        it('sends a request with the exact method', async () => {
-          const { statusCode } = await request('HeAd', '/');
-          expect(statusCode).to.be(200);
-          sinon.assert.calledOnce(requestModule.sendRequest);
-          expect(requestModule.sendRequest.getCall(0).args[0].method).to.be('HeAd');
-        });
-      });
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/console/server/proxy_route.ts b/src/legacy/core_plugins/console/server/proxy_route.ts
deleted file mode 100644
index f67c97443ba07..0000000000000
--- a/src/legacy/core_plugins/console/server/proxy_route.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import Joi from 'joi';
-import * as url from 'url';
-import { IncomingMessage } from 'http';
-import Boom from 'boom';
-import { trimLeft, trimRight } from 'lodash';
-import { sendRequest } from './request';
-
-function toURL(base: string, path: string) {
-  const urlResult = new url.URL(`${trimRight(base, '/')}/${trimLeft(path, '/')}`);
-  // Appending pretty here to have Elasticsearch do the JSON formatting, as doing
-  // in JS can lead to data loss (7.0 will get munged into 7, thus losing indication of
-  // measurement precision)
-  if (!urlResult.searchParams.get('pretty')) {
-    urlResult.searchParams.append('pretty', 'true');
-  }
-  return urlResult;
-}
-
-function getProxyHeaders(req: any) {
-  const headers = Object.create(null);
-
-  // Scope this proto-unsafe functionality to where it is being used.
-  function extendCommaList(obj: Record<string, any>, property: string, value: any) {
-    obj[property] = (obj[property] ? obj[property] + ',' : '') + value;
-  }
-
-  if (req.info.remotePort && req.info.remoteAddress) {
-    // see https://git.io/vytQ7
-    extendCommaList(headers, 'x-forwarded-for', req.info.remoteAddress);
-    extendCommaList(headers, 'x-forwarded-port', req.info.remotePort);
-    extendCommaList(headers, 'x-forwarded-proto', req.server.info.protocol);
-    extendCommaList(headers, 'x-forwarded-host', req.info.host);
-  }
-
-  const contentType = req.headers['content-type'];
-  if (contentType) {
-    headers['content-type'] = contentType;
-  }
-  return headers;
-}
-
-export const createProxyRoute = ({
-  hosts,
-  pathFilters = [/.*/],
-  getConfigForReq = () => ({}),
-}: {
-  hosts: string[];
-  pathFilters: RegExp[];
-  getConfigForReq: (...args: any[]) => any;
-}) => ({
-  path: '/api/console/proxy',
-  method: 'POST',
-  config: {
-    tags: ['access:console'],
-    payload: {
-      output: 'stream',
-      parse: false,
-    },
-    validate: {
-      payload: true,
-      query: Joi.object()
-        .keys({
-          method: Joi.string()
-            .valid('HEAD', 'GET', 'POST', 'PUT', 'DELETE')
-            .insensitive()
-            .required(),
-          path: Joi.string().required(),
-        })
-        .unknown(true),
-    },
-
-    pre: [
-      function filterPath(req: any) {
-        const { path } = req.query;
-
-        if (pathFilters.some(re => re.test(path))) {
-          return null;
-        }
-
-        const err = Boom.forbidden();
-        err.output.payload = `Error connecting to '${path}':\n\nUnable to send requests to that path.` as any;
-        err.output.headers['content-type'] = 'text/plain';
-        throw err;
-      },
-    ],
-
-    handler: async (req: any, h: any) => {
-      const { payload, query } = req;
-      const { path, method } = query;
-
-      let esIncomingMessage: IncomingMessage;
-
-      for (let idx = 0; idx < hosts.length; ++idx) {
-        const host = hosts[idx];
-        try {
-          const uri = toURL(host, path);
-
-          // Because this can technically be provided by a settings-defined proxy config, we need to
-          // preserve these property names to maintain BWC.
-          const { timeout, agent, headers, rejectUnauthorized } = getConfigForReq(
-            req,
-            uri.toString()
-          );
-
-          const requestHeaders = {
-            ...headers,
-            ...getProxyHeaders(req),
-          };
-
-          esIncomingMessage = await sendRequest({
-            method,
-            headers: requestHeaders,
-            uri,
-            timeout,
-            payload,
-            rejectUnauthorized,
-            agent,
-          });
-
-          break;
-        } catch (e) {
-          if (e.code !== 'ECONNREFUSED') {
-            throw Boom.boomify(e);
-          }
-          if (idx === hosts.length - 1) {
-            throw Boom.badGateway('Could not reach any configured nodes.');
-          }
-          // Otherwise, try the next host...
-        }
-      }
-
-      const {
-        statusCode,
-        statusMessage,
-        headers: { warning },
-      } = esIncomingMessage!;
-
-      if (method.toUpperCase() !== 'HEAD') {
-        return h
-          .response(esIncomingMessage!)
-          .code(statusCode)
-          .header('warning', warning!);
-      } else {
-        return h
-          .response(`${statusCode} - ${statusMessage}`)
-          .code(statusCode)
-          .type('text/plain')
-          .header('warning', warning!);
-      }
-    },
-  },
-});
diff --git a/src/legacy/core_plugins/console_legacy/index.ts b/src/legacy/core_plugins/console_legacy/index.ts
new file mode 100644
index 0000000000000..65547e1ee5406
--- /dev/null
+++ b/src/legacy/core_plugins/console_legacy/index.ts
@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { first } from 'rxjs/operators';
+import { head } from 'lodash';
+import { resolve } from 'path';
+import url from 'url';
+
+// TODO: Remove this hack once we can get the ES config we need for Console proxy a better way.
+let _legacyEsConfig: any;
+export const readLegacyEsConfig = () => {
+  return _legacyEsConfig;
+};
+
+// eslint-disable-next-line import/no-default-export
+export default function(kibana: any) {
+  return new kibana.Plugin({
+    id: 'console_legacy',
+
+    async init(server: any) {
+      _legacyEsConfig = await server.newPlatform.__internals.elasticsearch.legacy.config$
+        .pipe(first())
+        .toPromise();
+    },
+
+    uiExports: {
+      styleSheetPaths: resolve(__dirname, 'public/styles/index.scss'),
+      injectDefaultVars: () => ({
+        elasticsearchUrl: url.format(
+          Object.assign(url.parse(head(_legacyEsConfig.hosts)), { auth: false })
+        ),
+      }),
+    },
+  } as any);
+}
diff --git a/src/legacy/core_plugins/console_legacy/package.json b/src/legacy/core_plugins/console_legacy/package.json
new file mode 100644
index 0000000000000..b78807daed959
--- /dev/null
+++ b/src/legacy/core_plugins/console_legacy/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "console_legacy",
+  "version": "kibana"
+}
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/styles/_app.scss b/src/legacy/core_plugins/console_legacy/public/styles/_app.scss
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/styles/_app.scss
rename to src/legacy/core_plugins/console_legacy/public/styles/_app.scss
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/styles/components/_help.scss b/src/legacy/core_plugins/console_legacy/public/styles/components/_help.scss
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/styles/components/_help.scss
rename to src/legacy/core_plugins/console_legacy/public/styles/components/_help.scss
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/styles/components/_history.scss b/src/legacy/core_plugins/console_legacy/public/styles/components/_history.scss
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/styles/components/_history.scss
rename to src/legacy/core_plugins/console_legacy/public/styles/components/_history.scss
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/styles/components/_index.scss b/src/legacy/core_plugins/console_legacy/public/styles/components/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/styles/components/_index.scss
rename to src/legacy/core_plugins/console_legacy/public/styles/components/_index.scss
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/styles/index.scss b/src/legacy/core_plugins/console_legacy/public/styles/index.scss
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/styles/index.scss
rename to src/legacy/core_plugins/console_legacy/public/styles/index.scss
diff --git a/src/legacy/core_plugins/console/common/text_object.ts b/src/plugins/console/common/text_object.ts
similarity index 100%
rename from src/legacy/core_plugins/console/common/text_object.ts
rename to src/plugins/console/common/text_object.ts
diff --git a/src/plugins/console/common/types/index.ts b/src/plugins/console/common/types/index.ts
new file mode 100644
index 0000000000000..65e02b859d1ac
--- /dev/null
+++ b/src/plugins/console/common/types/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 './models';
+export * from './plugin_config';
diff --git a/src/legacy/core_plugins/console/common/types.ts b/src/plugins/console/common/types/models.ts
similarity index 97%
rename from src/legacy/core_plugins/console/common/types.ts
rename to src/plugins/console/common/types/models.ts
index 33d6907ff60b8..de118761aea54 100644
--- a/src/legacy/core_plugins/console/common/types.ts
+++ b/src/plugins/console/common/types/models.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { TextObject } from './text_object';
+import { TextObject } from '../text_object';
 
 export interface IdObject {
   id: string;
diff --git a/src/plugins/console/common/types/plugin_config.ts b/src/plugins/console/common/types/plugin_config.ts
new file mode 100644
index 0000000000000..965c301d8b086
--- /dev/null
+++ b/src/plugins/console/common/types/plugin_config.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export interface PluginServerConfig {
+  elasticsearchUrl: string;
+}
diff --git a/src/legacy/core_plugins/console/public/kibana.json b/src/plugins/console/kibana.json
similarity index 73%
rename from src/legacy/core_plugins/console/public/kibana.json
rename to src/plugins/console/kibana.json
index c58a5a90fb9f2..18f7eb06e98ed 100644
--- a/src/legacy/core_plugins/console/public/kibana.json
+++ b/src/plugins/console/kibana.json
@@ -3,6 +3,6 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": ["home"],
+  "requiredPlugins": ["dev_tools", "home"],
   "optionalPlugins": ["usageCollection"]
 }
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/console_menu.tsx b/src/plugins/console/public/application/components/console_menu.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/console_menu.tsx
rename to src/plugins/console/public/application/components/console_menu.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/editor_content_spinner.tsx b/src/plugins/console/public/application/components/editor_content_spinner.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/editor_content_spinner.tsx
rename to src/plugins/console/public/application/components/editor_content_spinner.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/editor_example.tsx b/src/plugins/console/public/application/components/editor_example.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/editor_example.tsx
rename to src/plugins/console/public/application/components/editor_example.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/help_panel.tsx b/src/plugins/console/public/application/components/help_panel.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/help_panel.tsx
rename to src/plugins/console/public/application/components/help_panel.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/index.ts b/src/plugins/console/public/application/components/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/index.ts
rename to src/plugins/console/public/application/components/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/settings_modal.tsx b/src/plugins/console/public/application/components/settings_modal.tsx
similarity index 98%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/settings_modal.tsx
rename to src/plugins/console/public/application/components/settings_modal.tsx
index 05afdc9b79e0f..3cd20bf1bc343 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/components/settings_modal.tsx
+++ b/src/plugins/console/public/application/components/settings_modal.tsx
@@ -248,7 +248,10 @@ export function DevToolsSettingsModal(props: Props) {
             }
           >
             <EuiCheckboxGroup
-              options={autoCompleteCheckboxes}
+              options={autoCompleteCheckboxes.map(opts => {
+                const { stateSetter, ...rest } = opts;
+                return rest;
+              })}
               idToSelectedMap={checkboxIdToSelectedMap}
               onChange={(e: any) => {
                 onAutocompleteChange(e as AutocompleteOptions);
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/something_went_wrong_callout.tsx b/src/plugins/console/public/application/components/something_went_wrong_callout.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/something_went_wrong_callout.tsx
rename to src/plugins/console/public/application/components/something_went_wrong_callout.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/top_nav_menu.tsx b/src/plugins/console/public/application/components/top_nav_menu.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/top_nav_menu.tsx
rename to src/plugins/console/public/application/components/top_nav_menu.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/components/welcome_panel.tsx b/src/plugins/console/public/application/components/welcome_panel.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/components/welcome_panel.tsx
rename to src/plugins/console/public/application/components/welcome_panel.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/constants/help_example.txt b/src/plugins/console/public/application/constants/help_example.txt
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/constants/help_example.txt
rename to src/plugins/console/public/application/constants/help_example.txt
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/console_history/console_history.tsx b/src/plugins/console/public/application/containers/console_history/console_history.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/console_history/console_history.tsx
rename to src/plugins/console/public/application/containers/console_history/console_history.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/console_history/history_viewer.tsx b/src/plugins/console/public/application/containers/console_history/history_viewer.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/console_history/history_viewer.tsx
rename to src/plugins/console/public/application/containers/console_history/history_viewer.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/console_history/index.ts b/src/plugins/console/public/application/containers/console_history/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/console_history/index.ts
rename to src/plugins/console/public/application/containers/console_history/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/editor.tsx b/src/plugins/console/public/application/containers/editor/editor.tsx
similarity index 96%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/editor.tsx
rename to src/plugins/console/public/application/containers/editor/editor.tsx
index b42d791e5acd8..5c7fe293651fb 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/editor.tsx
+++ b/src/plugins/console/public/application/containers/editor/editor.tsx
@@ -21,7 +21,7 @@ import React, { useCallback } from 'react';
 import { debounce } from 'lodash';
 
 import { EditorContentSpinner } from '../../components';
-import { Panel, PanelsContainer } from '../../../../../../../../plugins/kibana_react/public';
+import { Panel, PanelsContainer } from '../../../../../kibana_react/public';
 import { Editor as EditorUI, EditorOutput } from './legacy/console_editor';
 import { StorageKeys } from '../../../services';
 import { useEditorReadContext, useServicesContext } from '../../contexts';
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/index.ts b/src/plugins/console/public/application/containers/editor/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/index.ts
rename to src/plugins/console/public/application/containers/editor/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/apply_editor_settings.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/apply_editor_settings.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/apply_editor_settings.ts
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/apply_editor_settings.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.mock.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
similarity index 99%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
index d4079fcea33f8..306cdd396f4f8 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.test.tsx
+++ b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.test.tsx
@@ -25,7 +25,7 @@ import { I18nProvider } from '@kbn/i18n/react';
 import { act } from 'react-dom/test-utils';
 import * as sinon from 'sinon';
 
-import { notificationServiceMock } from '../../../../../../../../../../../src/core/public/mocks';
+import { notificationServiceMock } from '../../../../../../../../core/public/mocks';
 
 import { nextTick } from 'test_utils/enzyme_helpers';
 import {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor.tsx
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/editor.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor_output.tsx b/src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/editor_output.tsx
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/editor_output.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/index.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/index.ts
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts b/src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
rename to src/plugins/console/public/application/containers/editor/legacy/console_editor/keyboard_shortcuts.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts b/src/plugins/console/public/application/containers/editor/legacy/console_menu_actions.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/console_menu_actions.ts
rename to src/plugins/console/public/application/containers/editor/legacy/console_menu_actions.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/index.ts b/src/plugins/console/public/application/containers/editor/legacy/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/index.ts
rename to src/plugins/console/public/application/containers/editor/legacy/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts b/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
similarity index 93%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts
rename to src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
index 1adc56d47927b..2d992aadbf15a 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/subscribe_console_resize_checker.ts
+++ b/src/plugins/console/public/application/containers/editor/legacy/subscribe_console_resize_checker.ts
@@ -16,7 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ResizeChecker } from '../../../../../../../../../plugins/kibana_utils/public';
+
+import { ResizeChecker } from '../../../../../../kibana_utils/public';
 
 export function subscribeResizeChecker(el: HTMLElement, ...editors: any[]) {
   const checker = new ResizeChecker(el);
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx b/src/plugins/console/public/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx
rename to src/plugins/console/public/application/containers/editor/legacy/use_ui_ace_keyboard_mode.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/index.ts b/src/plugins/console/public/application/containers/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/index.ts
rename to src/plugins/console/public/application/containers/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/main/get_top_nav.ts b/src/plugins/console/public/application/containers/main/get_top_nav.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/main/get_top_nav.ts
rename to src/plugins/console/public/application/containers/main/get_top_nav.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/main/index.ts b/src/plugins/console/public/application/containers/main/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/main/index.ts
rename to src/plugins/console/public/application/containers/main/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/main/main.tsx b/src/plugins/console/public/application/containers/main/main.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/main/main.tsx
rename to src/plugins/console/public/application/containers/main/main.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/containers/settings.tsx b/src/plugins/console/public/application/containers/settings.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/containers/settings.tsx
rename to src/plugins/console/public/application/containers/settings.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/create_use_context.ts b/src/plugins/console/public/application/contexts/create_use_context.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/create_use_context.ts
rename to src/plugins/console/public/application/contexts/create_use_context.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/editor_context/editor_context.tsx b/src/plugins/console/public/application/contexts/editor_context/editor_context.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/editor_context/editor_context.tsx
rename to src/plugins/console/public/application/contexts/editor_context/editor_context.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/editor_context/editor_registry.ts b/src/plugins/console/public/application/contexts/editor_context/editor_registry.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/editor_context/editor_registry.ts
rename to src/plugins/console/public/application/contexts/editor_context/editor_registry.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/editor_context/index.ts b/src/plugins/console/public/application/contexts/editor_context/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/editor_context/index.ts
rename to src/plugins/console/public/application/contexts/editor_context/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts b/src/plugins/console/public/application/contexts/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/index.ts
rename to src/plugins/console/public/application/contexts/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/request_context.tsx b/src/plugins/console/public/application/contexts/request_context.tsx
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/request_context.tsx
rename to src/plugins/console/public/application/contexts/request_context.tsx
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx b/src/plugins/console/public/application/contexts/services_context.tsx
similarity index 96%
rename from src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
rename to src/plugins/console/public/application/contexts/services_context.tsx
index d7f036e1aecb6..4393cab4adbc5 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/contexts/services_context.tsx
+++ b/src/plugins/console/public/application/contexts/services_context.tsx
@@ -20,7 +20,7 @@
 import React, { createContext, useContext } from 'react';
 import { NotificationsSetup } from 'kibana/public';
 import { History, Storage, Settings } from '../../services';
-import { ObjectStorageClient } from '../../../../common/types';
+import { ObjectStorageClient } from '../../../common/types';
 import { MetricsTracker } from '../../types';
 
 export interface ContextValue {
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/factories/index.ts b/src/plugins/console/public/application/factories/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/factories/index.ts
rename to src/plugins/console/public/application/factories/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/factories/token_iterator.ts b/src/plugins/console/public/application/factories/token_iterator.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/factories/token_iterator.ts
rename to src/plugins/console/public/application/factories/token_iterator.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/index.ts b/src/plugins/console/public/application/hooks/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/index.ts
rename to src/plugins/console/public/application/hooks/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/data_migration.ts b/src/plugins/console/public/application/hooks/use_data_init/data_migration.ts
similarity index 95%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/data_migration.ts
rename to src/plugins/console/public/application/hooks/use_data_init/data_migration.ts
index 08acd78ba2b8a..67d39c37a2f45 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/data_migration.ts
+++ b/src/plugins/console/public/application/hooks/use_data_init/data_migration.ts
@@ -18,7 +18,7 @@
  */
 
 import { History } from '../../../services';
-import { ObjectStorageClient } from '../../../../../common/types';
+import { ObjectStorageClient } from '../../../../common/types';
 
 export interface Dependencies {
   history: History;
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/index.ts b/src/plugins/console/public/application/hooks/use_data_init/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/index.ts
rename to src/plugins/console/public/application/hooks/use_data_init/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/use_data_init.ts b/src/plugins/console/public/application/hooks/use_data_init/use_data_init.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_data_init/use_data_init.ts
rename to src/plugins/console/public/application/hooks/use_data_init/use_data_init.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_restore_request_from_history/index.ts b/src/plugins/console/public/application/hooks/use_restore_request_from_history/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_restore_request_from_history/index.ts
rename to src/plugins/console/public/application/hooks/use_restore_request_from_history/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_restore_request_from_history/restore_request_from_history.ts b/src/plugins/console/public/application/hooks/use_restore_request_from_history/restore_request_from_history.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_restore_request_from_history/restore_request_from_history.ts
rename to src/plugins/console/public/application/hooks/use_restore_request_from_history/restore_request_from_history.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_restore_request_from_history/use_restore_request_from_history.ts b/src/plugins/console/public/application/hooks/use_restore_request_from_history/use_restore_request_from_history.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_restore_request_from_history/use_restore_request_from_history.ts
rename to src/plugins/console/public/application/hooks/use_restore_request_from_history/use_restore_request_from_history.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_save_current_text_object.ts b/src/plugins/console/public/application/hooks/use_save_current_text_object.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_save_current_text_object.ts
rename to src/plugins/console/public/application/hooks/use_save_current_text_object.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/index.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/index.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request_to_es/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request_to_es/send_request_to_es.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/track.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/track.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request_to_es/track.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
rename to src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/hooks/use_set_input_editor.ts b/src/plugins/console/public/application/hooks/use_set_input_editor.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/hooks/use_set_input_editor.ts
rename to src/plugins/console/public/application/hooks/use_set_input_editor.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/index.tsx b/src/plugins/console/public/application/index.tsx
similarity index 81%
rename from src/legacy/core_plugins/console/public/np_ready/application/index.tsx
rename to src/plugins/console/public/application/index.tsx
index efd0f2ba86024..1fef52da6f31b 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/index.tsx
+++ b/src/plugins/console/public/application/index.tsx
@@ -18,27 +18,38 @@
  */
 
 import React from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
 import { NotificationsSetup } from 'src/core/public';
 import { ServicesContextProvider, EditorContextProvider, RequestContextProvider } from './contexts';
 import { Main } from './containers';
 import { createStorage, createHistory, createSettings, Settings } from '../services';
 import * as localStorageObjectClient from '../lib/local_storage_object_client';
 import { createUsageTracker } from '../services/tracker';
+import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 let settingsRef: Settings;
 export function legacyBackDoorToSettings() {
   return settingsRef;
 }
 
-export function boot(deps: {
+export interface BootDependencies {
   docLinkVersion: string;
   I18nContext: any;
   notifications: NotificationsSetup;
   elasticsearchUrl: string;
-}) {
-  const { I18nContext, notifications, docLinkVersion, elasticsearchUrl } = deps;
+  usageCollection?: UsageCollectionSetup;
+  element: HTMLElement;
+}
 
-  const trackUiMetric = createUsageTracker();
+export function renderApp({
+  I18nContext,
+  notifications,
+  docLinkVersion,
+  elasticsearchUrl,
+  usageCollection,
+  element,
+}: BootDependencies) {
+  const trackUiMetric = createUsageTracker(usageCollection);
   trackUiMetric.load('opened_app');
 
   const storage = createStorage({
@@ -50,7 +61,7 @@ export function boot(deps: {
   const objectStorageClient = localStorageObjectClient.create(storage);
   settingsRef = settings;
 
-  return (
+  render(
     <I18nContext>
       <ServicesContextProvider
         value={{
@@ -72,6 +83,9 @@ export function boot(deps: {
           </EditorContextProvider>
         </RequestContextProvider>
       </ServicesContextProvider>
-    </I18nContext>
+    </I18nContext>,
+    element
   );
+
+  return () => unmountComponentAtNode(element);
 }
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/logo.svg b/src/plugins/console/public/application/logo.svg
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/logo.svg
rename to src/plugins/console/public/application/logo.svg
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/index.ts b/src/plugins/console/public/application/models/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/index.ts
rename to src/plugins/console/public/application/models/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/__tests__/input_tokenization.test.js b/src/plugins/console/public/application/models/legacy_core_editor/__tests__/input_tokenization.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/__tests__/input_tokenization.test.js
rename to src/plugins/console/public/application/models/legacy_core_editor/__tests__/input_tokenization.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/__tests__/output_tokenization.test.js b/src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/__tests__/output_tokenization.test.js
rename to src/plugins/console/public/application/models/legacy_core_editor/__tests__/output_tokenization.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/create.ts b/src/plugins/console/public/application/models/legacy_core_editor/create.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/create.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/create.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/create_readonly.ts b/src/plugins/console/public/application/models/legacy_core_editor/create_readonly.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/create_readonly.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/create_readonly.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/index.ts b/src/plugins/console/public/application/models/legacy_core_editor/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/index.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.test.mocks.ts b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.test.mocks.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.test.mocks.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.test.mocks.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts b/src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/legacy_core_editor.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/legacy_core_editor.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/elasticsearch_sql_highlight_rules.ts b/src/plugins/console/public/application/models/legacy_core_editor/mode/elasticsearch_sql_highlight_rules.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/elasticsearch_sql_highlight_rules.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/elasticsearch_sql_highlight_rules.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/input.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/input.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/input.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/input.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/input_highlight_rules.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/input_highlight_rules.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/input_highlight_rules.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/output.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/output.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/output.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/output.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/output_highlight_rules.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/output_highlight_rules.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/output_highlight_rules.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/script.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/script.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/script_highlight_rules.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/script_highlight_rules.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/script_highlight_rules.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/worker/index.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/worker/index.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/worker/index.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/worker/worker.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/worker/worker.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/worker/worker.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/worker/worker.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/x_json_highlight_rules.js b/src/plugins/console/public/application/models/legacy_core_editor/mode/x_json_highlight_rules.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/mode/x_json_highlight_rules.js
rename to src/plugins/console/public/application/models/legacy_core_editor/mode/x_json_highlight_rules.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/smart_resize.ts b/src/plugins/console/public/application/models/legacy_core_editor/smart_resize.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/smart_resize.ts
rename to src/plugins/console/public/application/models/legacy_core_editor/smart_resize.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/theme_sense_dark.js b/src/plugins/console/public/application/models/legacy_core_editor/theme_sense_dark.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/legacy_core_editor/theme_sense_dark.js
rename to src/plugins/console/public/application/models/legacy_core_editor/theme_sense_dark.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/__tests__/editor_input1.txt b/src/plugins/console/public/application/models/sense_editor/__tests__/editor_input1.txt
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/__tests__/editor_input1.txt
rename to src/plugins/console/public/application/models/sense_editor/__tests__/editor_input1.txt
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/__tests__/integration.test.js b/src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/__tests__/integration.test.js
rename to src/plugins/console/public/application/models/sense_editor/__tests__/integration.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/__tests__/sense_editor.test.js b/src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/__tests__/sense_editor.test.js
rename to src/plugins/console/public/application/models/sense_editor/__tests__/sense_editor.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/create.ts b/src/plugins/console/public/application/models/sense_editor/create.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/create.ts
rename to src/plugins/console/public/application/models/sense_editor/create.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/curl.ts b/src/plugins/console/public/application/models/sense_editor/curl.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/curl.ts
rename to src/plugins/console/public/application/models/sense_editor/curl.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts b/src/plugins/console/public/application/models/sense_editor/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/index.ts
rename to src/plugins/console/public/application/models/sense_editor/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/sense_editor.test.mocks.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.test.mocks.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/sense_editor.test.mocks.ts
rename to src/plugins/console/public/application/models/sense_editor/sense_editor.test.mocks.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/sense_editor.ts b/src/plugins/console/public/application/models/sense_editor/sense_editor.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/models/sense_editor/sense_editor.ts
rename to src/plugins/console/public/application/models/sense_editor/sense_editor.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/stores/editor.ts b/src/plugins/console/public/application/stores/editor.ts
similarity index 96%
rename from src/legacy/core_plugins/console/public/np_ready/application/stores/editor.ts
rename to src/plugins/console/public/application/stores/editor.ts
index 844eacd9b91a8..73c29e7ff8575 100644
--- a/src/legacy/core_plugins/console/public/np_ready/application/stores/editor.ts
+++ b/src/plugins/console/public/application/stores/editor.ts
@@ -21,7 +21,7 @@ import { Reducer } from 'react';
 import { produce } from 'immer';
 import { identity } from 'fp-ts/lib/function';
 import { DevToolsSettings } from '../../services';
-import { TextObject } from '../../../../common/text_object';
+import { TextObject } from '../../../common/text_object';
 
 export interface Store {
   ready: boolean;
diff --git a/src/legacy/core_plugins/console/public/np_ready/application/stores/request.ts b/src/plugins/console/public/application/stores/request.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/application/stores/request.ts
rename to src/plugins/console/public/application/stores/request.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/index.ts b/src/plugins/console/public/index.ts
similarity index 85%
rename from src/legacy/core_plugins/console/public/np_ready/index.ts
rename to src/plugins/console/public/index.ts
index 045420f401e3b..2af9d1d16af02 100644
--- a/src/legacy/core_plugins/console/public/np_ready/index.ts
+++ b/src/plugins/console/public/index.ts
@@ -17,12 +17,10 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
-
 import { ConsoleUIPlugin } from './plugin';
 
 export { ConsoleUIPlugin as Plugin };
 
-export function plugin(ctx: PluginInitializerContext) {
-  return new ConsoleUIPlugin(ctx);
+export function plugin() {
+  return new ConsoleUIPlugin();
 }
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/ace_token_provider/index.ts b/src/plugins/console/public/lib/ace_token_provider/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/ace_token_provider/index.ts
rename to src/plugins/console/public/lib/ace_token_provider/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/ace_token_provider/token_provider.test.ts b/src/plugins/console/public/lib/ace_token_provider/token_provider.test.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/ace_token_provider/token_provider.test.ts
rename to src/plugins/console/public/lib/ace_token_provider/token_provider.test.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/ace_token_provider/token_provider.ts b/src/plugins/console/public/lib/ace_token_provider/token_provider.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/ace_token_provider/token_provider.ts
rename to src/plugins/console/public/lib/ace_token_provider/token_provider.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/__tests__/url_autocomplete.test.js b/src/plugins/console/public/lib/autocomplete/__tests__/url_autocomplete.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/__tests__/url_autocomplete.test.js
rename to src/plugins/console/public/lib/autocomplete/__tests__/url_autocomplete.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/__tests__/url_params.test.js b/src/plugins/console/public/lib/autocomplete/__tests__/url_params.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/__tests__/url_params.test.js
rename to src/plugins/console/public/lib/autocomplete/__tests__/url_params.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts b/src/plugins/console/public/lib/autocomplete/autocomplete.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/autocomplete.ts
rename to src/plugins/console/public/lib/autocomplete/autocomplete.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/body_completer.js b/src/plugins/console/public/lib/autocomplete/body_completer.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/body_completer.js
rename to src/plugins/console/public/lib/autocomplete/body_completer.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/accept_endpoint_component.js b/src/plugins/console/public/lib/autocomplete/components/accept_endpoint_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/accept_endpoint_component.js
rename to src/plugins/console/public/lib/autocomplete/components/accept_endpoint_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/conditional_proxy.js b/src/plugins/console/public/lib/autocomplete/components/conditional_proxy.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/conditional_proxy.js
rename to src/plugins/console/public/lib/autocomplete/components/conditional_proxy.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/constant_component.js b/src/plugins/console/public/lib/autocomplete/components/constant_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/constant_component.js
rename to src/plugins/console/public/lib/autocomplete/components/constant_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/field_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/field_autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/field_autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/field_autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/full_request_component.ts b/src/plugins/console/public/lib/autocomplete/components/full_request_component.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/full_request_component.ts
rename to src/plugins/console/public/lib/autocomplete/components/full_request_component.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/global_only_component.js b/src/plugins/console/public/lib/autocomplete/components/global_only_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/global_only_component.js
rename to src/plugins/console/public/lib/autocomplete/components/global_only_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/id_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/id_autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/id_autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/index.js b/src/plugins/console/public/lib/autocomplete/components/index.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/index.js
rename to src/plugins/console/public/lib/autocomplete/components/index.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/index_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/index_autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/index_autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/list_component.js b/src/plugins/console/public/lib/autocomplete/components/list_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/list_component.js
rename to src/plugins/console/public/lib/autocomplete/components/list_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/object_component.js b/src/plugins/console/public/lib/autocomplete/components/object_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/object_component.js
rename to src/plugins/console/public/lib/autocomplete/components/object_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/shared_component.js b/src/plugins/console/public/lib/autocomplete/components/shared_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/shared_component.js
rename to src/plugins/console/public/lib/autocomplete/components/shared_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/simple_param_component.js b/src/plugins/console/public/lib/autocomplete/components/simple_param_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/simple_param_component.js
rename to src/plugins/console/public/lib/autocomplete/components/simple_param_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/template_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/template_autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/template_autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/template_autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/type_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/type_autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/type_autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/url_pattern_matcher.js b/src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/url_pattern_matcher.js
rename to src/plugins/console/public/lib/autocomplete/components/url_pattern_matcher.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/username_autocomplete_component.js b/src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/components/username_autocomplete_component.js
rename to src/plugins/console/public/lib/autocomplete/components/username_autocomplete_component.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/engine.js b/src/plugins/console/public/lib/autocomplete/engine.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/engine.js
rename to src/plugins/console/public/lib/autocomplete/engine.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts b/src/plugins/console/public/lib/autocomplete/get_endpoint_from_position.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/get_endpoint_from_position.ts
rename to src/plugins/console/public/lib/autocomplete/get_endpoint_from_position.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/url_params.js b/src/plugins/console/public/lib/autocomplete/url_params.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/autocomplete/url_params.js
rename to src/plugins/console/public/lib/autocomplete/url_params.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/curl_parsing/__tests__/curl_parsing.test.js b/src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/curl_parsing/__tests__/curl_parsing.test.js
rename to src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/curl_parsing/__tests__/curl_parsing.txt b/src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.txt
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/curl_parsing/__tests__/curl_parsing.txt
rename to src/plugins/console/public/lib/curl_parsing/__tests__/curl_parsing.txt
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/curl_parsing/curl.js b/src/plugins/console/public/lib/curl_parsing/curl.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/curl_parsing/curl.js
rename to src/plugins/console/public/lib/curl_parsing/curl.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/es/__tests__/content_type.test.js b/src/plugins/console/public/lib/es/__tests__/content_type.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/es/__tests__/content_type.test.js
rename to src/plugins/console/public/lib/es/__tests__/content_type.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/es/es.js b/src/plugins/console/public/lib/es/es.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/es/es.js
rename to src/plugins/console/public/lib/es/es.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/kb/__tests__/kb.test.js b/src/plugins/console/public/lib/kb/__tests__/kb.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/kb/__tests__/kb.test.js
rename to src/plugins/console/public/lib/kb/__tests__/kb.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/kb/api.js b/src/plugins/console/public/lib/kb/api.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/kb/api.js
rename to src/plugins/console/public/lib/kb/api.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/kb/index.js b/src/plugins/console/public/lib/kb/index.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/kb/index.js
rename to src/plugins/console/public/lib/kb/index.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/kb/kb.js b/src/plugins/console/public/lib/kb/kb.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/kb/kb.js
rename to src/plugins/console/public/lib/kb/kb.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/create.ts b/src/plugins/console/public/lib/local_storage_object_client/create.ts
similarity index 88%
rename from src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/create.ts
rename to src/plugins/console/public/lib/local_storage_object_client/create.ts
index 36948b9acb962..503387f7b4a41 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/create.ts
+++ b/src/plugins/console/public/lib/local_storage_object_client/create.ts
@@ -18,8 +18,8 @@
  */
 
 import { Storage } from '../../services';
-import { ObjectStorageClient } from '../../../../common/types';
-import { TextObject, textObjectTypeName } from '../../../../common/text_object';
+import { ObjectStorageClient } from '../../../common/types';
+import { TextObject, textObjectTypeName } from '../../../common/text_object';
 import { LocalObjectStorage } from './local_storage_object_client';
 
 export const create = (storage: Storage): ObjectStorageClient => {
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/index.ts b/src/plugins/console/public/lib/local_storage_object_client/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/index.ts
rename to src/plugins/console/public/lib/local_storage_object_client/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/local_storage_object_client.ts b/src/plugins/console/public/lib/local_storage_object_client/local_storage_object_client.ts
similarity index 96%
rename from src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/local_storage_object_client.ts
rename to src/plugins/console/public/lib/local_storage_object_client/local_storage_object_client.ts
index 41c88d23b2533..8eac345898f9a 100644
--- a/src/legacy/core_plugins/console/public/np_ready/lib/local_storage_object_client/local_storage_object_client.ts
+++ b/src/plugins/console/public/lib/local_storage_object_client/local_storage_object_client.ts
@@ -18,7 +18,7 @@
  */
 
 import uuid from 'uuid';
-import { ObjectStorage, IdObject } from '../../../../common/types';
+import { ObjectStorage, IdObject } from '../../../common/types';
 import { Storage } from '../../services';
 
 export class LocalObjectStorage<O extends IdObject> implements ObjectStorage<O> {
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/mappings/__tests__/mapping.test.js b/src/plugins/console/public/lib/mappings/__tests__/mapping.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/mappings/__tests__/mapping.test.js
rename to src/plugins/console/public/lib/mappings/__tests__/mapping.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/mappings/mappings.js b/src/plugins/console/public/lib/mappings/mappings.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/mappings/mappings.js
rename to src/plugins/console/public/lib/mappings/mappings.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/row_parser.ts b/src/plugins/console/public/lib/row_parser.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/row_parser.ts
rename to src/plugins/console/public/lib/row_parser.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/token_iterator/index.ts b/src/plugins/console/public/lib/token_iterator/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/token_iterator/index.ts
rename to src/plugins/console/public/lib/token_iterator/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/token_iterator/token_iterator.test.ts b/src/plugins/console/public/lib/token_iterator/token_iterator.test.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/token_iterator/token_iterator.test.ts
rename to src/plugins/console/public/lib/token_iterator/token_iterator.test.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/token_iterator/token_iterator.ts b/src/plugins/console/public/lib/token_iterator/token_iterator.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/token_iterator/token_iterator.ts
rename to src/plugins/console/public/lib/token_iterator/token_iterator.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils.test.js b/src/plugins/console/public/lib/utils/__tests__/utils.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils.test.js
rename to src/plugins/console/public/lib/utils/__tests__/utils.test.js
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_collapsing.txt b/src/plugins/console/public/lib/utils/__tests__/utils_string_collapsing.txt
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_collapsing.txt
rename to src/plugins/console/public/lib/utils/__tests__/utils_string_collapsing.txt
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt b/src/plugins/console/public/lib/utils/__tests__/utils_string_expanding.txt
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/utils/__tests__/utils_string_expanding.txt
rename to src/plugins/console/public/lib/utils/__tests__/utils_string_expanding.txt
diff --git a/src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts b/src/plugins/console/public/lib/utils/utils.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/lib/utils/utils.ts
rename to src/plugins/console/public/lib/utils/utils.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/plugin.ts b/src/plugins/console/public/plugin.ts
similarity index 58%
rename from src/legacy/core_plugins/console/public/np_ready/plugin.ts
rename to src/plugins/console/public/plugin.ts
index 22351ae95ba87..71a5e150a9f00 100644
--- a/src/legacy/core_plugins/console/public/np_ready/plugin.ts
+++ b/src/plugins/console/public/plugin.ts
@@ -17,23 +17,21 @@
  * under the License.
  */
 
-import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 
-import { PluginInitializerContext, Plugin, CoreStart, CoreSetup } from 'src/core/public';
-import { XPluginSet } from '../legacy';
+import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 
-export class ConsoleUIPlugin implements Plugin<any, any> {
-  // @ts-ignore
-  constructor(private readonly ctx: PluginInitializerContext) {}
+import { FeatureCatalogueCategory } from '../../home/public';
 
-  async setup({ notifications }: CoreSetup, pluginSet: XPluginSet) {
-    const {
-      __LEGACY: { I18nContext, elasticsearchUrl, category },
-      dev_tools,
-      home,
-    } = pluginSet;
+import { AppSetupUIPluginDependencies } from './types';
 
+export class ConsoleUIPlugin implements Plugin<void, void, AppSetupUIPluginDependencies> {
+  constructor() {}
+
+  async setup(
+    { notifications, getStartServices }: CoreSetup,
+    { dev_tools, home, usageCollection }: AppSetupUIPluginDependencies
+  ) {
     home.featureCatalogue.register({
       id: 'console',
       title: i18n.translate('console.devToolsTitle', {
@@ -45,7 +43,7 @@ export class ConsoleUIPlugin implements Plugin<any, any> {
       icon: 'consoleApp',
       path: '/app/kibana#/dev_tools/console',
       showOnHomePage: true,
-      category,
+      category: FeatureCatalogueCategory.ADMIN,
     });
 
     dev_tools.register({
@@ -55,20 +53,21 @@ export class ConsoleUIPlugin implements Plugin<any, any> {
         defaultMessage: 'Console',
       }),
       enableRouting: false,
-      async mount({ core: { docLinks } }, { element }) {
-        const { boot } = await import('./application');
-        render(
-          boot({
-            docLinkVersion: docLinks.DOC_LINK_VERSION,
-            I18nContext,
-            notifications,
-            elasticsearchUrl,
-          }),
-          element
-        );
-        return () => {
-          unmountComponentAtNode(element);
-        };
+      mount: async ({ core: { docLinks, i18n: i18nDep } }, { element }) => {
+        const { renderApp } = await import('./application');
+        const [{ injectedMetadata }] = await getStartServices();
+        const elasticsearchUrl = injectedMetadata.getInjectedVar(
+          'elasticsearchUrl',
+          'http://localhost:9200'
+        ) as string;
+        return renderApp({
+          docLinkVersion: docLinks.DOC_LINK_VERSION,
+          I18nContext: i18nDep.Context,
+          notifications,
+          elasticsearchUrl,
+          usageCollection,
+          element,
+        });
       },
     });
   }
diff --git a/src/legacy/core_plugins/console/public/np_ready/services/history.ts b/src/plugins/console/public/services/history.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/services/history.ts
rename to src/plugins/console/public/services/history.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/services/index.ts b/src/plugins/console/public/services/index.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/services/index.ts
rename to src/plugins/console/public/services/index.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/services/settings.ts b/src/plugins/console/public/services/settings.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/services/settings.ts
rename to src/plugins/console/public/services/settings.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/services/storage.ts b/src/plugins/console/public/services/storage.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/services/storage.ts
rename to src/plugins/console/public/services/storage.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts b/src/plugins/console/public/services/tracker.ts
similarity index 62%
rename from src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
rename to src/plugins/console/public/services/tracker.ts
index 13d5f875b3c6f..f5abcd145d0f7 100644
--- a/src/legacy/core_plugins/console/public/np_ready/services/tracker.ts
+++ b/src/plugins/console/public/services/tracker.ts
@@ -17,15 +17,22 @@
  * under the License.
  */
 
-import { METRIC_TYPE } from '@kbn/analytics';
+import { METRIC_TYPE, UiStatsMetricType } from '@kbn/analytics';
 import { MetricsTracker } from '../types';
-import { createUiStatsReporter } from '../../../../ui_metric/public';
+import { UsageCollectionSetup } from '../../../usage_collection/public';
 
 const APP_TRACKER_NAME = 'console';
-export const createUsageTracker = (): MetricsTracker => {
-  const track = createUiStatsReporter(APP_TRACKER_NAME);
+
+export const createUsageTracker = (usageCollection?: UsageCollectionSetup): MetricsTracker => {
+  const track = (type: UiStatsMetricType, name: string) =>
+    usageCollection?.reportUiStats(APP_TRACKER_NAME, type, name);
+
   return {
-    count: (eventName: string) => track(METRIC_TYPE.COUNT, eventName),
-    load: (eventName: string) => track(METRIC_TYPE.LOADED, eventName),
+    count: (eventName: string) => {
+      track(METRIC_TYPE.COUNT, eventName);
+    },
+    load: (eventName: string) => {
+      track(METRIC_TYPE.LOADED, eventName);
+    },
   };
 };
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/common.ts b/src/plugins/console/public/types/common.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/types/common.ts
rename to src/plugins/console/public/types/common.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/core_editor.ts b/src/plugins/console/public/types/core_editor.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/types/core_editor.ts
rename to src/plugins/console/public/types/core_editor.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/index.ts b/src/plugins/console/public/types/index.ts
similarity index 95%
rename from src/legacy/core_plugins/console/public/np_ready/types/index.ts
rename to src/plugins/console/public/types/index.ts
index 78c6b6c8f55cc..555a0ea82c523 100644
--- a/src/legacy/core_plugins/console/public/np_ready/types/index.ts
+++ b/src/plugins/console/public/types/index.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+export * from './plugin_dependencies';
 export * from './core_editor';
 export * from './token';
 export * from './tokens_provider';
diff --git a/src/plugins/console/public/types/plugin_dependencies.ts b/src/plugins/console/public/types/plugin_dependencies.ts
new file mode 100644
index 0000000000000..6bc4ff25ee442
--- /dev/null
+++ b/src/plugins/console/public/types/plugin_dependencies.ts
@@ -0,0 +1,27 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { HomePublicPluginSetup } from '../../../home/public';
+import { DevToolsSetup } from '../../../dev_tools/public';
+import { UsageCollectionSetup } from '../../../usage_collection/public';
+
+export interface AppSetupUIPluginDependencies {
+  home: HomePublicPluginSetup;
+  dev_tools: DevToolsSetup;
+  usageCollection?: UsageCollectionSetup;
+}
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/token.ts b/src/plugins/console/public/types/token.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/types/token.ts
rename to src/plugins/console/public/types/token.ts
diff --git a/src/legacy/core_plugins/console/public/np_ready/types/tokens_provider.ts b/src/plugins/console/public/types/tokens_provider.ts
similarity index 100%
rename from src/legacy/core_plugins/console/public/np_ready/types/tokens_provider.ts
rename to src/plugins/console/public/types/tokens_provider.ts
diff --git a/src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js b/src/plugins/console/server/__tests__/elasticsearch_proxy_config.js
similarity index 98%
rename from src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js
rename to src/plugins/console/server/__tests__/elasticsearch_proxy_config.js
index ec7d256975b27..df8b49b0a089e 100644
--- a/src/legacy/core_plugins/console/server/__tests__/elasticsearch_proxy_config.js
+++ b/src/plugins/console/server/__tests__/elasticsearch_proxy_config.js
@@ -19,7 +19,7 @@
 
 import expect from '@kbn/expect';
 import moment from 'moment';
-import { getElasticsearchProxyConfig } from '../elasticsearch_proxy_config';
+import { getElasticsearchProxyConfig } from '../lib/elasticsearch_proxy_config';
 import https from 'https';
 import http from 'http';
 
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_config.js b/src/plugins/console/server/__tests__/proxy_config.js
similarity index 99%
rename from src/legacy/core_plugins/console/server/__tests__/proxy_config.js
rename to src/plugins/console/server/__tests__/proxy_config.js
index 2a221aa261167..b0b85e6bb7d06 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_config.js
+++ b/src/plugins/console/server/__tests__/proxy_config.js
@@ -24,7 +24,7 @@ import sinon from 'sinon';
 import https, { Agent as HttpsAgent } from 'https';
 import { parse as parseUrl } from 'url';
 
-import { ProxyConfig } from '../proxy_config';
+import { ProxyConfig } from '../lib/proxy_config';
 
 const matchGoogle = {
   protocol: 'https',
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_config_collection.js b/src/plugins/console/server/__tests__/proxy_config_collection.js
similarity index 98%
rename from src/legacy/core_plugins/console/server/__tests__/proxy_config_collection.js
rename to src/plugins/console/server/__tests__/proxy_config_collection.js
index 1791ca9865d25..e1bc099ac1e85 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_config_collection.js
+++ b/src/plugins/console/server/__tests__/proxy_config_collection.js
@@ -24,7 +24,7 @@ import sinon from 'sinon';
 import fs from 'fs';
 import { Agent as HttpsAgent } from 'https';
 
-import { ProxyConfigCollection } from '../proxy_config_collection';
+import { ProxyConfigCollection } from '../lib/proxy_config_collection';
 
 describe('ProxyConfigCollection', function() {
   beforeEach(function() {
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/body.js b/src/plugins/console/server/__tests__/proxy_route/body.test.ts
similarity index 63%
rename from src/legacy/core_plugins/console/server/__tests__/proxy_route/body.js
rename to src/plugins/console/server/__tests__/proxy_route/body.test.ts
index 923567769a6b8..252009a8977f3 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/body.js
+++ b/src/plugins/console/server/__tests__/proxy_route/body.test.ts
@@ -16,79 +16,83 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import { getProxyRouteHandlerDeps } from './mocks';
 
-import sinon from 'sinon';
 import expect from '@kbn/expect';
-import { Server } from 'hapi';
+import { Readable } from 'stream';
+
+import { kibanaResponseFactory } from '../../../../../core/server';
+import { createHandler } from '../../routes/api/console/proxy/create_handler';
+import * as requestModule from '../../lib/proxy_request';
 import { createResponseStub } from './stubs';
-import { createProxyRoute } from '../../';
-import * as requestModule from '../../request';
 
 describe('Console Proxy Route', () => {
-  const sandbox = sinon.createSandbox();
-  const teardowns = [];
-  let request;
+  let request: any;
 
   beforeEach(() => {
-    request = async (method, path, response) => {
-      sandbox.stub(requestModule, 'sendRequest').callsFake(createResponseStub(response));
-      const server = new Server();
-      server.route(
-        createProxyRoute({
-          hosts: ['http://localhost:9200'],
-        })
-      );
+    request = (method: string, path: string, response: string) => {
+      (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub(response));
+      const handler = createHandler(getProxyRouteHandlerDeps({}));
 
-      teardowns.push(() => server.stop());
-
-      const params = [];
-      if (path != null) params.push(`path=${path}`);
-      if (method != null) params.push(`method=${method}`);
-      return await server.inject({
-        method: 'POST',
-        url: `/api/console/proxy${params.length ? `?${params.join('&')}` : ''}`,
-      });
+      return handler(
+        {} as any,
+        {
+          headers: {},
+          query: { method, path },
+        } as any,
+        kibanaResponseFactory
+      );
     };
   });
 
+  const readStream = (s: Readable) =>
+    new Promise(resolve => {
+      let v = '';
+      s.on('data', data => {
+        v += data;
+      });
+      s.on('end', () => resolve(v));
+    });
+
   afterEach(async () => {
-    sandbox.restore();
-    await Promise.all(teardowns.splice(0).map(fn => fn()));
+    jest.resetAllMocks();
   });
 
   describe('response body', () => {
     describe('GET request', () => {
       it('returns the exact body', async () => {
         const { payload } = await request('GET', '/', 'foobar');
-        expect(payload).to.be('foobar');
+        expect(await readStream(payload)).to.be('foobar');
       });
     });
     describe('POST request', () => {
       it('returns the exact body', async () => {
         const { payload } = await request('POST', '/', 'foobar');
-        expect(payload).to.be('foobar');
+        expect(await readStream(payload)).to.be('foobar');
       });
     });
     describe('PUT request', () => {
       it('returns the exact body', async () => {
         const { payload } = await request('PUT', '/', 'foobar');
-        expect(payload).to.be('foobar');
+        expect(await readStream(payload)).to.be('foobar');
       });
     });
     describe('DELETE request', () => {
       it('returns the exact body', async () => {
         const { payload } = await request('DELETE', '/', 'foobar');
-        expect(payload).to.be('foobar');
+        expect(await readStream(payload)).to.be('foobar');
       });
     });
     describe('HEAD request', () => {
       it('returns the status code and text', async () => {
         const { payload } = await request('HEAD', '/');
+        expect(typeof payload).to.be('string');
         expect(payload).to.be('200 - OK');
       });
       describe('mixed casing', () => {
         it('returns the status code and text', async () => {
           const { payload } = await request('HeAd', '/');
+          expect(typeof payload).to.be('string');
           expect(payload).to.be('200 - OK');
         });
       });
diff --git a/src/plugins/console/server/__tests__/proxy_route/headers.test.ts b/src/plugins/console/server/__tests__/proxy_route/headers.test.ts
new file mode 100644
index 0000000000000..8a779715ac823
--- /dev/null
+++ b/src/plugins/console/server/__tests__/proxy_route/headers.test.ts
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+jest.mock('../../../../../core/server/http/router/request', () => ({
+  ensureRawRequest: jest.fn(),
+}));
+
+import { kibanaResponseFactory } from '../../../../../core/server';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ensureRawRequest } from '../../../../../core/server/http/router/request';
+
+import { getProxyRouteHandlerDeps } from './mocks';
+
+import expect from '@kbn/expect';
+import * as requestModule from '../../lib/proxy_request';
+
+import { createHandler } from '../../routes/api/console/proxy/create_handler';
+
+import { createResponseStub } from './stubs';
+
+describe('Console Proxy Route', () => {
+  let handler: ReturnType<typeof createHandler>;
+
+  beforeEach(() => {
+    (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub(''));
+    handler = createHandler(getProxyRouteHandlerDeps({}));
+  });
+
+  afterEach(async () => {
+    jest.resetAllMocks();
+  });
+
+  describe('headers', () => {
+    it('forwards the remote header info', async () => {
+      (ensureRawRequest as jest.Mock).mockReturnValue({
+        // This mocks the shape of the hapi request object, will probably change
+        info: {
+          remoteAddress: '0.0.0.0',
+          remotePort: '1234',
+          host: 'test',
+        },
+        server: {
+          info: {
+            protocol: 'http',
+          },
+        },
+      });
+
+      await handler(
+        {} as any,
+        {
+          headers: {},
+          query: {
+            method: 'POST',
+            path: '/api/console/proxy?method=GET&path=/',
+          },
+        } as any,
+        kibanaResponseFactory
+      );
+
+      expect((requestModule.proxyRequest as jest.Mock).mock.calls.length).to.be(1);
+      const [[{ headers }]] = (requestModule.proxyRequest as jest.Mock).mock.calls;
+      expect(headers).to.have.property('x-forwarded-for');
+      expect(headers['x-forwarded-for']).to.be('0.0.0.0');
+      expect(headers).to.have.property('x-forwarded-port');
+      expect(headers['x-forwarded-port']).to.be('1234');
+      expect(headers).to.have.property('x-forwarded-proto');
+      expect(headers['x-forwarded-proto']).to.be('http');
+      expect(headers).to.have.property('x-forwarded-host');
+      expect(headers['x-forwarded-host']).to.be('test');
+    });
+  });
+});
diff --git a/src/plugins/console/server/__tests__/proxy_route/mocks.ts b/src/plugins/console/server/__tests__/proxy_route/mocks.ts
new file mode 100644
index 0000000000000..74bd43fe52146
--- /dev/null
+++ b/src/plugins/console/server/__tests__/proxy_route/mocks.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+jest.mock('../../lib/proxy_request', () => ({
+  proxyRequest: jest.fn(),
+}));
+
+import { duration } from 'moment';
+import { ProxyConfigCollection } from '../../lib';
+import { CreateHandlerDependencies } from '../../routes/api/console/proxy/create_handler';
+import { coreMock } from '../../../../../core/server/mocks';
+
+export const getProxyRouteHandlerDeps = ({
+  proxyConfigCollection = new ProxyConfigCollection([]),
+  pathFilters = [/.*/],
+  readLegacyESConfig = () => ({
+    requestTimeout: duration(30000),
+    customHeaders: {},
+    requestHeadersWhitelist: [],
+    hosts: ['http://localhost:9200'],
+  }),
+  log = coreMock.createPluginInitializerContext().logger.get(),
+}: Partial<CreateHandlerDependencies>): CreateHandlerDependencies => ({
+  proxyConfigCollection,
+  pathFilters,
+  readLegacyESConfig,
+  log,
+});
diff --git a/src/plugins/console/server/__tests__/proxy_route/params.test.ts b/src/plugins/console/server/__tests__/proxy_route/params.test.ts
new file mode 100644
index 0000000000000..1ab9c3ae789cc
--- /dev/null
+++ b/src/plugins/console/server/__tests__/proxy_route/params.test.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { kibanaResponseFactory } from '../../../../../core/server';
+import { getProxyRouteHandlerDeps } from './mocks';
+import { createResponseStub } from './stubs';
+import * as requestModule from '../../lib/proxy_request';
+import expect from '@kbn/expect';
+
+import { createHandler } from '../../routes/api/console/proxy/create_handler';
+
+describe('Console Proxy Route', () => {
+  let handler: ReturnType<typeof createHandler>;
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  describe('params', () => {
+    describe('pathFilters', () => {
+      describe('no matches', () => {
+        it('rejects with 403', async () => {
+          handler = createHandler(
+            getProxyRouteHandlerDeps({ pathFilters: [/^\/foo\//, /^\/bar\//] })
+          );
+
+          const { status } = await handler(
+            {} as any,
+            { query: { method: 'POST', path: '/baz/id' } } as any,
+            kibanaResponseFactory
+          );
+
+          expect(status).to.be(403);
+        });
+      });
+      describe('one match', () => {
+        it('allows the request', async () => {
+          handler = createHandler(
+            getProxyRouteHandlerDeps({ pathFilters: [/^\/foo\//, /^\/bar\//] })
+          );
+
+          (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub('foo'));
+
+          const { status } = await handler(
+            {} as any,
+            { headers: {}, query: { method: 'POST', path: '/foo/id' } } as any,
+            kibanaResponseFactory
+          );
+
+          expect(status).to.be(200);
+          expect((requestModule.proxyRequest as jest.Mock).mock.calls.length).to.be(1);
+        });
+      });
+      describe('all match', () => {
+        it('allows the request', async () => {
+          handler = createHandler(getProxyRouteHandlerDeps({ pathFilters: [/^\/foo\//] }));
+
+          (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub('foo'));
+
+          const { status } = await handler(
+            {} as any,
+            { headers: {}, query: { method: 'GET', path: '/foo/id' } } as any,
+            kibanaResponseFactory
+          );
+
+          expect(status).to.be(200);
+          expect((requestModule.proxyRequest as jest.Mock).mock.calls.length).to.be(1);
+        });
+      });
+    });
+  });
+});
diff --git a/src/plugins/console/server/__tests__/proxy_route/query_string.test.ts b/src/plugins/console/server/__tests__/proxy_route/query_string.test.ts
new file mode 100644
index 0000000000000..028022db1096d
--- /dev/null
+++ b/src/plugins/console/server/__tests__/proxy_route/query_string.test.ts
@@ -0,0 +1,76 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { kibanaResponseFactory } from '../../../../../core/server';
+import { getProxyRouteHandlerDeps } from './mocks';
+import { createResponseStub } from './stubs';
+import * as requestModule from '../../lib/proxy_request';
+
+import expect from '@kbn/expect';
+
+import { createHandler } from '../../routes/api/console/proxy/create_handler';
+
+describe('Console Proxy Route', () => {
+  let request: any;
+  beforeEach(() => {
+    (requestModule.proxyRequest as jest.Mock).mockResolvedValue(createResponseStub('foo'));
+
+    request = async (method: string, path: string) => {
+      const handler = createHandler(getProxyRouteHandlerDeps({}));
+
+      return handler(
+        {} as any,
+        { headers: {}, query: { method, path } } as any,
+        kibanaResponseFactory
+      );
+    };
+  });
+
+  afterEach(async () => {
+    jest.resetAllMocks();
+  });
+
+  describe('query string', () => {
+    describe('path', () => {
+      describe('contains full url', () => {
+        it('treats the url as a path', async () => {
+          await request('GET', 'http://evil.com/test');
+          expect((requestModule.proxyRequest as jest.Mock).mock.calls.length).to.be(1);
+          const [[args]] = (requestModule.proxyRequest as jest.Mock).mock.calls;
+          expect(args.uri.href).to.be('http://localhost:9200/http://evil.com/test?pretty=true');
+        });
+      });
+      describe('starts with a slash', () => {
+        it('combines well with the base url', async () => {
+          await request('GET', '/index/id');
+          expect((requestModule.proxyRequest as jest.Mock).mock.calls.length).to.be(1);
+          const [[args]] = (requestModule.proxyRequest as jest.Mock).mock.calls;
+          expect(args.uri.href).to.be('http://localhost:9200/index/id?pretty=true');
+        });
+      });
+      describe(`doesn't start with a slash`, () => {
+        it('combines well with the base url', async () => {
+          await request('GET', 'index/id');
+          expect((requestModule.proxyRequest as jest.Mock).mock.calls.length).to.be(1);
+          const [[args]] = (requestModule.proxyRequest as jest.Mock).mock.calls;
+          expect(args.uri.href).to.be('http://localhost:9200/index/id?pretty=true');
+        });
+      });
+    });
+  });
+});
diff --git a/src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts b/src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts
new file mode 100644
index 0000000000000..403ef9737ae42
--- /dev/null
+++ b/src/plugins/console/server/__tests__/proxy_route/route_validation.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { routeValidationConfig } from '../../routes/api/console/proxy/validation_config';
+
+const { query } = routeValidationConfig;
+
+describe('Proxy route validation', () => {
+  describe('query', () => {
+    describe('allows', () => {
+      it('known http verb method and path value', () => {
+        expect(query.validate({ method: 'GET', path: 'test' }));
+      });
+      it('mixed case http verbs', () => {
+        expect(query.validate({ method: 'hEaD', path: 'test' }));
+      });
+    });
+    describe('throws for', () => {
+      it('empty query method value', () => {
+        expect(() => {
+          query.validate({ method: '', path: 'test' });
+        }).toThrow('Method must be one of');
+      });
+      it('unknown method value', () => {
+        expect(() => {
+          query.validate({ method: 'abc', path: 'test' });
+        }).toThrow('Method must be one of');
+      });
+      it('empty path value', () => {
+        expect(() => {
+          query.validate({ method: 'GET', path: '' });
+        }).toThrow('Expected non-empty string');
+      });
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/console/server/__tests__/proxy_route/stubs.js b/src/plugins/console/server/__tests__/proxy_route/stubs.ts
similarity index 65%
rename from src/legacy/core_plugins/console/server/__tests__/proxy_route/stubs.js
rename to src/plugins/console/server/__tests__/proxy_route/stubs.ts
index 18ad277c0bf6b..12ad9cbe26e9c 100644
--- a/src/legacy/core_plugins/console/server/__tests__/proxy_route/stubs.js
+++ b/src/plugins/console/server/__tests__/proxy_route/stubs.ts
@@ -16,27 +16,25 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+import { IncomingMessage } from 'http';
 import { Readable } from 'stream';
 
-export function createResponseStub(response) {
-  return async () => {
-    const resp = new Readable({
-      read() {
-        if (response) {
-          this.push(response);
-        }
-        this.push(null);
-      },
-    });
-
-    resp.statusCode = 200;
-    resp.statusMessage = 'OK';
-    resp.headers = {
-      'content-type': 'text/plain',
-      'content-length': String(response ? response.length : 0),
-    };
+export function createResponseStub(response: any) {
+  const resp: any = new Readable({
+    read() {
+      if (response) {
+        this.push(response);
+      }
+      this.push(null);
+    },
+  });
 
-    return resp;
+  resp.statusCode = 200;
+  resp.statusMessage = 'OK';
+  resp.headers = {
+    'content-type': 'text/plain',
+    'content-length': String(response ? response.length : 0),
   };
+
+  return resp as IncomingMessage;
 }
diff --git a/src/legacy/core_plugins/console/server/__tests__/set_headers.js b/src/plugins/console/server/__tests__/set_headers.js
similarity index 97%
rename from src/legacy/core_plugins/console/server/__tests__/set_headers.js
rename to src/plugins/console/server/__tests__/set_headers.js
index 3cab23a05884f..1f349cbbb571e 100644
--- a/src/legacy/core_plugins/console/server/__tests__/set_headers.js
+++ b/src/plugins/console/server/__tests__/set_headers.js
@@ -18,7 +18,7 @@
  */
 
 import expect from '@kbn/expect';
-import { setHeaders } from '../set_headers';
+import { setHeaders } from '../lib';
 
 describe('#set_headers', function() {
   it('throws if not given an object as the first argument', function() {
diff --git a/src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js b/src/plugins/console/server/__tests__/wildcard_matcher.js
similarity index 98%
rename from src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js
rename to src/plugins/console/server/__tests__/wildcard_matcher.js
index 5969b94d7e672..18e43b2215740 100644
--- a/src/legacy/core_plugins/console/server/__tests__/wildcard_matcher.js
+++ b/src/plugins/console/server/__tests__/wildcard_matcher.js
@@ -18,7 +18,7 @@
  */
 
 /* eslint-env mocha */
-import { WildcardMatcher } from '../wildcard_matcher';
+import { WildcardMatcher } from '../lib/wildcard_matcher';
 
 function should(candidate, ...constructorArgs) {
   if (!new WildcardMatcher(...constructorArgs).match(candidate)) {
diff --git a/src/plugins/console/server/config.ts b/src/plugins/console/server/config.ts
new file mode 100644
index 0000000000000..ebd4b37bb41b2
--- /dev/null
+++ b/src/plugins/console/server/config.ts
@@ -0,0 +1,55 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export type ConfigType = TypeOf<typeof config>;
+
+export const config = schema.object(
+  {
+    enabled: schema.boolean({ defaultValue: true }),
+    proxyFilter: schema.arrayOf(schema.string(), { defaultValue: ['.*'] }),
+    ssl: schema.object({ verify: schema.boolean({ defaultValue: false }) }, {}),
+
+    // This does not actually work, track this issue: https://github.com/elastic/kibana/issues/55576
+    proxyConfig: schema.arrayOf(
+      schema.object({
+        match: schema.object({
+          protocol: schema.string({ defaultValue: '*' }),
+          host: schema.string({ defaultValue: '*' }),
+          port: schema.string({ defaultValue: '*' }),
+          path: schema.string({ defaultValue: '*' }),
+        }),
+
+        timeout: schema.number(),
+        ssl: schema.object(
+          {
+            verify: schema.boolean(),
+            ca: schema.arrayOf(schema.string()),
+            cert: schema.string(),
+            key: schema.string(),
+          },
+          { defaultValue: undefined }
+        ),
+      }),
+      { defaultValue: [] }
+    ),
+  },
+  { defaultValue: undefined }
+);
diff --git a/src/plugins/console/server/index.ts b/src/plugins/console/server/index.ts
new file mode 100644
index 0000000000000..b603deee12e23
--- /dev/null
+++ b/src/plugins/console/server/index.ts
@@ -0,0 +1,31 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
+
+import { ConfigType, config as configSchema } from './config';
+import { ConsoleServerPlugin } from './plugin';
+
+export { ConsoleSetup } from './types';
+
+export const plugin = (ctx: PluginInitializerContext) => new ConsoleServerPlugin(ctx);
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  deprecations: ({ unused }) => [unused('ssl')],
+  schema: configSchema,
+};
diff --git a/src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts b/src/plugins/console/server/lib/elasticsearch_proxy_config.ts
similarity index 94%
rename from src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts
rename to src/plugins/console/server/lib/elasticsearch_proxy_config.ts
index 5f44a524e9cc8..901d726ac51d8 100644
--- a/src/legacy/core_plugins/console/server/elasticsearch_proxy_config.ts
+++ b/src/plugins/console/server/lib/elasticsearch_proxy_config.ts
@@ -21,6 +21,7 @@ import _ from 'lodash';
 import http from 'http';
 import https from 'https';
 import url from 'url';
+import { Duration } from 'moment';
 
 const createAgent = (legacyConfig: any) => {
   const target = url.parse(_.head(legacyConfig.hosts));
@@ -58,7 +59,7 @@ const createAgent = (legacyConfig: any) => {
   return new https.Agent(agentOptions);
 };
 
-export const getElasticsearchProxyConfig = (legacyConfig: any) => {
+export const getElasticsearchProxyConfig = (legacyConfig: { requestTimeout: Duration }) => {
   return {
     timeout: legacyConfig.requestTimeout.asMilliseconds(),
     agent: createAgent(legacyConfig),
diff --git a/src/legacy/core_plugins/console/server/index.js b/src/plugins/console/server/lib/index.ts
similarity index 80%
rename from src/legacy/core_plugins/console/server/index.js
rename to src/plugins/console/server/lib/index.ts
index 15a8a5baf79dc..98004768f880b 100644
--- a/src/legacy/core_plugins/console/server/index.js
+++ b/src/plugins/console/server/lib/index.ts
@@ -17,6 +17,9 @@
  * under the License.
  */
 
+export { ProxyConfig } from './proxy_config';
 export { ProxyConfigCollection } from './proxy_config_collection';
+export { proxyRequest } from './proxy_request';
 export { getElasticsearchProxyConfig } from './elasticsearch_proxy_config';
-export { createProxyRoute } from './proxy_route';
+export { setHeaders } from './set_headers';
+export { addProcessorDefinition, addExtensionSpecFilePath } from './spec_definitions';
diff --git a/src/legacy/core_plugins/console/server/proxy_config.js b/src/plugins/console/server/lib/proxy_config.ts
similarity index 80%
rename from src/legacy/core_plugins/console/server/proxy_config.js
rename to src/plugins/console/server/lib/proxy_config.ts
index b8c1b11f9a0d3..5adb9c58f784e 100644
--- a/src/legacy/core_plugins/console/server/proxy_config.js
+++ b/src/plugins/console/server/lib/proxy_config.ts
@@ -19,12 +19,27 @@
 
 import { values } from 'lodash';
 import { format as formatUrl } from 'url';
-import { Agent as HttpsAgent } from 'https';
+import { Agent as HttpsAgent, AgentOptions } from 'https';
 
 import { WildcardMatcher } from './wildcard_matcher';
 
 export class ProxyConfig {
-  constructor(config) {
+  // @ts-ignore
+  private id: string;
+  private matchers: {
+    protocol: WildcardMatcher;
+    host: WildcardMatcher;
+    port: WildcardMatcher;
+    path: WildcardMatcher;
+  };
+
+  private readonly timeout: number;
+
+  private readonly sslAgent?: HttpsAgent;
+
+  private verifySsl: any;
+
+  constructor(config: { match: any; timeout: number }) {
     config = {
       ...config,
     };
@@ -57,11 +72,11 @@ export class ProxyConfig {
     this.sslAgent = this._makeSslAgent(config);
   }
 
-  _makeSslAgent(config) {
+  _makeSslAgent(config: any) {
     const ssl = config.ssl || {};
     this.verifySsl = ssl.verify;
 
-    const sslAgentOpts = {
+    const sslAgentOpts: AgentOptions = {
       ca: ssl.ca,
       cert: ssl.cert,
       key: ssl.key,
@@ -73,7 +88,12 @@ export class ProxyConfig {
     }
   }
 
-  getForParsedUri({ protocol, hostname, port, pathname }) {
+  getForParsedUri({
+    protocol,
+    hostname,
+    port,
+    pathname,
+  }: Record<'protocol' | 'hostname' | 'port' | 'pathname', string>) {
     let match = this.matchers.protocol.match(protocol.slice(0, -1));
     match = match && this.matchers.host.match(hostname);
     match = match && this.matchers.port.match(port);
diff --git a/src/legacy/core_plugins/console/server/proxy_config_collection.js b/src/plugins/console/server/lib/proxy_config_collection.ts
similarity index 83%
rename from src/legacy/core_plugins/console/server/proxy_config_collection.js
rename to src/plugins/console/server/lib/proxy_config_collection.ts
index 79bc057aaaf7f..5d0b02fed5b18 100644
--- a/src/legacy/core_plugins/console/server/proxy_config_collection.js
+++ b/src/plugins/console/server/lib/proxy_config_collection.ts
@@ -18,18 +18,24 @@
  */
 
 import { defaultsDeep } from 'lodash';
+import { parse as parseUrl } from 'url';
 
 import { ProxyConfig } from './proxy_config';
-import { parse as parseUrl } from 'url';
 
 export class ProxyConfigCollection {
-  constructor(configs = []) {
+  private configs: ProxyConfig[];
+
+  constructor(configs: Array<{ match: any; timeout: number }> = []) {
     this.configs = configs.map(settings => new ProxyConfig(settings));
   }
 
-  configForUri(uri) {
+  hasConfig() {
+    return Boolean(this.configs.length);
+  }
+
+  configForUri(uri: string): object {
     const parsedUri = parseUrl(uri);
-    const settings = this.configs.map(config => config.getForParsedUri(parsedUri));
+    const settings = this.configs.map(config => config.getForParsedUri(parsedUri as any));
     return defaultsDeep({}, ...settings);
   }
 }
diff --git a/src/legacy/core_plugins/console/server/request.test.ts b/src/plugins/console/server/lib/proxy_request.test.ts
similarity index 96%
rename from src/legacy/core_plugins/console/server/request.test.ts
rename to src/plugins/console/server/lib/proxy_request.test.ts
index 2cbde5b3b39b8..0285daef7d725 100644
--- a/src/legacy/core_plugins/console/server/request.test.ts
+++ b/src/plugins/console/server/lib/proxy_request.test.ts
@@ -18,7 +18,7 @@
  */
 import http, { ClientRequest } from 'http';
 import * as sinon from 'sinon';
-import { sendRequest } from './request';
+import { proxyRequest } from './proxy_request';
 import { URL } from 'url';
 import { fail } from 'assert';
 
@@ -46,7 +46,7 @@ describe(`Console's send request`, () => {
 
   it('correctly implements timeout and abort mechanism', async () => {
     try {
-      await sendRequest({
+      await proxyRequest({
         agent: null as any,
         headers: {},
         method: 'get',
diff --git a/src/legacy/core_plugins/console/server/request.ts b/src/plugins/console/server/lib/proxy_request.ts
similarity index 99%
rename from src/legacy/core_plugins/console/server/request.ts
rename to src/plugins/console/server/lib/proxy_request.ts
index 0f6b78b484adf..ed02b23d77f6a 100644
--- a/src/legacy/core_plugins/console/server/request.ts
+++ b/src/plugins/console/server/lib/proxy_request.ts
@@ -37,7 +37,7 @@ interface Args {
 // We use a modified version of Hapi's Wreck because Hapi, Axios, and Superagent don't support GET requests
 // with bodies, but ES APIs do. Similarly with DELETE requests with bodies. Another library, `request`
 // diverged too much from current behaviour.
-export const sendRequest = ({
+export const proxyRequest = ({
   method,
   headers,
   agent,
diff --git a/src/legacy/core_plugins/console/server/set_headers.js b/src/plugins/console/server/lib/set_headers.ts
similarity index 94%
rename from src/legacy/core_plugins/console/server/set_headers.js
rename to src/plugins/console/server/lib/set_headers.ts
index 5ea4c214dc42e..ee0be40312a4d 100644
--- a/src/legacy/core_plugins/console/server/set_headers.js
+++ b/src/plugins/console/server/lib/set_headers.ts
@@ -19,7 +19,7 @@
 
 import { isPlainObject } from 'lodash';
 
-export function setHeaders(originalHeaders, newHeaders) {
+export function setHeaders(originalHeaders: object, newHeaders: object) {
   if (!isPlainObject(originalHeaders)) {
     throw new Error(
       `Expected originalHeaders to be an object, but ${typeof originalHeaders} given`
diff --git a/src/legacy/core_plugins/console/server/api_server/api.js b/src/plugins/console/server/lib/spec_definitions/api.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/api.js
rename to src/plugins/console/server/lib/spec_definitions/api.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0.js b/src/plugins/console/server/lib/spec_definitions/es_6_0.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/aggregations.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/aggregations.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/aggregations.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/aggregations.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/aliases.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/aliases.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/aliases.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/aliases.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/document.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/document.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/document.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/document.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/filter.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/filter.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/filter.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/globals.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/globals.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/globals.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/globals.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/ingest.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/ingest.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/ingest.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/ingest.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/mappings.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/mappings.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/mappings.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/mappings.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/query/dsl.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/query/dsl.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/query/dsl.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/query/index.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/query/index.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/query/index.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/query/index.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/query/templates.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/query/templates.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/query/templates.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/query/templates.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/reindex.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/reindex.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/reindex.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/reindex.js
diff --git a/src/legacy/core_plugins/console/server/api_server/es_6_0/search.js b/src/plugins/console/server/lib/spec_definitions/es_6_0/search.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/es_6_0/search.js
rename to src/plugins/console/server/lib/spec_definitions/es_6_0/search.js
diff --git a/src/plugins/console/server/lib/spec_definitions/index.d.ts b/src/plugins/console/server/lib/spec_definitions/index.d.ts
new file mode 100644
index 0000000000000..0a79d3fb386f1
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/index.d.ts
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 declare function addProcessorDefinition(...args: any[]): any;
+
+export declare function resolveApi(senseVersion: string, apis: string[]): object;
+
+export declare function addExtensionSpecFilePath(...args: any[]): any;
diff --git a/src/plugins/console/server/lib/spec_definitions/index.js b/src/plugins/console/server/lib/spec_definitions/index.js
new file mode 100644
index 0000000000000..3fe1913d5a193
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/index.js
@@ -0,0 +1,24 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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 { addProcessorDefinition } from './es_6_0/ingest';
+
+export { addExtensionSpecFilePath } from './spec';
+
+export { resolveApi } from './server';
diff --git a/src/legacy/core_plugins/console/server/api_server/server.js b/src/plugins/console/server/lib/spec_definitions/server.js
similarity index 91%
rename from src/legacy/core_plugins/console/server/api_server/server.js
rename to src/plugins/console/server/lib/spec_definitions/server.js
index 48ed73cb3611d..dd700bf019507 100644
--- a/src/legacy/core_plugins/console/server/api_server/server.js
+++ b/src/plugins/console/server/lib/spec_definitions/server.js
@@ -21,7 +21,7 @@ import _ from 'lodash';
 
 const KNOWN_APIS = ['es_6_0'];
 
-export function resolveApi(senseVersion, apis, h) {
+export function resolveApi(senseVersion, apis) {
   const result = {};
   _.each(apis, function(name) {
     {
@@ -33,5 +33,5 @@ export function resolveApi(senseVersion, apis, h) {
     }
   });
 
-  return h.response(result).type('application/json');
+  return result;
 }
diff --git a/src/legacy/core_plugins/console/server/api_server/server.test.js b/src/plugins/console/server/lib/spec_definitions/server.test.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/server.test.js
rename to src/plugins/console/server/lib/spec_definitions/server.test.js
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/.eslintrc b/src/plugins/console/server/lib/spec_definitions/spec/.eslintrc
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/.eslintrc
rename to src/plugins/console/server/lib/spec_definitions/spec/.eslintrc
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/_common.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/_common.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/_common.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/_common.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/bulk.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/bulk.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/bulk.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/bulk.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.aliases.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.aliases.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.aliases.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.aliases.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.allocation.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.allocation.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.allocation.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.allocation.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.count.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.count.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.count.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.count.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.fielddata.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.fielddata.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.fielddata.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.fielddata.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.health.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.health.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.health.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.health.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.help.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.help.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.help.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.help.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.indices.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.indices.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.indices.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.indices.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.master.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.master.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.master.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.master.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.nodeattrs.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.nodeattrs.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.nodeattrs.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.nodeattrs.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.nodes.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.nodes.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.nodes.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.nodes.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.pending_tasks.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.pending_tasks.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.pending_tasks.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.pending_tasks.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.plugins.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.plugins.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.plugins.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.plugins.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.recovery.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.recovery.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.recovery.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.recovery.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.repositories.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.repositories.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.repositories.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.repositories.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.segments.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.segments.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.segments.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.segments.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.shards.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.shards.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.shards.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.shards.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.snapshots.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.snapshots.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.snapshots.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.snapshots.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.tasks.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.tasks.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.tasks.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.tasks.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.templates.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.templates.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.templates.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.templates.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cat.thread_pool.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cat.thread_pool.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cat.thread_pool.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cat.thread_pool.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/clear_scroll.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/clear_scroll.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/clear_scroll.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/clear_scroll.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.allocation_explain.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.allocation_explain.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.allocation_explain.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.allocation_explain.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.get_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.get_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.get_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.get_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.health.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.health.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.health.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.pending_tasks.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.pending_tasks.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.pending_tasks.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.pending_tasks.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.put_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.put_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.put_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.put_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.remote_info.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.remote_info.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.remote_info.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.remote_info.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.reroute.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.reroute.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.reroute.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.reroute.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.state.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.state.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.state.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.state.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.stats.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.stats.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/cluster.stats.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/cluster.stats.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/count.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/count.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/count.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/count.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/create.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/create.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/create.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/create.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/delete.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/delete.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/delete.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/delete_by_query.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/delete_by_query.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query_rethrottle.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/delete_by_query_rethrottle.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/delete_by_query_rethrottle.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/delete_by_query_rethrottle.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/delete_script.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/delete_script.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/delete_script.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/delete_script.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/exists.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/exists.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/exists.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/exists.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/exists_source.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/exists_source.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/exists_source.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/exists_source.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/explain.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/explain.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/explain.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/explain.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/field_caps.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/field_caps.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/field_caps.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/field_caps.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/get.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/get.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/get.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/get_script.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/get_script.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/get_script.json
diff --git a/src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_context.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_context.json
new file mode 100644
index 0000000000000..528c261df7707
--- /dev/null
+++ b/src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_context.json
@@ -0,0 +1,10 @@
+{
+  "get_script_context": {
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_script_context"
+    ]
+  }
+}
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_languages.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_languages.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/get_script_languages.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/get_script_languages.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/get_source.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/get_source.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/get_source.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/get_source.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/index.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/index.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/index.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/index.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.analyze.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.analyze.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.analyze.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.analyze.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.clear_cache.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.clear_cache.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.clear_cache.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.clear_cache.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.clone.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.clone.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.clone.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.clone.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.close.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.close.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.close.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.close.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.create.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.create.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.create.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.delete.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.delete.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.delete.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.delete.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.delete_alias.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.delete_alias.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.delete_alias.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.delete_alias.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.delete_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.delete_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.delete_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.delete_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists_alias.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists_alias.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists_alias.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists_alias.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists_type.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists_type.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.exists_type.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.exists_type.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.flush.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.flush.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.flush.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.flush.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.flush_synced.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.flush_synced.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.flush_synced.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.flush_synced.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.forcemerge.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.forcemerge.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.forcemerge.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.forcemerge.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_alias.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_alias.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_alias.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_alias.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_field_mapping.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_field_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_field_mapping.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_mapping.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_mapping.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_mapping.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_upgrade.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_upgrade.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.get_upgrade.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.get_upgrade.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.open.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.open.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.open.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.open.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_alias.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_alias.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_alias.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_alias.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_mapping.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_mapping.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_mapping.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.put_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.put_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.recovery.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.recovery.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.recovery.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.recovery.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.refresh.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.refresh.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.refresh.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.refresh.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.rollover.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.rollover.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.rollover.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.segments.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.segments.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.segments.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.segments.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shard_stores.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.shard_stores.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shard_stores.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.shard_stores.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.shrink.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.shrink.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.shrink.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.split.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.split.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.split.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.stats.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.stats.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.stats.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.stats.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.update_aliases.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.update_aliases.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.update_aliases.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.update_aliases.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.upgrade.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.upgrade.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.upgrade.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.upgrade.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/indices.validate_query.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/indices.validate_query.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/indices.validate_query.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/indices.validate_query.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/info.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/info.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/info.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/info.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.delete_pipeline.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.delete_pipeline.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.delete_pipeline.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.delete_pipeline.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.get_pipeline.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.get_pipeline.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.get_pipeline.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.get_pipeline.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.processor_grok.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.processor_grok.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.processor_grok.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.processor_grok.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.put_pipeline.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.put_pipeline.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.put_pipeline.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.put_pipeline.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.simulate.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.simulate.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/ingest.simulate.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/ingest.simulate.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/mget.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/mget.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/mget.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/mget.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/msearch.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/msearch.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/msearch.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/msearch_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/msearch_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/msearch_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/mtermvectors.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/mtermvectors.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/mtermvectors.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/mtermvectors.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.hot_threads.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.hot_threads.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.hot_threads.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.hot_threads.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.info.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.info.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.info.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.info.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.reload_secure_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.reload_secure_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.reload_secure_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.reload_secure_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.stats.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.stats.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.stats.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.stats.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.usage.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.usage.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/nodes.usage.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/nodes.usage.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/ping.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/ping.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/ping.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/ping.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/put_script.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/put_script.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/put_script.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/put_script.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/rank_eval.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/rank_eval.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/rank_eval.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/rank_eval.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/reindex.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/reindex.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/reindex.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/reindex.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/reindex_rethrottle.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/reindex_rethrottle.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/reindex_rethrottle.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/reindex_rethrottle.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/render_search_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/render_search_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/render_search_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/render_search_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/scripts_painless_execute.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/scripts_painless_execute.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/scripts_painless_execute.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/scripts_painless_execute.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/scroll.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/scroll.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/scroll.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/scroll.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/search.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/search.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/search.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/search.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/search_shards.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/search_shards.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/search_shards.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/search_shards.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/search_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/search_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/search_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.cleanup_repository.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.cleanup_repository.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.cleanup_repository.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.cleanup_repository.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.create.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.create.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.create.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.create.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.create_repository.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.create_repository.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.create_repository.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.create_repository.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.delete.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.delete.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.delete.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.delete.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.delete_repository.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.delete_repository.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.delete_repository.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.delete_repository.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.get.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.get.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.get.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.get.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.get_repository.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.get_repository.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.get_repository.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.get_repository.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.restore.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.restore.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.restore.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.restore.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.status.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.status.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.status.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.status.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.verify_repository.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.verify_repository.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/snapshot.verify_repository.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/snapshot.verify_repository.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/tasks.cancel.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/tasks.cancel.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/tasks.cancel.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/tasks.cancel.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/tasks.get.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/tasks.get.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/tasks.get.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/tasks.get.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/tasks.list.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/tasks.list.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/tasks.list.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/tasks.list.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/termvectors.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/termvectors.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/termvectors.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/termvectors.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/update.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/update.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/update.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/update.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/update_by_query.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/update_by_query.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query_rethrottle.json b/src/plugins/console/server/lib/spec_definitions/spec/generated/update_by_query_rethrottle.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/generated/update_by_query_rethrottle.json
rename to src/plugins/console/server/lib/spec_definitions/spec/generated/update_by_query_rethrottle.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/index.js b/src/plugins/console/server/lib/spec_definitions/spec/index.js
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/index.js
rename to src/plugins/console/server/lib/spec_definitions/spec/index.js
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/clear_scroll.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/clear_scroll.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/clear_scroll.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/clear_scroll.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/cluster.health.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/cluster.health.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/cluster.health.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/cluster.health.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/cluster.put_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/cluster.put_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/cluster.put_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/cluster.put_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/cluster.reroute.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/cluster.reroute.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/cluster.reroute.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/cluster.reroute.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/count.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/count.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/count.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/count.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.analyze.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.analyze.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.analyze.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.analyze.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.clone.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.clone.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.clone.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.clone.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.create.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.create.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.create.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.create.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.delete_template.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.delete_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.delete_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.delete_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.exists_template.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.exists_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.exists_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.exists_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.get_field_mapping.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.get_field_mapping.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.get_field_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.get_field_mapping.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.get_mapping.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.get_mapping.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.get_mapping.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.get_mapping.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.get_template.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.get_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.get_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.get_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.put_alias.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.put_alias.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.put_alias.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.put_alias.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.put_settings.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.put_settings.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.put_settings.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.put_settings.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.put_template.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.put_template.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.put_template.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.put_template.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.rollover.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.rollover.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.rollover.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.rollover.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.update_aliases.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.update_aliases.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.update_aliases.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.update_aliases.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.validate_query.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.validate_query.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/indices.validate_query.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/indices.validate_query.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/snapshot.create.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/snapshot.create.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/snapshot.create.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/snapshot.create.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/snapshot.create_repository.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/snapshot.create_repository.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/snapshot.create_repository.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/snapshot.create_repository.json
diff --git a/src/legacy/core_plugins/console/server/api_server/spec/overrides/snapshot.restore.json b/src/plugins/console/server/lib/spec_definitions/spec/overrides/snapshot.restore.json
similarity index 100%
rename from src/legacy/core_plugins/console/server/api_server/spec/overrides/snapshot.restore.json
rename to src/plugins/console/server/lib/spec_definitions/spec/overrides/snapshot.restore.json
diff --git a/src/legacy/core_plugins/console/server/wildcard_matcher.js b/src/plugins/console/server/lib/wildcard_matcher.ts
similarity index 81%
rename from src/legacy/core_plugins/console/server/wildcard_matcher.js
rename to src/plugins/console/server/lib/wildcard_matcher.ts
index b99fba9295e51..128ad19172c75 100644
--- a/src/legacy/core_plugins/console/server/wildcard_matcher.js
+++ b/src/plugins/console/server/lib/wildcard_matcher.ts
@@ -17,12 +17,14 @@
  * under the License.
  */
 
-import { Minimatch } from 'minimatch';
+import { Minimatch, IMinimatch } from 'minimatch';
 
 export class WildcardMatcher {
-  constructor(wildcardPattern, emptyVal) {
-    this.emptyVal = emptyVal;
-    this.pattern = String(wildcardPattern || '*');
+  pattern: string;
+  matcher: IMinimatch;
+
+  constructor(private readonly wildcardPattern: string, private readonly emptyVal?: string) {
+    this.pattern = String(this.wildcardPattern || '*');
     this.matcher = new Minimatch(this.pattern, {
       noglobstar: true,
       dot: true,
@@ -32,7 +34,7 @@ export class WildcardMatcher {
     });
   }
 
-  match(candidate) {
+  match(candidate: string) {
     const empty = !candidate || candidate === this.emptyVal;
     if (empty && this.pattern === '*') {
       return true;
diff --git a/src/plugins/console/server/plugin.ts b/src/plugins/console/server/plugin.ts
new file mode 100644
index 0000000000000..c8ef84aee3b61
--- /dev/null
+++ b/src/plugins/console/server/plugin.ts
@@ -0,0 +1,81 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { first } from 'rxjs/operators';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+
+import { readLegacyEsConfig } from '../../../legacy/core_plugins/console_legacy';
+
+import { ProxyConfigCollection, addExtensionSpecFilePath, addProcessorDefinition } from './lib';
+import { ConfigType } from './config';
+import { registerProxyRoute } from './routes/api/console/proxy';
+import { registerSpecDefinitionsRoute } from './routes/api/console/spec_definitions';
+import { ESConfigForProxy, ConsoleSetup } from './types';
+
+export class ConsoleServerPlugin implements Plugin<ConsoleSetup> {
+  log: Logger;
+
+  constructor(private readonly ctx: PluginInitializerContext<ConfigType>) {
+    this.log = this.ctx.logger.get();
+  }
+
+  async setup({ http, capabilities, getStartServices }: CoreSetup) {
+    capabilities.registerProvider(() => ({
+      dev_tools: {
+        show: true,
+        save: true,
+      },
+    }));
+
+    const config = await this.ctx.config
+      .create()
+      .pipe(first())
+      .toPromise();
+
+    const { elasticsearch } = await this.ctx.config.legacy.globalConfig$.pipe(first()).toPromise();
+
+    const proxyPathFilters = config.proxyFilter.map((str: string) => new RegExp(str));
+
+    const router = http.createRouter();
+
+    registerProxyRoute({
+      log: this.log,
+      proxyConfigCollection: new ProxyConfigCollection(config.proxyConfig),
+      readLegacyESConfig: (): ESConfigForProxy => {
+        const legacyConfig = readLegacyEsConfig();
+        return {
+          ...elasticsearch,
+          hosts: legacyConfig.hosts,
+          requestHeadersWhitelist: legacyConfig.requestHeadersWhitelist,
+          customHeaders: legacyConfig.customHeaders,
+        };
+      },
+      pathFilters: proxyPathFilters,
+      router,
+    });
+
+    registerSpecDefinitionsRoute({ router });
+
+    return {
+      addExtensionSpecFilePath,
+      addProcessorDefinition,
+    };
+  }
+
+  start() {}
+}
diff --git a/src/plugins/console/server/routes/api/console/proxy/create_handler.ts b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
new file mode 100644
index 0000000000000..50a9fcf03c209
--- /dev/null
+++ b/src/plugins/console/server/routes/api/console/proxy/create_handler.ts
@@ -0,0 +1,217 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Agent, IncomingMessage } from 'http';
+import * as url from 'url';
+import { pick, trimLeft, trimRight } from 'lodash';
+
+import { KibanaRequest, Logger, RequestHandler } from 'kibana/server';
+
+import { ESConfigForProxy } from '../../../../types';
+import {
+  getElasticsearchProxyConfig,
+  ProxyConfigCollection,
+  proxyRequest,
+  setHeaders,
+} from '../../../../lib';
+
+import { Body, Query } from './validation_config';
+
+// TODO: find a better way to get information from the request like remoteAddress and remotePort
+// for forwarding.
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { ensureRawRequest } from '../../../../../../../core/server/http/router';
+
+export interface CreateHandlerDependencies {
+  log: Logger;
+  readLegacyESConfig: () => ESConfigForProxy;
+  pathFilters: RegExp[];
+  proxyConfigCollection: ProxyConfigCollection;
+}
+
+function toURL(base: string, path: string) {
+  const urlResult = new url.URL(`${trimRight(base, '/')}/${trimLeft(path, '/')}`);
+  // Appending pretty here to have Elasticsearch do the JSON formatting, as doing
+  // in JS can lead to data loss (7.0 will get munged into 7, thus losing indication of
+  // measurement precision)
+  if (!urlResult.searchParams.get('pretty')) {
+    urlResult.searchParams.append('pretty', 'true');
+  }
+  return urlResult;
+}
+
+function filterHeaders(originalHeaders: object, headersToKeep: string[]): object {
+  const normalizeHeader = function(header: any) {
+    if (!header) {
+      return '';
+    }
+    header = header.toString();
+    return header.trim().toLowerCase();
+  };
+
+  // Normalize list of headers we want to allow in upstream request
+  const headersToKeepNormalized = headersToKeep.map(normalizeHeader);
+
+  return pick(originalHeaders, headersToKeepNormalized);
+}
+
+function getRequestConfig(
+  headers: object,
+  esConfig: ESConfigForProxy,
+  proxyConfigCollection: ProxyConfigCollection,
+  uri: string
+): { agent: Agent; timeout: number; headers: object; rejectUnauthorized?: boolean } {
+  const filteredHeaders = filterHeaders(headers, esConfig.requestHeadersWhitelist);
+  const newHeaders = setHeaders(filteredHeaders, esConfig.customHeaders);
+
+  if (proxyConfigCollection.hasConfig()) {
+    return {
+      ...proxyConfigCollection.configForUri(uri),
+      headers: newHeaders,
+    } as any;
+  }
+
+  return {
+    ...getElasticsearchProxyConfig(esConfig),
+    headers: newHeaders,
+  };
+}
+
+function getProxyHeaders(req: KibanaRequest) {
+  const headers = Object.create(null);
+
+  // Scope this proto-unsafe functionality to where it is being used.
+  function extendCommaList(obj: Record<string, any>, property: string, value: any) {
+    obj[property] = (obj[property] ? obj[property] + ',' : '') + value;
+  }
+
+  const _req = ensureRawRequest(req);
+
+  if (_req?.info?.remotePort && _req?.info?.remoteAddress) {
+    // see https://git.io/vytQ7
+    extendCommaList(headers, 'x-forwarded-for', _req.info.remoteAddress);
+    extendCommaList(headers, 'x-forwarded-port', _req.info.remotePort);
+    extendCommaList(headers, 'x-forwarded-proto', _req.server.info.protocol);
+    extendCommaList(headers, 'x-forwarded-host', _req.info.host);
+  }
+
+  const contentType = req.headers['content-type'];
+  if (contentType) {
+    headers['content-type'] = contentType;
+  }
+  return headers;
+}
+
+export const createHandler = ({
+  log,
+  readLegacyESConfig,
+  pathFilters,
+  proxyConfigCollection,
+}: CreateHandlerDependencies): RequestHandler<unknown, Query, Body> => async (
+  ctx,
+  request,
+  response
+) => {
+  const { body, query } = request;
+  const { path, method } = query;
+
+  if (!pathFilters.some(re => re.test(path))) {
+    return response.forbidden({
+      body: `Error connecting to '${path}':\n\nUnable to send requests to that path.`,
+      headers: {
+        'Content-Type': 'text/plain',
+      },
+    });
+  }
+
+  const legacyConfig = readLegacyESConfig();
+  const { hosts } = legacyConfig;
+  let esIncomingMessage: IncomingMessage;
+
+  for (let idx = 0; idx < hosts.length; ++idx) {
+    const host = hosts[idx];
+    try {
+      const uri = toURL(host, path);
+
+      // Because this can technically be provided by a settings-defined proxy config, we need to
+      // preserve these property names to maintain BWC.
+      const { timeout, agent, headers, rejectUnauthorized } = getRequestConfig(
+        request.headers,
+        legacyConfig,
+        proxyConfigCollection,
+        uri.toString()
+      );
+
+      const requestHeaders = {
+        ...headers,
+        ...getProxyHeaders(request),
+      };
+
+      esIncomingMessage = await proxyRequest({
+        method: method.toLowerCase() as any,
+        headers: requestHeaders,
+        uri,
+        timeout,
+        payload: body,
+        rejectUnauthorized,
+        agent,
+      });
+
+      break;
+    } catch (e) {
+      log.error(e);
+      if (e.code !== 'ECONNREFUSED') {
+        return response.internalError(e);
+      }
+      if (idx === hosts.length - 1) {
+        log.warn(`Could not connect to any configured ES node [${hosts.join(', ')}]`);
+        return response.customError({
+          statusCode: 502,
+          body: e,
+        });
+      }
+      // Otherwise, try the next host...
+    }
+  }
+
+  const {
+    statusCode,
+    statusMessage,
+    headers: { warning },
+  } = esIncomingMessage!;
+
+  if (method.toUpperCase() !== 'HEAD') {
+    return response.custom({
+      statusCode: statusCode!,
+      body: esIncomingMessage!,
+      headers: {
+        warning: warning || '',
+      },
+    });
+  }
+
+  return response.custom({
+    statusCode: statusCode!,
+    body: `${statusCode} - ${statusMessage}`,
+    headers: {
+      warning: warning || '',
+      'Content-Type': 'text/plain',
+    },
+  });
+};
diff --git a/src/plugins/console/server/routes/api/console/proxy/index.ts b/src/plugins/console/server/routes/api/console/proxy/index.ts
new file mode 100644
index 0000000000000..5f7df1d7cf66b
--- /dev/null
+++ b/src/plugins/console/server/routes/api/console/proxy/index.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { IRouter } from 'kibana/server';
+import { routeValidationConfig } from './validation_config';
+import { createHandler, CreateHandlerDependencies } from './create_handler';
+
+export const registerProxyRoute = (
+  deps: {
+    router: IRouter;
+  } & CreateHandlerDependencies
+) => {
+  const { router, ...handlerDeps } = deps;
+  router.post(
+    {
+      path: '/api/console/proxy',
+      options: {
+        tags: ['access:console'],
+        body: {
+          output: 'stream',
+          parse: false,
+        },
+      },
+      validate: routeValidationConfig,
+    },
+    createHandler(handlerDeps)
+  );
+};
diff --git a/src/plugins/console/server/routes/api/console/proxy/validation_config.ts b/src/plugins/console/server/routes/api/console/proxy/validation_config.ts
new file mode 100644
index 0000000000000..f2372e9ee80d0
--- /dev/null
+++ b/src/plugins/console/server/routes/api/console/proxy/validation_config.ts
@@ -0,0 +1,44 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export type Query = TypeOf<typeof routeValidationConfig.query>;
+export type Body = TypeOf<typeof routeValidationConfig.body>;
+
+const acceptedHttpVerb = schema.string({
+  validate: method => {
+    return ['HEAD', 'GET', 'POST', 'PUT', 'DELETE'].some(
+      verb => verb.toLowerCase() === method.toLowerCase()
+    )
+      ? undefined
+      : `Method must be one of, case insensitive ['HEAD', 'GET', 'POST', 'PUT', 'DELETE']. Received '${method}'.`;
+  },
+});
+
+const nonEmptyString = schema.string({
+  validate: s => (s === '' ? 'Expected non-empty string' : undefined),
+});
+
+export const routeValidationConfig = {
+  query: schema.object({
+    method: acceptedHttpVerb,
+    path: nonEmptyString,
+  }),
+  body: schema.stream(),
+};
diff --git a/src/plugins/console/server/routes/api/console/spec_definitions/index.ts b/src/plugins/console/server/routes/api/console/spec_definitions/index.ts
new file mode 100644
index 0000000000000..e2ece37f407ac
--- /dev/null
+++ b/src/plugins/console/server/routes/api/console/spec_definitions/index.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 { schema, TypeOf } from '@kbn/config-schema';
+import { IRouter, RequestHandler } from 'kibana/server';
+import { resolveApi } from '../../../../lib/spec_definitions';
+
+export const registerSpecDefinitionsRoute = ({ router }: { router: IRouter }) => {
+  const handler: RequestHandler<unknown, TypeOf<typeof validate.query>> = async (
+    ctx,
+    request,
+    response
+  ) => {
+    const { sense_version: version, apis } = request.query;
+
+    return response.ok({
+      body: resolveApi(version, apis.split(',')),
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    });
+  };
+
+  const validate = {
+    query: schema.object({
+      sense_version: schema.string({ defaultValue: '' }),
+      apis: schema.string(),
+    }),
+  };
+
+  router.get({ path: '/api/console/api_server', validate }, handler);
+  router.post({ path: '/api/console/api_server', validate }, handler);
+};
diff --git a/src/plugins/console/server/types.ts b/src/plugins/console/server/types.ts
new file mode 100644
index 0000000000000..60ce56ad39fcd
--- /dev/null
+++ b/src/plugins/console/server/types.ts
@@ -0,0 +1,34 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Duration } from 'moment';
+import { ConsoleServerPlugin } from './plugin';
+
+/** @public */
+export type ConsoleSetup = ReturnType<ConsoleServerPlugin['setup']> extends Promise<infer U>
+  ? U
+  : ReturnType<ConsoleServerPlugin['setup']>;
+
+/** @internal */
+export interface ESConfigForProxy {
+  hosts: string[];
+  requestHeadersWhitelist: string[];
+  customHeaders: Record<string, any>;
+  requestTimeout: Duration;
+}
diff --git a/x-pack/index.js b/x-pack/index.js
index 83a7b5540334f..9ab6e2ee322d9 100644
--- a/x-pack/index.js
+++ b/x-pack/index.js
@@ -22,7 +22,6 @@ import { maps } from './legacy/plugins/maps';
 import { licenseManagement } from './legacy/plugins/license_management';
 import { indexManagement } from './legacy/plugins/index_management';
 import { indexLifecycleManagement } from './legacy/plugins/index_lifecycle_management';
-import { consoleExtensions } from './legacy/plugins/console_extensions';
 import { spaces } from './legacy/plugins/spaces';
 import { kueryAutocompleteInitializer } from './legacy/plugins/kuery_autocomplete';
 import { canvas } from './legacy/plugins/canvas';
@@ -65,7 +64,6 @@ module.exports = function(kibana) {
     canvas(kibana),
     licenseManagement(kibana),
     indexManagement(kibana),
-    consoleExtensions(kibana),
     indexLifecycleManagement(kibana),
     kueryAutocompleteInitializer(kibana),
     infra(kibana),
diff --git a/x-pack/legacy/plugins/console_extensions/index.js b/x-pack/legacy/plugins/console_extensions/index.js
deleted file mode 100644
index fd1b48f0fd6b1..0000000000000
--- a/x-pack/legacy/plugins/console_extensions/index.js
+++ /dev/null
@@ -1,47 +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 { join } from 'path';
-import { processors } from './spec/ingest';
-
-export function consoleExtensions(kibana) {
-  return new kibana.Plugin({
-    id: 'console_extensions',
-    require: ['kibana', 'console'],
-    isEnabled(config) {
-      return (
-        config.get('console_extensions.enabled') &&
-        config.has('console.enabled') &&
-        config.get('console.enabled')
-      );
-    },
-
-    config(Joi) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-
-    init: server => {
-      if (
-        server.plugins.console &&
-        server.plugins.console.addExtensionSpecFilePath &&
-        server.plugins.console.addProcessorDefinition
-      ) {
-        const { addExtensionSpecFilePath, addProcessorDefinition } = server.plugins.console;
-
-        addExtensionSpecFilePath(join(__dirname, 'spec/'));
-
-        processors.forEach(processor => addProcessorDefinition(processor));
-      } else {
-        console.warn(
-          'Missing server.plugins.console.addExtensionSpecFilePath extension point.',
-          'Cannot add xpack APIs to autocomplete.'
-        );
-      }
-    },
-  });
-}
diff --git a/x-pack/plugins/console_extensions/kibana.json b/x-pack/plugins/console_extensions/kibana.json
new file mode 100644
index 0000000000000..9411523d3f6dd
--- /dev/null
+++ b/x-pack/plugins/console_extensions/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "consoleExtensions",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "requiredPlugins": ["console"],
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/plugins/console_extensions/server/config.ts b/x-pack/plugins/console_extensions/server/config.ts
new file mode 100644
index 0000000000000..c429e0fce13fa
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/config.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export type ConfigType = TypeOf<typeof config>;
+
+export const config = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+});
diff --git a/x-pack/plugins/console_extensions/server/index.ts b/x-pack/plugins/console_extensions/server/index.ts
new file mode 100644
index 0000000000000..7fc16d4507da9
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { PluginInitializerContext, PluginConfigDescriptor } from 'kibana/server';
+
+import { config as configSchema, ConfigType } from './config';
+import { ConsoleExtensionsServerPlugin } from './plugin';
+
+export const plugin = (ctx: PluginInitializerContext) => new ConsoleExtensionsServerPlugin(ctx);
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+  schema: configSchema,
+};
diff --git a/x-pack/plugins/console_extensions/server/plugin.ts b/x-pack/plugins/console_extensions/server/plugin.ts
new file mode 100644
index 0000000000000..f4c41aa0a0ad5
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/plugin.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { join } from 'path';
+import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'kibana/server';
+
+import { ConsoleSetup } from '../../../../src/plugins/console/server';
+
+import { processors } from './spec/ingest/index';
+
+interface SetupDependencies {
+  console: ConsoleSetup;
+}
+
+export class ConsoleExtensionsServerPlugin implements Plugin<void, void, SetupDependencies> {
+  log: Logger;
+  constructor(private readonly ctx: PluginInitializerContext) {
+    this.log = this.ctx.logger.get();
+  }
+
+  setup(
+    core: CoreSetup,
+    { console: { addProcessorDefinition, addExtensionSpecFilePath } }: SetupDependencies
+  ) {
+    addExtensionSpecFilePath(join(__dirname, 'spec/'));
+    processors.forEach(processor => addProcessorDefinition(processor));
+    this.log.debug('Installed console autocomplete extensions.');
+  }
+  start() {}
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.delete_auto_follow_pattern.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.delete_auto_follow_pattern.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.delete_auto_follow_pattern.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.delete_auto_follow_pattern.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.follow.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.follow.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.follow.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.follow.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.follow_info.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.follow_info.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.follow_info.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.follow_info.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.follow_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.follow_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.follow_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.follow_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.forget_follower.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.forget_follower.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.forget_follower.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.forget_follower.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.get_auto_follow_pattern.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.get_auto_follow_pattern.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.get_auto_follow_pattern.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.get_auto_follow_pattern.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.pause_auto_follow_pattern.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.pause_auto_follow_pattern.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.pause_auto_follow_pattern.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.pause_auto_follow_pattern.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.pause_follow.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.pause_follow.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.pause_follow.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.pause_follow.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.put_auto_follow_pattern.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.put_auto_follow_pattern.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.put_auto_follow_pattern.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.put_auto_follow_pattern.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.resume_auto_follow_pattern.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.resume_auto_follow_pattern.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.resume_auto_follow_pattern.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.resume_auto_follow_pattern.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.resume_follow.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.resume_follow.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.resume_follow.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.resume_follow.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ccr.unfollow.json b/x-pack/plugins/console_extensions/server/spec/generated/ccr.unfollow.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ccr.unfollow.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ccr.unfollow.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/enrich.delete_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.delete_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/enrich.delete_policy.json
rename to x-pack/plugins/console_extensions/server/spec/generated/enrich.delete_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/enrich.execute_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.execute_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/enrich.execute_policy.json
rename to x-pack/plugins/console_extensions/server/spec/generated/enrich.execute_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/enrich.get_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.get_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/enrich.get_policy.json
rename to x-pack/plugins/console_extensions/server/spec/generated/enrich.get_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/enrich.put_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.put_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/enrich.put_policy.json
rename to x-pack/plugins/console_extensions/server/spec/generated/enrich.put_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/enrich.stats.json b/x-pack/plugins/console_extensions/server/spec/generated/enrich.stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/enrich.stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/enrich.stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/graph.explore.json b/x-pack/plugins/console_extensions/server/spec/generated/graph.explore.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/graph.explore.json
rename to x-pack/plugins/console_extensions/server/spec/generated/graph.explore.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.delete_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.delete_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.delete_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.delete_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.explain_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.explain_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.explain_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.explain_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.get_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.get_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.get_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.get_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.get_status.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.get_status.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.get_status.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.get_status.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.move_to_step.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.move_to_step.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.move_to_step.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.move_to_step.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.put_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.put_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.put_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.put_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.remove_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.remove_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.remove_policy.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.remove_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.retry.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.retry.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.retry.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.retry.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.set_policy.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.set_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.set_policy.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.set_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.start.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.start.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.start.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.start.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ilm.stop.json b/x-pack/plugins/console_extensions/server/spec/generated/ilm.stop.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ilm.stop.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ilm.stop.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/indices.freeze.json b/x-pack/plugins/console_extensions/server/spec/generated/indices.freeze.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/indices.freeze.json
rename to x-pack/plugins/console_extensions/server/spec/generated/indices.freeze.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/indices.reload_search_analyzers.json b/x-pack/plugins/console_extensions/server/spec/generated/indices.reload_search_analyzers.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/indices.reload_search_analyzers.json
rename to x-pack/plugins/console_extensions/server/spec/generated/indices.reload_search_analyzers.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/indices.unfreeze.json b/x-pack/plugins/console_extensions/server/spec/generated/indices.unfreeze.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/indices.unfreeze.json
rename to x-pack/plugins/console_extensions/server/spec/generated/indices.unfreeze.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.delete.json b/x-pack/plugins/console_extensions/server/spec/generated/license.delete.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.delete.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.delete.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.get.json b/x-pack/plugins/console_extensions/server/spec/generated/license.get.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.get.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.get.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.get_basic_status.json b/x-pack/plugins/console_extensions/server/spec/generated/license.get_basic_status.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.get_basic_status.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.get_basic_status.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.get_trial_status.json b/x-pack/plugins/console_extensions/server/spec/generated/license.get_trial_status.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.get_trial_status.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.get_trial_status.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.post.json b/x-pack/plugins/console_extensions/server/spec/generated/license.post.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.post.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.post.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.post_start_basic.json b/x-pack/plugins/console_extensions/server/spec/generated/license.post_start_basic.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.post_start_basic.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.post_start_basic.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/license.post_start_trial.json b/x-pack/plugins/console_extensions/server/spec/generated/license.post_start_trial.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/license.post_start_trial.json
rename to x-pack/plugins/console_extensions/server/spec/generated/license.post_start_trial.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/migration.deprecations.json b/x-pack/plugins/console_extensions/server/spec/generated/migration.deprecations.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/migration.deprecations.json
rename to x-pack/plugins/console_extensions/server/spec/generated/migration.deprecations.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/migration.get_assistance.json b/x-pack/plugins/console_extensions/server/spec/generated/migration.get_assistance.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/migration.get_assistance.json
rename to x-pack/plugins/console_extensions/server/spec/generated/migration.get_assistance.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/migration.upgrade.json b/x-pack/plugins/console_extensions/server/spec/generated/migration.upgrade.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/migration.upgrade.json
rename to x-pack/plugins/console_extensions/server/spec/generated/migration.upgrade.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.close_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.close_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.close_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.close_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_calendar.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_calendar.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_calendar.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_calendar.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_calendar_event.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_calendar_event.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_calendar_event.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_calendar_event.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_calendar_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_calendar_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_calendar_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_calendar_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_expired_data.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_expired_data.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_expired_data.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_expired_data.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_filter.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_filter.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_filter.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_filter.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_forecast.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_forecast.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_forecast.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_forecast.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_model_snapshot.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_model_snapshot.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_model_snapshot.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.delete_trained_model.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.delete_trained_model.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.delete_trained_model.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.estimate_memory_usage.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.estimate_memory_usage.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.estimate_memory_usage.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.estimate_memory_usage.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.evaluate_data_frame.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.evaluate_data_frame.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.evaluate_data_frame.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.evaluate_data_frame.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.explain_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.explain_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.explain_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.explain_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.find_file_structure.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.find_file_structure.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.find_file_structure.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.find_file_structure.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.flush_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.flush_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.flush_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.flush_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.forecast.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.forecast.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.forecast.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.forecast.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_buckets.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_buckets.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_buckets.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_calendar_events.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_calendar_events.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_calendar_events.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_calendar_events.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_calendars.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_calendars.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_calendars.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_calendars.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_categories.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_categories.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_categories.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_categories.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_data_frame_analytics_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_data_frame_analytics_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_data_frame_analytics_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_datafeed_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeed_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_datafeed_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeed_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_datafeeds.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeeds.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_datafeeds.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_datafeeds.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_filters.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_filters.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_filters.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_filters.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_influencers.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_influencers.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_influencers.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_influencers.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_job_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_job_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_job_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_job_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_jobs.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_jobs.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_jobs.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_jobs.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_model_snapshots.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_model_snapshots.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_model_snapshots.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_model_snapshots.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_overall_buckets.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_overall_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_overall_buckets.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_overall_buckets.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_records.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_records.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_records.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_records.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.get_trained_models_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.get_trained_models_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.info.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.info.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.info.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.info.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.open_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.open_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.open_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.open_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.post_calendar_events.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.post_calendar_events.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.post_calendar_events.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.post_calendar_events.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.post_data.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.post_data.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.post_data.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.post_data.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.preview_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.preview_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.preview_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.preview_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_calendar.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_calendar.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_calendar.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_calendar.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_calendar_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_calendar_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_calendar_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_calendar_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_filter.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_filter.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_filter.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_filter.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_trained_model.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.put_trained_model.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.put_trained_model.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.put_trained_model.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.revert_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.revert_model_snapshot.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.revert_model_snapshot.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.revert_model_snapshot.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.set_upgrade_mode.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.set_upgrade_mode.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.set_upgrade_mode.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.set_upgrade_mode.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.start_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.start_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.start_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.start_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.start_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.start_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.start_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.start_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.stop_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.stop_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.stop_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.stop_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.stop_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.stop_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.stop_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_datafeed.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.update_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_filter.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_filter.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_filter.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.update_filter.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_job.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.update_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.update_model_snapshot.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.update_model_snapshot.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.update_model_snapshot.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.upgrade.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.upgrade.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.upgrade.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.upgrade.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.validate.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.validate.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.validate.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.validate.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ml.validate_detector.json b/x-pack/plugins/console_extensions/server/spec/generated/ml.validate_detector.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ml.validate_detector.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ml.validate_detector.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/monitoring.bulk.json b/x-pack/plugins/console_extensions/server/spec/generated/monitoring.bulk.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/monitoring.bulk.json
rename to x-pack/plugins/console_extensions/server/spec/generated/monitoring.bulk.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.delete_job.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.delete_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.delete_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.delete_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.get_jobs.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.get_jobs.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.get_jobs.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.get_jobs.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.get_rollup_caps.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.get_rollup_caps.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.get_rollup_caps.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.get_rollup_caps.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.get_rollup_index_caps.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.get_rollup_index_caps.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.get_rollup_index_caps.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.get_rollup_index_caps.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.put_job.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.put_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.put_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.put_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.rollup_search.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.rollup_search.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.rollup_search.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.rollup_search.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.start_job.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.start_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.start_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.start_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/rollup.stop_job.json b/x-pack/plugins/console_extensions/server/spec/generated/rollup.stop_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/rollup.stop_job.json
rename to x-pack/plugins/console_extensions/server/spec/generated/rollup.stop_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.authenticate.json b/x-pack/plugins/console_extensions/server/spec/generated/security.authenticate.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.authenticate.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.authenticate.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.change_password.json b/x-pack/plugins/console_extensions/server/spec/generated/security.change_password.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.change_password.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.change_password.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.clear_cached_realms.json b/x-pack/plugins/console_extensions/server/spec/generated/security.clear_cached_realms.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.clear_cached_realms.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.clear_cached_realms.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.clear_cached_roles.json b/x-pack/plugins/console_extensions/server/spec/generated/security.clear_cached_roles.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.clear_cached_roles.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.clear_cached_roles.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.create_api_key.json b/x-pack/plugins/console_extensions/server/spec/generated/security.create_api_key.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.create_api_key.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.create_api_key.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.delete_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.delete_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_role.json b/x-pack/plugins/console_extensions/server/spec/generated/security.delete_role.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_role.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.delete_role.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_role_mapping.json b/x-pack/plugins/console_extensions/server/spec/generated/security.delete_role_mapping.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_role_mapping.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.delete_role_mapping.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_user.json b/x-pack/plugins/console_extensions/server/spec/generated/security.delete_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.delete_user.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.delete_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.disable_user.json b/x-pack/plugins/console_extensions/server/spec/generated/security.disable_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.disable_user.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.disable_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.enable_user.json b/x-pack/plugins/console_extensions/server/spec/generated/security.enable_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.enable_user.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.enable_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_api_key.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_api_key.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_api_key.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_api_key.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_builtin_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_builtin_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_builtin_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_builtin_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_role.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_role.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_role.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_role.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_role_mapping.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_role_mapping.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_role_mapping.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_role_mapping.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_token.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_token.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_token.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_token.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_user.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_user.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.get_user_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.get_user_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.get_user_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.get_user_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.has_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.has_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.has_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.has_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.invalidate_api_key.json b/x-pack/plugins/console_extensions/server/spec/generated/security.invalidate_api_key.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.invalidate_api_key.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.invalidate_api_key.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.invalidate_token.json b/x-pack/plugins/console_extensions/server/spec/generated/security.invalidate_token.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.invalidate_token.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.invalidate_token.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_privileges.json b/x-pack/plugins/console_extensions/server/spec/generated/security.put_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.put_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.put_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_role.json b/x-pack/plugins/console_extensions/server/spec/generated/security.put_role.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.put_role.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.put_role.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_role_mapping.json b/x-pack/plugins/console_extensions/server/spec/generated/security.put_role_mapping.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.put_role_mapping.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.put_role_mapping.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/security.put_user.json b/x-pack/plugins/console_extensions/server/spec/generated/security.put_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/security.put_user.json
rename to x-pack/plugins/console_extensions/server/spec/generated/security.put_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.delete_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.delete_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.delete_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.delete_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.execute_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.execute_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.execute_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.execute_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.execute_retention.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.execute_retention.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.execute_retention.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.execute_retention.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.get_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.get_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.get_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.get_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.get_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.get_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.get_status.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.get_status.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.get_status.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.get_status.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.put_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.put_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.put_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.put_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.start.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.start.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.start.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.start.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/slm.stop.json b/x-pack/plugins/console_extensions/server/spec/generated/slm.stop.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/slm.stop.json
rename to x-pack/plugins/console_extensions/server/spec/generated/slm.stop.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/sql.clear_cursor.json b/x-pack/plugins/console_extensions/server/spec/generated/sql.clear_cursor.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/sql.clear_cursor.json
rename to x-pack/plugins/console_extensions/server/spec/generated/sql.clear_cursor.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/sql.query.json b/x-pack/plugins/console_extensions/server/spec/generated/sql.query.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/sql.query.json
rename to x-pack/plugins/console_extensions/server/spec/generated/sql.query.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/sql.translate.json b/x-pack/plugins/console_extensions/server/spec/generated/sql.translate.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/sql.translate.json
rename to x-pack/plugins/console_extensions/server/spec/generated/sql.translate.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/ssl.certificates.json b/x-pack/plugins/console_extensions/server/spec/generated/ssl.certificates.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/ssl.certificates.json
rename to x-pack/plugins/console_extensions/server/spec/generated/ssl.certificates.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.delete_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.delete_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.delete_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.delete_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.get_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.get_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.get_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.get_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.get_transform_stats.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.get_transform_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.get_transform_stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.get_transform_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.preview_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.preview_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.preview_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.preview_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.put_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.put_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.put_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.put_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.start_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.start_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.start_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.start_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.stop_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.stop_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.stop_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.stop_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/transform.update_transform.json b/x-pack/plugins/console_extensions/server/spec/generated/transform.update_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/transform.update_transform.json
rename to x-pack/plugins/console_extensions/server/spec/generated/transform.update_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.ack_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.ack_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.ack_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.ack_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.activate_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.activate_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.activate_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.activate_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.deactivate_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.deactivate_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.deactivate_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.deactivate_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.delete_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.delete_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.delete_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.delete_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.execute_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.execute_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.execute_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.execute_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.get_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.get_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.get_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.get_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.put_watch.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.put_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.put_watch.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.put_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.start.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.start.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.start.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.start.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.stats.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.stats.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/watcher.stop.json b/x-pack/plugins/console_extensions/server/spec/generated/watcher.stop.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/watcher.stop.json
rename to x-pack/plugins/console_extensions/server/spec/generated/watcher.stop.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/xpack.info.json b/x-pack/plugins/console_extensions/server/spec/generated/xpack.info.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/xpack.info.json
rename to x-pack/plugins/console_extensions/server/spec/generated/xpack.info.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/xpack.ssl.certificates.json b/x-pack/plugins/console_extensions/server/spec/generated/xpack.ssl.certificates.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/xpack.ssl.certificates.json
rename to x-pack/plugins/console_extensions/server/spec/generated/xpack.ssl.certificates.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/generated/xpack.usage.json b/x-pack/plugins/console_extensions/server/spec/generated/xpack.usage.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/generated/xpack.usage.json
rename to x-pack/plugins/console_extensions/server/spec/generated/xpack.usage.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/ingest/index.js b/x-pack/plugins/console_extensions/server/spec/ingest/index.ts
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/ingest/index.js
rename to x-pack/plugins/console_extensions/server/spec/ingest/index.ts
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.follow.json b/x-pack/plugins/console_extensions/server/spec/overrides/ccr.follow.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.follow.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ccr.follow.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.forget_follower.json b/x-pack/plugins/console_extensions/server/spec/overrides/ccr.forget_follower.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.forget_follower.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ccr.forget_follower.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.put_auto_follow_pattern.json b/x-pack/plugins/console_extensions/server/spec/overrides/ccr.put_auto_follow_pattern.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.put_auto_follow_pattern.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ccr.put_auto_follow_pattern.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.resume_follow.json b/x-pack/plugins/console_extensions/server/spec/overrides/ccr.resume_follow.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ccr.resume_follow.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ccr.resume_follow.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/enrich.put_policy.json b/x-pack/plugins/console_extensions/server/spec/overrides/enrich.put_policy.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/enrich.put_policy.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/enrich.put_policy.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ilm.move_to_step.json b/x-pack/plugins/console_extensions/server/spec/overrides/ilm.move_to_step.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ilm.move_to_step.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ilm.move_to_step.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ilm.put_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/overrides/ilm.put_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ilm.put_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ilm.put_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.estimate_memory_usage.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.estimate_memory_usage.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.estimate_memory_usage.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.estimate_memory_usage.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.evaluate_data_frame.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.evaluate_data_frame.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.evaluate_data_frame.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.evaluate_data_frame.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.explain_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.explain_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.explain_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.explain_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_buckets.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_buckets.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_buckets.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_calendar_events.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_calendar_events.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_calendar_events.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_calendar_events.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_calendars.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_calendars.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_calendars.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_calendars.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_categories.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_categories.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_categories.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_categories.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_influencers.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_influencers.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_influencers.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_influencers.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_model_snapshots.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_model_snapshots.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_model_snapshots.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_model_snapshots.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_overall_buckets.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_overall_buckets.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_overall_buckets.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_overall_buckets.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_records.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.get_records.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.get_records.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.get_records.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.post_calendar_events.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.post_calendar_events.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.post_calendar_events.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.post_calendar_events.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_calendar.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.put_calendar.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_calendar.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.put_calendar.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_data_frame_analytics.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.put_data_frame_analytics.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_data_frame_analytics.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.put_data_frame_analytics.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_datafeed.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.put_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.put_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_job.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.put_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_job.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.put_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_trained_model.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.put_trained_model.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.put_trained_model.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.put_trained_model.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.revert_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.revert_model_snapshot.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.revert_model_snapshot.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.revert_model_snapshot.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.update_datafeed.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.update_datafeed.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.update_datafeed.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.update_datafeed.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.update_job.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.update_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.update_job.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.update_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/ml.update_model_snapshot.json b/x-pack/plugins/console_extensions/server/spec/overrides/ml.update_model_snapshot.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/ml.update_model_snapshot.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/ml.update_model_snapshot.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.authenticate.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.authenticate.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.authenticate.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.authenticate.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.change_password.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.change_password.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.change_password.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.change_password.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.create_api_key.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.create_api_key.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.create_api_key.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.create_api_key.json
diff --git a/x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
new file mode 100644
index 0000000000000..35fb78c532c12
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/overrides/security.delete_privileges.json
@@ -0,0 +1,3 @@
+{
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-delete-privilege.html"
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.get_token.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.get_token.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.get_token.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.get_token.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.has_privileges.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.has_privileges.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.has_privileges.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.has_privileges.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.invalidate_api_key.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.invalidate_api_key.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.invalidate_api_key.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.invalidate_api_key.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.invalidate_token.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.invalidate_token.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.invalidate_token.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.invalidate_token.json
diff --git a/x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json
new file mode 100644
index 0000000000000..ae37d9a889543
--- /dev/null
+++ b/x-pack/plugins/console_extensions/server/spec/overrides/security.put_privileges.json
@@ -0,0 +1,3 @@
+{
+    "documentation": "https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-put-privileges.html"
+}
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_role.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.put_role.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_role.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.put_role.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_role_mapping.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.put_role_mapping.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_role_mapping.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.put_role_mapping.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_user.json b/x-pack/plugins/console_extensions/server/spec/overrides/security.put_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/security.put_user.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/security.put_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/slm.put_lifecycle.json b/x-pack/plugins/console_extensions/server/spec/overrides/slm.put_lifecycle.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/slm.put_lifecycle.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/slm.put_lifecycle.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/slm.start.json b/x-pack/plugins/console_extensions/server/spec/overrides/slm.start.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/slm.start.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/slm.start.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/slm.stop.json b/x-pack/plugins/console_extensions/server/spec/overrides/slm.stop.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/slm.stop.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/slm.stop.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json b/x-pack/plugins/console_extensions/server/spec/overrides/sql.query.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/sql.query.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/sql.query.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/transform.get_transform_stats.json b/x-pack/plugins/console_extensions/server/spec/overrides/transform.get_transform_stats.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/transform.get_transform_stats.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/transform.get_transform_stats.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/transform.preview_transform.json b/x-pack/plugins/console_extensions/server/spec/overrides/transform.preview_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/transform.preview_transform.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/transform.preview_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/transform.put_transform.json b/x-pack/plugins/console_extensions/server/spec/overrides/transform.put_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/transform.put_transform.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/transform.put_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/transform.stop_transform.json b/x-pack/plugins/console_extensions/server/spec/overrides/transform.stop_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/transform.stop_transform.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/transform.stop_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/transform.update_transform.json b/x-pack/plugins/console_extensions/server/spec/overrides/transform.update_transform.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/transform.update_transform.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/transform.update_transform.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.graph.explore.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.graph.explore.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.graph.explore.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.graph.explore.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.info.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.info.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.info.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.info.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.license.post.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.license.post.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.license.post.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.license.post.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.rollup.delete_job.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.rollup.delete_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.rollup.delete_job.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.rollup.delete_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.rollup.put_job.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.rollup.put_job.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.rollup.put_job.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.rollup.put_job.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.rollup.rollup_search.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.rollup.rollup_search.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.rollup.rollup_search.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.rollup.rollup_search.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.authenticate.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.authenticate.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.authenticate.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.authenticate.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.change_password.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.change_password.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.change_password.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.change_password.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.get_token.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.get_token.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.get_token.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.get_token.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.invalidate_token.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.invalidate_token.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.invalidate_token.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.invalidate_token.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.put_role.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.put_role.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.put_role.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.put_role.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.put_role_mapping.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.put_role_mapping.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.put_role_mapping.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.put_role_mapping.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.put_user.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.put_user.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.security.put_user.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.security.put_user.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.watcher.execute_watch.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.watcher.execute_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.watcher.execute_watch.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.watcher.execute_watch.json
diff --git a/x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.watcher.put_watch.json b/x-pack/plugins/console_extensions/server/spec/overrides/xpack.watcher.put_watch.json
similarity index 100%
rename from x-pack/legacy/plugins/console_extensions/spec/overrides/xpack.watcher.put_watch.json
rename to x-pack/plugins/console_extensions/server/spec/overrides/xpack.watcher.put_watch.json

From 1d315e805fb2c749b8b45782dd9b4de0ed263812 Mon Sep 17 00:00:00 2001
From: Jean-Louis Leysens <jloleysens@gmail.com>
Date: Thu, 30 Jan 2020 16:41:27 +0100
Subject: [PATCH 03/23] [Watcher] Follow up on flaky functional test (#56384)
 (#56392)

* Skip flaky watcher FF test

* Give a bit more time for machines on CI

* Update watcher_test.js

* Revert "Update watcher_test.js"

This reverts commit 8a0289f9f15d92bdfd70ec2eb4dbc2b4c9dcf903.

* Revert "Give a bit more time for machines on CI"

This reverts commit d11228d6187121cf1cca2415a5c6f77de887f7bc.
---
 x-pack/test/functional/apps/watcher/watcher_test.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x-pack/test/functional/apps/watcher/watcher_test.js b/x-pack/test/functional/apps/watcher/watcher_test.js
index a3b955f8fccee..a2da0aad2d3c5 100644
--- a/x-pack/test/functional/apps/watcher/watcher_test.js
+++ b/x-pack/test/functional/apps/watcher/watcher_test.js
@@ -18,7 +18,10 @@ export default function({ getService, getPageObjects }) {
   const esSupertest = getService('esSupertest');
   const PageObjects = getPageObjects(['security', 'common', 'header', 'settings', 'watcher']);
 
-  describe('watcher_test', function() {
+  // Still flaky test :c
+  // https://github.com/elastic/kibana/pull/56361
+  // https://github.com/elastic/kibana/pull/56304
+  describe.skip('watcher_test', function() {
     before('initialize tests', async () => {
       // There may be system watches if monitoring was previously enabled
       // These cannot be deleted via the UI, so we need to delete via the API

From 0a324476337fdca78d60d3575ab86d53fc56e78a Mon Sep 17 00:00:00 2001
From: Joe Reuter <johannes.reuter@elastic.co>
Date: Thu, 30 Jan 2020 18:05:24 +0100
Subject: [PATCH 04/23] Move tsvb server to new platform (#55310) (#56394)

---
 .i18nrc.json                                  |  2 +-
 .../core_plugins/vis_type_timeseries/index.ts |  6 --
 .../public/components/aggs/filter_ratio.js    |  2 +-
 .../public/components/aggs/metric_select.js   |  8 +-
 .../public/components/aggs/moving_average.js  |  2 +-
 .../public/components/aggs/std_agg.js         |  2 +-
 .../public/components/aggs/top_hit.js         |  2 +-
 .../public/components/index_pattern.js        | 11 ++-
 .../components/lib/convert_series_to_vars.js  |  2 +-
 .../public/components/lib/get_interval.js     |  2 +-
 .../components/lib/series_change_handler.js   |  2 +-
 .../public/components/splits/terms.js         |  2 +-
 .../public/components/vis_editor.js           |  2 +-
 .../components/vis_editor_visualization.js    |  2 +-
 .../public/components/vis_picker.js           |  2 +-
 .../public/components/vis_types/gauge/vis.js  |  2 +-
 .../components/vis_types/markdown/vis.js      |  2 +-
 .../public/components/vis_types/metric/vis.js |  4 +-
 .../components/vis_types/table/is_sortable.js |  2 +-
 .../public/components/vis_types/table/vis.js  |  4 +-
 .../components/vis_types/timeseries/series.js |  2 +-
 .../components/vis_types/timeseries/vis.js    |  2 +-
 .../public/components/vis_types/top_n/vis.js  |  4 +-
 .../public/components/vis_with_splits.js      |  2 +-
 .../public/lib/check_ui_restrictions.js       |  5 +-
 .../public/lib/fetch_fields.js                |  2 +-
 .../{common => public/lib}/set_is_reversed.js |  6 +-
 .../public/lib/validate_interval.js           |  2 +-
 .../public/metrics_type.ts                    |  2 +-
 .../public/visualizations/views/gauge.js      |  4 +-
 .../public/visualizations/views/metric.js     |  2 +-
 .../public/visualizations/views/top_n.js      |  2 +-
 .../vis_type_timeseries/server/init.ts        | 44 ---------
 .../server/lib/get_fields.js                  | 37 --------
 .../server/lib/get_index_pattern_service.js   | 30 -------
 .../server/lib/search_strategies/index.js     | 20 -----
 .../strategies/abstract_search_strategy.js    | 42 ---------
 .../__snapshots__/model_options.test.js.snap  |  0
 .../vis_type_timeseries/common/agg_lookup.js  |  0
 .../common/agg_lookup.test.js                 |  0
 .../vis_type_timeseries/common/basic_aggs.js  |  0
 .../common/calculate_label.js                 |  0
 .../common/calculate_label.test.js            |  0
 .../common/extract_index_patterns.js          |  0
 .../common/extract_index_patterns.test.js     |  0
 .../vis_type_timeseries/common/field_types.js |  0
 .../common/get_last_value.js                  |  0
 .../common/get_last_value.test.js             |  0
 .../common/interval_regexp.js                 |  0
 .../common/interval_regexp.test.js            |  0
 .../common/metric_types.js                    |  0
 .../common/model_options.js                   |  0
 .../common/model_options.test.js              |  0
 .../vis_type_timeseries/common/panel_types.js |  0
 .../common/timerange_data_modes.js            |  0
 .../common/to_percentile_number.js            |  0
 .../common/ui_restrictions.js                 |  0
 .../vis_type_timeseries/server/index.ts       |  7 ++
 .../server/lib/get_fields.ts                  | 89 +++++++++++++++++++
 .../server/lib/get_vis_data.ts                | 16 ++--
 .../default_search_capabilities.js            |  0
 .../default_search_capabilities.test.js       |  0
 .../server/lib/search_strategies}/index.ts    |  3 +-
 .../search_requests}/abstract_request.js      |  0
 .../search_requests}/abstract_request.test.js |  0
 .../search_requests}/multi_search_request.js  |  0
 .../multi_search_request.test.js              |  0
 .../search_requests}/search_request.js        |  0
 .../search_requests}/search_request.test.js   |  0
 .../search_requests}/single_search_request.js |  0
 .../single_search_request.test.js             |  0
 .../search_strategies_registry.test.ts}       | 52 ++++-------
 .../search_strategy_registry.ts}              | 40 ++++-----
 .../abstract_search_strategy.test.js          |  0
 .../strategies/abstract_search_strategy.ts    | 87 ++++++++++++++++++
 .../strategies/default_search_strategy.js     |  2 +-
 .../default_search_strategy.test.js           |  0
 .../annotations}/build_request_body.js        |  0
 .../annotations}/get_request_params.js        |  0
 .../vis_data/build_processor_function.test.ts |  0
 .../lib/vis_data/build_processor_function.ts  |  0
 .../server/lib/vis_data/get_annotations.js    |  4 +-
 .../vis_data/get_interval_and_timefield.js    |  0
 .../get_interval_and_timefield.test.js        |  0
 .../server/lib/vis_data/get_panel_data.d.ts   |  0
 .../server/lib/vis_data/get_panel_data.js     |  0
 .../server/lib/vis_data/get_series_data.js    |  9 +-
 .../server/lib/vis_data/get_table_data.js     | 10 +--
 .../lib/vis_data/handle_error_response.js     |  0
 .../bucket_transform.test.js.snap             |  0
 .../lib/vis_data/helpers/bucket_transform.js  |  0
 .../vis_data/helpers/bucket_transform.test.js |  0
 .../lib/vis_data/helpers/calculate_auto.js    |  0
 .../server/lib/vis_data/helpers/format_key.js |  0
 .../lib/vis_data/helpers/get_active_series.js |  0
 .../lib/vis_data/helpers/get_agg_value.js     |  0
 .../vis_data/helpers/get_agg_value.test.js    |  0
 .../lib/vis_data/helpers/get_bucket_size.js   |  2 +-
 .../vis_data/helpers/get_bucket_size.test.js  |  0
 .../lib/vis_data/helpers/get_buckets_path.js  |  0
 .../vis_data/helpers/get_buckets_path.test.js |  0
 .../helpers/get_default_decoration.js         |  0
 .../helpers/get_default_decoration.test.js    |  0
 .../helpers/get_es_query_uisettings.js        |  0
 .../vis_data/helpers/get_es_shard_timeout.js  |  0
 .../helpers/get_es_shard_timeout.test.js      |  0
 .../lib/vis_data/helpers/get_index_pattern.js |  0
 .../lib/vis_data/helpers/get_last_metric.js   |  0
 .../vis_data/helpers/get_last_metric.test.js  |  0
 .../vis_data/helpers/get_sibling_agg_value.js |  0
 .../helpers/get_sibling_agg_value.test.js     |  0
 .../lib/vis_data/helpers/get_split_colors.js  |  0
 .../server/lib/vis_data/helpers/get_splits.js |  0
 .../lib/vis_data/helpers/get_splits.test.js   |  0
 .../lib/vis_data/helpers/get_timerange.js     |  0
 .../vis_data/helpers/get_timerange.test.js    |  0
 .../vis_data/helpers/get_timerange_mode.js    |  0
 .../server/lib/vis_data/helpers/index.js      |  0
 .../server/lib/vis_data/helpers/map_bucket.js |  0
 .../lib/vis_data/helpers/map_bucket.test.js   |  0
 .../lib/vis_data/helpers/moving_fn_scripts.js |  0
 .../helpers/moving_fn_scripts.test.js         |  0
 .../lib/vis_data/helpers/parse_interval.js    |  0
 .../lib/vis_data/helpers/parse_settings.js    |  0
 .../vis_data/helpers/parse_settings.test.js   |  0
 .../server/lib/vis_data/helpers/timestamp.js  |  0
 .../lib/vis_data/helpers/timestamp.test.js    |  0
 .../lib/vis_data/helpers/unit_to_seconds.js   |  0
 .../vis_data/helpers/unit_to_seconds.test.js  |  0
 .../server/lib/vis_data/offset_time.js        |  0
 .../server/lib/vis_data/offset_time.test.js   |  0
 .../annotations/date_histogram.js             |  2 +-
 .../request_processors/annotations/index.js   |  0
 .../request_processors/annotations/query.js   |  2 +-
 .../annotations/top_hits.js                   |  0
 .../series/date_histogram.js                  |  2 +-
 .../series/date_histogram.test.js             |  0
 .../series/filter_ratios.js                   |  0
 .../series/filter_ratios.test.js              |  0
 .../request_processors/series/index.js        |  0
 .../series/metric_buckets.js                  |  0
 .../series/metric_buckets.test.js             |  0
 .../series/normalize_query.js                 |  0
 .../series/normalize_query.test.js            |  0
 .../request_processors/series/query.js        |  2 +-
 .../request_processors/series/query.test.js   |  0
 .../series/sibling_buckets.js                 |  0
 .../series/sibling_buckets.test.js            |  0
 .../series/split_by_everything.js             |  0
 .../series/split_by_everything.test.js        |  0
 .../series/split_by_filter.js                 |  2 +-
 .../series/split_by_filter.test.js            |  0
 .../series/split_by_filters.js                |  2 +-
 .../series/split_by_filters.test.js           |  0
 .../series/split_by_terms.js                  |  0
 .../series/split_by_terms.test.js             |  0
 .../table/calculate_agg_root.js               |  0
 .../table/date_histogram.js                   |  2 +-
 .../request_processors/table/filter_ratios.js |  0
 .../request_processors/table/index.js         |  0
 .../table/metric_buckets.js                   |  0
 .../table/normalize_query.js                  |  0
 .../table/normalize_query.test.js             |  0
 .../request_processors/table/pivot.js         |  0
 .../request_processors/table/query.js         |  2 +-
 .../table/sibling_buckets.js                  |  0
 .../table/split_by_everything.js              |  2 +-
 .../table/split_by_terms.js                   |  2 +-
 .../annotations/buckets.js                    |  0
 .../response_processors/annotations/filter.js |  0
 .../annotations/filter.test.js                |  0
 .../response_processors/annotations/index.js  |  0
 .../response_processors/series/_series_agg.js |  0
 .../series/_series_agg.test.js                |  0
 .../series/drop_last_bucket.js                |  0
 .../response_processors/series/index.js       |  0
 .../response_processors/series/math.js        |  0
 .../response_processors/series/percentile.js  |  0
 .../series/percentile.test.js                 |  0
 .../series/percentile_rank.js                 |  0
 .../response_processors/series/series_agg.js  |  0
 .../series/series_agg.test.js                 |  0
 .../series/std_deviation_bands.js             |  0
 .../series/std_deviation_bands.test.js        |  0
 .../series/std_deviation_sibling.js           |  0
 .../series/std_deviation_sibling.test.js      |  0
 .../response_processors/series/std_metric.js  |  0
 .../series/std_metric.test.js                 |  0
 .../response_processors/series/std_sibling.js |  0
 .../series/std_sibling.test.js                |  0
 .../response_processors/series/time_shift.js  |  0
 .../series/time_shift.test.js                 |  0
 .../response_processors/table/_series_agg.js  |  0
 .../table/drop_last_bucket.js                 |  0
 .../response_processors/table/index.js        |  0
 .../response_processors/table/math.js         |  0
 .../response_processors/table/percentile.js   |  0
 .../table/percentile_rank.js                  |  0
 .../response_processors/table/series_agg.js   |  0
 .../response_processors/table/std_metric.js   |  0
 .../response_processors/table/std_sibling.js  |  0
 .../series/build_request_body.test.ts         |  0
 .../lib/vis_data/series/build_request_body.ts |  2 +-
 .../lib/vis_data/series/get_request_params.js |  0
 .../vis_data/series/handle_response_body.js   |  0
 .../lib/vis_data/table/build_request_body.js  |  0
 .../lib/vis_data/table/process_bucket.js      |  0
 .../vis_type_timeseries/server/plugin.ts      | 60 +++++++------
 .../server/routes/fields.ts}                  | 37 +++++---
 .../server/routes/post_vis_schema.ts          |  0
 .../vis_type_timeseries/server/routes/vis.ts  | 15 ++--
 .../framework/kibana_framework_adapter.ts     |  3 +-
 .../metrics/kibana_metrics_adapter.ts         |  7 +-
 .../lib/populate_series_with_tsvb_data.ts     |  8 +-
 x-pack/legacy/plugins/rollup/index.js         |  2 +-
 .../call_with_request_factory.js              |  8 +-
 .../register_rollup_search_strategy.js        | 18 ++--
 .../register_rollup_search_strategy.test.js   | 18 ++--
 218 files changed, 405 insertions(+), 385 deletions(-)
 rename src/legacy/core_plugins/vis_type_timeseries/{common => public/lib}/set_is_reversed.js (92%)
 delete mode 100644 src/legacy/core_plugins/vis_type_timeseries/server/init.ts
 delete mode 100644 src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js
 delete mode 100644 src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js
 delete mode 100644 src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js
 delete mode 100644 src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/agg_lookup.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/agg_lookup.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/basic_aggs.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/calculate_label.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/calculate_label.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/extract_index_patterns.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/extract_index_patterns.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/field_types.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/get_last_value.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/get_last_value.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/interval_regexp.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/interval_regexp.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/metric_types.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/model_options.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/model_options.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/panel_types.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/timerange_data_modes.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/to_percentile_number.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/common/ui_restrictions.js (100%)
 create mode 100644 src/plugins/vis_type_timeseries/server/lib/get_fields.ts
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/get_vis_data.ts (87%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server => plugins/vis_type_timeseries/server/lib/search_strategies}/index.ts (87%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/abstract_request.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/abstract_request.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/multi_search_request.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/multi_search_request.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/search_request.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/search_request.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/single_search_request.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests => plugins/vis_type_timeseries/server/lib/search_strategies/search_requests}/single_search_request.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js => plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts} (61%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js => plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts} (57%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js (100%)
 create mode 100644 src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations => plugins/vis_type_timeseries/server/lib/vis_data/annotations}/build_request_body.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations => plugins/vis_type_timeseries/server/lib/vis_data/annotations}/get_request_params.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_annotations.js (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_panel_data.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_series_data.js (91%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/get_table_data.js (90%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/handle_error_response.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/offset_time.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/offset_time.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js (100%)
 rename src/{legacy/core_plugins/vis_type_timeseries/server/routes/fields.js => plugins/vis_type_timeseries/server/routes/fields.ts} (54%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/routes/post_vis_schema.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_timeseries/server/routes/vis.ts (85%)

diff --git a/.i18nrc.json b/.i18nrc.json
index 98c36b43e5d8f..1230151212f57 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -40,7 +40,7 @@
     "visTypeMetric": "src/legacy/core_plugins/vis_type_metric",
     "visTypeTable": "src/legacy/core_plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
-    "visTypeTimeseries": "src/legacy/core_plugins/vis_type_timeseries",
+    "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
     "visTypeVega": "src/legacy/core_plugins/vis_type_vega",
     "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
     "visualizations": [
diff --git a/src/legacy/core_plugins/vis_type_timeseries/index.ts b/src/legacy/core_plugins/vis_type_timeseries/index.ts
index a502bb174bc99..3ad8ba3a31c17 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/index.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/index.ts
@@ -21,7 +21,6 @@ import { resolve } from 'path';
 import { Legacy } from 'kibana';
 
 import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
-import { VisTypeTimeseriesSetup } from '../../../plugins/vis_type_timeseries/server';
 
 const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
   new Plugin({
@@ -47,11 +46,6 @@ const metricsPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPlu
         },
       },
     },
-    init: (server: Legacy.Server) => {
-      const visTypeTimeSeriesPlugin = server.newPlatform.setup.plugins
-        .metrics as VisTypeTimeseriesSetup;
-      visTypeTimeSeriesPlugin.__legacy.registerLegacyAPI({ server });
-    },
     config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js
index 355c4723587d6..5bd7f6557e887 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/filter_ratio.js
@@ -36,7 +36,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
-import { METRIC_TYPES } from '../../../common/metric_types';
+import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 export const FilterRatioAgg = props => {
   const { series, fields, panel } = props;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js
index 5e2f148ab5a6e..18daecd699903 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/metric_select.js
@@ -23,10 +23,10 @@ import { includes } from 'lodash';
 import { injectI18n } from '@kbn/i18n/react';
 import { EuiComboBox } from '@elastic/eui';
 import { calculateSiblings } from '../lib/calculate_siblings';
-import { calculateLabel } from '../../../common/calculate_label';
-import { basicAggs } from '../../../common/basic_aggs';
-import { toPercentileNumber } from '../../../common/to_percentile_number';
-import { METRIC_TYPES } from '../../../common/metric_types';
+import { calculateLabel } from '../../../../../../plugins/vis_type_timeseries/common/calculate_label';
+import { basicAggs } from '../../../../../../plugins/vis_type_timeseries/common/basic_aggs';
+import { toPercentileNumber } from '../../../../../../plugins/vis_type_timeseries/common/to_percentile_number';
+import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 function createTypeFilter(restrict, exclude) {
   return metric => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js
index 3b9d0ab282682..5843eab3f4707 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/moving_average.js
@@ -36,7 +36,7 @@ import {
   EuiFieldNumber,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { MODEL_TYPES } from '../../../common/model_options';
+import { MODEL_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/model_options';
 
 const DEFAULTS = {
   model_type: MODEL_TYPES.UNWEIGHTED,
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js
index 67fe9403e402b..61e5c60cbd72a 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/std_agg.js
@@ -34,7 +34,7 @@ import {
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
-import { METRIC_TYPES } from '../../../common/metric_types';
+import { METRIC_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 export function StandardAgg(props) {
   const { model, panel, series, fields, uiRestrictions } = props;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js
index fa92713046aca..df13b94394061 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/aggs/top_hit.js
@@ -36,7 +36,7 @@ import {
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
-import { PANEL_TYPES } from '../../../common/panel_types';
+import { PANEL_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/panel_types';
 
 const isFieldTypeEnabled = (fieldRestrictions, fieldType) =>
   fieldRestrictions.length ? fieldRestrictions.includes(fieldType) : true;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js
index 352747013fe29..de8469adfb8a7 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/index_pattern.js
@@ -42,8 +42,11 @@ import {
   AUTO_INTERVAL,
 } from './lib/get_interval';
 import { i18n } from '@kbn/i18n';
-import { TIME_RANGE_DATA_MODES, TIME_RANGE_MODE_KEY } from '../../common/timerange_data_modes';
-import { PANEL_TYPES } from '../../common/panel_types';
+import {
+  TIME_RANGE_DATA_MODES,
+  TIME_RANGE_MODE_KEY,
+} from '../../../../../plugins/vis_type_timeseries/common/timerange_data_modes';
+import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types';
 import { isTimerangeModeEnabled } from '../lib/check_ui_restrictions';
 import { VisDataContext } from '../contexts/vis_data_context';
 
@@ -138,8 +141,8 @@ export const IndexPattern = ({ fields, prefix, onChange, disabled, model: _model
             </EuiFormRow>
             <EuiText size="xs" style={{ margin: 0 }}>
               {i18n.translate('visTypeTimeseries.indexPattern.timeRange.hint', {
-                defaultMessage: `This setting controls the timespan used for matching documents. 
-                "Entire timerange" will match all the documents selected in the timepicker. 
+                defaultMessage: `This setting controls the timespan used for matching documents.
+                "Entire timerange" will match all the documents selected in the timepicker.
                 "Last value" will match only the documents for the specified interval from the end of the timerange.`,
               })}
             </EuiText>
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js
index bcab9ec026d9a..73fc8dac2b564 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/convert_series_to_vars.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { getLastValue } from '../../../common/get_last_value';
+import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value';
 import { createTickFormatter } from './tick_formatter';
 import moment from 'moment';
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js
index 05d00f6bede1a..a6aefe067dd62 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/get_interval.js
@@ -20,7 +20,7 @@ import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { get } from 'lodash';
 import { parseEsInterval } from '../../../../data/public';
-import { GTE_INTERVAL_RE } from '../../../common/interval_regexp';
+import { GTE_INTERVAL_RE } from '../../../../../../plugins/vis_type_timeseries/common/interval_regexp';
 
 export const AUTO_INTERVAL = 'auto';
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js
index b13f89c204292..e773782969d16 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/lib/series_change_handler.js
@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import { newMetricAggFn } from './new_metric_agg_fn';
-import { isBasicAgg } from '../../../common/agg_lookup';
+import { isBasicAgg } from '../../../../../../plugins/vis_type_timeseries/common/agg_lookup';
 import { handleAdd, handleChange } from './collection_actions';
 
 export const seriesChangeHandler = (props, items) => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js
index 111da86d71ecb..0fddc4f8c1d87 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/splits/terms.js
@@ -36,7 +36,7 @@ import {
   EuiFieldText,
 } from '@elastic/eui';
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
-import { FIELD_TYPES } from '../../../common/field_types';
+import { FIELD_TYPES } from '../../../../../../plugins/vis_type_timeseries/common/field_types';
 import { STACKED_OPTIONS } from '../../visualizations/constants';
 
 const DEFAULTS = { terms_direction: 'desc', terms_size: 10, terms_order_by: '_count' };
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js
index ae39d75c7a2d1..3dedb67bd1d99 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor.js
@@ -28,7 +28,7 @@ import { VisPicker } from './vis_picker';
 import { PanelConfig } from './panel_config';
 import { createBrushHandler } from '../lib/create_brush_handler';
 import { fetchFields } from '../lib/fetch_fields';
-import { extractIndexPatterns } from '../../common/extract_index_patterns';
+import { extractIndexPatterns } from '../../../../../plugins/vis_type_timeseries/common/extract_index_patterns';
 import { esKuery } from '../../../../../plugins/data/public';
 
 import { npStart } from 'ui/new_platform';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js
index a376905495c52..c45a4d68e8aad 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_editor_visualization.js
@@ -28,7 +28,7 @@ import {
   isGteInterval,
   AUTO_INTERVAL,
 } from './lib/get_interval';
-import { PANEL_TYPES } from '../../common/panel_types';
+import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types';
 import { start as embeddables } from '../../../embeddable_api/public/np_ready/public/legacy';
 
 const MIN_CHART_HEIGHT = 300;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js
index 8d2673ea24cb2..2c4a11f8880ff 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_picker.js
@@ -21,7 +21,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { EuiTabs, EuiTab } from '@elastic/eui';
 import { injectI18n } from '@kbn/i18n/react';
-import { PANEL_TYPES } from '../../common/panel_types';
+import { PANEL_TYPES } from '../../../../../plugins/vis_type_timeseries/common/panel_types';
 
 function VisPickerItem(props) {
   const { label, type, selected } = props;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js
index 5d6bb55f33db6..7d30a1f0c8df5 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/gauge/vis.js
@@ -23,7 +23,7 @@ import { visWithSplits } from '../../vis_with_splits';
 import { createTickFormatter } from '../../lib/tick_formatter';
 import _, { get, isUndefined, assign, includes } from 'lodash';
 import { Gauge } from '../../../visualizations/views/gauge';
-import { getLastValue } from '../../../../common/get_last_value';
+import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value';
 
 function getColors(props) {
   const { model, visData } = props;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js
index e20f3d3fbaebc..a806339085450 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/markdown/vis.js
@@ -26,7 +26,7 @@ import { Markdown } from '../../../../../kibana_react/public';
 import { ErrorComponent } from '../../error';
 import { replaceVars } from '../../lib/replace_vars';
 import { convertSeriesToVars } from '../../lib/convert_series_to_vars';
-import { isBackgroundInverted } from '../../../../common/set_is_reversed';
+import { isBackgroundInverted } from '../../../lib/set_is_reversed';
 
 const getMarkdownId = id => `markdown-${id}`;
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js
index f463a4494a189..4a907a7b2078d 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/metric/vis.js
@@ -23,8 +23,8 @@ import { visWithSplits } from '../../vis_with_splits';
 import { createTickFormatter } from '../../lib/tick_formatter';
 import _, { get, isUndefined, assign, includes, pick } from 'lodash';
 import { Metric } from '../../../visualizations/views/metric';
-import { getLastValue } from '../../../../common/get_last_value';
-import { isBackgroundInverted } from '../../../../common/set_is_reversed';
+import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value';
+import { isBackgroundInverted } from '../../../lib/set_is_reversed';
 
 function getColors(props) {
   const { model, visData } = props;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js
index 887652a67f406..b44c94131348d 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/is_sortable.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { basicAggs } from '../../../../common/basic_aggs';
+import { basicAggs } from '../../../../../../../plugins/vis_type_timeseries/common/basic_aggs';
 
 export function isSortable(metric) {
   return basicAggs.includes(metric.type);
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js
index a82d5bdb1588c..94f4506cd0172 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/table/vis.js
@@ -22,14 +22,14 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { npStart } from 'ui/new_platform';
 import { createTickFormatter } from '../../lib/tick_formatter';
-import { calculateLabel } from '../../../../common/calculate_label';
+import { calculateLabel } from '../../../../../../../plugins/vis_type_timeseries/common/calculate_label';
 import { isSortable } from './is_sortable';
 import { EuiToolTip, EuiIcon } from '@elastic/eui';
 import { replaceVars } from '../../lib/replace_vars';
 import { fieldFormats } from '../../../../../../../plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { METRIC_TYPES } from '../../../../common/metric_types';
+import { METRIC_TYPES } from '../../../../../../../plugins/vis_type_timeseries/common/metric_types';
 
 function getColor(rules, colorKey, value) {
   let color;
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js
index 226aded390508..27a84d9ba40b9 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/series.js
@@ -35,7 +35,7 @@ import {
 import { Split } from '../../split';
 import { createTextHandler } from '../../lib/create_text_handler';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
-import { PANEL_TYPES } from '../../../../common/panel_types';
+import { PANEL_TYPES } from '../../../../../../../plugins/vis_type_timeseries/common/panel_types';
 
 const TimeseriesSeriesUI = injectI18n(function(props) {
   const {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
index d269d7c3546ec..5243f5f92a621 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/timeseries/vis.js
@@ -34,7 +34,7 @@ import { getAxisLabelString } from '../../lib/get_axis_label_string';
 import { getInterval } from '../../lib/get_interval';
 import { areFieldsDifferent } from '../../lib/charts';
 import { createXaxisFormatter } from '../../lib/create_xaxis_formatter';
-import { isBackgroundDark } from '../../../../common/set_is_reversed';
+import { isBackgroundDark } from '../../../lib/set_is_reversed';
 import { STACKED_OPTIONS } from '../../../visualizations/constants';
 
 export class TimeseriesVisualization extends Component {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js
index 7d09f33acdecc..2ebc60325a425 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_types/top_n/vis.js
@@ -19,8 +19,8 @@
 
 import { createTickFormatter } from '../../lib/tick_formatter';
 import { TopN } from '../../../visualizations/views/top_n';
-import { getLastValue } from '../../../../common/get_last_value';
-import { isBackgroundInverted } from '../../../../common/set_is_reversed';
+import { getLastValue } from '../../../../../../../plugins/vis_type_timeseries/common/get_last_value';
+import { isBackgroundInverted } from '../../../lib/set_is_reversed';
 import { replaceVars } from '../../lib/replace_vars';
 import PropTypes from 'prop-types';
 import React from 'react';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js
index 91d53b9c2e1db..e36910d9081b3 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/components/vis_with_splits.js
@@ -20,7 +20,7 @@
 import React from 'react';
 import { getDisplayName } from './lib/get_display_name';
 import { last, findIndex, first } from 'lodash';
-import { calculateLabel } from '../../common/calculate_label';
+import { calculateLabel } from '../../../../../plugins/vis_type_timeseries/common/calculate_label';
 
 export function visWithSplits(WrappedComponent) {
   function SplitVisComponent(props) {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js
index 1fade6ebe9849..5d18c0a2f09cd 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/check_ui_restrictions.js
@@ -18,7 +18,10 @@
  */
 
 import { get } from 'lodash';
-import { RESTRICTIONS_KEYS, DEFAULT_UI_RESTRICTION } from '../../common/ui_restrictions';
+import {
+  RESTRICTIONS_KEYS,
+  DEFAULT_UI_RESTRICTION,
+} from '../../../../../plugins/vis_type_timeseries/common/ui_restrictions';
 
 /**
  * Generic method for checking all types of the UI Restrictions
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js
index 21c12b07ff47f..68e694f23fa7f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/fetch_fields.js
@@ -19,7 +19,7 @@
 import { kfetch } from 'ui/kfetch';
 import { toastNotifications } from 'ui/notify';
 import { i18n } from '@kbn/i18n';
-import { extractIndexPatterns } from '../../common/extract_index_patterns';
+import { extractIndexPatterns } from '../../../../../plugins/vis_type_timeseries/common/extract_index_patterns';
 
 export async function fetchFields(indexPatterns = ['*']) {
   const patterns = Array.isArray(indexPatterns) ? indexPatterns : [indexPatterns];
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/set_is_reversed.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/set_is_reversed.js
similarity index 92%
rename from src/legacy/core_plugins/vis_type_timeseries/common/set_is_reversed.js
rename to src/legacy/core_plugins/vis_type_timeseries/public/lib/set_is_reversed.js
index b633d004b9705..9f66bcd161916 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/common/set_is_reversed.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/set_is_reversed.js
@@ -18,9 +18,9 @@
  */
 
 import color from 'color';
-import chrome from '../../../ui/public/chrome';
+import { getUISettings } from '../services';
 
-const IS_DARK_THEME = chrome.getUiSettingsClient().get('theme:darkMode');
+const isDarkTheme = () => getUISettings().get('theme:darkMode');
 
 /**
  * Returns true if the color that is passed has low luminosity
@@ -34,7 +34,7 @@ const isColorDark = c => {
  * Defaults to checking `theme:darkMode`.
  */
 export const isThemeDark = currentTheme => {
-  let themeIsDark = currentTheme || IS_DARK_THEME;
+  let themeIsDark = currentTheme || isDarkTheme();
 
   // If passing a string, check the luminosity
   if (typeof currentTheme === 'string') {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
index 2dbcdc4749a66..2992549d38e30 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/lib/validate_interval.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { GTE_INTERVAL_RE } from '../../common/interval_regexp';
+import { GTE_INTERVAL_RE } from '../../../../../plugins/vis_type_timeseries/common/interval_regexp';
 import { i18n } from '@kbn/i18n';
 import { parseInterval } from '../../../../../plugins/data/public';
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts
index e7684cd21b797..22d2b3b10e566 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts
@@ -26,7 +26,7 @@ import { metricsRequestHandler } from './request_handler';
 // @ts-ignore
 import { EditorController } from './editor_controller';
 // @ts-ignore
-import { PANEL_TYPES } from '../common/panel_types';
+import { PANEL_TYPES } from '../../../../plugins/vis_type_timeseries/common/panel_types';
 
 export const metricsVisDefinition = {
   name: 'metrics',
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js
index 3be2e9daed58c..b518665e5ece4 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/gauge.js
@@ -21,8 +21,8 @@ import _ from 'lodash';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import classNames from 'classnames';
-import { isBackgroundInverted, isBackgroundDark } from '../../../common/set_is_reversed';
-import { getLastValue } from '../../../common/get_last_value';
+import { isBackgroundInverted, isBackgroundDark } from '../../lib/set_is_reversed';
+import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value';
 import { getValueBy } from '../lib/get_value_by';
 import { GaugeVis } from './gauge_vis';
 import reactcss from 'reactcss';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js
index 004d59efca333..5524e17d106e4 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/metric.js
@@ -20,7 +20,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import _ from 'lodash';
-import { getLastValue } from '../../../common/get_last_value';
+import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value';
 import reactcss from 'reactcss';
 import { calculateCoordinates } from '../lib/calculate_coordinates';
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js
index 5734d101a09d2..99e9cc0b1c218 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js
+++ b/src/legacy/core_plugins/vis_type_timeseries/public/visualizations/views/top_n.js
@@ -19,7 +19,7 @@
 
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { getLastValue } from '../../../common/get_last_value';
+import { getLastValue } from '../../../../../../plugins/vis_type_timeseries/common/get_last_value';
 import reactcss from 'reactcss';
 
 const RENDER_MODES = {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts b/src/legacy/core_plugins/vis_type_timeseries/server/init.ts
deleted file mode 100644
index ae6eebc00fc1b..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/init.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-// @ts-ignore
-import { fieldsRoutes } from './routes/fields';
-// @ts-ignore
-import { visDataRoutes } from './routes/vis';
-// @ts-ignore
-import { SearchStrategiesRegister } from './lib/search_strategies/search_strategies_register';
-// @ts-ignore
-import { getVisData } from './lib/get_vis_data';
-import { Framework } from '../../../../plugins/vis_type_timeseries/server';
-import { ValidationTelemetryServiceSetup } from '../../../../plugins/vis_type_timeseries/server';
-
-export const init = async (
-  framework: Framework,
-  __LEGACY: any,
-  validationTelemetry: ValidationTelemetryServiceSetup
-) => {
-  const { core } = framework;
-  const router = core.http.createRouter();
-
-  visDataRoutes(router, framework, validationTelemetry);
-
-  // [LEGACY_TODO]
-  fieldsRoutes(__LEGACY.server);
-  SearchStrategiesRegister.init(__LEGACY.server);
-};
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js
deleted file mode 100644
index 361ce132f1735..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_fields.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-import { SearchStrategiesRegister } from './search_strategies/search_strategies_register';
-import { uniq } from 'lodash';
-import { getIndexPatternObject } from './vis_data/helpers/get_index_pattern';
-import { isNestedField } from '../../../../../plugins/data/server';
-
-export async function getFields(req) {
-  const indexPattern = req.query.index;
-  const { indexPatternString } = await getIndexPatternObject(req, indexPattern);
-  const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy(
-    req,
-    indexPatternString
-  );
-
-  const fields = (
-    await searchStrategy.getFieldsForWildcard(req, indexPatternString, capabilities)
-  ).filter(field => field.aggregatable && !isNestedField(field));
-
-  return uniq(fields, field => field.name);
-}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js
deleted file mode 100644
index 54e90ab7dd9b7..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_index_pattern_service.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { IndexPatternsFetcher } from '../../../../../plugins/data/server/';
-export const getIndexPatternService = {
-  assign: 'indexPatternsService',
-  method(req) {
-    const dataCluster = req.server.plugins.elasticsearch.getCluster('data');
-    const callDataCluster = (...args) => {
-      return dataCluster.callWithRequest(req, ...args);
-    };
-    return new IndexPatternsFetcher(callDataCluster);
-  },
-};
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js
deleted file mode 100644
index 512894f30a619..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export { SearchStrategiesRegister } from './search_strategies_register';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js b/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js
deleted file mode 100644
index 794e92a1954a9..0000000000000
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export class AbstractSearchStrategy {
-  constructor(server, callWithRequestFactory, SearchRequest) {
-    this.getCallWithRequestInstance = req => callWithRequestFactory(server, req);
-
-    this.getSearchRequest = req => {
-      const callWithRequest = this.getCallWithRequestInstance(req);
-
-      return new SearchRequest(req, callWithRequest);
-    };
-  }
-
-  async getFieldsForWildcard(req, indexPattern) {
-    const { indexPatternsService } = req.pre;
-
-    return await indexPatternsService.getFieldsForWildcard({
-      pattern: indexPattern,
-    });
-  }
-
-  checkForViability() {
-    throw new TypeError('Must override method');
-  }
-}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap b/src/plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap
rename to src/plugins/vis_type_timeseries/common/__snapshots__/model_options.test.js.snap
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.js b/src/plugins/vis_type_timeseries/common/agg_lookup.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.js
rename to src/plugins/vis_type_timeseries/common/agg_lookup.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.test.js b/src/plugins/vis_type_timeseries/common/agg_lookup.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/agg_lookup.test.js
rename to src/plugins/vis_type_timeseries/common/agg_lookup.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/basic_aggs.js b/src/plugins/vis_type_timeseries/common/basic_aggs.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/basic_aggs.js
rename to src/plugins/vis_type_timeseries/common/basic_aggs.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.js b/src/plugins/vis_type_timeseries/common/calculate_label.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.js
rename to src/plugins/vis_type_timeseries/common/calculate_label.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.test.js b/src/plugins/vis_type_timeseries/common/calculate_label.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/calculate_label.test.js
rename to src/plugins/vis_type_timeseries/common/calculate_label.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.js b/src/plugins/vis_type_timeseries/common/extract_index_patterns.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.js
rename to src/plugins/vis_type_timeseries/common/extract_index_patterns.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.test.js b/src/plugins/vis_type_timeseries/common/extract_index_patterns.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/extract_index_patterns.test.js
rename to src/plugins/vis_type_timeseries/common/extract_index_patterns.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/field_types.js b/src/plugins/vis_type_timeseries/common/field_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/field_types.js
rename to src/plugins/vis_type_timeseries/common/field_types.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.js b/src/plugins/vis_type_timeseries/common/get_last_value.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.js
rename to src/plugins/vis_type_timeseries/common/get_last_value.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.test.js b/src/plugins/vis_type_timeseries/common/get_last_value.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/get_last_value.test.js
rename to src/plugins/vis_type_timeseries/common/get_last_value.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.js b/src/plugins/vis_type_timeseries/common/interval_regexp.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.js
rename to src/plugins/vis_type_timeseries/common/interval_regexp.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.test.js b/src/plugins/vis_type_timeseries/common/interval_regexp.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/interval_regexp.test.js
rename to src/plugins/vis_type_timeseries/common/interval_regexp.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/metric_types.js b/src/plugins/vis_type_timeseries/common/metric_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/metric_types.js
rename to src/plugins/vis_type_timeseries/common/metric_types.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/model_options.js b/src/plugins/vis_type_timeseries/common/model_options.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/model_options.js
rename to src/plugins/vis_type_timeseries/common/model_options.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/model_options.test.js b/src/plugins/vis_type_timeseries/common/model_options.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/model_options.test.js
rename to src/plugins/vis_type_timeseries/common/model_options.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/panel_types.js b/src/plugins/vis_type_timeseries/common/panel_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/panel_types.js
rename to src/plugins/vis_type_timeseries/common/panel_types.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/timerange_data_modes.js b/src/plugins/vis_type_timeseries/common/timerange_data_modes.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/timerange_data_modes.js
rename to src/plugins/vis_type_timeseries/common/timerange_data_modes.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/to_percentile_number.js b/src/plugins/vis_type_timeseries/common/to_percentile_number.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/to_percentile_number.js
rename to src/plugins/vis_type_timeseries/common/to_percentile_number.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/common/ui_restrictions.js b/src/plugins/vis_type_timeseries/common/ui_restrictions.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/common/ui_restrictions.js
rename to src/plugins/vis_type_timeseries/common/ui_restrictions.js
diff --git a/src/plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/index.ts
index dfb2394af237b..fa74b6e965971 100644
--- a/src/plugins/vis_type_timeseries/server/index.ts
+++ b/src/plugins/vis_type_timeseries/server/index.ts
@@ -32,6 +32,13 @@ export type VisTypeTimeseriesConfig = TypeOf<typeof config.schema>;
 
 export { ValidationTelemetryServiceSetup } from './validation_telemetry';
 
+// @ts-ignore
+export { AbstractSearchStrategy } from './lib/search_strategies/strategies/abstract_search_strategy';
+// @ts-ignore
+export { AbstractSearchRequest } from './lib/search_strategies/search_requests/abstract_request';
+// @ts-ignore
+export { DefaultSearchCapabilities } from './lib/search_strategies/default_search_capabilities';
+
 export function plugin(initializerContext: PluginInitializerContext) {
   return new VisTypeTimeseriesPlugin(initializerContext);
 }
diff --git a/src/plugins/vis_type_timeseries/server/lib/get_fields.ts b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts
new file mode 100644
index 0000000000000..8eca30dae7773
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/lib/get_fields.ts
@@ -0,0 +1,89 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import { uniq } from 'lodash';
+import { first, map } from 'rxjs/operators';
+import { KibanaRequest, RequestHandlerContext } from 'kibana/server';
+
+// @ts-ignore
+import { getIndexPatternObject } from './vis_data/helpers/get_index_pattern';
+import { isNestedField } from '../../../data/server';
+import { Framework } from '../plugin';
+import { FieldDescriptor, IndexPatternsFetcher } from '../../../data/server';
+import { ReqFacade } from './search_strategies/strategies/abstract_search_strategy';
+
+export async function getFields(
+  requestContext: RequestHandlerContext,
+  request: KibanaRequest,
+  framework: Framework,
+  indexPattern: string
+) {
+  // NOTE / TODO: This facade has been put in place to make migrating to the New Platform easier. It
+  // removes the need to refactor many layers of dependencies on "req", and instead just augments the top
+  // level object passed from here. The layers should be refactored fully at some point, but for now
+  // this works and we are still using the New Platform services for these vis data portions.
+  const reqFacade: ReqFacade = {
+    ...request,
+    framework,
+    payload: {},
+    pre: {
+      indexPatternsService: new IndexPatternsFetcher(
+        requestContext.core.elasticsearch.dataClient.callAsCurrentUser
+      ),
+    },
+    getUiSettingsService: () => requestContext.core.uiSettings.client,
+    getSavedObjectsClient: () => requestContext.core.savedObjects.client,
+    server: {
+      plugins: {
+        elasticsearch: {
+          getCluster: () => {
+            return {
+              callWithRequest: async (req: any, endpoint: string, params: any) => {
+                return await requestContext.core.elasticsearch.dataClient.callAsCurrentUser(
+                  endpoint,
+                  params
+                );
+              },
+            };
+          },
+        },
+      },
+    },
+    getEsShardTimeout: async () => {
+      return await framework.globalConfig$
+        .pipe(
+          first(),
+          map(config => config.elasticsearch.shardTimeout.asMilliseconds())
+        )
+        .toPromise();
+    },
+  };
+  const { indexPatternString } = await getIndexPatternObject(reqFacade, indexPattern);
+  const {
+    searchStrategy,
+    capabilities,
+  } = (await framework.searchStrategyRegistry.getViableStrategy(reqFacade, indexPatternString))!;
+
+  const fields = ((await searchStrategy.getFieldsForWildcard(
+    reqFacade,
+    indexPatternString,
+    capabilities
+  )) as FieldDescriptor[]).filter(field => field.aggregatable && !isNestedField(field));
+
+  return uniq(fields, field => field.name);
+}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts b/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts
similarity index 87%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts
rename to src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts
index 58e624fa13442..aef831eaad430 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/get_vis_data.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/get_vis_data.ts
@@ -17,11 +17,12 @@
  * under the License.
  */
 
-import { RequestHandlerContext } from 'src/core/server';
+import { FakeRequest, RequestHandlerContext } from 'kibana/server';
 import _ from 'lodash';
 import { first, map } from 'rxjs/operators';
 import { getPanelData } from './vis_data/get_panel_data';
-import { Framework } from '../../../../../plugins/vis_type_timeseries/server';
+import { Framework } from '../index';
+import { ReqFacade } from './search_strategies/strategies/abstract_search_strategy';
 
 interface GetVisDataResponse {
   [key: string]: GetVisDataPanel;
@@ -56,15 +57,18 @@ export type GetVisData = (
 
 export function getVisData(
   requestContext: RequestHandlerContext,
-  options: GetVisDataOptions,
+  request: FakeRequest & { body: GetVisDataOptions },
   framework: Framework
 ): Promise<GetVisDataResponse> {
   // NOTE / TODO: This facade has been put in place to make migrating to the New Platform easier. It
   // removes the need to refactor many layers of dependencies on "req", and instead just augments the top
   // level object passed from here. The layers should be refactored fully at some point, but for now
   // this works and we are still using the New Platform services for these vis data portions.
-  const reqFacade: any = {
-    payload: options,
+  const reqFacade: ReqFacade = {
+    ...request,
+    framework,
+    pre: {},
+    payload: request.body,
     getUiSettingsService: () => requestContext.core.uiSettings.client,
     getSavedObjectsClient: () => requestContext.core.savedObjects.client,
     server: {
@@ -92,7 +96,7 @@ export function getVisData(
         .toPromise();
     },
   };
-  const promises = reqFacade.payload.panels.map(getPanelData(reqFacade));
+  const promises = (reqFacade.payload as GetVisDataOptions).panels.map(getPanelData(reqFacade));
   return Promise.all(promises).then(res => {
     return res.reduce((acc, data) => {
       return _.assign(acc as any, data);
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/default_search_capabilities.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/index.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts
similarity index 87%
rename from src/legacy/core_plugins/vis_type_timeseries/server/index.ts
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts
index c010628ca04bf..d53683882252b 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/index.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/index.ts
@@ -17,5 +17,4 @@
  * under the License.
  */
 
-export { init } from './init';
-export { getVisData, GetVisData, GetVisDataOptions } from './lib/get_vis_data';
+export { SearchStrategyRegistry } from './search_strategy_registry';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/abstract_request.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/abstract_request.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/multi_search_request.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/multi_search_request.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/search_request.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/search_request.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/searh_requests/single_search_request.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_requests/single_search_request.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts
similarity index 61%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts
index e03d776b8ee0c..ecd09653b3b48 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_registry.test.ts
@@ -16,10 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { SearchStrategiesRegister } from './search_strategies_register';
+
+import { SearchStrategyRegistry } from './search_strategy_registry';
+// @ts-ignore
 import { AbstractSearchStrategy } from './strategies/abstract_search_strategy';
+// @ts-ignore
 import { DefaultSearchStrategy } from './strategies/default_search_strategy';
-import { AbstractSearchRequest } from './searh_requests/abstract_request';
+// @ts-ignore
 import { DefaultSearchCapabilities } from './default_search_capabilities';
 
 class MockSearchStrategy extends AbstractSearchStrategy {
@@ -31,34 +34,21 @@ class MockSearchStrategy extends AbstractSearchStrategy {
   }
 }
 
-describe('SearchStrategiesRegister', () => {
-  let server;
-  let strategies;
-  let anotherSearchStrategy;
+describe('SearchStrategyRegister', () => {
+  let registry: SearchStrategyRegistry;
 
   beforeAll(() => {
-    server = {
-      expose: jest.fn((strategy, func) => {
-        server[strategy] = func;
-      }),
-    };
-    strategies = [
-      ['AbstractSearchStrategy', AbstractSearchStrategy],
-      ['AbstractSearchRequest', AbstractSearchRequest],
-      ['DefaultSearchCapabilities', DefaultSearchCapabilities],
-      ['addSearchStrategy', expect.any(Function)],
-    ];
-
-    SearchStrategiesRegister.init(server);
+    registry = new SearchStrategyRegistry();
   });
 
   test('should init strategies register', () => {
-    expect(server.expose.mock.calls).toEqual(strategies);
-    expect(server.addSearchStrategy()[0] instanceof DefaultSearchStrategy).toBe(true);
+    expect(
+      registry.addStrategy({} as AbstractSearchStrategy)[0] instanceof DefaultSearchStrategy
+    ).toBe(true);
   });
 
   test('should not add a strategy if it is not an instance of AbstractSearchStrategy', () => {
-    const addedStrategies = server.addSearchStrategy({});
+    const addedStrategies = registry.addStrategy({} as AbstractSearchStrategy);
 
     expect(addedStrategies.length).toEqual(1);
     expect(addedStrategies[0] instanceof DefaultSearchStrategy).toBe(true);
@@ -68,18 +58,15 @@ describe('SearchStrategiesRegister', () => {
     const req = {};
     const indexPattern = '*';
 
-    const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy(
-      req,
-      indexPattern
-    );
+    const { searchStrategy, capabilities } = (await registry.getViableStrategy(req, indexPattern))!;
 
     expect(searchStrategy instanceof DefaultSearchStrategy).toBe(true);
     expect(capabilities instanceof DefaultSearchCapabilities).toBe(true);
   });
 
   test('should add a strategy if it is an instance of AbstractSearchStrategy', () => {
-    anotherSearchStrategy = new MockSearchStrategy();
-    const addedStrategies = server.addSearchStrategy(anotherSearchStrategy);
+    const anotherSearchStrategy = new MockSearchStrategy({}, {} as any, {});
+    const addedStrategies = registry.addStrategy(anotherSearchStrategy);
 
     expect(addedStrategies.length).toEqual(2);
     expect(addedStrategies[0] instanceof AbstractSearchStrategy).toBe(true);
@@ -88,13 +75,12 @@ describe('SearchStrategiesRegister', () => {
   test('should return a MockSearchStrategy instance', async () => {
     const req = {};
     const indexPattern = '*';
+    const anotherSearchStrategy = new MockSearchStrategy({}, {} as any, {});
+    registry.addStrategy(anotherSearchStrategy);
 
-    const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy(
-      req,
-      indexPattern
-    );
+    const { searchStrategy, capabilities } = (await registry.getViableStrategy(req, indexPattern))!;
 
-    expect(searchStrategy instanceof AbstractSearchStrategy).toBe(true);
+    expect(searchStrategy instanceof MockSearchStrategy).toBe(true);
     expect(capabilities).toEqual({});
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts
similarity index 57%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts
index 5fbb4060862a4..6fbed1ddfba0f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/search_strategies_register.js
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/search_strategy_registry.ts
@@ -16,34 +16,32 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 import { AbstractSearchStrategy } from './strategies/abstract_search_strategy';
-import { AbstractSearchRequest } from './searh_requests/abstract_request';
+// @ts-ignore
 import { DefaultSearchStrategy } from './strategies/default_search_strategy';
-import { DefaultSearchCapabilities } from './default_search_capabilities';
-
+// @ts-ignore
 import { extractIndexPatterns } from '../../../common/extract_index_patterns';
 
-const strategies = [];
+export type RequestFacade = any;
+export type Panel = any;
 
-const addStrategy = searchStrategy => {
-  if (searchStrategy instanceof AbstractSearchStrategy) {
-    strategies.unshift(searchStrategy);
-  }
-  return strategies;
-};
+export class SearchStrategyRegistry {
+  private strategies: AbstractSearchStrategy[] = [];
 
-export class SearchStrategiesRegister {
-  static init(server) {
-    server.expose('AbstractSearchStrategy', AbstractSearchStrategy);
-    server.expose('AbstractSearchRequest', AbstractSearchRequest);
-    server.expose('DefaultSearchCapabilities', DefaultSearchCapabilities);
-    server.expose('addSearchStrategy', searchStrategy => addStrategy(searchStrategy));
+  constructor() {
+    this.addStrategy(new DefaultSearchStrategy());
+  }
 
-    addStrategy(new DefaultSearchStrategy(server));
+  public addStrategy(searchStrategy: AbstractSearchStrategy) {
+    if (searchStrategy instanceof AbstractSearchStrategy) {
+      this.strategies.unshift(searchStrategy);
+    }
+    return this.strategies;
   }
 
-  static async getViableStrategy(req, indexPattern) {
-    for (const searchStrategy of strategies) {
+  async getViableStrategy(req: RequestFacade, indexPattern: string) {
+    for (const searchStrategy of this.strategies) {
       const { isViable, capabilities } = await searchStrategy.checkForViability(req, indexPattern);
 
       if (isViable) {
@@ -55,9 +53,9 @@ export class SearchStrategiesRegister {
     }
   }
 
-  static async getViableStrategyForPanel(req, panel) {
+  async getViableStrategyForPanel(req: RequestFacade, panel: Panel) {
     const indexPattern = extractIndexPatterns(panel).join(',');
 
-    return SearchStrategiesRegister.getViableStrategy(req, indexPattern);
+    return this.getViableStrategy(req, indexPattern);
   }
 }
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.js
diff --git a/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
new file mode 100644
index 0000000000000..4fd4ac251fa3e
--- /dev/null
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -0,0 +1,87 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  APICaller,
+  FakeRequest,
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+} from 'kibana/server';
+import { Framework } from '../../../plugin';
+import { IndexPatternsFetcher } from '../../../../../data/server';
+
+/**
+ * ReqFacade is a regular KibanaRequest object extended with additional service
+ * references to ensure backwards compatibility for existing integrations.
+ *
+ * This will be replaced by standard KibanaRequest and RequestContext objects in a later version.
+ */
+export type ReqFacade = FakeRequest & {
+  framework: Framework;
+  payload: unknown;
+  pre: {
+    indexPatternsService?: IndexPatternsFetcher;
+  };
+  getUiSettingsService: () => IUiSettingsClient;
+  getSavedObjectsClient: () => SavedObjectsClientContract;
+  server: {
+    plugins: {
+      elasticsearch: {
+        getCluster: () => {
+          callWithRequest: (req: ReqFacade, endpoint: string, params: any) => Promise<any>;
+        };
+      };
+    };
+  };
+  getEsShardTimeout: () => Promise<number>;
+};
+
+export class AbstractSearchStrategy {
+  public getCallWithRequestInstance: (req: ReqFacade) => APICaller;
+  public getSearchRequest: (req: ReqFacade) => any;
+
+  constructor(
+    server: any,
+    callWithRequestFactory: (server: any, req: ReqFacade) => APICaller,
+    SearchRequest: any
+  ) {
+    this.getCallWithRequestInstance = req => callWithRequestFactory(server, req);
+
+    this.getSearchRequest = req => {
+      const callWithRequest = this.getCallWithRequestInstance(req);
+
+      return new SearchRequest(req, callWithRequest);
+    };
+  }
+
+  async getFieldsForWildcard(req: ReqFacade, indexPattern: string, capabilities: any) {
+    const { indexPatternsService } = req.pre;
+
+    return await indexPatternsService!.getFieldsForWildcard({
+      pattern: indexPattern,
+    });
+  }
+
+  checkForViability(
+    req: ReqFacade,
+    indexPattern: string
+  ): { isViable: boolean; capabilities: any } {
+    throw new TypeError('Must override method');
+  }
+}
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js
index fba67f448e784..63f2911ce1118 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js
+++ b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 import { AbstractSearchStrategy } from './abstract_search_strategy';
-import { SearchRequest } from '../searh_requests/search_request';
+import { SearchRequest } from '../search_requests/search_request';
 import { DefaultSearchCapabilities } from '../default_search_capabilities';
 
 const callWithRequestFactory = (server, request) => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js b/src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js
rename to src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/default_search_strategy.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/build_request_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/build_request_body.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/build_request_body.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/build_request_body.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/get_request_params.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/get_request_params.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/annorations/get_request_params.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/annotations/get_request_params.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.test.ts
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/build_processor_function.ts
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js
index 898ff837d4a01..8b8c31912f168 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_annotations.js
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { handleAnnotationResponse } from './response_processors/annotations/';
-import { getAnnotationRequestParams } from './annorations/get_request_params';
+import { handleAnnotationResponse } from './response_processors/annotations';
+import { getAnnotationRequestParams } from './annotations/get_request_params';
 import { getLastSeriesTimestamp } from './helpers/timestamp';
 
 function validAnnotation(annotation) {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_interval_and_timefield.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.d.ts
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_panel_data.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
similarity index 91%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
index b4eb9e6b108ff..1efeccb4b5701 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_series_data.js
@@ -20,15 +20,14 @@ import { getSeriesRequestParams } from './series/get_request_params';
 import { handleResponseBody } from './series/handle_response_body';
 import { handleErrorResponse } from './handle_error_response';
 import { getAnnotations } from './get_annotations';
-import { SearchStrategiesRegister } from '../search_strategies/search_strategies_register';
 import { getEsQueryConfig } from './helpers/get_es_query_uisettings';
 import { getActiveSeries } from './helpers/get_active_series';
 
 export async function getSeriesData(req, panel) {
-  const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategyForPanel(
-    req,
-    panel
-  );
+  const {
+    searchStrategy,
+    capabilities,
+  } = await req.framework.searchStrategyRegistry.getViableStrategyForPanel(req, panel);
   const searchRequest = searchStrategy.getSearchRequest(req);
   const esQueryConfig = await getEsQueryConfig(req);
   const meta = {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js
similarity index 90%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js
index 2c92692d2bd1f..1d1c245907959 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/get_table_data.js
@@ -20,16 +20,16 @@ import { buildRequestBody } from './table/build_request_body';
 import { handleErrorResponse } from './handle_error_response';
 import { get } from 'lodash';
 import { processBucket } from './table/process_bucket';
-import { SearchStrategiesRegister } from '../search_strategies/search_strategies_register';
 import { getEsQueryConfig } from './helpers/get_es_query_uisettings';
 import { getIndexPatternObject } from './helpers/get_index_pattern';
 
 export async function getTableData(req, panel) {
   const panelIndexPattern = panel.index_pattern;
-  const { searchStrategy, capabilities } = await SearchStrategiesRegister.getViableStrategy(
-    req,
-    panelIndexPattern
-  );
+
+  const {
+    searchStrategy,
+    capabilities,
+  } = await req.framework.searchStrategyRegistry.getViableStrategy(req, panelIndexPattern);
   const searchRequest = searchStrategy.getSearchRequest(req);
   const esQueryConfig = await getEsQueryConfig(req);
   const { indexPatternObject } = await getIndexPatternObject(req, panelIndexPattern);
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/handle_error_response.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/__snapshots__/bucket_transform.test.js.snap
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/calculate_auto.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/format_key.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_active_series.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_agg_value.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js
similarity index 97%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js
index de23b90b21d6c..3ec5454fcee77 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.js
@@ -24,7 +24,7 @@ import {
   convertIntervalToUnit,
   ASCENDING_UNIT_ORDER,
 } from './unit_to_seconds';
-import { getTimerangeDuration } from '../helpers/get_timerange';
+import { getTimerangeDuration } from './get_timerange';
 import { INTERVAL_STRING_RE, GTE_INTERVAL_RE } from '../../../../common/interval_regexp';
 
 const calculateBucketData = (timeInterval, capabilities) => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_bucket_size.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_buckets_path.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_default_decoration.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_query_uisettings.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_es_shard_timeout.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_index_pattern.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_last_metric.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_sibling_agg_value.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_split_colors.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_splits.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/get_timerange_mode.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/map_bucket.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/moving_fn_scripts.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_interval.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/parse_settings.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/timestamp.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/unit_to_seconds.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/offset_time.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js
similarity index 94%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js
index 5a763ce35e35e..995790c590e42 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/date_histogram.js
@@ -18,7 +18,7 @@
  */
 
 import _ from 'lodash';
-import { dateHistogramInterval } from '../../../../../../data/server';
+import { dateHistogramInterval } from '../../../../../../../legacy/core_plugins/data/server';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { getTimerange } from '../../helpers/get_timerange';
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js
similarity index 97%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js
index d6514e3bc45d4..a4817dac9bd18 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/query.js
@@ -19,7 +19,7 @@
 
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { getTimerange } from '../../helpers/get_timerange';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function query(req, panel, annotation, esQueryConfig, indexPattern, capabilities) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/annotations/top_hits.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
index 3b55e2bf4c151..48da5ac19aa3a 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
@@ -18,7 +18,7 @@
  */
 
 import { set } from 'lodash';
-import { dateHistogramInterval } from '../../../../../../data/server';
+import { dateHistogramInterval } from '../../../../../../../legacy/core_plugins/data/server';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { offsetTime } from '../../offset_time';
 import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/filter_ratios.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/normalize_query.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js
index 53f894322a8e0..e5b81912f286e 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.js
@@ -19,7 +19,7 @@
 
 import { offsetTime } from '../../offset_time';
 import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function query(req, panel, series, esQueryConfig, indexPatternObject) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/query.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_everything.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js
similarity index 94%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js
index 1548c9e17c2e1..80b4ef70a3f08 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.js
@@ -18,7 +18,7 @@
  */
 
 import { set } from 'lodash';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function splitByFilter(req, panel, series, esQueryConfig, indexPattern) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filter.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js
similarity index 94%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js
index 4295bceed43cc..d023c28cdb25e 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.js
@@ -18,7 +18,7 @@
  */
 
 import { set } from 'lodash';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function splitByFilters(req, panel, series, esQueryConfig, indexPattern) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_filters.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/split_by_terms.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/calculate_agg_root.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
index 183785fab9be1..f33ce145aa230 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
@@ -18,7 +18,7 @@
  */
 
 import { set } from 'lodash';
-import { dateHistogramInterval } from '../../../../../../data/server';
+import { dateHistogramInterval } from '../../../../../../../legacy/core_plugins/data/server';
 import { getBucketSize } from '../../helpers/get_bucket_size';
 import { isLastValueTimerangeMode } from '../../helpers/get_timerange_mode';
 import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/filter_ratios.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/normalize_query.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/pivot.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js
similarity index 96%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js
index 9d46c212e05bd..d8d948e01cccd 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/query.js
@@ -18,7 +18,7 @@
  */
 import { getTimerange } from '../../helpers/get_timerange';
 import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function query(req, panel, esQueryConfig, indexPatternObject) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js
index 17f99ea431fd3..35036abed320f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_everything.js
@@ -18,7 +18,7 @@
  */
 
 import { set } from 'lodash';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function splitByEverything(req, panel, esQueryConfig, indexPattern) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js
index 042e4d98e2767..5b7ae735cd50f 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/split_by_terms.js
@@ -18,7 +18,7 @@
  */
 
 import { set } from 'lodash';
-import { esQuery } from '../../../../../../../../plugins/data/server';
+import { esQuery } from '../../../../../../data/server';
 
 export function splitByTerms(req, panel, esQueryConfig, indexPattern) {
   return next => doc => {
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/buckets.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/filter.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/annotations/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/_series_agg.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/drop_last_bucket.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/percentile_rank.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/series_agg.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_bands.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_deviation_sibling.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_metric.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/std_sibling.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/time_shift.test.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/_series_agg.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/drop_last_bucket.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/index.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/math.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/percentile_rank.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/series_agg.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_metric.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/table/std_sibling.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts
similarity index 95%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts
index 85e1f8f7eb12b..9d8f3fca789f0 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.ts
@@ -19,7 +19,7 @@
 
 import { buildProcessorFunction } from '../build_processor_function';
 // @ts-ignore
-import { processors } from '../request_processors/series';
+import { processors } from '../request_processors/series/index';
 
 /**
  * Builds series request body
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/get_request_params.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/series/handle_response_body.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/table/build_request_body.js
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js
rename to src/plugins/vis_type_timeseries/server/lib/vis_data/table/process_bucket.js
diff --git a/src/plugins/vis_type_timeseries/server/plugin.ts b/src/plugins/vis_type_timeseries/server/plugin.ts
index dcd0cd500bbc3..6ef6362c6e37b 100644
--- a/src/plugins/vis_type_timeseries/server/plugin.ts
+++ b/src/plugins/vis_type_timeseries/server/plugin.ts
@@ -24,19 +24,19 @@ import {
   Plugin,
   RequestHandlerContext,
   Logger,
+  IRouter,
+  FakeRequest,
 } from 'src/core/server';
 import { Observable } from 'rxjs';
 import { Server } from 'hapi';
-import { once } from 'lodash';
 import { VisTypeTimeseriesConfig } from '.';
-import {
-  init,
-  getVisData,
-  GetVisData,
-  GetVisDataOptions,
-} from '../../../legacy/core_plugins/vis_type_timeseries/server';
-import { ValidationTelemetryService } from './validation_telemetry/validation_telemetry_service';
+import { getVisData, GetVisData, GetVisDataOptions } from './lib/get_vis_data';
+import { ValidationTelemetryService } from './validation_telemetry';
 import { UsageCollectionSetup } from '../../usage_collection/server';
+import { visDataRoutes } from './routes/vis';
+// @ts-ignore
+import { fieldsRoutes } from './routes/fields';
+import { SearchStrategyRegistry } from './lib/search_strategies';
 
 export interface LegacySetup {
   server: Server;
@@ -47,15 +47,12 @@ interface VisTypeTimeseriesPluginSetupDependencies {
 }
 
 export interface VisTypeTimeseriesSetup {
-  /** @deprecated */
-  __legacy: {
-    config$: Observable<VisTypeTimeseriesConfig>;
-    registerLegacyAPI: (__LEGACY: LegacySetup) => void;
-  };
   getVisData: (
     requestContext: RequestHandlerContext,
+    fakeRequest: FakeRequest,
     options: GetVisDataOptions
   ) => ReturnType<GetVisData>;
+  addSearchStrategy: SearchStrategyRegistry['addStrategy'];
 }
 
 export interface Framework {
@@ -64,6 +61,8 @@ export interface Framework {
   config$: Observable<VisTypeTimeseriesConfig>;
   globalConfig$: PluginInitializerContext['config']['legacy']['globalConfig$'];
   logger: Logger;
+  router: IRouter;
+  searchStrategyRegistry: SearchStrategyRegistry;
 }
 
 export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
@@ -79,6 +78,9 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
     const config$ = this.initializerContext.config.create<VisTypeTimeseriesConfig>();
     // Global config contains things like the ES shard timeout
     const globalConfig$ = this.initializerContext.config.legacy.globalConfig$;
+    const router = core.http.createRouter();
+
+    const searchStrategyRegistry = new SearchStrategyRegistry();
 
     const framework: Framework = {
       core,
@@ -86,23 +88,29 @@ export class VisTypeTimeseriesPlugin implements Plugin<VisTypeTimeseriesSetup> {
       config$,
       globalConfig$,
       logger,
+      router,
+      searchStrategyRegistry,
     };
 
-    return {
-      __legacy: {
-        config$,
-        registerLegacyAPI: once(async (__LEGACY: LegacySetup) => {
-          const validationTelemetrySetup = await this.validationTelementryService.setup(core, {
-            ...plugins,
-            globalConfig$,
-          });
+    (async () => {
+      const validationTelemetry = await this.validationTelementryService.setup(core, {
+        ...plugins,
+        globalConfig$,
+      });
+      visDataRoutes(router, framework, validationTelemetry);
 
-          await init(framework, __LEGACY, validationTelemetrySetup);
-        }),
-      },
-      getVisData: async (requestContext: RequestHandlerContext, options: GetVisDataOptions) => {
-        return await getVisData(requestContext, options, framework);
+      fieldsRoutes(framework);
+    })();
+
+    return {
+      getVisData: async (
+        requestContext: RequestHandlerContext,
+        fakeRequest: FakeRequest,
+        options: GetVisDataOptions
+      ) => {
+        return await getVisData(requestContext, { ...fakeRequest, body: options }, framework);
       },
+      addSearchStrategy: searchStrategyRegistry.addStrategy.bind(searchStrategyRegistry),
     };
   }
 
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/fields.js b/src/plugins/vis_type_timeseries/server/routes/fields.ts
similarity index 54%
rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/fields.js
rename to src/plugins/vis_type_timeseries/server/routes/fields.ts
index d984868afb0b0..255c85c9eefa7 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/routes/fields.js
+++ b/src/plugins/vis_type_timeseries/server/routes/fields.ts
@@ -17,26 +17,35 @@
  * under the License.
  */
 
+import { isBoom } from 'boom';
+import { schema } from '@kbn/config-schema';
 import { getFields } from '../lib/get_fields';
-import { getIndexPatternService } from '../lib/get_index_pattern_service';
+import { Framework } from '../plugin';
 
-export const fieldsRoutes = server => {
-  server.route({
-    config: {
-      pre: [getIndexPatternService],
+export const fieldsRoutes = (framework: Framework) => {
+  framework.router.get(
+    {
+      path: '/api/metrics/fields',
+      validate: {
+        query: schema.object({ index: schema.string() }),
+      },
     },
-    path: '/api/metrics/fields',
-    method: 'GET',
-    handler: async req => {
+    async (context, req, res) => {
       try {
-        return await getFields(req);
+        return res.ok({ body: await getFields(context, req, framework, req.query.index) });
       } catch (err) {
-        if (err.isBoom && err.status === 401) {
-          return err;
+        if (isBoom(err) && err.output.statusCode === 401) {
+          return res.customError({
+            body: err.output.payload,
+            statusCode: err.output.statusCode,
+            headers: err.output.headers,
+          });
         }
 
-        return [];
+        return res.ok({
+          body: [],
+        });
       }
-    },
-  });
+    }
+  );
 };
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts b/src/plugins/vis_type_timeseries/server/routes/post_vis_schema.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/post_vis_schema.ts
rename to src/plugins/vis_type_timeseries/server/routes/post_vis_schema.ts
diff --git a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts b/src/plugins/vis_type_timeseries/server/routes/vis.ts
similarity index 85%
rename from src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts
rename to src/plugins/vis_type_timeseries/server/routes/vis.ts
index 32e87f5a3f666..e2d1e4d114ad5 100644
--- a/src/legacy/core_plugins/vis_type_timeseries/server/routes/vis.ts
+++ b/src/plugins/vis_type_timeseries/server/routes/vis.ts
@@ -17,14 +17,11 @@
  * under the License.
  */
 
-import { IRouter } from 'kibana/server';
+import { IRouter, KibanaRequest } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
-import { getVisData } from '../lib/get_vis_data';
+import { getVisData, GetVisDataOptions } from '../lib/get_vis_data';
 import { visPayloadSchema } from './post_vis_schema';
-import {
-  Framework,
-  ValidationTelemetryServiceSetup,
-} from '../../../../../plugins/vis_type_timeseries/server';
+import { Framework, ValidationTelemetryServiceSetup } from '../index';
 
 const escapeHatch = schema.object({}, { allowUnknowns: true });
 
@@ -52,7 +49,11 @@ export const visDataRoutes = (
         );
       }
       try {
-        const results = await getVisData(requestContext, request.body, framework);
+        const results = await getVisData(
+          requestContext,
+          request as KibanaRequest<{}, {}, GetVisDataOptions>,
+          framework
+        );
         return response.ok({ body: results });
       } catch (error) {
         return response.internalError({
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index 4409667d8390a..4b1aa774a523f 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -241,6 +241,7 @@ export class KibanaFramework {
 
   public async makeTSVBRequest(
     requestContext: RequestHandlerContext,
+    rawRequest: KibanaRequest,
     model: TSVBMetricModel,
     timerange: { min: number; max: number },
     filters: any[]
@@ -254,6 +255,6 @@ export class KibanaFramework {
       panels: [model],
       filters,
     };
-    return getVisData(requestContext, options);
+    return getVisData(requestContext, rawRequest, options);
   }
 }
diff --git a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
index eb5ac05644a22..5a5f9d0f8f529 100644
--- a/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
+++ b/x-pack/legacy/plugins/infra/server/lib/adapters/metrics/kibana_metrics_adapter.ts
@@ -51,7 +51,7 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
     }
 
     const requests = options.metrics.map(metricId =>
-      this.makeTSVBRequest(metricId, options, nodeField, requestContext)
+      this.makeTSVBRequest(metricId, options, nodeField, requestContext, rawRequest)
     );
 
     return Promise.all(requests)
@@ -93,7 +93,8 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
     metricId: InventoryMetric,
     options: InfraMetricsRequestOptions,
     nodeField: string,
-    requestContext: RequestHandlerContext
+    requestContext: RequestHandlerContext,
+    rawRequest: KibanaRequest
   ) {
     const createTSVBModel = get(metrics, ['tsvb', metricId]) as TSVBMetricModelCreator | undefined;
     if (!createTSVBModel) {
@@ -152,6 +153,6 @@ export class KibanaMetricsAdapter implements InfraMetricsAdapter {
       ? [{ match: { [model.map_field_to]: id } }]
       : [{ match: { [nodeField]: id } }];
 
-    return this.framework.makeTSVBRequest(requestContext, model, timerange, filters);
+    return this.framework.makeTSVBRequest(requestContext, rawRequest, model, timerange, filters);
   }
 }
diff --git a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
index 8ab3fdccbe72b..347feca67aa99 100644
--- a/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
+++ b/x-pack/legacy/plugins/infra/server/routes/metrics_explorer/lib/populate_series_with_tsvb_data.ts
@@ -76,7 +76,13 @@ export const populateSeriesWithTSVBData = (
   }
 
   // Get TSVB results using the model, timerange and filters
-  const tsvbResults = await framework.makeTSVBRequest(requestContext, model, timerange, filters);
+  const tsvbResults = await framework.makeTSVBRequest(
+    requestContext,
+    request,
+    model,
+    timerange,
+    filters
+  );
 
   // If there is no data `custom` will not exist.
   if (!tsvbResults.custom) {
diff --git a/x-pack/legacy/plugins/rollup/index.js b/x-pack/legacy/plugins/rollup/index.js
index a10407b19fa93..cace3bba1592b 100644
--- a/x-pack/legacy/plugins/rollup/index.js
+++ b/x-pack/legacy/plugins/rollup/index.js
@@ -60,7 +60,7 @@ export function rollup(kibana) {
         server.plugins.index_management.addIndexManagementDataEnricher(rollupDataEnricher);
       }
 
-      registerRollupSearchStrategy(this.kbnServer, server);
+      registerRollupSearchStrategy(this.kbnServer);
     },
   });
 }
diff --git a/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js b/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js
index 537c5cf45ad61..284151d404a47 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js
+++ b/x-pack/legacy/plugins/rollup/server/lib/call_with_request_factory/call_with_request_factory.js
@@ -8,10 +8,10 @@ import { once } from 'lodash';
 import { elasticsearchJsPlugin } from '../../client/elasticsearch_rollup';
 
 const callWithRequest = once(server => {
-  const config = { plugins: [elasticsearchJsPlugin] };
-  const cluster = server.plugins.elasticsearch.createCluster('rollup', config);
-
-  return cluster.callWithRequest;
+  const client = server.newPlatform.setup.core.elasticsearch.createClient('rollup', {
+    plugins: [elasticsearchJsPlugin],
+  });
+  return (request, ...args) => client.asScoped(request).callAsCurrentUser(...args);
 });
 
 export const callWithRequestFactory = (server, request) => {
diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js
index 5d732c8e7fbaa..fe65a7f1f30e9 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js
+++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.js
@@ -6,19 +6,19 @@
 import { getRollupSearchStrategy } from './rollup_search_strategy';
 import { getRollupSearchRequest } from './rollup_search_request';
 import { getRollupSearchCapabilities } from './rollup_search_capabilities';
+import {
+  AbstractSearchRequest,
+  DefaultSearchCapabilities,
+  AbstractSearchStrategy,
+} from '../../../../../../../src/plugins/vis_type_timeseries/server';
 
-export const registerRollupSearchStrategy = (kbnServer, server) =>
+export const registerRollupSearchStrategy = kbnServer =>
   kbnServer.afterPluginsInit(() => {
-    if (!server.plugins.metrics) {
+    if (!kbnServer.newPlatform.setup.plugins.metrics) {
       return;
     }
 
-    const {
-      addSearchStrategy,
-      AbstractSearchRequest,
-      AbstractSearchStrategy,
-      DefaultSearchCapabilities,
-    } = server.plugins.metrics;
+    const { addSearchStrategy } = kbnServer.newPlatform.setup.plugins.metrics;
 
     const RollupSearchRequest = getRollupSearchRequest(AbstractSearchRequest);
     const RollupSearchCapabilities = getRollupSearchCapabilities(DefaultSearchCapabilities);
@@ -28,5 +28,5 @@ export const registerRollupSearchStrategy = (kbnServer, server) =>
       RollupSearchCapabilities
     );
 
-    addSearchStrategy(new RollupSearchStrategy(server));
+    addSearchStrategy(new RollupSearchStrategy(kbnServer));
   });
diff --git a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js
index 5a1e4f27b1453..acd016d75f97e 100644
--- a/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js
+++ b/x-pack/legacy/plugins/rollup/server/lib/search_strategies/register_rollup_search_strategy.test.js
@@ -14,6 +14,9 @@ describe('Register Rollup Search Strategy', () => {
 
     kbnServer = {
       afterPluginsInit,
+      newPlatform: {
+        setup: { plugins: {} },
+      },
     };
 
     metrics = {
@@ -25,27 +28,22 @@ describe('Register Rollup Search Strategy', () => {
   });
 
   test('should run initialization on "afterPluginsInit" hook', () => {
-    registerRollupSearchStrategy(kbnServer, {
-      plugins: {},
-    });
+    registerRollupSearchStrategy(kbnServer);
 
     expect(kbnServer.afterPluginsInit).toHaveBeenCalled();
   });
 
   test('should run initialization if metrics plugin available', () => {
-    registerRollupSearchStrategy(kbnServer, {
-      plugins: {
-        metrics,
-      },
+    registerRollupSearchStrategy({
+      ...kbnServer,
+      newPlatform: { setup: { plugins: { metrics } } },
     });
 
     expect(metrics.addSearchStrategy).toHaveBeenCalled();
   });
 
   test('should not run initialization if metrics plugin unavailable', () => {
-    registerRollupSearchStrategy(kbnServer, {
-      plugins: {},
-    });
+    registerRollupSearchStrategy(kbnServer);
 
     expect(metrics.addSearchStrategy).not.toHaveBeenCalled();
   });

From b64c6db8545c10c31aff08b6e1b4efadf05a3dcd Mon Sep 17 00:00:00 2001
From: Jimmy Kuang <jimmy@elastic.co>
Date: Thu, 30 Jan 2020 09:16:49 -0800
Subject: [PATCH 05/23] [ILM] Index Lifecycle Policies show wrong unit in
 Kibana UI (#55228) (#55757)

* Added timing and byte size units to hot, cold, warm, and delete phase

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../components/hot_phase/hot_phase.js         | 63 +++++++++++++++++++
 .../edit_policy/components/min_age_input.js   | 58 +++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
index d57bf759ad721..475d26bb2e3c0 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/hot_phase/hot_phase.js
@@ -169,6 +169,30 @@ export class HotPhase extends PureComponent {
                             defaultMessage: 'megabytes',
                           }),
                         },
+                        {
+                          value: 'b',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.bytesLabel', {
+                            defaultMessage: 'bytes',
+                          }),
+                        },
+                        {
+                          value: 'kb',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.kilobytesLabel', {
+                            defaultMessage: 'kilobytes',
+                          }),
+                        },
+                        {
+                          value: 'tb',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.terabytesLabel', {
+                            defaultMessage: 'terabytes',
+                          }),
+                        },
+                        {
+                          value: 'pb',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.petabytesLabel', {
+                            defaultMessage: 'petabytes',
+                          }),
+                        },
                       ]}
                     />
                   </ErrableFormRow>
@@ -254,6 +278,45 @@ export class HotPhase extends PureComponent {
                             defaultMessage: 'hours',
                           }),
                         },
+                        {
+                          value: 'm',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.minutesLabel', {
+                            defaultMessage: 'minutes',
+                          }),
+                        },
+                        {
+                          value: 's',
+                          text: i18n.translate('xpack.indexLifecycleMgmt.hotPhase.secondsLabel', {
+                            defaultMessage: 'seconds',
+                          }),
+                        },
+                        {
+                          value: 'ms',
+                          text: i18n.translate(
+                            'xpack.indexLifecycleMgmt.hotPhase.millisecondsLabel',
+                            {
+                              defaultMessage: 'milliseconds',
+                            }
+                          ),
+                        },
+                        {
+                          value: 'micros',
+                          text: i18n.translate(
+                            'xpack.indexLifecycleMgmt.hotPhase.microsecondsLabel',
+                            {
+                              defaultMessage: 'microseconds',
+                            }
+                          ),
+                        },
+                        {
+                          value: 'nanos',
+                          text: i18n.translate(
+                            'xpack.indexLifecycleMgmt.hotPhase.nanosecondsLabel',
+                            {
+                              defaultMessage: 'nanoseconds',
+                            }
+                          ),
+                        },
                       ]}
                     />
                   </ErrableFormRow>
diff --git a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
index b4c9f4e958cd2..2300979851329 100644
--- a/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
+++ b/x-pack/legacy/plugins/index_lifecycle_management/public/sections/edit_policy/components/min_age_input.js
@@ -73,6 +73,11 @@ export const MinAgeInput = props => {
 
   let daysOptionLabel;
   let hoursOptionLabel;
+  let minutesOptionLabel;
+  let secondsOptionLabel;
+  let millisecondsOptionLabel;
+  let microsecondsOptionLabel;
+  let nanosecondsOptionLabel;
 
   if (rolloverEnabled) {
     daysOptionLabel = i18n.translate(
@@ -88,6 +93,39 @@ export const MinAgeInput = props => {
         defaultMessage: 'hours from rollover',
       }
     );
+    minutesOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverMinutesOptionLabel',
+      {
+        defaultMessage: 'minutes from rollover',
+      }
+    );
+
+    secondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverSecondsOptionLabel',
+      {
+        defaultMessage: 'seconds from rollover',
+      }
+    );
+    millisecondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverMilliSecondsOptionLabel',
+      {
+        defaultMessage: 'milliseconds from rollover',
+      }
+    );
+
+    microsecondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverMicroSecondsOptionLabel',
+      {
+        defaultMessage: 'microseconds from rollover',
+      }
+    );
+
+    nanosecondsOptionLabel = i18n.translate(
+      'xpack.indexLifecycleMgmt.editPolicy.rolloverNanoSecondsOptionLabel',
+      {
+        defaultMessage: 'nanoseconds from rollover',
+      }
+    );
   } else {
     daysOptionLabel = i18n.translate(
       'xpack.indexLifecycleMgmt.editPolicy.creationDaysOptionLabel',
@@ -150,6 +188,26 @@ export const MinAgeInput = props => {
                 value: 'h',
                 text: hoursOptionLabel,
               },
+              {
+                value: 'm',
+                text: minutesOptionLabel,
+              },
+              {
+                value: 's',
+                text: secondsOptionLabel,
+              },
+              {
+                value: 'ms',
+                text: millisecondsOptionLabel,
+              },
+              {
+                value: 'micros',
+                text: microsecondsOptionLabel,
+              },
+              {
+                value: 'nanos',
+                text: nanosecondsOptionLabel,
+              },
             ]}
           />
         </EuiFormRow>

From aa0b5a8e594ff213d5950c39aa9a32409d894cbb Mon Sep 17 00:00:00 2001
From: Maja Grubic <maja.grubic@elastic.co>
Date: Thu, 30 Jan 2020 17:24:33 +0000
Subject: [PATCH 06/23] [Filter Bar] Remove flickering when opening filter bar
 popover (#56222) (#56385)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 src/plugins/data/public/ui/filter_bar/filter_bar.tsx          | 1 +
 src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
index 2f1b1f8588eb9..2aaceddd68f0c 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_bar.tsx
@@ -96,6 +96,7 @@ function FilterBarUI(props: Props) {
           withTitle
           panelPaddingSize="none"
           ownFocus={true}
+          initialFocus=".filterEditor__hiddenItem"
         >
           <EuiFlexItem grow={false}>
             <div style={{ width: 400 }}>
diff --git a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
index b058d231b8306..b83c3a8e905dc 100644
--- a/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
+++ b/src/plugins/data/public/ui/filter_bar/filter_editor/index.tsx
@@ -95,6 +95,7 @@ class FilterEditorUI extends Component<Props, State> {
                 defaultMessage="Edit filter"
               />
             </EuiFlexItem>
+            <EuiFlexItem grow={false} className="filterEditor__hiddenItem" />
             <EuiFlexItem grow={false}>
               <EuiButtonEmpty size="xs" onClick={this.toggleCustomEditor}>
                 {this.state.isCustomEditorOpen ? (

From d547408a7289b66df8257c8b18e239b543427c9b Mon Sep 17 00:00:00 2001
From: Xavier Mouligneau <189600+XavierM@users.noreply.github.com>
Date: Thu, 30 Jan 2020 13:12:14 -0500
Subject: [PATCH 07/23] fix edit rule for detections (#56333) (#56405)

fix duplicates rules

allow no filter on detail rule
---
 .../components/link_to/redirect_to_detection_engine.tsx       | 4 +---
 .../siem/public/containers/detection_engine/rules/api.ts      | 2 ++
 .../rules/components/description_step/index.tsx               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx b/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx
index e4a6a799fdcf3..3701069389b72 100644
--- a/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/link_to/redirect_to_detection_engine.tsx
@@ -57,9 +57,7 @@ export const RedirectToEditRulePage = ({
   location: { search },
 }: DetectionEngineComponentProps) => {
   return (
-    <RedirectWrapper
-      to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/rule-details/${detailName}${search}/edit`}
-    />
+    <RedirectWrapper to={`/${DETECTION_ENGINE_PAGE_NAME}/rules/id/${detailName}/edit${search}`} />
   );
 };
 
diff --git a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
index 6b3578bacf24c..8f4abeb31c226 100644
--- a/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
+++ b/x-pack/legacy/plugins/siem/public/containers/detection_engine/rules/api.ts
@@ -217,6 +217,8 @@ export const duplicateRules = async ({ rules }: DuplicateRulesProps): Promise<Ru
           immutable: undefined,
           last_success_at: undefined,
           last_success_message: undefined,
+          last_failure_at: undefined,
+          last_failure_message: undefined,
           status: undefined,
           status_date: undefined,
         }))
diff --git a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
index 96c98a67b7662..687c9a94a76af 100644
--- a/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/detection_engine/rules/components/description_step/index.tsx
@@ -115,7 +115,7 @@ const getDescriptionItem = (
   indexPatterns?: IIndexPattern
 ): ListItems[] => {
   if (field === 'queryBar') {
-    const filters = addFilterStateIfNotThere(get('queryBar.filters', value));
+    const filters = addFilterStateIfNotThere(get('queryBar.filters', value) ?? []);
     const query = get('queryBar.query', value) as Query;
     const savedId = get('queryBar.saved_id', value);
     return buildQueryBarDescription({

From e2fc9582622bfbcec721cf67626d90aaad3cd74e Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Thu, 30 Jan 2020 19:20:53 +0100
Subject: [PATCH 08/23] [Uptime] Use dynamic index pattern in Uptime (#55446)
 (#56386)

* Using auto attribute field and fixed title

* added constant

* refactor index pattern state

* fixed type

* PR feedback

* resolve conflcits

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../filter_group/filter_group_container.tsx   | 93 +++++++++++++++++++
 .../public/components/connected/index.ts      |  3 +
 .../kuerybar/kuery_bar_container.tsx          | 21 +++++
 .../connected/pages/overview_container.ts     | 14 +++
 ...w_page_parsing_error_callout.test.tsx.snap | 10 ++
 .../functional/filter_group/filter_group.tsx  | 92 ++----------------
 .../functional/filter_group/index.ts          |  2 +-
 .../public/components/functional/index.ts     |  3 +-
 .../kuery_bar/{index.tsx => kuery_bar.tsx}    | 19 ++--
 .../overview_page_parsing_error_callout.tsx   |  1 +
 .../plugins/uptime/public/hooks/index.ts      |  2 +-
 .../public/hooks/update_kuery_string.ts       | 65 +++++++++++++
 .../uptime/public/hooks/use_index_pattern.ts  | 21 -----
 .../to_static_index_pattern.test.ts.snap      | 19 ----
 .../__tests__/to_static_index_pattern.test.ts | 19 ----
 .../helper/combine_filters_and_user_search.ts |  3 +
 .../plugins/uptime/public/lib/helper/index.ts |  1 -
 .../lib/helper/to_static_index_pattern.ts     | 11 ---
 .../plugins/uptime/public/pages/index.ts      |  2 +-
 .../plugins/uptime/public/pages/overview.tsx  | 81 ++++------------
 .../legacy/plugins/uptime/public/routes.tsx   |  2 +-
 .../uptime/public/state/actions/index.ts      |  1 +
 .../public/state/actions/index_patternts.ts   | 12 +++
 .../plugins/uptime/public/state/api/index.ts  |  1 +
 .../uptime/public/state/api/index_pattern.ts  | 21 +++++
 .../uptime/public/state/effects/index.ts      |  2 +
 .../public/state/effects/index_pattern.ts     | 17 ++++
 .../uptime/public/state/reducers/index.ts     |  2 +
 .../public/state/reducers/index_pattern.ts    | 41 ++++++++
 .../state/selectors/__tests__/index.test.ts   |  5 +
 .../uptime/public/state/selectors/index.ts    |  4 +
 .../lib/adapters/framework/adapter_types.ts   | 14 ---
 .../uptime/server/lib/adapters/index.ts       |  2 +-
 .../heartbeat_index_pattern.json              | 13 ---
 .../kibana_saved_objects_adapter.ts           | 25 -----
 .../lib/adapters/saved_objects/types.ts       | 11 ---
 .../index.ts                                  |  3 +-
 .../stub_index_pattern/stub_index_pattern.ts  | 54 +++++++++++
 .../uptime/server/lib/compose/kibana.ts       |  4 +-
 .../legacy/plugins/uptime/server/lib/lib.ts   |  4 +-
 .../index_pattern/get_index_pattern.ts        |  4 +-
 41 files changed, 420 insertions(+), 304 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/connected/filter_group/filter_group_container.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.ts
 rename x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/{index.tsx => kuery_bar.tsx} (91%)
 create mode 100644 x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/to_static_index_pattern.test.ts.snap
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/to_static_index_pattern.test.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/public/lib/helper/to_static_index_pattern.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/actions/index_patternts.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/api/index_pattern.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/effects/index_pattern.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/heartbeat_index_pattern.json
 delete mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
 delete mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts
 rename x-pack/legacy/plugins/uptime/server/lib/adapters/{saved_objects => stub_index_pattern}/index.ts (67%)
 create mode 100644 x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/stub_index_pattern.ts

diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/filter_group/filter_group_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/filter_group/filter_group_container.tsx
new file mode 100644
index 0000000000000..2d1c21d1c997d
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/filter_group/filter_group_container.tsx
@@ -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 React, { useEffect } from 'react';
+import { connect } from 'react-redux';
+import { useUrlParams } from '../../../hooks';
+import { parseFiltersMap } from '../../functional/filter_group/parse_filter_map';
+import { AppState } from '../../../state';
+import { fetchOverviewFilters, GetOverviewFiltersPayload } from '../../../state/actions';
+import { FilterGroupComponent } from '../../functional/filter_group';
+import { OverviewFilters } from '../../../../common/runtime_types/overview_filters';
+
+interface OwnProps {
+  esFilters?: string;
+}
+
+interface StoreProps {
+  esKuery: string;
+  lastRefresh: number;
+  loading: boolean;
+  overviewFilters: OverviewFilters;
+}
+
+interface DispatchProps {
+  loadFilterGroup: typeof fetchOverviewFilters;
+}
+
+type Props = OwnProps & StoreProps & DispatchProps;
+
+export const Container: React.FC<Props> = ({
+  esKuery,
+  esFilters,
+  loading,
+  loadFilterGroup,
+  overviewFilters,
+}: Props) => {
+  const [getUrlParams, updateUrl] = useUrlParams();
+
+  const { dateRangeStart, dateRangeEnd, statusFilter, filters: urlFilters } = getUrlParams();
+
+  useEffect(() => {
+    const filterSelections = parseFiltersMap(urlFilters);
+    loadFilterGroup({
+      dateRangeStart,
+      dateRangeEnd,
+      locations: filterSelections.locations ?? [],
+      ports: filterSelections.ports ?? [],
+      schemes: filterSelections.schemes ?? [],
+      search: esKuery,
+      statusFilter,
+      tags: filterSelections.tags ?? [],
+    });
+  }, [dateRangeStart, dateRangeEnd, esKuery, esFilters, statusFilter, urlFilters, loadFilterGroup]);
+
+  // update filters in the URL from filter group
+  const onFilterUpdate = (filtersKuery: string) => {
+    if (urlFilters !== filtersKuery) {
+      updateUrl({ filters: filtersKuery, pagination: '' });
+    }
+  };
+
+  return (
+    <FilterGroupComponent
+      currentFilter={urlFilters}
+      overviewFilters={overviewFilters}
+      loading={loading}
+      onFilterUpdate={onFilterUpdate}
+    />
+  );
+};
+
+const mapStateToProps = ({
+  overviewFilters: { loading, filters },
+  ui: { esKuery, lastRefresh },
+}: AppState): StoreProps => ({
+  esKuery,
+  overviewFilters: filters,
+  lastRefresh,
+  loading,
+});
+
+const mapDispatchToProps = (dispatch: any): DispatchProps => ({
+  loadFilterGroup: (payload: GetOverviewFiltersPayload) => dispatch(fetchOverviewFilters(payload)),
+});
+
+export const FilterGroup = connect<StoreProps, DispatchProps, OwnProps>(
+  // @ts-ignore connect is expecting null | undefined for some reason
+  mapStateToProps,
+  mapDispatchToProps
+)(Container);
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
index f9f6aa263ed27..5bb0d1ae8468f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
@@ -5,3 +5,6 @@
  */
 
 export { PingHistogram } from './charts/ping_histogram';
+export { KueryBar } from './kuerybar/kuery_bar_container';
+export { OverviewPage } from './pages/overview_container';
+export { FilterGroup } from './filter_group/filter_group_container';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx
new file mode 100644
index 0000000000000..d0f160b2c5540
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { connect } from 'react-redux';
+import { AppState } from '../../../state';
+import { selectIndexPattern } from '../../../state/selectors';
+import { getIndexPattern } from '../../../state/actions';
+import { KueryBarComponent } from '../../functional';
+
+const mapStateToProps = (state: AppState) => ({ indexPattern: selectIndexPattern(state) });
+
+const mapDispatchToProps = (dispatch: any) => ({
+  loadIndexPattern: () => {
+    dispatch(getIndexPattern({}));
+  },
+});
+
+export const KueryBar = connect(mapStateToProps, mapDispatchToProps)(KueryBarComponent);
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.ts b/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.ts
new file mode 100644
index 0000000000000..406fab8f5bf01
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { connect } from 'react-redux';
+import { OverviewPageComponent } from '../../../pages/overview';
+import { selectIndexPattern } from '../../../state/selectors';
+import { AppState } from '../../../state';
+
+const mapStateToProps = (state: AppState) => ({ indexPattern: selectIndexPattern(state) });
+
+export const OverviewPage = connect(mapStateToProps)(OverviewPageComponent);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/overview_page_parsing_error_callout.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/overview_page_parsing_error_callout.test.tsx.snap
index 4b9c169b3d9b3..653b739145f30 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/overview_page_parsing_error_callout.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/__tests__/__snapshots__/overview_page_parsing_error_callout.test.tsx.snap
@@ -4,6 +4,11 @@ exports[`OverviewPageParsingErrorCallout renders without errors when a valid err
 <EuiCallOut
   color="danger"
   iconType="alert"
+  style={
+    Object {
+      "width": "100%",
+    }
+  }
   title="Parsing error"
 >
   <p>
@@ -26,6 +31,11 @@ exports[`OverviewPageParsingErrorCallout renders without errors when an error wi
 <EuiCallOut
   color="danger"
   iconType="alert"
+  style={
+    Object {
+      "width": "100%",
+    }
+  }
   title="Parsing error"
 >
   <p>
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx
index 351302fb38356..ff73554c8f07c 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/filter_group.tsx
@@ -4,44 +4,21 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import React from 'react';
 import { EuiFilterGroup } from '@elastic/eui';
-import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
-import { connect } from 'react-redux';
 import { FilterPopoverProps, FilterPopover } from './filter_popover';
 import { FilterStatusButton } from './filter_status_button';
-import { OverviewFilters } from '../../../../common/runtime_types';
-import { fetchOverviewFilters, GetOverviewFiltersPayload } from '../../../state/actions';
-import { AppState } from '../../../state';
-import { useUrlParams } from '../../../hooks';
-import { parseFiltersMap } from './parse_filter_map';
+import { OverviewFilters } from '../../../../common/runtime_types/overview_filters';
 
-interface OwnProps {
-  currentFilter: any;
-  onFilterUpdate: any;
-  dateRangeStart: string;
-  dateRangeEnd: string;
-  filters?: string;
-  statusFilter?: string;
-}
-
-interface StoreProps {
-  esKuery: string;
-  lastRefresh: number;
+interface PresentationalComponentProps {
   loading: boolean;
   overviewFilters: OverviewFilters;
+  currentFilter: string;
+  onFilterUpdate: (filtersKuery: string) => void;
 }
 
-interface DispatchProps {
-  loadFilterGroup: typeof fetchOverviewFilters;
-}
-
-type Props = OwnProps & StoreProps & DispatchProps;
-
-type PresentationalComponentProps = Pick<StoreProps, 'overviewFilters' | 'loading'> &
-  Pick<OwnProps, 'currentFilter' | 'onFilterUpdate'>;
-
-export const PresentationalComponent: React.FC<PresentationalComponentProps> = ({
+export const FilterGroupComponent: React.FC<PresentationalComponentProps> = ({
   currentFilter,
   overviewFilters,
   loading,
@@ -151,60 +128,3 @@ export const PresentationalComponent: React.FC<PresentationalComponentProps> = (
     </EuiFilterGroup>
   );
 };
-
-export const Container: React.FC<Props> = ({
-  currentFilter,
-  esKuery,
-  filters,
-  loading,
-  loadFilterGroup,
-  dateRangeStart,
-  dateRangeEnd,
-  overviewFilters,
-  statusFilter,
-  onFilterUpdate,
-}: Props) => {
-  const [getUrlParams] = useUrlParams();
-  const { filters: urlFilters } = getUrlParams();
-  useEffect(() => {
-    const filterSelections = parseFiltersMap(urlFilters);
-    loadFilterGroup({
-      dateRangeStart,
-      dateRangeEnd,
-      locations: filterSelections.locations ?? [],
-      ports: filterSelections.ports ?? [],
-      schemes: filterSelections.schemes ?? [],
-      search: esKuery,
-      statusFilter,
-      tags: filterSelections.tags ?? [],
-    });
-  }, [dateRangeStart, dateRangeEnd, esKuery, filters, statusFilter, urlFilters, loadFilterGroup]);
-  return (
-    <PresentationalComponent
-      currentFilter={currentFilter}
-      overviewFilters={overviewFilters}
-      loading={loading}
-      onFilterUpdate={onFilterUpdate}
-    />
-  );
-};
-
-const mapStateToProps = ({
-  overviewFilters: { loading, filters },
-  ui: { esKuery, lastRefresh },
-}: AppState): StoreProps => ({
-  esKuery,
-  overviewFilters: filters,
-  lastRefresh,
-  loading,
-});
-
-const mapDispatchToProps = (dispatch: any): DispatchProps => ({
-  loadFilterGroup: (payload: GetOverviewFiltersPayload) => dispatch(fetchOverviewFilters(payload)),
-});
-
-export const FilterGroup = connect<StoreProps, DispatchProps, OwnProps>(
-  // @ts-ignore connect is expecting null | undefined for some reason
-  mapStateToProps,
-  mapDispatchToProps
-)(Container);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/index.ts
index 285972fb34eaa..2aae026144d8f 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/filter_group/index.ts
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { FilterGroup } from './filter_group';
+export { FilterGroupComponent } from './filter_group';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
index b9f0014322062..6af17cfd67c46 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
@@ -7,9 +7,8 @@
 export { DonutChart } from './charts/donut_chart';
 export { EmptyState } from './empty_state';
 export { MonitorStatusBar } from './monitor_status_details';
-export { FilterGroup } from './filter_group';
 export { IntegrationLink } from './integration_link';
-export { KueryBar } from './kuery_bar';
+export { KueryBarComponent } from './kuery_bar/kuery_bar';
 export { MonitorCharts } from './monitor_charts';
 export { MonitorList } from './monitor_list';
 export { OverviewPageParsingErrorCallout } from './overview_page_parsing_error_callout';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx
similarity index 91%
rename from x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
rename to x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx
index 679106f7e19b4..63c8885fe5864 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/index.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx
@@ -11,14 +11,12 @@ import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { Typeahead } from './typeahead';
 import { useUrlParams } from '../../../hooks';
-import { toStaticIndexPattern } from '../../../lib/helper';
 import {
   esKuery,
   IIndexPattern,
   autocomplete,
   DataPublicPluginStart,
 } from '../../../../../../../../src/plugins/data/public';
-import { useIndexPattern } from '../../../hooks';
 
 const Container = styled.div`
   margin-bottom: 10px;
@@ -36,20 +34,29 @@ function convertKueryToEsQuery(kuery: string, indexPattern: IIndexPattern) {
 
 interface Props {
   autocomplete: DataPublicPluginStart['autocomplete'];
+  loadIndexPattern: any;
+  indexPattern: any;
 }
 
-export function KueryBar({ autocomplete: autocompleteService }: Props) {
+export function KueryBarComponent({
+  autocomplete: autocompleteService,
+  loadIndexPattern,
+  indexPattern,
+}: Props) {
+  useEffect(() => {
+    if (!indexPattern) {
+      loadIndexPattern();
+    }
+  }, [indexPattern, loadIndexPattern]);
+
   const [state, setState] = useState<State>({
     suggestions: [],
     isLoadingIndexPattern: true,
   });
-  const [indexPattern, setIndexPattern] = useState<any | undefined>(undefined);
   const [isLoadingIndexPattern, setIsLoadingIndexPattern] = useState<boolean>(true);
   const [isLoadingSuggestions, setIsLoadingSuggestions] = useState<boolean>(false);
   let currentRequestCheck: string;
 
-  useIndexPattern((result: any) => setIndexPattern(toStaticIndexPattern(result)));
-
   useEffect(() => {
     if (indexPattern !== undefined) {
       setIsLoadingIndexPattern(false);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_parsing_error_callout.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_parsing_error_callout.tsx
index 3d38ce42dd1f0..b71a4f2f8646a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_parsing_error_callout.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/overview_page_parsing_error_callout.tsx
@@ -26,6 +26,7 @@ export const OverviewPageParsingErrorCallout = ({
     })}
     color="danger"
     iconType="alert"
+    style={{ width: '100%' }}
   >
     <p>
       <FormattedMessage
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/index.ts b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
index aa7bb0a220357..cfb8d71f783a6 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
@@ -5,5 +5,5 @@
  */
 
 export { useUrlParams } from './use_url_params';
-export { useIndexPattern } from './use_index_pattern';
 export * from './use_telemetry';
+export * from './update_kuery_string';
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts b/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
new file mode 100644
index 0000000000000..d02a6fc2afb5d
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { combineFiltersAndUserSearch, stringifyKueries } from '../lib/helper';
+import { esKuery } from '../../../../../../src/plugins/data/common/es_query';
+import { store } from '../state';
+import { setEsKueryString } from '../state/actions';
+import { IIndexPattern } from '../../../../../../src/plugins/data/common/index_patterns';
+
+const updateEsQueryForFilterGroup = (filterQueryString: string, indexPattern: IIndexPattern) => {
+  // Update EsQuery in Redux to be used in FilterGroup
+  const searchDSL: string = filterQueryString
+    ? JSON.stringify(
+        esKuery.toElasticsearchQuery(esKuery.fromKueryExpression(filterQueryString), indexPattern)
+      )
+    : '';
+  store.dispatch(setEsKueryString(searchDSL));
+};
+
+const getKueryString = (urlFilters: string): string => {
+  let kueryString = '';
+  // We are using try/catch here because this is user entered value
+  // and JSON.parse and stringifyKueries can have hard time parsing
+  // all possible scenarios, we can safely ignore if we can't parse them
+  try {
+    if (urlFilters !== '') {
+      const filterMap = new Map<string, Array<string | number>>(JSON.parse(urlFilters));
+      kueryString = stringifyKueries(filterMap);
+    }
+  } catch {
+    kueryString = '';
+  }
+  return kueryString;
+};
+
+export const useUpdateKueryString = (
+  indexPattern: IIndexPattern,
+  filterQueryString = '',
+  urlFilters: string
+): [string?, Error?] => {
+  const kueryString = getKueryString(urlFilters);
+
+  const combinedFilterString = combineFiltersAndUserSearch(filterQueryString, kueryString);
+
+  let esFilters: string | undefined;
+  // this try catch is necessary to evaluate user input in kuery bar,
+  // this error will be actually shown in UI for user to see
+  try {
+    if ((filterQueryString || urlFilters) && indexPattern) {
+      const ast = esKuery.fromKueryExpression(combinedFilterString);
+
+      const elasticsearchQuery = esKuery.toElasticsearchQuery(ast, indexPattern);
+
+      esFilters = JSON.stringify(elasticsearchQuery);
+
+      updateEsQueryForFilterGroup(filterQueryString, indexPattern);
+    }
+    return [esFilters];
+  } catch (err) {
+    return [urlFilters, err];
+  }
+};
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts b/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
deleted file mode 100644
index f2b586b27dba6..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/hooks/use_index_pattern.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { useEffect, Dispatch } from 'react';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-
-export const useIndexPattern = <T>(setIndexPattern: Dispatch<T>) => {
-  const core = useKibana();
-  useEffect(() => {
-    const fetch = core.services.http?.fetch;
-    async function getIndexPattern() {
-      if (!fetch) throw new Error('Http core services are not defined');
-      setIndexPattern(await fetch('/api/uptime/index_pattern', { method: 'GET' }));
-    }
-    getIndexPattern();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [core.services.http]);
-};
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/to_static_index_pattern.test.ts.snap b/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/to_static_index_pattern.test.ts.snap
deleted file mode 100644
index bc02e1054b6f7..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/__snapshots__/to_static_index_pattern.test.ts.snap
+++ /dev/null
@@ -1,19 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`toStaticIndexPattern provides the required fields 1`] = `
-Object {
-  "attributes": Object {
-    "fields": "[{\\"name\\":\\"@timestamp\\",\\"type\\":\\"date\\",\\"scripted\\":false,\\"searchable\\":true}]",
-  },
-  "fields": Array [
-    Object {
-      "name": "@timestamp",
-      "scripted": false,
-      "searchable": true,
-      "type": "date",
-    },
-  ],
-  "id": "foo",
-  "title": "foo",
-}
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/to_static_index_pattern.test.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/to_static_index_pattern.test.ts
deleted file mode 100644
index c8015a678c726..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/__tests__/to_static_index_pattern.test.ts
+++ /dev/null
@@ -1,19 +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 { toStaticIndexPattern } from '../to_static_index_pattern';
-
-describe('toStaticIndexPattern', () => {
-  it('provides the required fields', () => {
-    const pattern = {
-      attributes: {
-        fields: '[{"name":"@timestamp","type":"date","scripted":false,"searchable":true}]',
-      },
-      id: 'foo',
-    };
-    expect(toStaticIndexPattern(pattern)).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts
index f3dfbb7d3b529..45aff24f0449e 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/combine_filters_and_user_search.ts
@@ -5,6 +5,9 @@
  */
 
 export const combineFiltersAndUserSearch = (filters: string, search: string) => {
+  if (!filters && !search) {
+    return '';
+  }
   if (!filters) return search;
   if (!search) return filters;
   return `(${filters}) and (${search})`;
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/index.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/index.ts
index ced06ce7a1d7b..ef191ce32e532 100644
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/lib/helper/index.ts
@@ -12,5 +12,4 @@ export { getChartDateLabel } from './charts';
 export { parameterizeValues } from './parameterize_values';
 export { seriesHasDownValues } from './series_has_down_values';
 export { stringifyKueries } from './stringify_kueries';
-export { toStaticIndexPattern } from './to_static_index_pattern';
 export { UptimeUrlParams, getSupportedUrlParams } from './url_params';
diff --git a/x-pack/legacy/plugins/uptime/public/lib/helper/to_static_index_pattern.ts b/x-pack/legacy/plugins/uptime/public/lib/helper/to_static_index_pattern.ts
deleted file mode 100644
index b8a12c1e578e3..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/lib/helper/to_static_index_pattern.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-export const toStaticIndexPattern = (indexPattern: any) => ({
-  ...indexPattern,
-  fields: JSON.parse(indexPattern.attributes.fields),
-  title: indexPattern.id,
-});
diff --git a/x-pack/legacy/plugins/uptime/public/pages/index.ts b/x-pack/legacy/plugins/uptime/public/pages/index.ts
index a96be42eb0dee..17f083ca023ed 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/pages/index.ts
@@ -5,6 +5,6 @@
  */
 
 export { MonitorPage } from './monitor';
-export { OverviewPage } from './overview';
 export { NotFoundPage } from './not_found';
 export { PageHeader } from './page_header';
+export { OverviewPage } from '../components/connected/';
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index b9c2284edb0cf..0f6195c5f4c66 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -5,30 +5,28 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import React, { Fragment, useContext, useState } from 'react';
+import React, { useContext } from 'react';
 import styled from 'styled-components';
 import {
   EmptyState,
-  FilterGroup,
-  KueryBar,
   MonitorList,
   OverviewPageParsingErrorCallout,
   StatusPanel,
 } from '../components/functional';
 import { UMUpdateBreadcrumbs } from '../lib/lib';
-import { useIndexPattern, useUrlParams, useUptimeTelemetry, UptimePage } from '../hooks';
+import { useUrlParams, useUptimeTelemetry, UptimePage } from '../hooks';
 import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../infra/public';
-import { combineFiltersAndUserSearch, stringifyKueries, toStaticIndexPattern } from '../lib/helper';
-import { store } from '../state';
-import { setEsKueryString } from '../state/actions';
 import { PageHeader } from './page_header';
-import { esKuery, DataPublicPluginStart } from '../../../../../../src/plugins/data/public';
-import { UptimeThemeContext } from '../contexts/uptime_theme_context';
+import { DataPublicPluginStart, IIndexPattern } from '../../../../../../src/plugins/data/public';
+import { UptimeThemeContext } from '../contexts';
+import { FilterGroup, KueryBar } from '../components/connected';
+import { useUpdateKueryString } from '../hooks';
 
 interface OverviewPageProps {
   autocomplete: DataPublicPluginStart['autocomplete'];
   setBreadcrumbs: UMUpdateBreadcrumbs;
+  indexPattern: IIndexPattern;
 }
 
 type Props = OverviewPageProps;
@@ -42,72 +40,37 @@ const EuiFlexItemStyled = styled(EuiFlexItem)`
   }
 `;
 
-export const OverviewPage = ({ autocomplete, setBreadcrumbs }: Props) => {
+export const OverviewPageComponent = ({ autocomplete, setBreadcrumbs, indexPattern }: Props) => {
   const { colors } = useContext(UptimeThemeContext);
-  const [getUrlParams, updateUrl] = useUrlParams();
+  const [getUrlParams] = useUrlParams();
   const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
   const {
     dateRangeStart,
     dateRangeEnd,
-    search,
     pagination,
     statusFilter,
+    search,
     filters: urlFilters,
   } = params;
-  const [indexPattern, setIndexPattern] = useState<any>(undefined);
+
   useUptimeTelemetry(UptimePage.Overview);
-  useIndexPattern(setIndexPattern);
 
   useTrackPageview({ app: 'uptime', path: 'overview' });
   useTrackPageview({ app: 'uptime', path: 'overview', delay: 15000 });
 
-  let error: any;
-  let kueryString: string = '';
-  try {
-    if (urlFilters !== '') {
-      const filterMap = new Map<string, Array<string | number>>(JSON.parse(urlFilters));
-      kueryString = stringifyKueries(filterMap);
-    }
-  } catch {
-    kueryString = '';
-  }
-
-  const filterQueryString = search || '';
-  let filters: any | undefined;
-  try {
-    if (filterQueryString || urlFilters) {
-      if (indexPattern) {
-        const staticIndexPattern = toStaticIndexPattern(indexPattern);
-        const combinedFilterString = combineFiltersAndUserSearch(filterQueryString, kueryString);
-        const ast = esKuery.fromKueryExpression(combinedFilterString);
-        const elasticsearchQuery = esKuery.toElasticsearchQuery(ast, staticIndexPattern);
-        filters = JSON.stringify(elasticsearchQuery);
-        const searchDSL: string = filterQueryString
-          ? JSON.stringify(
-              esKuery.toElasticsearchQuery(
-                esKuery.fromKueryExpression(filterQueryString),
-                staticIndexPattern
-              )
-            )
-          : '';
-        store.dispatch(setEsKueryString(searchDSL));
-      }
-    }
-  } catch (e) {
-    error = e;
-  }
+  const [esFilters, error] = useUpdateKueryString(indexPattern, search, urlFilters);
 
   const sharedProps = {
     dateRangeStart,
     dateRangeEnd,
-    filters,
     statusFilter,
+    filters: esFilters,
   };
 
   const linkParameters = stringifyUrlParams(params, true);
 
   return (
-    <Fragment>
+    <>
       <PageHeader setBreadcrumbs={setBreadcrumbs} />
       <EmptyState implementsCustomErrorState={true} variables={{}}>
         <EuiFlexGroup gutterSize="xs" wrap responsive>
@@ -115,15 +78,7 @@ export const OverviewPage = ({ autocomplete, setBreadcrumbs }: Props) => {
             <KueryBar autocomplete={autocomplete} />
           </EuiFlexItem>
           <EuiFlexItemStyled grow={true}>
-            <FilterGroup
-              {...sharedProps}
-              currentFilter={urlFilters}
-              onFilterUpdate={(filtersKuery: string) => {
-                if (urlFilters !== filtersKuery) {
-                  updateUrl({ filters: filtersKuery, pagination: '' });
-                }
-              }}
-            />
+            <FilterGroup esFilters={esFilters} />
           </EuiFlexItemStyled>
           {error && <OverviewPageParsingErrorCallout error={error} />}
         </EuiFlexGroup>
@@ -133,7 +88,7 @@ export const OverviewPage = ({ autocomplete, setBreadcrumbs }: Props) => {
           absoluteDateRangeEnd={absoluteDateRangeEnd}
           dateRangeStart={dateRangeStart}
           dateRangeEnd={dateRangeEnd}
-          filters={filters}
+          filters={esFilters}
           statusFilter={statusFilter}
         />
         <EuiSpacer size="s" />
@@ -141,7 +96,7 @@ export const OverviewPage = ({ autocomplete, setBreadcrumbs }: Props) => {
           absoluteStartDate={absoluteDateRangeStart}
           absoluteEndDate={absoluteDateRangeEnd}
           dangerColor={colors.danger}
-          hasActiveFilters={!!filters}
+          hasActiveFilters={!!esFilters}
           implementsCustomErrorState={true}
           linkParameters={linkParameters}
           successColor={colors.success}
@@ -151,6 +106,6 @@ export const OverviewPage = ({ autocomplete, setBreadcrumbs }: Props) => {
           }}
         />
       </EmptyState>
-    </Fragment>
+    </>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/routes.tsx b/x-pack/legacy/plugins/uptime/public/routes.tsx
index 07bba5163922e..c318a82ab7f19 100644
--- a/x-pack/legacy/plugins/uptime/public/routes.tsx
+++ b/x-pack/legacy/plugins/uptime/public/routes.tsx
@@ -6,7 +6,7 @@
 
 import React, { FC } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import { MonitorPage, OverviewPage, NotFoundPage } from './pages';
+import { MonitorPage, NotFoundPage, OverviewPage } from './pages';
 import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
 import { UMUpdateBreadcrumbs } from './lib/lib';
 
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
index 6758006914ab8..df707584bd844 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
@@ -8,4 +8,5 @@ export * from './overview_filters';
 export * from './snapshot';
 export * from './ui';
 export * from './monitor_status';
+export * from './index_patternts';
 export * from './ping';
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index_patternts.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index_patternts.ts
new file mode 100644
index 0000000000000..f52dac805a199
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index_patternts.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createAction } from 'redux-actions';
+import { QueryParams } from './types';
+
+export const getIndexPattern = createAction('GET_INDEX_PATTERN');
+export const getIndexPatternSuccess = createAction<QueryParams>('GET_INDEX_PATTERN_SUCCESS');
+export const getIndexPatternFail = createAction<Error>('GET_INDEX_PATTERN_FAIL');
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index.ts b/x-pack/legacy/plugins/uptime/public/state/api/index.ts
index be79317dc97c2..2d20638832335 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/index.ts
@@ -8,4 +8,5 @@ export * from './monitor';
 export * from './overview_filters';
 export * from './snapshot';
 export * from './monitor_status';
+export * from './index_pattern';
 export * from './ping';
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index_pattern.ts b/x-pack/legacy/plugins/uptime/public/state/api/index_pattern.ts
new file mode 100644
index 0000000000000..2669376d728ab
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/index_pattern.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getApiPath } from '../../lib/helper';
+
+interface APIParams {
+  basePath: string;
+}
+
+export const fetchIndexPattern = async ({ basePath }: APIParams) => {
+  const url = getApiPath(`/api/uptime/index_pattern`, basePath);
+
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+  return await response.json();
+};
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
index 21d4f7a66ad67..f809454cefb39 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
@@ -9,6 +9,7 @@ import { fetchMonitorDetailsEffect } from './monitor';
 import { fetchOverviewFiltersEffect } from './overview_filters';
 import { fetchSnapshotCountEffect } from './snapshot';
 import { fetchMonitorStatusEffect } from './monitor_status';
+import { fetchIndexPatternEffect } from './index_pattern';
 import { fetchPingHistogramEffect } from './ping';
 
 export function* rootEffect() {
@@ -16,5 +17,6 @@ export function* rootEffect() {
   yield fork(fetchSnapshotCountEffect);
   yield fork(fetchOverviewFiltersEffect);
   yield fork(fetchMonitorStatusEffect);
+  yield fork(fetchIndexPatternEffect);
   yield fork(fetchPingHistogramEffect);
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index_pattern.ts b/x-pack/legacy/plugins/uptime/public/state/effects/index_pattern.ts
new file mode 100644
index 0000000000000..a6f9256d5ccd9
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index_pattern.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { takeLatest } from 'redux-saga/effects';
+import { getIndexPattern, getIndexPatternSuccess, getIndexPatternFail } from '../actions';
+import { fetchIndexPattern } from '../api';
+import { fetchEffectFactory } from './fetch_effect';
+
+export function* fetchIndexPatternEffect() {
+  yield takeLatest(
+    getIndexPattern,
+    fetchEffectFactory(fetchIndexPattern, getIndexPatternSuccess, getIndexPatternFail)
+  );
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
index c80ada4f63182..842cb1e937108 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
@@ -10,6 +10,7 @@ import { overviewFiltersReducer } from './overview_filters';
 import { snapshotReducer } from './snapshot';
 import { uiReducer } from './ui';
 import { monitorStatusReducer } from './monitor_status';
+import { indexPatternReducer } from './index_pattern';
 import { pingReducer } from './ping';
 
 export const rootReducer = combineReducers({
@@ -18,5 +19,6 @@ export const rootReducer = combineReducers({
   snapshot: snapshotReducer,
   ui: uiReducer,
   monitorStatus: monitorStatusReducer,
+  indexPattern: indexPatternReducer,
   ping: pingReducer,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
new file mode 100644
index 0000000000000..dff043f81b95c
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { handleActions, Action } from 'redux-actions';
+import { getIndexPattern, getIndexPatternSuccess, getIndexPatternFail } from '../actions';
+
+export interface IndexPatternState {
+  index_pattern: any;
+  errors: any[];
+  loading: boolean;
+}
+
+const initialState: IndexPatternState = {
+  index_pattern: null,
+  loading: false,
+  errors: [],
+};
+
+export const indexPatternReducer = handleActions<IndexPatternState>(
+  {
+    [String(getIndexPattern)]: state => ({
+      ...state,
+      loading: true,
+    }),
+
+    [String(getIndexPatternSuccess)]: (state, action: Action<any>) => ({
+      ...state,
+      loading: false,
+      index_pattern: { ...action.payload },
+    }),
+
+    [String(getIndexPatternFail)]: (state, action: Action<any>) => ({
+      ...state,
+      errors: [...state.errors, action.payload],
+      loading: false,
+    }),
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 5e3bf95d81292..2e27431a5ff14 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -45,6 +45,11 @@ describe('state selectors', () => {
       monitor: null,
       loading: false,
     },
+    indexPattern: {
+      index_pattern: null,
+      loading: false,
+      errors: [],
+    },
     ping: {
       pingHistogram: null,
       loading: false,
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 0066241dcc217..fe6a7a1b7eade 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -29,6 +29,10 @@ export const selectMonitorStatus = (state: AppState) => {
   return state.monitorStatus.status;
 };
 
+export const selectIndexPattern = ({ indexPattern }: AppState) => {
+  return indexPattern.index_pattern;
+};
+
 export const selectPingHistogram = ({ ping, ui }: AppState) => {
   return { data: ping.pingHistogram, loading: ping.loading, lastRefresh: ui.lastRefresh };
 };
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
index 2f72081a70988..fb2052bb4c87f 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/framework/adapter_types.ts
@@ -8,26 +8,12 @@ import { GraphQLSchema } from 'graphql';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 import {
   SavedObjectsLegacyService,
-  RequestHandler,
   IRouter,
   CallAPIOptions,
   SavedObjectsClientContract,
 } from 'src/core/server';
-import { ObjectType } from '@kbn/config-schema';
 import { UMKibanaRoute } from '../../../rest_api';
 
-export interface UMFrameworkRouteOptions<
-  P extends ObjectType,
-  Q extends ObjectType,
-  B extends ObjectType
-> {
-  path: string;
-  method: string;
-  handler: RequestHandler<P, Q, B>;
-  config?: any;
-  validate: any;
-}
-
 type APICaller = (
   endpoint: string,
   clientParams: Record<string, any>,
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 f5ff3b8c62ba9..fbef70f106dd8 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/index.ts
@@ -8,5 +8,5 @@ export * from './framework';
 export * from './monitor_states';
 export * from './monitors';
 export * from './pings';
-export * from './saved_objects';
+export * from './stub_index_pattern';
 export * from './telemetry';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/heartbeat_index_pattern.json b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/heartbeat_index_pattern.json
deleted file mode 100644
index 444c7510c6a6d..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/heartbeat_index_pattern.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "attributes": {
-    "fields": "[{\"name\":\"@timestamp\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent.ephemeral_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"agent.hostname\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"agent.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"agent.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"agent.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"agent.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.address\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.domain\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.mac\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.packets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.port\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.full_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"client.user.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.account.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.availability_zone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.image.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.instance.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.instance.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.machine.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.project.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.provider\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"cloud.region\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"container.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"container.image.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"container.image.tag\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"container.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"container.runtime\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.address\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.domain\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.mac\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.packets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.port\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.full_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"destination.user.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"ecs.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"error.code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"error.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"error.message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"error.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.action\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.category\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.created\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.dataset\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.duration\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.end\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.kind\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.module\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.original\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.outcome\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.risk_score\",\"type\":\"number\",\"esTypes\":[\"float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.risk_score_norm\",\"type\":\"number\",\"esTypes\":[\"float\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.severity\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.start\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.timezone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"event.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.ctime\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.device\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.extension\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.gid\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.group\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.inode\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.mode\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.mtime\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.owner\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.path\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.size\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.target_path\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"file.uid\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.architecture\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.containerized\",\"type\":\"boolean\",\"esTypes\":[\"boolean\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.hostname\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.mac\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.build\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.codename\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.family\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.full\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.kernel\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.platform\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.os.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.full_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host.user.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.request.body.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.request.body.content\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.request.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.request.method\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.request.referrer\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.response.body.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.response.body.content\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.response.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.response.status_code\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.rtt.content.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.rtt.response_header.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.rtt.total.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.rtt.validate.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.rtt.validate_body.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.rtt.write_request.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"http.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"icmp.requests\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"icmp.rtt.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.agent.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.agent.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.secured\",\"type\":\"boolean\",\"esTypes\":[\"boolean\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.server.product\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.server.vendor\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.server.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"jolokia.url\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.container.image\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.container.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.deployment.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.namespace\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.node.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.pod.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.pod.uid\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.replicaset.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"kubernetes.statefulset.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"log.level\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"log.original\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"text\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"monitor.check_group\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"monitor.duration.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"monitor.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"monitor.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"monitor.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"monitor.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.application\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.community_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.direction\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.forwarded_ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.iana_number\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.packets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.protocol\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.transport\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"network.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.hostname\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.mac\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.os.family\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.os.full\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.os.kernel\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.os.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.os.platform\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.os.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.serial_number\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.vendor\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"observer.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"organization.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"organization.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"os.family\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"os.full\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"os.kernel\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"os.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"os.platform\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"os.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.args\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.executable\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.pid\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.ppid\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.start\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.thread.id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.title\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"process.working_directory\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"related.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resolve.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"resolve.rtt.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.address\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.domain\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.mac\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.packets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.port\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.full_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"server.user.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"service.ephemeral_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"service.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"service.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"service.state\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"service.type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"service.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"socks5.rtt.connect.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.address\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.bytes\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.domain\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.country_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.region_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.geo.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.ip\",\"type\":\"ip\",\"esTypes\":[\"ip\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.mac\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.packets\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.port\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.full_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"source.user.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"summary.down\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"summary.up\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tags\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tcp.rtt.connect.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tcp.rtt.validate.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"timeseries.instance\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tls.certificate_not_valid_after\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tls.certificate_not_valid_before\",\"type\":\"date\",\"esTypes\":[\"date\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"tls.rtt.handshake.us\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.domain\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.fragment\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.full\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.original\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.password\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.path\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.port\",\"type\":\"number\",\"esTypes\":[\"long\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.query\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.scheme\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url.username\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.full_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.group.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.group.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.hash\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.device.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.original\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.os.family\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.os.full\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.os.kernel\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.os.name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.os.platform\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.os.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"user_agent.version\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
-    "timeFieldName": "@timestamp",
-    "title": "heartbeat-8*"
-  },
-  "id": "heartbeat-8*",
-  "migrationVersion": { "index-pattern": "6.5.0" },
-  "references": [],
-  "type": "index-pattern",
-  "updated_at": "2019-08-20T17:45:34.286Z",
-  "version": "1"
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
deleted file mode 100644
index 7628c5bac0660..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { UMSavedObjectsAdapter } from './types';
-import uptimeIndexPattern from './heartbeat_index_pattern.json';
-
-export const savedObjectsAdapter: UMSavedObjectsAdapter = {
-  getUptimeIndexPattern: async client => {
-    try {
-      return await client.get('index-pattern', uptimeIndexPattern.id);
-    } catch (error) {
-      return await client.create(
-        'index-pattern',
-        {
-          ...uptimeIndexPattern.attributes,
-          title: 'UptimeIndexPattern',
-        },
-        { id: uptimeIndexPattern.id, overwrite: false }
-      );
-    }
-  },
-};
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts
deleted file mode 100644
index 0fef1e1428e97..0000000000000
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { UMSavedObjectsQueryFn } from '../framework';
-
-export interface UMSavedObjectsAdapter {
-  getUptimeIndexPattern: UMSavedObjectsQueryFn;
-}
diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/index.ts
similarity index 67%
rename from x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts
rename to x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/index.ts
index bd86daba1bcb6..4ef6e3fa8a6bd 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/index.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { savedObjectsAdapter } from './kibana_saved_objects_adapter';
-export { UMSavedObjectsAdapter } from './types';
+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
new file mode 100644
index 0000000000000..49ec86af25040
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/stub_index_pattern/stub_index_pattern.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 cc11bf90da5f3..b44a890de3819 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/compose/kibana.ts
@@ -10,7 +10,7 @@ import { elasticsearchPingsAdapter } from '../adapters/pings';
 import { licenseCheck } from '../domains';
 import { UMDomainLibs, UMServerLibs } from '../lib';
 import { elasticsearchMonitorStatesAdapter } from '../adapters/monitor_states';
-import { savedObjectsAdapter } from '../adapters/saved_objects';
+import { stubIndexPatternAdapter } from '../adapters/stub_index_pattern';
 import { UptimeCorePlugins, UptimeCoreSetup } from '../adapters/framework';
 
 export function compose(server: UptimeCoreSetup, plugins: UptimeCorePlugins): UMServerLibs {
@@ -21,7 +21,7 @@ export function compose(server: UptimeCoreSetup, plugins: UptimeCorePlugins): UM
     monitors: elasticsearchMonitorsAdapter,
     monitorStates: elasticsearchMonitorStatesAdapter,
     pings: elasticsearchPingsAdapter,
-    savedObjects: savedObjectsAdapter,
+    stubIndexPattern: stubIndexPatternAdapter,
   };
 
   return {
diff --git a/x-pack/legacy/plugins/uptime/server/lib/lib.ts b/x-pack/legacy/plugins/uptime/server/lib/lib.ts
index da87c3ebfe301..e5ab9940d482d 100644
--- a/x-pack/legacy/plugins/uptime/server/lib/lib.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/lib.ts
@@ -9,7 +9,7 @@ import {
   UMMonitorsAdapter,
   UMMonitorStatesAdapter,
   UMPingsAdapter,
-  UMSavedObjectsAdapter,
+  StubIndexPatternAdapter,
 } from './adapters';
 import { UMLicenseCheck } from './domains';
 
@@ -18,7 +18,7 @@ export interface UMDomainLibs {
   monitors: UMMonitorsAdapter;
   monitorStates: UMMonitorStatesAdapter;
   pings: UMPingsAdapter;
-  savedObjects: UMSavedObjectsAdapter;
+  stubIndexPattern: StubIndexPatternAdapter;
 }
 
 export interface UMServerLibs extends UMDomainLibs {
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 f061307807a42..cee8eaf3f9cae 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
@@ -14,11 +14,11 @@ export const createGetIndexPatternRoute: UMRestApiRouteFactory = (libs: UMServer
   options: {
     tags: ['access:uptime'],
   },
-  handler: async ({ savedObjectsClient: client }, _context, _request, response): Promise<any> => {
+  handler: async ({ callES }, _context, _request, response): Promise<any> => {
     try {
       return response.ok({
         body: {
-          ...(await libs.savedObjects.getUptimeIndexPattern(client, undefined)),
+          ...(await libs.stubIndexPattern.getUptimeIndexPattern(callES)),
         },
       });
     } catch (e) {

From 107976d7caaecad22c0683f35a0eb360db051466 Mon Sep 17 00:00:00 2001
From: Jonathan Budzenski <jon@budzenski.me>
Date: Thu, 30 Jan 2020 13:55:17 -0600
Subject: [PATCH 09/23] Add missing docker settings (#56411)

Closes #54811
---
 .../resources/bin/kibana-docker               | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
index fb0b809f6ed26..d3e5ee364e024 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/kibana-docker
@@ -18,6 +18,11 @@ kibana_vars=(
     console.enabled
     console.proxyConfig
     console.proxyFilter
+    cpu.cgroup.path.override
+    cpuacct.cgroup.path.override
+    csp.rules
+    csp.strict
+    csp.warnLegacyBrowsers
     elasticsearch.customHeaders
     elasticsearch.hosts
     elasticsearch.logQueries
@@ -30,6 +35,7 @@ kibana_vars=(
     elasticsearch.sniffInterval
     elasticsearch.sniffOnConnectionFault
     elasticsearch.sniffOnStart
+    elasticsearch.ssl.alwaysPresentCertificate
     elasticsearch.ssl.certificate
     elasticsearch.ssl.certificateAuthorities
     elasticsearch.ssl.key
@@ -42,9 +48,13 @@ kibana_vars=(
     elasticsearch.startupTimeout
     elasticsearch.username
     i18n.locale
+    interpreter.enableInVisualize
+    kibana.autocompleteTerminateAfter
+    kibana.autocompleteTimeout
     kibana.defaultAppId
     kibana.index
     logging.dest
+    logging.json
     logging.quiet
     logging.rotate.enabled
     logging.rotate.everyBytes
@@ -55,18 +65,32 @@ kibana_vars=(
     logging.useUTC
     logging.verbose
     map.includeElasticMapsService
+    map.proxyElasticMapsServiceInMaps
+    map.regionmap
+    map.tilemap.options.attribution
+    map.tilemap.options.maxZoom
+    map.tilemap.options.minZoom
+    map.tilemap.options.subdomains
+    map.tilemap.url
+    newsfeed.enabled
     ops.interval
     path.data
     pid.file
     regionmap
     server.basePath
     server.customResponseHeaders
+    server.compression.enabled
+    server.compression.referrerWhitelist
+    server.cors
+    server.cors.origin
     server.defaultRoute
     server.host
+    server.keepAliveTimeout
     server.maxPayloadBytes
     server.name
     server.port
     server.rewriteBasePath
+    server.socketTimeout
     server.ssl.cert
     server.ssl.certificate
     server.ssl.certificateAuthorities
@@ -82,6 +106,7 @@ kibana_vars=(
     server.ssl.truststore.password
     server.ssl.redirectHttpFromPort
     server.ssl.supportedProtocols
+    server.xsrf.disableProtection
     server.xsrf.whitelist
     status.allowAnonymous
     status.v6ApiFormat
@@ -96,11 +121,13 @@ kibana_vars=(
     xpack.apm.serviceMapEnabled
     xpack.apm.ui.enabled
     xpack.apm.ui.maxTraceItems
+    xpack.apm.ui.transactionGroupBucketSize
     apm_oss.apmAgentConfigurationIndex
     apm_oss.indexPattern
     apm_oss.errorIndices
     apm_oss.onboardingIndices
     apm_oss.spanIndices
+    apm_oss.sourcemapIndices
     apm_oss.transactionIndices
     apm_oss.metricsIndices
     xpack.canvas.enabled
@@ -116,6 +143,8 @@ kibana_vars=(
     xpack.code.security.gitHostWhitelist
     xpack.code.security.gitProtocolWhitelist
     xpack.graph.enabled
+    xpack.graph.canEditDrillDownUrls
+    xpack.graph.savePolicy
     xpack.grokdebugger.enabled
     xpack.infra.enabled
     xpack.infra.query.partitionFactor
@@ -128,11 +157,14 @@ kibana_vars=(
     xpack.infra.sources.default.fields.timestamp
     xpack.infra.sources.default.logAlias
     xpack.infra.sources.default.metricAlias
+    xpack.license_management.enabled
     xpack.ml.enabled
+    xpack.monitoring.cluster_alerts.email_notifications.email_address
     xpack.monitoring.elasticsearch.password
     xpack.monitoring.elasticsearch.pingTimeout
     xpack.monitoring.elasticsearch.hosts
     xpack.monitoring.elasticsearch.username
+    xpack.monitoring.elasticsearch.logFetchCount
     xpack.monitoring.elasticsearch.ssl.certificateAuthorities
     xpack.monitoring.elasticsearch.ssl.verificationMode
     xpack.monitoring.enabled
@@ -166,6 +198,7 @@ kibana_vars=(
     xpack.reporting.csv.maxSizeBytes
     xpack.reporting.csv.scroll.duration
     xpack.reporting.csv.scroll.size
+    xpack.reporting.capture.maxAttempts
     xpack.reporting.enabled
     xpack.reporting.encryptionKey
     xpack.reporting.index
@@ -183,6 +216,8 @@ kibana_vars=(
     xpack.reporting.queue.pollIntervalErrorMultiplier
     xpack.reporting.queue.timeout
     xpack.reporting.roles.allow
+    xpack.rollup.enabled
+    xpack.security.audit.enabled
     xpack.searchprofiler.enabled
     xpack.security.authProviders
     xpack.security.authc.providers
@@ -201,7 +236,10 @@ kibana_vars=(
     xpack.security.public.protocol
     xpack.security.public.hostname
     xpack.security.public.port
+    telemetry.allowChangingOptInStatus
     telemetry.enabled
+    telemetry.optIn
+    telemetry.optInStatusUrl
     telemetry.sendUsageFrom
 )
 

From dec20a8fb013851635748facc263552046d78f42 Mon Sep 17 00:00:00 2001
From: Alison Goryachev <alison.goryachev@elastic.co>
Date: Thu, 30 Jan 2020 15:01:40 -0500
Subject: [PATCH 10/23] [7.x] System index templates can't be edited (#55229)
 (#56417)

---
 .../template_form/steps/step_logistics.tsx    |   3 +-
 .../template_form/template_form_schemas.tsx   | 124 +++++++++---------
 2 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx
index 290ade3504551..d2134837c15e5 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/steps/step_logistics.tsx
@@ -18,7 +18,7 @@ import {
 } from '../../../../../../../../../src/plugins/es_ui_shared/static/forms/components';
 import { documentationService } from '../../../services/documentation';
 import { StepProps } from '../types';
-import { schemas } from '../template_form_schemas';
+import { schemas, nameConfig, nameConfigWithoutValidations } from '../template_form_schemas';
 
 // Create or Form components with partial props that are common to all instances
 const UseField = getUseField({ component: Field });
@@ -131,6 +131,7 @@ export const StepLogistics: React.FunctionComponent<StepProps> = ({
             ['data-test-subj']: name.testSubject,
             euiFieldProps: { disabled: isEditing },
           }}
+          config={isEditing ? nameConfigWithoutValidations : nameConfig}
         />
       </FormRow>
       {/* Index patterns */}
diff --git a/x-pack/legacy/plugins/index_management/public/app/components/template_form/template_form_schemas.tsx b/x-pack/legacy/plugins/index_management/public/app/components/template_form/template_form_schemas.tsx
index 5f3e28ddffb8e..ed2616cc64e38 100644
--- a/x-pack/legacy/plugins/index_management/public/app/components/template_form/template_form_schemas.tsx
+++ b/x-pack/legacy/plugins/index_management/public/app/components/template_form/template_form_schemas.tsx
@@ -12,6 +12,7 @@ import {
   FormSchema,
   FIELD_TYPES,
   VALIDATION_TYPES,
+  FieldConfig,
 } from '../../../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib';
 
 import {
@@ -34,70 +35,71 @@ const {
 const { toInt } = fieldFormatters;
 const indexPatternInvalidCharacters = INVALID_INDEX_PATTERN_CHARS.join(' ');
 
-export const schemas: Record<string, FormSchema> = {
-  logistics: {
-    name: {
-      type: FIELD_TYPES.TEXT,
-      label: i18n.translate('xpack.idxMgmt.templateForm.stepLogistics.fieldNameLabel', {
-        defaultMessage: 'Name',
+export const nameConfig: FieldConfig = {
+  type: FIELD_TYPES.TEXT,
+  label: i18n.translate('xpack.idxMgmt.templateForm.stepLogistics.fieldNameLabel', {
+    defaultMessage: 'Name',
+  }),
+  validations: [
+    {
+      validator: emptyField(
+        i18n.translate('xpack.idxMgmt.templateValidation.templateNameRequiredError', {
+          defaultMessage: 'A template name is required.',
+        })
+      ),
+    },
+    {
+      validator: containsCharsField({
+        chars: ' ',
+        message: i18n.translate('xpack.idxMgmt.templateValidation.templateNameSpacesError', {
+          defaultMessage: 'Spaces are not allowed in a template name.',
+        }),
       }),
-      validations: [
-        {
-          validator: emptyField(
-            i18n.translate('xpack.idxMgmt.templateValidation.templateNameRequiredError', {
-              defaultMessage: 'A template name is required.',
-            })
-          ),
-        },
-        {
-          validator: containsCharsField({
-            chars: ' ',
-            message: i18n.translate('xpack.idxMgmt.templateValidation.templateNameSpacesError', {
-              defaultMessage: 'Spaces are not allowed in a template name.',
-            }),
-          }),
-        },
-        {
-          validator: startsWithField({
-            char: '_',
-            message: i18n.translate(
-              'xpack.idxMgmt.templateValidation.templateNameUnderscoreError',
-              {
-                defaultMessage: 'A template name must not start with an underscore.',
-              }
-            ),
-          }),
-        },
-        {
-          validator: startsWithField({
-            char: '.',
-            message: i18n.translate('xpack.idxMgmt.templateValidation.templateNamePeriodError', {
-              defaultMessage: 'A template name must not start with a period.',
-            }),
-          }),
-        },
-        {
-          validator: containsCharsField({
-            chars: INVALID_TEMPLATE_NAME_CHARS,
-            message: ({ charsFound }) =>
-              i18n.translate(
-                'xpack.idxMgmt.templateValidation.templateNameInvalidaCharacterError',
-                {
-                  defaultMessage: 'A template name must not contain the character "{invalidChar}"',
-                  values: { invalidChar: charsFound[0] },
-                }
-              ),
+    },
+    {
+      validator: startsWithField({
+        char: '_',
+        message: i18n.translate('xpack.idxMgmt.templateValidation.templateNameUnderscoreError', {
+          defaultMessage: 'A template name must not start with an underscore.',
+        }),
+      }),
+    },
+    {
+      validator: startsWithField({
+        char: '.',
+        message: i18n.translate('xpack.idxMgmt.templateValidation.templateNamePeriodError', {
+          defaultMessage: 'A template name must not start with a period.',
+        }),
+      }),
+    },
+    {
+      validator: containsCharsField({
+        chars: INVALID_TEMPLATE_NAME_CHARS,
+        message: ({ charsFound }) =>
+          i18n.translate('xpack.idxMgmt.templateValidation.templateNameInvalidaCharacterError', {
+            defaultMessage: 'A template name must not contain the character "{invalidChar}"',
+            values: { invalidChar: charsFound[0] },
           }),
-        },
-        {
-          validator: lowerCaseStringField(
-            i18n.translate('xpack.idxMgmt.templateValidation.templateNameLowerCaseRequiredError', {
-              defaultMessage: 'The template name must be in lowercase.',
-            })
-          ),
-        },
-      ],
+      }),
     },
+    {
+      validator: lowerCaseStringField(
+        i18n.translate('xpack.idxMgmt.templateValidation.templateNameLowerCaseRequiredError', {
+          defaultMessage: 'The template name must be in lowercase.',
+        })
+      ),
+    },
+  ],
+};
+
+export const nameConfigWithoutValidations: FieldConfig = {
+  ...nameConfig,
+  validations: [],
+};
+
+export const schemas: Record<string, FormSchema> = {
+  logistics: {
+    name: nameConfig,
     indexPatterns: {
       type: FIELD_TYPES.COMBO_BOX,
       defaultValue: [],

From 103095a07f4cd6db132783590571a80e92f5b628 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Thu, 30 Jan 2020 13:14:36 -0700
Subject: [PATCH 11/23] [skip-ci] Add example for migrating pre-handlers
 (#56080) (#56436)

---
 src/core/MIGRATION_EXAMPLES.md | 137 +++++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)

diff --git a/src/core/MIGRATION_EXAMPLES.md b/src/core/MIGRATION_EXAMPLES.md
index 568980f50117d..5517dfa7f9a23 100644
--- a/src/core/MIGRATION_EXAMPLES.md
+++ b/src/core/MIGRATION_EXAMPLES.md
@@ -14,6 +14,7 @@ APIs to their New Platform equivalents.
     - [3. New Platform shim using New Platform router](#3-new-platform-shim-using-new-platform-router)
       - [4. New Platform plugin](#4-new-platform-plugin)
     - [Accessing Services](#accessing-services)
+    - [Migrating Hapi "pre" handlers](#migrating-hapi-pre-handlers)
   - [Chrome](#chrome)
     - [Updating an application navlink](#updating-application-navlink)
   - [Chromeless Applications](#chromeless-applications)
@@ -450,6 +451,142 @@ class Plugin {
 }
 ```
 
+### Migrating Hapi "pre" handlers
+
+In the Legacy Platform, routes could provide a "pre" option in their config to
+register a function that should be run prior to the route handler. These
+"pre" handlers allow routes to share some business logic that may do some
+pre-work or validation. In Kibana, these are often used for license checks.
+
+The Kibana Platform's HTTP interface does not provide this functionality,
+however it is simple enough to port over using a higher-order function that can
+wrap the route handler.
+
+#### Simple example
+
+In this simple example, a pre-handler is used to either abort the request with
+an error or continue as normal. This is a simple "gate-keeping" pattern.
+
+```ts
+// Legacy pre-handler
+const licensePreRouting = (request) => {
+  const licenseInfo = getMyPluginLicenseInfo(request.server.plugins.xpack_main);
+  if (!licenseInfo.isOneOf(['gold', 'platinum', 'trial'])) {
+    throw Boom.forbidden(`You don't have the right license for MyPlugin!`);
+  }
+}
+
+server.route({
+  method: 'GET',
+  path: '/api/my-plugin/do-something',
+  config: {
+    pre: [{ method: licensePreRouting }]
+  },
+  handler: (req) => {
+    return doSomethingInteresting();
+  }
+})
+```
+
+In the Kibana Platform, the same functionality can be acheived by creating a
+function that takes a route handler (or factory for a route handler) as an
+argument and either invokes it in the successful case or returns an error
+response in the failure case.
+
+We'll call this a "high-order handler" similar to the "high-order component"
+pattern common in the React ecosystem.
+
+```ts
+// New Platform high-order handler
+const checkLicense = <P, Q, B>(
+  handler: RequestHandler<P, Q, B, RouteMethod>
+): RequestHandler<P, Q, B, RouteMethod> => {
+  return (context, req, res) => {
+    const licenseInfo = getMyPluginLicenseInfo(context.licensing.license);
+
+    if (licenseInfo.hasAtLeast('gold')) {
+      return handler(context, req, res);
+    } else {
+      return res.forbidden({ body: `You don't have the right license for MyPlugin!` });
+    }
+  }
+}
+
+router.get(
+  { path: '/api/my-plugin/do-something', validate: false },
+  checkLicense(async (context, req, res) => {
+    const results = doSomethingInteresting();
+    return res.ok({ body: results });
+  }),
+)
+```
+
+#### Full Example
+
+In some cases, the route handler may need access to data that the pre-handler
+retrieves. In this case, you can utilize a handler _factory_ rather than a raw
+handler.
+
+```ts
+// Legacy pre-handler
+const licensePreRouting = (request) => {
+  const licenseInfo = getMyPluginLicenseInfo(request.server.plugins.xpack_main);
+  if (licenseInfo.isOneOf(['gold', 'platinum', 'trial'])) {
+    // In this case, the return value of the pre-handler is made available on
+    // whatever the 'assign' option is in the route config.
+    return licenseInfo;
+  } else {
+    // In this case, the route handler is never called and the user gets this
+    // error message
+    throw Boom.forbidden(`You don't have the right license for MyPlugin!`);
+  }
+}
+
+server.route({
+  method: 'GET',
+  path: '/api/my-plugin/do-something',
+  config: {
+    pre: [{ method: licensePreRouting, assign: 'licenseInfo' }]
+  },
+  handler: (req) => {
+    const licenseInfo = req.pre.licenseInfo;
+    return doSomethingInteresting(licenseInfo);
+  }
+})
+```
+
+In many cases, it may be simpler to duplicate the function call
+to retrieve the data again in the main handler. In this other cases, you can
+utilize a handler _factory_ rather than a raw handler as the argument to your
+high-order handler. This way the high-order handler can pass arbitrary arguments
+to the route handler.
+
+```ts
+// New Platform high-order handler
+const checkLicense = <P, Q, B>(
+  handlerFactory: (licenseInfo: MyPluginLicenseInfo) => RequestHandler<P, Q, B, RouteMethod>
+): RequestHandler<P, Q, B, RouteMethod> => {
+  return (context, req, res) => {
+    const licenseInfo = getMyPluginLicenseInfo(context.licensing.license);
+
+    if (licenseInfo.hasAtLeast('gold')) {
+      const handler = handlerFactory(licenseInfo);
+      return handler(context, req, res);
+    } else {
+      return res.forbidden({ body: `You don't have the right license for MyPlugin!` });
+    }
+  }
+}
+
+router.get(
+  { path: '/api/my-plugin/do-something', validate: false },
+  checkLicense(licenseInfo => async (context, req, res) => {
+    const results = doSomethingInteresting(licenseInfo);
+    return res.ok({ body: results });
+  }),
+)
+```
+
 ## Chrome
 
 In the Legacy Platform, the `ui/chrome` import contained APIs for a very wide

From a519fa216f1c7cf58214cc9b5aac187b163ace3d Mon Sep 17 00:00:00 2001
From: Chris Roberson <chrisronline@gmail.com>
Date: Thu, 30 Jan 2020 15:24:41 -0500
Subject: [PATCH 12/23] [Monitoring] Change all configs to `monitoring.*`
 (#56215) (#56421)

* Revert "Revert "[Monitoring] Change all configs to `monitoring.*`" (#56214)"

This reverts commit bd08eb7efcd0df87581d91b6c69e270f4fe5670d.

* Fix missing config changes

* More fixes

* Doc changes

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 docs/settings/monitoring-settings.asciidoc    | 32 +++----
 .../config/deprecation/core_deprecations.ts   | 50 ++++++++++
 x-pack/legacy/plugins/monitoring/config.js    | 96 +++++++++----------
 .../legacy/plugins/monitoring/deprecations.js |  4 +-
 x-pack/legacy/plugins/monitoring/index.js     | 34 +++----
 .../flyout/__snapshots__/flyout.test.js.snap  |  8 +-
 ...isable_internal_collection_instructions.js |  4 +-
 .../cluster_alerts/alerts_cluster_search.js   |  2 +-
 .../verify_monitoring_license.js              |  2 +-
 .../es_client/__tests__/instantiate_client.js |  6 +-
 .../parse_elasticsearch_config.test.ts        |  4 +-
 .../es_client/parse_elasticsearch_config.ts   |  2 +-
 .../server/init_monitoring_xpack_info.js      |  2 +-
 .../server/kibana_monitoring/bulk_uploader.js |  2 +-
 .../__tests__/get_default_admin_email.js      | 14 +--
 .../collectors/get_settings_collector.js      |  4 +-
 .../collectors/ops_buffer/ops_buffer.js       |  2 +-
 .../server/kibana_monitoring/init.js          |  2 +-
 .../server/lib/__tests__/ccs_utils.js         |  8 +-
 .../monitoring/server/lib/apm/get_apms.js     |  2 +-
 .../server/lib/apm/get_apms_for_clusters.js   |  2 +-
 .../monitoring/server/lib/apm/get_stats.js    |  2 +-
 .../monitoring/server/lib/beats/get_beats.js  |  2 +-
 .../lib/beats/get_beats_for_clusters.js       |  2 +-
 .../server/lib/beats/get_latest_stats.js      |  2 +-
 .../monitoring/server/lib/beats/get_stats.js  |  2 +-
 .../monitoring/server/lib/ccs_utils.js        |  2 +-
 .../lib/cluster/get_clusters_from_request.js  |  2 +-
 .../server/lib/cluster/get_clusters_stats.js  |  2 +-
 .../lib/details/__test__/get_metrics.test.js  |  2 +-
 .../server/lib/details/get_metrics.js         |  2 +-
 .../server/lib/elasticsearch/get_ml_jobs.js   |  2 +-
 .../lib/elasticsearch/indices/get_indices.js  |  2 +-
 .../nodes/get_nodes/get_nodes.js              |  6 +-
 .../nodes/get_nodes/get_paginated_nodes.js    |  4 +-
 .../get_indices_unassigned_shard_stats.js     |  2 +-
 .../shards/get_nodes_shard_count.js           |  2 +-
 .../shards/get_shard_allocation.js            |  2 +-
 .../shards/get_shard_stat_aggs.js             |  2 +-
 .../server/lib/kibana/get_kibanas.js          |  2 +-
 .../lib/kibana/get_kibanas_for_clusters.js    |  2 +-
 .../monitoring/server/lib/logs/get_logs.js    |  2 +-
 .../lib/logstash/get_logstash_for_clusters.js |  6 +-
 .../server/lib/logstash/get_nodes.js          |  2 +-
 .../lib/logstash/get_paginated_pipelines.js   |  2 +-
 .../server/lib/logstash/get_pipeline.js       |  2 +-
 .../get_pipeline_stats_aggregation.js         |  2 +-
 .../lib/logstash/get_pipeline_versions.js     |  2 +-
 .../lib/logstash/get_pipeline_vertex.js       |  2 +-
 .../get_pipeline_vertex_stats_aggregation.js  |  2 +-
 .../plugins/monitoring/server/plugin.js       | 16 ++--
 .../server/routes/api/v1/elasticsearch/ccr.js |  2 +-
 .../api/v1/elasticsearch/node_detail.js       |  2 +-
 .../server/routes/api/v1/logstash/node.js     |  4 +-
 .../pipelines/cluster_pipeline_ids.js         |  2 +-
 .../telemetry_collection/get_cluster_uuids.ts |  2 +-
 .../telemetry_collection/get_es_stats.js      |  2 +-
 .../get_high_level_stats.js                   |  2 +-
 .../legacy/plugins/monitoring/ui_exports.js   |  2 +-
 59 files changed, 213 insertions(+), 171 deletions(-)

diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
index 8f445ff25218b..8586d26e9a07a 100644
--- a/docs/settings/monitoring-settings.asciidoc
+++ b/docs/settings/monitoring-settings.asciidoc
@@ -14,7 +14,7 @@ built-in `elastic` user has this role.
 
 You can adjust how monitoring data is
 collected from {kib} and displayed in {kib} by configuring settings in the
-`kibana.yml` file. There are also `xpack.monitoring.elasticsearch.*` settings,
+`kibana.yml` file. There are also `monitoring.ui.elasticsearch.*` settings,
 which support the same values as <<settings,{kib} configuration settings>>.
 
 To control how data is collected from your {es} nodes, you configure
@@ -31,20 +31,20 @@ For more information, see
 [[monitoring-general-settings]]
 ==== General monitoring settings
 
-`xpack.monitoring.enabled`::
+`monitoring.enabled`::
 Set to `true` (default) to enable the {monitor-features} in {kib}. Unlike the
-`xpack.monitoring.ui.enabled` setting, when this setting is `false`, the
+`monitoring.ui.enabled` setting, when this setting is `false`, the
 monitoring back-end does not run and {kib} stats are not sent to the monitoring
 cluster.
 
-`xpack.monitoring.elasticsearch.hosts`::
+`monitoring.ui.elasticsearch.hosts`::
 Specifies the location of the {es} cluster where your monitoring data is stored.
 By default, this is the same as `elasticsearch.hosts`. This setting enables
 you to use a single {kib} instance to search and visualize data in your
 production cluster as well as monitor data sent to a dedicated monitoring
 cluster.
 
-`xpack.monitoring.elasticsearch.username`::
+`monitoring.ui.elasticsearch.username`::
 Specifies the username used by {kib} monitoring to establish a persistent connection
 in {kib}  to the {es} monitoring cluster and to verify licensing status on the {es}
 monitoring cluster.
@@ -55,7 +55,7 @@ both the {es} monitoring cluster and the {es} production cluster.
 
 If not set, {kib} uses the value of the `elasticsearch.username` setting.
 
-`xpack.monitoring.elasticsearch.password`::
+`monitoring.ui.elasticsearch.password`::
 Specifies the password used by {kib} monitoring to establish a persistent connection
 in {kib}  to the {es} monitoring cluster and to verify licensing status on the {es}
 monitoring cluster.
@@ -66,7 +66,7 @@ both the {es} monitoring cluster and the {es} production cluster.
 
 If not set, {kib} uses the value of the `elasticsearch.password` setting.
 
-`xpack.monitoring.elasticsearch.pingTimeout`::
+`monitoring.ui.elasticsearch.pingTimeout`::
 Specifies the time in milliseconds to wait for {es} to respond to internal
 health checks. By default, it matches the `elasticsearch.pingTimeout` setting,
 which has a default value of `30000`.
@@ -77,11 +77,11 @@ which has a default value of `30000`.
 
 These settings control how data is collected from {kib}.
 
-`xpack.monitoring.kibana.collection.enabled`::
+`monitoring.kibana.collection.enabled`::
 Set to `true` (default) to enable data collection from the {kib} NodeJS server
 for {kib} Dashboards to be featured in the Monitoring.
 
-`xpack.monitoring.kibana.collection.interval`::
+`monitoring.kibana.collection.interval`::
 Specifies the number of milliseconds to wait in between data sampling on the
 {kib} NodeJS server for the metrics that are displayed in the {kib} dashboards.
 Defaults to `10000` (10 seconds).
@@ -96,24 +96,24 @@ However, the defaults work best in most circumstances. For more information
 about configuring {kib}, see
 {kibana-ref}/settings.html[Setting Kibana Server Properties].
 
-`xpack.monitoring.elasticsearch.logFetchCount`::
+`monitoring.ui.elasticsearch.logFetchCount`::
 Specifies the number of log entries to display in the Monitoring UI. Defaults to
 `10`. The maximum value is `50`.
 
-`xpack.monitoring.max_bucket_size`::
+`monitoring.ui.max_bucket_size`::
 Specifies the number of term buckets to return out of the overall terms list when
 performing terms aggregations to retrieve index and node metrics. For more
 information about the `size` parameter, see
 {ref}/search-aggregations-bucket-terms-aggregation.html#search-aggregations-bucket-terms-aggregation-size[Terms Aggregation].
 Defaults to `10000`.
 
-`xpack.monitoring.min_interval_seconds`::
+`monitoring.ui.min_interval_seconds`::
 Specifies the minimum number of seconds that a time bucket in a chart can
 represent. Defaults to 10. If you modify the
-`xpack.monitoring.collection.interval` in `elasticsearch.yml`, use the same
+`monitoring.ui.collection.interval` in `elasticsearch.yml`, use the same
 value in this setting.
 
-`xpack.monitoring.ui.enabled`::
+`monitoring.ui.enabled`::
 Set to `false` to hide the Monitoring UI in {kib}. The monitoring back-end
 continues to run as an agent for sending {kib} stats to the monitoring
 cluster. Defaults to `true`.
@@ -127,7 +127,7 @@ better decisions about your container performance, rather than guessing based on
 the overall machine performance. If you are not running your applications in a
 container, then Cgroup statistics are not useful.
 
-`xpack.monitoring.ui.container.elasticsearch.enabled`::
+`monitoring.ui.container.elasticsearch.enabled`::
 
 For {es} clusters that are running in containers, this setting changes the
 *Node Listing* to display the CPU utilization based on the reported Cgroup
@@ -135,7 +135,7 @@ statistics. It also adds the calculated Cgroup CPU utilization to the
 *Node Overview* page instead of the overall operating system's CPU
 utilization. Defaults to `false`.
 
-`xpack.monitoring.ui.container.logstash.enabled`::
+`monitoring.ui.container.logstash.enabled`::
 
 For {ls} nodes that are running in containers, this setting
 changes the {ls} *Node Listing* to display the CPU utilization
diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
index c63c9384da9d8..3aa7f9e2aa8ad 100644
--- a/src/core/server/config/deprecation/core_deprecations.ts
+++ b/src/core/server/config/deprecation/core_deprecations.ts
@@ -119,6 +119,56 @@ export const coreDeprecationProvider: ConfigDeprecationProvider = ({
   renameFromRoot('xpack.telemetry.config', 'telemetry.config'),
   renameFromRoot('xpack.telemetry.banner', 'telemetry.banner'),
   renameFromRoot('xpack.telemetry.url', 'telemetry.url'),
+  // Monitoring renames
+  // TODO: Remove these from here once the monitoring plugin is migrated to NP
+  renameFromRoot('xpack.monitoring.enabled', 'monitoring.enabled'),
+  renameFromRoot('xpack.monitoring.ui.enabled', 'monitoring.ui.enabled'),
+  renameFromRoot(
+    'xpack.monitoring.kibana.collection.enabled',
+    'monitoring.kibana.collection.enabled'
+  ),
+  renameFromRoot('xpack.monitoring.max_bucket_size', 'monitoring.ui.max_bucket_size'),
+  renameFromRoot('xpack.monitoring.min_interval_seconds', 'monitoring.ui.min_interval_seconds'),
+  renameFromRoot(
+    'xpack.monitoring.show_license_expiration',
+    'monitoring.ui.show_license_expiration'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.ui.container.elasticsearch.enabled',
+    'monitoring.ui.container.elasticsearch.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.ui.container.logstash.enabled',
+    'monitoring.ui.container.logstash.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.tests.cloud_detector.enabled',
+    'monitoring.tests.cloud_detector.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.kibana.collection.interval',
+    'monitoring.kibana.collection.interval'
+  ),
+  renameFromRoot('xpack.monitoring.elasticsearch.hosts', 'monitoring.ui.elasticsearch.hosts'),
+  renameFromRoot('xpack.monitoring.elasticsearch.username', 'monitoring.ui.elasticsearch.username'),
+  renameFromRoot('xpack.monitoring.elasticsearch.password', 'monitoring.ui.elasticsearch.password'),
+  renameFromRoot(
+    'xpack.monitoring.xpack_api_polling_frequency_millis',
+    'monitoring.xpack_api_polling_frequency_millis'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.cluster_alerts.email_notifications.enabled',
+    'monitoring.cluster_alerts.email_notifications.enabled'
+  ),
+  renameFromRoot(
+    'xpack.monitoring.cluster_alerts.email_notifications.email_address',
+    'monitoring.cluster_alerts.email_notifications.email_address'
+  ),
+  renameFromRoot('xpack.monitoring.ccs.enabled', 'monitoring.ui.ccs.enabled'),
+  renameFromRoot(
+    'xpack.monitoring.elasticsearch.logFetchCount',
+    'monitoring.ui.elasticsearch.logFetchCount'
+  ),
   configPathDeprecation,
   dataPathDeprecation,
   rewriteBasePathDeprecation,
diff --git a/x-pack/legacy/plugins/monitoring/config.js b/x-pack/legacy/plugins/monitoring/config.js
index 91c1ee99a0b2e..778b656c056f2 100644
--- a/x-pack/legacy/plugins/monitoring/config.js
+++ b/x-pack/legacy/plugins/monitoring/config.js
@@ -15,12 +15,12 @@ export const config = Joi => {
   const DEFAULT_REQUEST_HEADERS = ['authorization'];
 
   return Joi.object({
-    ccs: Joi.object({
-      enabled: Joi.boolean().default(true),
-    }).default(),
     enabled: Joi.boolean().default(true),
     ui: Joi.object({
       enabled: Joi.boolean().default(true),
+      ccs: Joi.object({
+        enabled: Joi.boolean().default(true),
+      }).default(),
       container: Joi.object({
         elasticsearch: Joi.object({
           enabled: Joi.boolean().default(false),
@@ -29,6 +29,51 @@ export const config = Joi => {
           enabled: Joi.boolean().default(false),
         }).default(),
       }).default(),
+      max_bucket_size: Joi.number().default(10000),
+      min_interval_seconds: Joi.number().default(10),
+      show_license_expiration: Joi.boolean().default(true),
+      elasticsearch: Joi.object({
+        customHeaders: Joi.object().default({}),
+        logQueries: Joi.boolean().default(false),
+        requestHeadersWhitelist: Joi.array()
+          .items()
+          .single()
+          .default(DEFAULT_REQUEST_HEADERS),
+        sniffOnStart: Joi.boolean().default(false),
+        sniffInterval: Joi.number()
+          .allow(false)
+          .default(false),
+        sniffOnConnectionFault: Joi.boolean().default(false),
+        hosts: Joi.array()
+          .items(Joi.string().uri({ scheme: ['http', 'https'] }))
+          .single(), // if empty, use Kibana's connection config
+        username: Joi.string(),
+        password: Joi.string(),
+        requestTimeout: Joi.number().default(30000),
+        pingTimeout: Joi.number().default(30000),
+        ssl: Joi.object({
+          verificationMode: Joi.string()
+            .valid('none', 'certificate', 'full')
+            .default('full'),
+          certificateAuthorities: Joi.array()
+            .single()
+            .items(Joi.string()),
+          certificate: Joi.string(),
+          key: Joi.string(),
+          keyPassphrase: Joi.string(),
+          keystore: Joi.object({
+            path: Joi.string(),
+            password: Joi.string(),
+          }).default(),
+          truststore: Joi.object({
+            path: Joi.string(),
+            password: Joi.string(),
+          }).default(),
+          alwaysPresentCertificate: Joi.boolean().default(false),
+        }).default(),
+        apiVersion: Joi.string().default('master'),
+        logFetchCount: Joi.number().default(10),
+      }).default(),
     }).default(),
     kibana: Joi.object({
       collection: Joi.object({
@@ -46,56 +91,11 @@ export const config = Joi => {
     xpack_api_polling_frequency_millis: Joi.number().default(
       XPACK_INFO_API_DEFAULT_POLL_FREQUENCY_IN_MILLIS
     ),
-    max_bucket_size: Joi.number().default(10000),
-    min_interval_seconds: Joi.number().default(10),
-    show_license_expiration: Joi.boolean().default(true),
     agent: Joi.object({
       interval: Joi.string()
         .regex(/[\d\.]+[yMwdhms]/)
         .default('10s'),
     }).default(),
-    elasticsearch: Joi.object({
-      customHeaders: Joi.object().default({}),
-      logQueries: Joi.boolean().default(false),
-      requestHeadersWhitelist: Joi.array()
-        .items()
-        .single()
-        .default(DEFAULT_REQUEST_HEADERS),
-      sniffOnStart: Joi.boolean().default(false),
-      sniffInterval: Joi.number()
-        .allow(false)
-        .default(false),
-      sniffOnConnectionFault: Joi.boolean().default(false),
-      hosts: Joi.array()
-        .items(Joi.string().uri({ scheme: ['http', 'https'] }))
-        .single(), // if empty, use Kibana's connection config
-      username: Joi.string(),
-      password: Joi.string(),
-      requestTimeout: Joi.number().default(30000),
-      pingTimeout: Joi.number().default(30000),
-      ssl: Joi.object({
-        verificationMode: Joi.string()
-          .valid('none', 'certificate', 'full')
-          .default('full'),
-        certificateAuthorities: Joi.array()
-          .single()
-          .items(Joi.string()),
-        certificate: Joi.string(),
-        key: Joi.string(),
-        keyPassphrase: Joi.string(),
-        keystore: Joi.object({
-          path: Joi.string(),
-          password: Joi.string(),
-        }).default(),
-        truststore: Joi.object({
-          path: Joi.string(),
-          password: Joi.string(),
-        }).default(),
-        alwaysPresentCertificate: Joi.boolean().default(false),
-      }).default(),
-      apiVersion: Joi.string().default('master'),
-      logFetchCount: Joi.number().default(10),
-    }).default(),
     tests: Joi.object({
       cloud_detector: Joi.object({
         enabled: Joi.boolean().default(true),
diff --git a/x-pack/legacy/plugins/monitoring/deprecations.js b/x-pack/legacy/plugins/monitoring/deprecations.js
index c3b2b70690f33..6e35e86dd9d71 100644
--- a/x-pack/legacy/plugins/monitoring/deprecations.js
+++ b/x-pack/legacy/plugins/monitoring/deprecations.js
@@ -28,7 +28,7 @@ export const deprecations = () => {
       }
     },
     (settings, log) => {
-      const fromPath = 'xpack.monitoring.elasticsearch';
+      const fromPath = 'monitoring.elasticsearch';
       const es = get(settings, 'elasticsearch');
       if (es) {
         if (es.username === 'elastic') {
@@ -39,7 +39,7 @@ export const deprecations = () => {
       }
     },
     (settings, log) => {
-      const fromPath = 'xpack.monitoring.elasticsearch.ssl';
+      const fromPath = 'monitoring.elasticsearch.ssl';
       const ssl = get(settings, 'elasticsearch.ssl');
       if (ssl) {
         if (ssl.key !== undefined && ssl.certificate === undefined) {
diff --git a/x-pack/legacy/plugins/monitoring/index.js b/x-pack/legacy/plugins/monitoring/index.js
index 37003ca058a63..8145d89b2db31 100644
--- a/x-pack/legacy/plugins/monitoring/index.js
+++ b/x-pack/legacy/plugins/monitoring/index.js
@@ -20,32 +20,32 @@ export const monitoring = kibana =>
   new kibana.Plugin({
     require: ['kibana', 'elasticsearch', 'xpack_main'],
     id: 'monitoring',
-    configPrefix: 'xpack.monitoring',
+    configPrefix: 'monitoring',
     publicDir: resolve(__dirname, 'public'),
     init(server) {
       const configs = [
-        'xpack.monitoring.ui.enabled',
-        'xpack.monitoring.kibana.collection.enabled',
-        'xpack.monitoring.max_bucket_size',
-        'xpack.monitoring.min_interval_seconds',
+        'monitoring.ui.enabled',
+        'monitoring.kibana.collection.enabled',
+        'monitoring.ui.max_bucket_size',
+        'monitoring.ui.min_interval_seconds',
         'kibana.index',
         'pkg.version',
-        'xpack.monitoring.show_license_expiration',
-        'xpack.monitoring.ui.container.elasticsearch.enabled',
-        'xpack.monitoring.ui.container.logstash.enabled',
-        'xpack.monitoring.tests.cloud_detector.enabled',
-        'xpack.monitoring.kibana.collection.interval',
-        'xpack.monitoring.elasticsearch.hosts',
-        'xpack.monitoring.elasticsearch',
-        'xpack.monitoring.xpack_api_polling_frequency_millis',
+        'monitoring.ui.show_license_expiration',
+        'monitoring.ui.container.elasticsearch.enabled',
+        'monitoring.ui.container.logstash.enabled',
+        'monitoring.tests.cloud_detector.enabled',
+        'monitoring.kibana.collection.interval',
+        'monitoring.ui.elasticsearch.hosts',
+        'monitoring.ui.elasticsearch',
+        'monitoring.xpack_api_polling_frequency_millis',
         'server.uuid',
         'server.name',
         'server.host',
         'server.port',
-        'xpack.monitoring.cluster_alerts.email_notifications.enabled',
-        'xpack.monitoring.cluster_alerts.email_notifications.email_address',
-        'xpack.monitoring.ccs.enabled',
-        'xpack.monitoring.elasticsearch.logFetchCount',
+        'monitoring.cluster_alerts.email_notifications.enabled',
+        'monitoring.cluster_alerts.email_notifications.email_address',
+        'monitoring.ui.ccs.enabled',
+        'monitoring.ui.elasticsearch.logFetchCount',
       ];
 
       const serverConfig = server.config();
diff --git a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap
index 7f48f3386b180..eb1c65c6a696d 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap
+++ b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/flyout/__snapshots__/flyout.test.js.snap
@@ -1174,7 +1174,7 @@ exports[`Flyout kibana part two should show instructions to disable internal col
               isCopyable={true}
               language="bash"
             >
-              xpack.monitoring.kibana.collection.enabled: false
+              monitoring.kibana.collection.enabled: false
             </EuiCodeBlock>
             <EuiSpacer
               size="s"
@@ -1187,7 +1187,7 @@ exports[`Flyout kibana part two should show instructions to disable internal col
                   values={
                     Object {
                       "config": <Monospace>
-                        xpack.monitoring.enabled
+                        monitoring.enabled
                       </Monospace>,
                       "defaultValue": <Monospace>
                         true
@@ -2091,7 +2091,7 @@ exports[`Flyout should show a restart warning for restarting the primary Kibana
               isCopyable={true}
               language="bash"
             >
-              xpack.monitoring.kibana.collection.enabled: false
+              monitoring.kibana.collection.enabled: false
             </EuiCodeBlock>
             <EuiSpacer
               size="s"
@@ -2104,7 +2104,7 @@ exports[`Flyout should show a restart warning for restarting the primary Kibana
                   values={
                     Object {
                       "config": <Monospace>
-                        xpack.monitoring.enabled
+                        monitoring.enabled
                       </Monospace>,
                       "defaultValue": <Monospace>
                         true
diff --git a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/disable_internal_collection_instructions.js b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/disable_internal_collection_instructions.js
index 9326156c1ac36..5f7f97b74e871 100644
--- a/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/disable_internal_collection_instructions.js
+++ b/x-pack/legacy/plugins/monitoring/public/components/metricbeat_migration/instruction_steps/kibana/disable_internal_collection_instructions.js
@@ -61,7 +61,7 @@ export function getKibanaInstructionsForDisablingInternalCollection(product, met
         </EuiText>
         <EuiSpacer size="s" />
         <EuiCodeBlock isCopyable language="bash">
-          xpack.monitoring.kibana.collection.enabled: false
+          monitoring.kibana.collection.enabled: false
         </EuiCodeBlock>
         <EuiSpacer size="s" />
         <EuiText>
@@ -70,7 +70,7 @@ export function getKibanaInstructionsForDisablingInternalCollection(product, met
               id="xpack.monitoring.metricbeatMigration.kibanaInstructions.disableInternalCollection.note"
               defaultMessage="For {config}, leave the default value of ({defaultValue})."
               values={{
-                config: <Monospace>xpack.monitoring.enabled</Monospace>,
+                config: <Monospace>monitoring.enabled</Monospace>,
                 defaultValue: <Monospace>true</Monospace>,
               }}
             />
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
index 0c9fb4bd04ee7..eff9875d794ad 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
+++ b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/alerts_cluster_search.js
@@ -157,7 +157,7 @@ export function alertsClusterSearch(req, alertsIndex, cluster, checkLicense, opt
 
   if (prodLicenseInfo.clusterAlerts.enabled) {
     const config = req.server.config();
-    const size = options.size || config.get('xpack.monitoring.max_bucket_size');
+    const size = options.size || config.get('monitoring.ui.max_bucket_size');
 
     const params = {
       index: alertsIndex,
diff --git a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
index 9cc67e11c28d5..e94f4e08fbdb1 100644
--- a/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
+++ b/x-pack/legacy/plugins/monitoring/server/cluster_alerts/verify_monitoring_license.js
@@ -19,7 +19,7 @@ export function verifyMonitoringLicense(server) {
   const config = server.config();
 
   // if cluster alerts are enabled, then ensure that we can use it according to the license
-  if (config.get('xpack.monitoring.cluster_alerts.enabled')) {
+  if (config.get('monitoring.cluster_alerts.enabled')) {
     const xpackInfo = get(server.plugins.monitoring, 'info');
     if (xpackInfo) {
       const monitoringCluster = xpackInfo.feature('monitoring').getLicenseCheckResults();
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js b/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
index 6844bd5febf8e..88cf9734d5f57 100644
--- a/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
+++ b/x-pack/legacy/plugins/monitoring/server/es_client/__tests__/instantiate_client.js
@@ -11,8 +11,8 @@ import { exposeClient, hasMonitoringCluster } from '../instantiate_client';
 
 function getMockServerFromConnectionUrl(monitoringClusterUrl) {
   const server = {
-    xpack: {
-      monitoring: {
+    monitoring: {
+      ui: {
         elasticsearch: {
           hosts: monitoringClusterUrl ? [monitoringClusterUrl] : [],
           username: 'monitoring-user-internal-test',
@@ -27,7 +27,7 @@ function getMockServerFromConnectionUrl(monitoringClusterUrl) {
   };
 
   return {
-    elasticsearchConfig: server.xpack.monitoring.elasticsearch,
+    elasticsearchConfig: server.monitoring.ui.elasticsearch,
     elasticsearchPlugin: {
       getCluster: sinon
         .stub()
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
index c6f4e0fa68504..8d9b5335732c0 100644
--- a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
+++ b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.test.ts
@@ -168,14 +168,14 @@ describe('throws when config is invalid', () => {
   it('throws if key and keystore.path are both specified', () => {
     const value = { ssl: { key: 'foo', keystore: { path: 'bar' } } };
     expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"[config validation of [xpack.monitoring.elasticsearch].ssl]: cannot use [key] when [keystore.path] is specified"`
+      `"[config validation of [monitoring.ui.elasticsearch].ssl]: cannot use [key] when [keystore.path] is specified"`
     );
   });
 
   it('throws if certificate and keystore.path are both specified', () => {
     const value = { ssl: { certificate: 'foo', keystore: { path: 'bar' } } };
     expect(() => parse(value)).toThrowErrorMatchingInlineSnapshot(
-      `"[config validation of [xpack.monitoring.elasticsearch].ssl]: cannot use [certificate] when [keystore.path] is specified"`
+      `"[config validation of [monitoring.ui.elasticsearch].ssl]: cannot use [certificate] when [keystore.path] is specified"`
     );
   });
 });
diff --git a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
index 70e6235602b5b..728b3433bf06c 100644
--- a/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
+++ b/x-pack/legacy/plugins/monitoring/server/es_client/parse_elasticsearch_config.ts
@@ -7,7 +7,7 @@
 import { readFileSync } from 'fs';
 import { readPkcs12Truststore, readPkcs12Keystore } from '../../../../../../src/core/utils';
 
-const KEY = 'xpack.monitoring.elasticsearch';
+const KEY = 'monitoring.ui.elasticsearch';
 
 /*
  * Parse a config object's Elasticsearch configuration, reading any
diff --git a/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js b/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
index b43430ead23b0..ba07f512de896 100644
--- a/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
+++ b/x-pack/legacy/plugins/monitoring/server/init_monitoring_xpack_info.js
@@ -15,7 +15,7 @@ export const initMonitoringXpackInfo = async ({ config, xpackMainPlugin, expose,
   const xpackInfo = hasMonitoringCluster(config)
     ? xpackMainPlugin.createXPackInfo({
         clusterSource: 'monitoring',
-        pollFrequencyInMillis: config.get('xpack.monitoring.xpack_api_polling_frequency_millis'),
+        pollFrequencyInMillis: config.get('monitoring.xpack_api_polling_frequency_millis'),
       })
     : xpackMainPlugin.info;
 
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
index 5e0d8aa4be1fd..cf68ec073bebc 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/bulk_uploader.js
@@ -24,7 +24,7 @@ const LOGGING_TAGS = [LOGGING_TAG, KIBANA_MONITORING_LOGGING_TAG];
  * NOTE: internal collection will be removed in 7.0
  *
  * Depends on
- *   - 'xpack.monitoring.kibana.collection.enabled' config
+ *   - 'monitoring.kibana.collection.enabled' config
  *   - monitoring enabled in ES (checked against xpack_main.info license info change)
  * The dependencies are handled upstream
  * - Ops Events - essentially Kibana's /api/status
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
index a88f69af2aefb..59fb2952196ab 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/__tests__/get_default_admin_email.js
@@ -21,14 +21,10 @@ describe('getSettingsCollector / getDefaultAdminEmail', () => {
   }) {
     const config = { get: sinon.stub() };
 
-    config.get
-      .withArgs('xpack.monitoring.cluster_alerts.email_notifications.enabled')
-      .returns(enabled);
+    config.get.withArgs('monitoring.cluster_alerts.email_notifications.enabled').returns(enabled);
 
     if (adminEmail) {
-      config.get
-        .withArgs(`xpack.monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`)
-        .returns(adminEmail);
+      config.get.withArgs(`monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`).returns(adminEmail);
     }
 
     config.get.withArgs('kibana.index').returns('.kibana');
@@ -74,7 +70,7 @@ describe('getSettingsCollector / getDefaultAdminEmail', () => {
       resetDeprecationWarning();
     });
 
-    describe('xpack.monitoring.cluster_alerts.email_notifications.enabled = false', () => {
+    describe('monitoring.cluster_alerts.email_notifications.enabled = false', () => {
       it('returns null', async () => {
         const { config, callCluster, log } = setup({ enabled: false });
         expect(await getDefaultAdminEmail(config, callCluster, log)).to.be(null);
@@ -131,12 +127,12 @@ describe('getSettingsCollector / getDefaultAdminEmail', () => {
     });
   });
 
-  describe('using xpack.monitoring.cluster_alerts.email_notifications.email_address', () => {
+  describe('using monitoring.cluster_alerts.email_notifications.email_address', () => {
     beforeEach(() => {
       resetDeprecationWarning();
     });
 
-    describe('xpack.monitoring.cluster_alerts.email_notifications.enabled = false', () => {
+    describe('monitoring.cluster_alerts.email_notifications.enabled = false', () => {
       it('returns null', async () => {
         const { config, callCluster, log } = setup({ enabled: false });
         expect(await getDefaultAdminEmail(config, callCluster, log)).to.be(null);
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
index 361de95653349..d04a4a1f669d9 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/get_settings_collector.js
@@ -19,11 +19,11 @@ export function resetDeprecationWarning() {
  * If so, use uiSettings API to fetch the X-Pack default admin email
  */
 export async function getDefaultAdminEmail(config, callCluster, log) {
-  if (!config.get('xpack.monitoring.cluster_alerts.email_notifications.enabled')) {
+  if (!config.get('monitoring.cluster_alerts.email_notifications.enabled')) {
     return null;
   }
 
-  const emailAddressConfigKey = `xpack.monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`;
+  const emailAddressConfigKey = `monitoring.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}`;
   const configuredEmailAddress = config.get(emailAddressConfigKey);
 
   if (configuredEmailAddress) {
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
index d58f6f3254c76..699a364433b3e 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/collectors/ops_buffer/ops_buffer.js
@@ -17,7 +17,7 @@ export function opsBuffer({ config, log, getOSInfo }) {
   // determine the cloud service in the background
   const cloudDetector = new CloudDetector();
 
-  if (config.get('xpack.monitoring.tests.cloud_detector.enabled')) {
+  if (config.get('monitoring.tests.cloud_detector.enabled')) {
     cloudDetector.detectCloudService();
   }
 
diff --git a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js
index bf79ddc210902..3c02e2be58dec 100644
--- a/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js
+++ b/x-pack/legacy/plugins/monitoring/server/kibana_monitoring/init.js
@@ -16,7 +16,7 @@ import { BulkUploader } from './bulk_uploader';
  * @param {Object} server HapiJS server instance
  */
 export function initBulkUploader({ config, ...params }) {
-  const interval = config.get('xpack.monitoring.kibana.collection.interval');
+  const interval = config.get('monitoring.kibana.collection.interval');
   return new BulkUploader({
     interval,
     config,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js b/x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js
index 844dfc96bb19b..2d310962238fd 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/__tests__/ccs_utils.js
@@ -17,7 +17,7 @@ describe('ccs_utils', () => {
       const get = sinon.stub();
       const config = { get };
 
-      get.withArgs('xpack.monitoring.ccs.enabled').returns(false);
+      get.withArgs('monitoring.ui.ccs.enabled').returns(false);
 
       // falsy string values should be ignored
       const allPattern = prefixIndexPattern(config, indexPattern, '*');
@@ -32,7 +32,7 @@ describe('ccs_utils', () => {
       const get = sinon.stub();
       const config = { get };
 
-      get.withArgs('xpack.monitoring.ccs.enabled').returns(true);
+      get.withArgs('monitoring.ui.ccs.enabled').returns(true);
 
       // falsy string values should be ignored
       const undefinedPattern = prefixIndexPattern(config, indexPattern);
@@ -49,7 +49,7 @@ describe('ccs_utils', () => {
       const get = sinon.stub();
       const config = { get };
 
-      get.withArgs('xpack.monitoring.ccs.enabled').returns(true);
+      get.withArgs('monitoring.ui.ccs.enabled').returns(true);
 
       const abcPattern = prefixIndexPattern(config, indexPattern, 'aBc');
       const underscorePattern = prefixIndexPattern(config, indexPattern, 'cluster_one');
@@ -67,7 +67,7 @@ describe('ccs_utils', () => {
       const get = sinon.stub();
       const config = { get };
 
-      get.withArgs('xpack.monitoring.ccs.enabled').returns(true);
+      get.withArgs('monitoring.ui.ccs.enabled').returns(true);
 
       const pattern = prefixIndexPattern(config, indexPattern, '*');
 
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms.js b/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms.js
index ef8db59620f1a..40070a6b0d0f2 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms.js
@@ -84,7 +84,7 @@ export async function getApms(req, apmIndexPattern, clusterUuid) {
 
   const params = {
     index: apmIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'), // FIXME
+    size: config.get('monitoring.ui.max_bucket_size'), // FIXME
     ignoreUnavailable: true,
     filterPath: [
       // only filter path can filter for inner_hits
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js b/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js
index 95ccb81f696be..a24936dc0f832 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/apm/get_apms_for_clusters.js
@@ -35,7 +35,7 @@ export function getApmsForClusters(req, apmIndexPattern, clusters) {
   const start = req.payload.timeRange.min;
   const end = req.payload.timeRange.max;
   const config = req.server.config();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
 
   return Promise.all(
     clusters.map(async cluster => {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_stats.js b/x-pack/legacy/plugins/monitoring/server/lib/apm/get_stats.js
index 54a0609d945de..bfaec4f8a1294 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/apm/get_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/apm/get_stats.js
@@ -28,7 +28,7 @@ export async function getStats(req, apmIndexPattern, clusterUuid) {
   const config = req.server.config();
   const start = moment.utc(req.payload.timeRange.min).valueOf();
   const end = moment.utc(req.payload.timeRange.max).valueOf();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
 
   const params = {
     index: apmIndexPattern,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats.js b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats.js
index 5857ec32b2259..ef878e4892557 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats.js
@@ -83,7 +83,7 @@ export async function getBeats(req, beatsIndexPattern, clusterUuid) {
 
   const params = {
     index: beatsIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'), // FIXME
+    size: config.get('monitoring.ui.max_bucket_size'), // FIXME
     ignoreUnavailable: true,
     filterPath: [
       // only filter path can filter for inner_hits
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js
index 82a738755931d..624abb894e508 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_beats_for_clusters.js
@@ -34,7 +34,7 @@ export function getBeatsForClusters(req, beatsIndexPattern, clusters) {
   const start = req.payload.timeRange.min;
   const end = req.payload.timeRange.max;
   const config = req.server.config();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
 
   return Promise.all(
     clusters.map(async cluster => {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_latest_stats.js b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_latest_stats.js
index d326c84634e12..1139489728dbf 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_latest_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_latest_stats.js
@@ -71,7 +71,7 @@ export function getLatestStats(req, beatsIndexPattern, clusterUuid) {
       uuids: {
         terms: {
           field: 'beats_stats.beat.uuid',
-          size: config.get('xpack.monitoring.max_bucket_size'),
+          size: config.get('monitoring.ui.max_bucket_size'),
         },
       },
     },
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_stats.js b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_stats.js
index 80851a8498c26..0f90750a293fb 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/beats/get_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/beats/get_stats.js
@@ -28,7 +28,7 @@ export async function getStats(req, beatsIndexPattern, clusterUuid) {
   const config = req.server.config();
   const start = moment.utc(req.payload.timeRange.min).valueOf();
   const end = moment.utc(req.payload.timeRange.max).valueOf();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
 
   const params = {
     index: beatsIndexPattern,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js b/x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js
index 5b3980d9619a8..3409462156a07 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/ccs_utils.js
@@ -16,7 +16,7 @@
  * @return {String} The index pattern with the {@code cluster} prefix appropriately prepended.
  */
 export function prefixIndexPattern(config, indexPattern, ccs) {
-  const ccsEnabled = config.get('xpack.monitoring.ccs.enabled');
+  const ccsEnabled = config.get('monitoring.ui.ccs.enabled');
 
   if (!ccsEnabled || !ccs) {
     return indexPattern;
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
index d3456eeb2fe4e..2b080a5c333fc 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
@@ -55,7 +55,7 @@ export async function getClustersFromRequest(
   } = indexPatterns;
 
   const config = req.server.config();
-  const size = config.get('xpack.monitoring.max_bucket_size');
+  const size = config.get('monitoring.ui.max_bucket_size');
   const isStandaloneCluster = clusterUuid === STANDALONE_CLUSTER_CLUSTER_UUID;
 
   let clusters = [];
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_stats.js b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
index c323cb381aaf2..54dc58a374c2c 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/cluster/get_clusters_stats.js
@@ -46,7 +46,7 @@ function fetchClusterStats(req, esIndexPattern, clusterUuid) {
   const metric = ElasticsearchMetric.getMetricFields();
   const params = {
     index: esIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     ignoreUnavailable: true,
     filterPath: [
       'hits.hits._index',
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js b/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js
index b7c387e74ec96..fbe6c8ec4cfa3 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/details/__test__/get_metrics.test.js
@@ -20,7 +20,7 @@ function getMockReq(metricsBuckets = []) {
     get: sinon.stub(),
   };
 
-  config.get.withArgs('xpack.monitoring.min_interval_seconds').returns(10);
+  config.get.withArgs('monitoring.ui.min_interval_seconds').returns(10);
 
   return {
     server: {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js b/x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js
index 798a94abbe484..0c4736e91ea10 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/details/get_metrics.js
@@ -28,7 +28,7 @@ export async function getMetrics(
   // TODO: Pass in req parameters as explicit function parameters
   let min = moment.utc(req.payload.timeRange.min).valueOf();
   const max = moment.utc(req.payload.timeRange.max).valueOf();
-  const minIntervalSeconds = config.get('xpack.monitoring.min_interval_seconds');
+  const minIntervalSeconds = config.get('monitoring.ui.min_interval_seconds');
   const bucketSize = calculateTimeseriesInterval(min, max, minIntervalSeconds);
   const timezone = await getTimezone(req);
 
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
index 658ee96c1f084..8aef402f881e8 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/get_ml_jobs.js
@@ -23,7 +23,7 @@ export function getMlJobs(req, esIndexPattern) {
   checkParam(esIndexPattern, 'esIndexPattern in getMlJobs');
 
   const config = req.server.config();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
   const start = req.payload.timeRange.min; // no wrapping in moment :)
   const end = req.payload.timeRange.max;
   const clusterUuid = req.params.clusterUuid;
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
index 6fe8ccfd89043..938a9b9d55e43 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/indices/get_indices.js
@@ -97,7 +97,7 @@ export function getIndices(req, esIndexPattern, showSystemIndices = false, shard
   const params = {
     index: esIndexPattern,
     // TODO: composite aggregation
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     ignoreUnavailable: true,
     filterPath: [
       // only filter path can filter for inner_hits
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js
index 7581a32590971..c248ad743e0ec 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_nodes.js
@@ -44,7 +44,7 @@ export async function getNodes(req, esIndexPattern, pageOfNodes, clusterStats, n
   const min = start;
 
   const bucketSize = Math.max(
-    config.get('xpack.monitoring.min_interval_seconds'),
+    config.get('monitoring.ui.min_interval_seconds'),
     calculateAuto(100, duration).asSeconds()
   );
 
@@ -59,7 +59,7 @@ export async function getNodes(req, esIndexPattern, pageOfNodes, clusterStats, n
 
   const params = {
     index: esIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     ignoreUnavailable: true,
     body: {
       query: createQuery({
@@ -78,7 +78,7 @@ export async function getNodes(req, esIndexPattern, pageOfNodes, clusterStats, n
           terms: {
             field: `source_node.uuid`,
             include: uuidsToInclude,
-            size: config.get('xpack.monitoring.max_bucket_size'),
+            size: config.get('monitoring.ui.max_bucket_size'),
           },
           aggs: {
             by_date: {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js
index 51c61046e9cda..e18d328e8725b 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/nodes/get_nodes/get_paginated_nodes.js
@@ -38,7 +38,7 @@ export async function getPaginatedNodes(
   { clusterStats, nodesShardCount }
 ) {
   const config = req.server.config();
-  const size = config.get('xpack.monitoring.max_bucket_size');
+  const size = config.get('monitoring.ui.max_bucket_size');
   const nodes = await getNodeIds(req, esIndexPattern, { clusterUuid }, size);
 
   // Add `isOnline` and shards from the cluster state and shard stats
@@ -63,7 +63,7 @@ export async function getPaginatedNodes(
   const groupBy = {
     field: `source_node.uuid`,
     include: nodes.map(node => node.uuid),
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
   };
   const metricSeriesData = await getMetrics(
     req,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js
index e8d484e7021f4..c77bcc4f62e61 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_indices_unassigned_shard_stats.js
@@ -12,7 +12,7 @@ import { calculateIndicesTotals } from './calculate_shard_stat_indices_totals';
 
 async function getUnassignedShardData(req, esIndexPattern, cluster) {
   const config = req.server.config();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
   const metric = ElasticsearchMetric.getMetricFields();
 
   const params = {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js
index c11bd4aead693..7823884dc749d 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_nodes_shard_count.js
@@ -11,7 +11,7 @@ import { ElasticsearchMetric } from '../../metrics';
 
 async function getShardCountPerNode(req, esIndexPattern, cluster) {
   const config = req.server.config();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
   const metric = ElasticsearchMetric.getMetricFields();
 
   const params = {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js
index 3be5650b7d3bc..40412c03b0ef9 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_allocation.js
@@ -55,7 +55,7 @@ export function getShardAllocation(
   const metric = ElasticsearchMetric.getMetricFields();
   const params = {
     index: esIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     ignoreUnavailable: true,
     body: {
       query: createQuery({ type: 'shards', clusterUuid, metric, filters }),
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js
index eddd50612cdb1..8c4834e5d5e40 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/elasticsearch/shards/get_shard_stat_aggs.js
@@ -9,7 +9,7 @@
  * @param {Boolean} includeNodes - whether to add the aggs for node shards
  */
 export function getShardAggs(config, includeNodes, includeIndices) {
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
   const aggSize = 10;
   const indicesAgg = {
     terms: {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas.js b/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas.js
index af6563bae682d..c272c38f00d55 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas.js
@@ -31,7 +31,7 @@ export function getKibanas(req, kbnIndexPattern, { clusterUuid }) {
 
   const params = {
     index: kbnIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     ignoreUnavailable: true,
     body: {
       query: createQuery({
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js b/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
index dbf1c41dcf4e5..e50e8bda3c907 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/kibana/get_kibanas_for_clusters.js
@@ -49,7 +49,7 @@ export function getKibanasForClusters(req, kbnIndexPattern, clusters) {
           kibana_uuids: {
             terms: {
               field: 'kibana_stats.kibana.uuid',
-              size: config.get('xpack.monitoring.max_bucket_size'),
+              size: config.get('monitoring.ui.max_bucket_size'),
             },
             aggs: {
               latest_report: {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logs/get_logs.js b/x-pack/legacy/plugins/monitoring/server/lib/logs/get_logs.js
index 7a20d7737c5e8..b876e3ba05d70 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logs/get_logs.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logs/get_logs.js
@@ -70,7 +70,7 @@ export async function getLogs(
 
   const params = {
     index: filebeatIndexPattern,
-    size: Math.min(50, config.get('xpack.monitoring.elasticsearch.logFetchCount')),
+    size: Math.min(50, config.get('monitoring.ui.elasticsearch.logFetchCount')),
     filterPath: [
       'hits.hits._source.message',
       'hits.hits._source.log.level',
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
index d0de2c3f5df3a..55baa3cf10b50 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_logstash_for_clusters.js
@@ -60,7 +60,7 @@ export function getLogstashForClusters(req, lsIndexPattern, clusters) {
           logstash_uuids: {
             terms: {
               field: 'logstash_stats.logstash.uuid',
-              size: config.get('xpack.monitoring.max_bucket_size'),
+              size: config.get('monitoring.ui.max_bucket_size'),
             },
             aggs: {
               latest_report: {
@@ -119,7 +119,7 @@ export function getLogstashForClusters(req, lsIndexPattern, clusters) {
           logstash_versions: {
             terms: {
               field: 'logstash_stats.logstash.version',
-              size: config.get('xpack.monitoring.max_bucket_size'),
+              size: config.get('monitoring.ui.max_bucket_size'),
             },
           },
           pipelines_nested: {
@@ -135,7 +135,7 @@ export function getLogstashForClusters(req, lsIndexPattern, clusters) {
               queue_types: {
                 terms: {
                   field: 'logstash_stats.pipelines.queue.type',
-                  size: config.get('xpack.monitoring.max_bucket_size'),
+                  size: config.get('monitoring.ui.max_bucket_size'),
                 },
                 aggs: {
                   num_pipelines: {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_nodes.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_nodes.js
index 93b70d7b79f0a..06696abdb031f 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_nodes.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_nodes.js
@@ -31,7 +31,7 @@ export function getNodes(req, lsIndexPattern, { clusterUuid }) {
 
   const params = {
     index: lsIndexPattern,
-    size: config.get('xpack.monitoring.max_bucket_size'), // FIXME
+    size: config.get('monitoring.ui.max_bucket_size'), // FIXME
     ignoreUnavailable: true,
     body: {
       query: createQuery({
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
index ef9ef90e8f310..ffc7e9ce1d6c2 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_paginated_pipelines.js
@@ -37,7 +37,7 @@ export async function getPaginatedPipelines(
   queryText
 ) {
   const config = req.server.config();
-  const size = config.get('xpack.monitoring.max_bucket_size');
+  const size = config.get('monitoring.ui.max_bucket_size');
   const pipelines = await getLogstashPipelineIds(
     req,
     lsIndexPattern,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline.js
index eeeffd74e91f7..35a4295de298b 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline.js
@@ -111,7 +111,7 @@ export async function getPipeline(req, config, lsIndexPattern, clusterUuid, pipe
   };
 
   // Determine metrics' timeseries interval based on version's timespan
-  const minIntervalSeconds = config.get('xpack.monitoring.min_interval_seconds');
+  const minIntervalSeconds = config.get('monitoring.ui.min_interval_seconds');
   const timeseriesInterval = calculateTimeseriesInterval(
     version.firstSeen,
     version.lastSeen,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
index 1858674a01b86..d9c03819b0098 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_stats_aggregation.js
@@ -171,7 +171,7 @@ export function getPipelineStatsAggregation(
     logstashIndexPattern,
     pipelineId,
     version,
-    config.get('xpack.monitoring.max_bucket_size'),
+    config.get('monitoring.ui.max_bucket_size'),
     callWithRequest,
     req
   );
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js
index 7dfa8d4a163ce..7521389c379ea 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_versions.js
@@ -37,7 +37,7 @@ function fetchPipelineVersions(...args) {
     by_pipeline_hash: {
       terms: {
         field: 'logstash_stats.pipelines.hash',
-        size: config.get('xpack.monitoring.max_bucket_size'),
+        size: config.get('monitoring.ui.max_bucket_size'),
         order: { 'path_to_root>first_seen': 'desc' },
       },
       aggs: {
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js
index 49c2dff2d6080..134dd88b36ce6 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex.js
@@ -130,7 +130,7 @@ export async function getPipelineVertex(
   };
 
   // Determine metrics' timeseries interval based on version's timespan
-  const minIntervalSeconds = config.get('xpack.monitoring.min_interval_seconds');
+  const minIntervalSeconds = config.get('monitoring.ui.min_interval_seconds');
   const timeseriesInterval = calculateTimeseriesInterval(
     version.firstSeen,
     version.lastSeen,
diff --git a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
index c91182188b213..425ca5731926c 100644
--- a/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
+++ b/x-pack/legacy/plugins/monitoring/server/lib/logstash/get_pipeline_vertex_stats_aggregation.js
@@ -216,7 +216,7 @@ export function getPipelineVertexStatsAggregation(
     version,
     vertexId,
     timeSeriesIntervalInSeconds,
-    config.get('xpack.monitoring.max_bucket_size'),
+    config.get('monitoring.ui.max_bucket_size'),
     callWithRequest,
     req
   );
diff --git a/x-pack/legacy/plugins/monitoring/server/plugin.js b/x-pack/legacy/plugins/monitoring/server/plugin.js
index 163bc43945be1..ef346e95ad075 100644
--- a/x-pack/legacy/plugins/monitoring/server/plugin.js
+++ b/x-pack/legacy/plugins/monitoring/server/plugin.js
@@ -48,7 +48,7 @@ export class Plugin {
       /*
        * End-user-facing services
        */
-      const uiEnabled = config.get('xpack.monitoring.ui.enabled');
+      const uiEnabled = config.get('monitoring.ui.enabled');
 
       if (uiEnabled) {
         await instantiateClient({
@@ -98,7 +98,7 @@ export class Plugin {
       kbnServerStatus: kbnServer.status,
       kbnServerVersion: kbnServer.version,
     });
-    const kibanaCollectionEnabled = config.get('xpack.monitoring.kibana.collection.enabled');
+    const kibanaCollectionEnabled = config.get('monitoring.kibana.collection.enabled');
 
     if (kibanaCollectionEnabled) {
       /*
@@ -125,14 +125,12 @@ export class Plugin {
     core.injectUiAppVars('monitoring', () => {
       const config = core.config();
       return {
-        maxBucketSize: config.get('xpack.monitoring.max_bucket_size'),
-        minIntervalSeconds: config.get('xpack.monitoring.min_interval_seconds'),
+        maxBucketSize: config.get('monitoring.ui.max_bucket_size'),
+        minIntervalSeconds: config.get('monitoring.ui.min_interval_seconds'),
         kbnIndex: config.get('kibana.index'),
-        showLicenseExpiration: config.get('xpack.monitoring.show_license_expiration'),
-        showCgroupMetricsElasticsearch: config.get(
-          'xpack.monitoring.ui.container.elasticsearch.enabled'
-        ),
-        showCgroupMetricsLogstash: config.get('xpack.monitoring.ui.container.logstash.enabled'), // Note, not currently used, but see https://github.com/elastic/x-pack-kibana/issues/1559 part 2
+        showLicenseExpiration: config.get('monitoring.ui.show_license_expiration'),
+        showCgroupMetricsElasticsearch: config.get('monitoring.ui.container.elasticsearch.enabled'),
+        showCgroupMetricsLogstash: config.get('monitoring.ui.container.logstash.enabled'), // Note, not currently used, but see https://github.com/elastic/x-pack-kibana/issues/1559 part 2
       };
     });
   }
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
index 2d4bded9fc4c8..fcdf4ad8a706c 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
+++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/ccr.js
@@ -26,7 +26,7 @@ function getBucketScript(max, min) {
 function buildRequest(req, config, esIndexPattern) {
   const min = moment.utc(req.payload.timeRange.min).valueOf();
   const max = moment.utc(req.payload.timeRange.max).valueOf();
-  const maxBucketSize = config.get('xpack.monitoring.max_bucket_size');
+  const maxBucketSize = config.get('monitoring.ui.max_bucket_size');
   const aggs = {
     ops_synced_max: {
       max: {
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
index 10226d74ed001..25ead723e3ddb 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
+++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/elasticsearch/node_detail.js
@@ -61,7 +61,7 @@ export function esNodeRoute(server) {
         metricSet = metricSetOverview;
         // set the cgroup option if needed
         const showCgroupMetricsElasticsearch = config.get(
-          'xpack.monitoring.ui.container.elasticsearch.enabled'
+          'monitoring.ui.container.elasticsearch.enabled'
         );
         const metricCpu = metricSet.find(m => m.name === 'node_cpu_metric');
         if (showCgroupMetricsElasticsearch) {
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js
index d5ce9d1686f8a..bd3ae5f5c2679 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js
+++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/node.js
@@ -60,9 +60,7 @@ export function logstashNodeRoute(server) {
       } else {
         metricSet = metricSetOverview;
         // set the cgroup option if needed
-        const showCgroupMetricsLogstash = config.get(
-          'xpack.monitoring.ui.container.logstash.enabled'
-        );
+        const showCgroupMetricsLogstash = config.get('monitoring.ui.container.logstash.enabled');
         const metricCpu = metricSet.find(m => m.name === 'logstash_node_cpu_metric');
         if (showCgroupMetricsLogstash) {
           metricCpu.keys = ['logstash_node_cgroup_quota_as_cpu_utilization'];
diff --git a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
index c5fd76487cca1..93330880babcc 100644
--- a/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
+++ b/x-pack/legacy/plugins/monitoring/server/routes/api/v1/logstash/pipelines/cluster_pipeline_ids.js
@@ -36,7 +36,7 @@ export function logstashClusterPipelineIdsRoute(server) {
       const { ccs } = req.payload;
       const clusterUuid = req.params.clusterUuid;
       const lsIndexPattern = prefixIndexPattern(config, INDEX_PATTERN_LOGSTASH, ccs);
-      const size = config.get('xpack.monitoring.max_bucket_size');
+      const size = config.get('monitoring.ui.max_bucket_size');
 
       try {
         const pipelines = await getLogstashPipelineIds(req, lsIndexPattern, { clusterUuid }, size);
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
index fc85cbe442ddf..4738ab5b8af83 100644
--- a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
+++ b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_cluster_uuids.ts
@@ -40,7 +40,7 @@ export function fetchClusterUuids({ server, callCluster, start, end }: StatsColl
         cluster_uuids: {
           terms: {
             field: 'cluster_uuid',
-            size: config.get('xpack.monitoring.max_bucket_size'),
+            size: config.get('monitoring.ui.max_bucket_size'),
           },
         },
       },
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.js b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.js
index 8e5a59361e52f..52d34258b5fa4 100644
--- a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_es_stats.js
@@ -31,7 +31,7 @@ export function fetchElasticsearchStats(server, callCluster, clusterUuids) {
   const config = server.config();
   const params = {
     index: INDEX_PATTERN_ELASTICSEARCH,
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     ignoreUnavailable: true,
     filterPath: [
       'hits.hits._source.cluster_uuid',
diff --git a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.js b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.js
index 2632a8f6e041d..b87f632308e4d 100644
--- a/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.js
+++ b/x-pack/legacy/plugins/monitoring/server/telemetry_collection/get_high_level_stats.js
@@ -217,7 +217,7 @@ export async function fetchHighLevelStats(server, callCluster, clusterUuids, sta
 
   const params = {
     index: getIndexPatternForStackProduct(product),
-    size: config.get('xpack.monitoring.max_bucket_size'),
+    size: config.get('monitoring.ui.max_bucket_size'),
     headers: {
       'X-QUERY-SOURCE': TELEMETRY_QUERY_SOURCE,
     },
diff --git a/x-pack/legacy/plugins/monitoring/ui_exports.js b/x-pack/legacy/plugins/monitoring/ui_exports.js
index 2b5ea21a2bb45..9251deb673bd1 100644
--- a/x-pack/legacy/plugins/monitoring/ui_exports.js
+++ b/x-pack/legacy/plugins/monitoring/ui_exports.js
@@ -32,7 +32,7 @@ export const getUiExports = () => ({
   injectDefaultVars(server) {
     const config = server.config();
     return {
-      monitoringUiEnabled: config.get('xpack.monitoring.ui.enabled'),
+      monitoringUiEnabled: config.get('monitoring.ui.enabled'),
     };
   },
   hacks: ['plugins/monitoring/hacks/toggle_app_link_in_nav'],

From f01165ac154f74d90594b6383bee7442d6bd2b3d Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Thu, 30 Jan 2020 13:23:05 -0800
Subject: [PATCH 13/23] [DOCS] Adds breaking changes for 7.6 (#56437)

* adding api changes for 7.6

* [DOCS] Adds breaking changes for 7.6

* [DOCS] Incorporates review comments

Co-authored-by: Tim Schnell <timductive@gmail.com>
---
 docs/images/breaking_changes_save_query.png   |  Bin 0 -> 37587 bytes
 ...breaking_changes_save_query_management.png |  Bin 0 -> 21256 bytes
 docs/migration.asciidoc                       |    6 +-
 docs/migration/migrate_7_6.asciidoc           | 1897 +++++++++++++++++
 4 files changed, 1901 insertions(+), 2 deletions(-)
 create mode 100644 docs/images/breaking_changes_save_query.png
 create mode 100644 docs/images/breaking_changes_save_query_management.png
 create mode 100644 docs/migration/migrate_7_6.asciidoc

diff --git a/docs/images/breaking_changes_save_query.png b/docs/images/breaking_changes_save_query.png
new file mode 100644
index 0000000000000000000000000000000000000000..da65e166ed4983c2136103eef02e057aad763029
GIT binary patch
literal 37587
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%0D0qK&
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

literal 0
HcmV?d00001

diff --git a/docs/images/breaking_changes_save_query_management.png b/docs/images/breaking_changes_save_query_management.png
new file mode 100644
index 0000000000000000000000000000000000000000..aba2aa53e2d7c510fcdf42cafb602e26d861ae16
GIT binary patch
literal 21256
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
S1}y#n0000<MNUMnLSTYm_mS8D

literal 0
HcmV?d00001

diff --git a/docs/migration.asciidoc b/docs/migration.asciidoc
index 9a108a98b3570..ddfb3455e9991 100644
--- a/docs/migration.asciidoc
+++ b/docs/migration.asciidoc
@@ -6,6 +6,7 @@
 This section discusses the changes that you need to be aware of when migrating
 your application from one version of Kibana to another.
 
+* <<breaking-changes-7.6, Breaking changes in 7.6>>
 * <<breaking-changes-7.5, Breaking changes in 7.5>>
 * <<breaking-changes-7.4, Breaking changes in 7.4>>
 * <<breaking-changes-7.3, Breaking changes in 7.3>>
@@ -13,12 +14,13 @@ your application from one version of Kibana to another.
 * <<breaking-changes-7.1, Breaking changes in 7.1>>
 * <<breaking-changes-7.0, Breaking changes in 7.0>>
 
-See also <<release-highlights>> and <<release-notes>>. 
+See also <<release-highlights>> and <<release-notes>>.
 --
 
+include::migration/migrate_7_6.asciidoc[]
 include::migration/migrate_7_5.asciidoc[]
 include::migration/migrate_7_4.asciidoc[]
 include::migration/migrate_7_3.asciidoc[]
 include::migration/migrate_7_2.asciidoc[]
 include::migration/migrate_7_1.asciidoc[]
-include::migration/migrate_7_0.asciidoc[]
\ No newline at end of file
+include::migration/migrate_7_0.asciidoc[]
diff --git a/docs/migration/migrate_7_6.asciidoc b/docs/migration/migrate_7_6.asciidoc
new file mode 100644
index 0000000000000..779e674a780ff
--- /dev/null
+++ b/docs/migration/migrate_7_6.asciidoc
@@ -0,0 +1,1897 @@
+[[breaking-changes-7.6]]
+== Breaking changes in 7.6
+++++
+<titleabbrev>7.6</titleabbrev>
+++++
+
+This page discusses the breaking changes that you need to be aware of when migrating
+your application to Kibana 7.6.
+
+* <<general-plugin-API-changes, General plugin API changes>>
+* <<move-to-new-platform-changes, Plugin API migrations to New Platform>>
+
+
+[float]
+[[general-plugin-API-changes]]
+=== General plugin API changes
+
+[float]
+==== {kib} no longer crashes when a plugin version does not match the server
+{pull}54404[#54404]
+
+{kib} no longer crashes when a plugin is used against an incompatible {kib} version.
+A warning is now displayed in the console instead of throwing and crashing.
+
+[float]
+==== Generate legacy vars when rendering all applications
+{pull}54768[#54768]
+
+Rendering any type of application, even ones for the new platform,
+should still generate legacy vars injected into the page metadata.
+This ensures these vars are injected for HTTP route rendering as well.
+
+[float]
+==== `uiSettings` image upload field config
+{pull}54522[#54522]
+
+In `uiSettings`, the image upload field required specifying `maxSize`
+via the `options` field. This was in conflict with the stated use and
+type of `options`, which is a `string[]` used to populate select fields.
+`uiOptions` has been provided instead, accepting `Record<string, any>` values.
+
+[float]
+==== Replaced `map.manifestServiceUrl` setting in kibana.yml with `map.emsTileApiUrl` and `map.emsFileApiUrl`
+{pull}54399[#54399]
+
+The undocumented `map.manifestServiceUrl` setting in kibana.yml has been replaced
+by `map.emsTileApiUrl` and `map.emsFileApiUrl`. These settings configure the
+base URL for the tile basemap manifest and vector file manifests used in
+Elastic Maps and the region map and coordinate map.visualizations.
+
+[float]
+==== Don't expose {es} client as Observable
+{pull}53824[#53824]
+
+{es} clients aren't exposed via the Observable interface anymore.
+{es} client provides a static API that handles all {es} config updates under the hood,
+transparent to the end-user.
+
+```js
+
+const client = core.elasticsearch.dataClient;
+
+const data = await client.callAsInternalUser('endpoint');
+
+```
+
+[float]
+==== Reduce license plugin API
+{pull}53489[#53489]
+
+License method `isOneOf` was superseded by `hasAtLeast`, which checks
+the current license is not less than passes minimal required license.
+
+```js
+
+//before
+
+license.isOneOf(['platinum', 'enterprise', 'trial'])
+
+// after
+
+license.hasAtLeast('platinum')
+
+```
+
+[float]
+==== State containers
+{pull}52384[#52384]
+
+State containers have now been rewritten and to create state container you
+use `createStateContainer` instead of previous `createStore`.
+https://github.com/streamich/kibana/blob/state-containers/src/plugins/kibana_utils/docs/state_containers/README.md[See full documentation].
+
+
+```ts
+
+import { createStateContainer } from 'src/plugins/kibana_utils';
+
+const container = createStateContainer(0, {
+
+  increment: (cnt: number) => (by: number) => cnt + by,
+
+  double: (cnt: number) => () => cnt * 2,
+
+});
+
+container.transitions.increment(5);
+
+container.transitions.double();
+
+console.log(container.get()); // 10
+
+```
+
+
+
+[float]
+==== Add pre-response HTTP interceptor
+{pull}52366[#52366]
+
+HttpService provides `onPreResponse` interceptor. Interceptor supports extending a response with custom headers.
+
+```js
+
+ this.registerOnPreResponse((request, preResponseInfo, t) => {
+
+   if(preResponseInfo.statusCode < 300){
+
+     return t.next({
+
+       headers: {
+
+         'x-foo-header': 'bar'
+
+       }
+
+   });
+
+  }
+
+  return t.next()
+
+});
+
+```
+
+[float]
+==== Add server rendering service to enable standalone route rendering
+{pull}52161[#52161]
+
+Render a bootstrapped HTML page from a route handler using the `RenderingService` from your server plugin:
+
+```ts
+
+const router = createRouter();
+
+router.get(
+
+  { path: '/', validate: false },
+
+  (context, request, response) =>
+
+    response.ok({
+
+      headers: {
+
+        'content-security-policy': context.core.http.csp.header,
+
+      },
+
+      body: await context.core.rendering.render(),
+
+    })
+
+);
+
+```
+
+[float]
+==== Disabled actions
+{pull}51975[#51975]
+
+Embeddable input now has `disabledActions` property. Actions with ID listed
+in `disabledActions` will not be rendered by embeddable panel in drop down context menu and badge list.
+
+```ts
+
+const embeddable = await embeddableFactory.createFromState(
+
+  state,
+
+  {
+
+    // ...
+
+    disabledActions: ['CUSTOM_TIME_RANGE', 'CUSTOM_TIME_RANGE_BADGE'],
+
+  },
+
+  // ...
+
+);
+
+```
+
+[float]
+==== Allow chromeless applications to render via non-/app routes
+{pull}51527[#51527]
+
+Allow applications to routable from paths that do not start with `/app`.
+This is first enabled via the `appRoute` flag during UI application registration.
+
+```ts
+
+export class MyPlugin implements Plugin {
+
+  setup({ application }) {
+
+    application.register({
+
+      id: 'my-app',
+
+      // App can be accessed via the /my-app route
+
+      appRoute: '/my-app',
+
+      async mount(context, params) {
+
+        const { renderApp } = await import('./application');
+
+        return renderApp(context, params);
+
+      },
+
+    });
+
+  }
+
+}
+
+```
+
+[float]
+==== Add compatibility wrapper for Boom errors thrown from route handler
+{pull}51157[#51157]
+
+Added a new `handleLegacyErrors` method to core `HttpService` router. The method wraps a `RequestHandler` to intercept any thrown `Boom` errors and converts them into proper NP error response.
+
+```ts
+
+// plugins/myplugin/server/plugin.ts
+
+import { schema } from '@kbn/config-schema';
+
+import { CoreSetup } from 'src/core/server';
+
+export interface DemoPluginsSetup {};
+
+class Plugin {
+
+  public setup(core: CoreSetup, pluginSetup: DemoPluginSetup) {
+
+    const router = core.http.createRouter();
+
+    router.post(
+
+      {
+
+        path: '/api/myplugin/endpoint',
+
+        validate: false,
+
+      },
+
+      router.wrapErrors((context, req, res) => {
+
+        throw Boom.notFound('not there'); // will be converted into properly interpreted error
+
+      })
+
+    )
+
+  }
+
+}
+
+```
+
+[float]
+==== Move SavedQuery to New Platform
+{pull}51024[#51024]
+
+**Saved Query Service**
+
+Saved query service is now available on the data plugin's `query` start contract.
+
+```ts
+
+class MyPlugin {
+
+    public start(core: CoreStart, { data }: MyPluginDependencies) {
+
+        const allSavedQueries = data.query.savedQueries.getAllSavedQueries()
+
+    }
+
+}
+
+
+
+```
+
+**Saved Query UI Components**
+
+The Saved Query management UI components can be imported from `data` plugin directly.
+
+```ts
+
+   import { SavedQueryManagementComponent, SaveQueryForm } from '../../plugins/data/public';
+
+```
+
+Saved query Management component
+
+[role="screenshot"]
+image::images/breaking_changes_save_query_management.png[Saved Query Management Component]
+
+Save query form
+
+[role="screenshot"]
+image::images/breaking_changes_save_query.png[Save Query Form]
+
+[float]
+==== Kibana app migration: Remove old APIs
+{pull}50881[#50881]
+
+
+The following undocumented APIs for scroll search and index document count have been removed:
+
+* `POST /api/kibana/legacy_scroll_continue`
+
+* `POST /api/kibana/legacy_scroll_start`
+
+* `POST /api/kibana/{id}/_count`
+
+[float]
+==== ChromeHelpExtension
+{pull}50736[#50736]
+
+The `chrome.helpExtension` has been updated to where it no longer just accepts a function to spit out any content. Now, the extension looks like:
+
+```tsx
+
+export interface ChromeHelpExtension {
+
+  appName: string;
+
+  links?: HeaderHelpMenuUIExtraLink[];
+
+  // You can still pass custom content via the `content` key
+
+  content?: (element: HTMLDivElement) => () => void;
+
+}
+
+```
+
+[float]
+==== Allows plugins to define validation schema for "enabled" flag
+{pull}50286[#50286]
+
+If you want your plugin to be disabled by default you can specify it via config:
+
+```js
+
+export const config = {
+
+  schema: schema.object({ enabled: schema.boolean({ defaultValue: true }) })
+
+}
+
+```
+
+[float]
+==== Add getStartServices API
+{pull}50231[#50231]
+
+Context is being deprecated on the front-end and replaced by the `core.getStartServices()` API.
+
+```ts
+
+class Plugin {
+
+  setup(core, plugins) {
+
+    core.application.register({
+
+      id: 'myApp',
+
+      title: 'My App',
+
+      // `mount` functions with just one argument will only receive `params`
+
+      async mount(params) {
+
+        const [coreStart, depsStart] = await core.getStartServices();
+
+        const { renderApp } = await import('./application');
+
+        return renderApp(coreStart, depsStart, params);
+
+      }
+
+    });
+
+  }
+
+}
+
+```
+
+[float]
+==== Relocated `@kbn/es-query` package to `data` plugin
+{pull}50182[#50182]
+
+The `@kbn/es-query` package has been moved to `src/plugins/data` and is available under the `esQuery` namespace on both the client and the server.
+
+```ts
+
+// old
+
+import {
+
+  buildEsQuery,
+
+  EsQueryConfig,
+
+  buildQueryFromFilters,
+
+  luceneStringToDsl,
+
+  decorateQuery,
+
+  getEsQueryConfig,
+
+} from '@kbn/es-query';
+
+// new
+
+import { esQuery } from 'src/plugins/data/public'; // or `src/plugins/data/server`
+
+esQuery.buildEsQuery(...);
+
+```
+
+
+[float]
+==== Migrate share registry
+{pull}50137[#50137]
+
+The `ui/share` registry is removed in favor of the `share` plugin which exposes a `register` method in the setup contract. The interface of share menu providers does not change except for the removal of angular dependency injection. The function to render the menu also moves into a function exposed by the `share` plugin in the start phase instead of a function which has to be called with the menu item providers. The following items have also been renamed:
+
+- `ShowProps` -> `ShowShareMenuOptions`
+
+- `ShareMenuItemProps` -> `ShareContext`
+
+- `showShareContextMenu` -> `toggleShareContextMenu`
+
+[float]
+==== Ensure chromeless applications hide left navbar link
+{pull}50060[#50060]
+
+Chromeless applications no longer display a navigation link in the left application menu.
+
+[float]
+==== Allow registered applications to hide Kibana chrome
+{pull}49795[#49795]
+
+When registering an application, you can now use the `chromeless` option to hide the Kibana chrome UI when the application is mounted.
+
+```ts
+
+application.register({
+
+  id: 'my-app',
+
+  chromeless: true,
+
+  async mount(context, params) {
+
+    /* ... */
+
+  },
+
+});
+
+```
+
+[float]
+==== Remove react references from core `Notifications` APIs
+{pull}49573[#49573]
+
+The core `NotificationService` and `ToastsApi` methods are now framework agnostic
+and no longer accept react components as input. Please use `kibana_react`'s`toMountPoint`
+utility to convert a react node to a mountPoint.
+
+[float]
+==== Shim dev tools
+{pull}49349[#49349]
+
+The `ui/registry/dev_tools` is removed in favor of the `DevTools` plugin,
+which exposes a `register` method in the setup contract.
+Registering app works mostly the same as registering apps in `core.application.register`.
+Routing will be handled by the id of the dev tool - your dev tool will be mounted when the URL matches `/app/kibana#/dev_tools/<YOUR ID>`. This API doesn't support angular, for registering angular dev tools, bootstrap a local module on mount into the given HTML element.
+
+[float]
+==== Kibana app migration: Shim dashboard
+{pull}48913[#48913]
+
+The route flag `requireDefaultIndex` making sure there are index patterns
+and the `defaultIndex` advanced setting is set was removed.
+
+The same functionality can be achieved by using the
+helper function `ensureDefaultIndexPattern` from `ui/legacy_compat` within the `resolve` object of a route.
+
+[float]
+==== Remove react references from core `OverlayService` apis
+{pull}48431[#48431]
+
+The core `OverlayService` methods are now framework agnostic and no longer accept react components as input.
+Please use `kibana_react`'s`toMountPoint` utility to convert a react component to a mountPoint.
+
+For exemple:
+
+```typescript
+
+core.overlays.openModal(<MyComponent/>)
+
+```
+
+Becomes:
+
+```typescript
+
+core.overlays.openModal(toMountPoint(<MyComponent/>))
+
+```
+
+[float]
+==== Supply deprecated req and res properties on IHttpFetchError for legacy compatibility
+{pull}48430[#48430]
+
+Expose deprecated `req: Request` and `res: Response` properties on `IHttpFetchError`s
+to help plugins migrated faster by removing an additional migration burden.
+
+[float]
+==== Timelion server API
+{pull}47813[#47813]
+
+The server side AOU of Timelion `/api/timelion/run` used to
+accept datemath strings (like `now`) for the `time.from` and `time.to` properties.
+This PR removes support for datemath, from now on only ISO8601 encoded strings are supported.
+
+[float]
+==== Pass along request object to all HTTP interceptors
+{pull}47258[#47258]
+
+Make the `Request` instance available to all HTTP interceptors, which is now in a read-only state.
+You may now also under-specify the object returned from HTTP response interceptors
+to only overwrite specific properties.
+
+[float]
+[[move-to-new-platform-changes]]
+=== Plugin API migrations to New Platform
+
+[float]
+==== Expose whitelisted config values to client-side plugin
+{pull}50641[#50641]
+
+New Platform plugins with both a server and client parts can now expose configuration properties to the client-side plugin.
+
+The properties to expose must be whitelisted in the config declaration.
+
+```typescript
+
+// my_plugin/server/index.ts
+
+const configSchema = schema.object({
+
+  secret: schema.string({ defaultValue: 'Not really a secret :/' }),
+
+  uiProp: schema.string({ defaultValue: 'Accessible from client' }),
+
+});
+
+type ConfigType = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigType> = {
+
+  exposeToBrowser: {
+
+    uiProp: true,
+
+  },
+
+  schema: configSchema,
+
+};
+
+```
+
+And can then be accessed in the client-side plugin using the `PluginInitializerContext`:
+
+```typescript
+
+// my_plugin/public/index.ts
+
+interface ClientConfigType {
+
+  uiProp: string;
+
+}
+
+export class Plugin implements Plugin<PluginSetup, PluginStart> {
+
+  constructor(private readonly initializerContext: PluginInitializerContext) {}
+
+  public async setup(core: CoreSetup, deps: {}) {
+
+    const config = this.initializerContext.config.get<ClientConfigType>();
+
+    // ...
+
+  }
+
+```
+
+[float]
+==== Allow registering per-app navigation items
+{pull}53136[#53136]
+
+Allow registering per-app TopNavMenuItems&mdash;have a plugin register menu items into another application.
+
+*New platform plugin*
+
+```tsx
+
+class MyPlugin {
+
+   public setup(core: CoreSetup, { navigation }: MyPluginSetupDependencies) {
+
+      const customDiscoverExtension = {
+
+         id: 'registered-discover-prop',
+
+         label: 'Registered Discover Button',
+
+         description: 'Registered Discover Demo',
+
+         run() {},
+
+         testId: 'demoDiscoverRegisteredNewButton',
+
+         appName: 'discover',
+
+      };
+
+      navigation.registerMenuItem(customDiscoverExtension);
+
+   }
+
+}
+```
+
+*Legacy plugin*
+
+```tsx
+
+const customDiscoverExtension = {
+
+  id: 'registered-discover-prop',
+
+  label: 'Registered Discover Button',
+
+  description: 'Registered Discover Demo',
+
+  run() {},
+
+  testId: 'demoDiscoverRegisteredNewButton',
+
+  appName: 'discover',
+
+};
+
+npSetup.plugins.navigation.registerMenuItem(customDiscoverExtension);
+```
+
+[float]
+==== Management API for Kibana Platform
+{pull}52579[#52579]
+
+Management API for Kibana Platform implemented.
+Demonstration code available at `test/plugin_functional/plugins/management_test_plugin/public/plugin.tsx`
+
+
+[float]
+==== New platform applications can now prompt user with a message
+{pull}54221[#54221]
+
+New platform applications can now prompt a message when users are trying to
+leave the app, allowing to notify them if some changes are unsaved.
+
+```typescript
+
+   core.application.register({
+
+      id: 'my-app',
+
+      title: 'MyApp',
+
+      mount: (context, { appBasePath, element, onAppLeave }) => {
+
+        onAppLeave(actions => {
+
+          if(someUnsavedChanges) {
+
+            return actions.confirm(
+
+              'Some changes are unsaved and will be lost. Are you sure you want to leave MyApp?',
+
+              'Leaving application'
+
+            );
+
+          }
+
+          return actions.default();
+
+        });
+
+        const div = document.createElement('div');
+
+        div.innerHTML = '.....';
+
+        element.appendChild(div);
+
+        return () => div.remove();
+
+      },
+
+    });
+
+```
+
+[float]
+==== [NP] Add lifecycle timeout
+{pull}54129[#54129]
+
+{kib} platform deprecates async lifecycles by `v8` release.
+{kib} supports async lifecycles for BWC, but limits their time duration to 30 sec.
+
+
+[float]
+==== Migrate config deprecations and `ShieldUser` functionality to the New Platform
+{pull}53768[#53768]
+
+In the Security Plugin, the
+Legacy `ShieldUser` angular service has been removed and replaced with
+the dedicated method on the {kib} platform plugin `setup` contract:
+
+**Before**:
+
+```typescript
+
+const currentUser = await $injector.get('ShieldUser').getCurrent().$promise;
+
+```
+
+**Now**:
+
+Legacy plugin:
+
+```typescript
+
+import { npSetup } from 'ui/new_platform';
+
+const currentUser = await npSetup.plugins.security.authc.getCurrentUser();
+
+```
+
+Kibana platform plugin:
+
+```json
+
+// manifest.json
+
+....
+
+[optional]requiredPlugins: ["security"],
+
+....
+
+```
+
+```typescript
+
+// my_plugin/public/plugin.ts
+
+public setup(core: CoreSetup, { security }: PluginSetupDependencies) {
+
+    const currentUser = await security.authc.getCurrentUser();
+
+}
+
+```
+
+[float]
+==== NP Migration: Move doc views registry and existing doc views into discover plugin
+{pull}53465[#53465]
+
+The `ui/registry/doc_views` registry is removed in favor of the same
+functionality exposed through the setup contract of the `discover` plugin in `core_plugins/kibana`.
+
+Old way of registering a doc view:
+
+```ts
+
+import { addDocView } from 'ui/registry/doc_views';
+
+addDocView({
+
+  title: '',
+
+  order: 10,
+
+  component: MyComponent,
+
+});
+
+```
+
+New way of registering a doc view:
+
+```ts
+
+import { setup } from '../src/legacy/core_plugins/kibana/public/discover';
+
+setup.addDocView({
+
+  title: '',
+
+  order: 10,
+
+  component: MyComponent,
+
+});
+
+```
+
+
+[float]
+==== bfetch
+{pull}52888[#52888]
+
+`ajax_stream` has been ported to the New Platform. Use `fetchStreaming()` method of `bfetch` plugin instead.
+
+```js
+
+import { npStart } from 'ui/new_platform';
+
+const { stream, promise } = npStart.plugins.bfetch.fetchStreaming({ url: 'http://elastic.co' });
+
+```
+
+[float]
+==== Move CSP options to New Platform
+{pull}52698[#52698]
+
+The default options used for managing Kibana's Content Security Policy have been moved into core for the new platform. Relevant items exposed from `src/core/server` include:
+
+- `CspConfig`: TypeScript class for generating CSP configuration. Will generate default configuration for any properties not specified in initialization.
+
+- `CspConfig.DEFAULT`: Default CSP configuration.
+
+- `ICspConfig`: Interface representing CSP configuration.
+
+
+[float]
+==== Implements config deprecation in New Platform
+{pull}52251[#52251]
+
+
+New platform plugin's configuration now supports deprecation. Use the `deprecations` key of a plugin's config descriptor to register them.
+
+```typescript
+
+ // my_plugin/server/index.ts
+
+ import { schema, TypeOf } from '@kbn/config-schema';
+
+ import { PluginConfigDescriptor } from 'kibana/server';
+
+
+
+ const configSchema = schema.object({
+
+   someNewKey: schema.string({ defaultValue: 'a string' }),
+
+ });
+
+
+
+ type ConfigType = TypeOf<typeof configSchema>;
+
+
+
+ export const config: PluginConfigDescriptor<ConfigType> = {
+
+   schema: configSchema,
+
+   deprecations: ({ rename, unused }) => [
+
+     rename('someOldKey', 'someNewKey'),
+
+     unused('deprecatedProperty'),
+
+   ],
+
+ };
+
+```
+
+
+[float]
+==== [Telemetry] Migrate ui_metric plugin to NP under usageCollection
+{pull}51972[#51972]
+
+Migrates `ui_metrics` to NP under `usageCollection`.
+
+[float]
+==== NP licensing plugin improvements
+{pull}51818[#51818]
+
+
+Licensing plugin retrieves license data from {es} and
+becomes a source of license data for all {kib} plugins on server-side and client-side.
+
+*Server-side API*
+
+The licensing plugin retrieves license data from {es} at regular configurable intervals.
+
+- `license$: Observable<ILicense>` Provides a steam of license data ILicense.
+Plugin emits new value whenever it detects changes in license info.
+If the plugin cannot retrieve a license from **Elasticsearch**, it will emit `an empty license` object.
+
+- `refresh: () => Promise<ILicense>` allows a plugin to enforce license retrieval.
+
+*Client-side API*
+
+The licensing plugin retrieves license data from licensing Kibana plugin
+and does not communicate with Elasticsearch directly.
+
+- `license$: Observable<ILicense>` Provides a steam of license data ILicense.
+Plugin emits new value whenever it detects changes in license info. If the plugin cannot retrieve a
+license from **Kibana**, it will emit `an empty license` object.
+
+- `refresh: () => Promise<ILicense>` allows a plugin to enforce license retrieval.
+
+
+
+[float]
+==== [Cloud] move cloud plugin to New Platform
+{pull}51789[#51789]
+
+Fully migrates `cloud` plugin over to NP. To use the NP contract exposed by
+the cloud plugin (ex `cloudId` or `isCloudEnabled`) follow this quick guide below.
+Note that all the plugins are already migrated to use the NP plugin in this very same PR.
+
+```json
+
+// plugin/kibana.json
+
+{
+
+  "id": "...",
+
+  "optionalPlugins": ["cloud"]
+
+}
+
+```
+
+*Server side:* Check for cloud plugin in the `setup` function.
+
+```ts
+
+// server/plugin.ts
+
+import { get } from 'lodash';
+
+class Plugin {
+
+  setup(core, plugins) {
+
+    const { cloud } = plugins;
+
+    // use `lodash.get` as cloud might not be available if set as an optional plugin.
+
+		const isCloudEnabled = get<boolean>(cloud, 'isCloudEnabled', false);
+
+    // ...
+
+  }
+
+}
+
+```
+
+*Client side:* Both `cloudId` and `isCloudEnabled` are exposed for the the plugins to consume
+in the plugins. Until fully transitioned to new platform, your plugins can use `npSetup` to access the cloud plugin.
+
+```ts
+
+import { npSetup } from 'ui/new_platform';
+
+import { get } from 'lodash';
+
+// ...
+
+const { cloud } = npSetup.plugins;
+
+const isCloudEnabled = get<boolean>(cloud, 'isCloudEnabled', false);
+
+```
+
+[float]
+==== [Telemetry] Migrate Usage Collector Set to the new Kibana Platform
+{pull}51618[#51618]
+
+Fully migrate (`server.usage.collectorSet`) to New Platform under (`UsageCollection`) plugin.
+To use the `UsageCollector` plugin to collect server side stats with the NP follow the quick guide below (Note that all the plugins are already migrated to use this new plugin in this very same PR):
+
+Make sure `usageCollection` is in your optional Plugins:
+
+```json
+
+// plugin/kibana.json
+
+{
+
+  "id": "...",
+
+  "optionalPlugins": ["usageCollection"]
+
+}
+
+```
+
+Register Usage collector in the `setup` function:
+
+```ts
+
+// server/plugin.ts
+
+class Plugin {
+
+  setup(core, plugins) {
+
+    registerMyPluginUsageCollector(plugins.usageCollection);
+
+  }
+
+}
+
+```
+
+Create and register a Usage Collector. Ideally collectors would be defined in a separate directory `server/collectors/register.ts`.
+
+```ts
+
+// server/collectors/register.ts
+
+import { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
+
+import { CallCluster } from 'src/legacy/core_plugins/elasticsearch';
+
+export function registerMyPluginUsageCollector(usageCollection?: UsageCollectionSetup): void {
+
+  // usageCollection is an optional dependency, so make sure to return if it is not registered.
+
+  if (!usageCollection) {
+
+    return;
+
+  }
+
+  // create usage collector
+
+  const myCollector = usageCollection.makeUsageCollector({
+
+    type: MY_USAGE_TYPE,
+
+    fetch: async (callCluster: CallCluster) => {
+
+    // query ES and get some data
+
+    // summarize the data into a model
+
+    // return the modeled object that includes whatever you want to track
+
+      return {
+
+        my_objects: {
+
+          total: SOME_NUMBER
+
+        }
+
+      };
+
+    },
+
+  });
+
+  // register usage collector
+
+  usageCollection.registerCollector(myCollector);
+
+}
+
+```
+
+[float]
+==== Move SearchBar to NP
+{pull}51028[#51028]
+
+The SearchBar component is now available by importing from the data plugin.
+
+```tsx
+
+import { SearchBar } from '../../../plugins/data/public';
+
+```
+
+There is also a stateful version available, that requires much fewer dependencies
+
+```tsx
+
+export class MyPublicPlugin {
+
+  public start(
+
+    core: CoreStart,
+
+    { data }: MyPublicPluginDependencies
+
+  ) {
+
+    const { SearchBar } = data.ui;
+
+    ...
+
+    return <SearchBar
+
+       ...
+
+    ></SearchBar>
+
+  }
+
+}
+
+```
+
+[float]
+==== Move QueryBarInput to New Platform
+{pull}51023[#51023]
+
+
+* `QueryBarInput` was renamed to `QueryStringInput` and moved to `src/plugins/data/public`
+
+* The `typeahead` UI component can now be used independently of `QueryStringInput`. It can be imported from `src/plugins/data/public`.
+
+```ts
+
+   import { QueryStringInput, SuggestionsComponent } from '../../plugins\data\public'
+
+```
+
+[float]
+==== Move ApplyFiltersPopover to New Platform
+{pull}51022[#51022]
+
+The `ApplyFiltersPopover` component is no longer exported.
+
+If you wish to open the filter selection popover,
+use the Actions API from within an `embeddable`:
+
+```ts
+
+ await uiActions.executeTriggerActions(APPLY_FILTER_TRIGGER, {
+
+    embeddable: this,
+
+    filters,
+
+ });
+
+```
+
+[float]
+==== Deprecated the `filter-bar` directive
+{pull}51020[#51020]
+
+If you need to render a filter bar from `angular`,
+use the `kbn-top-nav` directive with the following configuration:
+
+```ts
+
+<kbn-top-nav
+
+  app-name="'my-app'"
+
+  show-search-bar="true"
+
+  show-filter-bar="true"
+
+  show-save-query="false"
+
+  show-date-picker="false"
+
+  filters="filters"
+
+  on-filters-updated="updateFilters"
+
+  index-patterns="[indexPattern]"
+
+>
+
+</kbn-top-nav>
+
+```
+
+*Move `FilterBar` React component to New Platform*
+
+The `FilterBar` component is now available by importing from the `data` plugin.
+
+```ts
+
+import { FilterBar } from '../../../plugins/data/public';
+
+```
+*Move filter related utilities to New Platform*
+
+ * `IDataPluginServices` ⇒ import from `data`
+
+ * `getDisplayValueFromFilter` ⇒ `data.utils`
+
+ * `buildCustomFilter` ⇒ `esFilters.buildCustomFilter`
+
+ * `buildFilter` ⇒ `esFilters.buildFilter`
+
+ * `getFilterParams` ⇒ `esFilters.getFilterParams`
+
+ * `getIndexPatternFromFilter` ⇒ `utils.getIndexPatternFromFilter`
+
+ * `getQueryDslFromFilter` ⇒ replaced with `esFilters.cleanFIlter`
+
+ * `isFilterable` ⇒ import from `data`
+
+
+[float]
+==== NP Kibana plugin home feature catalogue
+{pull}50838[#50838]
+
+The `ui/registries/feature_catalogue` module has been deprecated for removal in 8.0.
+
+Plugins wishing to migrate may remove their usage of `ui/registries/feature_catalogue` and rely on either:
+
+```ts
+
+// For legacy plugins
+
+import { npSetup } from 'ui/new_platform';
+
+npSetup.plugins.home.featureCatalogue.register(/* same details here */);
+
+// For new plugins: first add 'home` to the list of `optionalPlugins`
+
+// in your kibana.json file. Then access the plugin directly in `setup`:
+
+class MyPlugin {
+
+  setup(core, plugins) {
+
+    if (plugins.home) {
+
+      plugins.home.featureCatalogue.register(/* same details here. */);
+
+    }
+
+  }
+
+}
+
+```
+
+Note that the old module supported providing a Angular DI function to receive Angular dependencies. This is no longer supported as we migrate away from Angular.
+
+
+[float]
+==== [NP Kibana Migrations ] Kibana plugin home
+{pull}50444[#50444]
+
+The API to register new tutorials was moved to the new platform. You are now able to add new tutorials by creating a plugin in the new platform, adding a dependency to `home` in its `kibana.json` and using the `tutorials.registerTutorial` method in the setup lifecycle:
+
+```ts
+
+class MyPlugin {
+
+  setup(core: CoreSetup, plugins: { home: HomeServerPluginSetup }) {
+
+    home.tutorials.registerTutorial(() => ({ /* tutorial definition */ }));
+
+  }
+
+}
+
+```
+
+It is still possible to register tutorials from within the legacy platform by calling the same method exposed on the server object:
+
+```js
+
+server.newPlatform.setup.plugins.home.tutorials.registerTutorial(() => ({ /* tutorial definition */ }));
+
+```
+
+[float]
+==== Expressions fully migrated to the New Platform
+{pull}50294[#50294]
+
+The Expressions service has been moved to the New Platform. Moving forward, any expressions-related code should be consumed via the new plugin's contracts (`src/plugins/expressions`).
+
+Use it in your New Platform plugin:
+
+```ts
+
+class MyPlugin {
+
+  setup (core, { expressions }) {
+
+    expressions.registerFunction(myFunction);
+
+    // ...
+
+  }
+
+  start (core, { expressions }) {
+
+    expressions.execute(myExpression);
+
+    // ...
+
+  }
+
+}
+
+```
+
+Or, in your legacy platform plugin, consume it through the `ui/new_platform` module:
+
+```ts
+
+import { npSetup, npStart } from 'ui/new_platform';
+
+npSetup.plugins.expressions.registerFunction(myFunction);
+
+npStart.plugins.expressions.execute(myExpression);
+
+// ...
+
+```
+
+[float]
+==== Move generateFilters to NP
+{pull}50118[#50118]
+
+Filter generator is now available as a utility function in the `data` plugin.
+
+```ts
+
+import { generateFilters } from '../plugins/data/public';
+
+const { filterManager } = plugins.data.query;
+
+const filters = generateFilters(filterManager, field, values, negate, indexString);
+
+```
+
+[float]
+==== Move Query type to NP
+{pull}49636[#49636]
+
+Moved the data `Query` type, used to represent a query string in a specific querying language  to `src/plugins/data`.
+
+```ts
+
+// previously
+
+import { Query } from `src/legacy/core_plugins/data/public`;
+
+// now
+
+import { Query } from `src/plugins/data/public`;
+
+```
+
+[float]
+==== Move Timefilter service to NP
+{pull}49491[#49491]
+
+Moved the `timefilter` service to New Platform.
+
+**Usage in Old Platform**:
+
+```ts
+
+import { TimeRange } from 'src/plugins/data/public';
+
+import { npSetup, npStart } from 'ui/new_platform';
+
+const { timefilter } = npStart.data.timefilter;
+
+const timeRange: TimeRange = timefilter.getTime();
+
+const refreshInterval: RefreshInterval = timefilter.getRefreshInterval()
+
+```
+
+**Usage in New Platform**:
+
+```ts
+
+class MyPlugin {
+
+   public setup(core: CoreSetup, { data }: MyPluginSetupDependencies) {
+
+      const timeRange: TimeRange = data.timefilter.timefilter.getTime();
+
+   }
+
+   public start(core: CoreStart, { data }: MyPluginStartDependencies) {
+
+      const newTimeRange = { from: getYesterday(), to: getNow() }
+
+      data.timefilter.timefilter.setTime(newTimeRange);
+
+   }
+
+}
+
+```
+
+[float]
+==== Move Storage to New Platform
+{pull}49448[#49448]
+
+Move `Storage` to `kibana_utils`.
+
+ - Move `Storage` class to NP, and introduce the interface `IStorageWrapper` for when we only pass storage around.
+
+ - Rename places where `storage` was called `store`
+
+ - Load the Storage directives only where applicable (not in autoload)
+
+[float]
+==== Licensing plugin
+{pull}49345[#49345]
+
+Add x-pack plugin for new platform public licensing information. This will eventually replace the licensing information consumed via `xpack_main`. Upon setup, this plugin exposes an observable API for inspecting and making checks against the license information.
+
+```ts
+
+license$.subscribe(license => {
+
+   console.log(license.uid);
+
+   console.log(license.isActive);
+
+   console.log(license.type);
+
+   const { state } = license.check('my-plugin', LICENSE_TYPE.gold);
+
+   if (state !== LICENSE_STATUS.Valid) {
+
+     disableSomething();
+
+   }
+
+});
+
+```
+
+[float]
+==== Migrate ui/registry/feature_catalogue to New Platform plugin
+{pull}48818[#48818]
+
+The `ui/registries/feature_catalogue` module has been deprecated for removal in 8.0.
+
+Plugins wishing to migrate may remove their usage of `ui/registries/feature_catalogue` and rely on either:
+
+```ts
+
+// For legacy plugins
+
+import { npSetup } from 'ui/new_platform';
+
+npSetup.plugins.feature_catalogue.register(/* same details here */);
+
+// For new plugins: first add 'feature_catalogue` to the list of `optionalPlugins`
+
+// in your kibana.json file. Then access the plugin directly in `setup`:
+
+class MyPlugin {
+
+  setup(core, plugins) {
+
+    if (plugins.feature_catalogue) {
+
+      plugins.feature_catalogue.register(/* same details here. */);
+
+    }
+
+  }
+
+}
+
+```
+
+Note that the old module supported providing a Angular DI function to receive Angular dependencies. This is no longer supported as we migrate away from Angular.
+
+[float]
+==== Migrate necessary ui/autoload functionality to NP
+{pull}48689[#48689]
+
+The `ui/autoload/styles` and `ui/autoload/settings` modules have been removed and are no longer necessary to import in your plugin code. Remove these imports starting in 7.6.
+
+If you still require font awesome, you should import it manually from the npm module:
+
+```ts
+
+import 'font-awesome/less/font-awesome';
+
+```
+
+[float]
+==== Provide uiSettings service in NP
+{pull}48413[#48413]
+
+New platform plugins can register custom uiSettings via the `uiSettings.register` method.
+
+```js
+
+// src/plugins/my-plugin/server/plugin.ts
+
+setup(core: CoreSetup){
+
+  core.uiSettings.register({
+
+    'my-plugin:my-setting': {
+
+      name: 'just-work',
+
+      value: true,
+
+      description: 'make it work',
+
+      category: ['my-category'],
+
+    },
+
+  })
+
+}
+
+```
+
+**Access UiSettings client**
+
+- Via RequestHandlerContext on server-side:
+
+```js
+
+(context, req, res) {
+
+  const uiSettingsClient = context.core.uiSettings.client;
+
+  const value = await uiSettings.get('myPlugin:key');
+
+  // ...
+
+}
+
+```
+
+- Via core interface in setup/start lifecycles on the client-side:
+
+```js
+
+public start({ uiSettings }) {
+
+  const value = uiSettings.get('myPlugin:key');
+
+```
+
+[float]
+==== Move FilterManager to New Platform
+{pull}48391[#48391]
+
+Moved Filter Manager to New Platform.
+
+**Usage in Old Platform**
+
+```ts
+
+import { npSetup, npStart } from 'ui/new_platform';
+
+npStart.data.query.filterManager.getFilters()
+
+...
+
+```
+
+**Usage in New platform**
+
+```ts
+
+class MyPlugin {
+
+   public setup(core: CoreSetup, { data }: MyPluginSetupDependencies) {
+
+      data.query.filterManager.getFilters();
+
+   }
+
+   public start(core: CoreStart, { data }: MyPluginStartDependencies) {
+
+      data.query.filterManager.getFilters();
+
+   }
+
+}
+
+```
+
+[float]
+==== Migrate ui/doc_title to New platform
+{pull}48121[#48121]
+
+Migrate `chrome.docTitle` to new platform. Plugins can now change the page title using this API.
+
+```ts
+
+coreStart.docTitle.change('My Title');
+
+```
+
+[float]
+==== Use NP registry instead of ui/registry/field_formats
+{pull}48108[#48108]
+
+The `FieldFormats` service has been moved to the `data` plugin in the New Platform.
+If your plugin has any imports from `ui/registry/field_formats`, you'll need to update your imports as follows:
+
+Use it in your New Platform plugin:
+
+```ts
+
+class MyPlugin {
+
+  setup (core, { data }) {
+
+    data.fieldFormats.register(myFieldFormat);
+
+    // ...
+
+  }
+
+  start (core, { data }) {
+
+    data.fieldFormats.getType(myFieldFormatId);
+
+    // ...
+
+  }
+
+}
+
+```
+
+Or, in your legacy platform plugin, consume it through the `ui/new_platform` module:
+
+```ts
+
+import { npSetup, npStart } from 'ui/new_platform';
+
+npSetup.plugins.data.fieldFormats.register(myFieldFormat);
+
+npStart.plugins.data.fieldFormats.getType(myFieldFormatId);
+
+// ...
+
+```
+
+[float]
+==== ui/management to New Platform
+{pull}45747[#45747]
+
+The following interfaces were previously available under `ui/management`
+and are now available via `import { setup as managementSetup }``
+from `'${correct path to top dir}src/legacy/core_plugins/management/public/legacy';`
+
+* `ui/management/saved_objects_management`
+
+* `ui/management/index_pattern_creation`
+
+* `ui/management/index_pattern_list`
+
+[float]
+==== `ui/public` cleanup
+{pull}43511[#43511]
+
+**Removed / moved modules**
+
+In preparation for Kibana's upcoming new platform, we are in the process
+of migrating awayfrom the `ui/public` directory.
+Over time, the contents of this directory will be either deprecated or
+housed inside a parent plugin.
+
+If your plugin imports the listed items from the following `ui/public` modules,
+you will need to either update your import statements as indicated below,
+so that you are pulling these modules from their new locations,
+or copy the relevant code into your plugin.
+
+[float]
+**`ui/state_management`**
+{pull}51835[#51835]
+{pull}52172[#52172]
+{pull}52280[#52280]
+{pull}53582[#53582]
+
+The `hashUrl` and `unhashUrl` functions no longer rely on states being provided as an argument, therefore `getUnhashableStates`/`getUnhashableStatesProvider` have been removed.
+
+```ts
+// old
+
+import {
+
+  hashUrl,
+
+  unhashUrl,
+
+  getUnhashableStatesProvider, // deprecated
+
+} from 'ui/state_management/state_hashing';
+
+const getUnhashableStates = Private(getUnhashableStatesProvider);
+
+unhashUrl(window.location.href, getUnhashableStates());
+
+hashUrl([new AppState(), globalState], myRedirectUrl);
+
+// new
+
+import { hashUrl, unhashUrl } from '../../plugins/kibana_utils/public'
+
+hashUrl(window.location.href);
+
+unhashUrl(myRedirectUrl);
+
+```
+
+HashedItemStore was also moved to the `kibana_utils` plugin.
+
+```ts
+// old
+
+import { HashedItemStoreSingleton } from 'ui/state_management/state_storage'
+
+// new
+
+import { hashedItemStore } from '../../plugins/kibana_utils/public'
+
+```
+
+Created new state syncing utilities for syncing state between state containers and different type of state storage (e.g. query params in URL or session storage).
+
+Example app: `examples/state_containers_examples`
+
+This should become a replacement for `AppState` and `GlobalState` in NP.
+
+**`ui/public/utils` cleanup**
+
+- `base_object` and `find_by_param` utilities have been removed {pull}52500[#52500]
+
+- `decode_geo_hash` and `zoom_to_precision` utilities have been moved to `ui/vis/map`{pull}52615[#52615]
+
+- `range` utility has beed moved to `ui/vis/editors/default` {pull}52615[#52615]
+
+- `cidr_mask`, `date_range`, `geo_utils`,  `ip_range`, `ordinal_suffix` utilities have been moved to `ui/agg_types` {pull}52744[#52744]
+
+- `case_conversion` {pull}53819[#53819]
+
+    - `keysToSnakeCaseShallow` moved to `src/legacy/server/status/lib`
+
+    - `keysToCamelCaseShallow` moved to `src/legacy/core_plugins/kibana/public/management`
+
+- `collection` {pull}53819[#53819]
+
+    - `organizeBy moved to `src/legacy/ui/public/indexed_array`
+
+    - `pushAll` was removed
+
+- `diff_object moved to `ui/state_management` {pull}53819[#53819]
+
+- `function` was removed {pull}53819[#53819]
+
+- `key_map` moved to `ui/directives` {pull}53819[#53819]
+
+- `math` moved to `ui/vis`  {pull}53819[#53819]
+
+- `numeric` moved to `src/legacy/core_plugins/kibana/public/management` {pull}53819[#53819]
+
+- `parse_interval` moved to`src/legacy/core_plugins/data/common` {pull}53819[#53819]
+
+- `sort_prefix_first` moved to `x-pack/legacy/plugins/kuery_autocomplete` {pull}53819[#53819]
+
+- `supports` moved to `src/legacy/core_plugins/tile_map/public` {pull}53819[#53819]
+
+[float]
+==== Index Patterns moved to New Platform
+{pull}43438[#43438]
+
+The `indexPatterns` service is now available from the data plugin.
+
+```ts
+
+class MyPlugin {
+
+  start(core, data) {
+
+    const indexPatterns = data.indexPatterns.get(indexPatternId);
+
+    ...
+
+  }
+
+}
+```
+
+[float]
+**Type Definitions**
+
+ * The `IndexPattern` type replaces the legacy `StaticIndexPattern` type
+ * `IndexPattern` was moved to the new plugin.
+ * `FieldList` was moved to the new plugin and the `IFieldList` type was added.
+ * `Field` was moved to the new plugin, along side the `IFieldType` type.
+```ts
+
+    import { IIndexPattern, IFieldType } from 'src/plugins/data/public';
+
+    const indexPattern: IIndexPattern = data.indexPatterns.find(indexPatternId);
+
+    const field: IFieldType[] = indexPattern.fields;
+
+```
+
+**Helper functions**
+
+```ts
+
+    import { indexPatterns as indexPatternsUtils } from 'src/plugins/data/public';
+
+    const indexPattern: IIndexPattern = indexPatterns.getFromSavedObject(savedObject)
+
+    const isValid = indexPatterns.validateIndexPattern(indexPatternString)
+
+```
+
+**Deletions**
+
+  * `IndexPatternAlreadyExists`
+
+  *  `NoDefaultIndexPattern`
+
+  *  `NoDefinedIndexPatterns`

From caac198eaba4df951e0654e550caff86b37a98d2 Mon Sep 17 00:00:00 2001
From: Zacqary Adam Xeper <Zacqary@users.noreply.github.com>
Date: Thu, 30 Jan 2020 15:38:09 -0600
Subject: [PATCH 14/23] [Logs UI] Fix Check for New Data button on empty
 indices screen (#56239) (#56320)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../log_text_stream/scrollable_log_text_stream_view.tsx    | 7 ++++---
 .../infra/public/containers/logs/log_entries/index.ts      | 7 ++++---
 .../infra/public/pages/logs/stream/page_logs_content.tsx   | 2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
index 84bcfa911125a..15d3c83ffebe9 100644
--- a/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/logging/log_text_stream/scrollable_log_text_stream_view.tsx
@@ -51,6 +51,7 @@ interface ScrollableLogTextStreamViewProps {
     fromScroll: boolean;
   }) => any;
   loadNewerItems: () => void;
+  reloadItems: () => void;
   setFlyoutItem: (id: string) => void;
   setFlyoutVisibility: (visible: boolean) => void;
   highlightedItem: string | null;
@@ -269,10 +270,10 @@ export class ScrollableLogTextStreamView extends React.PureComponent<
   };
 
   private handleReload = () => {
-    const { jumpToTarget, target } = this.props;
+    const { reloadItems } = this.props;
 
-    if (target) {
-      jumpToTarget(target);
+    if (reloadItems) {
+      reloadItems();
     }
   };
 
diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
index ed82c0854cdea..04412f5fdd871 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_entries/index.ts
@@ -67,6 +67,7 @@ export type LogEntriesStateParams = {
 
 export interface LogEntriesCallbacks {
   fetchNewerEntries: () => Promise<TimeKey | null | undefined>;
+  checkForNewEntries: () => Promise<void>;
 }
 export const logEntriesInitialCallbacks = {
   fetchNewerEntries: async () => {},
@@ -231,7 +232,7 @@ const useFetchEntriesEffect = (
   useEffect(fetchMoreEntriesEffect, fetchMoreEntriesEffectDependencies);
   useEffect(streamEntriesEffect, streamEntriesEffectDependencies);
 
-  return { fetchNewerEntries };
+  return { fetchNewerEntries, checkForNewEntries: runFetchNewEntriesRequest };
 };
 
 export const useLogEntriesState: (
@@ -239,8 +240,8 @@ export const useLogEntriesState: (
 ) => [LogEntriesStateParams, LogEntriesCallbacks] = props => {
   const [state, dispatch] = useReducer(logEntriesStateReducer, logEntriesInitialState);
 
-  const { fetchNewerEntries } = useFetchEntriesEffect(state, dispatch, props);
-  const callbacks = { fetchNewerEntries };
+  const { fetchNewerEntries, checkForNewEntries } = useFetchEntriesEffect(state, dispatch, props);
+  const callbacks = { fetchNewerEntries, checkForNewEntries };
 
   return [state, callbacks];
 };
diff --git a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index f789c16b67d9c..4d2b99da9b412 100644
--- a/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -82,6 +82,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
             items,
             lastLoadedTime,
             fetchNewerEntries,
+            checkForNewEntries,
           }) => (
             <ScrollableLogTextStreamView
               columnConfigurations={(source && source.configuration.logColumns) || []}
@@ -94,6 +95,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
               jumpToTarget={jumpToTargetPosition}
               lastLoadedTime={lastLoadedTime}
               loadNewerItems={fetchNewerEntries}
+              reloadItems={checkForNewEntries}
               reportVisibleInterval={reportVisiblePositions}
               scale={textScale}
               target={targetPosition}

From 5398f5ee7aaeb1042398262ed28245a1e88630e8 Mon Sep 17 00:00:00 2001
From: gchaps <33642766+gchaps@users.noreply.github.com>
Date: Thu, 30 Jan 2020 14:34:43 -0800
Subject: [PATCH 15/23] [DOCS] Updates example in Timelion doc (#56444)
 (#56454)

---
 docs/visualize/timelion.asciidoc | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/visualize/timelion.asciidoc b/docs/visualize/timelion.asciidoc
index 7c7ec7c995ea7..a7520227977bc 100644
--- a/docs/visualize/timelion.asciidoc
+++ b/docs/visualize/timelion.asciidoc
@@ -43,7 +43,7 @@ image::images/timelion-create01.png[]
 [[time-series-compare-data]]
 ==== Compare the data
 
-To compare the two data sets, add another series with data from the previous hour, separated by a comma:  
+To compare the two data sets, add another series with data from the previous hour, separated by a comma:
 
 [source,text]
 ----------------------------------
@@ -81,7 +81,7 @@ image::images/timelion-create03.png[]
 
 [float]
 [[time-series-title]]
-==== Add a title 
+==== Add a title
 
 Add a meaningful title:
 
@@ -169,7 +169,7 @@ Change the position and style of the legend:
 
 [source,text]
 ----------------------------------
-.es(offset=-1h,index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('last hour').lines(fill=1,width=0.5).color(gray), .es(index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('current hour').title('CPU usage over time').color(#1E90FF).legend(columns=2, position=nw) <1> 
+.es(offset=-1h,index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('last hour').lines(fill=1,width=0.5).color(gray), .es(index=metricbeat-*, timefield='@timestamp', metric='avg:system.cpu.user.pct').label('current hour').title('CPU usage over time').color(#1E90FF).legend(columns=2, position=nw) <1>
 ----------------------------------
 
 <1> `.legend()` sets the position and style of the legend. In this example, `.legend(columns=2, position=nw)` places the legend in the north west position of the visualization with two columns.
@@ -210,7 +210,7 @@ Change how the data is displayed so that you can easily monitor the inbound traf
 .es(index=metricbeat*, timefield=@timestamp, metric=max:system.network.in.bytes).derivative() <1>
 ----------------------------------
 
-<1> `.derivative` plots the change in values over time. 
+<1> `.derivative` plots the change in values over time.
 
 [role="screenshot"]
 image::images/timelion-math02.png[]
@@ -240,7 +240,7 @@ To make the visualization easier to analyze, change the data metric from bytes t
 .es(index=metricbeat*, timefield=@timestamp, metric=max:system.network.in.bytes).derivative().divide(1048576), .es(index=metricbeat*, timefield=@timestamp, metric=max:system.network.out.bytes).derivative().multiply(-1).divide(1048576) <1>
 ----------------------------------
 
-<1> `.divide()` accepts the same input as `.multiply()`, then divides the data series by the defined divisor. 
+<1> `.divide()` accepts the same input as `.multiply()`, then divides the data series by the defined divisor.
 
 [role="screenshot"]
 image::images/timelion-math04.png[]
@@ -256,7 +256,7 @@ Customize and format the visualization using functions:
 ----------------------------------
 .es(index=metricbeat*,
     timefield=@timestamp,
-    metric=max:system.network.in.byte)
+    metric=max:system.network.in.bytes)
   .derivative()
   .divide(1048576)
   .lines(fill=2, width=1)
@@ -270,7 +270,7 @@ Customize and format the visualization using functions:
   .multiply(-1)
   .divide(1048576)
   .lines(fill=2, width=1)           <3>
-  .color(blue) <                    <4>
+  .color(blue)                      <4>
     .label("Outbound traffic")
     .legend(columns=2, position=nw) <5>
 ----------------------------------

From cf19b8657f9d6072077337a60a82173edea32301 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Thu, 30 Jan 2020 18:16:00 -0600
Subject: [PATCH 16/23] [APM] Storybook support (#54970) (#56445)

Add Storybook with help from changes in #43529.

    We still need to do some work around having mocks for hooks and HTTP requests but the basics are there.
---
 src/dev/storybook/aliases.ts                  |  1 +
 .../PlatinumLicensePrompt.stories.tsx         | 33 ++++++++++++++++++
 x-pack/legacy/plugins/apm/readme.md           | 34 +++++++++++++++++++
 .../legacy/plugins/apm/scripts/storybook.js   | 15 ++++++++
 4 files changed, 83 insertions(+)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx
 create mode 100644 x-pack/legacy/plugins/apm/scripts/storybook.js

diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts
index 8213bdeeea2da..1dce53b6c2a84 100644
--- a/src/dev/storybook/aliases.ts
+++ b/src/dev/storybook/aliases.ts
@@ -18,6 +18,7 @@
  */
 
 export const storybookAliases = {
+  apm: 'x-pack/legacy/plugins/apm/scripts/storybook.js',
   canvas: 'x-pack/legacy/plugins/canvas/scripts/storybook_new.js',
   embeddable: 'src/plugins/embeddable/scripts/storybook.js',
   infra: 'x-pack/legacy/plugins/infra/scripts/storybook.js',
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx
new file mode 100644
index 0000000000000..80281c1a0a8fc
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/PlatinumLicensePrompt.stories.tsx
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { storiesOf } from '@storybook/react';
+import React from 'react';
+import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
+import {
+  ApmPluginContext,
+  ApmPluginContextValue
+} from '../../../context/ApmPluginContext';
+
+storiesOf('app/ServiceMap/PlatinumLicensePrompt', module).add(
+  'example',
+  () => {
+    const contextMock = ({
+      core: { http: { basePath: { prepend: () => {} } } }
+    } as unknown) as ApmPluginContextValue;
+
+    return (
+      <ApmPluginContext.Provider value={contextMock}>
+        <PlatinumLicensePrompt />
+      </ApmPluginContext.Provider>
+    );
+  },
+  {
+    info: {
+      source: false
+    }
+  }
+);
diff --git a/x-pack/legacy/plugins/apm/readme.md b/x-pack/legacy/plugins/apm/readme.md
index ded8ab7e95a44..4892aa1b15bc7 100644
--- a/x-pack/legacy/plugins/apm/readme.md
+++ b/x-pack/legacy/plugins/apm/readme.md
@@ -30,6 +30,32 @@ cd apm-integration-testing/
 
 _Docker Compose is required_
 
+### Setup default APM users
+
+APM behaves differently depending on which the role and permissions a logged in user has.
+For testing purposes APM uses 3 custom users:
+
+**apm_read_user**: Apps: read. Indices: read (`apm-*`)
+
+**apm_write_user**: Apps: read/write. Indices: read (`apm-*`)
+
+**kibana_write_user** Apps: read/write. Indices: None
+
+To create the users with the correct roles run the following script:
+
+```sh
+node x-pack/legacy/plugins/apm/scripts/setup-kibana-security.js --role-suffix <github-username-or-something-unique>
+```
+
+The users will be created with the password specified in kibana.dev.yml for `elasticsearch.password`
+
+### Debugging Elasticsearch queries
+
+All APM api endpoints accept `_debug=true` as a query param that will result in the underlying ES query being outputted in the Kibana backend process.
+
+Example:
+`/api/apm/services/my_service?_debug=true`
+
 ### Unit testing
 
 Note: Run the following commands from `kibana/x-pack`.
@@ -118,4 +144,12 @@ To make the [VSCode debugger](https://vscode.readthedocs.io/en/latest/editor/deb
 }
 ```
 
+#### Storybook
+
+Start the [Storybook](https://storybook.js.org/) development environment with
+`yarn storybook apm`. All files with a .stories.tsx extension will be loaded.
+You can access the development environment at http://localhost:9001.
+
+#### Further resources
+
 (you'll want `runtimeVersion` to match what's in the Kibana root .nvmrc. Depending on your setup, you might be able to remove this line.)
diff --git a/x-pack/legacy/plugins/apm/scripts/storybook.js b/x-pack/legacy/plugins/apm/scripts/storybook.js
new file mode 100644
index 0000000000000..846ee1f301e30
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/scripts/storybook.js
@@ -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 { join } from 'path';
+
+// eslint-disable-next-line
+require('@kbn/storybook').runStorybookCli({
+  name: 'apm',
+  storyGlobs: [
+    join(__dirname, '..', 'public', 'components', '**', '*.stories.tsx')
+  ]
+});

From 933dbf2ec3d9d348c0227b6005e348c58531c0da Mon Sep 17 00:00:00 2001
From: Tiago Costa <tiagoffcc@hotmail.com>
Date: Fri, 31 Jan 2020 03:45:18 +0000
Subject: [PATCH 17/23] chore(NA): delete data/optimize with kbn clean (#55890)
 (#56422)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b25621db7cd52..3df3cbe990653 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "clean": {
       "extraPatterns": [
         "build",
-        "optimize",
+        "data/optimize",
         "built_assets",
         ".eslintcache",
         ".node_binaries"

From 0e15c37c4d96e9ce50b42cb46fb4f5addc037ba9 Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Thu, 30 Jan 2020 21:48:19 -0600
Subject: [PATCH 18/23] Add animation to service map layout (#56042) (#56460)

We had previously deleted the animation because the method we were using for adding nodes to the map would wipe the whole map out before redrawing it and make for very awkward animation.

The way it works now is the Cytoscape component calls `add` on the cytoscape instance when new elements are added, so the animation looks ok.

Fixes #54796.
---
 .../apm/public/components/app/ServiceMap/cytoscapeOptions.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
index 1a6247388a655..a243021ddc5fd 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/cytoscapeOptions.ts
@@ -10,7 +10,10 @@ import { defaultIcon, iconForNode } from './icons';
 const layout = {
   name: 'dagre',
   nodeDimensionsIncludeLabels: true,
-  rankDir: 'LR'
+  rankDir: 'LR',
+  animate: true,
+  animationEasing: theme.euiAnimSlightBounce,
+  animationDuration: parseInt(theme.euiAnimSpeedNormal, 10)
 };
 
 function isService(el: cytoscape.NodeSingular) {

From 4dbe14d942fee2c3e3e828011ca8a12da20e94cd Mon Sep 17 00:00:00 2001
From: Nathan L Smith <nathan.smith@elastic.co>
Date: Fri, 31 Jan 2020 00:11:06 -0600
Subject: [PATCH 19/23] [APM] Fit service map to container (#56336) (#56463)

* Set the height of the service map dynamically
* Move the loading overlay from the outside to the inside of the Cytoscape container
* Remove the EUI spacer from the Home and ServiceDetailTabs components and add it to the individual components that use them
---
 .../app/ErrorGroupOverview/index.tsx          | 63 +++++++++--------
 .../apm/public/components/app/Home/index.tsx  | 20 +++---
 .../app/ServiceDetails/ServiceDetailTabs.tsx  | 23 +++----
 .../components/app/ServiceMap/Cytoscape.tsx   |  8 ++-
 .../app/ServiceMap/LoadingOverlay.tsx         |  8 +--
 .../components/app/ServiceMap/index.tsx       | 19 +++--
 .../components/app/ServiceMap/useRefHeight.ts | 20 ++++++
 .../components/app/ServiceMetrics/index.tsx   | 41 ++++++-----
 .../app/ServiceNodeOverview/index.tsx         | 52 ++++++++------
 .../components/app/ServiceOverview/index.tsx  | 41 ++++++-----
 .../components/app/TraceOverview/index.tsx    | 28 +++++---
 .../app/TransactionOverview/index.tsx         | 69 ++++++++++---------
 .../apm/public/new-platform/plugin.tsx        |  4 +-
 13 files changed, 227 insertions(+), 169 deletions(-)
 create mode 100644 x-pack/legacy/plugins/apm/public/components/app/ServiceMap/useRefHeight.ts

diff --git a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
index 2e1efabf47b2c..2daf5e55d4e72 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ErrorGroupOverview/index.tsx
@@ -95,39 +95,42 @@ const ErrorGroupOverview: React.FC = () => {
   }
 
   return (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localUIFiltersConfig} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={7}>
-        <EuiFlexGroup>
-          <EuiFlexItem>
-            <EuiPanel>
-              <ErrorDistribution
-                distribution={errorDistributionData}
-                title={i18n.translate(
-                  'xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle',
-                  {
-                    defaultMessage: 'Error occurrences'
-                  }
-                )}
-              />
-            </EuiPanel>
-          </EuiFlexItem>
-        </EuiFlexGroup>
+    <>
+      <EuiSpacer />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <LocalUIFilters {...localUIFiltersConfig} />
+        </EuiFlexItem>
+        <EuiFlexItem grow={7}>
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              <EuiPanel>
+                <ErrorDistribution
+                  distribution={errorDistributionData}
+                  title={i18n.translate(
+                    'xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle',
+                    {
+                      defaultMessage: 'Error occurrences'
+                    }
+                  )}
+                />
+              </EuiPanel>
+            </EuiFlexItem>
+          </EuiFlexGroup>
 
-        <EuiSpacer size="s" />
-
-        <EuiPanel>
-          <EuiTitle size="xs">
-            <h3>Errors</h3>
-          </EuiTitle>
           <EuiSpacer size="s" />
 
-          <ErrorGroupList items={errorGroupListData} />
-        </EuiPanel>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+          <EuiPanel>
+            <EuiTitle size="xs">
+              <h3>Errors</h3>
+            </EuiTitle>
+            <EuiSpacer size="s" />
+
+            <ErrorGroupList items={errorGroupListData} />
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 };
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/Home/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/Home/index.tsx
index 4c98618d7de8a..5f8fa8bf5dc07 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/Home/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/Home/index.tsx
@@ -5,27 +5,26 @@
  */
 
 import {
+  EuiButtonEmpty,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiTitle,
-  EuiButtonEmpty,
   EuiTabs,
-  EuiSpacer
+  EuiTitle
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { $ElementType } from 'utility-types';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 import { ApmHeader } from '../../shared/ApmHeader';
-import { SetupInstructionsLink } from '../../shared/Links/SetupInstructionsLink';
-import { ServiceOverview } from '../ServiceOverview';
-import { TraceOverview } from '../TraceOverview';
-import { ServiceOverviewLink } from '../../shared/Links/apm/ServiceOverviewLink';
-import { TraceOverviewLink } from '../../shared/Links/apm/TraceOverviewLink';
 import { EuiTabLink } from '../../shared/EuiTabLink';
-import { SettingsLink } from '../../shared/Links/apm/SettingsLink';
 import { ServiceMapLink } from '../../shared/Links/apm/ServiceMapLink';
+import { ServiceOverviewLink } from '../../shared/Links/apm/ServiceOverviewLink';
+import { SettingsLink } from '../../shared/Links/apm/SettingsLink';
+import { TraceOverviewLink } from '../../shared/Links/apm/TraceOverviewLink';
+import { SetupInstructionsLink } from '../../shared/Links/SetupInstructionsLink';
 import { ServiceMap } from '../ServiceMap';
-import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { ServiceOverview } from '../ServiceOverview';
+import { TraceOverview } from '../TraceOverview';
 
 function getHomeTabs({
   serviceMapEnabled = false
@@ -116,7 +115,6 @@ export function Home({ tab }: Props) {
           </EuiTabLink>
         ))}
       </EuiTabs>
-      <EuiSpacer />
       {selectedTab.render()}
     </div>
   );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx
index 75ea02491967e..7ab2f7bac8ae2 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceDetails/ServiceDetailTabs.tsx
@@ -4,24 +4,24 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { EuiTabs } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { EuiTabs, EuiSpacer } from '@elastic/eui';
-import { ErrorGroupOverview } from '../ErrorGroupOverview';
-import { TransactionOverview } from '../TransactionOverview';
-import { ServiceMetrics } from '../ServiceMetrics';
-import { isRumAgentName, isJavaAgentName } from '../../../../common/agent_name';
-import { EuiTabLink } from '../../shared/EuiTabLink';
+import { isJavaAgentName, isRumAgentName } from '../../../../common/agent_name';
+import { useAgentName } from '../../../hooks/useAgentName';
+import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
 import { useUrlParams } from '../../../hooks/useUrlParams';
-import { TransactionOverviewLink } from '../../shared/Links/apm/TransactionOverviewLink';
+import { EuiTabLink } from '../../shared/EuiTabLink';
 import { ErrorOverviewLink } from '../../shared/Links/apm/ErrorOverviewLink';
 import { MetricOverviewLink } from '../../shared/Links/apm/MetricOverviewLink';
+import { ServiceMapLink } from '../../shared/Links/apm/ServiceMapLink';
 import { ServiceNodeOverviewLink } from '../../shared/Links/apm/ServiceNodeOverviewLink';
-import { ServiceNodeOverview } from '../ServiceNodeOverview';
-import { useAgentName } from '../../../hooks/useAgentName';
+import { TransactionOverviewLink } from '../../shared/Links/apm/TransactionOverviewLink';
+import { ErrorGroupOverview } from '../ErrorGroupOverview';
 import { ServiceMap } from '../ServiceMap';
-import { ServiceMapLink } from '../../shared/Links/apm/ServiceMapLink';
-import { useApmPluginContext } from '../../../hooks/useApmPluginContext';
+import { ServiceMetrics } from '../ServiceMetrics';
+import { ServiceNodeOverview } from '../ServiceNodeOverview';
+import { TransactionOverview } from '../TransactionOverview';
 
 interface Props {
   tab: 'transactions' | 'errors' | 'metrics' | 'nodes' | 'service-map';
@@ -124,7 +124,6 @@ export function ServiceDetailTabs({ tab }: Props) {
           </EuiTabLink>
         ))}
       </EuiTabs>
-      <EuiSpacer />
       {selectedTab ? selectedTab.render() : null}
     </>
   );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
index d69fa5d895b9e..f7d74bee1aa50 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
@@ -25,6 +25,7 @@ export const CytoscapeContext = createContext<cytoscape.Core | undefined>(
 interface CytoscapeProps {
   children?: ReactNode;
   elements: cytoscape.ElementDefinition[];
+  height: number;
   serviceName?: string;
   style?: CSSProperties;
 }
@@ -54,11 +55,16 @@ function useCytoscape(options: cytoscape.CytoscapeOptions) {
 export function Cytoscape({
   children,
   elements,
+  height,
   serviceName,
   style
 }: CytoscapeProps) {
   const [ref, cy] = useCytoscape({ ...cytoscapeOptions, elements });
 
+  // Add the height to the div style. The height is a separate prop because it
+  // is required and can trigger rendering when changed.
+  const divStyle = { ...style, height };
+
   // Trigger a custom "data" event when data changes
   useEffect(() => {
     if (cy) {
@@ -108,7 +114,7 @@ export function Cytoscape({
 
   return (
     <CytoscapeContext.Provider value={cy}>
-      <div ref={ref} style={style}>
+      <div ref={ref} style={divStyle}>
         {children}
       </div>
     </CytoscapeContext.Provider>
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx
index efafdbcecd41c..c08d3acbf1861 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/LoadingOverlay.tsx
@@ -31,16 +31,11 @@ const ProgressBarContainer = styled.div`
 `;
 
 interface Props {
-  children: React.ReactNode;
   isLoading: boolean;
   percentageLoaded: number;
 }
 
-export const LoadingOverlay = ({
-  children,
-  isLoading,
-  percentageLoaded
-}: Props) => (
+export const LoadingOverlay = ({ isLoading, percentageLoaded }: Props) => (
   <Container>
     {isLoading && (
       <Overlay>
@@ -61,6 +56,5 @@ export const LoadingOverlay = ({
         </EuiText>
       </Overlay>
     )}
-    {children}
   </Container>
 );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
index a8e6f964f4d0c..24fb0b9e5d8a3 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/index.tsx
@@ -30,13 +30,13 @@ import { getCytoscapeElements } from './get_cytoscape_elements';
 import { LoadingOverlay } from './LoadingOverlay';
 import { PlatinumLicensePrompt } from './PlatinumLicensePrompt';
 import { Popover } from './Popover';
+import { useRefHeight } from './useRefHeight';
 
 interface ServiceMapProps {
   serviceName?: string;
 }
 
 const cytoscapeDivStyle = {
-  height: '85vh',
   background: `linear-gradient(
   90deg,
   ${theme.euiPageBackgroundColor}
@@ -52,7 +52,8 @@ linear-gradient(
 center,
 ${theme.euiColorLightShade}`,
   backgroundSize: `${theme.euiSizeL} ${theme.euiSizeL}`,
-  margin: `-${theme.gutterTypes.gutterLarge}`
+  margin: `-${theme.gutterTypes.gutterLarge}`,
+  marginTop: 0
 };
 
 const MAX_REQUESTS = 5;
@@ -198,17 +199,27 @@ export function ServiceMap({ serviceName }: ServiceMapProps) {
     license?.isActive &&
     (license?.type === 'platinum' || license?.type === 'trial');
 
+  const [wrapperRef, height] = useRefHeight();
+
   return isValidPlatinumLicense ? (
-    <LoadingOverlay isLoading={isLoading} percentageLoaded={percentageLoaded}>
+    <div
+      style={{ height: height - parseInt(theme.gutterTypes.gutterLarge, 10) }}
+      ref={wrapperRef}
+    >
       <Cytoscape
         elements={renderedElements.current}
         serviceName={serviceName}
+        height={height}
         style={cytoscapeDivStyle}
       >
+        <LoadingOverlay
+          isLoading={isLoading}
+          percentageLoaded={percentageLoaded}
+        />
         <Controls />
         <Popover focusedServiceName={serviceName} />
       </Cytoscape>
-    </LoadingOverlay>
+    </div>
   ) : (
     <PlatinumLicensePrompt />
   );
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/useRefHeight.ts b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/useRefHeight.ts
new file mode 100644
index 0000000000000..b8fba47acd2d6
--- /dev/null
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMap/useRefHeight.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { MutableRefObject, useRef } from 'react';
+import { useWindowSize } from 'react-use';
+
+export function useRefHeight(): [
+  MutableRefObject<HTMLDivElement | null>,
+  number
+] {
+  const ref = useRef<HTMLDivElement>(null);
+  const windowHeight = useWindowSize().height;
+  const topOffset = ref.current?.getBoundingClientRect()?.top ?? 0;
+
+  const height = ref.current ? windowHeight - topOffset : 0;
+
+  return [ref, height];
+}
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx
index d01093be801a2..0fb8c00a2b162 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceMetrics/index.tsx
@@ -43,24 +43,27 @@ export function ServiceMetrics({ agentName }: ServiceMetricsProps) {
   );
 
   return (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localFiltersConfig} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={7}>
-        <ChartsSyncContextProvider>
-          <EuiFlexGrid columns={2} gutterSize="s">
-            {data.charts.map(chart => (
-              <EuiFlexItem key={chart.key}>
-                <EuiPanel>
-                  <MetricsChart start={start} end={end} chart={chart} />
-                </EuiPanel>
-              </EuiFlexItem>
-            ))}
-          </EuiFlexGrid>
-          <EuiSpacer size="xxl" />
-        </ChartsSyncContextProvider>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <>
+      <EuiSpacer />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <LocalUIFilters {...localFiltersConfig} />
+        </EuiFlexItem>
+        <EuiFlexItem grow={7}>
+          <ChartsSyncContextProvider>
+            <EuiFlexGrid columns={2} gutterSize="s">
+              {data.charts.map(chart => (
+                <EuiFlexItem key={chart.key}>
+                  <EuiPanel>
+                    <MetricsChart start={start} end={end} chart={chart} />
+                  </EuiPanel>
+                </EuiFlexItem>
+              ))}
+            </EuiFlexGrid>
+            <EuiSpacer size="xxl" />
+          </ChartsSyncContextProvider>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx
index a118871a5e268..4e57cb47691be 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceNodeOverview/index.tsx
@@ -4,7 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React, { useMemo } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiToolTip } from '@elastic/eui';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPanel,
+  EuiToolTip,
+  EuiSpacer
+} from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import styled from 'styled-components';
 import { UNIDENTIFIED_SERVICE_NODES_LABEL } from '../../../../common/i18n';
@@ -150,25 +156,31 @@ const ServiceNodeOverview = () => {
   ];
 
   return (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localFiltersConfig} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={7}>
-        <EuiPanel>
-          <ManagedTable
-            noItemsMessage={i18n.translate('xpack.apm.jvmsTable.noJvmsLabel', {
-              defaultMessage: 'No JVMs were found'
-            })}
-            items={items}
-            columns={columns}
-            initialPageSize={INITIAL_PAGE_SIZE}
-            initialSortField={INITIAL_SORT_FIELD}
-            initialSortDirection={INITIAL_SORT_DIRECTION}
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <>
+      <EuiSpacer />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <LocalUIFilters {...localFiltersConfig} />
+        </EuiFlexItem>
+        <EuiFlexItem grow={7}>
+          <EuiPanel>
+            <ManagedTable
+              noItemsMessage={i18n.translate(
+                'xpack.apm.jvmsTable.noJvmsLabel',
+                {
+                  defaultMessage: 'No JVMs were found'
+                }
+              )}
+              items={items}
+              columns={columns}
+              initialPageSize={INITIAL_PAGE_SIZE}
+              initialSortField={INITIAL_SORT_FIELD}
+              initialSortDirection={INITIAL_SORT_DIRECTION}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 };
 
diff --git a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/index.tsx
index 05ccc691ecdba..b522736c80f9b 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/ServiceOverview/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiPanel, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import { EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useMemo } from 'react';
@@ -94,23 +94,26 @@ export function ServiceOverview() {
   );
 
   return (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localFiltersConfig} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={7}>
-        <EuiPanel>
-          <ServiceList
-            items={data.items}
-            noItemsMessage={
-              <NoServicesMessage
-                historicalDataFound={data.hasHistoricalData}
-                status={status}
-              />
-            }
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <>
+      <EuiSpacer />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <LocalUIFilters {...localFiltersConfig} />
+        </EuiFlexItem>
+        <EuiFlexItem grow={7}>
+          <EuiPanel>
+            <ServiceList
+              items={data.items}
+              noItemsMessage={
+                <NoServicesMessage
+                  historicalDataFound={data.hasHistoricalData}
+                  status={status}
+                />
+              }
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx
index cf701d02aa5cb..dd3e2d13826dc 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TraceOverview/index.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { EuiPanel, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiPanel, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 import React, { useMemo } from 'react';
 import { FETCH_STATUS, useFetcher } from '../../../hooks/useFetcher';
 import { TraceList } from './TraceList';
@@ -47,15 +47,21 @@ export function TraceOverview() {
   }, []);
 
   return (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localUIFiltersConfig} showCount={false} />
-      </EuiFlexItem>
-      <EuiFlexItem grow={7}>
-        <EuiPanel>
-          <TraceList items={data} isLoading={status === FETCH_STATUS.LOADING} />
-        </EuiPanel>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+    <>
+      <EuiSpacer />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <LocalUIFilters {...localUIFiltersConfig} showCount={false} />
+        </EuiFlexItem>
+        <EuiFlexItem grow={7}>
+          <EuiPanel>
+            <TraceList
+              items={data}
+              isLoading={status === FETCH_STATUS.LOADING}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx
index 439e3d80eef4f..2cf01f8b40a09 100644
--- a/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx
+++ b/x-pack/legacy/plugins/apm/public/components/app/TransactionOverview/index.tsx
@@ -119,41 +119,44 @@ export function TransactionOverview() {
   }
 
   return (
-    <EuiFlexGroup>
-      <EuiFlexItem grow={1}>
-        <LocalUIFilters {...localFiltersConfig}>
-          <TransactionTypeFilter transactionTypes={serviceTransactionTypes} />
-          <EuiSpacer size="xl" />
-          <EuiHorizontalRule margin="none" />
-        </LocalUIFilters>
-      </EuiFlexItem>
-      <EuiFlexItem grow={7}>
-        <ChartsSyncContextProvider>
-          <TransactionBreakdown initialIsOpen={true} />
+    <>
+      <EuiSpacer />
+      <EuiFlexGroup>
+        <EuiFlexItem grow={1}>
+          <LocalUIFilters {...localFiltersConfig}>
+            <TransactionTypeFilter transactionTypes={serviceTransactionTypes} />
+            <EuiSpacer size="xl" />
+            <EuiHorizontalRule margin="none" />
+          </LocalUIFilters>
+        </EuiFlexItem>
+        <EuiFlexItem grow={7}>
+          <ChartsSyncContextProvider>
+            <TransactionBreakdown initialIsOpen={true} />
+
+            <EuiSpacer size="s" />
+
+            <TransactionCharts
+              hasMLJob={hasMLJob}
+              charts={transactionCharts}
+              location={location}
+              urlParams={urlParams}
+            />
+          </ChartsSyncContextProvider>
 
           <EuiSpacer size="s" />
 
-          <TransactionCharts
-            hasMLJob={hasMLJob}
-            charts={transactionCharts}
-            location={location}
-            urlParams={urlParams}
-          />
-        </ChartsSyncContextProvider>
-
-        <EuiSpacer size="s" />
-
-        <EuiPanel>
-          <EuiTitle size="xs">
-            <h3>Transactions</h3>
-          </EuiTitle>
-          <EuiSpacer size="s" />
-          <TransactionList
-            isLoading={transactionListStatus === 'loading'}
-            items={transactionListData}
-          />
-        </EuiPanel>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+          <EuiPanel>
+            <EuiTitle size="xs">
+              <h3>Transactions</h3>
+            </EuiTitle>
+            <EuiSpacer size="s" />
+            <TransactionList
+              isLoading={transactionListStatus === 'loading'}
+              items={transactionListData}
+            />
+          </EuiPanel>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
   );
 }
diff --git a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
index e6c81d1190ce3..26e0f25cbb666 100644
--- a/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
+++ b/x-pack/legacy/plugins/apm/public/new-platform/plugin.tsx
@@ -39,7 +39,7 @@ import { setReadonlyBadge } from './updateBadge';
 
 export const REACT_APP_ROOT_ID = 'react-apm-root';
 
-const MainContainer = styled.main`
+const MainContainer = styled.div`
   min-width: ${px(unit * 50)};
   padding: ${px(units.plus)};
   height: 100%;
@@ -47,7 +47,7 @@ const MainContainer = styled.main`
 
 const App = () => {
   return (
-    <MainContainer data-test-subj="apmMainContainer">
+    <MainContainer data-test-subj="apmMainContainer" role="main">
       <UpdateBreadcrumbs routes={routes} />
       <Route component={ScrollToTopOnPathChange} />
       <Switch>

From d3a2d9fde26a417d27f93c687960e2abdfa688cd Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Fri, 31 Jan 2020 12:57:30 +0300
Subject: [PATCH 20/23] kuery_autocomplete -> convert remaining items to
 TS/Jest (#56316) (#56471)

* kuery_autocomplete -> convert remaining items to TS/Jest

Closes #55487

* QuerySuggestionsTypes rename values

* remove ref to npStart

* conjunction.test.ts it -> test

* remove ts-ignore
---
 .../data/common/es_query/kuery/types.ts       |   2 +
 .../autocomplete/autocomplete_service.ts      |   6 +
 src/plugins/data/public/autocomplete/index.ts |   5 +-
 .../providers/query_suggestion_provider.ts    |  26 ++-
 .../autocomplete/{types.ts => static.ts}      |  14 +-
 src/plugins/data/public/index.ts              |   5 +-
 src/plugins/data/public/types.ts              |   2 +-
 .../query_string_input/query_string_input.tsx |   6 +-
 .../typeahead/suggestion_component.test.tsx   |   2 +-
 .../typeahead/suggestions_component.test.tsx  |   4 +-
 .../__tests__/conjunction.js                  |  48 ----
 .../kql_query_suggestion/__tests__/field.js   | 146 ------------
 .../__tests__/operator.js                     |  64 ------
 .../kql_query_suggestion/conjunction.test.ts  |  63 +++++
 .../{conjunction.js => conjunction.tsx}       |  35 +--
 .../public/kql_query_suggestion/field.test.ts | 216 ++++++++++++++++++
 .../{field.js => field.tsx}                   |  71 +++---
 .../public/kql_query_suggestion/index.js      |  58 -----
 .../public/kql_query_suggestion/index.ts      |  59 +++++
 .../escape_kuery.test.ts}                     |  45 ++--
 .../{escape_kuery.js => lib/escape_kuery.ts}  |  20 +-
 .../kql_query_suggestion/operator.test.ts     |  96 ++++++++
 .../{operator.js => operator.tsx}             |  57 +++--
 .../kql_query_suggestion/sort_prefix_first.ts |   2 +
 .../public/kql_query_suggestion/types.ts      |  15 ++
 .../public/kql_query_suggestion/value.js      |  58 -----
 .../public/kql_query_suggestion/value.test.js | 146 ------------
 .../public/kql_query_suggestion/value.test.ts | 192 ++++++++++++++++
 .../public/kql_query_suggestion/value.ts      |  62 +++++
 .../kuery_autocomplete/public/legacy.ts       |  15 +-
 .../kuery_autocomplete/public/plugin.ts       |  14 +-
 .../kuery_autocomplete/public/services.ts     |  12 +
 .../__examples__/index.stories.tsx            |   2 +-
 .../autocomplete_field/index.test.tsx         |  20 +-
 34 files changed, 915 insertions(+), 673 deletions(-)
 rename src/plugins/data/public/autocomplete/{types.ts => static.ts} (76%)
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{conjunction.js => conjunction.tsx} (72%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{field.js => field.tsx} (66%)
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{__tests__/escape_kuery.js => lib/escape_kuery.test.ts} (55%)
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{escape_kuery.js => lib/escape_kuery.ts} (57%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts
 rename x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/{operator.js => operator.tsx} (82%)
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.ts
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js
 delete mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts
 create mode 100644 x-pack/legacy/plugins/kuery_autocomplete/public/services.ts

diff --git a/src/plugins/data/common/es_query/kuery/types.ts b/src/plugins/data/common/es_query/kuery/types.ts
index 86cb7e08a767c..63c52bb64dc65 100644
--- a/src/plugins/data/common/es_query/kuery/types.ts
+++ b/src/plugins/data/common/es_query/kuery/types.ts
@@ -33,6 +33,8 @@ export interface KueryParseOptions {
   startRule: string;
   allowLeadingWildcards: boolean;
   errorOnLuceneSyntax: boolean;
+  cursorSymbol?: string;
+  parseCursor?: boolean;
 }
 
 export { nodeTypes } from './node_types';
diff --git a/src/plugins/data/public/autocomplete/autocomplete_service.ts b/src/plugins/data/public/autocomplete/autocomplete_service.ts
index 0527f833b0f8c..78bd2ec85f477 100644
--- a/src/plugins/data/public/autocomplete/autocomplete_service.ts
+++ b/src/plugins/data/public/autocomplete/autocomplete_service.ts
@@ -75,3 +75,9 @@ export class AutocompleteService {
     this.querySuggestionProviders.clear();
   }
 }
+
+/** @public **/
+export type AutocompleteSetup = ReturnType<AutocompleteService['setup']>;
+
+/** @public **/
+export type AutocompleteStart = ReturnType<AutocompleteService['start']>;
diff --git a/src/plugins/data/public/autocomplete/index.ts b/src/plugins/data/public/autocomplete/index.ts
index 5b8f3ae510bfd..c2b21e84b7a38 100644
--- a/src/plugins/data/public/autocomplete/index.ts
+++ b/src/plugins/data/public/autocomplete/index.ts
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import * as autocomplete from './static';
+export { AutocompleteService, AutocompleteSetup, AutocompleteStart } from './autocomplete_service';
 
-export { AutocompleteService } from './autocomplete_service';
-export { QuerySuggestion, QuerySuggestionType, QuerySuggestionsGetFn } from './types';
+export { autocomplete };
diff --git a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts b/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
index 53abdd44c0c3f..94054ed56f42a 100644
--- a/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
+++ b/src/plugins/data/public/autocomplete/providers/query_suggestion_provider.ts
@@ -19,13 +19,20 @@
 
 import { IFieldType, IIndexPattern } from '../../../common/index_patterns';
 
-export type QuerySuggestionType = 'field' | 'value' | 'operator' | 'conjunction' | 'recentSearch';
+export enum QuerySuggestionsTypes {
+  Field = 'field',
+  Value = 'value',
+  Operator = 'operator',
+  Conjunction = 'conjunction',
+  RecentSearch = 'recentSearch',
+}
 
 export type QuerySuggestionsGetFn = (
   args: QuerySuggestionsGetFnArgs
 ) => Promise<QuerySuggestion[]> | undefined;
 
-interface QuerySuggestionsGetFnArgs {
+/** @public **/
+export interface QuerySuggestionsGetFnArgs {
   language: string;
   indexPatterns: IIndexPattern[];
   query: string;
@@ -35,22 +42,21 @@ interface QuerySuggestionsGetFnArgs {
   boolFilter?: any;
 }
 
-interface BasicQuerySuggestion {
-  type: QuerySuggestionType;
-  description?: string;
+/** @public **/
+export interface BasicQuerySuggestion {
+  type: QuerySuggestionsTypes;
+  description?: string | JSX.Element;
   end: number;
   start: number;
   text: string;
   cursorIndex?: number;
 }
 
-interface FieldQuerySuggestion extends BasicQuerySuggestion {
-  type: 'field';
+/** @public **/
+export interface FieldQuerySuggestion extends BasicQuerySuggestion {
+  type: QuerySuggestionsTypes.Field;
   field: IFieldType;
 }
 
-// A union type allows us to do easy type guards in the code. For example, if I want to ensure I'm
-// working with a FieldAutocompleteSuggestion, I can just do `if ('field' in suggestion)` and the
-// TypeScript compiler will narrow the type to the parts of the union that have a field prop.
 /** @public **/
 export type QuerySuggestion = BasicQuerySuggestion | FieldQuerySuggestion;
diff --git a/src/plugins/data/public/autocomplete/types.ts b/src/plugins/data/public/autocomplete/static.ts
similarity index 76%
rename from src/plugins/data/public/autocomplete/types.ts
rename to src/plugins/data/public/autocomplete/static.ts
index 759e2dd25a5bc..7d627486c6d65 100644
--- a/src/plugins/data/public/autocomplete/types.ts
+++ b/src/plugins/data/public/autocomplete/static.ts
@@ -17,17 +17,11 @@
  * under the License.
  */
 
-import { AutocompleteService } from './autocomplete_service';
-
-/** @public **/
-export type AutocompleteSetup = ReturnType<AutocompleteService['setup']>;
-
-/** @public **/
-export type AutocompleteStart = ReturnType<AutocompleteService['start']>;
-
-/** @public **/
 export {
   QuerySuggestion,
+  QuerySuggestionsTypes,
   QuerySuggestionsGetFn,
-  QuerySuggestionType,
+  QuerySuggestionsGetFnArgs,
+  BasicQuerySuggestion,
+  FieldQuerySuggestion,
 } from './providers/query_suggestion_provider';
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
index bc25c64f0e96e..2fa6b8deae69d 100644
--- a/src/plugins/data/public/index.ts
+++ b/src/plugins/data/public/index.ts
@@ -18,7 +18,6 @@
  */
 
 import { PluginInitializerContext } from '../../../core/public';
-import * as autocomplete from './autocomplete';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DataPublicPlugin(initializerContext);
@@ -44,7 +43,7 @@ export {
   RefreshInterval,
   TimeRange,
 } from '../common';
-
+export { autocomplete } from './autocomplete';
 export * from './field_formats';
 export * from './index_patterns';
 export * from './search';
@@ -70,5 +69,3 @@ export {
 // Export plugin after all other imports
 import { DataPublicPlugin } from './plugin';
 export { DataPublicPlugin as Plugin };
-
-export { autocomplete };
diff --git a/src/plugins/data/public/types.ts b/src/plugins/data/public/types.ts
index 6b6ff5e62e63f..e62aba5f2713d 100644
--- a/src/plugins/data/public/types.ts
+++ b/src/plugins/data/public/types.ts
@@ -20,7 +20,7 @@
 import { CoreStart } from 'src/core/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { IUiActionsSetup, IUiActionsStart } from 'src/plugins/ui_actions/public';
-import { AutocompleteSetup, AutocompleteStart } from './autocomplete/types';
+import { AutocompleteSetup, AutocompleteStart } from './autocomplete';
 import { FieldFormatsSetup, FieldFormatsStart } from './field_formats';
 import { ISearchSetup, ISearchStart } from './search';
 import { QuerySetup, QueryStart } from './query';
diff --git a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
index cf219c35bcced..7a8c0f7269fa1 100644
--- a/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
+++ b/src/plugins/data/public/ui/query_string_input/query_string_input.tsx
@@ -89,8 +89,6 @@ const KEY_CODES = {
   END: 35,
 };
 
-const recentSearchType: autocomplete.QuerySuggestionType = 'recentSearch';
-
 export class QueryStringInputUI extends Component<Props, State> {
   public state: State = {
     isSuggestionsVisible: false,
@@ -193,7 +191,7 @@ export class QueryStringInputUI extends Component<Props, State> {
       const text = toUser(recentSearch);
       const start = 0;
       const end = query.length;
-      return { type: recentSearchType, text, start, end };
+      return { type: autocomplete.QuerySuggestionsTypes.RecentSearch, text, start, end };
     });
   };
 
@@ -343,7 +341,7 @@ export class QueryStringInputUI extends Component<Props, State> {
       selectionEnd: start + (cursorIndex ? cursorIndex : text.length),
     });
 
-    if (type === recentSearchType) {
+    if (type === autocomplete.QuerySuggestionsTypes.RecentSearch) {
       this.setState({ isSuggestionsVisible: false, index: null });
       this.onSubmit({ query: newQueryString, language: this.props.query.language });
     }
diff --git a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx b/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
index 0c5c701642757..ba92be8947ea5 100644
--- a/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestion_component.test.tsx
@@ -31,7 +31,7 @@ const mockSuggestion: autocomplete.QuerySuggestion = {
   end: 0,
   start: 42,
   text: 'as promised, not helpful',
-  type: 'value',
+  type: autocomplete.QuerySuggestionsTypes.Value,
 };
 
 describe('SuggestionComponent', () => {
diff --git a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx b/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
index b84f612b6d13a..eebe438025949 100644
--- a/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
+++ b/src/plugins/data/public/ui/typeahead/suggestions_component.test.tsx
@@ -33,14 +33,14 @@ const mockSuggestions: autocomplete.QuerySuggestion[] = [
     end: 0,
     start: 42,
     text: 'as promised, not helpful',
-    type: 'value',
+    type: autocomplete.QuerySuggestionsTypes.Value,
   },
   {
     description: 'This is another unhelpful suggestion',
     end: 0,
     start: 42,
     text: 'yep',
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
   },
 ];
 
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js
deleted file mode 100644
index 94990edef5e82..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/conjunction.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { getSuggestionsProvider } from '../conjunction';
-
-describe('Kuery conjunction suggestions', function() {
-  const getSuggestions = getSuggestionsProvider();
-
-  it('should return a function', function() {
-    expect(typeof getSuggestions).to.be('function');
-  });
-
-  it('should not suggest anything for phrases not ending in whitespace', function() {
-    const text = 'foo';
-    const suggestions = getSuggestions({ text });
-    expect(suggestions).to.eql([]);
-  });
-
-  it('should suggest and/or for phrases ending in whitespace', function() {
-    const text = 'foo ';
-    const suggestions = getSuggestions({ text });
-    expect(suggestions.length).to.be(2);
-    expect(suggestions.map(suggestion => suggestion.text)).to.eql(['and ', 'or ']);
-  });
-
-  it('should suggest to insert the suggestion at the end of the string', function() {
-    const text = 'bar ';
-    const end = text.length;
-    const suggestions = getSuggestions({ text, end });
-    expect(suggestions.length).to.be(2);
-    expect(suggestions.map(suggestion => suggestion.start)).to.eql([end, end]);
-    expect(suggestions.map(suggestion => suggestion.end)).to.eql([end, end]);
-  });
-  it('should have descriptions', function() {
-    const text = ' ';
-    const suggestions = getSuggestions({ text });
-    expect(typeof suggestions).to.be('object');
-    expect(Object.keys(suggestions).length).to.be(2);
-    suggestions.forEach(suggestion => {
-      expect(typeof suggestion).to.be('object');
-      expect(suggestion).to.have.property('description');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js
deleted file mode 100644
index 6dc07da68a5ea..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/field.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { getSuggestionsProvider } from '../field';
-import indexPatternResponse from '../__fixtures__/index_pattern_response.json';
-import { isFilterable } from '../../../../../../../src/plugins/data/public';
-
-describe('Kuery field suggestions', function() {
-  let indexPattern;
-  let indexPatterns;
-  let getSuggestions;
-
-  beforeEach(() => {
-    indexPattern = indexPatternResponse;
-    indexPatterns = [indexPattern];
-    getSuggestions = getSuggestionsProvider({ indexPatterns });
-  });
-
-  it('should return a function', function() {
-    expect(typeof getSuggestions).to.be('function');
-  });
-
-  it('should return filterable fields', function() {
-    const prefix = '';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    const filterableFields = indexPattern.fields.filter(isFilterable);
-    expect(suggestions.length).to.be(filterableFields.length);
-  });
-
-  it('should filter suggestions based on the query', () => {
-    const prefix = 'machine';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.find(({ text }) => text === 'machine.os ')).to.be.ok();
-  });
-
-  it('should filter suggestions case insensitively', () => {
-    const prefix = 'MACHINE';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.find(({ text }) => text === 'machine.os ')).to.be.ok();
-  });
-
-  it('should return suggestions where the query matches somewhere in the middle', () => {
-    const prefix = '.';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.find(({ text }) => text === 'machine.os ')).to.be.ok();
-  });
-
-  it('should return field names that start with the query first', () => {
-    const prefix = 'e';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    const extensionIndex = suggestions.findIndex(({ text }) => text === 'extension ');
-    const bytesIndex = suggestions.findIndex(({ text }) => text === 'bytes ');
-    expect(extensionIndex).to.be.lessThan(bytesIndex);
-  });
-
-  it('should sort keyword fields before analyzed versions', () => {
-    const prefix = '';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    const analyzedIndex = suggestions.findIndex(({ text }) => text === 'machine.os ');
-    const keywordIndex = suggestions.findIndex(({ text }) => text === 'machine.os.raw ');
-    expect(keywordIndex).to.be.lessThan(analyzedIndex);
-  });
-
-  it('should have descriptions', function() {
-    const prefix = '';
-    const suffix = '';
-    const suggestions = getSuggestions({ prefix, suffix });
-    expect(suggestions.length).to.be.greaterThan(0);
-    suggestions.forEach(suggestion => {
-      expect(suggestion).to.have.property('description');
-    });
-  });
-
-  describe('nested fields', function() {
-    it("should automatically wrap nested fields in KQL's nested syntax", () => {
-      const prefix = 'ch';
-      const suffix = '';
-      const suggestions = getSuggestions({ prefix, suffix });
-
-      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
-      expect(suggestion.text).to.be('nestedField:{ child  }');
-
-      // For most suggestions the cursor can be placed at the end of the suggestion text, but
-      // for the nested field syntax we want to place the cursor inside the curly braces
-      expect(suggestion.cursorIndex).to.be(20);
-    });
-
-    it('should narrow suggestions to children of a nested path if provided', () => {
-      const prefix = 'ch';
-      const suffix = '';
-
-      const allSuggestions = getSuggestions({ prefix, suffix });
-      expect(allSuggestions.length).to.be.greaterThan(2);
-
-      const nestedSuggestions = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
-      expect(nestedSuggestions).to.have.length(2);
-    });
-
-    it("should not wrap the suggestion in KQL's nested syntax if the correct nested path is already provided", () => {
-      const prefix = 'ch';
-      const suffix = '';
-
-      const suggestions = getSuggestions({ prefix, suffix, nestedPath: 'nestedField' });
-      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
-      expect(suggestion.text).to.be('child ');
-    });
-
-    it('should handle fields nested multiple levels deep', () => {
-      const prefix = 'doubly';
-      const suffix = '';
-
-      const suggestionsWithNoPath = getSuggestions({ prefix, suffix });
-      expect(suggestionsWithNoPath).to.have.length(1);
-      const [noPathSuggestion] = suggestionsWithNoPath;
-      expect(noPathSuggestion.text).to.be('nestedField.nestedChild:{ doublyNestedChild  }');
-
-      const suggestionsWithPartialPath = getSuggestions({
-        prefix,
-        suffix,
-        nestedPath: 'nestedField',
-      });
-      expect(suggestionsWithPartialPath).to.have.length(1);
-      const [partialPathSuggestion] = suggestionsWithPartialPath;
-      expect(partialPathSuggestion.text).to.be('nestedChild:{ doublyNestedChild  }');
-
-      const suggestionsWithFullPath = getSuggestions({
-        prefix,
-        suffix,
-        nestedPath: 'nestedField.nestedChild',
-      });
-      expect(suggestionsWithFullPath).to.have.length(1);
-      const [fullPathSuggestion] = suggestionsWithFullPath;
-      expect(fullPathSuggestion.text).to.be('doublyNestedChild ');
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js
deleted file mode 100644
index c248e3e8366a9..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/operator.js
+++ /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 expect from '@kbn/expect';
-import { getSuggestionsProvider } from '../operator';
-import indexPatternResponse from '../__fixtures__/index_pattern_response.json';
-
-describe('Kuery operator suggestions', function() {
-  let indexPatterns;
-  let getSuggestions;
-
-  beforeEach(() => {
-    indexPatterns = [indexPatternResponse];
-    getSuggestions = getSuggestionsProvider({ indexPatterns });
-  });
-
-  it('should return a function', function() {
-    expect(typeof getSuggestions).to.be('function');
-  });
-
-  it('should not return suggestions for non-fields', () => {
-    const fieldName = 'foo';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.length).to.eql([]);
-  });
-
-  it('should return exists for every field', () => {
-    const fieldName = 'custom_user_field';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.length).to.eql(1);
-    expect(suggestions[0].text).to.be(': * ');
-  });
-
-  it('should return equals for string fields', () => {
-    const fieldName = 'machine.os';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.find(({ text }) => text === ': ')).to.be.ok();
-    expect(suggestions.find(({ text }) => text === '< ')).to.not.be.ok();
-  });
-
-  it('should return numeric operators for numeric fields', () => {
-    const fieldName = 'bytes';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.find(({ text }) => text === ': ')).to.be.ok();
-    expect(suggestions.find(({ text }) => text === '< ')).to.be.ok();
-  });
-
-  it('should have descriptions', function() {
-    const fieldName = 'bytes';
-    const suggestions = getSuggestions({ fieldName });
-    expect(suggestions.length).to.be.greaterThan(0);
-    suggestions.forEach(suggestion => {
-      expect(suggestion).to.have.property('description');
-    });
-  });
-
-  it('should handle nested paths', () => {
-    const suggestions = getSuggestions({ fieldName: 'child', nestedPath: 'nestedField' });
-    expect(suggestions.length).to.be.greaterThan(0);
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts
new file mode 100644
index 0000000000000..e8aec0deec6d7
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.test.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { setupGetConjunctionSuggestions } from './conjunction';
+import { autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery conjunction suggestions', () => {
+  const querySuggestionsArgs = (null as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+  let getSuggestions: ReturnType<typeof setupGetConjunctionSuggestions>;
+
+  beforeEach(() => {
+    getSuggestions = setupGetConjunctionSuggestions(coreMock.createSetup());
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should not suggest anything for phrases not ending in whitespace', async () => {
+    const text = 'foo';
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text }));
+
+    expect(suggestions).toEqual([]);
+  });
+
+  test('should suggest and/or for phrases ending in whitespace', async () => {
+    const text = 'foo ';
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text }));
+
+    expect(suggestions.length).toBe(2);
+    expect(suggestions.map(suggestion => suggestion.text)).toEqual(['and ', 'or ']);
+  });
+
+  test('should suggest to insert the suggestion at the end of the string', async () => {
+    const text = 'bar ';
+    const end = text.length;
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text, end }));
+
+    expect(suggestions.length).toBe(2);
+    expect(suggestions.map(suggestion => suggestion.start)).toEqual([end, end]);
+    expect(suggestions.map(suggestion => suggestion.end)).toEqual([end, end]);
+  });
+
+  test('should have descriptions', async () => {
+    const text = ' ';
+    const suggestions = await getSuggestions(querySuggestionsArgs, mockKueryNode({ text }));
+
+    expect(typeof suggestions).toBe('object');
+    expect(Object.keys(suggestions).length).toBe(2);
+
+    suggestions.forEach(suggestion => {
+      expect(typeof suggestion).toBe('object');
+      expect(suggestion).toHaveProperty('description');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.tsx
similarity index 72%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.tsx
index 66f4e6f8eb341..f570586274fdd 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/conjunction.tsx
@@ -4,9 +4,10 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import React from 'react';
+import { $Keys } from 'utility-types';
 import { FormattedMessage } from '@kbn/i18n/react';
-
-const type = 'conjunction';
+import { KqlQuerySuggestionProvider } from './types';
+import { autocomplete } from '../../../../../../src/plugins/data/public';
 
 const bothArgumentsText = (
   <FormattedMessage
@@ -24,7 +25,7 @@ const oneOrMoreArgumentsText = (
   />
 );
 
-const conjunctions = {
+const conjunctions: Record<string, JSX.Element> = {
   and: (
     <p>
       <FormattedMessage
@@ -55,18 +56,20 @@ const conjunctions = {
   ),
 };
 
-function getDescription(conjunction) {
-  return conjunctions[conjunction];
-}
+export const setupGetConjunctionSuggestions: KqlQuerySuggestionProvider = core => {
+  return (querySuggestionsArgs, { text, end }) => {
+    let suggestions: autocomplete.QuerySuggestion[] | [] = [];
+
+    if (text.endsWith(' ')) {
+      suggestions = Object.keys(conjunctions).map((key: $Keys<typeof conjunctions>) => ({
+        type: autocomplete.QuerySuggestionsTypes.Conjunction,
+        text: `${key} `,
+        description: conjunctions[key],
+        start: end,
+        end,
+      }));
+    }
 
-export function getSuggestionsProvider() {
-  return function getConjunctionSuggestions({ text, end }) {
-    if (!text.endsWith(' ')) return [];
-    const suggestions = Object.keys(conjunctions).map(conjunction => {
-      const text = `${conjunction} `;
-      const description = getDescription(conjunction);
-      return { type, text, description, start: end, end };
-    });
-    return suggestions;
+    return Promise.resolve(suggestions);
   };
-}
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts
new file mode 100644
index 0000000000000..2fd5cfd17eb69
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.test.ts
@@ -0,0 +1,216 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+
+import { setupGetFieldSuggestions } from './field';
+import { isFilterable, autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery field suggestions', () => {
+  let querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs;
+  let getSuggestions: ReturnType<typeof setupGetFieldSuggestions>;
+
+  beforeEach(() => {
+    querySuggestionsArgs = ({
+      indexPatterns: [indexPatternResponse],
+    } as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+
+    getSuggestions = setupGetFieldSuggestions(coreMock.createSetup());
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should return filterable fields', async () => {
+    const prefix = '';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    const filterableFields = indexPatternResponse.fields.filter(isFilterable);
+
+    expect(suggestions.length).toBe(filterableFields.length);
+  });
+
+  test('should filter suggestions based on the query', async () => {
+    const prefix = 'machine';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+
+    expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
+  });
+
+  test('should filter suggestions case insensitively', async () => {
+    const prefix = 'MACHINE';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+
+    expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
+  });
+
+  test('should return suggestions where the query matches somewhere in the middle', async () => {
+    const prefix = '.';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+
+    expect(suggestions.find(({ text }) => text === 'machine.os ')).toBeDefined();
+  });
+
+  test('should return field names that start with the query first', async () => {
+    const prefix = 'e';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    const extensionIndex = suggestions.findIndex(({ text }) => text === 'extension ');
+    const bytesIndex = suggestions.findIndex(({ text }) => text === 'bytes ');
+
+    expect(extensionIndex).toBeLessThan(bytesIndex);
+  });
+
+  test('should sort keyword fields before analyzed versions', async () => {
+    const prefix = '';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    const analyzedIndex = suggestions.findIndex(({ text }) => text === 'machine.os ');
+    const keywordIndex = suggestions.findIndex(({ text }) => text === 'machine.os.raw ');
+
+    expect(keywordIndex).toBeLessThan(analyzedIndex);
+  });
+
+  test('should have descriptions', async () => {
+    const prefix = '';
+    const suffix = '';
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ prefix, suffix })
+    );
+    expect(suggestions.length).toBeGreaterThan(0);
+    suggestions.forEach(suggestion => {
+      expect(suggestion).toHaveProperty('description');
+    });
+  });
+
+  describe('nested fields', () => {
+    test("should automatically wrap nested fields in KQL's nested syntax", async () => {
+      const prefix = 'ch';
+      const suffix = '';
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({ prefix, suffix })
+      );
+
+      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
+
+      expect(suggestion).toBeDefined();
+
+      if (suggestion) {
+        expect(suggestion.text).toBe('nestedField:{ child  }');
+
+        // For most suggestions the cursor can be placed at the end of the suggestion text, but
+        // for the nested field syntax we want to place the cursor inside the curly braces
+        expect(suggestion.cursorIndex).toBe(20);
+      }
+    });
+
+    test('should narrow suggestions to children of a nested path if provided', async () => {
+      const prefix = 'ch';
+      const suffix = '';
+
+      const allSuggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({ prefix, suffix })
+      );
+      expect(allSuggestions.length).toBeGreaterThan(2);
+
+      const nestedSuggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField',
+        })
+      );
+      expect(nestedSuggestions).toHaveLength(2);
+    });
+
+    test("should not wrap the suggestion in KQL's nested syntax if the correct nested path is already provided", async () => {
+      const prefix = 'ch';
+      const suffix = '';
+
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField',
+        })
+      );
+      const suggestion = suggestions.find(({ field }) => field.name === 'nestedField.child');
+
+      expect(suggestion).toBeDefined();
+
+      if (suggestion) {
+        expect(suggestion.text).toBe('child ');
+      }
+    });
+
+    test('should handle fields nested multiple levels deep', async () => {
+      const prefix = 'doubly';
+      const suffix = '';
+
+      const suggestionsWithNoPath = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({ prefix, suffix })
+      );
+      expect(suggestionsWithNoPath).toHaveLength(1);
+      const [noPathSuggestion] = suggestionsWithNoPath;
+      expect(noPathSuggestion.text).toBe('nestedField.nestedChild:{ doublyNestedChild  }');
+
+      const suggestionsWithPartialPath = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField',
+        })
+      );
+      expect(suggestionsWithPartialPath).toHaveLength(1);
+      const [partialPathSuggestion] = suggestionsWithPartialPath;
+      expect(partialPathSuggestion.text).toBe('nestedChild:{ doublyNestedChild  }');
+
+      const suggestionsWithFullPath = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          prefix,
+          suffix,
+          nestedPath: 'nestedField.nestedChild',
+        })
+      );
+      expect(suggestionsWithFullPath).toHaveLength(1);
+      const [fullPathSuggestion] = suggestionsWithFullPath;
+      expect(fullPathSuggestion.text).toBe('doublyNestedChild ');
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.tsx
similarity index 66%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.tsx
index 3e5c92dfc007f..a8af884c24fc3 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/field.tsx
@@ -5,32 +5,42 @@
  */
 import React from 'react';
 import { flatten } from 'lodash';
-import { escapeKuery } from './escape_kuery';
-import { sortPrefixFirst } from './sort_prefix_first';
-import { isFilterable } from '../../../../../../src/plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { escapeKuery } from './lib/escape_kuery';
+import { sortPrefixFirst } from './sort_prefix_first';
+import { IFieldType, isFilterable, autocomplete } from '../../../../../../src/plugins/data/public';
+import { KqlQuerySuggestionProvider } from './types';
 
-const type = 'field';
-
-function getDescription(fieldName) {
+const getDescription = (field: IFieldType) => {
   return (
     <p>
       <FormattedMessage
         id="xpack.kueryAutocomplete.filterResultsDescription"
         defaultMessage="Filter results that contain {fieldName}"
-        values={{ fieldName: <span className="kbnSuggestionItem__callout">{fieldName}</span> }}
+        values={{ fieldName: <span className="kbnSuggestionItem__callout">{field.name}</span> }}
       />
     </p>
   );
-}
+};
 
-export function getSuggestionsProvider({ indexPatterns }) {
-  const allFields = flatten(
-    indexPatterns.map(indexPattern => {
-      return indexPattern.fields.filter(isFilterable);
-    })
-  );
-  return function getFieldSuggestions({ start, end, prefix, suffix, nestedPath = '' }) {
+const keywordComparator = (first: IFieldType, second: IFieldType) => {
+  const extensions = ['raw', 'keyword'];
+  if (extensions.map(ext => `${first.name}.${ext}`).includes(second.name)) {
+    return 1;
+  } else if (extensions.map(ext => `${second.name}.${ext}`).includes(first.name)) {
+    return -1;
+  }
+
+  return first.name.localeCompare(second.name);
+};
+
+export const setupGetFieldSuggestions: KqlQuerySuggestionProvider<autocomplete.FieldQuerySuggestion> = core => {
+  return ({ indexPatterns }, { start, end, prefix, suffix, nestedPath = '' }) => {
+    const allFields = flatten(
+      indexPatterns.map(indexPattern => {
+        return indexPattern.fields.filter(isFilterable);
+      })
+    );
     const search = `${prefix}${suffix}`.trim().toLowerCase();
     const matchingFields = allFields.filter(field => {
       return (
@@ -44,7 +54,8 @@ export function getSuggestionsProvider({ indexPatterns }) {
       );
     });
     const sortedFields = sortPrefixFirst(matchingFields.sort(keywordComparator), search, 'name');
-    const suggestions = sortedFields.map(field => {
+
+    const suggestions: autocomplete.FieldQuerySuggestion[] = sortedFields.map(field => {
       const remainingPath =
         field.subType && field.subType.nested
           ? field.subType.nested.path.slice(nestedPath ? nestedPath.length + 1 : 0)
@@ -55,23 +66,23 @@ export function getSuggestionsProvider({ indexPatterns }) {
               field.name.slice(field.subType.nested.path.length + 1)
             )}  }`
           : `${escapeKuery(field.name.slice(nestedPath ? nestedPath.length + 1 : 0))} `;
-      const description = getDescription(field.name);
+      const description = getDescription(field);
       const cursorIndex =
         field.subType && field.subType.nested && remainingPath.length > 0
           ? text.length - 2
           : text.length;
-      return { type, text, description, start, end, cursorIndex, field };
+
+      return {
+        type: autocomplete.QuerySuggestionsTypes.Field,
+        text,
+        description,
+        start,
+        end,
+        cursorIndex,
+        field,
+      };
     });
-    return suggestions;
-  };
-}
 
-function keywordComparator(first, second) {
-  const extensions = ['raw', 'keyword'];
-  if (extensions.map(ext => `${first.name}.${ext}`).includes(second.name)) {
-    return 1;
-  } else if (extensions.map(ext => `${second.name}.${ext}`).includes(first.name)) {
-    return -1;
-  }
-  return first.name.localeCompare(second.name);
-}
+    return Promise.resolve(suggestions);
+  };
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js
deleted file mode 100644
index b877f9eb852d5..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { flatten, uniq } from 'lodash';
-import { getSuggestionsProvider as field } from './field';
-import { getSuggestionsProvider as value } from './value';
-import { getSuggestionsProvider as operator } from './operator';
-import { getSuggestionsProvider as conjunction } from './conjunction';
-import { esKuery } from '../../../../../../src/plugins/data/public';
-
-const cursorSymbol = '@kuery-cursor@';
-const providers = {
-  field,
-  value,
-  operator,
-  conjunction,
-};
-
-function dedup(suggestions) {
-  return uniq(suggestions, ({ type, text, start, end }) => [type, text, start, end].join('|'));
-}
-
-const getProviderByType = (type, args) => providers[type](args);
-
-export const setupKqlQuerySuggestionProvider = ({ uiSettings }) => ({
-  indexPatterns,
-  boolFilter,
-  query,
-  selectionStart,
-  selectionEnd,
-  signal,
-}) => {
-  const cursoredQuery = `${query.substr(0, selectionStart)}${cursorSymbol}${query.substr(
-    selectionEnd
-  )}`;
-
-  let cursorNode;
-  try {
-    cursorNode = esKuery.fromKueryExpression(cursoredQuery, { cursorSymbol, parseCursor: true });
-  } catch (e) {
-    cursorNode = {};
-  }
-
-  const { suggestionTypes = [] } = cursorNode;
-  const suggestionsByType = suggestionTypes.map(type =>
-    getProviderByType(type, {
-      config: uiSettings,
-      indexPatterns,
-      boolFilter,
-    })(cursorNode, signal)
-  );
-  return Promise.all(suggestionsByType).then(suggestionsByType =>
-    dedup(flatten(suggestionsByType))
-  );
-};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts
new file mode 100644
index 0000000000000..2cc15fe4c9280
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/index.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { CoreSetup } from 'kibana/public';
+import { $Keys } from 'utility-types';
+import { flatten, uniq } from 'lodash';
+import { setupGetFieldSuggestions } from './field';
+import { setupGetValueSuggestions } from './value';
+import { setupGetOperatorSuggestions } from './operator';
+import { setupGetConjunctionSuggestions } from './conjunction';
+import { esKuery, autocomplete } from '../../../../../../src/plugins/data/public';
+
+const cursorSymbol = '@kuery-cursor@';
+
+const dedup = (suggestions: autocomplete.QuerySuggestion[]): autocomplete.QuerySuggestion[] =>
+  uniq(suggestions, ({ type, text, start, end }) => [type, text, start, end].join('|'));
+
+export const setupKqlQuerySuggestionProvider = (
+  core: CoreSetup
+): autocomplete.QuerySuggestionsGetFn => {
+  const providers = {
+    field: setupGetFieldSuggestions(core),
+    value: setupGetValueSuggestions(core),
+    operator: setupGetOperatorSuggestions(core),
+    conjunction: setupGetConjunctionSuggestions(core),
+  };
+
+  const getSuggestionsByType = (
+    cursoredQuery: string,
+    querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs
+  ): Array<Promise<autocomplete.QuerySuggestion[]>> | [] => {
+    try {
+      const cursorNode = esKuery.fromKueryExpression(cursoredQuery, {
+        cursorSymbol,
+        parseCursor: true,
+      });
+
+      return cursorNode.suggestionTypes.map((type: $Keys<typeof providers>) =>
+        providers[type](querySuggestionsArgs, cursorNode)
+      );
+    } catch (e) {
+      return [];
+    }
+  };
+
+  return querySuggestionsArgs => {
+    const { query, selectionStart, selectionEnd } = querySuggestionsArgs;
+    const cursoredQuery = `${query.substr(0, selectionStart)}${cursorSymbol}${query.substr(
+      selectionEnd
+    )}`;
+
+    return Promise.all(
+      getSuggestionsByType(cursoredQuery, querySuggestionsArgs)
+    ).then(suggestionsByType => dedup(flatten(suggestionsByType)));
+  };
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/escape_kuery.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.test.ts
similarity index 55%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/escape_kuery.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.test.ts
index 2127194c9a890..a4a1d977a207f 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/__tests__/escape_kuery.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.test.ts
@@ -4,55 +4,62 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import expect from '@kbn/expect';
-import { escapeQuotes, escapeKuery } from '../escape_kuery';
+import { escapeQuotes, escapeKuery } from './escape_kuery';
 
-describe('Kuery escape', function() {
-  it('should escape quotes', function() {
+describe('Kuery escape', () => {
+  test('should escape quotes', () => {
     const value = 'I said, "Hello."';
     const expected = 'I said, \\"Hello.\\"';
-    expect(escapeQuotes(value)).to.be(expected);
+
+    expect(escapeQuotes(value)).toBe(expected);
   });
 
-  it('should escape special characters', function() {
+  test('should escape special characters', () => {
     const value = `This \\ has (a lot of) <special> characters, don't you *think*? "Yes."`;
     const expected = `This \\\\ has \\(a lot of\\) \\<special\\> characters, don't you \\*think\\*? \\"Yes.\\"`;
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape keywords', function() {
+  test('should escape keywords', () => {
     const value = 'foo and bar or baz not qux';
     const expected = 'foo \\and bar \\or baz \\not qux';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape keywords next to each other', function() {
+  test('should escape keywords next to each other', () => {
     const value = 'foo and bar or not baz';
     const expected = 'foo \\and bar \\or \\not baz';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should not escape keywords without surrounding spaces', function() {
+  test('should not escape keywords without surrounding spaces', () => {
     const value = 'And this has keywords, or does it not?';
     const expected = 'And this has keywords, \\or does it not?';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape uppercase keywords', function() {
+  test('should escape uppercase keywords', () => {
     const value = 'foo AND bar';
     const expected = 'foo \\AND bar';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape both keywords and special characters', function() {
+  test('should escape both keywords and special characters', () => {
     const value = 'Hello, world, and <nice> to meet you!';
     const expected = 'Hello, world, \\and \\<nice\\> to meet you!';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 
-  it('should escape newlines and tabs', () => {
+  test('should escape newlines and tabs', () => {
     const value = 'This\nhas\tnewlines\r\nwith\ttabs';
     const expected = 'This\\nhas\\tnewlines\\r\\nwith\\ttabs';
-    expect(escapeKuery(value)).to.be(expected);
+
+    expect(escapeKuery(value)).toBe(expected);
   });
 });
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/escape_kuery.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.ts
similarity index 57%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/escape_kuery.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.ts
index 5d9bfe6143c22..a00082f8c7d7c 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/escape_kuery.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/lib/escape_kuery.ts
@@ -6,29 +6,29 @@
 
 import { flow } from 'lodash';
 
-export function escapeQuotes(string) {
-  return string.replace(/"/g, '\\"');
+export function escapeQuotes(str: string) {
+  return str.replace(/"/g, '\\"');
 }
 
 export const escapeKuery = flow(escapeSpecialCharacters, escapeAndOr, escapeNot, escapeWhitespace);
 
 // See the SpecialCharacter rule in kuery.peg
-function escapeSpecialCharacters(string) {
-  return string.replace(/[\\():<>"*]/g, '\\$&'); // $& means the whole matched string
+function escapeSpecialCharacters(str: string) {
+  return str.replace(/[\\():<>"*]/g, '\\$&'); // $& means the whole matched string
 }
 
 // See the Keyword rule in kuery.peg
-function escapeAndOr(string) {
-  return string.replace(/(\s+)(and|or)(\s+)/gi, '$1\\$2$3');
+function escapeAndOr(str: string) {
+  return str.replace(/(\s+)(and|or)(\s+)/gi, '$1\\$2$3');
 }
 
-function escapeNot(string) {
-  return string.replace(/not(\s+)/gi, '\\$&');
+function escapeNot(str: string) {
+  return str.replace(/not(\s+)/gi, '\\$&');
 }
 
 // See the Space rule in kuery.peg
-function escapeWhitespace(string) {
-  return string
+function escapeWhitespace(str: string) {
+  return str
     .replace(/\t/g, '\\t')
     .replace(/\r/g, '\\r')
     .replace(/\n/g, '\\n');
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts
new file mode 100644
index 0000000000000..acafc4e169c8f
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.test.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+
+import { setupGetOperatorSuggestions } from './operator';
+import { autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery operator suggestions', () => {
+  let getSuggestions: ReturnType<typeof setupGetOperatorSuggestions>;
+  let querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs;
+
+  beforeEach(() => {
+    querySuggestionsArgs = ({
+      indexPatterns: [indexPatternResponse],
+    } as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+
+    getSuggestions = setupGetOperatorSuggestions(coreMock.createSetup());
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should not return suggestions for non-fields', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'foo' })
+    );
+
+    expect(suggestions).toEqual([]);
+  });
+
+  test('should return exists for every field', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'custom_user_field',
+      })
+    );
+
+    expect(suggestions.length).toEqual(1);
+    expect(suggestions[0].text).toBe(': * ');
+  });
+
+  test('should return equals for string fields', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'machine.os' })
+    );
+
+    expect(suggestions.find(({ text }) => text === ': ')).toBeDefined();
+    expect(suggestions.find(({ text }) => text === '< ')).not.toBeDefined();
+  });
+
+  test('should return numeric operators for numeric fields', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'bytes' })
+    );
+
+    expect(suggestions.find(({ text }) => text === ': ')).toBeDefined();
+    expect(suggestions.find(({ text }) => text === '< ')).toBeDefined();
+  });
+
+  test('should have descriptions', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName: 'bytes' })
+    );
+
+    expect(suggestions.length).toBeGreaterThan(0);
+
+    suggestions.forEach(suggestion => {
+      expect(suggestion).toHaveProperty('description');
+    });
+  });
+
+  test('should handle nested paths', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'child',
+        nestedPath: 'nestedField',
+      })
+    );
+
+    expect(suggestions.length).toBeGreaterThan(0);
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.tsx
similarity index 82%
rename from x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.js
rename to x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.tsx
index 173a24b3f5f1e..6e9010c4310fb 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.js
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/operator.tsx
@@ -6,8 +6,11 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { $Keys } from 'utility-types';
 import { flatten } from 'lodash';
-const type = 'operator';
+
+import { KqlQuerySuggestionProvider } from './types';
+import { autocomplete } from '../../../../../../src/plugins/data/public';
 
 const equalsText = (
   <FormattedMessage
@@ -133,36 +136,42 @@ const operators = {
         'xpack.kueryAutocomplete.existOperatorDescription.existsText' for 'exists' part."
       />
     ),
+    fieldTypes: undefined,
   },
 };
 
-function getDescription(operator) {
-  const { description } = operators[operator];
-  return <p>{description}</p>;
-}
+type Operators = $Keys<typeof operators>;
+
+const getOperatorByName = (operator: string) => operators[operator as Operators];
+const getDescription = (operator: string) => <p>{getOperatorByName(operator).description}</p>;
 
-export function getSuggestionsProvider({ indexPatterns }) {
-  const allFields = flatten(
-    indexPatterns.map(indexPattern => {
-      return indexPattern.fields.slice();
-    })
-  );
-  return function getOperatorSuggestions({ end, fieldName, nestedPath }) {
+export const setupGetOperatorSuggestions: KqlQuerySuggestionProvider = () => {
+  return ({ indexPatterns }, { end, fieldName, nestedPath }) => {
+    const allFields = flatten(
+      indexPatterns.map(indexPattern => {
+        return indexPattern.fields.slice();
+      })
+    );
     const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
-    const fields = allFields.filter(field => field.name === fullFieldName);
-    return flatten(
-      fields.map(field => {
+    const fields = allFields
+      .filter(field => field.name === fullFieldName)
+      .map(field => {
         const matchingOperators = Object.keys(operators).filter(operator => {
-          const { fieldTypes } = operators[operator];
+          const { fieldTypes } = getOperatorByName(operator);
+
           return !fieldTypes || fieldTypes.includes(field.type);
         });
-        const suggestions = matchingOperators.map(operator => {
-          const text = operator + ' ';
-          const description = getDescription(operator);
-          return { type, text, description, start: end, end };
-        });
+
+        const suggestions = matchingOperators.map(operator => ({
+          type: autocomplete.QuerySuggestionsTypes.Operator,
+          text: operator + ' ',
+          description: getDescription(operator),
+          start: end,
+          end,
+        }));
         return suggestions;
-      })
-    );
+      });
+
+    return Promise.resolve(flatten(fields));
   };
-}
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts
index 123e440b75231..03e1a9099f1ab 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/sort_prefix_first.ts
@@ -14,7 +14,9 @@ export function sortPrefixFirst(array: any[], prefix?: string | number, property
 
   const partitions = partition(array, entry => {
     const value = ('' + (property ? entry[property] : entry)).toLowerCase();
+
     return value.startsWith(lowerCasePrefix);
   });
+
   return [...partitions[0], ...partitions[1]];
 }
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.ts
new file mode 100644
index 0000000000000..c51b75e001b9f
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/types.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 { CoreSetup } from 'kibana/public';
+import { esKuery, autocomplete } from '../../../../../../src/plugins/data/public';
+
+export type KqlQuerySuggestionProvider<T = autocomplete.BasicQuerySuggestion> = (
+  core: CoreSetup
+) => (
+  querySuggestionsGetFnArgs: autocomplete.QuerySuggestionsGetFnArgs,
+  kueryNode: esKuery.KueryNode
+) => Promise<T[]>;
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js
deleted file mode 100644
index 9d0d70fd95747..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { flatten } from 'lodash';
-import { escapeQuotes } from './escape_kuery';
-import { npStart } from 'ui/new_platform';
-
-const type = 'value';
-
-export function getSuggestionsProvider({ indexPatterns, boolFilter }) {
-  const allFields = flatten(
-    indexPatterns.map(indexPattern => {
-      return indexPattern.fields.map(field => ({
-        ...field,
-        indexPattern,
-      }));
-    })
-  );
-
-  return function getValueSuggestions(
-    { start, end, prefix, suffix, fieldName, nestedPath },
-    signal
-  ) {
-    const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
-    const fields = allFields.filter(field => field.name === fullFieldName);
-    const query = `${prefix}${suffix}`.trim();
-    const { getValueSuggestions } = npStart.plugins.data.autocomplete;
-
-    const suggestionsByField = fields.map(field =>
-      getValueSuggestions({
-        indexPattern: field.indexPattern,
-        field,
-        query,
-        boolFilter,
-        signal,
-      }).then(data => {
-        const quotedValues = data.map(value =>
-          typeof value === 'string' ? `"${escapeQuotes(value)}"` : `${value}`
-        );
-        return wrapAsSuggestions(start, end, query, quotedValues);
-      })
-    );
-
-    return Promise.all(suggestionsByField).then(suggestions => flatten(suggestions));
-  };
-}
-
-function wrapAsSuggestions(start, end, query, values) {
-  return values
-    .filter(value => value.toLowerCase().includes(query.toLowerCase()))
-    .map(value => {
-      const text = `${value} `;
-      return { type, text, start, end };
-    });
-}
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js
deleted file mode 100644
index f5b652d2e2164..0000000000000
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.js
+++ /dev/null
@@ -1,146 +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 { getSuggestionsProvider } from './value';
-import indexPatternResponse from './__fixtures__/index_pattern_response.json';
-import { npStart } from 'ui/new_platform';
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    plugins: {
-      data: {
-        autocomplete: {
-          getValueSuggestions: jest.fn(({ field }) => {
-            let res;
-            if (field.type === 'boolean') {
-              res = [true, false];
-            } else if (field.name === 'machine.os') {
-              res = ['Windo"ws', "Mac'", 'Linux'];
-            } else if (field.name === 'nestedField.child') {
-              res = ['foo'];
-            } else {
-              res = [];
-            }
-            return Promise.resolve(res);
-          }),
-        },
-      },
-    },
-  },
-}));
-
-describe('Kuery value suggestions', function() {
-  let indexPatterns;
-  let getSuggestions;
-
-  beforeEach(() => {
-    indexPatterns = [indexPatternResponse];
-    getSuggestions = getSuggestionsProvider({ indexPatterns });
-    jest.clearAllMocks();
-  });
-
-  test('should return a function', function() {
-    expect(typeof getSuggestions).toBe('function');
-  });
-
-  test('should not search for non existing field', async () => {
-    const fieldName = 'i_dont_exist';
-    const prefix = '';
-    const suffix = '';
-
-    const suggestions = await getSuggestions({ fieldName, prefix, suffix });
-    expect(suggestions.map(({ text }) => text)).toEqual([]);
-
-    expect(npStart.plugins.data.autocomplete.getValueSuggestions).toHaveBeenCalledTimes(0);
-  });
-
-  test('should format suggestions', async () => {
-    const start = 1;
-    const end = 5;
-    const suggestions = await getSuggestions({
-      fieldName: 'ssl',
-      prefix: '',
-      suffix: '',
-      start,
-      end,
-    });
-
-    expect(suggestions[0].type).toEqual('value');
-    expect(suggestions[0].start).toEqual(start);
-    expect(suggestions[0].end).toEqual(end);
-  });
-
-  test('should handle nested paths', async () => {
-    const suggestions = await getSuggestions({
-      fieldName: 'child',
-      nestedPath: 'nestedField',
-      prefix: '',
-      suffix: '',
-    });
-    expect(suggestions.length).toEqual(1);
-    expect(suggestions[0].text).toEqual('"foo" ');
-  });
-
-  describe('Boolean suggestions', function() {
-    test('should stringify boolean fields', async () => {
-      const suggestions = await getSuggestions({ fieldName: 'ssl', prefix: '', suffix: '' });
-
-      expect(suggestions.map(({ text }) => text)).toEqual(['true ', 'false ']);
-      expect(npStart.plugins.data.autocomplete.getValueSuggestions).toHaveBeenCalledTimes(1);
-    });
-
-    test('should filter out boolean suggestions', async () => {
-      const suggestions = await getSuggestions({ fieldName: 'ssl', prefix: 'fa', suffix: '' });
-
-      expect(suggestions.length).toEqual(1);
-    });
-  });
-
-  describe('String suggestions', function() {
-    test('should merge prefix and suffix', async () => {
-      const prefix = 'he';
-      const suffix = 'llo';
-
-      await getSuggestions({ fieldName: 'machine.os.raw', prefix, suffix });
-
-      expect(npStart.plugins.data.autocomplete.getValueSuggestions).toHaveBeenCalledTimes(1);
-      expect(npStart.plugins.data.autocomplete.getValueSuggestions).toBeCalledWith(
-        expect.objectContaining({
-          field: expect.any(Object),
-          query: prefix + suffix,
-        })
-      );
-    });
-
-    test('should escape quotes in suggestions', async () => {
-      const suggestions = await getSuggestions({ fieldName: 'machine.os', prefix: '', suffix: '' });
-
-      expect(suggestions[0].text).toEqual('"Windo\\"ws" ');
-      expect(suggestions[1].text).toEqual('"Mac\'" ');
-      expect(suggestions[2].text).toEqual('"Linux" ');
-    });
-
-    test('should filter out string suggestions', async () => {
-      const suggestions = await getSuggestions({
-        fieldName: 'machine.os',
-        prefix: 'banana',
-        suffix: '',
-      });
-
-      expect(suggestions.length).toEqual(0);
-    });
-
-    test('should partially filter out string suggestions - case insensitive', async () => {
-      const suggestions = await getSuggestions({
-        fieldName: 'machine.os',
-        prefix: 'ma',
-        suffix: '',
-      });
-
-      expect(suggestions.length).toEqual(1);
-    });
-  });
-});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts
new file mode 100644
index 0000000000000..5ffe30c877868
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.test.ts
@@ -0,0 +1,192 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { setupGetValueSuggestions } from './value';
+import indexPatternResponse from './__fixtures__/index_pattern_response.json';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+import { autocomplete, esKuery } from '../../../../../../src/plugins/data/public';
+import { setAutocompleteService } from '../services';
+
+const mockKueryNode = (kueryNode: Partial<esKuery.KueryNode>) =>
+  (kueryNode as unknown) as esKuery.KueryNode;
+
+describe('Kuery value suggestions', () => {
+  let getSuggestions: ReturnType<typeof setupGetValueSuggestions>;
+  let querySuggestionsArgs: autocomplete.QuerySuggestionsGetFnArgs;
+  let autocompleteServiceMock: any;
+
+  beforeEach(() => {
+    getSuggestions = setupGetValueSuggestions(coreMock.createSetup());
+    querySuggestionsArgs = ({
+      indexPatterns: [indexPatternResponse],
+    } as unknown) as autocomplete.QuerySuggestionsGetFnArgs;
+
+    autocompleteServiceMock = {
+      getValueSuggestions: jest.fn(({ field }) => {
+        let res: any[];
+
+        if (field.type === 'boolean') {
+          res = [true, false];
+        } else if (field.name === 'machine.os') {
+          res = ['Windo"ws', "Mac'", 'Linux'];
+        } else if (field.name === 'nestedField.child') {
+          res = ['foo'];
+        } else {
+          res = [];
+        }
+        return Promise.resolve(res);
+      }),
+    };
+    setAutocompleteService(autocompleteServiceMock);
+
+    jest.clearAllMocks();
+  });
+
+  test('should return a function', () => {
+    expect(typeof getSuggestions).toBe('function');
+  });
+
+  test('should not search for non existing field', async () => {
+    const fieldName = 'i_dont_exist';
+    const prefix = '';
+    const suffix = '';
+
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({ fieldName, prefix, suffix })
+    );
+
+    expect(suggestions.map(({ text }) => text)).toEqual([]);
+    expect(autocompleteServiceMock.getValueSuggestions).toHaveBeenCalledTimes(0);
+  });
+
+  test('should format suggestions', async () => {
+    const start = 1;
+    const end = 5;
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'ssl',
+        prefix: '',
+        suffix: '',
+        start,
+        end,
+      })
+    );
+
+    expect(suggestions[0].type).toEqual('value');
+    expect(suggestions[0].start).toEqual(start);
+    expect(suggestions[0].end).toEqual(end);
+  });
+
+  test('should handle nested paths', async () => {
+    const suggestions = await getSuggestions(
+      querySuggestionsArgs,
+      mockKueryNode({
+        fieldName: 'child',
+        nestedPath: 'nestedField',
+        prefix: '',
+        suffix: '',
+      })
+    );
+
+    expect(suggestions.length).toEqual(1);
+    expect(suggestions[0].text).toEqual('"foo" ');
+  });
+
+  describe('Boolean suggestions', () => {
+    test('should stringify boolean fields', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'ssl',
+          prefix: '',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.map(({ text }) => text)).toEqual(['true ', 'false ']);
+      expect(autocompleteServiceMock.getValueSuggestions).toHaveBeenCalledTimes(1);
+    });
+
+    test('should filter out boolean suggestions', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'ssl',
+          prefix: 'fa',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.length).toEqual(1);
+    });
+  });
+
+  describe('String suggestions', () => {
+    test('should merge prefix and suffix', async () => {
+      const prefix = 'he';
+      const suffix = 'llo';
+
+      await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os.raw',
+          prefix,
+          suffix,
+        })
+      );
+
+      expect(autocompleteServiceMock.getValueSuggestions).toHaveBeenCalledTimes(1);
+      expect(autocompleteServiceMock.getValueSuggestions).toBeCalledWith(
+        expect.objectContaining({
+          field: expect.any(Object),
+          query: prefix + suffix,
+        })
+      );
+    });
+
+    test('should escape quotes in suggestions', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os',
+          prefix: '',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions[0].text).toEqual('"Windo\\"ws" ');
+      expect(suggestions[1].text).toEqual('"Mac\'" ');
+      expect(suggestions[2].text).toEqual('"Linux" ');
+    });
+
+    test('should filter out string suggestions', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os',
+          prefix: 'banana',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.length).toEqual(0);
+    });
+
+    test('should partially filter out string suggestions - case insensitive', async () => {
+      const suggestions = await getSuggestions(
+        querySuggestionsArgs,
+        mockKueryNode({
+          fieldName: 'machine.os',
+          prefix: 'ma',
+          suffix: '',
+        })
+      );
+
+      expect(suggestions.length).toEqual(1);
+    });
+  });
+});
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts
new file mode 100644
index 0000000000000..242b9ccba3508
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/kql_query_suggestion/value.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { flatten } from 'lodash';
+import { escapeQuotes } from './lib/escape_kuery';
+import { KqlQuerySuggestionProvider } from './types';
+import { getAutocompleteService } from '../services';
+import { autocomplete } from '../../../../../../src/plugins/data/public';
+
+const wrapAsSuggestions = (start: number, end: number, query: string, values: string[]) =>
+  values
+    .filter(value => value.toLowerCase().includes(query.toLowerCase()))
+    .map(value => ({
+      type: autocomplete.QuerySuggestionsTypes.Value,
+      text: `${value} `,
+      start,
+      end,
+    }));
+
+export const setupGetValueSuggestions: KqlQuerySuggestionProvider = core => {
+  return async (
+    { indexPatterns, boolFilter, signal },
+    { start, end, prefix, suffix, fieldName, nestedPath }
+  ): Promise<autocomplete.QuerySuggestion[]> => {
+    const allFields = flatten(
+      indexPatterns.map(indexPattern =>
+        indexPattern.fields.map(field => ({
+          ...field,
+          indexPattern,
+        }))
+      )
+    );
+
+    const fullFieldName = nestedPath ? `${nestedPath}.${fieldName}` : fieldName;
+    const fields = allFields.filter(field => field.name === fullFieldName);
+    const query = `${prefix}${suffix}`.trim();
+    const { getValueSuggestions } = getAutocompleteService();
+
+    const data = await Promise.all(
+      fields.map(field =>
+        getValueSuggestions({
+          indexPattern: field.indexPattern,
+          field,
+          query,
+          boolFilter,
+          signal,
+        }).then(valueSuggestions => {
+          const quotedValues = valueSuggestions.map(value =>
+            typeof value === 'string' ? `"${escapeQuotes(value)}"` : `${value}`
+          );
+
+          return wrapAsSuggestions(start, end, query, quotedValues);
+        })
+      )
+    );
+
+    return flatten(data);
+  };
+};
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts
index 52abe21c055ee..303fe8c557fbd 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/legacy.ts
@@ -8,13 +8,20 @@ import { PluginInitializerContext } from 'src/core/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { plugin } from './index';
-import { KueryAutocompletePluginSetupDependencies } from './plugin';
+import {
+  KueryAutocompletePluginSetupDependencies,
+  KueryAutocompletePluginStartDependencies,
+} from './plugin';
 
-const plugins: Readonly<KueryAutocompletePluginSetupDependencies> = {
+const pluginsSetup: Readonly<KueryAutocompletePluginSetupDependencies> = {
   data: npSetup.plugins.data,
 };
 
+const pluginsStart: Readonly<KueryAutocompletePluginStartDependencies> = {
+  data: npStart.plugins.data,
+};
+
 const pluginInstance = plugin({} as PluginInitializerContext);
 
-export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core);
+export const setup = pluginInstance.setup(npSetup.core, pluginsSetup);
+export const start = pluginInstance.start(npStart.core, pluginsStart);
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts
index 216e0f49ccd34..81737c4636532 100644
--- a/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/plugin.ts
@@ -6,8 +6,7 @@
 
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { Plugin as DataPublicPlugin } from '../../../../../src/plugins/data/public';
-
-// @ts-ignore
+import { setAutocompleteService } from './services';
 import { setupKqlQuerySuggestionProvider } from './kql_query_suggestion';
 
 /** @internal */
@@ -15,6 +14,11 @@ export interface KueryAutocompletePluginSetupDependencies {
   data: ReturnType<DataPublicPlugin['setup']>;
 }
 
+/** @internal */
+export interface KueryAutocompletePluginStartDependencies {
+  data: ReturnType<DataPublicPlugin['start']>;
+}
+
 const KUERY_LANGUAGE_NAME = 'kuery';
 
 /** @internal */
@@ -26,12 +30,12 @@ export class KueryAutocompletePlugin implements Plugin<Promise<void>, void> {
   }
 
   public async setup(core: CoreSetup, plugins: KueryAutocompletePluginSetupDependencies) {
-    const kueryProvider = setupKqlQuerySuggestionProvider(core, plugins);
+    const kueryProvider = setupKqlQuerySuggestionProvider(core);
 
     plugins.data.autocomplete.addQuerySuggestionProvider(KUERY_LANGUAGE_NAME, kueryProvider);
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
+  public start(core: CoreStart, plugins: KueryAutocompletePluginStartDependencies) {
+    setAutocompleteService(plugins.data.autocomplete);
   }
 }
diff --git a/x-pack/legacy/plugins/kuery_autocomplete/public/services.ts b/x-pack/legacy/plugins/kuery_autocomplete/public/services.ts
new file mode 100644
index 0000000000000..1ec48e597f636
--- /dev/null
+++ b/x-pack/legacy/plugins/kuery_autocomplete/public/services.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createGetterSetter } from '../../../../../src/plugins/kibana_utils/public';
+import { DataPublicPluginStart } from '../../../../../src/plugins/data/public';
+
+export const [getAutocompleteService, setAutocompleteService] = createGetterSetter<
+  DataPublicPluginStart['autocomplete']
+>('Autocomplete');
diff --git a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx
index 4d92e8cb1335d..85e2b3b3fe384 100644
--- a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/__examples__/index.stories.tsx
@@ -16,7 +16,7 @@ const suggestion: autocomplete.QuerySuggestion = {
   end: 3,
   start: 1,
   text: 'Text...',
-  type: 'value',
+  type: autocomplete.QuerySuggestionsTypes.Value,
 };
 
 storiesOf('components/SuggestionItem', module).add('example', () => (
diff --git a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
index ef16f79a4b83c..552aaa5889719 100644
--- a/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
+++ b/x-pack/legacy/plugins/siem/public/components/autocomplete_field/index.test.tsx
@@ -18,7 +18,7 @@ import { AutocompleteField } from '.';
 
 const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.ephemeral_id ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.ephemeral_id</span></p>',
@@ -26,7 +26,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.hostname ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.hostname</span></p>',
@@ -34,7 +34,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.id ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.id</span></p>',
@@ -42,7 +42,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.name ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.name</span></p>',
@@ -50,7 +50,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.type ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.type</span></p>',
@@ -58,7 +58,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.version ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.version</span></p>',
@@ -66,7 +66,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test1 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test1</span></p>',
@@ -74,7 +74,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test2 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test2</span></p>',
@@ -82,7 +82,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test3 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test3</span></p>',
@@ -90,7 +90,7 @@ const mockAutoCompleteData: autocomplete.QuerySuggestion[] = [
     end: 1,
   },
   {
-    type: 'field',
+    type: autocomplete.QuerySuggestionsTypes.Field,
     text: 'agent.test4 ',
     description:
       '<p>Filter results that contain <span class="suggestionItem__callout">agent.test4</span></p>',

From 3f5149f57bc8aedf376b41d1e0f55a315d9a3eb4 Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Fri, 31 Jan 2020 11:10:25 +0100
Subject: [PATCH 21/23] [ML] conditional rison encoding for query params
 (#56380) (#56469)

---
 .../public/application/util/url_state.test.ts |  2 +-
 .../ml/public/application/util/url_state.ts   | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/x-pack/legacy/plugins/ml/public/application/util/url_state.test.ts b/x-pack/legacy/plugins/ml/public/application/util/url_state.test.ts
index 91bbef2dba6c2..0813f2e3da97f 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/url_state.test.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/url_state.test.ts
@@ -75,7 +75,7 @@ describe('useUrlState', () => {
 
     expect(mockHistoryPush).toHaveBeenCalledWith({
       search:
-        '_a=%28mlExplorerFilter%3A%28%29%2CmlExplorerSwimlane%3A%28viewByFieldName%3Aaction%29%2Cquery%3A%28%29%29&_g=%28ml%3A%28jobIds%3A%21%28dec-2%29%29%2CrefreshInterval%3A%28display%3AOff%2Cpause%3A%21f%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272019-01-01T00%3A03%3A40.000Z%27%2Cmode%3Aabsolute%2Cto%3A%272019-08-30T11%3A55%3A07.000Z%27%29%29&savedSearchId=%27571aaf70-4c88-11e8-b3d7-01146121b73d%27',
+        '_a=%28mlExplorerFilter%3A%28%29%2CmlExplorerSwimlane%3A%28viewByFieldName%3Aaction%29%2Cquery%3A%28%29%29&_g=%28ml%3A%28jobIds%3A%21%28dec-2%29%29%2CrefreshInterval%3A%28display%3AOff%2Cpause%3A%21f%2Cvalue%3A0%29%2Ctime%3A%28from%3A%272019-01-01T00%3A03%3A40.000Z%27%2Cmode%3Aabsolute%2Cto%3A%272019-08-30T11%3A55%3A07.000Z%27%29%29&savedSearchId=571aaf70-4c88-11e8-b3d7-01146121b73d',
     });
   });
 });
diff --git a/x-pack/legacy/plugins/ml/public/application/util/url_state.ts b/x-pack/legacy/plugins/ml/public/application/util/url_state.ts
index 546944b1a33bf..e7d5a94e2694f 100644
--- a/x-pack/legacy/plugins/ml/public/application/util/url_state.ts
+++ b/x-pack/legacy/plugins/ml/public/application/util/url_state.ts
@@ -18,14 +18,26 @@ import { getNestedProperty } from './object_utils';
 export type SetUrlState = (attribute: string | Dictionary<any>, value?: any) => void;
 export type UrlState = [Dictionary<any>, SetUrlState];
 
-const decodedParams = new Set(['_a', '_g']);
+/**
+ * Set of URL query parameters that require the rison serialization.
+ */
+const risonSerializedParams = new Set(['_a', '_g']);
+
+/**
+ * Checks if the URL query parameter requires rison serialization.
+ * @param queryParam
+ */
+function isRisonSerializationRequired(queryParam: string): boolean {
+  return risonSerializedParams.has(queryParam);
+}
+
 export function getUrlState(search: string): Dictionary<any> {
   const urlState: Dictionary<any> = {};
   const parsedQueryString = queryString.parse(search);
 
   try {
     Object.keys(parsedQueryString).forEach(a => {
-      if (decodedParams.has(a)) {
+      if (isRisonSerializationRequired(a)) {
         urlState[a] = decode(parsedQueryString[a]) as Dictionary<any>;
       } else {
         urlState[a] = parsedQueryString[a];
@@ -75,7 +87,11 @@ export const useUrlState = (accessor: string): UrlState => {
         const oldLocationSearch = queryString.stringify(parsedQueryString, { encode: false });
 
         Object.keys(urlState).forEach(a => {
-          parsedQueryString[a] = encode(urlState[a]);
+          if (isRisonSerializationRequired(a)) {
+            parsedQueryString[a] = encode(urlState[a]);
+          } else {
+            parsedQueryString[a] = urlState[a];
+          }
         });
         const newLocationSearch = queryString.stringify(parsedQueryString, { encode: false });
 

From 5df9c86fedb58649adb8e27b25ad8e8fb9ac5b5c Mon Sep 17 00:00:00 2001
From: Dima Arnautov <dmitrii.arnautov@elastic.co>
Date: Fri, 31 Jan 2020 11:10:46 +0100
Subject: [PATCH 22/23] [ML] Fix Data Visualizer responsive layout  (#56372)
 (#56472)

* [ML] replace Example component with EuiListGroup

* [ML] center alignment
---
 .../field_data_card/examples_list/example.tsx | 31 -------------------
 .../examples_list/examples_list.tsx           | 17 +++++++---
 2 files changed, 12 insertions(+), 36 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/example.tsx

diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/example.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/example.tsx
deleted file mode 100644
index 29fe690f4a43b..0000000000000
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/example.tsx
+++ /dev/null
@@ -1,31 +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, { FC } from 'react';
-
-import { EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
-
-interface Props {
-  example: string | object;
-}
-
-export const Example: FC<Props> = ({ example }) => {
-  const exampleStr = typeof example === 'string' ? example : JSON.stringify(example);
-
-  // Use 95% width for each example so that the truncation ellipses show up when
-  // wrapped inside a tooltip.
-  return (
-    <EuiFlexGroup gutterSize="s" alignItems="center">
-      <EuiFlexItem grow={false} style={{ width: '95%' }} className="eui-textTruncate">
-        <EuiToolTip content={exampleStr}>
-          <EuiText size="s" className="eui-textTruncate">
-            {exampleStr}
-          </EuiText>
-        </EuiToolTip>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/examples_list.tsx b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/examples_list.tsx
index 0bf911c1edf86..c8eb810115401 100644
--- a/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/examples_list.tsx
+++ b/x-pack/legacy/plugins/ml/public/application/datavisualizer/index_based/components/field_data_card/examples_list/examples_list.tsx
@@ -6,12 +6,10 @@
 
 import React, { FC } from 'react';
 
-import { EuiSpacer, EuiText } from '@elastic/eui';
+import { EuiListGroup, EuiListGroupItem, EuiSpacer, EuiText } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { Example } from './example';
-
 interface Props {
   examples: Array<string | object>;
 }
@@ -22,7 +20,14 @@ export const ExamplesList: FC<Props> = ({ examples }) => {
   }
 
   const examplesContent = examples.map((example, i) => {
-    return <Example key={`example_${i}`} example={example} />;
+    return (
+      <EuiListGroupItem
+        style={{ padding: 0, justifyContent: 'center' }}
+        size="xs"
+        key={`example_${i}`}
+        label={typeof example === 'string' ? example : JSON.stringify(example)}
+      />
+    );
   });
 
   return (
@@ -39,7 +44,9 @@ export const ExamplesList: FC<Props> = ({ examples }) => {
         </h6>
       </EuiText>
       <EuiSpacer size="s" />
-      {examplesContent}
+      <EuiListGroup flush={true} showToolTips={true}>
+        {examplesContent}
+      </EuiListGroup>
     </div>
   );
 };

From b916251449bd86bbcf7ee27cbc755eada57c1ba4 Mon Sep 17 00:00:00 2001
From: Anton Dosov <anton.dosov@elastic.co>
Date: Fri, 31 Jan 2020 12:34:18 +0100
Subject: [PATCH 23/23] Fix setting filters without $store value (#56304)
 (#56475)

Follow up on: #56213

AddFilters method had logic which ensured that $store exists in filter object, but setFilters was missing that.
---
 .../filter_manager/filter_manager.test.ts     | 51 +++++++++++++++++--
 .../query/filter_manager/filter_manager.ts    | 22 +++++---
 2 files changed, 62 insertions(+), 11 deletions(-)

diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
index 1ade48b3537c8..8c790ac2ddc46 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.test.ts
@@ -29,9 +29,16 @@ import { esFilters } from '../../../common';
 import { coreMock } from '../../../../../core/public/mocks';
 const setupMock = coreMock.createSetup();
 
-setupMock.uiSettings.get.mockImplementation((key: string) => {
-  return true;
-});
+const uiSettingsMock = (pinnedByDefault: boolean) => (key: string) => {
+  switch (key) {
+    case 'filters:pinnedByDefault':
+      return pinnedByDefault;
+    default:
+      throw new Error(`Unexpected uiSettings key in FilterManager mock: ${key}`);
+  }
+};
+
+setupMock.uiSettings.get.mockImplementation(uiSettingsMock(true));
 
 describe('filter_manager', () => {
   let updateSubscription: Subscription | undefined;
@@ -224,6 +231,44 @@ describe('filter_manager', () => {
       expect(newGlobalFilters).toHaveLength(2);
       expect(newAppFilters).toHaveLength(1);
     });
+
+    test('set filter with no state, and force pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      filterManager.setFilters([f1], true);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+    });
+
+    test('set filter with no state, and no pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      filterManager.setFilters([f1], false);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+    });
+
+    test('set filters with default pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+      setupMock.uiSettings.get.mockImplementationOnce(uiSettingsMock(true));
+
+      filterManager.setFilters([f1]);
+      expect(filterManager.getGlobalFilters()).toHaveLength(1);
+      expect(filterManager.getAppFilters()).toHaveLength(0);
+    });
+
+    test('set filters without default pin', async () => {
+      const f1 = getFilter(esFilters.FilterStateStore.GLOBAL_STATE, false, false, 'age', 38);
+      f1.$state = undefined;
+
+      setupMock.uiSettings.get.mockImplementationOnce(uiSettingsMock(false));
+      filterManager.setFilters([f1]);
+      expect(filterManager.getGlobalFilters()).toHaveLength(0);
+      expect(filterManager.getAppFilters()).toHaveLength(1);
+    });
   });
 
   describe('add filters', () => {
diff --git a/src/plugins/data/public/query/filter_manager/filter_manager.ts b/src/plugins/data/public/query/filter_manager/filter_manager.ts
index 6c5cdbaffce5e..aa77f10d89f63 100644
--- a/src/plugins/data/public/query/filter_manager/filter_manager.ts
+++ b/src/plugins/data/public/query/filter_manager/filter_manager.ts
@@ -124,7 +124,10 @@ export class FilterManager {
 
   /* Setters */
 
-  public addFilters(filters: esFilters.Filter[] | esFilters.Filter, pinFilterStatus?: boolean) {
+  public addFilters(
+    filters: esFilters.Filter[] | esFilters.Filter,
+    pinFilterStatus: boolean = this.uiSettings.get('filters:pinnedByDefault')
+  ) {
     if (!Array.isArray(filters)) {
       filters = [filters];
     }
@@ -133,12 +136,6 @@ export class FilterManager {
       return;
     }
 
-    if (pinFilterStatus === undefined) {
-      pinFilterStatus = this.uiSettings.get('filters:pinnedByDefault');
-    }
-
-    // Set the store of all filters. For now.
-    // In the future, all filters should come in with filter state store already set.
     const store = pinFilterStatus
       ? esFilters.FilterStateStore.GLOBAL_STATE
       : esFilters.FilterStateStore.APP_STATE;
@@ -157,7 +154,16 @@ export class FilterManager {
     this.handleStateUpdate(newFilters);
   }
 
-  public setFilters(newFilters: esFilters.Filter[]) {
+  public setFilters(
+    newFilters: esFilters.Filter[],
+    pinFilterStatus: boolean = this.uiSettings.get('filters:pinnedByDefault')
+  ) {
+    const store = pinFilterStatus
+      ? esFilters.FilterStateStore.GLOBAL_STATE
+      : esFilters.FilterStateStore.APP_STATE;
+
+    FilterManager.setFiltersStore(newFilters, store);
+
     const mappedFilters = mapAndFlattenFilters(newFilters);
     const newPartitionedFilters = FilterManager.partitionFilters(mappedFilters);
     const mergedFilters = this.mergeIncomingFilters(newPartitionedFilters);