From 2fba7ed9f79d29f7fd2f6817ecf273da8af9ae0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20St=C3=BCrmer?= <weltenwort@users.noreply.github.com>
Date: Tue, 28 Apr 2020 11:12:50 +0200
Subject: [PATCH 01/17] [Logs UI] Reimplement log source configuration routes
 in plain HTTP+JSON (#64021)

---
 .../get_log_source_configuration.ts           |  57 ++++
 .../log_sources/get_log_source_status.ts      |  61 ++++
 .../common/http_api/log_sources/index.ts      |  10 +
 .../log_sources/log_source_configuration.ts   |  78 +++++
 .../patch_log_source_configuration.ts         |  60 ++++
 x-pack/plugins/infra/common/runtime_types.ts  |  20 +-
 .../components/source_configuration/index.ts  |   1 +
 .../public/containers/logs/log_flyout.tsx     |   6 +-
 .../api/fetch_log_source_configuration.ts     |  20 ++
 .../log_source/api/fetch_log_source_status.ts |  20 ++
 .../api/patch_log_source_configuration.ts     |  30 ++
 .../containers/logs/log_source/index.ts       |   7 +
 .../containers/logs/log_source/log_source.ts  | 157 ++++++++++
 .../logs/log_summary/with_summary.ts          |   4 +-
 .../log_entry_categories/page_content.tsx     |   8 +-
 .../log_entry_categories/page_providers.tsx   |   8 +-
 .../logs/log_entry_rate/page_content.tsx      |   8 +-
 .../logs/log_entry_rate/page_providers.tsx    |   8 +-
 .../infra/public/pages/logs/page_content.tsx  |   8 +
 .../public/pages/logs/page_providers.tsx      |   7 +-
 .../infra/public/pages/logs/settings.tsx      |  19 --
 .../logs/settings/add_log_column_popover.tsx  | 166 +++++++++++
 .../settings/fields_configuration_panel.tsx   | 178 +++++++++++
 .../infra/public/pages/logs/settings/index.ts |   7 +
 .../indices_configuration_form_state.ts       | 123 ++++++++
 .../settings/indices_configuration_panel.tsx  |  88 ++++++
 .../log_columns_configuration_form_state.tsx  | 153 ++++++++++
 .../log_columns_configuration_panel.tsx       | 276 ++++++++++++++++++
 .../source_configuration_form_state.tsx       | 106 +++++++
 .../source_configuration_settings.tsx         | 193 ++++++++++++
 .../infra/public/pages/logs/stream/page.tsx   |   5 +-
 .../public/pages/logs/stream/page_content.tsx |   8 +-
 .../pages/logs/stream/page_logs_content.tsx   |  23 +-
 .../pages/logs/stream/page_providers.tsx      |  21 +-
 .../public/pages/logs/stream/page_toolbar.tsx |   5 +-
 .../logs/stream/page_view_log_in_context.tsx  |  22 +-
 x-pack/plugins/infra/server/infra_server.ts   |   3 +
 .../framework/kibana_framework_adapter.ts     |   3 +
 .../infra/server/lib/domains/fields_domain.ts |   7 +-
 .../routes/log_sources/configuration.ts       | 114 ++++++++
 .../infra/server/routes/log_sources/index.ts  |   8 +
 .../infra/server/routes/log_sources/status.ts |  62 ++++
 .../test/api_integration/apis/infra/index.js  |   1 +
 .../api_integration/apis/infra/log_sources.ts | 179 ++++++++++++
 x-pack/test/api_integration/services/index.ts |   2 +
 .../infra_log_source_configuration.ts         |  69 +++++
 x-pack/test/functional/apps/infra/link_to.ts  |  16 +-
 47 files changed, 2340 insertions(+), 95 deletions(-)
 create mode 100644 x-pack/plugins/infra/common/http_api/log_sources/get_log_source_configuration.ts
 create mode 100644 x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
 create mode 100644 x-pack/plugins/infra/common/http_api/log_sources/index.ts
 create mode 100644 x-pack/plugins/infra/common/http_api/log_sources/log_source_configuration.ts
 create mode 100644 x-pack/plugins/infra/common/http_api/log_sources/patch_log_source_configuration.ts
 create mode 100644 x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_configuration.ts
 create mode 100644 x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_status.ts
 create mode 100644 x-pack/plugins/infra/public/containers/logs/log_source/api/patch_log_source_configuration.ts
 create mode 100644 x-pack/plugins/infra/public/containers/logs/log_source/index.ts
 create mode 100644 x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
 delete mode 100644 x-pack/plugins/infra/public/pages/logs/settings.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/fields_configuration_panel.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/index.ts
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_form_state.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/source_configuration_form_state.tsx
 create mode 100644 x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
 create mode 100644 x-pack/plugins/infra/server/routes/log_sources/configuration.ts
 create mode 100644 x-pack/plugins/infra/server/routes/log_sources/index.ts
 create mode 100644 x-pack/plugins/infra/server/routes/log_sources/status.ts
 create mode 100644 x-pack/test/api_integration/apis/infra/log_sources.ts
 create mode 100644 x-pack/test/api_integration/services/infra_log_source_configuration.ts

diff --git a/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_configuration.ts b/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_configuration.ts
new file mode 100644
index 00000000000000..bb79b5ebc52905
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_configuration.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { badRequestErrorRT, forbiddenErrorRT, routeTimingMetadataRT } from '../shared';
+import { logSourceConfigurationRT } from './log_source_configuration';
+
+/**
+ * request
+ */
+
+export const getLogSourceConfigurationRequestParamsRT = rt.type({
+  // the id of the source configuration
+  sourceId: rt.string,
+});
+
+export type GetLogSourceConfigurationRequestParams = rt.TypeOf<
+  typeof getLogSourceConfigurationRequestParamsRT
+>;
+
+/**
+ * response
+ */
+
+export const getLogSourceConfigurationSuccessResponsePayloadRT = rt.intersection([
+  rt.type({
+    data: logSourceConfigurationRT,
+  }),
+  rt.partial({
+    timing: routeTimingMetadataRT,
+  }),
+]);
+
+export type GetLogSourceConfigurationSuccessResponsePayload = rt.TypeOf<
+  typeof getLogSourceConfigurationSuccessResponsePayloadRT
+>;
+
+export const getLogSourceConfigurationErrorResponsePayloadRT = rt.union([
+  badRequestErrorRT,
+  forbiddenErrorRT,
+]);
+
+export type GetLogSourceConfigurationErrorReponsePayload = rt.TypeOf<
+  typeof getLogSourceConfigurationErrorResponsePayloadRT
+>;
+
+export const getLogSourceConfigurationResponsePayloadRT = rt.union([
+  getLogSourceConfigurationSuccessResponsePayloadRT,
+  getLogSourceConfigurationErrorResponsePayloadRT,
+]);
+
+export type GetLogSourceConfigurationReponsePayload = rt.TypeOf<
+  typeof getLogSourceConfigurationResponsePayloadRT
+>;
diff --git a/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts b/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
new file mode 100644
index 00000000000000..ae872cee9aa56f
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_sources/get_log_source_status.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { routeTimingMetadataRT } from '../shared';
+import {
+  getLogSourceConfigurationPath,
+  LOG_SOURCE_CONFIGURATION_PATH,
+} from './log_source_configuration';
+
+export const LOG_SOURCE_STATUS_PATH_SUFFIX = 'status';
+export const LOG_SOURCE_STATUS_PATH = `${LOG_SOURCE_CONFIGURATION_PATH}/${LOG_SOURCE_STATUS_PATH_SUFFIX}`;
+export const getLogSourceStatusPath = (sourceId: string) =>
+  `${getLogSourceConfigurationPath(sourceId)}/${LOG_SOURCE_STATUS_PATH_SUFFIX}`;
+
+/**
+ * request
+ */
+
+export const getLogSourceStatusRequestParamsRT = rt.type({
+  // the id of the source configuration
+  sourceId: rt.string,
+});
+
+export type GetLogSourceStatusRequestParams = rt.TypeOf<typeof getLogSourceStatusRequestParamsRT>;
+
+/**
+ * response
+ */
+
+const logIndexFieldRT = rt.strict({
+  name: rt.string,
+  type: rt.string,
+  searchable: rt.boolean,
+  aggregatable: rt.boolean,
+});
+
+export type LogIndexField = rt.TypeOf<typeof logIndexFieldRT>;
+
+const logSourceStatusRT = rt.strict({
+  logIndexFields: rt.array(logIndexFieldRT),
+  logIndexNames: rt.array(rt.string),
+});
+
+export type LogSourceStatus = rt.TypeOf<typeof logSourceStatusRT>;
+
+export const getLogSourceStatusSuccessResponsePayloadRT = rt.intersection([
+  rt.type({
+    data: logSourceStatusRT,
+  }),
+  rt.partial({
+    timing: routeTimingMetadataRT,
+  }),
+]);
+
+export type GetLogSourceStatusSuccessResponsePayload = rt.TypeOf<
+  typeof getLogSourceStatusSuccessResponsePayloadRT
+>;
diff --git a/x-pack/plugins/infra/common/http_api/log_sources/index.ts b/x-pack/plugins/infra/common/http_api/log_sources/index.ts
new file mode 100644
index 00000000000000..5fd1b5efec1775
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_sources/index.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './get_log_source_configuration';
+export * from './get_log_source_status';
+export * from './log_source_configuration';
+export * from './patch_log_source_configuration';
diff --git a/x-pack/plugins/infra/common/http_api/log_sources/log_source_configuration.ts b/x-pack/plugins/infra/common/http_api/log_sources/log_source_configuration.ts
new file mode 100644
index 00000000000000..e8bf63843c623d
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_sources/log_source_configuration.ts
@@ -0,0 +1,78 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+
+export const LOG_SOURCE_CONFIGURATION_PATH_PREFIX = '/api/infra/log_source_configurations';
+export const LOG_SOURCE_CONFIGURATION_PATH = `${LOG_SOURCE_CONFIGURATION_PATH_PREFIX}/{sourceId}`;
+export const getLogSourceConfigurationPath = (sourceId: string) =>
+  `${LOG_SOURCE_CONFIGURATION_PATH_PREFIX}/${sourceId}`;
+
+export const logSourceConfigurationOriginRT = rt.keyof({
+  fallback: null,
+  internal: null,
+  stored: null,
+});
+
+export type LogSourceConfigurationOrigin = rt.TypeOf<typeof logSourceConfigurationOriginRT>;
+
+const logSourceFieldsConfigurationRT = rt.strict({
+  timestamp: rt.string,
+  tiebreaker: rt.string,
+});
+
+const logSourceCommonColumnConfigurationRT = rt.strict({
+  id: rt.string,
+});
+
+const logSourceTimestampColumnConfigurationRT = rt.strict({
+  timestampColumn: logSourceCommonColumnConfigurationRT,
+});
+
+const logSourceMessageColumnConfigurationRT = rt.strict({
+  messageColumn: logSourceCommonColumnConfigurationRT,
+});
+
+const logSourceFieldColumnConfigurationRT = rt.strict({
+  fieldColumn: rt.intersection([
+    logSourceCommonColumnConfigurationRT,
+    rt.strict({
+      field: rt.string,
+    }),
+  ]),
+});
+
+const logSourceColumnConfigurationRT = rt.union([
+  logSourceTimestampColumnConfigurationRT,
+  logSourceMessageColumnConfigurationRT,
+  logSourceFieldColumnConfigurationRT,
+]);
+
+export const logSourceConfigurationPropertiesRT = rt.strict({
+  name: rt.string,
+  description: rt.string,
+  logAlias: rt.string,
+  fields: logSourceFieldsConfigurationRT,
+  logColumns: rt.array(logSourceColumnConfigurationRT),
+});
+
+export type LogSourceConfigurationProperties = rt.TypeOf<typeof logSourceConfigurationPropertiesRT>;
+
+export const logSourceConfigurationRT = rt.exact(
+  rt.intersection([
+    rt.type({
+      id: rt.string,
+      origin: logSourceConfigurationOriginRT,
+      configuration: logSourceConfigurationPropertiesRT,
+    }),
+    rt.partial({
+      updatedAt: rt.number,
+      version: rt.string,
+    }),
+  ])
+);
+
+export type LogSourceConfiguration = rt.TypeOf<typeof logSourceConfigurationRT>;
diff --git a/x-pack/plugins/infra/common/http_api/log_sources/patch_log_source_configuration.ts b/x-pack/plugins/infra/common/http_api/log_sources/patch_log_source_configuration.ts
new file mode 100644
index 00000000000000..fd312d7429b606
--- /dev/null
+++ b/x-pack/plugins/infra/common/http_api/log_sources/patch_log_source_configuration.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as rt from 'io-ts';
+import { badRequestErrorRT, forbiddenErrorRT } from '../shared';
+import { getLogSourceConfigurationSuccessResponsePayloadRT } from './get_log_source_configuration';
+import { logSourceConfigurationPropertiesRT } from './log_source_configuration';
+
+/**
+ * request
+ */
+
+export const patchLogSourceConfigurationRequestParamsRT = rt.type({
+  // the id of the source configuration
+  sourceId: rt.string,
+});
+
+export type PatchLogSourceConfigurationRequestParams = rt.TypeOf<
+  typeof patchLogSourceConfigurationRequestParamsRT
+>;
+
+const logSourceConfigurationProperiesPatchRT = rt.partial({
+  ...logSourceConfigurationPropertiesRT.type.props,
+  fields: rt.partial(logSourceConfigurationPropertiesRT.type.props.fields.type.props),
+});
+
+export type LogSourceConfigurationPropertiesPatch = rt.TypeOf<
+  typeof logSourceConfigurationProperiesPatchRT
+>;
+
+export const patchLogSourceConfigurationRequestBodyRT = rt.type({
+  data: logSourceConfigurationProperiesPatchRT,
+});
+
+export type PatchLogSourceConfigurationRequestBody = rt.TypeOf<
+  typeof patchLogSourceConfigurationRequestBodyRT
+>;
+
+/**
+ * response
+ */
+
+export const patchLogSourceConfigurationSuccessResponsePayloadRT = getLogSourceConfigurationSuccessResponsePayloadRT;
+
+export type PatchLogSourceConfigurationSuccessResponsePayload = rt.TypeOf<
+  typeof patchLogSourceConfigurationSuccessResponsePayloadRT
+>;
+
+export const patchLogSourceConfigurationResponsePayloadRT = rt.union([
+  patchLogSourceConfigurationSuccessResponsePayloadRT,
+  badRequestErrorRT,
+  forbiddenErrorRT,
+]);
+
+export type PatchLogSourceConfigurationReponsePayload = rt.TypeOf<
+  typeof patchLogSourceConfigurationResponsePayloadRT
+>;
diff --git a/x-pack/plugins/infra/common/runtime_types.ts b/x-pack/plugins/infra/common/runtime_types.ts
index d5b858df38def1..a8d5cd8693a3da 100644
--- a/x-pack/plugins/infra/common/runtime_types.ts
+++ b/x-pack/plugins/infra/common/runtime_types.ts
@@ -9,6 +9,7 @@ import { identity } from 'fp-ts/lib/function';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Errors, Type } from 'io-ts';
 import { failure } from 'io-ts/lib/PathReporter';
+import { RouteValidationFunction } from 'kibana/server';
 
 type ErrorFactory = (message: string) => Error;
 
@@ -18,8 +19,21 @@ export const throwErrors = (createError: ErrorFactory) => (errors: Errors) => {
   throw createError(failure(errors).join('\n'));
 };
 
-export const decodeOrThrow = <A, O, I>(
-  runtimeType: Type<A, O, I>,
+export const decodeOrThrow = <DecodedValue, EncodedValue, InputValue>(
+  runtimeType: Type<DecodedValue, EncodedValue, InputValue>,
   createError: ErrorFactory = createPlainError
-) => (inputValue: I) =>
+) => (inputValue: InputValue) =>
   pipe(runtimeType.decode(inputValue), fold(throwErrors(createError), identity));
+
+type ValdidationResult<Value> = ReturnType<RouteValidationFunction<Value>>;
+
+export const createValidationFunction = <DecodedValue, EncodedValue, InputValue>(
+  runtimeType: Type<DecodedValue, EncodedValue, InputValue>
+): RouteValidationFunction<DecodedValue> => (inputValue, { badRequest, ok }) =>
+  pipe(
+    runtimeType.decode(inputValue),
+    fold<Errors, DecodedValue, ValdidationResult<DecodedValue>>(
+      (errors: Errors) => badRequest(failure(errors).join('\n')),
+      (result: DecodedValue) => ok(result)
+    )
+  );
diff --git a/x-pack/plugins/infra/public/components/source_configuration/index.ts b/x-pack/plugins/infra/public/components/source_configuration/index.ts
index 98825567cc204b..66f64aee24f6ee 100644
--- a/x-pack/plugins/infra/public/components/source_configuration/index.ts
+++ b/x-pack/plugins/infra/public/components/source_configuration/index.ts
@@ -4,5 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export * from './input_fields';
 export { SourceConfigurationSettings } from './source_configuration_settings';
 export { ViewSourceConfigurationButton } from './view_source_configuration_button';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx b/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx
index 267abe631c1423..b0981f9b3c41f2 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_flyout.tsx
@@ -8,11 +8,11 @@ import createContainer from 'constate';
 import { isString } from 'lodash';
 import React, { useContext, useEffect, useMemo, useState } from 'react';
 
+import { LogEntriesItem } from '../../../common/http_api';
 import { UrlStateContainer } from '../../utils/url_state';
 import { useTrackedPromise } from '../../utils/use_tracked_promise';
-import { Source } from '../source';
 import { fetchLogEntriesItem } from './log_entries/api/fetch_log_entries_item';
-import { LogEntriesItem } from '../../../common/http_api';
+import { useLogSourceContext } from './log_source';
 
 export enum FlyoutVisibility {
   hidden = 'hidden',
@@ -26,7 +26,7 @@ export interface FlyoutOptionsUrlState {
 }
 
 export const useLogFlyout = () => {
-  const { sourceId } = useContext(Source.Context);
+  const { sourceId } = useLogSourceContext();
   const [flyoutVisible, setFlyoutVisibility] = useState<boolean>(false);
   const [flyoutId, setFlyoutId] = useState<string | null>(null);
   const [flyoutItem, setFlyoutItem] = useState<LogEntriesItem | null>(null);
diff --git a/x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_configuration.ts b/x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_configuration.ts
new file mode 100644
index 00000000000000..786cb485b38dd5
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_configuration.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 {
+  getLogSourceConfigurationPath,
+  getLogSourceConfigurationSuccessResponsePayloadRT,
+} from '../../../../../common/http_api/log_sources';
+import { decodeOrThrow } from '../../../../../common/runtime_types';
+import { npStart } from '../../../../legacy_singletons';
+
+export const callFetchLogSourceConfigurationAPI = async (sourceId: string) => {
+  const response = await npStart.http.fetch(getLogSourceConfigurationPath(sourceId), {
+    method: 'GET',
+  });
+
+  return decodeOrThrow(getLogSourceConfigurationSuccessResponsePayloadRT)(response);
+};
diff --git a/x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_status.ts b/x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_status.ts
new file mode 100644
index 00000000000000..2f1d15ffaf4d3d
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/logs/log_source/api/fetch_log_source_status.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 {
+  getLogSourceStatusPath,
+  getLogSourceStatusSuccessResponsePayloadRT,
+} from '../../../../../common/http_api/log_sources';
+import { decodeOrThrow } from '../../../../../common/runtime_types';
+import { npStart } from '../../../../legacy_singletons';
+
+export const callFetchLogSourceStatusAPI = async (sourceId: string) => {
+  const response = await npStart.http.fetch(getLogSourceStatusPath(sourceId), {
+    method: 'GET',
+  });
+
+  return decodeOrThrow(getLogSourceStatusSuccessResponsePayloadRT)(response);
+};
diff --git a/x-pack/plugins/infra/public/containers/logs/log_source/api/patch_log_source_configuration.ts b/x-pack/plugins/infra/public/containers/logs/log_source/api/patch_log_source_configuration.ts
new file mode 100644
index 00000000000000..848801ab3c7ce7
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/logs/log_source/api/patch_log_source_configuration.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  getLogSourceConfigurationPath,
+  patchLogSourceConfigurationSuccessResponsePayloadRT,
+  patchLogSourceConfigurationRequestBodyRT,
+  LogSourceConfigurationPropertiesPatch,
+} from '../../../../../common/http_api/log_sources';
+import { decodeOrThrow } from '../../../../../common/runtime_types';
+import { npStart } from '../../../../legacy_singletons';
+
+export const callPatchLogSourceConfigurationAPI = async (
+  sourceId: string,
+  patchedProperties: LogSourceConfigurationPropertiesPatch
+) => {
+  const response = await npStart.http.fetch(getLogSourceConfigurationPath(sourceId), {
+    method: 'PATCH',
+    body: JSON.stringify(
+      patchLogSourceConfigurationRequestBodyRT.encode({
+        data: patchedProperties,
+      })
+    ),
+  });
+
+  return decodeOrThrow(patchLogSourceConfigurationSuccessResponsePayloadRT)(response);
+};
diff --git a/x-pack/plugins/infra/public/containers/logs/log_source/index.ts b/x-pack/plugins/infra/public/containers/logs/log_source/index.ts
new file mode 100644
index 00000000000000..5d9c6373050a19
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/logs/log_source/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './log_source';
diff --git a/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts b/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
new file mode 100644
index 00000000000000..8332018fddf901
--- /dev/null
+++ b/x-pack/plugins/infra/public/containers/logs/log_source/log_source.ts
@@ -0,0 +1,157 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import createContainer from 'constate';
+import { useState, useMemo, useCallback } from 'react';
+import {
+  LogSourceConfiguration,
+  LogSourceStatus,
+  LogSourceConfigurationPropertiesPatch,
+  LogSourceConfigurationProperties,
+} from '../../../../common/http_api/log_sources';
+import { useTrackedPromise } from '../../../utils/use_tracked_promise';
+import { callFetchLogSourceConfigurationAPI } from './api/fetch_log_source_configuration';
+import { callFetchLogSourceStatusAPI } from './api/fetch_log_source_status';
+import { callPatchLogSourceConfigurationAPI } from './api/patch_log_source_configuration';
+
+export {
+  LogSourceConfiguration,
+  LogSourceConfigurationProperties,
+  LogSourceConfigurationPropertiesPatch,
+  LogSourceStatus,
+};
+
+export const useLogSource = ({ sourceId }: { sourceId: string }) => {
+  const [sourceConfiguration, setSourceConfiguration] = useState<
+    LogSourceConfiguration | undefined
+  >(undefined);
+
+  const [sourceStatus, setSourceStatus] = useState<LogSourceStatus | undefined>(undefined);
+
+  const [loadSourceConfigurationRequest, loadSourceConfiguration] = useTrackedPromise(
+    {
+      cancelPreviousOn: 'resolution',
+      createPromise: async () => {
+        return await callFetchLogSourceConfigurationAPI(sourceId);
+      },
+      onResolve: ({ data }) => {
+        setSourceConfiguration(data);
+      },
+    },
+    [sourceId]
+  );
+
+  const [updateSourceConfigurationRequest, updateSourceConfiguration] = useTrackedPromise(
+    {
+      cancelPreviousOn: 'resolution',
+      createPromise: async (patchedProperties: LogSourceConfigurationPropertiesPatch) => {
+        return await callPatchLogSourceConfigurationAPI(sourceId, patchedProperties);
+      },
+      onResolve: ({ data }) => {
+        setSourceConfiguration(data);
+        loadSourceStatus();
+      },
+    },
+    [sourceId]
+  );
+
+  const [loadSourceStatusRequest, loadSourceStatus] = useTrackedPromise(
+    {
+      cancelPreviousOn: 'resolution',
+      createPromise: async () => {
+        return await callFetchLogSourceStatusAPI(sourceId);
+      },
+      onResolve: ({ data }) => {
+        setSourceStatus(data);
+      },
+    },
+    [sourceId]
+  );
+
+  const logIndicesExist = useMemo(() => (sourceStatus?.logIndexNames?.length ?? 0) > 0, [
+    sourceStatus,
+  ]);
+
+  const derivedIndexPattern = useMemo(
+    () => ({
+      fields: sourceStatus?.logIndexFields ?? [],
+      title: sourceConfiguration?.configuration.name ?? 'unknown',
+    }),
+    [sourceConfiguration, sourceStatus]
+  );
+
+  const isLoadingSourceConfiguration = useMemo(
+    () => loadSourceConfigurationRequest.state === 'pending',
+    [loadSourceConfigurationRequest.state]
+  );
+
+  const isUpdatingSourceConfiguration = useMemo(
+    () => updateSourceConfigurationRequest.state === 'pending',
+    [updateSourceConfigurationRequest.state]
+  );
+
+  const isLoadingSourceStatus = useMemo(() => loadSourceStatusRequest.state === 'pending', [
+    loadSourceStatusRequest.state,
+  ]);
+
+  const isLoading = useMemo(
+    () => isLoadingSourceConfiguration || isLoadingSourceStatus || isUpdatingSourceConfiguration,
+    [isLoadingSourceConfiguration, isLoadingSourceStatus, isUpdatingSourceConfiguration]
+  );
+
+  const isUninitialized = useMemo(
+    () =>
+      loadSourceConfigurationRequest.state === 'uninitialized' ||
+      loadSourceStatusRequest.state === 'uninitialized',
+    [loadSourceConfigurationRequest.state, loadSourceStatusRequest.state]
+  );
+
+  const hasFailedLoadingSource = useMemo(
+    () => loadSourceConfigurationRequest.state === 'rejected',
+    [loadSourceConfigurationRequest.state]
+  );
+
+  const loadSourceFailureMessage = useMemo(
+    () =>
+      loadSourceConfigurationRequest.state === 'rejected'
+        ? `${loadSourceConfigurationRequest.value}`
+        : undefined,
+    [loadSourceConfigurationRequest]
+  );
+
+  const loadSource = useCallback(() => {
+    return Promise.all([loadSourceConfiguration(), loadSourceStatus()]);
+  }, [loadSourceConfiguration, loadSourceStatus]);
+
+  const initialize = useCallback(async () => {
+    if (!isUninitialized) {
+      return;
+    }
+
+    return await loadSource();
+  }, [isUninitialized, loadSource]);
+
+  return {
+    derivedIndexPattern,
+    hasFailedLoadingSource,
+    initialize,
+    isLoading,
+    isLoadingSourceConfiguration,
+    isLoadingSourceStatus,
+    isUninitialized,
+    loadSource,
+    loadSourceFailureMessage,
+    loadSourceConfiguration,
+    loadSourceStatus,
+    logIndicesExist,
+    sourceConfiguration,
+    sourceId,
+    sourceStatus,
+    updateSourceConfiguration,
+  };
+};
+
+export const [LogSourceProvider, useLogSourceContext] = createContainer(useLogSource);
diff --git a/x-pack/plugins/infra/public/containers/logs/log_summary/with_summary.ts b/x-pack/plugins/infra/public/containers/logs/log_summary/with_summary.ts
index 14da2b47bcfa2d..625a1ead4d930f 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_summary/with_summary.ts
+++ b/x-pack/plugins/infra/public/containers/logs/log_summary/with_summary.ts
@@ -8,10 +8,10 @@ import { useContext } from 'react';
 import { useThrottle } from 'react-use';
 
 import { RendererFunction } from '../../../utils/typed_react';
-import { Source } from '../../source';
 import { LogSummaryBuckets, useLogSummary } from './log_summary';
 import { LogFilterState } from '../log_filter';
 import { LogPositionState } from '../log_position';
+import { useLogSourceContext } from '../log_source';
 
 const FETCH_THROTTLE_INTERVAL = 3000;
 
@@ -24,7 +24,7 @@ export const WithSummary = ({
     end: number | null;
   }>;
 }) => {
-  const { sourceId } = useContext(Source.Context);
+  const { sourceId } = useLogSourceContext();
   const { filterQuery } = useContext(LogFilterState.Context);
   const { startTimestamp, endTimestamp } = useContext(LogPositionState.Context);
 
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
index ed1aa9e72ebaea..04b472ceb59c84 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_content.tsx
@@ -17,7 +17,7 @@ import {
 import { SourceErrorPage } from '../../../components/source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogAnalysisCapabilitiesContext } from '../../../containers/logs/log_analysis';
-import { useSourceContext } from '../../../containers/source';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { LogEntryCategoriesResultsContent } from './page_results_content';
 import { LogEntryCategoriesSetupContent } from './page_setup_content';
 import { useLogEntryCategoriesModuleContext } from './use_log_entry_categories_module';
@@ -25,11 +25,11 @@ import { useLogEntryCategoriesModuleContext } from './use_log_entry_categories_m
 export const LogEntryCategoriesPageContent = () => {
   const {
     hasFailedLoadingSource,
-    isLoadingSource,
+    isLoading,
     isUninitialized,
     loadSource,
     loadSourceFailureMessage,
-  } = useSourceContext();
+  } = useLogSourceContext();
 
   const {
     hasLogAnalysisCapabilites,
@@ -45,7 +45,7 @@ export const LogEntryCategoriesPageContent = () => {
     }
   }, [fetchJobStatus, hasLogAnalysisReadCapabilities]);
 
-  if (isLoadingSource || isUninitialized) {
+  if (isLoading || isUninitialized) {
     return <SourceLoadingPage />;
   } else if (hasFailedLoadingSource) {
     return <SourceErrorPage errorMessage={loadSourceFailureMessage ?? ''} retry={loadSource} />;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
index 619cea6eda8b7e..cecea733b49e4c 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_categories/page_providers.tsx
@@ -6,20 +6,20 @@
 
 import React from 'react';
 
-import { useSourceContext } from '../../../containers/source';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { useKibanaSpaceId } from '../../../utils/use_kibana_space_id';
 import { LogEntryCategoriesModuleProvider } from './use_log_entry_categories_module';
 
 export const LogEntryCategoriesPageProviders: React.FunctionComponent = ({ children }) => {
-  const { sourceId, source } = useSourceContext();
+  const { sourceId, sourceConfiguration } = useLogSourceContext();
   const spaceId = useKibanaSpaceId();
 
   return (
     <LogEntryCategoriesModuleProvider
-      indexPattern={source ? source.configuration.logAlias : ''}
+      indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
       sourceId={sourceId}
       spaceId={spaceId}
-      timestampField={source ? source.configuration.fields.timestamp : ''}
+      timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
     >
       {children}
     </LogEntryCategoriesModuleProvider>
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
index 2f34e62d8e611a..fc07289f02fe7f 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_content.tsx
@@ -17,7 +17,7 @@ import {
 import { SourceErrorPage } from '../../../components/source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
 import { useLogAnalysisCapabilitiesContext } from '../../../containers/logs/log_analysis';
-import { useSourceContext } from '../../../containers/source';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { LogEntryRateResultsContent } from './page_results_content';
 import { LogEntryRateSetupContent } from './page_setup_content';
 import { useLogEntryRateModuleContext } from './use_log_entry_rate_module';
@@ -25,11 +25,11 @@ import { useLogEntryRateModuleContext } from './use_log_entry_rate_module';
 export const LogEntryRatePageContent = () => {
   const {
     hasFailedLoadingSource,
-    isLoadingSource,
+    isLoading,
     isUninitialized,
     loadSource,
     loadSourceFailureMessage,
-  } = useSourceContext();
+  } = useLogSourceContext();
 
   const {
     hasLogAnalysisCapabilites,
@@ -45,7 +45,7 @@ export const LogEntryRatePageContent = () => {
     }
   }, [fetchJobStatus, hasLogAnalysisReadCapabilities]);
 
-  if (isLoadingSource || isUninitialized) {
+  if (isLoading || isUninitialized) {
     return <SourceLoadingPage />;
   } else if (hasFailedLoadingSource) {
     return <SourceErrorPage errorMessage={loadSourceFailureMessage ?? ''} retry={loadSource} />;
diff --git a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
index 67c8ea7660a260..e91ef87bdf34ae 100644
--- a/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/log_entry_rate/page_providers.tsx
@@ -6,20 +6,20 @@
 
 import React from 'react';
 
-import { useSourceContext } from '../../../containers/source';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { useKibanaSpaceId } from '../../../utils/use_kibana_space_id';
 import { LogEntryRateModuleProvider } from './use_log_entry_rate_module';
 
 export const LogEntryRatePageProviders: React.FunctionComponent = ({ children }) => {
-  const { sourceId, source } = useSourceContext();
+  const { sourceId, sourceConfiguration } = useLogSourceContext();
   const spaceId = useKibanaSpaceId();
 
   return (
     <LogEntryRateModuleProvider
-      indexPattern={source ? source.configuration.logAlias : ''}
+      indexPattern={sourceConfiguration?.configuration.logAlias ?? ''}
       sourceId={sourceId}
       spaceId={spaceId}
-      timestampField={source ? source.configuration.fields.timestamp : ''}
+      timestampField={sourceConfiguration?.configuration.fields.timestamp ?? ''}
     >
       {children}
     </LogEntryRateModuleProvider>
diff --git a/x-pack/plugins/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
index dc210406275d8d..2974939a83215c 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_content.tsx
@@ -8,6 +8,7 @@ import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
+import { useMount } from 'react-use';
 
 import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { DocumentTitle } from '../../components/document_title';
@@ -17,6 +18,7 @@ import { AppNavigation } from '../../components/navigation/app_navigation';
 import { RoutedTabs } from '../../components/navigation/routed_tabs';
 import { ColumnarPage } from '../../components/page';
 import { useLogAnalysisCapabilitiesContext } from '../../containers/logs/log_analysis';
+import { useLogSourceContext } from '../../containers/logs/log_source';
 import { RedirectWithQueryParams } from '../../utils/redirect_with_query_params';
 import { LogEntryCategoriesPage } from './log_entry_categories';
 import { LogEntryRatePage } from './log_entry_rate';
@@ -28,6 +30,12 @@ export const LogsPageContent: React.FunctionComponent = () => {
   const uiCapabilities = useKibana().services.application?.capabilities;
   const logAnalysisCapabilities = useLogAnalysisCapabilitiesContext();
 
+  const { initialize } = useLogSourceContext();
+
+  useMount(() => {
+    initialize();
+  });
+
   const streamTab = {
     app: 'logs',
     title: streamTabTitle,
diff --git a/x-pack/plugins/infra/public/pages/logs/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/page_providers.tsx
index 24c1598787a204..d2db5002f4aa22 100644
--- a/x-pack/plugins/infra/public/pages/logs/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/page_providers.tsx
@@ -6,15 +6,16 @@
 
 import React from 'react';
 import { LogAnalysisCapabilitiesProvider } from '../../containers/logs/log_analysis';
-import { SourceProvider } from '../../containers/source';
+import { LogSourceProvider } from '../../containers/logs/log_source';
+// import { SourceProvider } from '../../containers/source';
 import { useSourceId } from '../../containers/source_id';
 
 export const LogsPageProviders: React.FunctionComponent = ({ children }) => {
   const [sourceId] = useSourceId();
 
   return (
-    <SourceProvider sourceId={sourceId}>
+    <LogSourceProvider sourceId={sourceId}>
       <LogAnalysisCapabilitiesProvider>{children}</LogAnalysisCapabilitiesProvider>
-    </SourceProvider>
+    </LogSourceProvider>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/settings.tsx b/x-pack/plugins/infra/public/pages/logs/settings.tsx
deleted file mode 100644
index faee7a643085a3..00000000000000
--- a/x-pack/plugins/infra/public/pages/logs/settings.tsx
+++ /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 React from 'react';
-import { SourceConfigurationSettings } from '../../components/source_configuration/source_configuration_settings';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
-
-export const LogsSettingsPage = () => {
-  const uiCapabilities = useKibana().services.application?.capabilities;
-  return (
-    <SourceConfigurationSettings
-      shouldAllowEdit={uiCapabilities?.logs?.configureSource as boolean}
-      displaySettings="logs"
-    />
-  );
-};
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx b/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
new file mode 100644
index 00000000000000..6e68debceac701
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/add_log_column_popover.tsx
@@ -0,0 +1,166 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiBadge,
+  EuiButton,
+  EuiPopover,
+  EuiPopoverTitle,
+  EuiSelectable,
+  EuiSelectableOption,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { useCallback, useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
+import { euiStyled } from '../../../../../observability/public';
+import { LogColumnConfiguration } from '../../../utils/source_configuration';
+import { useVisibilityState } from '../../../utils/use_visibility_state';
+
+interface SelectableColumnOption {
+  optionProps: EuiSelectableOption;
+  columnConfiguration: LogColumnConfiguration;
+}
+
+export const AddLogColumnButtonAndPopover: React.FunctionComponent<{
+  addLogColumn: (logColumnConfiguration: LogColumnConfiguration) => void;
+  availableFields: string[];
+  isDisabled?: boolean;
+}> = ({ addLogColumn, availableFields, isDisabled }) => {
+  const { isVisible: isOpen, show: openPopover, hide: closePopover } = useVisibilityState(false);
+
+  const availableColumnOptions = useMemo<SelectableColumnOption[]>(
+    () => [
+      {
+        optionProps: {
+          append: <SystemColumnBadge />,
+          'data-test-subj': 'addTimestampLogColumn',
+          // this key works around EuiSelectable using a lowercased label as
+          // key, which leads to conflicts with field names
+          key: 'timestamp',
+          label: 'Timestamp',
+        },
+        columnConfiguration: {
+          timestampColumn: {
+            id: uuidv4(),
+          },
+        },
+      },
+      {
+        optionProps: {
+          'data-test-subj': 'addMessageLogColumn',
+          append: <SystemColumnBadge />,
+          // this key works around EuiSelectable using a lowercased label as
+          // key, which leads to conflicts with field names
+          key: 'message',
+          label: 'Message',
+        },
+        columnConfiguration: {
+          messageColumn: {
+            id: uuidv4(),
+          },
+        },
+      },
+      ...availableFields.map<SelectableColumnOption>(field => ({
+        optionProps: {
+          'data-test-subj': `addFieldLogColumn addFieldLogColumn:${field}`,
+          // this key works around EuiSelectable using a lowercased label as
+          // key, which leads to conflicts with fields that only differ in the
+          // case (e.g. the metricbeat mongodb module)
+          key: `field-${field}`,
+          label: field,
+        },
+        columnConfiguration: {
+          fieldColumn: {
+            id: uuidv4(),
+            field,
+          },
+        },
+      })),
+    ],
+    [availableFields]
+  );
+
+  const availableOptions = useMemo<EuiSelectableOption[]>(
+    () => availableColumnOptions.map(availableColumnOption => availableColumnOption.optionProps),
+    [availableColumnOptions]
+  );
+
+  const handleColumnSelection = useCallback(
+    (selectedOptions: EuiSelectableOption[]) => {
+      closePopover();
+
+      const selectedOptionIndex = selectedOptions.findIndex(
+        selectedOption => selectedOption.checked === 'on'
+      );
+      const selectedOption = availableColumnOptions[selectedOptionIndex];
+
+      addLogColumn(selectedOption.columnConfiguration);
+    },
+    [addLogColumn, availableColumnOptions, closePopover]
+  );
+
+  return (
+    <EuiPopover
+      anchorPosition="downRight"
+      button={
+        <EuiButton
+          data-test-subj="addLogColumnButton"
+          isDisabled={isDisabled}
+          iconType="plusInCircle"
+          onClick={openPopover}
+        >
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.addLogColumnButtonLabel"
+            defaultMessage="Add column"
+          />
+        </EuiButton>
+      }
+      closePopover={closePopover}
+      id="addLogColumn"
+      isOpen={isOpen}
+      ownFocus
+      panelPaddingSize="none"
+    >
+      <EuiSelectable
+        height={600}
+        listProps={selectableListProps}
+        onChange={handleColumnSelection}
+        options={availableOptions}
+        searchable
+        searchProps={searchProps}
+        singleSelection
+      >
+        {(list, search) => (
+          <SelectableContent data-test-subj="addLogColumnPopover">
+            <EuiPopoverTitle>{search}</EuiPopoverTitle>
+            {list}
+          </SelectableContent>
+        )}
+      </EuiSelectable>
+    </EuiPopover>
+  );
+};
+
+const searchProps = {
+  'data-test-subj': 'fieldSearchInput',
+};
+
+const selectableListProps = {
+  showIcons: false,
+};
+
+const SystemColumnBadge: React.FunctionComponent = () => (
+  <EuiBadge>
+    <FormattedMessage
+      id="xpack.infra.sourceConfiguration.systemColumnBadgeLabel"
+      defaultMessage="System"
+    />
+  </EuiBadge>
+);
+
+const SelectableContent = euiStyled.div`
+  width: 400px;
+`;
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/fields_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/fields_configuration_panel.tsx
new file mode 100644
index 00000000000000..ac3b75ad97bb2a
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/fields_configuration_panel.tsx
@@ -0,0 +1,178 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiCallOut,
+  EuiCode,
+  EuiDescribedFormGroup,
+  EuiFieldText,
+  EuiForm,
+  EuiFormRow,
+  EuiLink,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+import { InputFieldProps } from '../../../components/source_configuration';
+
+interface FieldsConfigurationPanelProps {
+  isLoading: boolean;
+  readOnly: boolean;
+  tiebreakerFieldProps: InputFieldProps;
+  timestampFieldProps: InputFieldProps;
+}
+
+export const FieldsConfigurationPanel = ({
+  isLoading,
+  readOnly,
+  tiebreakerFieldProps,
+  timestampFieldProps,
+}: FieldsConfigurationPanelProps) => {
+  const isTimestampValueDefault = timestampFieldProps.value === '@timestamp';
+  const isTiebreakerValueDefault = tiebreakerFieldProps.value === '_doc';
+
+  return (
+    <EuiForm>
+      <EuiTitle size="s">
+        <h3>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.fieldsSectionTitle"
+            defaultMessage="Fields"
+          />
+        </h3>
+      </EuiTitle>
+      <EuiSpacer size="m" />
+      <EuiCallOut
+        title={i18n.translate('xpack.infra.sourceConfiguration.deprecationNotice', {
+          defaultMessage: 'Deprecation Notice',
+        })}
+        color="warning"
+        iconType="help"
+      >
+        <p>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.deprecationMessage"
+            defaultMessage="Configuring these fields have been deprecated and will be removed in 8.0.0. This application is designed to work with {ecsLink}, you should adjust your indexing to use the {documentationLink}."
+            values={{
+              documentationLink: (
+                <EuiLink
+                  href="https://www.elastic.co/guide/en/infrastructure/guide/7.4/infrastructure-metrics.html"
+                  target="BLANK"
+                >
+                  <FormattedMessage
+                    id="xpack.infra.sourceConfiguration.documentedFields"
+                    defaultMessage="documented fields"
+                  />
+                </EuiLink>
+              ),
+              ecsLink: (
+                <EuiLink
+                  href="https://www.elastic.co/guide/en/ecs/current/index.html"
+                  target="BLANK"
+                >
+                  ECS
+                </EuiLink>
+              ),
+            }}
+          />
+        </p>
+      </EuiCallOut>
+      <EuiSpacer size="m" />
+      <EuiDescribedFormGroup
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.timestampFieldLabel"
+              defaultMessage="Timestamp"
+            />
+          </h4>
+        }
+        description={
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.timestampFieldDescription"
+            defaultMessage="Timestamp used to sort log entries"
+          />
+        }
+      >
+        <EuiFormRow
+          error={timestampFieldProps.error}
+          fullWidth
+          helpText={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.timestampFieldRecommendedValue"
+              defaultMessage="The recommended value is {defaultValue}"
+              values={{
+                defaultValue: <EuiCode>@timestamp</EuiCode>,
+              }}
+            />
+          }
+          isInvalid={timestampFieldProps.isInvalid}
+          label={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.timestampFieldLabel"
+              defaultMessage="Timestamp"
+            />
+          }
+        >
+          <EuiFieldText
+            fullWidth
+            disabled={isLoading || isTimestampValueDefault}
+            readOnly={readOnly}
+            isLoading={isLoading}
+            {...timestampFieldProps}
+          />
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+      <EuiDescribedFormGroup
+        title={
+          <h4>
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+              defaultMessage="Tiebreaker"
+            />
+          </h4>
+        }
+        description={
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.tiebreakerFieldDescription"
+            defaultMessage="Field used to break ties between two entries with the same timestamp"
+          />
+        }
+      >
+        <EuiFormRow
+          error={tiebreakerFieldProps.error}
+          fullWidth
+          helpText={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.tiebreakerFieldRecommendedValue"
+              defaultMessage="The recommended value is {defaultValue}"
+              values={{
+                defaultValue: <EuiCode>_doc</EuiCode>,
+              }}
+            />
+          }
+          isInvalid={tiebreakerFieldProps.isInvalid}
+          label={
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.tiebreakerFieldLabel"
+              defaultMessage="Tiebreaker"
+            />
+          }
+        >
+          <EuiFieldText
+            fullWidth
+            disabled={isLoading || isTiebreakerValueDefault}
+            readOnly={readOnly}
+            isLoading={isLoading}
+            {...tiebreakerFieldProps}
+          />
+        </EuiFormRow>
+      </EuiDescribedFormGroup>
+    </EuiForm>
+  );
+};
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/index.ts b/x-pack/plugins/infra/public/pages/logs/settings/index.ts
new file mode 100644
index 00000000000000..ebdda7ebbd5873
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './source_configuration_settings';
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
new file mode 100644
index 00000000000000..a97e38884a5bd0
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_form_state.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ReactNode, useCallback, useMemo, useState } from 'react';
+import {
+  createInputFieldProps,
+  validateInputFieldNotEmpty,
+} from '../../../components/source_configuration/input_fields';
+
+interface FormState {
+  name: string;
+  description: string;
+  logAlias: string;
+  tiebreakerField: string;
+  timestampField: string;
+}
+
+type FormStateChanges = Partial<FormState>;
+
+export const useLogIndicesConfigurationFormState = ({
+  initialFormState = defaultFormState,
+}: {
+  initialFormState?: FormState;
+}) => {
+  const [formStateChanges, setFormStateChanges] = useState<FormStateChanges>({});
+
+  const resetForm = useCallback(() => setFormStateChanges({}), []);
+
+  const formState = useMemo(
+    () => ({
+      ...initialFormState,
+      ...formStateChanges,
+    }),
+    [initialFormState, formStateChanges]
+  );
+
+  const nameFieldProps = useMemo(
+    () =>
+      createInputFieldProps({
+        errors: validateInputFieldNotEmpty(formState.name),
+        name: 'name',
+        onChange: name => setFormStateChanges(changes => ({ ...changes, name })),
+        value: formState.name,
+      }),
+    [formState.name]
+  );
+  const logAliasFieldProps = useMemo(
+    () =>
+      createInputFieldProps({
+        errors: validateInputFieldNotEmpty(formState.logAlias),
+        name: 'logAlias',
+        onChange: logAlias => setFormStateChanges(changes => ({ ...changes, logAlias })),
+        value: formState.logAlias,
+      }),
+    [formState.logAlias]
+  );
+  const tiebreakerFieldFieldProps = useMemo(
+    () =>
+      createInputFieldProps({
+        errors: validateInputFieldNotEmpty(formState.tiebreakerField),
+        name: `tiebreakerField`,
+        onChange: tiebreakerField =>
+          setFormStateChanges(changes => ({ ...changes, tiebreakerField })),
+        value: formState.tiebreakerField,
+      }),
+    [formState.tiebreakerField]
+  );
+  const timestampFieldFieldProps = useMemo(
+    () =>
+      createInputFieldProps({
+        errors: validateInputFieldNotEmpty(formState.timestampField),
+        name: `timestampField`,
+        onChange: timestampField =>
+          setFormStateChanges(changes => ({ ...changes, timestampField })),
+        value: formState.timestampField,
+      }),
+    [formState.timestampField]
+  );
+
+  const fieldProps = useMemo(
+    () => ({
+      name: nameFieldProps,
+      logAlias: logAliasFieldProps,
+      tiebreakerField: tiebreakerFieldFieldProps,
+      timestampField: timestampFieldFieldProps,
+    }),
+    [nameFieldProps, logAliasFieldProps, tiebreakerFieldFieldProps, timestampFieldFieldProps]
+  );
+
+  const errors = useMemo(
+    () =>
+      Object.values(fieldProps).reduce<ReactNode[]>(
+        (accumulatedErrors, { error }) => [...accumulatedErrors, ...error],
+        []
+      ),
+    [fieldProps]
+  );
+
+  const isFormValid = useMemo(() => errors.length <= 0, [errors]);
+
+  const isFormDirty = useMemo(() => Object.keys(formStateChanges).length > 0, [formStateChanges]);
+
+  return {
+    errors,
+    fieldProps,
+    formState,
+    formStateChanges,
+    isFormDirty,
+    isFormValid,
+    resetForm,
+  };
+};
+
+const defaultFormState: FormState = {
+  name: '',
+  description: '',
+  logAlias: '',
+  tiebreakerField: '',
+  timestampField: '',
+};
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
new file mode 100644
index 00000000000000..83effaa3d51a55
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/indices_configuration_panel.tsx
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiCode,
+  EuiDescribedFormGroup,
+  EuiFieldText,
+  EuiForm,
+  EuiFormRow,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React from 'react';
+import { InputFieldProps } from '../../../components/source_configuration';
+
+interface IndicesConfigurationPanelProps {
+  isLoading: boolean;
+  readOnly: boolean;
+  logAliasFieldProps: InputFieldProps;
+}
+
+export const IndicesConfigurationPanel = ({
+  isLoading,
+  readOnly,
+  logAliasFieldProps,
+}: IndicesConfigurationPanelProps) => (
+  <EuiForm>
+    <EuiTitle size="s">
+      <h3>
+        <FormattedMessage
+          id="xpack.infra.sourceConfiguration.indicesSectionTitle"
+          defaultMessage="Indices"
+        />
+      </h3>
+    </EuiTitle>
+    <EuiSpacer size="m" />
+    <EuiDescribedFormGroup
+      title={
+        <h4>
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.logIndicesTitle"
+            defaultMessage="Log indices"
+          />
+        </h4>
+      }
+      description={
+        <FormattedMessage
+          id="xpack.infra.sourceConfiguration.logIndicesDescription"
+          defaultMessage="Index pattern for matching indices that contain log data"
+        />
+      }
+    >
+      <EuiFormRow
+        error={logAliasFieldProps.error}
+        fullWidth
+        helpText={
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.logIndicesRecommendedValue"
+            defaultMessage="The recommended value is {defaultValue}"
+            values={{
+              defaultValue: <EuiCode>filebeat-*</EuiCode>,
+            }}
+          />
+        }
+        isInvalid={logAliasFieldProps.isInvalid}
+        label={
+          <FormattedMessage
+            id="xpack.infra.sourceConfiguration.logIndicesLabel"
+            defaultMessage="Log indices"
+          />
+        }
+      >
+        <EuiFieldText
+          data-test-subj="logIndicesInput"
+          fullWidth
+          disabled={isLoading}
+          isLoading={isLoading}
+          readOnly={readOnly}
+          {...logAliasFieldProps}
+        />
+      </EuiFormRow>
+    </EuiDescribedFormGroup>
+  </EuiForm>
+);
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_form_state.tsx b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_form_state.tsx
new file mode 100644
index 00000000000000..0beccffe5f4e8d
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_form_state.tsx
@@ -0,0 +1,153 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { useCallback, useMemo, useState } from 'react';
+import {
+  FieldLogColumnConfiguration,
+  isMessageLogColumnConfiguration,
+  isTimestampLogColumnConfiguration,
+  LogColumnConfiguration,
+  MessageLogColumnConfiguration,
+  TimestampLogColumnConfiguration,
+} from '../../../utils/source_configuration';
+
+export interface TimestampLogColumnConfigurationProps {
+  logColumnConfiguration: TimestampLogColumnConfiguration['timestampColumn'];
+  remove: () => void;
+  type: 'timestamp';
+}
+
+export interface MessageLogColumnConfigurationProps {
+  logColumnConfiguration: MessageLogColumnConfiguration['messageColumn'];
+  remove: () => void;
+  type: 'message';
+}
+
+export interface FieldLogColumnConfigurationProps {
+  logColumnConfiguration: FieldLogColumnConfiguration['fieldColumn'];
+  remove: () => void;
+  type: 'field';
+}
+
+export type LogColumnConfigurationProps =
+  | TimestampLogColumnConfigurationProps
+  | MessageLogColumnConfigurationProps
+  | FieldLogColumnConfigurationProps;
+
+interface FormState {
+  logColumns: LogColumnConfiguration[];
+}
+
+type FormStateChanges = Partial<FormState>;
+
+export const useLogColumnsConfigurationFormState = ({
+  initialFormState = defaultFormState,
+}: {
+  initialFormState?: FormState;
+}) => {
+  const [formStateChanges, setFormStateChanges] = useState<FormStateChanges>({});
+
+  const resetForm = useCallback(() => setFormStateChanges({}), []);
+
+  const formState = useMemo(
+    () => ({
+      ...initialFormState,
+      ...formStateChanges,
+    }),
+    [initialFormState, formStateChanges]
+  );
+
+  const logColumnConfigurationProps = useMemo<LogColumnConfigurationProps[]>(
+    () =>
+      formState.logColumns.map(
+        (logColumn): LogColumnConfigurationProps => {
+          const remove = () =>
+            setFormStateChanges(changes => ({
+              ...changes,
+              logColumns: formState.logColumns.filter(item => item !== logColumn),
+            }));
+
+          if (isTimestampLogColumnConfiguration(logColumn)) {
+            return {
+              logColumnConfiguration: logColumn.timestampColumn,
+              remove,
+              type: 'timestamp',
+            };
+          } else if (isMessageLogColumnConfiguration(logColumn)) {
+            return {
+              logColumnConfiguration: logColumn.messageColumn,
+              remove,
+              type: 'message',
+            };
+          } else {
+            return {
+              logColumnConfiguration: logColumn.fieldColumn,
+              remove,
+              type: 'field',
+            };
+          }
+        }
+      ),
+    [formState.logColumns]
+  );
+
+  const addLogColumn = useCallback(
+    (logColumnConfiguration: LogColumnConfiguration) =>
+      setFormStateChanges(changes => ({
+        ...changes,
+        logColumns: [...formState.logColumns, logColumnConfiguration],
+      })),
+    [formState.logColumns]
+  );
+
+  const moveLogColumn = useCallback(
+    (sourceIndex, destinationIndex) => {
+      if (destinationIndex >= 0 && sourceIndex <= formState.logColumns.length - 1) {
+        const newLogColumns = [...formState.logColumns];
+        newLogColumns.splice(destinationIndex, 0, newLogColumns.splice(sourceIndex, 1)[0]);
+        setFormStateChanges(changes => ({
+          ...changes,
+          logColumns: newLogColumns,
+        }));
+      }
+    },
+    [formState.logColumns]
+  );
+
+  const errors = useMemo(
+    () =>
+      logColumnConfigurationProps.length <= 0
+        ? [
+            <FormattedMessage
+              id="xpack.infra.sourceConfiguration.logColumnListEmptyErrorMessage"
+              defaultMessage="The log column list must not be empty."
+            />,
+          ]
+        : [],
+    [logColumnConfigurationProps]
+  );
+
+  const isFormValid = useMemo(() => (errors.length <= 0 ? true : false), [errors]);
+
+  const isFormDirty = useMemo(() => Object.keys(formStateChanges).length > 0, [formStateChanges]);
+
+  return {
+    addLogColumn,
+    moveLogColumn,
+    errors,
+    logColumnConfigurationProps,
+    formState,
+    formStateChanges,
+    isFormDirty,
+    isFormValid,
+    resetForm,
+  };
+};
+
+const defaultFormState: FormState = {
+  logColumns: [],
+};
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
new file mode 100644
index 00000000000000..777f611ef33f71
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/log_columns_configuration_panel.tsx
@@ -0,0 +1,276 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiButtonIcon,
+  EuiDragDropContext,
+  EuiDraggable,
+  EuiDroppable,
+  EuiEmptyPrompt,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiForm,
+  EuiIcon,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { useCallback } from 'react';
+import { DragHandleProps, DropResult } from '../../../../../observability/public';
+import { LogColumnConfiguration } from '../../../utils/source_configuration';
+import { AddLogColumnButtonAndPopover } from './add_log_column_popover';
+import {
+  FieldLogColumnConfigurationProps,
+  LogColumnConfigurationProps,
+} from './log_columns_configuration_form_state';
+
+interface LogColumnsConfigurationPanelProps {
+  availableFields: string[];
+  isLoading: boolean;
+  logColumnConfiguration: LogColumnConfigurationProps[];
+  addLogColumn: (logColumn: LogColumnConfiguration) => void;
+  moveLogColumn: (sourceIndex: number, destinationIndex: number) => void;
+}
+
+export const LogColumnsConfigurationPanel: React.FunctionComponent<LogColumnsConfigurationPanelProps> = ({
+  addLogColumn,
+  moveLogColumn,
+  availableFields,
+  isLoading,
+  logColumnConfiguration,
+}) => {
+  const onDragEnd = useCallback(
+    ({ source, destination }: DropResult) =>
+      destination && moveLogColumn(source.index, destination.index),
+    [moveLogColumn]
+  );
+
+  return (
+    <EuiForm>
+      <EuiFlexGroup>
+        <EuiFlexItem>
+          <EuiTitle size="s" data-test-subj="sourceConfigurationLogColumnsSectionTitle">
+            <h3>
+              <FormattedMessage
+                id="xpack.infra.sourceConfiguration.logColumnsSectionTitle"
+                defaultMessage="Log Columns"
+              />
+            </h3>
+          </EuiTitle>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <AddLogColumnButtonAndPopover
+            addLogColumn={addLogColumn}
+            availableFields={availableFields}
+            isDisabled={isLoading}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      {logColumnConfiguration.length > 0 ? (
+        <EuiDragDropContext onDragEnd={onDragEnd}>
+          <EuiDroppable droppableId="COLUMN_CONFIG_DROPPABLE_AREA">
+            <>
+              {/* Fragment here necessary for typechecking */}
+              {logColumnConfiguration.map((column, index) => (
+                <EuiDraggable
+                  key={`logColumnConfigurationPanel-${column.logColumnConfiguration.id}`}
+                  index={index}
+                  draggableId={column.logColumnConfiguration.id}
+                  customDragHandle
+                >
+                  {provided => (
+                    <LogColumnConfigurationPanel
+                      dragHandleProps={provided.dragHandleProps}
+                      logColumnConfigurationProps={column}
+                    />
+                  )}
+                </EuiDraggable>
+              ))}
+            </>
+          </EuiDroppable>
+        </EuiDragDropContext>
+      ) : (
+        <LogColumnConfigurationEmptyPrompt />
+      )}
+    </EuiForm>
+  );
+};
+
+interface LogColumnConfigurationPanelProps {
+  logColumnConfigurationProps: LogColumnConfigurationProps;
+  dragHandleProps: DragHandleProps;
+}
+
+const LogColumnConfigurationPanel: React.FunctionComponent<LogColumnConfigurationPanelProps> = props => (
+  <>
+    <EuiSpacer size="m" />
+    {props.logColumnConfigurationProps.type === 'timestamp' ? (
+      <TimestampLogColumnConfigurationPanel {...props} />
+    ) : props.logColumnConfigurationProps.type === 'message' ? (
+      <MessageLogColumnConfigurationPanel {...props} />
+    ) : (
+      <FieldLogColumnConfigurationPanel
+        logColumnConfigurationProps={props.logColumnConfigurationProps}
+        dragHandleProps={props.dragHandleProps}
+      />
+    )}
+  </>
+);
+
+const TimestampLogColumnConfigurationPanel: React.FunctionComponent<LogColumnConfigurationPanelProps> = ({
+  logColumnConfigurationProps,
+  dragHandleProps,
+}) => (
+  <ExplainedLogColumnConfigurationPanel
+    fieldName="Timestamp"
+    helpText={
+      <FormattedMessage
+        tagName="span"
+        id="xpack.infra.sourceConfiguration.timestampLogColumnDescription"
+        defaultMessage="This system field shows the log entry's time as determined by the {timestampSetting} field setting."
+        values={{
+          timestampSetting: <code>timestamp</code>,
+        }}
+      />
+    }
+    removeColumn={logColumnConfigurationProps.remove}
+    dragHandleProps={dragHandleProps}
+  />
+);
+
+const MessageLogColumnConfigurationPanel: React.FunctionComponent<LogColumnConfigurationPanelProps> = ({
+  logColumnConfigurationProps,
+  dragHandleProps,
+}) => (
+  <ExplainedLogColumnConfigurationPanel
+    fieldName="Message"
+    helpText={
+      <FormattedMessage
+        tagName="span"
+        id="xpack.infra.sourceConfiguration.messageLogColumnDescription"
+        defaultMessage="This system field shows the log entry message as derived from the document fields."
+      />
+    }
+    removeColumn={logColumnConfigurationProps.remove}
+    dragHandleProps={dragHandleProps}
+  />
+);
+
+const FieldLogColumnConfigurationPanel: React.FunctionComponent<{
+  logColumnConfigurationProps: FieldLogColumnConfigurationProps;
+  dragHandleProps: DragHandleProps;
+}> = ({
+  logColumnConfigurationProps: {
+    logColumnConfiguration: { field },
+    remove,
+  },
+  dragHandleProps,
+}) => {
+  const fieldLogColumnTitle = i18n.translate(
+    'xpack.infra.sourceConfiguration.fieldLogColumnTitle',
+    {
+      defaultMessage: 'Field',
+    }
+  );
+  return (
+    <EuiPanel data-test-subj={`logColumnPanel fieldLogColumnPanel fieldLogColumnPanel:${field}`}>
+      <EuiFlexGroup>
+        <EuiFlexItem grow={false}>
+          <div data-test-subj="moveLogColumnHandle" {...dragHandleProps}>
+            <EuiIcon type="grab" />
+          </div>
+        </EuiFlexItem>
+        <EuiFlexItem grow={1}>{fieldLogColumnTitle}</EuiFlexItem>
+        <EuiFlexItem grow={3}>
+          <code>{field}</code>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <RemoveLogColumnButton
+            onClick={remove}
+            columnDescription={`${fieldLogColumnTitle} - ${field}`}
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
+
+const ExplainedLogColumnConfigurationPanel: React.FunctionComponent<{
+  fieldName: React.ReactNode;
+  helpText: React.ReactNode;
+  removeColumn: () => void;
+  dragHandleProps: DragHandleProps;
+}> = ({ fieldName, helpText, removeColumn, dragHandleProps }) => (
+  <EuiPanel
+    data-test-subj={`logColumnPanel systemLogColumnPanel systemLogColumnPanel:${fieldName}`}
+  >
+    <EuiFlexGroup>
+      <EuiFlexItem grow={false}>
+        <div data-test-subj="moveLogColumnHandle" {...dragHandleProps}>
+          <EuiIcon type="grab" />
+        </div>
+      </EuiFlexItem>
+      <EuiFlexItem grow={1}>{fieldName}</EuiFlexItem>
+      <EuiFlexItem grow={3}>
+        <EuiText size="s" color="subdued">
+          {helpText}
+        </EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <RemoveLogColumnButton onClick={removeColumn} columnDescription={String(fieldName)} />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  </EuiPanel>
+);
+
+const RemoveLogColumnButton: React.FunctionComponent<{
+  onClick?: () => void;
+  columnDescription: string;
+}> = ({ onClick, columnDescription }) => {
+  const removeColumnLabel = i18n.translate(
+    'xpack.infra.sourceConfiguration.removeLogColumnButtonLabel',
+    {
+      defaultMessage: 'Remove {columnDescription} column',
+      values: { columnDescription },
+    }
+  );
+
+  return (
+    <EuiButtonIcon
+      color="danger"
+      data-test-subj="removeLogColumnButton"
+      iconType="trash"
+      onClick={onClick}
+      title={removeColumnLabel}
+      aria-label={removeColumnLabel}
+    />
+  );
+};
+
+const LogColumnConfigurationEmptyPrompt: React.FunctionComponent = () => (
+  <EuiEmptyPrompt
+    iconType="list"
+    title={
+      <h2>
+        <FormattedMessage
+          id="xpack.infra.sourceConfiguration.noLogColumnsTitle"
+          defaultMessage="No columns"
+        />
+      </h2>
+    }
+    body={
+      <p>
+        <FormattedMessage
+          id="xpack.infra.sourceConfiguration.noLogColumnsDescription"
+          defaultMessage="Add a column to this list using the button above."
+        />
+      </p>
+    }
+  />
+);
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_form_state.tsx b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_form_state.tsx
new file mode 100644
index 00000000000000..92d70955c678f1
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_form_state.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useCallback, useMemo } from 'react';
+import { LogSourceConfigurationProperties } from '../../../containers/logs/log_source';
+import { useLogIndicesConfigurationFormState } from './indices_configuration_form_state';
+import { useLogColumnsConfigurationFormState } from './log_columns_configuration_form_state';
+
+export const useLogSourceConfigurationFormState = (
+  configuration?: LogSourceConfigurationProperties
+) => {
+  const indicesConfigurationFormState = useLogIndicesConfigurationFormState({
+    initialFormState: useMemo(
+      () =>
+        configuration
+          ? {
+              name: configuration.name,
+              description: configuration.description,
+              logAlias: configuration.logAlias,
+              tiebreakerField: configuration.fields.tiebreaker,
+              timestampField: configuration.fields.timestamp,
+            }
+          : undefined,
+      [configuration]
+    ),
+  });
+
+  const logColumnsConfigurationFormState = useLogColumnsConfigurationFormState({
+    initialFormState: useMemo(
+      () =>
+        configuration
+          ? {
+              logColumns: configuration.logColumns,
+            }
+          : undefined,
+      [configuration]
+    ),
+  });
+
+  const errors = useMemo(
+    () => [...indicesConfigurationFormState.errors, ...logColumnsConfigurationFormState.errors],
+    [indicesConfigurationFormState.errors, logColumnsConfigurationFormState.errors]
+  );
+
+  const resetForm = useCallback(() => {
+    indicesConfigurationFormState.resetForm();
+    logColumnsConfigurationFormState.resetForm();
+  }, [indicesConfigurationFormState, logColumnsConfigurationFormState]);
+
+  const isFormDirty = useMemo(
+    () => indicesConfigurationFormState.isFormDirty || logColumnsConfigurationFormState.isFormDirty,
+    [indicesConfigurationFormState.isFormDirty, logColumnsConfigurationFormState.isFormDirty]
+  );
+
+  const isFormValid = useMemo(
+    () => indicesConfigurationFormState.isFormValid && logColumnsConfigurationFormState.isFormValid,
+    [indicesConfigurationFormState.isFormValid, logColumnsConfigurationFormState.isFormValid]
+  );
+
+  const formState = useMemo(
+    () => ({
+      name: indicesConfigurationFormState.formState.name,
+      description: indicesConfigurationFormState.formState.description,
+      logAlias: indicesConfigurationFormState.formState.logAlias,
+      fields: {
+        tiebreaker: indicesConfigurationFormState.formState.tiebreakerField,
+        timestamp: indicesConfigurationFormState.formState.timestampField,
+      },
+      logColumns: logColumnsConfigurationFormState.formState.logColumns,
+    }),
+    [indicesConfigurationFormState.formState, logColumnsConfigurationFormState.formState]
+  );
+
+  const formStateChanges = useMemo(
+    () => ({
+      name: indicesConfigurationFormState.formStateChanges.name,
+      description: indicesConfigurationFormState.formStateChanges.description,
+      logAlias: indicesConfigurationFormState.formStateChanges.logAlias,
+      fields: {
+        tiebreaker: indicesConfigurationFormState.formStateChanges.tiebreakerField,
+        timestamp: indicesConfigurationFormState.formStateChanges.timestampField,
+      },
+      logColumns: logColumnsConfigurationFormState.formStateChanges.logColumns,
+    }),
+    [
+      indicesConfigurationFormState.formStateChanges,
+      logColumnsConfigurationFormState.formStateChanges,
+    ]
+  );
+
+  return {
+    addLogColumn: logColumnsConfigurationFormState.addLogColumn,
+    moveLogColumn: logColumnsConfigurationFormState.moveLogColumn,
+    errors,
+    formState,
+    formStateChanges,
+    isFormDirty,
+    isFormValid,
+    indicesConfigurationProps: indicesConfigurationFormState.fieldProps,
+    logColumnConfigurationProps: logColumnsConfigurationFormState.logColumnConfigurationProps,
+    resetForm,
+  };
+};
diff --git a/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
new file mode 100644
index 00000000000000..88b1441f0ba7c1
--- /dev/null
+++ b/x-pack/plugins/infra/public/pages/logs/settings/source_configuration_settings.tsx
@@ -0,0 +1,193 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  EuiButton,
+  EuiCallOut,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPanel,
+  EuiSpacer,
+  EuiPage,
+  EuiPageBody,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { useCallback, useMemo } from 'react';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { FieldsConfigurationPanel } from './fields_configuration_panel';
+import { IndicesConfigurationPanel } from './indices_configuration_panel';
+import { NameConfigurationPanel } from '../../../components/source_configuration/name_configuration_panel';
+import { LogColumnsConfigurationPanel } from './log_columns_configuration_panel';
+import { useLogSourceConfigurationFormState } from './source_configuration_form_state';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
+import { SourceLoadingPage } from '../../../components/source_loading_page';
+import { Prompt } from '../../../utils/navigation_warning_prompt';
+
+export const LogsSettingsPage = () => {
+  const uiCapabilities = useKibana().services.application?.capabilities;
+  const shouldAllowEdit = uiCapabilities?.logs?.configureSource === true;
+
+  const {
+    sourceConfiguration: source,
+    sourceStatus,
+    isLoading,
+    isUninitialized,
+    updateSourceConfiguration,
+  } = useLogSourceContext();
+
+  const availableFields = useMemo(
+    () => sourceStatus?.logIndexFields.map(field => field.name) ?? [],
+    [sourceStatus]
+  );
+
+  const {
+    addLogColumn,
+    moveLogColumn,
+    indicesConfigurationProps,
+    logColumnConfigurationProps,
+    errors,
+    resetForm,
+    isFormDirty,
+    isFormValid,
+    formStateChanges,
+  } = useLogSourceConfigurationFormState(source?.configuration);
+
+  const persistUpdates = useCallback(async () => {
+    await updateSourceConfiguration(formStateChanges);
+    resetForm();
+  }, [updateSourceConfiguration, resetForm, formStateChanges]);
+
+  const isWriteable = useMemo(() => shouldAllowEdit && source && source.origin !== 'internal', [
+    shouldAllowEdit,
+    source,
+  ]);
+
+  if ((isLoading || isUninitialized) && !source) {
+    return <SourceLoadingPage />;
+  }
+  if (!source?.configuration) {
+    return null;
+  }
+
+  return (
+    <>
+      <EuiPage>
+        <EuiPageBody
+          className="eui-displayBlock"
+          restrictWidth
+          data-test-subj="sourceConfigurationContent"
+        >
+          <Prompt prompt={isFormDirty ? unsavedFormPromptMessage : undefined} />
+          <EuiPanel paddingSize="l">
+            <NameConfigurationPanel
+              isLoading={isLoading}
+              nameFieldProps={indicesConfigurationProps.name}
+              readOnly={!isWriteable}
+            />
+          </EuiPanel>
+          <EuiSpacer />
+          <EuiPanel paddingSize="l">
+            <IndicesConfigurationPanel
+              isLoading={isLoading}
+              logAliasFieldProps={indicesConfigurationProps.logAlias}
+              readOnly={!isWriteable}
+            />
+          </EuiPanel>
+          <EuiSpacer />
+          <EuiPanel paddingSize="l">
+            <FieldsConfigurationPanel
+              isLoading={isLoading}
+              readOnly={!isWriteable}
+              tiebreakerFieldProps={indicesConfigurationProps.tiebreakerField}
+              timestampFieldProps={indicesConfigurationProps.timestampField}
+            />
+          </EuiPanel>
+          <EuiSpacer />
+          <EuiPanel paddingSize="l">
+            <LogColumnsConfigurationPanel
+              addLogColumn={addLogColumn}
+              moveLogColumn={moveLogColumn}
+              availableFields={availableFields}
+              isLoading={isLoading}
+              logColumnConfiguration={logColumnConfigurationProps}
+            />
+          </EuiPanel>
+          {errors.length > 0 ? (
+            <>
+              <EuiCallOut color="danger">
+                <ul>
+                  {errors.map((error, errorIndex) => (
+                    <li key={errorIndex}>{error}</li>
+                  ))}
+                </ul>
+              </EuiCallOut>
+              <EuiSpacer size="m" />
+            </>
+          ) : null}
+          <EuiSpacer size="m" />
+          <EuiFlexGroup>
+            {isWriteable && (
+              <EuiFlexItem>
+                {isLoading ? (
+                  <EuiFlexGroup justifyContent="flexEnd">
+                    <EuiFlexItem grow={false}>
+                      <EuiButton color="primary" isLoading fill>
+                        Loading
+                      </EuiButton>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                ) : (
+                  <>
+                    <EuiFlexGroup justifyContent="flexEnd">
+                      <EuiFlexItem grow={false}>
+                        <EuiButton
+                          data-test-subj="discardSettingsButton"
+                          color="danger"
+                          iconType="cross"
+                          isDisabled={isLoading || !isFormDirty}
+                          onClick={() => {
+                            resetForm();
+                          }}
+                        >
+                          <FormattedMessage
+                            id="xpack.infra.sourceConfiguration.discardSettingsButtonLabel"
+                            defaultMessage="Discard"
+                          />
+                        </EuiButton>
+                      </EuiFlexItem>
+                      <EuiFlexItem grow={false}>
+                        <EuiButton
+                          data-test-subj="applySettingsButton"
+                          color="primary"
+                          isDisabled={!isFormDirty || !isFormValid}
+                          fill
+                          onClick={persistUpdates}
+                        >
+                          <FormattedMessage
+                            id="xpack.infra.sourceConfiguration.applySettingsButtonLabel"
+                            defaultMessage="Apply"
+                          />
+                        </EuiButton>
+                      </EuiFlexItem>
+                    </EuiFlexGroup>
+                  </>
+                )}
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
+        </EuiPageBody>
+      </EuiPage>
+    </>
+  );
+};
+
+const unsavedFormPromptMessage = i18n.translate(
+  'xpack.infra.logSourceConfiguration.unsavedFormPromptMessage',
+  {
+    defaultMessage: 'Are you sure you want to leave? Changes will be lost',
+  }
+);
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
index aff0ac27c36f86..712d625052140a 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page.tsx
@@ -5,13 +5,11 @@
  */
 
 import React from 'react';
-
+import { useTrackPageview } from '../../../../../observability/public';
 import { ColumnarPage } from '../../../components/page';
 import { StreamPageContent } from './page_content';
 import { StreamPageHeader } from './page_header';
 import { LogsPageProviders } from './page_providers';
-import { PageViewLogInContext } from './page_view_log_in_context';
-import { useTrackPageview } from '../../../../../observability/public';
 
 export const StreamPage = () => {
   useTrackPageview({ app: 'infra_logs', path: 'stream' });
@@ -22,7 +20,6 @@ export const StreamPage = () => {
         <StreamPageHeader />
         <StreamPageContent />
       </ColumnarPage>
-      <PageViewLogInContext />
     </LogsPageProviders>
   );
 };
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
index 010a17dae4ebdf..40ac5c74a6836f 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_content.tsx
@@ -7,21 +7,21 @@
 import React from 'react';
 import { SourceErrorPage } from '../../../components/source_error_page';
 import { SourceLoadingPage } from '../../../components/source_loading_page';
-import { useSourceContext } from '../../../containers/source';
 import { LogsPageLogsContent } from './page_logs_content';
 import { LogsPageNoIndicesContent } from './page_no_indices_content';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 
 export const StreamPageContent: React.FunctionComponent = () => {
   const {
     hasFailedLoadingSource,
-    isLoadingSource,
+    isLoading,
     isUninitialized,
     loadSource,
     loadSourceFailureMessage,
     logIndicesExist,
-  } = useSourceContext();
+  } = useLogSourceContext();
 
-  if (isLoadingSource || isUninitialized) {
+  if (isLoading || isUninitialized) {
     return <SourceLoadingPage />;
   } else if (hasFailedLoadingSource) {
     return <SourceErrorPage errorMessage={loadSourceFailureMessage ?? ''} retry={loadSource} />;
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
index 3208ea24029505..85781c48f95129 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_logs_content.tsx
@@ -5,32 +5,30 @@
  */
 
 import React, { useContext } from 'react';
-
 import { euiStyled } from '../../../../../observability/public';
 import { AutoSizer } from '../../../components/auto_sizer';
 import { LogEntryFlyout } from '../../../components/logging/log_entry_flyout';
 import { LogMinimap } from '../../../components/logging/log_minimap';
 import { ScrollableLogTextStreamView } from '../../../components/logging/log_text_stream';
 import { PageContent } from '../../../components/page';
-
-import { WithSummary } from '../../../containers/logs/log_summary';
-import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { LogFilterState } from '../../../containers/logs/log_filter';
 import {
   LogFlyout as LogFlyoutState,
   WithFlyoutOptionsUrlState,
 } from '../../../containers/logs/log_flyout';
+import { LogHighlightsState } from '../../../containers/logs/log_highlights';
 import { LogPositionState } from '../../../containers/logs/log_position';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
+import { WithSummary } from '../../../containers/logs/log_summary';
+import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
+import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
 import { WithLogTextviewUrlState } from '../../../containers/logs/with_log_textview';
 import { WithStreamItems } from '../../../containers/logs/with_stream_items';
-import { Source } from '../../../containers/source';
-
 import { LogsToolbar } from './page_toolbar';
-import { LogHighlightsState } from '../../../containers/logs/log_highlights';
-import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
+import { PageViewLogInContext } from './page_view_log_in_context';
 
 export const LogsPageLogsContent: React.FunctionComponent = () => {
-  const { source, sourceId, version } = useContext(Source.Context);
+  const { sourceConfiguration, sourceId } = useLogSourceContext();
   const { textScale, textWrap } = useContext(LogViewConfiguration.Context);
   const {
     setFlyoutVisibility,
@@ -64,6 +62,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
       <WithLogTextviewUrlState />
       <WithFlyoutOptionsUrlState />
       <LogsToolbar />
+      <PageViewLogInContext />
       {flyoutVisible ? (
         <LogEntryFlyout
           setFilter={applyLogFilterQuery}
@@ -77,7 +76,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
           loading={isLoading}
         />
       ) : null}
-      <PageContent key={`${sourceId}-${version}`}>
+      <PageContent key={`${sourceId}-${sourceConfiguration?.version}`}>
         <WithStreamItems>
           {({
             currentHighlightKey,
@@ -91,7 +90,9 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
             checkForNewEntries,
           }) => (
             <ScrollableLogTextStreamView
-              columnConfigurations={(source && source.configuration.logColumns) || []}
+              columnConfigurations={
+                (sourceConfiguration && sourceConfiguration.configuration.logColumns) || []
+              }
               hasMoreAfterEnd={hasMoreAfterEnd}
               hasMoreBeforeStart={hasMoreBeforeStart}
               isLoadingMore={isLoadingMore}
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
index 0341dc7c35b335..428a7d3fdfe4b1 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_providers.tsx
@@ -12,13 +12,11 @@ import { LogHighlightsState } from '../../../containers/logs/log_highlights/log_
 import { LogPositionState, WithLogPositionUrlState } from '../../../containers/logs/log_position';
 import { LogFilterState, WithLogFilterUrlState } from '../../../containers/logs/log_filter';
 import { LogEntriesState } from '../../../containers/logs/log_entries';
-
-import { Source } from '../../../containers/source';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
 
 const LogFilterStateProvider: React.FC = ({ children }) => {
-  const { createDerivedIndexPattern } = useContext(Source.Context);
-  const derivedIndexPattern = createDerivedIndexPattern('logs');
+  const { derivedIndexPattern } = useLogSourceContext();
   return (
     <LogFilterState.Provider indexPattern={derivedIndexPattern}>
       <WithLogFilterUrlState />
@@ -29,7 +27,7 @@ const LogFilterStateProvider: React.FC = ({ children }) => {
 
 const ViewLogInContextProvider: React.FC = ({ children }) => {
   const { startTimestamp, endTimestamp } = useContext(LogPositionState.Context);
-  const { sourceId } = useContext(Source.Context);
+  const { sourceId } = useLogSourceContext();
 
   if (!startTimestamp || !endTimestamp) {
     return null;
@@ -47,7 +45,7 @@ const ViewLogInContextProvider: React.FC = ({ children }) => {
 };
 
 const LogEntriesStateProvider: React.FC = ({ children }) => {
-  const { sourceId } = useContext(Source.Context);
+  const { sourceId } = useLogSourceContext();
   const {
     startTimestamp,
     endTimestamp,
@@ -89,13 +87,13 @@ const LogEntriesStateProvider: React.FC = ({ children }) => {
 };
 
 const LogHighlightsStateProvider: React.FC = ({ children }) => {
-  const { sourceId, version } = useContext(Source.Context);
+  const { sourceId, sourceConfiguration } = useLogSourceContext();
   const [{ topCursor, bottomCursor, centerCursor, entries }] = useContext(LogEntriesState.Context);
   const { filterQuery } = useContext(LogFilterState.Context);
 
   const highlightsProps = {
     sourceId,
-    sourceVersion: version,
+    sourceVersion: sourceConfiguration?.version,
     entriesStart: topCursor,
     entriesEnd: bottomCursor,
     centerCursor,
@@ -106,6 +104,13 @@ const LogHighlightsStateProvider: React.FC = ({ children }) => {
 };
 
 export const LogsPageProviders: React.FunctionComponent = ({ children }) => {
+  const { logIndicesExist } = useLogSourceContext();
+
+  // The providers assume the source is loaded, so short-circuit them otherwise
+  if (!logIndicesExist) {
+    return <>{children}</>;
+  }
+
   return (
     <LogViewConfiguration.Provider>
       <LogFlyout.Provider>
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
index 2f9a76fd47490b..9667272eb24179 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_toolbar.tsx
@@ -19,13 +19,12 @@ import { LogFlyout } from '../../../containers/logs/log_flyout';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { LogFilterState } from '../../../containers/logs/log_filter';
 import { LogPositionState } from '../../../containers/logs/log_position';
-import { Source } from '../../../containers/source';
 import { WithKueryAutocompletion } from '../../../containers/with_kuery_autocompletion';
 import { LogDatepicker } from '../../../components/logging/log_datepicker';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
 
 export const LogsToolbar = () => {
-  const { createDerivedIndexPattern } = useContext(Source.Context);
-  const derivedIndexPattern = createDerivedIndexPattern('logs');
+  const { derivedIndexPattern } = useLogSourceContext();
   const { availableTextScales, setTextScale, setTextWrap, textScale, textWrap } = useContext(
     LogViewConfiguration.Context
   );
diff --git a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
index fdfc16d6a9beff..9e0f7d5035aaf4 100644
--- a/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
+++ b/x-pack/plugins/infra/public/pages/logs/stream/page_view_log_in_context.tsx
@@ -4,32 +4,32 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useContext, useCallback, useMemo } from 'react';
-import { noop } from 'lodash';
 import {
-  EuiOverlayMask,
+  EuiFlexGroup,
+  EuiFlexItem,
   EuiModal,
   EuiModalBody,
+  EuiOverlayMask,
   EuiText,
   EuiTextColor,
-  EuiFlexGroup,
-  EuiFlexItem,
   EuiToolTip,
 } from '@elastic/eui';
-import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
+import { noop } from 'lodash';
+import React, { useCallback, useContext, useMemo } from 'react';
 import { LogEntry } from '../../../../common/http_api';
-import { Source } from '../../../containers/source';
-import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { ScrollableLogTextStreamView } from '../../../components/logging/log_text_stream';
+import { useLogSourceContext } from '../../../containers/logs/log_source';
+import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
+import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
 import { useViewportDimensions } from '../../../utils/use_viewport_dimensions';
 
 const MODAL_MARGIN = 25;
 
 export const PageViewLogInContext: React.FC = () => {
-  const { source } = useContext(Source.Context);
+  const { sourceConfiguration } = useLogSourceContext();
   const { textScale, textWrap } = useContext(LogViewConfiguration.Context);
-  const columnConfigurations = useMemo(() => (source && source.configuration.logColumns) || [], [
-    source,
+  const columnConfigurations = useMemo(() => sourceConfiguration?.configuration.logColumns ?? [], [
+    sourceConfiguration,
   ]);
   const [{ contextEntry, entries, isLoading }, { setContextEntry }] = useContext(
     ViewLogInContext.Context
diff --git a/x-pack/plugins/infra/server/infra_server.ts b/x-pack/plugins/infra/server/infra_server.ts
index 88b78dfd3e41c3..4ed30380dc164d 100644
--- a/x-pack/plugins/infra/server/infra_server.ts
+++ b/x-pack/plugins/infra/server/infra_server.ts
@@ -29,6 +29,7 @@ import {
   initLogEntriesItemRoute,
 } from './routes/log_entries';
 import { initInventoryMetaRoute } from './routes/inventory_metadata';
+import { initLogSourceConfigurationRoutes, initLogSourceStatusRoutes } from './routes/log_sources';
 import { initSourceRoute } from './routes/source';
 
 export const initInfraServer = (libs: InfraBackendLibs) => {
@@ -59,4 +60,6 @@ export const initInfraServer = (libs: InfraBackendLibs) => {
   initMetricExplorerRoute(libs);
   initMetadataRoute(libs);
   initInventoryMetaRoute(libs);
+  initLogSourceConfigurationRoutes(libs);
+  initLogSourceStatusRoutes(libs);
 };
diff --git a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
index eda1fbfa5f4ce1..eed7d39b8e74ae 100644
--- a/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
+++ b/x-pack/plugins/infra/server/lib/adapters/framework/kibana_framework_adapter.ts
@@ -70,6 +70,9 @@ export class KibanaFramework {
       case 'put':
         this.router.put(routeConfig, handler);
         break;
+      case 'patch':
+        this.router.patch(routeConfig, handler);
+        break;
     }
   }
 
diff --git a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
index b6837e5b769a6f..ecbc71f4895c79 100644
--- a/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
+++ b/x-pack/plugins/infra/server/lib/domains/fields_domain.ts
@@ -29,9 +29,10 @@ export class InfraFieldsDomain {
 
     const fields = await this.adapter.getIndexFields(
       requestContext,
-      `${includeMetricIndices ? configuration.metricAlias : ''},${
-        includeLogIndices ? configuration.logAlias : ''
-      }`
+      [
+        ...(includeMetricIndices ? [configuration.metricAlias] : []),
+        ...(includeLogIndices ? [configuration.logAlias] : []),
+      ].join(',')
     );
 
     return fields;
diff --git a/x-pack/plugins/infra/server/routes/log_sources/configuration.ts b/x-pack/plugins/infra/server/routes/log_sources/configuration.ts
new file mode 100644
index 00000000000000..0ce594675773c2
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/log_sources/configuration.ts
@@ -0,0 +1,114 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import Boom from 'boom';
+import {
+  getLogSourceConfigurationRequestParamsRT,
+  getLogSourceConfigurationSuccessResponsePayloadRT,
+  LOG_SOURCE_CONFIGURATION_PATH,
+  patchLogSourceConfigurationRequestBodyRT,
+  patchLogSourceConfigurationRequestParamsRT,
+  patchLogSourceConfigurationSuccessResponsePayloadRT,
+} from '../../../common/http_api/log_sources';
+import { createValidationFunction } from '../../../common/runtime_types';
+import { InfraBackendLibs } from '../../lib/infra_types';
+
+export const initLogSourceConfigurationRoutes = ({ framework, sources }: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'get',
+      path: LOG_SOURCE_CONFIGURATION_PATH,
+      validate: {
+        params: createValidationFunction(getLogSourceConfigurationRequestParamsRT),
+      },
+    },
+    framework.router.handleLegacyErrors(async (requestContext, request, response) => {
+      const { sourceId } = request.params;
+
+      try {
+        const sourceConfiguration = await sources.getSourceConfiguration(
+          requestContext.core.savedObjects.client,
+          sourceId
+        );
+
+        return response.ok({
+          body: getLogSourceConfigurationSuccessResponsePayloadRT.encode({
+            data: sourceConfiguration,
+          }),
+        });
+      } catch (error) {
+        if (Boom.isBoom(error)) {
+          throw error;
+        }
+
+        return response.customError({
+          statusCode: error.statusCode ?? 500,
+          body: {
+            message: error.message ?? 'An unexpected error occurred',
+          },
+        });
+      }
+    })
+  );
+
+  framework.registerRoute(
+    {
+      method: 'patch',
+      path: LOG_SOURCE_CONFIGURATION_PATH,
+      validate: {
+        params: createValidationFunction(patchLogSourceConfigurationRequestParamsRT),
+        body: createValidationFunction(patchLogSourceConfigurationRequestBodyRT),
+      },
+    },
+    framework.router.handleLegacyErrors(async (requestContext, request, response) => {
+      const { sourceId } = request.params;
+      const { data: patchedSourceConfigurationProperties } = request.body;
+
+      try {
+        const sourceConfiguration = await sources.getSourceConfiguration(
+          requestContext.core.savedObjects.client,
+          sourceId
+        );
+
+        if (sourceConfiguration.origin === 'internal') {
+          response.conflict({
+            body: 'A conflicting read-only source configuration already exists.',
+          });
+        }
+
+        const sourceConfigurationExists = sourceConfiguration.origin === 'stored';
+        const patchedSourceConfiguration = await (sourceConfigurationExists
+          ? sources.updateSourceConfiguration(
+              requestContext,
+              sourceId,
+              patchedSourceConfigurationProperties
+            )
+          : sources.createSourceConfiguration(
+              requestContext,
+              sourceId,
+              patchedSourceConfigurationProperties
+            ));
+
+        return response.ok({
+          body: patchLogSourceConfigurationSuccessResponsePayloadRT.encode({
+            data: patchedSourceConfiguration,
+          }),
+        });
+      } catch (error) {
+        if (Boom.isBoom(error)) {
+          throw error;
+        }
+
+        return response.customError({
+          statusCode: error.statusCode ?? 500,
+          body: {
+            message: error.message ?? 'An unexpected error occurred',
+          },
+        });
+      }
+    })
+  );
+};
diff --git a/x-pack/plugins/infra/server/routes/log_sources/index.ts b/x-pack/plugins/infra/server/routes/log_sources/index.ts
new file mode 100644
index 00000000000000..5b68152b329efc
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/log_sources/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export * from './configuration';
+export * from './status';
diff --git a/x-pack/plugins/infra/server/routes/log_sources/status.ts b/x-pack/plugins/infra/server/routes/log_sources/status.ts
new file mode 100644
index 00000000000000..cdd053d2bb10ae
--- /dev/null
+++ b/x-pack/plugins/infra/server/routes/log_sources/status.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 Boom from 'boom';
+import {
+  getLogSourceStatusRequestParamsRT,
+  getLogSourceStatusSuccessResponsePayloadRT,
+  LOG_SOURCE_STATUS_PATH,
+} from '../../../common/http_api/log_sources';
+import { createValidationFunction } from '../../../common/runtime_types';
+import { InfraIndexType } from '../../graphql/types';
+import { InfraBackendLibs } from '../../lib/infra_types';
+
+export const initLogSourceStatusRoutes = ({
+  framework,
+  sourceStatus,
+  fields,
+}: InfraBackendLibs) => {
+  framework.registerRoute(
+    {
+      method: 'get',
+      path: LOG_SOURCE_STATUS_PATH,
+      validate: {
+        params: createValidationFunction(getLogSourceStatusRequestParamsRT),
+      },
+    },
+    framework.router.handleLegacyErrors(async (requestContext, request, response) => {
+      const { sourceId } = request.params;
+
+      try {
+        const logIndexNames = await sourceStatus.getLogIndexNames(requestContext, sourceId);
+        const logIndexFields =
+          logIndexNames.length > 0
+            ? await fields.getFields(requestContext, sourceId, InfraIndexType.LOGS)
+            : [];
+
+        return response.ok({
+          body: getLogSourceStatusSuccessResponsePayloadRT.encode({
+            data: {
+              logIndexFields,
+              logIndexNames,
+            },
+          }),
+        });
+      } catch (error) {
+        if (Boom.isBoom(error)) {
+          throw error;
+        }
+
+        return response.customError({
+          statusCode: error.statusCode ?? 500,
+          body: {
+            message: error.message ?? 'An unexpected error occurred',
+          },
+        });
+      }
+    })
+  );
+};
diff --git a/x-pack/test/api_integration/apis/infra/index.js b/x-pack/test/api_integration/apis/infra/index.js
index 8bb3475da6cc9d..28a317893f5b29 100644
--- a/x-pack/test/api_integration/apis/infra/index.js
+++ b/x-pack/test/api_integration/apis/infra/index.js
@@ -11,6 +11,7 @@ export default function({ loadTestFile }) {
     loadTestFile(require.resolve('./log_entries'));
     loadTestFile(require.resolve('./log_entry_highlights'));
     loadTestFile(require.resolve('./logs_without_millis'));
+    loadTestFile(require.resolve('./log_sources'));
     loadTestFile(require.resolve('./log_summary'));
     loadTestFile(require.resolve('./metrics'));
     loadTestFile(require.resolve('./sources'));
diff --git a/x-pack/test/api_integration/apis/infra/log_sources.ts b/x-pack/test/api_integration/apis/infra/log_sources.ts
new file mode 100644
index 00000000000000..73d59bcdcd9a49
--- /dev/null
+++ b/x-pack/test/api_integration/apis/infra/log_sources.ts
@@ -0,0 +1,179 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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 { beforeEach } from 'mocha';
+import {
+  getLogSourceConfigurationSuccessResponsePayloadRT,
+  patchLogSourceConfigurationSuccessResponsePayloadRT,
+} from '../../../../plugins/infra/common/http_api/log_sources';
+import { decodeOrThrow } from '../../../../plugins/infra/common/runtime_types';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function({ getService }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const logSourceConfiguration = getService('infraLogSourceConfiguration');
+
+  describe('log sources api', () => {
+    before(() => esArchiver.load('infra/metrics_and_logs'));
+    after(() => esArchiver.unload('infra/metrics_and_logs'));
+    beforeEach(() => esArchiver.load('empty_kibana'));
+    afterEach(() => esArchiver.unload('empty_kibana'));
+
+    describe('source configuration get method for non-existant source', () => {
+      it('returns the default source configuration', async () => {
+        const response = await logSourceConfiguration
+          .createGetLogSourceConfigurationAgent('default')
+          .expect(200);
+
+        const {
+          data: { configuration, origin },
+        } = decodeOrThrow(getLogSourceConfigurationSuccessResponsePayloadRT)(response.body);
+
+        expect(origin).to.be('fallback');
+        expect(configuration.name).to.be('Default');
+        expect(configuration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
+        expect(configuration.fields.timestamp).to.be('@timestamp');
+        expect(configuration.fields.tiebreaker).to.be('_doc');
+        expect(configuration.logColumns[0]).to.have.key('timestampColumn');
+        expect(configuration.logColumns[1]).to.have.key('fieldColumn');
+        expect(configuration.logColumns[2]).to.have.key('messageColumn');
+      });
+    });
+
+    describe('source configuration patch method for non-existant source', () => {
+      it('creates a source configuration', async () => {
+        const response = await logSourceConfiguration
+          .createUpdateLogSourceConfigurationAgent('default', {
+            name: 'NAME',
+            description: 'DESCRIPTION',
+            logAlias: 'filebeat-**',
+            fields: {
+              tiebreaker: 'TIEBREAKER',
+              timestamp: 'TIMESTAMP',
+            },
+            logColumns: [
+              {
+                messageColumn: {
+                  id: 'MESSAGE_COLUMN',
+                },
+              },
+            ],
+          })
+          .expect(200);
+
+        // check direct response
+        const {
+          data: { configuration, origin },
+        } = decodeOrThrow(patchLogSourceConfigurationSuccessResponsePayloadRT)(response.body);
+
+        expect(configuration.name).to.be('NAME');
+        expect(origin).to.be('stored');
+        expect(configuration.logAlias).to.be('filebeat-**');
+        expect(configuration.fields.timestamp).to.be('TIMESTAMP');
+        expect(configuration.fields.tiebreaker).to.be('TIEBREAKER');
+        expect(configuration.logColumns).to.have.length(1);
+        expect(configuration.logColumns[0]).to.have.key('messageColumn');
+
+        // check for persistence
+        const {
+          data: { configuration: persistedConfiguration },
+        } = await logSourceConfiguration.getLogSourceConfiguration('default');
+
+        expect(configuration).to.eql(persistedConfiguration);
+      });
+
+      it('creates a source configuration with default values for unspecified properties', async () => {
+        const response = await logSourceConfiguration
+          .createUpdateLogSourceConfigurationAgent('default', {})
+          .expect(200);
+
+        const {
+          data: { configuration, origin },
+        } = decodeOrThrow(patchLogSourceConfigurationSuccessResponsePayloadRT)(response.body);
+
+        expect(configuration.name).to.be('Default');
+        expect(origin).to.be('stored');
+        expect(configuration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
+        expect(configuration.fields.timestamp).to.be('@timestamp');
+        expect(configuration.fields.tiebreaker).to.be('_doc');
+        expect(configuration.logColumns).to.have.length(3);
+        expect(configuration.logColumns[0]).to.have.key('timestampColumn');
+        expect(configuration.logColumns[1]).to.have.key('fieldColumn');
+        expect(configuration.logColumns[2]).to.have.key('messageColumn');
+
+        // check for persistence
+        const {
+          data: { configuration: persistedConfiguration, origin: persistedOrigin },
+        } = await logSourceConfiguration.getLogSourceConfiguration('default');
+
+        expect(persistedOrigin).to.be('stored');
+        expect(configuration).to.eql(persistedConfiguration);
+      });
+    });
+
+    describe('source configuration patch method for existing source', () => {
+      beforeEach(async () => {
+        await logSourceConfiguration.updateLogSourceConfiguration('default', {});
+      });
+
+      it('updates a source configuration', async () => {
+        const response = await logSourceConfiguration
+          .createUpdateLogSourceConfigurationAgent('default', {
+            name: 'NAME',
+            description: 'DESCRIPTION',
+            logAlias: 'filebeat-**',
+            fields: {
+              tiebreaker: 'TIEBREAKER',
+              timestamp: 'TIMESTAMP',
+            },
+            logColumns: [
+              {
+                messageColumn: {
+                  id: 'MESSAGE_COLUMN',
+                },
+              },
+            ],
+          })
+          .expect(200);
+
+        const {
+          data: { configuration, origin },
+        } = decodeOrThrow(patchLogSourceConfigurationSuccessResponsePayloadRT)(response.body);
+
+        expect(configuration.name).to.be('NAME');
+        expect(origin).to.be('stored');
+        expect(configuration.logAlias).to.be('filebeat-**');
+        expect(configuration.fields.timestamp).to.be('TIMESTAMP');
+        expect(configuration.fields.tiebreaker).to.be('TIEBREAKER');
+        expect(configuration.logColumns).to.have.length(1);
+        expect(configuration.logColumns[0]).to.have.key('messageColumn');
+      });
+
+      it('partially updates a source configuration', async () => {
+        const response = await logSourceConfiguration
+          .createUpdateLogSourceConfigurationAgent('default', {
+            name: 'NAME',
+          })
+          .expect(200);
+
+        const {
+          data: { configuration, origin },
+        } = decodeOrThrow(patchLogSourceConfigurationSuccessResponsePayloadRT)(response.body);
+
+        expect(configuration.name).to.be('NAME');
+        expect(origin).to.be('stored');
+        expect(configuration.logAlias).to.be('filebeat-*,kibana_sample_data_logs*');
+        expect(configuration.fields.timestamp).to.be('@timestamp');
+        expect(configuration.fields.tiebreaker).to.be('_doc');
+        expect(configuration.logColumns).to.have.length(3);
+        expect(configuration.logColumns[0]).to.have.key('timestampColumn');
+        expect(configuration.logColumns[1]).to.have.key('fieldColumn');
+        expect(configuration.logColumns[2]).to.have.key('messageColumn');
+      });
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/services/index.ts b/x-pack/test/api_integration/services/index.ts
index 84b8476bd1dd10..6dcc9bb291b02a 100644
--- a/x-pack/test/api_integration/services/index.ts
+++ b/x-pack/test/api_integration/services/index.ts
@@ -21,6 +21,7 @@ import {
 } from './infraops_graphql_client';
 import { SiemGraphQLClientProvider, SiemGraphQLClientFactoryProvider } from './siem_graphql_client';
 import { InfraOpsSourceConfigurationProvider } from './infraops_source_configuration';
+import { InfraLogSourceConfigurationProvider } from './infra_log_source_configuration';
 import { MachineLearningProvider } from './ml';
 import { IngestManagerProvider } from './ingest_manager';
 
@@ -35,6 +36,7 @@ export const services = {
   infraOpsGraphQLClient: InfraOpsGraphQLClientProvider,
   infraOpsGraphQLClientFactory: InfraOpsGraphQLClientFactoryProvider,
   infraOpsSourceConfiguration: InfraOpsSourceConfigurationProvider,
+  infraLogSourceConfiguration: InfraLogSourceConfigurationProvider,
   siemGraphQLClient: SiemGraphQLClientProvider,
   siemGraphQLClientFactory: SiemGraphQLClientFactoryProvider,
   supertestWithoutAuth: SupertestWithoutAuthProvider,
diff --git a/x-pack/test/api_integration/services/infra_log_source_configuration.ts b/x-pack/test/api_integration/services/infra_log_source_configuration.ts
new file mode 100644
index 00000000000000..851720895c6201
--- /dev/null
+++ b/x-pack/test/api_integration/services/infra_log_source_configuration.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  getLogSourceConfigurationPath,
+  getLogSourceConfigurationSuccessResponsePayloadRT,
+  PatchLogSourceConfigurationRequestBody,
+  patchLogSourceConfigurationRequestBodyRT,
+  patchLogSourceConfigurationResponsePayloadRT,
+} from '../../../plugins/infra/common/http_api/log_sources';
+import { decodeOrThrow } from '../../../plugins/infra/common/runtime_types';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export function InfraLogSourceConfigurationProvider({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const log = getService('log');
+
+  const createGetLogSourceConfigurationAgent = (sourceId: string) =>
+    supertest
+      .get(getLogSourceConfigurationPath(sourceId))
+      .set({
+        'kbn-xsrf': 'some-xsrf-token',
+      })
+      .send();
+
+  const getLogSourceConfiguration = async (sourceId: string) => {
+    log.debug(`Fetching Logs UI source configuration "${sourceId}"`);
+
+    const response = await createGetLogSourceConfigurationAgent(sourceId);
+
+    return decodeOrThrow(getLogSourceConfigurationSuccessResponsePayloadRT)(response.body);
+  };
+
+  const createUpdateLogSourceConfigurationAgent = (
+    sourceId: string,
+    sourceProperties: PatchLogSourceConfigurationRequestBody['data']
+  ) =>
+    supertest
+      .patch(getLogSourceConfigurationPath(sourceId))
+      .set({
+        'kbn-xsrf': 'some-xsrf-token',
+      })
+      .send(patchLogSourceConfigurationRequestBodyRT.encode({ data: sourceProperties }));
+
+  const updateLogSourceConfiguration = async (
+    sourceId: string,
+    sourceProperties: PatchLogSourceConfigurationRequestBody['data']
+  ) => {
+    log.debug(
+      `Updating Logs UI source configuration "${sourceId}" with properties ${JSON.stringify(
+        sourceProperties
+      )}`
+    );
+
+    const response = await createUpdateLogSourceConfigurationAgent(sourceId, sourceProperties);
+
+    return decodeOrThrow(patchLogSourceConfigurationResponsePayloadRT)(response.body);
+  };
+
+  return {
+    createGetLogSourceConfigurationAgent,
+    createUpdateLogSourceConfigurationAgent,
+    getLogSourceConfiguration,
+    updateLogSourceConfiguration,
+  };
+}
diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/link_to.ts
index 4e5ebab90880e0..89ed51f65b9306 100644
--- a/x-pack/test/functional/apps/infra/link_to.ts
+++ b/x-pack/test/functional/apps/infra/link_to.ts
@@ -5,6 +5,7 @@
  */
 
 import expect from '@kbn/expect';
+import { URL } from 'url';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 const ONE_HOUR = 60 * 60 * 1000;
@@ -28,8 +29,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         search: `time=${timestamp}&filter=trace.id:${traceId}`,
         state: undefined,
       };
-      const expectedSearchString = `logFilter=(expression:'trace.id:${traceId}',kind:kuery)&logPosition=(end:'${endDate}',position:(tiebreaker:0,time:${timestamp}),start:'${startDate}',streamLive:!f)&sourceId=default`;
-      const expectedRedirectPath = '/logs/stream?';
 
       await pageObjects.common.navigateToUrlWithBrowserHistory(
         'infraLogs',
@@ -41,9 +40,16 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       );
       await retry.tryForTime(5000, async () => {
         const currentUrl = await browser.getCurrentUrl();
-        const decodedUrl = decodeURIComponent(currentUrl);
-        expect(decodedUrl).to.contain(expectedRedirectPath);
-        expect(decodedUrl).to.contain(expectedSearchString);
+        const parsedUrl = new URL(currentUrl);
+
+        expect(parsedUrl.pathname).to.be('/app/logs/stream');
+        expect(parsedUrl.searchParams.get('logFilter')).to.be(
+          `(expression:'trace.id:${traceId}',kind:kuery)`
+        );
+        expect(parsedUrl.searchParams.get('logPosition')).to.be(
+          `(end:'${endDate}',position:(tiebreaker:0,time:${timestamp}),start:'${startDate}',streamLive:!f)`
+        );
+        expect(parsedUrl.searchParams.get('sourceId')).to.be('default');
       });
     });
   });

From e7971fa08ee65210236dce87abfcf4826d270ae0 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Tue, 28 Apr 2020 12:55:11 +0200
Subject: [PATCH 02/17] Improve Login Selector UX (#64142)

Co-authored-by: Dave Snider <dave.snider@gmail.com>
---
 .../resources/bin/kibana-docker               |   1 +
 x-pack/plugins/security/common/login_state.ts |  13 +-
 .../public/authentication/_index.scss         |   5 -
 .../authentication/components/_index.scss     |   1 -
 .../authentication_state_page/_index.scss     |   1 -
 .../authentication_state_page.tsx             |   2 +
 .../__snapshots__/login_page.test.tsx.snap    |  76 +++-
 .../public/authentication/login/_index.scss   |   1 -
 .../__snapshots__/login_form.test.tsx.snap    | 268 +++++--------
 .../components/login_form/login_form.scss     |  55 +++
 .../components/login_form/login_form.test.tsx | 374 +++++++++++++++---
 .../components/login_form/login_form.tsx      | 325 ++++++++++-----
 .../authentication/login/login_page.test.tsx  |  32 +-
 .../authentication/login/login_page.tsx       |   9 +-
 x-pack/plugins/security/public/index.scss     |   3 -
 x-pack/plugins/security/server/config.test.ts |  44 +--
 x-pack/plugins/security/server/config.ts      |  39 +-
 .../server/routes/views/login.test.ts         | 193 ++++++---
 .../security/server/routes/views/login.ts     |  19 +-
 .../translations/translations/ja-JP.json      |   1 -
 .../translations/translations/zh-CN.json      |   1 -
 21 files changed, 1008 insertions(+), 455 deletions(-)
 delete mode 100644 x-pack/plugins/security/public/authentication/_index.scss
 delete mode 100644 x-pack/plugins/security/public/authentication/components/_index.scss
 delete mode 100644 x-pack/plugins/security/public/authentication/components/authentication_state_page/_index.scss
 delete mode 100644 x-pack/plugins/security/public/authentication/login/_index.scss
 create mode 100644 x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss

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 eb7a121c2e64b2..d1fb544de733c3 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
@@ -234,6 +234,7 @@ kibana_vars=(
     xpack.security.session.idleTimeout
     xpack.security.session.lifespan
     xpack.security.loginAssistanceMessage
+    xpack.security.loginHelp
     telemetry.allowChangingOptInStatus
     telemetry.enabled
     telemetry.optIn
diff --git a/x-pack/plugins/security/common/login_state.ts b/x-pack/plugins/security/common/login_state.ts
index 4342e82d2f90b1..fd2b1cb8d1cf7e 100644
--- a/x-pack/plugins/security/common/login_state.ts
+++ b/x-pack/plugins/security/common/login_state.ts
@@ -6,15 +6,24 @@
 
 import { LoginLayout } from './licensing';
 
+export interface LoginSelectorProvider {
+  type: string;
+  name: string;
+  usesLoginForm: boolean;
+  description?: string;
+  hint?: string;
+  icon?: string;
+}
+
 export interface LoginSelector {
   enabled: boolean;
-  providers: Array<{ type: string; name: string; description?: string }>;
+  providers: LoginSelectorProvider[];
 }
 
 export interface LoginState {
   layout: LoginLayout;
   allowLogin: boolean;
-  showLoginForm: boolean;
   requiresSecureConnection: boolean;
+  loginHelp?: string;
   selector: LoginSelector;
 }
diff --git a/x-pack/plugins/security/public/authentication/_index.scss b/x-pack/plugins/security/public/authentication/_index.scss
deleted file mode 100644
index 0a423c00f0218a..00000000000000
--- a/x-pack/plugins/security/public/authentication/_index.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-// Component styles
-@import './components/index';
-
-// Login styles
-@import './login/index';
diff --git a/x-pack/plugins/security/public/authentication/components/_index.scss b/x-pack/plugins/security/public/authentication/components/_index.scss
deleted file mode 100644
index dfa258d523c5a4..00000000000000
--- a/x-pack/plugins/security/public/authentication/components/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './authentication_state_page/index';
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/_index.scss b/x-pack/plugins/security/public/authentication/components/authentication_state_page/_index.scss
deleted file mode 100644
index f7cdd751437919..00000000000000
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './authentication_state_page';
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
index aa306611299783..66176129407cd0 100644
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
+++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import './_authentication_state_page.scss';
+
 import { EuiIcon, EuiSpacer, EuiTitle } from '@elastic/eui';
 import React from 'react';
 
diff --git a/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap
index ecbdfedac1dd38..bbc6bfa1faddc7 100644
--- a/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap
@@ -121,10 +121,15 @@ exports[`LoginPage enabled form state renders as expected 1`] = `
   selector={
     Object {
       "enabled": false,
-      "providers": Array [],
+      "providers": Array [
+        Object {
+          "name": "basic1",
+          "type": "basic",
+          "usesLoginForm": true,
+        },
+      ],
     }
   }
-  showLoginForm={true}
 />
 `;
 
@@ -155,10 +160,15 @@ exports[`LoginPage enabled form state renders as expected when info message is s
   selector={
     Object {
       "enabled": false,
-      "providers": Array [],
+      "providers": Array [
+        Object {
+          "name": "basic1",
+          "type": "basic",
+          "usesLoginForm": true,
+        },
+      ],
     }
   }
-  showLoginForm={true}
 />
 `;
 
@@ -189,10 +199,55 @@ exports[`LoginPage enabled form state renders as expected when loginAssistanceMe
   selector={
     Object {
       "enabled": false,
-      "providers": Array [],
+      "providers": Array [
+        Object {
+          "name": "basic1",
+          "type": "basic",
+          "usesLoginForm": true,
+        },
+      ],
+    }
+  }
+/>
+`;
+
+exports[`LoginPage enabled form state renders as expected when loginHelp is set 1`] = `
+<LoginForm
+  http={
+    Object {
+      "addLoadingCountSource": [MockFunction],
+      "get": [MockFunction],
+    }
+  }
+  infoMessage="Your session has timed out. Please log in again."
+  loginAssistanceMessage=""
+  loginHelp="**some-help**"
+  notifications={
+    Object {
+      "toasts": Object {
+        "add": [MockFunction],
+        "addDanger": [MockFunction],
+        "addError": [MockFunction],
+        "addInfo": [MockFunction],
+        "addSuccess": [MockFunction],
+        "addWarning": [MockFunction],
+        "get$": [MockFunction],
+        "remove": [MockFunction],
+      },
+    }
+  }
+  selector={
+    Object {
+      "enabled": false,
+      "providers": Array [
+        Object {
+          "name": "basic1",
+          "type": "basic",
+          "usesLoginForm": true,
+        },
+      ],
     }
   }
-  showLoginForm={true}
 />
 `;
 
@@ -279,10 +334,15 @@ exports[`LoginPage page renders as expected 1`] = `
           selector={
             Object {
               "enabled": false,
-              "providers": Array [],
+              "providers": Array [
+                Object {
+                  "name": "basic1",
+                  "type": "basic",
+                  "usesLoginForm": true,
+                },
+              ],
             }
           }
-          showLoginForm={true}
         />
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/plugins/security/public/authentication/login/_index.scss b/x-pack/plugins/security/public/authentication/login/_index.scss
deleted file mode 100644
index 4dd2c0cabfb5e8..00000000000000
--- a/x-pack/plugins/security/public/authentication/login/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import './login_page';
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap b/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
index 7b8283b7bec0e6..072a025aa06a07 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap
@@ -1,170 +1,91 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`LoginForm login selector renders as expected with login form 1`] = `
-<Fragment>
-  <EuiButton
-    fullWidth={true}
-    isDisabled={false}
-    isLoading={false}
-    key="saml1"
-    onClick={[Function]}
-  >
-    Login w/SAML
-  </EuiButton>
-  <EuiSpacer
-    size="m"
-  />
-  <EuiButton
-    fullWidth={true}
-    isDisabled={false}
-    isLoading={false}
-    key="pki1"
-    onClick={[Function]}
-  >
-    Login w/PKI
-  </EuiButton>
-  <EuiSpacer
-    size="m"
-  />
-  <EuiText
-    color="subdued"
-    textAlign="center"
+exports[`LoginForm login selector properly switches to login form -> login help and back: Login Help 1`] = `
+<ReactMarkdown
+  astPlugins={Array []}
+  escapeHtml={true}
+  plugins={Array []}
+  rawSourcePos={false}
+  renderers={Object {}}
+  skipHtml={false}
+  sourcePos={false}
+  transformLinkUri={[Function]}
+>
+  <div
+    key="root-1-1"
   >
-    ―――  
-    <FormattedMessage
-      defaultMessage="OR"
-      id="xpack.security.loginPage.loginSelectorOR"
-      values={Object {}}
-    />
-      ―――
-  </EuiText>
-  <EuiSpacer
-    size="m"
-  />
-  <EuiPanel>
-    <form
-      onSubmit={[Function]}
+    <p
+      key="paragraph-1-1"
     >
-      <EuiFormRow
-        describedByIds={Array []}
-        display="row"
-        fullWidth={false}
-        hasChildLabel={true}
-        hasEmptyLabelSpace={false}
-        isInvalid={false}
-        label={
-          <FormattedMessage
-            defaultMessage="Username"
-            id="xpack.security.login.basicLoginForm.usernameFormRowLabel"
-            values={Object {}}
-          />
-        }
-        labelType="label"
+      <strong
+        key="strong-1-1"
       >
-        <EuiFieldText
-          aria-required={true}
-          data-test-subj="loginUsername"
-          disabled={false}
-          id="username"
-          inputRef={[Function]}
-          isInvalid={false}
-          name="username"
-          onChange={[Function]}
-          value=""
-        />
-      </EuiFormRow>
-      <EuiFormRow
-        describedByIds={Array []}
-        display="row"
-        fullWidth={false}
-        hasChildLabel={true}
-        hasEmptyLabelSpace={false}
-        isInvalid={false}
-        label={
-          <FormattedMessage
-            defaultMessage="Password"
-            id="xpack.security.login.basicLoginForm.passwordFormRowLabel"
-            values={Object {}}
-          />
-        }
-        labelType="label"
-      >
-        <EuiFieldPassword
-          aria-required={true}
-          autoComplete="off"
-          compressed={false}
-          data-test-subj="loginPassword"
-          disabled={false}
-          fullWidth={false}
-          id="password"
-          isInvalid={false}
-          isLoading={false}
-          name="password"
-          onChange={[Function]}
-          value=""
-        />
-      </EuiFormRow>
-      <EuiButton
-        color="primary"
-        data-test-subj="loginSubmit"
-        fill={true}
-        isDisabled={false}
-        isLoading={false}
-        onClick={[Function]}
-        type="submit"
-      >
-        <FormattedMessage
-          defaultMessage="Log in"
-          id="xpack.security.login.basicLoginForm.logInButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
-    </form>
-  </EuiPanel>
-</Fragment>
+        some help
+      </strong>
+    </p>
+  </div>
+</ReactMarkdown>
 `;
 
-exports[`LoginForm login selector renders as expected without login form for providers with and without description 1`] = `
-<Fragment>
-  <EuiButton
-    fullWidth={true}
-    isDisabled={false}
-    isLoading={false}
-    key="saml1"
-    onClick={[Function]}
+exports[`LoginForm login selector properly switches to login help: Login Help 1`] = `
+<ReactMarkdown
+  astPlugins={Array []}
+  escapeHtml={true}
+  plugins={Array []}
+  rawSourcePos={false}
+  renderers={Object {}}
+  skipHtml={false}
+  sourcePos={false}
+  transformLinkUri={[Function]}
+>
+  <div
+    key="root-1-1"
   >
-    Login w/SAML
-  </EuiButton>
-  <EuiSpacer
-    size="m"
-  />
-  <EuiButton
-    fullWidth={true}
-    isDisabled={false}
-    isLoading={false}
-    key="pki1"
-    onClick={[Function]}
+    <p
+      key="paragraph-1-1"
+    >
+      <strong
+        key="strong-1-1"
+      >
+        some help
+      </strong>
+    </p>
+  </div>
+</ReactMarkdown>
+`;
+
+exports[`LoginForm properly switches to login help: Login Help 1`] = `
+<ReactMarkdown
+  astPlugins={Array []}
+  escapeHtml={true}
+  plugins={Array []}
+  rawSourcePos={false}
+  renderers={Object {}}
+  skipHtml={false}
+  sourcePos={false}
+  transformLinkUri={[Function]}
+>
+  <div
+    key="root-1-1"
   >
-    <FormattedMessage
-      defaultMessage="Login with {providerType}/{providerName}"
-      id="xpack.security.loginPage.loginProviderDescription"
-      values={
-        Object {
-          "providerName": "pki1",
-          "providerType": "pki",
-        }
-      }
-    />
-  </EuiButton>
-  <EuiSpacer
-    size="m"
-  />
-</Fragment>
+    <p
+      key="paragraph-1-1"
+    >
+      <strong
+        key="strong-1-1"
+      >
+        some help
+      </strong>
+    </p>
+  </div>
+</ReactMarkdown>
 `;
 
 exports[`LoginForm renders as expected 1`] = `
 <Fragment>
-  <EuiPanel>
+  <EuiPanel
+    data-test-subj="loginForm"
+  >
     <form
       onSubmit={[Function]}
     >
@@ -227,21 +148,32 @@ exports[`LoginForm renders as expected 1`] = `
           value=""
         />
       </EuiFormRow>
-      <EuiButton
-        color="primary"
-        data-test-subj="loginSubmit"
-        fill={true}
-        isDisabled={false}
-        isLoading={false}
-        onClick={[Function]}
-        type="submit"
+      <EuiSpacer />
+      <EuiFlexGroup
+        alignItems="center"
+        gutterSize="s"
+        responsive={false}
       >
-        <FormattedMessage
-          defaultMessage="Log in"
-          id="xpack.security.login.basicLoginForm.logInButtonLabel"
-          values={Object {}}
-        />
-      </EuiButton>
+        <EuiFlexItem
+          grow={false}
+        >
+          <EuiButton
+            color="primary"
+            data-test-subj="loginSubmit"
+            fill={true}
+            isDisabled={false}
+            isLoading={false}
+            onClick={[Function]}
+            type="submit"
+          >
+            <FormattedMessage
+              defaultMessage="Log in"
+              id="xpack.security.login.basicLoginForm.logInButtonLabel"
+              values={Object {}}
+            />
+          </EuiButton>
+        </EuiFlexItem>
+      </EuiFlexGroup>
     </form>
   </EuiPanel>
 </Fragment>
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss
new file mode 100644
index 00000000000000..6784052ef4337e
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.scss
@@ -0,0 +1,55 @@
+.secLoginCard {
+  display: block;
+  box-shadow: none;
+  padding: $euiSize;
+  text-align: left;
+  width: 100%;
+
+  &:hover {
+    .secLoginCard__title {
+      text-decoration: underline;
+    }
+  }
+
+  &:disabled {
+    pointer-events: none;
+  }
+
+  &:not(.secLoginCard-isLoading):disabled {
+    .secLoginCard__title,
+    .secLoginCard__hint {
+      color: $euiColorMediumShade;
+    }
+  }
+
+  &:focus {
+    border-color: transparent;
+    border-radius: $euiBorderRadius;
+    @include euiFocusRing;
+
+    .secLoginCard__title {
+      text-decoration: underline;
+    }
+
+    // Make the focus ring clean and without borders
+    + .secLoginCard {
+      border-color: transparent;
+    }
+  }
+
+  + .secLoginCard {
+    border-top: $euiBorderThin;
+  }
+}
+
+.secLoginCard__hint {
+  @include euiFontSizeXS;
+  color: $euiColorDarkShade;
+  margin-top: $euiSizeXS;
+}
+
+.secLoginAssistanceMessage {
+  // This tightens up the layout if message is present
+  margin-top: -($euiSizeXXL + $euiSizeS);
+  padding: 0 $euiSize;
+}
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
index c17c10a2c51484..4e172cdde0eeda 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.test.tsx
@@ -5,12 +5,39 @@
  */
 
 import React from 'react';
+import ReactMarkdown from 'react-markdown';
 import { act } from '@testing-library/react';
-import { EuiButton, EuiCallOut } from '@elastic/eui';
+import { EuiButton, EuiCallOut, EuiIcon } from '@elastic/eui';
 import { mountWithIntl, nextTick, shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { LoginForm } from './login_form';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { LoginForm, PageMode } from './login_form';
 
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
+import { ReactWrapper } from 'enzyme';
+
+function expectPageMode(wrapper: ReactWrapper, mode: PageMode) {
+  const assertions: Array<[string, boolean]> =
+    mode === PageMode.Form
+      ? [
+          ['loginForm', true],
+          ['loginSelector', false],
+          ['loginHelp', false],
+        ]
+      : mode === PageMode.Selector
+      ? [
+          ['loginForm', false],
+          ['loginSelector', true],
+          ['loginHelp', false],
+        ]
+      : [
+          ['loginForm', false],
+          ['loginSelector', false],
+          ['loginHelp', true],
+        ];
+  for (const [selector, exists] of assertions) {
+    expect(findTestSubject(wrapper, selector).exists()).toBe(exists);
+  }
+}
 
 describe('LoginForm', () => {
   beforeAll(() => {
@@ -32,8 +59,10 @@ describe('LoginForm', () => {
           http={coreStartMock.http}
           notifications={coreStartMock.notifications}
           loginAssistanceMessage=""
-          showLoginForm={true}
-          selector={{ enabled: false, providers: [] }}
+          selector={{
+            enabled: false,
+            providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+          }}
         />
       )
     ).toMatchSnapshot();
@@ -41,20 +70,44 @@ describe('LoginForm', () => {
 
   it('renders an info message when provided.', () => {
     const coreStartMock = coreMock.createStart();
-    const wrapper = shallowWithIntl(
+    const wrapper = mountWithIntl(
       <LoginForm
         http={coreStartMock.http}
         notifications={coreStartMock.notifications}
         infoMessage={'Hey this is an info message'}
         loginAssistanceMessage=""
-        showLoginForm={true}
-        selector={{ enabled: false, providers: [] }}
+        selector={{
+          enabled: false,
+          providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+        }}
       />
     );
 
+    expectPageMode(wrapper, PageMode.Form);
+
     expect(wrapper.find(EuiCallOut).props().title).toEqual('Hey this is an info message');
   });
 
+  it('renders `Need help?` link if login help text is provided.', () => {
+    const coreStartMock = coreMock.createStart();
+    const wrapper = mountWithIntl(
+      <LoginForm
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        loginHelp={'**Hey this is a login help message**'}
+        loginAssistanceMessage=""
+        selector={{
+          enabled: false,
+          providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+        }}
+      />
+    );
+
+    expectPageMode(wrapper, PageMode.Form);
+
+    expect(findTestSubject(wrapper, 'loginHelpLink').text()).toEqual('Need help?');
+  });
+
   it('renders an invalid credentials message', async () => {
     const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
     coreStartMock.http.post.mockRejectedValue({ response: { status: 401 } });
@@ -64,11 +117,15 @@ describe('LoginForm', () => {
         http={coreStartMock.http}
         notifications={coreStartMock.notifications}
         loginAssistanceMessage=""
-        showLoginForm={true}
-        selector={{ enabled: false, providers: [] }}
+        selector={{
+          enabled: false,
+          providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+        }}
       />
     );
 
+    expectPageMode(wrapper, PageMode.Form);
+
     wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username' } });
     wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password' } });
     wrapper.find(EuiButton).simulate('click');
@@ -92,11 +149,15 @@ describe('LoginForm', () => {
         http={coreStartMock.http}
         notifications={coreStartMock.notifications}
         loginAssistanceMessage=""
-        showLoginForm={true}
-        selector={{ enabled: false, providers: [] }}
+        selector={{
+          enabled: false,
+          providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+        }}
       />
     );
 
+    expectPageMode(wrapper, PageMode.Form);
+
     wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username' } });
     wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password' } });
     wrapper.find(EuiButton).simulate('click');
@@ -121,11 +182,15 @@ describe('LoginForm', () => {
         http={coreStartMock.http}
         notifications={coreStartMock.notifications}
         loginAssistanceMessage=""
-        showLoginForm={true}
-        selector={{ enabled: false, providers: [] }}
+        selector={{
+          enabled: false,
+          providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+        }}
       />
     );
 
+    expectPageMode(wrapper, PageMode.Form);
+
     wrapper.find('input[name="username"]').simulate('change', { target: { value: 'username1' } });
     wrapper.find('input[name="password"]').simulate('change', { target: { value: 'password1' } });
     wrapper.find(EuiButton).simulate('click');
@@ -144,47 +209,125 @@ describe('LoginForm', () => {
     expect(wrapper.find(EuiCallOut).exists()).toBe(false);
   });
 
+  it('properly switches to login help', async () => {
+    const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+    const wrapper = mountWithIntl(
+      <LoginForm
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        loginAssistanceMessage=""
+        loginHelp="**some help**"
+        selector={{
+          enabled: false,
+          providers: [{ type: 'basic', name: 'basic', usesLoginForm: true }],
+        }}
+      />
+    );
+
+    expectPageMode(wrapper, PageMode.Form);
+    expect(findTestSubject(wrapper, 'loginBackToSelector').exists()).toBe(false);
+
+    // Going to login help.
+    findTestSubject(wrapper, 'loginHelpLink').simulate('click');
+    wrapper.update();
+    expectPageMode(wrapper, PageMode.LoginHelp);
+
+    expect(findTestSubject(wrapper, 'loginHelp').find(ReactMarkdown)).toMatchSnapshot('Login Help');
+
+    // Going back to login form.
+    findTestSubject(wrapper, 'loginBackToLoginLink').simulate('click');
+    wrapper.update();
+    expectPageMode(wrapper, PageMode.Form);
+    expect(findTestSubject(wrapper, 'loginBackToSelector').exists()).toBe(false);
+  });
+
   describe('login selector', () => {
-    it('renders as expected with login form', async () => {
+    it('renders as expected with providers that use login form', async () => {
       const coreStartMock = coreMock.createStart();
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          selector={{
+            enabled: true,
+            providers: [
+              {
+                type: 'basic',
+                name: 'basic',
+                usesLoginForm: true,
+                hint: 'Basic hint',
+                icon: 'logoElastic',
+              },
+              { type: 'saml', name: 'saml1', description: 'Log in w/SAML', usesLoginForm: false },
+              {
+                type: 'pki',
+                name: 'pki1',
+                description: 'Log in w/PKI',
+                hint: 'PKI hint',
+                usesLoginForm: false,
+              },
+            ],
+          }}
+        />
+      );
+
+      expectPageMode(wrapper, PageMode.Selector);
+
       expect(
-        shallowWithIntl(
-          <LoginForm
-            http={coreStartMock.http}
-            notifications={coreStartMock.notifications}
-            loginAssistanceMessage=""
-            showLoginForm={true}
-            selector={{
-              enabled: true,
-              providers: [
-                { type: 'saml', name: 'saml1', description: 'Login w/SAML' },
-                { type: 'pki', name: 'pki1', description: 'Login w/PKI' },
-              ],
-            }}
-          />
-        )
-      ).toMatchSnapshot();
+        wrapper.find('.secLoginCard').map(card => {
+          const hint = card.find('.secLoginCard__hint');
+          return {
+            title: card.find('p.secLoginCard__title').text(),
+            hint: hint.exists() ? hint.text() : '',
+            icon: card.find(EuiIcon).props().type,
+          };
+        })
+      ).toEqual([
+        { title: 'Log in with basic/basic', hint: 'Basic hint', icon: 'logoElastic' },
+        { title: 'Log in w/SAML', hint: '', icon: 'empty' },
+        { title: 'Log in w/PKI', hint: 'PKI hint', icon: 'empty' },
+      ]);
     });
 
-    it('renders as expected without login form for providers with and without description', async () => {
+    it('renders as expected without providers that use login form', async () => {
       const coreStartMock = coreMock.createStart();
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          selector={{
+            enabled: true,
+            providers: [
+              {
+                type: 'saml',
+                name: 'saml1',
+                description: 'Login w/SAML',
+                hint: 'SAML hint',
+                usesLoginForm: false,
+              },
+              { type: 'pki', name: 'pki1', icon: 'some-icon', usesLoginForm: false },
+            ],
+          }}
+        />
+      );
+
+      expectPageMode(wrapper, PageMode.Selector);
+
       expect(
-        shallowWithIntl(
-          <LoginForm
-            http={coreStartMock.http}
-            notifications={coreStartMock.notifications}
-            loginAssistanceMessage=""
-            showLoginForm={false}
-            selector={{
-              enabled: true,
-              providers: [
-                { type: 'saml', name: 'saml1', description: 'Login w/SAML' },
-                { type: 'pki', name: 'pki1' },
-              ],
-            }}
-          />
-        )
-      ).toMatchSnapshot();
+        wrapper.find('.secLoginCard').map(card => {
+          const hint = card.find('.secLoginCard__hint');
+          return {
+            title: card.find('p.secLoginCard__title').text(),
+            hint: hint.exists() ? hint.text() : '',
+            icon: card.find(EuiIcon).props().type,
+          };
+        })
+      ).toEqual([
+        { title: 'Login w/SAML', hint: 'SAML hint', icon: 'empty' },
+        { title: 'Log in with pki/pki1', hint: '', icon: 'some-icon' },
+      ]);
     });
 
     it('properly redirects after successful login', async () => {
@@ -203,17 +346,19 @@ describe('LoginForm', () => {
           http={coreStartMock.http}
           notifications={coreStartMock.notifications}
           loginAssistanceMessage=""
-          showLoginForm={true}
           selector={{
             enabled: true,
             providers: [
-              { type: 'saml', name: 'saml1', description: 'Login w/SAML' },
-              { type: 'pki', name: 'pki1', description: 'Login w/PKI' },
+              { type: 'basic', name: 'basic', usesLoginForm: true },
+              { type: 'saml', name: 'saml1', description: 'Login w/SAML', usesLoginForm: false },
+              { type: 'pki', name: 'pki1', description: 'Login w/PKI', usesLoginForm: false },
             ],
           }}
         />
       );
 
+      expectPageMode(wrapper, PageMode.Selector);
+
       wrapper.findWhere(node => node.key() === 'saml1').simulate('click');
 
       await act(async () => {
@@ -246,11 +391,18 @@ describe('LoginForm', () => {
           http={coreStartMock.http}
           notifications={coreStartMock.notifications}
           loginAssistanceMessage=""
-          showLoginForm={true}
-          selector={{ enabled: true, providers: [{ type: 'saml', name: 'saml1' }] }}
+          selector={{
+            enabled: true,
+            providers: [
+              { type: 'basic', name: 'basic', usesLoginForm: true },
+              { type: 'saml', name: 'saml1', usesLoginForm: false },
+            ],
+          }}
         />
       );
 
+      expectPageMode(wrapper, PageMode.Selector);
+
       wrapper.findWhere(node => node.key() === 'saml1').simulate('click');
 
       await act(async () => {
@@ -268,5 +420,123 @@ describe('LoginForm', () => {
         title: 'Could not perform login.',
       });
     });
+
+    it('properly switches to login form', async () => {
+      const currentURL = `https://some-host/login?next=${encodeURIComponent(
+        '/some-base-path/app/kibana#/home?_g=()'
+      )}`;
+
+      const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+      window.location.href = currentURL;
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          selector={{
+            enabled: true,
+            providers: [
+              { type: 'basic', name: 'basic', usesLoginForm: true },
+              { type: 'saml', name: 'saml1', usesLoginForm: false },
+            ],
+          }}
+        />
+      );
+
+      expectPageMode(wrapper, PageMode.Selector);
+
+      wrapper.findWhere(node => node.key() === 'basic').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.Form);
+
+      expect(coreStartMock.http.post).not.toHaveBeenCalled();
+      expect(coreStartMock.notifications.toasts.addError).not.toHaveBeenCalled();
+      expect(window.location.href).toBe(currentURL);
+    });
+
+    it('properly switches to login help', async () => {
+      const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          loginHelp="**some help**"
+          selector={{
+            enabled: true,
+            providers: [
+              { type: 'basic', name: 'basic', usesLoginForm: true },
+              { type: 'saml', name: 'saml1', usesLoginForm: false },
+            ],
+          }}
+        />
+      );
+
+      expectPageMode(wrapper, PageMode.Selector);
+
+      findTestSubject(wrapper, 'loginHelpLink').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.LoginHelp);
+
+      expect(findTestSubject(wrapper, 'loginHelp').find(ReactMarkdown)).toMatchSnapshot(
+        'Login Help'
+      );
+
+      // Going back to login selector.
+      findTestSubject(wrapper, 'loginBackToLoginLink').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.Selector);
+
+      expect(coreStartMock.http.post).not.toHaveBeenCalled();
+      expect(coreStartMock.notifications.toasts.addError).not.toHaveBeenCalled();
+    });
+
+    it('properly switches to login form -> login help and back', async () => {
+      const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+      const wrapper = mountWithIntl(
+        <LoginForm
+          http={coreStartMock.http}
+          notifications={coreStartMock.notifications}
+          loginAssistanceMessage=""
+          loginHelp="**some help**"
+          selector={{
+            enabled: true,
+            providers: [
+              { type: 'basic', name: 'basic', usesLoginForm: true },
+              { type: 'saml', name: 'saml1', usesLoginForm: false },
+            ],
+          }}
+        />
+      );
+
+      expectPageMode(wrapper, PageMode.Selector);
+
+      // Going to login form.
+      wrapper.findWhere(node => node.key() === 'basic').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.Form);
+
+      // Going to login help.
+      findTestSubject(wrapper, 'loginHelpLink').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.LoginHelp);
+
+      expect(findTestSubject(wrapper, 'loginHelp').find(ReactMarkdown)).toMatchSnapshot(
+        'Login Help'
+      );
+
+      // Going back to login form.
+      findTestSubject(wrapper, 'loginBackToLoginLink').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.Form);
+
+      // Going back to login selector.
+      findTestSubject(wrapper, 'loginBackToSelector').simulate('click');
+      wrapper.update();
+      expectPageMode(wrapper, PageMode.Selector);
+
+      expect(coreStartMock.http.post).not.toHaveBeenCalled();
+      expect(coreStartMock.notifications.toasts.addError).not.toHaveBeenCalled();
+    });
   });
 });
diff --git a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
index 01f5c40a69aebd..460c6550085a45 100644
--- a/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
+++ b/x-pack/plugins/security/public/authentication/login/components/login_form/login_form.tsx
@@ -4,10 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import './login_form.scss';
+
 import React, { ChangeEvent, Component, FormEvent, Fragment, MouseEvent } from 'react';
 import ReactMarkdown from 'react-markdown';
 import {
   EuiButton,
+  EuiIcon,
   EuiCallOut,
   EuiFieldPassword,
   EuiFieldText,
@@ -15,21 +18,28 @@ import {
   EuiPanel,
   EuiSpacer,
   EuiText,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiTitle,
+  EuiLoadingSpinner,
+  EuiLink,
+  EuiHorizontalRule,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { HttpStart, IHttpFetchError, NotificationsStart } from 'src/core/public';
-import { LoginValidator, LoginValidationResult } from './validate_login';
 import { parseNext } from '../../../../../common/parse_next';
 import { LoginSelector } from '../../../../../common/login_state';
+import { LoginValidator } from './validate_login';
 
 interface Props {
   http: HttpStart;
   notifications: NotificationsStart;
   selector: LoginSelector;
-  showLoginForm: boolean;
   infoMessage?: string;
   loginAssistanceMessage: string;
+  loginHelp?: string;
 }
 
 interface State {
@@ -42,7 +52,8 @@ interface State {
   message:
     | { type: MessageType.None }
     | { type: MessageType.Danger | MessageType.Info; content: string };
-  formError: LoginValidationResult | null;
+  mode: PageMode;
+  previousMode: PageMode;
 }
 
 enum LoadingStateType {
@@ -57,12 +68,21 @@ enum MessageType {
   Danger,
 }
 
+export enum PageMode {
+  Selector,
+  Form,
+  LoginHelp,
+}
+
 export class LoginForm extends Component<Props, State> {
   private readonly validator: LoginValidator;
 
   constructor(props: Props) {
     super(props);
     this.validator = new LoginValidator({ shouldValidate: false });
+
+    const mode = this.showLoginSelector() ? PageMode.Selector : PageMode.Form;
+
     this.state = {
       loadingState: { type: LoadingStateType.None },
       username: '',
@@ -70,7 +90,8 @@ export class LoginForm extends Component<Props, State> {
       message: this.props.infoMessage
         ? { type: MessageType.Info, content: this.props.infoMessage }
         : { type: MessageType.None },
-      formError: null,
+      mode,
+      previousMode: mode,
     };
   }
 
@@ -79,19 +100,91 @@ export class LoginForm extends Component<Props, State> {
       <Fragment>
         {this.renderLoginAssistanceMessage()}
         {this.renderMessage()}
-        {this.renderSelector()}
-        {this.renderLoginForm()}
+        {this.renderContent()}
+        {this.renderPageModeSwitchLink()}
       </Fragment>
     );
   }
 
-  private renderLoginForm = () => {
-    if (!this.props.showLoginForm) {
+  private renderLoginAssistanceMessage = () => {
+    if (!this.props.loginAssistanceMessage) {
       return null;
     }
 
     return (
-      <EuiPanel>
+      <div className="secLoginAssistanceMessage">
+        <EuiHorizontalRule size="half" />
+        <EuiText size="xs">
+          <ReactMarkdown>{this.props.loginAssistanceMessage}</ReactMarkdown>
+        </EuiText>
+      </div>
+    );
+  };
+
+  private renderMessage = () => {
+    const { message } = this.state;
+    if (message.type === MessageType.Danger) {
+      return (
+        <Fragment>
+          <EuiCallOut
+            size="s"
+            color="danger"
+            data-test-subj="loginErrorMessage"
+            title={message.content}
+            role="alert"
+          />
+          <EuiSpacer size="l" />
+        </Fragment>
+      );
+    }
+
+    if (message.type === MessageType.Info) {
+      return (
+        <Fragment>
+          <EuiCallOut
+            size="s"
+            color="primary"
+            data-test-subj="loginInfoMessage"
+            title={message.content}
+            role="status"
+          />
+          <EuiSpacer size="l" />
+        </Fragment>
+      );
+    }
+
+    return null;
+  };
+
+  public renderContent() {
+    switch (this.state.mode) {
+      case PageMode.Form:
+        return this.renderLoginForm();
+      case PageMode.Selector:
+        return this.renderSelector();
+      case PageMode.LoginHelp:
+        return this.renderLoginHelp();
+    }
+  }
+
+  private renderLoginForm = () => {
+    const loginSelectorLink = this.showLoginSelector() ? (
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty
+          data-test-subj="loginBackToSelector"
+          size="xs"
+          onClick={() => this.onPageModeChange(PageMode.Selector)}
+        >
+          <FormattedMessage
+            id="xpack.security.loginPage.loginSelectorLinkText"
+            defaultMessage="See more login options"
+          />
+        </EuiButtonEmpty>
+      </EuiFlexItem>
+    ) : null;
+
+    return (
+      <EuiPanel data-test-subj="loginForm">
         <form onSubmit={this.submitLoginForm}>
           <EuiFormRow
             label={
@@ -137,67 +230,128 @@ export class LoginForm extends Component<Props, State> {
             />
           </EuiFormRow>
 
-          <EuiButton
-            fill
-            type="submit"
-            color="primary"
-            onClick={this.submitLoginForm}
-            isDisabled={!this.isLoadingState(LoadingStateType.None)}
-            isLoading={this.isLoadingState(LoadingStateType.Form)}
-            data-test-subj="loginSubmit"
-          >
-            <FormattedMessage
-              id="xpack.security.login.basicLoginForm.logInButtonLabel"
-              defaultMessage="Log in"
-            />
-          </EuiButton>
+          <EuiSpacer />
+
+          <EuiFlexGroup responsive={false} alignItems="center" gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                fill
+                type="submit"
+                color="primary"
+                onClick={this.submitLoginForm}
+                isDisabled={!this.isLoadingState(LoadingStateType.None)}
+                isLoading={this.isLoadingState(LoadingStateType.Form)}
+                data-test-subj="loginSubmit"
+              >
+                <FormattedMessage
+                  id="xpack.security.login.basicLoginForm.logInButtonLabel"
+                  defaultMessage="Log in"
+                />
+              </EuiButton>
+            </EuiFlexItem>
+            {loginSelectorLink}
+          </EuiFlexGroup>
         </form>
       </EuiPanel>
     );
   };
 
-  private renderLoginAssistanceMessage = () => {
-    if (!this.props.loginAssistanceMessage) {
-      return null;
-    }
+  private renderSelector = () => {
+    return (
+      <EuiPanel data-test-subj="loginSelector" paddingSize="none">
+        {this.props.selector.providers.map(provider => (
+          <button
+            key={provider.name}
+            disabled={!this.isLoadingState(LoadingStateType.None)}
+            onClick={() =>
+              provider.usesLoginForm
+                ? this.onPageModeChange(PageMode.Form)
+                : this.loginWithSelector(provider.type, provider.name)
+            }
+            className={`secLoginCard ${
+              this.isLoadingState(LoadingStateType.Selector, provider.name)
+                ? 'secLoginCard-isLoading'
+                : ''
+            }`}
+          >
+            <EuiFlexGroup alignItems="center" gutterSize="m" responsive={false}>
+              <EuiFlexItem grow={false}>
+                <EuiIcon size="xl" type={provider.icon ? provider.icon : 'empty'} />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiTitle size="xs" className="secLoginCard__title">
+                  <p>
+                    {provider.description ?? (
+                      <FormattedMessage
+                        id="xpack.security.loginPage.loginProviderDescription"
+                        defaultMessage="Log in with {providerType}/{providerName}"
+                        values={{
+                          providerType: provider.type,
+                          providerName: provider.name,
+                        }}
+                      />
+                    )}
+                  </p>
+                </EuiTitle>
+                {provider.hint ? <p className="secLoginCard__hint">{provider.hint}</p> : null}
+              </EuiFlexItem>
+              {this.isLoadingState(LoadingStateType.Selector, provider.name) ? (
+                <EuiFlexItem grow={false}>
+                  <EuiLoadingSpinner size="m" />
+                </EuiFlexItem>
+              ) : null}
+            </EuiFlexGroup>
+          </button>
+        ))}
+      </EuiPanel>
+    );
+  };
 
+  private renderLoginHelp = () => {
     return (
-      <Fragment>
-        <EuiText size="s">
-          <ReactMarkdown>{this.props.loginAssistanceMessage}</ReactMarkdown>
+      <EuiPanel data-test-subj="loginHelp">
+        <EuiText>
+          <ReactMarkdown>{this.props.loginHelp || ''}</ReactMarkdown>
         </EuiText>
-      </Fragment>
+      </EuiPanel>
     );
   };
 
-  private renderMessage = () => {
-    const { message } = this.state;
-    if (message.type === MessageType.Danger) {
+  private renderPageModeSwitchLink = () => {
+    if (this.state.mode === PageMode.LoginHelp) {
       return (
         <Fragment>
-          <EuiCallOut
-            size="s"
-            color="danger"
-            data-test-subj="loginErrorMessage"
-            title={message.content}
-            role="alert"
-          />
-          <EuiSpacer size="l" />
+          <EuiSpacer />
+          <EuiText size="xs" className="eui-textCenter">
+            <EuiLink
+              data-test-subj="loginBackToLoginLink"
+              onClick={() => this.onPageModeChange(this.state.previousMode)}
+            >
+              <FormattedMessage
+                id="xpack.security.loginPage.goBackToLoginLink"
+                defaultMessage="Take me back to Login"
+              />
+            </EuiLink>
+          </EuiText>
         </Fragment>
       );
     }
 
-    if (message.type === MessageType.Info) {
+    if (this.props.loginHelp) {
       return (
         <Fragment>
-          <EuiCallOut
-            size="s"
-            color="primary"
-            data-test-subj="loginInfoMessage"
-            title={message.content}
-            role="status"
-          />
-          <EuiSpacer size="l" />
+          <EuiSpacer />
+          <EuiText size="xs" className="eui-textCenter">
+            <EuiLink
+              data-test-subj="loginHelpLink"
+              onClick={() => this.onPageModeChange(PageMode.LoginHelp)}
+            >
+              <FormattedMessage
+                id="xpack.security.loginPage.loginHelpLinkText"
+                defaultMessage="Need help?"
+              />
+            </EuiLink>
+          </EuiText>
         </Fragment>
       );
     }
@@ -205,60 +359,16 @@ export class LoginForm extends Component<Props, State> {
     return null;
   };
 
-  private renderSelector = () => {
-    const showLoginSelector =
-      this.props.selector.enabled && this.props.selector.providers.length > 0;
-    if (!showLoginSelector) {
-      return null;
-    }
-
-    const loginSelectorAndLoginFormSeparator = showLoginSelector && this.props.showLoginForm && (
-      <>
-        <EuiText textAlign="center" color="subdued">
-          ―――&nbsp;&nbsp;
-          <FormattedMessage id="xpack.security.loginPage.loginSelectorOR" defaultMessage="OR" />
-          &nbsp;&nbsp;―――
-        </EuiText>
-        <EuiSpacer size="m" />
-      </>
-    );
-
-    return (
-      <>
-        {this.props.selector.providers.map((provider, index) => (
-          <Fragment key={index}>
-            <EuiButton
-              key={provider.name}
-              fullWidth={true}
-              isDisabled={!this.isLoadingState(LoadingStateType.None)}
-              isLoading={this.isLoadingState(LoadingStateType.Selector, provider.name)}
-              onClick={() => this.loginWithSelector(provider.type, provider.name)}
-            >
-              {provider.description ?? (
-                <FormattedMessage
-                  id="xpack.security.loginPage.loginProviderDescription"
-                  defaultMessage="Login with {providerType}/{providerName}"
-                  values={{
-                    providerType: provider.type,
-                    providerName: provider.name,
-                  }}
-                />
-              )}
-            </EuiButton>
-            <EuiSpacer size="m" />
-          </Fragment>
-        ))}
-        {loginSelectorAndLoginFormSeparator}
-      </>
-    );
-  };
-
   private setUsernameInputRef(ref: HTMLInputElement) {
     if (ref) {
       ref.focus();
     }
   }
 
+  private onPageModeChange = (mode: PageMode) => {
+    this.setState({ message: { type: MessageType.None }, mode, previousMode: this.state.mode });
+  };
+
   private onUsernameChange = (e: ChangeEvent<HTMLInputElement>) => {
     this.setState({
       username: e.target.value,
@@ -279,12 +389,10 @@ export class LoginForm extends Component<Props, State> {
     this.validator.enableValidation();
 
     const { username, password } = this.state;
-    const result = this.validator.validateForLogin(username, password);
-    if (result.isInvalid) {
-      this.setState({ formError: result });
-      return;
-    } else {
-      this.setState({ formError: null });
+    if (this.validator.validateForLogin(username, password).isInvalid) {
+      // Since validation is enabled now, we should ask React to re-render form and display
+      // validation error messages if any.
+      return this.forceUpdate();
     }
 
     this.setState({
@@ -351,4 +459,11 @@ export class LoginForm extends Component<Props, State> {
       loadingState.type !== LoadingStateType.Selector || loadingState.providerName === providerName
     );
   }
+
+  private showLoginSelector() {
+    return (
+      this.props.selector.enabled &&
+      this.props.selector.providers.some(provider => !provider.usesLoginForm)
+    );
+  }
 }
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
index c4be57d8d7db7d..ab107e46dfff61 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.test.tsx
@@ -18,8 +18,10 @@ const createLoginState = (options?: Partial<LoginState>) => {
     allowLogin: true,
     layout: 'form',
     requiresSecureConnection: false,
-    showLoginForm: true,
-    selector: { enabled: false, providers: [] },
+    selector: {
+      enabled: false,
+      providers: [{ type: 'basic', name: 'basic1', usesLoginForm: true }],
+    },
     ...options,
   } as LoginState;
 };
@@ -163,7 +165,9 @@ describe('LoginPage', () => {
 
     it('renders as expected when login is not enabled', async () => {
       const coreStartMock = coreMock.createStart();
-      httpMock.get.mockResolvedValue(createLoginState({ showLoginForm: false }));
+      httpMock.get.mockResolvedValue(
+        createLoginState({ selector: { enabled: false, providers: [] } })
+      );
 
       const wrapper = shallow(
         <LoginPage
@@ -250,6 +254,28 @@ describe('LoginPage', () => {
 
       expect(wrapper.find(LoginForm)).toMatchSnapshot();
     });
+
+    it('renders as expected when loginHelp is set', async () => {
+      const coreStartMock = coreMock.createStart();
+      httpMock.get.mockResolvedValue(createLoginState({ loginHelp: '**some-help**' }));
+
+      const wrapper = shallow(
+        <LoginPage
+          http={httpMock}
+          notifications={coreStartMock.notifications}
+          fatalErrors={coreStartMock.fatalErrors}
+          loginAssistanceMessage=""
+        />
+      );
+
+      await act(async () => {
+        await nextTick();
+        wrapper.update();
+        resetHttpMock(); // so the calls don't show in the BasicLoginForm snapshot
+      });
+
+      expect(wrapper.find(LoginForm)).toMatchSnapshot();
+    });
   });
 
   describe('API calls', () => {
diff --git a/x-pack/plugins/security/public/authentication/login/login_page.tsx b/x-pack/plugins/security/public/authentication/login/login_page.tsx
index 70f8f76ee0a9c0..b7ac70f2aaf89e 100644
--- a/x-pack/plugins/security/public/authentication/login/login_page.tsx
+++ b/x-pack/plugins/security/public/authentication/login/login_page.tsx
@@ -4,6 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import './_login_page.scss';
+
 import React, { Component } from 'react';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
@@ -120,10 +122,9 @@ export class LoginPage extends Component<Props, State> {
     requiresSecureConnection,
     isSecureConnection,
     selector,
-    showLoginForm,
+    loginHelp,
   }: LoginState & { isSecureConnection: boolean }) => {
-    const isLoginExplicitlyDisabled =
-      !showLoginForm && (!selector.enabled || selector.providers.length === 0);
+    const isLoginExplicitlyDisabled = selector.providers.length === 0;
     if (isLoginExplicitlyDisabled) {
       return (
         <DisabledLoginForm
@@ -223,10 +224,10 @@ export class LoginPage extends Component<Props, State> {
       <LoginForm
         http={this.props.http}
         notifications={this.props.notifications}
-        showLoginForm={showLoginForm}
         selector={selector}
         infoMessage={infoMessageMap.get(parse(window.location.href, true).query.msg?.toString())}
         loginAssistanceMessage={this.props.loginAssistanceMessage}
+        loginHelp={loginHelp}
       />
     );
   };
diff --git a/x-pack/plugins/security/public/index.scss b/x-pack/plugins/security/public/index.scss
index 999639ba22eb78..1bdb8cc178fdf8 100644
--- a/x-pack/plugins/security/public/index.scss
+++ b/x-pack/plugins/security/public/index.scss
@@ -1,7 +1,4 @@
 $secFormWidth: 460px;
 
-// Authentication styles
-@import './authentication/index';
-
 // Management styles
 @import './management/index';
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 46a7ee79ee60c5..9899cd688d6ddb 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -29,6 +29,8 @@ describe('config schema', () => {
               "basic": Object {
                 "description": undefined,
                 "enabled": true,
+                "hint": undefined,
+                "icon": undefined,
                 "order": 0,
                 "showInSelector": true,
               },
@@ -71,6 +73,8 @@ describe('config schema', () => {
               "basic": Object {
                 "description": undefined,
                 "enabled": true,
+                "hint": undefined,
+                "icon": undefined,
                 "order": 0,
                 "showInSelector": true,
               },
@@ -113,6 +117,8 @@ describe('config schema', () => {
               "basic": Object {
                 "description": undefined,
                 "enabled": true,
+                "hint": undefined,
+                "icon": undefined,
                 "order": 0,
                 "showInSelector": true,
               },
@@ -361,20 +367,6 @@ describe('config schema', () => {
 `);
       });
 
-      it('does not allow custom description', () => {
-        expect(() =>
-          ConfigSchema.validate({
-            authc: {
-              providers: { basic: { basic1: { order: 0, description: 'Some description' } } },
-            },
-          })
-        ).toThrowErrorMatchingInlineSnapshot(`
-"[authc.providers]: types that failed validation:
-- [authc.providers.0]: expected value of type [array] but got [Object]
-- [authc.providers.1.basic.basic1.description]: \`basic\` provider does not support custom description."
-`);
-      });
-
       it('cannot be hidden from selector', () => {
         expect(() =>
           ConfigSchema.validate({
@@ -410,7 +402,9 @@ describe('config schema', () => {
           Object {
             "basic": Object {
               "basic1": Object {
+                "description": "Log in with Elasticsearch",
                 "enabled": true,
+                "icon": "logoElastic",
                 "order": 0,
                 "showInSelector": true,
               },
@@ -433,20 +427,6 @@ describe('config schema', () => {
 `);
       });
 
-      it('does not allow custom description', () => {
-        expect(() =>
-          ConfigSchema.validate({
-            authc: {
-              providers: { token: { token1: { order: 0, description: 'Some description' } } },
-            },
-          })
-        ).toThrowErrorMatchingInlineSnapshot(`
-"[authc.providers]: types that failed validation:
-- [authc.providers.0]: expected value of type [array] but got [Object]
-- [authc.providers.1.token.token1.description]: \`token\` provider does not support custom description."
-`);
-      });
-
       it('cannot be hidden from selector', () => {
         expect(() =>
           ConfigSchema.validate({
@@ -482,7 +462,9 @@ describe('config schema', () => {
           Object {
             "token": Object {
               "token1": Object {
+                "description": "Log in with Elasticsearch",
                 "enabled": true,
+                "icon": "logoElastic",
                 "order": 0,
                 "showInSelector": true,
               },
@@ -759,12 +741,16 @@ describe('config schema', () => {
         Object {
           "basic": Object {
             "basic1": Object {
+              "description": "Log in with Elasticsearch",
               "enabled": true,
+              "icon": "logoElastic",
               "order": 0,
               "showInSelector": true,
             },
             "basic2": Object {
+              "description": "Log in with Elasticsearch",
               "enabled": false,
+              "icon": "logoElastic",
               "order": 1,
               "showInSelector": true,
             },
@@ -1043,7 +1029,7 @@ describe('createConfig()', () => {
         Object {
           "name": "basic1",
           "options": Object {
-            "description": undefined,
+            "description": "Log in with Elasticsearch",
             "order": 3,
             "showInSelector": true,
           },
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index 97ff7d00a43362..7fe38b05f72d60 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -6,6 +6,7 @@
 
 import crypto from 'crypto';
 import { schema, Type, TypeOf } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
 import { Logger } from '../../../../src/core/server';
 
 export type ConfigType = ReturnType<typeof createConfig>;
@@ -21,7 +22,7 @@ const providerOptionsSchema = (providerType: string, optionsSchema: Type<any>) =
   );
 
 type ProvidersCommonConfigType = Record<
-  'enabled' | 'showInSelector' | 'order' | 'description',
+  'enabled' | 'showInSelector' | 'order' | 'description' | 'hint' | 'icon',
   Type<any>
 >;
 function getCommonProviderSchemaProperties(overrides: Partial<ProvidersCommonConfigType> = {}) {
@@ -30,6 +31,8 @@ function getCommonProviderSchemaProperties(overrides: Partial<ProvidersCommonCon
     showInSelector: schema.boolean({ defaultValue: true }),
     order: schema.number({ min: 0 }),
     description: schema.maybe(schema.string()),
+    hint: schema.maybe(schema.string()),
+    icon: schema.maybe(schema.string()),
     ...overrides,
   };
 }
@@ -53,11 +56,12 @@ type ProvidersConfigType = TypeOf<typeof providersConfigSchema>;
 const providersConfigSchema = schema.object(
   {
     basic: getUniqueProviderSchema('basic', {
-      description: schema.maybe(
-        schema.any({
-          validate: () => '`basic` provider does not support custom description.',
-        })
-      ),
+      description: schema.string({
+        defaultValue: i18n.translate('xpack.security.loginWithElasticsearchLabel', {
+          defaultMessage: 'Log in with Elasticsearch',
+        }),
+      }),
+      icon: schema.string({ defaultValue: 'logoElastic' }),
       showInSelector: schema.boolean({
         defaultValue: true,
         validate: value => {
@@ -68,11 +72,12 @@ const providersConfigSchema = schema.object(
       }),
     }),
     token: getUniqueProviderSchema('token', {
-      description: schema.maybe(
-        schema.any({
-          validate: () => '`token` provider does not support custom description.',
-        })
-      ),
+      description: schema.string({
+        defaultValue: i18n.translate('xpack.security.loginWithElasticsearchLabel', {
+          defaultMessage: 'Log in with Elasticsearch',
+        }),
+      }),
+      icon: schema.string({ defaultValue: 'logoElastic' }),
       showInSelector: schema.boolean({
         defaultValue: true,
         validate: value => {
@@ -131,6 +136,7 @@ const providersConfigSchema = schema.object(
 export const ConfigSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   loginAssistanceMessage: schema.string({ defaultValue: '' }),
+  loginHelp: schema.maybe(schema.string()),
   cookieName: schema.string({ defaultValue: 'sid' }),
   encryptionKey: schema.conditional(
     schema.contextRef('dist'),
@@ -147,7 +153,16 @@ export const ConfigSchema = schema.object({
     selector: schema.object({ enabled: schema.maybe(schema.boolean()) }),
     providers: schema.oneOf([schema.arrayOf(schema.string()), providersConfigSchema], {
       defaultValue: {
-        basic: { basic: { enabled: true, showInSelector: true, order: 0, description: undefined } },
+        basic: {
+          basic: {
+            enabled: true,
+            showInSelector: true,
+            order: 0,
+            description: undefined,
+            hint: undefined,
+            icon: undefined,
+          },
+        },
         token: undefined,
         saml: undefined,
         oidc: undefined,
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index d43319efbdfb9f..8bc2bb32325fc0 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -15,7 +15,7 @@ import {
   RouteConfig,
 } from '../../../../../../src/core/server';
 import { SecurityLicense } from '../../../common/licensing';
-import { LoginState } from '../../../common/login_state';
+import { LoginSelectorProvider } from '../../../common/login_state';
 import { ConfigType } from '../../config';
 import { defineLoginRoutes } from './login';
 
@@ -141,6 +141,10 @@ describe('Login view routes', () => {
   });
 
   describe('Login state route', () => {
+    function getAuthcConfig(authcConfig: Record<string, unknown> = {}) {
+      return routeDefinitionParamsMock.create({ authc: { ...authcConfig } }).config.authc;
+    }
+
     let routeHandler: RequestHandler<any, any, any, 'get'>;
     let routeConfig: RouteConfig<any, any, any, 'get'>;
     beforeEach(() => {
@@ -176,9 +180,11 @@ describe('Login view routes', () => {
       const expectedPayload = {
         allowLogin: true,
         layout: 'error-es-unavailable',
-        showLoginForm: true,
         requiresSecureConnection: false,
-        selector: { enabled: false, providers: [] },
+        selector: {
+          enabled: false,
+          providers: [{ name: 'basic', type: 'basic', usesLoginForm: true }],
+        },
       };
       await expect(
         routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
@@ -198,9 +204,11 @@ describe('Login view routes', () => {
       const expectedPayload = {
         allowLogin: true,
         layout: 'form',
-        showLoginForm: true,
         requiresSecureConnection: false,
-        selector: { enabled: false, providers: [] },
+        selector: {
+          enabled: false,
+          providers: [{ name: 'basic', type: 'basic', usesLoginForm: true }],
+        },
       };
       await expect(
         routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
@@ -229,22 +237,46 @@ describe('Login view routes', () => {
       });
     });
 
-    it('returns `showLoginForm: true` only if either `basic` or `token` provider is enabled.', async () => {
+    it('returns `useLoginForm: true` for `basic` and `token` providers.', async () => {
       license.getFeatures.mockReturnValue({ allowLogin: true, showLogin: true } as any);
 
       const request = httpServerMock.createKibanaRequest();
       const contextMock = coreMock.createRequestHandlerContext();
 
-      const cases: Array<[boolean, ConfigType['authc']['sortedProviders']]> = [
-        [false, []],
-        [true, [{ type: 'basic', name: 'basic1', options: { order: 0, showInSelector: true } }]],
-        [true, [{ type: 'token', name: 'token1', options: { order: 0, showInSelector: true } }]],
+      const cases: Array<[LoginSelectorProvider[], ConfigType['authc']]> = [
+        [[], getAuthcConfig({ providers: { basic: { basic1: { order: 0, enabled: false } } } })],
+        [
+          [
+            {
+              name: 'basic1',
+              type: 'basic',
+              usesLoginForm: true,
+              icon: 'logoElastic',
+              description: 'Log in with Elasticsearch',
+            },
+          ],
+          getAuthcConfig({ providers: { basic: { basic1: { order: 0 } } } }),
+        ],
+        [
+          [
+            {
+              name: 'token1',
+              type: 'token',
+              usesLoginForm: true,
+              icon: 'logoElastic',
+              description: 'Log in with Elasticsearch',
+            },
+          ],
+          getAuthcConfig({ providers: { token: { token1: { order: 0 } } } }),
+        ],
       ];
 
-      for (const [showLoginForm, sortedProviders] of cases) {
-        config.authc.sortedProviders = sortedProviders;
+      for (const [providers, authcConfig] of cases) {
+        config.authc = authcConfig;
 
-        const expectedPayload = expect.objectContaining({ showLoginForm });
+        const expectedPayload = expect.objectContaining({
+          selector: { enabled: false, providers },
+        });
         await expect(
           routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
         ).resolves.toEqual({
@@ -261,81 +293,142 @@ describe('Login view routes', () => {
       const request = httpServerMock.createKibanaRequest();
       const contextMock = coreMock.createRequestHandlerContext();
 
-      const cases: Array<[
-        boolean,
-        ConfigType['authc']['sortedProviders'],
-        LoginState['selector']['providers']
-      ]> = [
-        // selector is disabled, providers shouldn't be returned.
+      const cases: Array<[ConfigType['authc'], LoginSelectorProvider[]]> = [
+        // selector is disabled, multiple providers, but only basic provider should be returned.
         [
-          false,
+          getAuthcConfig({
+            selector: { enabled: false },
+            providers: {
+              basic: { basic1: { order: 0 } },
+              saml: { saml1: { order: 1, realm: 'realm1' } },
+            },
+          }),
           [
-            { type: 'basic', name: 'basic1', options: { order: 0, showInSelector: true } },
-            { type: 'saml', name: 'saml1', options: { order: 1, showInSelector: true } },
+            {
+              name: 'basic1',
+              type: 'basic',
+              usesLoginForm: true,
+              icon: 'logoElastic',
+              description: 'Log in with Elasticsearch',
+            },
           ],
-          [],
         ],
-        // selector is enabled, but only basic/token is available, providers shouldn't be returned.
+        // selector is enabled, but only basic/token is available and should be returned.
         [
-          true,
-          [{ type: 'basic', name: 'basic1', options: { order: 0, showInSelector: true } }],
-          [],
+          getAuthcConfig({
+            selector: { enabled: true },
+            providers: { basic: { basic1: { order: 0 } } },
+          }),
+          [
+            {
+              name: 'basic1',
+              type: 'basic',
+              usesLoginForm: true,
+              icon: 'logoElastic',
+              description: 'Log in with Elasticsearch',
+            },
+          ],
         ],
-        // selector is enabled, non-basic/token providers should be returned
+        // selector is enabled, all providers should be returned
         [
-          true,
+          getAuthcConfig({
+            selector: { enabled: true },
+            providers: {
+              basic: {
+                basic1: {
+                  order: 0,
+                  description: 'some-desc1',
+                  hint: 'some-hint1',
+                  icon: 'logoElastic',
+                },
+              },
+              saml: {
+                saml1: { order: 1, description: 'some-desc2', realm: 'realm1', icon: 'some-icon2' },
+                saml2: { order: 2, description: 'some-desc3', hint: 'some-hint3', realm: 'realm2' },
+              },
+            },
+          }),
           [
             {
               type: 'basic',
               name: 'basic1',
-              options: { order: 0, showInSelector: true, description: 'some-desc1' },
+              description: 'some-desc1',
+              hint: 'some-hint1',
+              icon: 'logoElastic',
+              usesLoginForm: true,
             },
             {
               type: 'saml',
               name: 'saml1',
-              options: { order: 1, showInSelector: true, description: 'some-desc2' },
+              description: 'some-desc2',
+              icon: 'some-icon2',
+              usesLoginForm: false,
             },
             {
               type: 'saml',
               name: 'saml2',
-              options: { order: 2, showInSelector: true, description: 'some-desc3' },
+              description: 'some-desc3',
+              hint: 'some-hint3',
+              usesLoginForm: false,
             },
           ],
-          [
-            { type: 'saml', name: 'saml1', description: 'some-desc2' },
-            { type: 'saml', name: 'saml2', description: 'some-desc3' },
-          ],
         ],
-        // selector is enabled, only non-basic/token providers that are enabled in selector should be returned.
+        // selector is enabled, only providers that are enabled should be returned.
         [
-          true,
+          getAuthcConfig({
+            selector: { enabled: true },
+            providers: {
+              basic: {
+                basic1: {
+                  order: 0,
+                  description: 'some-desc1',
+                  hint: 'some-hint1',
+                  icon: 'some-icon1',
+                },
+              },
+              saml: {
+                saml1: {
+                  order: 1,
+                  description: 'some-desc2',
+                  realm: 'realm1',
+                  showInSelector: false,
+                },
+                saml2: {
+                  order: 2,
+                  description: 'some-desc3',
+                  hint: 'some-hint3',
+                  icon: 'some-icon3',
+                  realm: 'realm2',
+                },
+              },
+            },
+          }),
           [
             {
               type: 'basic',
               name: 'basic1',
-              options: { order: 0, showInSelector: true, description: 'some-desc1' },
-            },
-            {
-              type: 'saml',
-              name: 'saml1',
-              options: { order: 1, showInSelector: false, description: 'some-desc2' },
+              description: 'some-desc1',
+              hint: 'some-hint1',
+              icon: 'some-icon1',
+              usesLoginForm: true,
             },
             {
               type: 'saml',
               name: 'saml2',
-              options: { order: 2, showInSelector: true, description: 'some-desc3' },
+              description: 'some-desc3',
+              hint: 'some-hint3',
+              icon: 'some-icon3',
+              usesLoginForm: false,
             },
           ],
-          [{ type: 'saml', name: 'saml2', description: 'some-desc3' }],
         ],
       ];
 
-      for (const [selectorEnabled, sortedProviders, expectedProviders] of cases) {
-        config.authc.selector.enabled = selectorEnabled;
-        config.authc.sortedProviders = sortedProviders;
+      for (const [authcConfig, expectedProviders] of cases) {
+        config.authc = authcConfig;
 
         const expectedPayload = expect.objectContaining({
-          selector: { enabled: selectorEnabled, providers: expectedProviders },
+          selector: { enabled: authcConfig.selector.enabled, providers: expectedProviders },
         });
         await expect(
           routeHandler({ core: contextMock } as any, request, kibanaResponseFactory)
diff --git a/x-pack/plugins/security/server/routes/views/login.ts b/x-pack/plugins/security/server/routes/views/login.ts
index 4d6747de713f76..f72facb2e24cc9 100644
--- a/x-pack/plugins/security/server/routes/views/login.ts
+++ b/x-pack/plugins/security/server/routes/views/login.ts
@@ -55,15 +55,16 @@ export function defineLoginRoutes({
       const { allowLogin, layout = 'form' } = license.getFeatures();
       const { sortedProviders, selector } = config.authc;
 
-      let showLoginForm = false;
       const providers = [];
-      for (const { type, name, options } of sortedProviders) {
-        if (options.showInSelector) {
-          if (type === 'basic' || type === 'token') {
-            showLoginForm = true;
-          } else if (selector.enabled) {
-            providers.push({ type, name, description: options.description });
-          }
+      for (const { type, name } of sortedProviders) {
+        // Since `config.authc.sortedProviders` is based on `config.authc.providers` config we can
+        // be sure that config is present for every provider in `config.authc.sortedProviders`.
+        const { showInSelector, description, hint, icon } = config.authc.providers[type]?.[name]!;
+
+        // Include provider into the list if either selector is enabled or provider uses login form.
+        const usesLoginForm = type === 'basic' || type === 'token';
+        if (showInSelector && (usesLoginForm || selector.enabled)) {
+          providers.push({ type, name, usesLoginForm, description, hint, icon });
         }
       }
 
@@ -71,7 +72,7 @@ export function defineLoginRoutes({
         allowLogin,
         layout,
         requiresSecureConnection: config.secureCookies,
-        showLoginForm,
+        loginHelp: config.loginHelp,
         selector: { enabled: selector.enabled, providers },
       };
 
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 5bb08915165170..ac074d99e9ff50 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -12651,7 +12651,6 @@
     "xpack.security.loginPage.esUnavailableTitle": "Elasticsearch クラスターに接続できません",
     "xpack.security.loginPage.loginProviderDescription": "{providerType}/{providerName} でログイン",
     "xpack.security.loginPage.loginSelectorErrorMessage": "ログインを実行できませんでした。",
-    "xpack.security.loginPage.loginSelectorOR": "OR",
     "xpack.security.loginPage.noLoginMethodsAvailableMessage": "システム管理者にお問い合わせください。",
     "xpack.security.loginPage.noLoginMethodsAvailableTitle": "ログインが無効です。",
     "xpack.security.loginPage.requiresSecureConnectionMessage": "システム管理者にお問い合わせください。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index a4f47053647377..60b958623bdc76 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -12655,7 +12655,6 @@
     "xpack.security.loginPage.esUnavailableTitle": "无法连接到 Elasticsearch 集群",
     "xpack.security.loginPage.loginProviderDescription": "使用 {providerType}/{providerName} 登录",
     "xpack.security.loginPage.loginSelectorErrorMessage": "无法执行登录。",
-    "xpack.security.loginPage.loginSelectorOR": "或",
     "xpack.security.loginPage.noLoginMethodsAvailableMessage": "请联系您的管理员。",
     "xpack.security.loginPage.noLoginMethodsAvailableTitle": "登录已禁用。",
     "xpack.security.loginPage.requiresSecureConnectionMessage": "请联系您的管理员。",

From c2e464325e623505ef89267024b9c50e24f09a8c Mon Sep 17 00:00:00 2001
From: Liza Katz <liza.katz@elastic.co>
Date: Tue, 28 Apr 2020 15:03:04 +0300
Subject: [PATCH 03/17] add test for #64132 (#64307)

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../search/async_search_strategy.test.ts      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/x-pack/plugins/data_enhanced/public/search/async_search_strategy.test.ts b/x-pack/plugins/data_enhanced/public/search/async_search_strategy.test.ts
index a7d6aa894d91db..6c635cc5b4489a 100644
--- a/x-pack/plugins/data_enhanced/public/search/async_search_strategy.test.ts
+++ b/x-pack/plugins/data_enhanced/public/search/async_search_strategy.test.ts
@@ -96,6 +96,34 @@ describe('Async search strategy', () => {
       });
   });
 
+  // For bug fixed in https://github.com/elastic/kibana/pull/64155
+  it('Continues polling if no records are returned on first async request', async () => {
+    mockSearch
+      .mockReturnValueOnce(of({ id: 1, total: 0, loaded: 0, is_running: true, is_partial: true }))
+      .mockReturnValueOnce(
+        of({ id: 1, total: 2, loaded: 2, is_running: false, is_partial: false })
+      );
+
+    const asyncSearch = asyncSearchStrategyProvider({
+      core: mockCoreStart,
+      getSearchStrategy: jest.fn().mockImplementation(() => {
+        return () => {
+          return {
+            search: mockSearch,
+          };
+        };
+      }),
+    });
+
+    expect(mockSearch).toBeCalledTimes(0);
+
+    await asyncSearch.search(mockRequest, mockOptions).toPromise();
+
+    expect(mockSearch).toBeCalledTimes(2);
+    expect(mockSearch.mock.calls[0][0]).toEqual(mockRequest);
+    expect(mockSearch.mock.calls[1][0]).toEqual({ id: 1, serverStrategy: 'foo' });
+  });
+
   it('only sends the ID and server strategy after the first request', async () => {
     mockSearch
       .mockReturnValueOnce(of({ id: 1, total: 2, loaded: 1, is_running: true, is_partial: true }))

From da898565037a98a55cf9af3a468c70057c3e09af Mon Sep 17 00:00:00 2001
From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com>
Date: Tue, 28 Apr 2020 15:44:17 +0300
Subject: [PATCH 04/17] [NP] Move visTypeVislib into NP (#63963)

---
 .eslintignore                                 |    1 -
 .eslintrc.js                                  |    3 +
 .github/CODEOWNERS                            |    2 +-
 .i18nrc.json                                  |    6 +-
 .sass-lint.yml                                |    4 +-
 src/dev/precommit_hook/casing_check_config.js |    1 -
 .../vis_type_vislib}/_vis_fixture.js          |   18 +-
 .../vis_type_vislib}/lib/chart_title.js       |    6 +-
 .../vis_type_vislib}/lib/dispatch.js          |    5 +-
 .../vis_type_vislib}/lib/handler/handler.js   |   12 +-
 .../vis_type_vislib}/lib/layout/layout.js     |   16 +-
 .../public/__tests__/vis_type_vislib}/vis.js  |   11 +-
 .../visualizations/area_chart.js              |   15 +-
 .../vis_type_vislib}/visualizations/chart.js  |    5 +-
 .../visualizations/column_chart.js            |   23 +-
 .../visualizations/gauge_chart.js             |    5 +-
 .../visualizations/heatmap_chart.js           |   14 +-
 .../visualizations/line_chart.js              |   16 +-
 .../visualizations/pie_chart.js               |    3 +-
 .../visualizations/pie_chart_mock_data.js     |    0
 .../core_plugins/kibana/public/index.scss     |    7 -
 src/legacy/core_plugins/tests_bundle/index.js |    2 +
 .../tests_bundle/public/index.scss            |    6 +
 .../core_plugins/vis_type_vislib/index.ts     |   44 -
 .../core_plugins/vis_type_vislib/package.json |    4 -
 .../mock_data/date_histogram/_columns.js      |  300 --
 .../mock_data/date_histogram/_rows.js         | 1678 --------
 .../date_histogram/_rows_series_with_holes.js |  123 -
 .../mock_data/date_histogram/_series.js       |  184 -
 .../_series_monthly_interval.js               |   89 -
 .../mock_data/date_histogram/_series_neg.js   |  184 -
 .../date_histogram/_series_pos_neg.js         |  184 -
 .../date_histogram/_stacked_series.js         | 1557 -------
 .../fixtures/mock_data/filters/_columns.js    |  112 -
 .../lib/fixtures/mock_data/filters/_rows.js   |  109 -
 .../lib/fixtures/mock_data/filters/_series.js |   42 -
 .../fixtures/mock_data/geohash/_columns.js    | 3745 -----------------
 .../fixtures/mock_data/geohash/_geo_json.js   | 1847 --------
 .../lib/fixtures/mock_data/geohash/_rows.js   | 3667 ----------------
 .../fixtures/mock_data/histogram/_columns.js  |  368 --
 .../lib/fixtures/mock_data/histogram/_rows.js |  212 -
 .../fixtures/mock_data/histogram/_series.js   |  124 -
 .../fixtures/mock_data/histogram/_slices.js   |  309 --
 .../mock_data/not_enough_data/_one_point.js   |   34 -
 .../lib/fixtures/mock_data/range/_columns.js  |   62 -
 .../lib/fixtures/mock_data/range/_rows.js     |   88 -
 .../lib/fixtures/mock_data/range/_series.js   |   38 -
 .../mock_data/significant_terms/_columns.js   |  242 --
 .../mock_data/significant_terms/_rows.js      |  242 --
 .../mock_data/significant_terms/_series.js    |   49 -
 .../fixtures/mock_data/stacked/_stacked.js    | 1635 -------
 .../lib/fixtures/mock_data/terms/_columns.js  |  146 -
 .../lib/fixtures/mock_data/terms/_rows.js     |  100 -
 .../lib/fixtures/mock_data/terms/_series.js   |   50 -
 .../mock_data/terms/_seriesMultiple.js        |   72 -
 .../__tests__/lib/types/point_series.js       |  128 -
 .../vis_type_vislib/public/vislib/vislib.js   |   43 -
 src/plugins/vis_type_vislib/kibana.json       |    8 +
 .../public/__snapshots__/pie_fn.test.ts.snap  |    0
 .../vis_type_vislib/public/area.ts            |    6 +-
 .../public/components/common/index.ts         |    0
 .../components/common/truncate_labels.tsx     |    0
 .../components/common/validation_wrapper.tsx  |    0
 .../public/components/index.ts                |    0
 .../public/components/options/gauge/index.tsx |    0
 .../components/options/gauge/labels_panel.tsx |    4 +-
 .../components/options/gauge/ranges_panel.tsx |    4 +-
 .../components/options/gauge/style_panel.tsx  |    6 +-
 .../components/options/heatmap/index.tsx      |    2 +-
 .../options/heatmap/labels_panel.tsx          |    2 +-
 .../public/components/options/index.ts        |    0
 .../category_axis_panel.test.tsx.snap         |    0
 .../__snapshots__/chart_options.test.tsx.snap |    0
 .../custom_extents_options.test.tsx.snap      |    0
 .../__snapshots__/index.test.tsx.snap         |    0
 .../__snapshots__/label_options.test.tsx.snap |    0
 .../__snapshots__/line_options.test.tsx.snap  |    0
 .../value_axes_panel.test.tsx.snap            |    0
 .../value_axis_options.test.tsx.snap          |    0
 .../__snapshots__/y_extents.test.tsx.snap     |    0
 .../metrics_axes/category_axis_panel.test.tsx |    2 -
 .../metrics_axes/category_axis_panel.tsx      |    2 +-
 .../metrics_axes/chart_options.test.tsx       |    2 -
 .../options/metrics_axes/chart_options.tsx    |    6 +-
 .../custom_extents_options.test.tsx           |    2 -
 .../metrics_axes/custom_extents_options.tsx   |    2 +-
 .../options/metrics_axes/index.test.tsx       |    0
 .../components/options/metrics_axes/index.tsx |    0
 .../metrics_axes/label_options.test.tsx       |    2 -
 .../options/metrics_axes/label_options.tsx    |    2 +-
 .../metrics_axes/line_options.test.tsx        |    4 +-
 .../options/metrics_axes/line_options.tsx     |    8 +-
 .../components/options/metrics_axes/mocks.ts  |    4 +-
 .../options/metrics_axes/series_panel.tsx     |    4 +-
 .../components/options/metrics_axes/utils.ts  |    0
 .../metrics_axes/value_axes_panel.test.tsx    |    2 -
 .../options/metrics_axes/value_axes_panel.tsx |    4 +-
 .../metrics_axes/value_axis_options.test.tsx  |    4 +-
 .../metrics_axes/value_axis_options.tsx       |   10 +-
 .../options/metrics_axes/y_extents.test.tsx   |    4 +-
 .../options/metrics_axes/y_extents.tsx        |    2 +-
 .../public/components/options/pie.tsx         |    2 +-
 .../options/point_series/grid_panel.tsx       |    2 +-
 .../components/options/point_series/index.ts  |    0
 .../options/point_series/point_series.tsx     |    2 +-
 .../options/point_series/threshold_panel.tsx  |    2 +-
 .../dispatch_bar_chart_config_normal.json     |    0
 .../dispatch_bar_chart_config_percentage.json |    0
 .../fixtures/dispatch_bar_chart_d3.json       |    0
 .../dispatch_bar_chart_data_point.json        |    0
 .../fixtures/dispatch_heatmap_config.json     |    0
 .../public}/fixtures/dispatch_heatmap_d3.json |    0
 .../fixtures/dispatch_heatmap_data_point.json |    0
 .../mock_data/date_histogram/_columns.js      |  319 ++
 .../mock_data/date_histogram/_rows.js         | 1697 ++++++++
 .../date_histogram/_rows_series_with_holes.js |  142 +
 .../mock_data/date_histogram/_series.js       |  203 +
 .../_series_monthly_interval.js               |  108 +
 .../mock_data/date_histogram/_series_neg.js   |  203 +
 .../date_histogram/_series_pos_neg.js         |  203 +
 .../date_histogram/_stacked_series.js         | 1576 +++++++
 .../fixtures/mock_data/filters/_columns.js    |  127 +
 .../fixtures/mock_data/filters/_rows.js       |  122 +
 .../fixtures/mock_data/filters/_series.js     |   59 +
 .../fixtures/mock_data/geohash/_columns.js    | 2918 +++++++++++++
 .../fixtures/mock_data/geohash/_geo_json.js   | 1326 ++++++
 .../fixtures/mock_data/geohash/_rows.js       | 2858 +++++++++++++
 .../fixtures/mock_data/histogram/_columns.js  |  381 ++
 .../fixtures/mock_data/histogram/_rows.js     |  225 +
 .../fixtures/mock_data/histogram/_series.js   |  141 +
 .../fixtures/mock_data/histogram/_slices.js   |  328 ++
 .../mock_data/not_enough_data/_one_point.js}  |   48 +-
 .../fixtures/mock_data/range/_columns.js      |   79 +
 .../public/fixtures/mock_data/range/_rows.js  |  107 +
 .../fixtures/mock_data/range/_series.js       |   55 +
 .../mock_data/significant_terms/_columns.js   |  251 ++
 .../mock_data/significant_terms/_rows.js      |  251 ++
 .../mock_data/significant_terms/_series.js}   |   67 +-
 .../fixtures/mock_data/stacked/_stacked.js    | 1654 ++++++++
 .../fixtures/mock_data/terms/_columns.js      |  159 +
 .../public/fixtures/mock_data/terms/_rows.js  |  115 +
 .../fixtures/mock_data/terms/_series.js       |   67 +
 .../mock_data/terms/_series_multiple.js       |  105 +
 .../vis_type_vislib/public/fixtures/mocks.js} |   20 +-
 .../vis_type_vislib/public/gauge.ts           |   12 +-
 .../vis_type_vislib/public/goal.ts            |    6 +-
 .../vis_type_vislib/public/heatmap.ts         |    6 +-
 .../vis_type_vislib/public/histogram.ts       |    6 +-
 .../vis_type_vislib/public/horizontal_bar.ts  |   10 +-
 .../vis_type_vislib/public/index.scss}        |    0
 .../vis_type_vislib/public/index.ts           |    2 +-
 .../vis_type_vislib/public/line.ts            |   10 +-
 .../vis_type_vislib/public/pie.ts             |    4 +-
 .../vis_type_vislib/public/pie_fn.test.ts     |    3 +-
 .../vis_type_vislib/public/pie_fn.ts          |    6 +-
 .../vis_type_vislib/public/plugin.ts          |   11 +-
 .../vis_type_vislib/public/services.ts        |    4 +-
 .../vis_type_vislib/public/types.ts           |    2 +-
 .../public/utils/collections.ts               |    2 +-
 .../public/utils/common_config.tsx            |    0
 .../vis_type_vislib/public/vis_controller.tsx |    4 +-
 .../public/vis_type_vislib_vis_fn.ts          |    6 +-
 .../public/vis_type_vislib_vis_types.ts       |    0
 .../vis_type_vislib/public/vislib/VISLIB.md   |    0
 .../vis_type_vislib/public/vislib/_index.scss |    0
 .../public/vislib/_variables.scss             |    0
 .../public/vislib/_vislib_vis_type.scss       |    0
 .../vislib/components/labels/data_array.js    |    0
 .../components/labels/flatten_series.js       |    0
 .../public/vislib/components/labels/index.js  |    0
 .../public/vislib/components/labels/labels.js |    0
 .../vislib/components/labels/labels.test.js}  |  107 +-
 .../components/labels/truncate_labels.js      |    0
 .../vislib/components/labels/uniq_labels.js   |    0
 .../legend/__snapshots__/legend.test.tsx.snap |    0
 .../vislib/components/legend/_index.scss      |    0
 .../vislib/components/legend/_legend.scss     |    0
 .../public/vislib/components/legend/index.ts  |    0
 .../vislib/components/legend/legend.test.tsx  |    4 -
 .../vislib/components/legend/legend.tsx       |    0
 .../vislib/components/legend/legend_item.tsx  |    0
 .../public/vislib/components/legend/models.ts |    0
 .../vislib/components/legend/pie_utils.ts     |    2 +-
 .../components/tooltip/_collect_branch.js     |    0
 .../tooltip/_collect_branch.test.js           |    0
 .../_hierarchical_tooltip_formatter.js        |    0
 .../vislib/components/tooltip/_index.scss     |    0
 .../tooltip/_pointseries_tooltip_formatter.js |    0
 .../_pointseries_tooltip_formatter.test.js}   |   19 +-
 .../vislib/components/tooltip/_tooltip.scss   |    0
 .../public/vislib/components/tooltip/index.js |    0
 .../components/tooltip/position_tooltip.js    |    0
 .../tooltip/position_tooltip.test.js}         |   60 +-
 .../vislib/components/tooltip/tooltip.js      |    0
 .../components/zero_injection/flatten_data.js |    0
 .../components/zero_injection/inject_zeros.js |    0
 .../zero_injection/ordered_x_keys.js          |    0
 .../components/zero_injection/uniq_keys.js    |    0
 .../zero_injection/zero_fill_data_array.js    |    0
 .../zero_injection/zero_filled_array.js       |    0
 .../zero_injection/zero_injection.test.js     |  223 +-
 .../vis_type_vislib/public/vislib/errors.ts   |    2 +-
 .../build_hierarchical_data.test.ts           |    0
 .../hierarchical/build_hierarchical_data.ts   |    2 +-
 .../public/vislib/helpers/index.ts            |    0
 .../helpers/point_series/_add_to_siri.test.ts |    0
 .../helpers/point_series/_add_to_siri.ts      |    0
 .../point_series/_fake_x_aspect.test.ts       |    0
 .../helpers/point_series/_fake_x_aspect.ts    |    0
 .../helpers/point_series/_get_aspects.test.ts |    0
 .../helpers/point_series/_get_aspects.ts      |    0
 .../helpers/point_series/_get_point.test.ts   |    2 +-
 .../vislib/helpers/point_series/_get_point.ts |    0
 .../helpers/point_series/_get_series.test.ts  |    0
 .../helpers/point_series/_get_series.ts       |    0
 .../helpers/point_series/_init_x_axis.test.ts |    0
 .../helpers/point_series/_init_x_axis.ts      |    0
 .../helpers/point_series/_init_y_axis.test.ts |    0
 .../helpers/point_series/_init_y_axis.ts      |    0
 .../point_series/_ordered_date_axis.test.ts   |    0
 .../point_series/_ordered_date_axis.ts        |    0
 .../vislib/helpers/point_series/index.ts      |    0
 .../helpers/point_series/point_series.test.ts |    0
 .../helpers/point_series/point_series.ts      |    0
 .../dispatch_heatmap.test.js.snap             |    0
 .../public/vislib/lib/_alerts.scss            |    0
 .../public/vislib/lib/_data_label.js          |    0
 .../public/vislib/lib/_error_handler.js       |    0
 .../public/vislib/lib/_error_handler.test.js} |   12 +-
 .../public/vislib/lib/_handler.scss           |    0
 .../public/vislib/lib/_index.scss             |    0
 .../public/vislib/lib/alerts.js               |    0
 .../public/vislib/lib/axis/axis.js            |    0
 .../public/vislib/lib/axis/axis.test.js}      |   13 +-
 .../public/vislib/lib/axis/axis_config.js     |    0
 .../public/vislib/lib/axis/axis_labels.js     |    0
 .../public/vislib/lib/axis/axis_scale.js      |    0
 .../public/vislib/lib/axis/axis_title.js      |    0
 .../vislib/lib/axis/axis_title.test.js}       |   27 +-
 .../public/vislib/lib/axis/index.js           |    0
 .../public/vislib/lib/axis/scale_modes.js     |    0
 .../public/vislib/lib/axis/time_ticks.js      |    0
 .../public/vislib/lib/axis/time_ticks.test.js |    0
 .../public/vislib/lib/axis/x_axis.test.js}    |   47 +-
 .../public/vislib/lib/axis/y_axis.test.js}    |   71 +-
 .../public/vislib/lib/binder.ts               |    0
 .../public/vislib/lib/chart_grid.js           |    0
 .../public/vislib/lib/chart_title.js          |    0
 .../vis_type_vislib/public/vislib/lib/data.js |    0
 .../public/vislib/lib/data.test.js}           |   25 +-
 .../public/vislib/lib/dispatch.js             |    0
 .../vislib}/lib/dispatch_heatmap.test.js      |   18 +-
 .../lib/dispatch_vertical_bar_chart.test.js   |   20 +-
 .../public/vislib/lib/handler.js              |    2 +-
 .../public/vislib/lib/layout/_index.scss      |    0
 .../public/vislib/lib/layout/_layout.scss     |    0
 .../public/vislib/lib/layout/index.js         |    0
 .../public/vislib/lib/layout/layout.js        |    0
 .../public/vislib/lib/layout/layout_types.js  |    0
 .../vislib/lib/layout/layout_types.test.js}   |    7 +-
 .../layout/splits/column_chart/chart_split.js |    0
 .../splits/column_chart/chart_title_split.js  |    0
 .../splits/column_chart/splits.test.js}       |   25 +-
 .../splits/column_chart/x_axis_split.js       |    0
 .../splits/column_chart/y_axis_split.js       |    0
 .../layout/splits/gauge_chart/chart_split.js  |    0
 .../splits/gauge_chart/chart_title_split.js   |    0
 .../layout/splits/gauge_chart/splits.test.js} |   13 +-
 .../layout/splits/pie_chart/chart_split.js    |    0
 .../splits/pie_chart/chart_title_split.js     |    0
 .../vislib/lib/layout/types/column_layout.js  |    0
 .../lib/layout/types/column_layout.test.js}   |    9 +-
 .../vislib/lib/layout/types/gauge_layout.js   |    0
 .../vislib/lib/layout/types/pie_layout.js     |    0
 .../public/vislib/lib/types/gauge.js          |    0
 .../public/vislib/lib/types/index.js          |    0
 .../public/vislib/lib/types/pie.js            |    0
 .../public/vislib/lib/types/point_series.js   |    0
 .../vislib/lib/types/point_series.test.js     |  154 +-
 .../types/testdata_linechart_percentile.json  |    0
 .../testdata_linechart_percentile_result.json |    0
 .../public/vislib/lib/vis_config.js           |    0
 .../public/vislib/lib/vis_config.test.js}     |   19 +-
 .../vislib/partials/touchdown.tmpl.html       |    0
 .../public/vislib/response_handler.js         |    0
 .../public/vislib/response_handler.test.ts    |    0
 .../vis_type_vislib/public/vislib/types.ts    |    0
 .../vis_type_vislib/public/vislib/vis.js      |    0
 .../public/vislib/visualizations/_chart.js    |    0
 .../vislib/visualizations/gauge_chart.js      |    0
 .../vislib/visualizations/gauges/_index.scss  |    0
 .../vislib/visualizations/gauges/_meter.scss  |    0
 .../visualizations/gauges/gauge_types.js      |    0
 .../vislib/visualizations/gauges/meter.js     |    2 +-
 .../public/vislib/visualizations/pie_chart.js |    0
 .../vislib/visualizations/point_series.js     |    0
 .../visualizations/point_series/_index.scss   |    0
 .../visualizations/point_series/_labels.scss  |    0
 .../point_series/_point_series.js             |    0
 .../visualizations/point_series/area_chart.js |    0
 .../point_series/column_chart.js              |    0
 .../point_series/heatmap_chart.js             |    2 +-
 .../visualizations/point_series/line_chart.js |    0
 .../point_series/series_types.js              |    0
 .../vislib/visualizations/time_marker.d.ts    |    0
 .../vislib/visualizations/time_marker.js      |    0
 .../visualizations/time_marker.test.js}       |   23 +-
 .../public/vislib/visualizations/vis_types.js |    0
 .../vislib/visualizations/vis_types.test.js}  |    7 +-
 .../vis_type_vislib/server/index.ts}          |   12 +-
 .../ml/public/application/util/chart_utils.js |    2 +-
 311 files changed, 16520 insertions(+), 18517 deletions(-)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__/lib/fixtures => kibana/public/__tests__/vis_type_vislib}/_vis_fixture.js (82%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/lib/chart_title.js (91%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/lib/dispatch.js (96%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/lib/handler/handler.js (86%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/lib/layout/layout.js (85%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/vis.js (92%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/area_chart.js (89%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/chart.js (92%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/column_chart.js (89%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/gauge_chart.js (94%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/heatmap_chart.js (89%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/line_chart.js (89%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/pie_chart.js (97%)
 rename src/legacy/core_plugins/{vis_type_vislib/public/vislib/__tests__ => kibana/public/__tests__/vis_type_vislib}/visualizations/pie_chart_mock_data.js (100%)
 create mode 100644 src/legacy/core_plugins/tests_bundle/public/index.scss
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/index.ts
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/package.json
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows_series_with_holes.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_monthly_interval.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_neg.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_pos_neg.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_stacked_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_geo_json.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_slices.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/not_enough_data/_one_point.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/stacked/_stacked.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_columns.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_rows.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/point_series.js
 delete mode 100644 src/legacy/core_plugins/vis_type_vislib/public/vislib/vislib.js
 create mode 100644 src/plugins/vis_type_vislib/kibana.json
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/__snapshots__/pie_fn.test.ts.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/area.ts (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/common/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/common/truncate_labels.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/common/validation_wrapper.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/gauge/index.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/gauge/labels_panel.tsx (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/gauge/style_panel.tsx (91%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/heatmap/index.tsx (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/category_axis_panel.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/custom_extents_options.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/label_options.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/line_options.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/y_extents.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/index.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/mocks.ts (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/utils.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/pie.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/point_series/grid_panel.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/point_series/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/point_series/point_series.tsx (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx (98%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_bar_chart_config_normal.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_bar_chart_config_percentage.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_bar_chart_d3.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_bar_chart_data_point.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_heatmap_config.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_heatmap_d3.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib => plugins/vis_type_vislib/public}/fixtures/dispatch_heatmap_data_point.json (100%)
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/index.js => plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js} (61%)
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js
 rename src/{legacy/core_plugins/vis_type_vislib/public/legacy.ts => plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js} (50%)
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/stacked/_stacked.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js
 create mode 100644 src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js
 rename src/{legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts => plugins/vis_type_vislib/public/fixtures/mocks.js} (68%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/gauge.ts (93%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/goal.ts (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/heatmap.ts (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/histogram.ts (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/horizontal_bar.ts (93%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/_index.scss => plugins/vis_type_vislib/public/index.scss} (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/index.ts (93%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/line.ts (93%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/pie.ts (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/pie_fn.test.ts (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/pie_fn.ts (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/plugin.ts (92%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/services.ts (87%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/types.ts (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/utils/collections.ts (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/utils/common_config.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vis_controller.tsx (96%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vis_type_vislib_vis_fn.ts (94%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vis_type_vislib_vis_types.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/VISLIB.md (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/_variables.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/_vislib_vis_type.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/labels/data_array.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/labels/flatten_series.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/labels/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/labels/labels.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/labels.js => plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js} (80%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/labels/truncate_labels.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/labels/uniq_labels.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/_legend.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/legend.test.tsx (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/legend.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/legend_item.tsx (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/models.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/legend/pie_utils.ts (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.test.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/_tooltip_formatter.js => plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js} (83%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/_tooltip.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/positioning.js => plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js} (82%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/tooltip/tooltip.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/inject_zeros.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/zero_filled_array.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js (65%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/errors.ts (95%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts (97%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_get_point.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_get_series.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/index.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__ => plugins/vis_type_vislib/public/vislib}/lib/__snapshots__/dispatch_heatmap.test.js.snap (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/_alerts.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/_data_label.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/_error_handler.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/error_handler.js => plugins/vis_type_vislib/public/vislib/lib/_error_handler.test.js} (88%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/_handler.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/alerts.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/axis.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis/axis.js => plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js} (93%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/axis_config.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/axis_labels.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/axis_scale.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/axis_title.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis_title.js => plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js} (91%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/scale_modes.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/time_ticks.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/axis/time_ticks.test.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/x_axis.js => plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js} (79%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/y_axis.js => plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js} (83%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/binder.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/chart_grid.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/chart_title.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/data.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/data.js => plugins/vis_type_vislib/public/vislib/lib/data.test.js} (91%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/dispatch.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__ => plugins/vis_type_vislib/public/vislib}/lib/dispatch_heatmap.test.js (75%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__ => plugins/vis_type_vislib/public/vislib}/lib/dispatch_vertical_bar_chart.test.js (74%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/handler.js (98%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/_layout.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/layout.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/layout_types.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout_types.js => plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js} (83%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_split.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_title_split.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js => plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/splits.test.js} (89%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/x_axis_split.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/y_axis_split.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_split.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_title_split.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/gauge_chart/splits.js => plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/splits.test.js} (93%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_split.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/types/column_layout.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/types/column_layout.js => plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js} (91%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/types/gauge_layout.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/layout/types/pie_layout.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/types/gauge.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/types/index.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/types/pie.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/types/point_series.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/types/point_series.test.js (53%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__ => plugins/vis_type_vislib/public/vislib}/lib/types/testdata_linechart_percentile.json (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__ => plugins/vis_type_vislib/public/vislib}/lib/types/testdata_linechart_percentile_result.json (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/lib/vis_config.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/vis_config.js => plugins/vis_type_vislib/public/vislib/lib/vis_config.test.js} (86%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/partials/touchdown.tmpl.html (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/response_handler.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/response_handler.test.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/types.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/vis.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/_chart.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/gauge_chart.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/gauges/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/gauges/_meter.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/gauges/gauge_types.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/gauges/meter.js (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/pie_chart.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/_index.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/_labels.scss (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js (99%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/point_series/series_types.js (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/time_marker.d.ts (100%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/time_marker.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/time_marker.js => plugins/vis_type_vislib/public/vislib/visualizations/time_marker.test.js} (83%)
 rename src/{legacy/core_plugins => plugins}/vis_type_vislib/public/vislib/visualizations/vis_types.js (100%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/vis_types.js => plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js} (85%)
 rename src/{legacy/core_plugins/vis_type_vislib/public/vislib/index.js => plugins/vis_type_vislib/server/index.ts} (78%)

diff --git a/.eslintignore b/.eslintignore
index 1f22b6074e76e0..2eaa498f86e5ae 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,7 +10,6 @@ bower_components
 /html_docs
 /src/plugins/data/common/es_query/kuery/ast/_generated_/**
 /src/plugins/vis_type_timelion/public/_generated_/**
-src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data
 /src/legacy/ui/public/flot-charts
 /test/fixtures/scenarios
 /src/legacy/core_plugins/console/public/webpackShims
diff --git a/.eslintrc.js b/.eslintrc.js
index 4e501004c22f9d..e45a2a96f29d7e 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -217,6 +217,9 @@ module.exports = {
                   'examples/**/*',
                   '!(src|x-pack)/**/*.test.*',
                   '!(x-pack/)?test/**/*',
+                  // next folder contains legacy browser tests which can't be migrated to jest
+                  // which import np files
+                  '!src/legacy/core_plugins/kibana/public/__tests__/**/*',
                 ],
                 from: [
                   '(src|x-pack)/plugins/**/(public|server)/**/*',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0d86726dca836c..4a16952f820142 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -11,7 +11,7 @@
 /src/legacy/core_plugins/kibana/public/discover/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/local_application_service/ @elastic/kibana-app
 /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
-/src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
+/src/plugins/vis_type_vislib/ @elastic/kibana-app
 /src/plugins/vis_type_xy/ @elastic/kibana-app
 /src/plugins/vis_type_table/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
diff --git a/.i18nrc.json b/.i18nrc.json
index 35ce7452343466..b04c02f6b22655 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -50,10 +50,10 @@
     "visTypeMetric": "src/plugins/vis_type_metric",
     "visTypeTable": "src/plugins/vis_type_table",
     "visTypeTagCloud": "src/plugins/vis_type_tagcloud",
-    "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
+    "visTypeTimeseries": "src/plugins/vis_type_timeseries",
     "visTypeVega": "src/plugins/vis_type_vega",
-    "visTypeVislib": "src/legacy/core_plugins/vis_type_vislib",
-    "visTypeXy": "src/legacy/core_plugins/vis_type_xy",
+    "visTypeVislib": "src/plugins/vis_type_vislib",
+    "visTypeXy": "src/plugins/vis_type_xy",
     "visualizations": "src/plugins/visualizations",
     "visualize": "src/plugins/visualize"
   },
diff --git a/.sass-lint.yml b/.sass-lint.yml
index 9b31f3fae6d161..44b4d493841361 100644
--- a/.sass-lint.yml
+++ b/.sass-lint.yml
@@ -2,8 +2,8 @@ files:
   include:
     - 'src/legacy/core_plugins/metrics/**/*.s+(a|c)ss'
     - 'src/legacy/core_plugins/timelion/**/*.s+(a|c)ss'
-    - 'src/legacy/core_plugins/vis_type_vislib/**/*.s+(a|c)ss'
-    - 'src/legacy/core_plugins/vis_type_xy/**/*.s+(a|c)ss'
+    - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss'
+    - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss'
     - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss'
     - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss'
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index fc95288eabed85..66296736b3ad04 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -117,7 +117,6 @@ export const TEMPORARILY_IGNORED_PATHS = [
   'src/legacy/core_plugins/tile_map/public/__tests__/shadedCircleMarkers.png',
   'src/legacy/core_plugins/tile_map/public/__tests__/shadedGeohashGrid.png',
   'src/fixtures/config_upgrade_from_4.0.0_to_4.0.1-snapshot.json',
-  'src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js',
   'src/core/server/core_app/assets/favicons/android-chrome-192x192.png',
   'src/core/server/core_app/assets/favicons/android-chrome-256x256.png',
   'src/core/server/core_app/assets/favicons/android-chrome-512x512.png',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/_vis_fixture.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js
similarity index 82%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/_vis_fixture.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js
index 05cea7addf560d..8a542fec0639c3 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/_vis_fixture.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/_vis_fixture.js
@@ -20,13 +20,10 @@
 import _ from 'lodash';
 import $ from 'jquery';
 
-import { Vis } from '../../../vis';
+import { Vis } from '../../../../../../plugins/vis_type_vislib/public/vislib/vis';
 
 // TODO: Remove when converted to jest mocks
-import {
-  ColorsService,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../../../plugins/charts/public/services';
+import { ColorsService } from '../../../../../../plugins/charts/public/services';
 
 const $visCanvas = $('<div>')
   .attr('id', 'vislib-vis-fixtures')
@@ -72,17 +69,6 @@ const getDeps = () => {
   };
 };
 
-export const getMockUiState = () => {
-  const map = new Map();
-
-  return (() => ({
-    get: (...args) => map.get(...args),
-    set: (...args) => map.set(...args),
-    setSilent: (...args) => map.set(...args),
-    on: () => undefined,
-  }))();
-};
-
 export function getVis(visLibParams, element) {
   return new Vis(
     element || $visCanvas.new(),
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/chart_title.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js
similarity index 91%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/chart_title.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js
index b65571becd83c6..81fef155daf57e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/chart_title.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/chart_title.js
@@ -21,9 +21,9 @@ import d3 from 'd3';
 import _ from 'lodash';
 import expect from '@kbn/expect';
 
-import { ChartTitle } from '../../lib/chart_title';
-import { VisConfig } from '../../lib/vis_config';
-import { getMockUiState } from './fixtures/_vis_fixture';
+import { ChartTitle } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/chart_title';
+import { VisConfig } from '../../../../../../../plugins/vis_type_vislib/public/vislib/lib/vis_config';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
 
 describe('Vislib ChartTitle Class Test Suite', function() {
   let mockUiState;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js
index a5d8eb80419a11..eb4e109690c37f 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/dispatch.js
@@ -22,9 +22,10 @@ import d3 from 'd3';
 import expect from '@kbn/expect';
 
 // Data
-import data from './fixtures/mock_data/date_histogram/_series';
+import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
 
-import { getVis, getMockUiState } from './fixtures/_vis_fixture';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 describe('Vislib Dispatch Class Test Suite', function() {
   function destroyVis(vis) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/handler/handler.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/handler/handler.js
similarity index 86%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/handler/handler.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/handler/handler.js
index 8e25015c101860..27f7f4ed3e0732 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/handler/handler.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/handler/handler.js
@@ -21,12 +21,12 @@ import expect from '@kbn/expect';
 import $ from 'jquery';
 
 // Data
-import series from '../fixtures/mock_data/date_histogram/_series';
-import columns from '../fixtures/mock_data/date_histogram/_columns';
-import rows from '../fixtures/mock_data/date_histogram/_rows';
-import stackedSeries from '../fixtures/mock_data/date_histogram/_stacked_series';
-
-import { getVis, getMockUiState } from '../fixtures/_vis_fixture';
+import series from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import columns from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
+import rows from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
+import stackedSeries from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../../_vis_fixture';
 
 const dateHistogramArray = [series, columns, rows, stackedSeries];
 const names = ['series', 'columns', 'rows', 'stackedSeries'];
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/layout/layout.js
similarity index 85%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/layout/layout.js
index f72794e27e834a..505b0a04c61837 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/lib/layout/layout.js
@@ -22,14 +22,14 @@ import expect from '@kbn/expect';
 import $ from 'jquery';
 
 // Data
-import series from '../fixtures/mock_data/date_histogram/_series';
-import columns from '../fixtures/mock_data/date_histogram/_columns';
-import rows from '../fixtures/mock_data/date_histogram/_rows';
-import stackedSeries from '../fixtures/mock_data/date_histogram/_stacked_series';
-
-import { Layout } from '../../../lib/layout/layout';
-import { getVis, getMockUiState } from '../fixtures/_vis_fixture';
-import { VisConfig } from '../../../lib/vis_config';
+import series from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import columns from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
+import rows from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
+import stackedSeries from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { Layout } from '../../../../../../../../plugins/vis_type_vislib/public/vislib/lib/layout/layout';
+import { VisConfig } from '../../../../../../../../plugins/vis_type_vislib/public/vislib/lib/vis_config';
+import { getVis } from '../../_vis_fixture';
 
 const dateHistogramArray = [series, columns, rows, stackedSeries];
 const names = ['series', 'columns', 'rows', 'stackedSeries'];
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/vis.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js
similarity index 92%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/vis.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js
index 4852f71d8c45b3..67f29ee96a3364 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/vis.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/vis.js
@@ -21,11 +21,12 @@ import _ from 'lodash';
 import $ from 'jquery';
 import expect from '@kbn/expect';
 
-import series from './lib/fixtures/mock_data/date_histogram/_series';
-import columns from './lib/fixtures/mock_data/date_histogram/_columns';
-import rows from './lib/fixtures/mock_data/date_histogram/_rows';
-import stackedSeries from './lib/fixtures/mock_data/date_histogram/_stacked_series';
-import { getVis, getMockUiState } from './lib/fixtures/_vis_fixture';
+import series from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import columns from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns';
+import rows from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
+import stackedSeries from '../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from './_vis_fixture';
 
 const dataArray = [series, columns, rows, stackedSeries];
 const names = ['series', 'columns', 'rows', 'stackedSeries'];
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/area_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js
similarity index 89%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/area_chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js
index c3f5859eb454cc..eb529c380cdda4 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/area_chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/area_chart.js
@@ -22,15 +22,16 @@ import _ from 'lodash';
 import $ from 'jquery';
 import expect from '@kbn/expect';
 
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 const dataTypesArray = {
-  'series pos': require('../lib/fixtures/mock_data/date_histogram/_series'),
-  'series pos neg': require('../lib/fixtures/mock_data/date_histogram/_series_pos_neg'),
-  'series neg': require('../lib/fixtures/mock_data/date_histogram/_series_neg'),
-  'term columns': require('../lib/fixtures/mock_data/terms/_columns'),
-  'range rows': require('../lib/fixtures/mock_data/range/_rows'),
-  stackedSeries: require('../lib/fixtures/mock_data/date_histogram/_stacked_series'),
+  'series pos': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series'),
+  'series pos neg': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg'),
+  'series neg': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg'),
+  'term columns': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns'),
+  'range rows': require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows'),
+  stackedSeries: require('../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series'),
 };
 
 const visLibParams = {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/chart.js
similarity index 92%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/chart.js
index 9653f9abab6fb8..4c5e3db3162430 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/chart.js
@@ -20,8 +20,9 @@
 import d3 from 'd3';
 import expect from '@kbn/expect';
 
-import { Chart } from '../../visualizations/_chart';
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import { Chart } from '../../../../../../../plugins/vis_type_vislib/public/vislib/visualizations/_chart';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 describe('Vislib _chart Test Suite', function() {
   let vis;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/column_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js
similarity index 89%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/column_chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js
index 2216294fcbac11..5cbd5948bc477a 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/column_chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/column_chart.js
@@ -23,17 +23,18 @@ import $ from 'jquery';
 import expect from '@kbn/expect';
 
 // Data
-import series from '../lib/fixtures/mock_data/date_histogram/_series';
-import seriesPosNeg from '../lib/fixtures/mock_data/date_histogram/_series_pos_neg';
-import seriesNeg from '../lib/fixtures/mock_data/date_histogram/_series_neg';
-import termsColumns from '../lib/fixtures/mock_data/terms/_columns';
-import histogramRows from '../lib/fixtures/mock_data/histogram/_rows';
-import stackedSeries from '../lib/fixtures/mock_data/date_histogram/_stacked_series';
-
-import { seriesMonthlyInterval } from '../lib/fixtures/mock_data/date_histogram/_series_monthly_interval';
-import { rowsSeriesWithHoles } from '../lib/fixtures/mock_data/date_histogram/_rows_series_with_holes';
-import rowsWithZeros from '../lib/fixtures/mock_data/date_histogram/_rows';
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import series from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
+import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
+import termsColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns';
+import histogramRows from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows';
+import stackedSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
+
+import { seriesMonthlyInterval } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval';
+import { rowsSeriesWithHoles } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes';
+import rowsWithZeros from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 // tuple, with the format [description, mode, data]
 const dataTypesArray = [
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/gauge_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/gauge_chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js
index fe25734fcbfde5..d8ce8f1f5f44bf 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/gauge_chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/gauge_chart.js
@@ -21,8 +21,9 @@ import $ from 'jquery';
 import _ from 'lodash';
 import expect from '@kbn/expect';
 
-import data from '../lib/fixtures/mock_data/terms/_seriesMultiple';
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import data from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 describe('Vislib Gauge Chart Test Suite', function() {
   let vis;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/heatmap_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js
similarity index 89%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/heatmap_chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js
index f4c952be191deb..765b9118e68445 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/heatmap_chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/heatmap_chart.js
@@ -23,13 +23,13 @@ import d3 from 'd3';
 import expect from '@kbn/expect';
 
 // Data
-import series from '../lib/fixtures/mock_data/date_histogram/_series';
-import seriesPosNeg from '../lib/fixtures/mock_data/date_histogram/_series_pos_neg';
-import seriesNeg from '../lib/fixtures/mock_data/date_histogram/_series_neg';
-import termsColumns from '../lib/fixtures/mock_data/terms/_columns';
-import stackedSeries from '../lib/fixtures/mock_data/date_histogram/_stacked_series';
-
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import series from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
+import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
+import termsColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns';
+import stackedSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 // tuple, with the format [description, mode, data]
 const dataTypesArray = [
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/line_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js
similarity index 89%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/line_chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js
index 1269fe7bcf62e9..691417e968eedb 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/line_chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/line_chart.js
@@ -23,14 +23,14 @@ import $ from 'jquery';
 import _ from 'lodash';
 
 // Data
-import seriesPos from '../lib/fixtures/mock_data/date_histogram/_series';
-import seriesPosNeg from '../lib/fixtures/mock_data/date_histogram/_series_pos_neg';
-import seriesNeg from '../lib/fixtures/mock_data/date_histogram/_series_neg';
-import histogramColumns from '../lib/fixtures/mock_data/histogram/_columns';
-import rangeRows from '../lib/fixtures/mock_data/range/_rows';
-import termSeries from '../lib/fixtures/mock_data/terms/_series';
-
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import seriesPos from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series';
+import seriesPosNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg';
+import seriesNeg from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg';
+import histogramColumns from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns';
+import rangeRows from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows';
+import termSeries from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 
 const dataTypes = [
   ['series pos', seriesPos],
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js
index caafb2c636271a..506ad2af85c34d 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart.js
@@ -22,7 +22,8 @@ import _ from 'lodash';
 import $ from 'jquery';
 import expect from '@kbn/expect';
 
-import { getVis, getMockUiState } from '../lib/fixtures/_vis_fixture';
+import { getMockUiState } from '../../../../../../../plugins/vis_type_vislib/public/fixtures/mocks';
+import { getVis } from '../_vis_fixture';
 import { pieChartMockData } from './pie_chart_mock_data';
 
 const names = ['rows', 'columns', 'slices'];
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart_mock_data.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart_mock_data.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/pie_chart_mock_data.js
rename to src/legacy/core_plugins/kibana/public/__tests__/vis_type_vislib/visualizations/pie_chart_mock_data.js
diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss
index d49c59970f521d..26805554370b96 100644
--- a/src/legacy/core_plugins/kibana/public/index.scss
+++ b/src/legacy/core_plugins/kibana/public/index.scss
@@ -7,16 +7,9 @@
 // Public UI styles
 @import 'src/legacy/ui/public/index';
 
-// vis_type_vislib UI styles
-@import 'src/legacy/core_plugins/vis_type_vislib/public/index';
-
 // Discover styles
 @import 'discover/index';
 
-// Visualization styles are imported here for running karma Browser tests
-// should be somehow included through the "visualizations" plugin initialization
-@import '../../../../plugins/visualizations/public/index';
-
 // Has to come after visualize because of some
 // bad cascading in the Editor layout
 @import '../../../../plugins/maps_legacy/public/index';
diff --git a/src/legacy/core_plugins/tests_bundle/index.js b/src/legacy/core_plugins/tests_bundle/index.js
index e1966a9e8b2667..3348096c0e2f1e 100644
--- a/src/legacy/core_plugins/tests_bundle/index.js
+++ b/src/legacy/core_plugins/tests_bundle/index.js
@@ -18,6 +18,7 @@
  */
 
 import { createReadStream } from 'fs';
+import { resolve } from 'path';
 
 import globby from 'globby';
 import MultiStream from 'multistream';
@@ -40,6 +41,7 @@ export default kibana => {
     },
 
     uiExports: {
+      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       async __bundleProvider__(kbnServer) {
         const modules = new Set();
 
diff --git a/src/legacy/core_plugins/tests_bundle/public/index.scss b/src/legacy/core_plugins/tests_bundle/public/index.scss
new file mode 100644
index 00000000000000..8020cef8d84927
--- /dev/null
+++ b/src/legacy/core_plugins/tests_bundle/public/index.scss
@@ -0,0 +1,6 @@
+@import 'src/legacy/ui/public/styles/styling_constants';
+
+// This file pulls some styles of NP plugins into the legacy test stylesheet
+// so they are available for karma browser tests.
+@import '../../../../plugins/vis_type_vislib/public/index';
+@import '../../../../plugins/visualizations/public/index';
diff --git a/src/legacy/core_plugins/vis_type_vislib/index.ts b/src/legacy/core_plugins/vis_type_vislib/index.ts
deleted file mode 100644
index da9476285a9b2e..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/index.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { resolve } from 'path';
-import { Legacy } from 'kibana';
-
-import { LegacyPluginApi, LegacyPluginInitializer } from '../../types';
-
-const visTypeVislibPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
-  new Plugin({
-    id: 'vis_type_vislib',
-    require: ['kibana', 'elasticsearch', 'interpreter'],
-    publicDir: resolve(__dirname, 'public'),
-    styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-    uiExports: {
-      hacks: [resolve(__dirname, 'public/legacy')],
-      injectDefaultVars: server => ({}),
-    },
-    init: (server: Legacy.Server) => ({}),
-    config(Joi: any) {
-      return Joi.object({
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-  } as Legacy.PluginSpecOptions);
-
-// eslint-disable-next-line import/no-default-export
-export default visTypeVislibPluginInitializer;
diff --git a/src/legacy/core_plugins/vis_type_vislib/package.json b/src/legacy/core_plugins/vis_type_vislib/package.json
deleted file mode 100644
index e30a9e2b358342..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/package.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "vis_type_vislib",
-  "version": "kibana"
-}
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_columns.js
deleted file mode 100644
index b5b14c279b40e0..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_columns.js
+++ /dev/null
@@ -1,300 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'columns': [
-    {
-      'label': '200: response',
-      'xAxisLabel': '@timestamp per 30 sec',
-      'ordered': {
-        'date': true,
-        'interval': 30000,
-        'min': 1415826608440,
-        'max': 1415827508440
-      },
-      'yAxisLabel': 'Count of documents',
-      'xAxisFormatter': function (thing) {
-        return moment(thing);
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      },
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 1415826600000,
-              'y': 4
-            },
-            {
-              'x': 1415826630000,
-              'y': 8
-            },
-            {
-              'x': 1415826660000,
-              'y': 7
-            },
-            {
-              'x': 1415826690000,
-              'y': 5
-            },
-            {
-              'x': 1415826720000,
-              'y': 5
-            },
-            {
-              'x': 1415826750000,
-              'y': 4
-            },
-            {
-              'x': 1415826780000,
-              'y': 10
-            },
-            {
-              'x': 1415826810000,
-              'y': 7
-            },
-            {
-              'x': 1415826840000,
-              'y': 9
-            },
-            {
-              'x': 1415826870000,
-              'y': 8
-            },
-            {
-              'x': 1415826900000,
-              'y': 9
-            },
-            {
-              'x': 1415826930000,
-              'y': 8
-            },
-            {
-              'x': 1415826960000,
-              'y': 3
-            },
-            {
-              'x': 1415826990000,
-              'y': 9
-            },
-            {
-              'x': 1415827020000,
-              'y': 6
-            },
-            {
-              'x': 1415827050000,
-              'y': 8
-            },
-            {
-              'x': 1415827080000,
-              'y': 7
-            },
-            {
-              'x': 1415827110000,
-              'y': 4
-            },
-            {
-              'x': 1415827140000,
-              'y': 6
-            },
-            {
-              'x': 1415827170000,
-              'y': 10
-            },
-            {
-              'x': 1415827200000,
-              'y': 2
-            },
-            {
-              'x': 1415827230000,
-              'y': 8
-            },
-            {
-              'x': 1415827260000,
-              'y': 5
-            },
-            {
-              'x': 1415827290000,
-              'y': 6
-            },
-            {
-              'x': 1415827320000,
-              'y': 6
-            },
-            {
-              'x': 1415827350000,
-              'y': 10
-            },
-            {
-              'x': 1415827380000,
-              'y': 6
-            },
-            {
-              'x': 1415827410000,
-              'y': 6
-            },
-            {
-              'x': 1415827440000,
-              'y': 12
-            },
-            {
-              'x': 1415827470000,
-              'y': 9
-            },
-            {
-              'x': 1415827500000,
-              'y': 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      'label': '503: response',
-      'xAxisLabel': '@timestamp per 30 sec',
-      'ordered': {
-        'date': true,
-        'interval': 30000,
-        'min': 1415826608440,
-        'max': 1415827508440
-      },
-      'yAxisLabel': 'Count of documents',
-      'xAxisFormatter': function (thing) {
-        return moment(thing);
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      },
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 1415826630000,
-              'y': 1
-            },
-            {
-              'x': 1415826660000,
-              'y': 1
-            },
-            {
-              'x': 1415826720000,
-              'y': 1
-            },
-            {
-              'x': 1415826780000,
-              'y': 1
-            },
-            {
-              'x': 1415826900000,
-              'y': 1
-            },
-            {
-              'x': 1415827020000,
-              'y': 1
-            },
-            {
-              'x': 1415827080000,
-              'y': 1
-            },
-            {
-              'x': 1415827110000,
-              'y': 2
-            }
-          ]
-        }
-      ]
-    },
-    {
-      'label': '404: response',
-      'xAxisLabel': '@timestamp per 30 sec',
-      'ordered': {
-        'date': true,
-        'interval': 30000,
-        'min': 1415826608440,
-        'max': 1415827508440
-      },
-      'yAxisLabel': 'Count of documents',
-      'xAxisFormatter': function (thing) {
-        return moment(thing);
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      },
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 1415826660000,
-              'y': 1
-            },
-            {
-              'x': 1415826720000,
-              'y': 1
-            },
-            {
-              'x': 1415826810000,
-              'y': 1
-            },
-            {
-              'x': 1415826960000,
-              'y': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 1
-            },
-            {
-              'x': 1415827260000,
-              'y': 1
-            },
-            {
-              'x': 1415827380000,
-              'y': 1
-            },
-            {
-              'x': 1415827410000,
-              'y': 1
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  'xAxisOrderedValues': [
-    1415826600000,
-    1415826630000,
-    1415826660000,
-    1415826690000,
-    1415826720000,
-    1415826750000,
-    1415826780000,
-    1415826810000,
-    1415826840000,
-    1415826870000,
-    1415826900000,
-    1415826930000,
-    1415826960000,
-    1415826990000,
-    1415827020000,
-    1415827050000,
-    1415827080000,
-    1415827110000,
-    1415827140000,
-    1415827170000,
-    1415827200000,
-    1415827230000,
-    1415827260000,
-    1415827290000,
-    1415827320000,
-    1415827350000,
-    1415827380000,
-    1415827410000,
-    1415827440000,
-    1415827470000,
-    1415827500000,
-  ],
-  'hits': 225
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows.js
deleted file mode 100644
index 98609d8ffbcd3b..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows.js
+++ /dev/null
@@ -1,1678 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'rows': [
-    {
-      'label': '0.0-1000.0: bytes',
-      'xAxisLabel': '@timestamp per 30 sec',
-      'ordered': {
-        'date': true,
-        'interval': 30000,
-        'min': 1415826260456,
-        'max': 1415827160456
-      },
-      'yAxisLabel': 'Count of documents',
-      'xAxisFormatter': function (thing) {
-        return moment(thing);
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      },
-      'series': [
-        {
-          'label': 'jpg',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'css',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'png',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827110000,
-              'y': 1,
-              'y0': 1
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'php',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827110000,
-              'y': 0,
-              'y0': 2
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'gif',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 3,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826660000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 1,
-              'y0': 1
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 1,
-              'y0': 1
-            },
-            {
-              'x': 1415827110000,
-              'y': 1,
-              'y0': 2
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      'label': '1000.0-2000.0: bytes',
-      'xAxisLabel': '@timestamp per 30 sec',
-      'ordered': {
-        'date': true,
-        'interval': 30000,
-        'min': 1415826260457,
-        'max': 1415827160457
-      },
-      'yAxisLabel': 'Count of documents',
-      'xAxisFormatter': function (thing) {
-        return moment(thing);
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      },
-      'series': [
-        {
-          'label': 'jpg',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826660000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826810000,
-              'y': 2,
-              'y0': 0
-            },
-            {
-              'x': 1415826840000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'css',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 2
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'png',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 2
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'php',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 2
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        },
-        {
-          'label': 'gif',
-          'values': [
-            {
-              'x': 1415826240000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826270000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826300000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826330000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826360000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826390000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826420000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826450000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826480000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826510000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826540000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826570000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826600000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826630000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826660000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826690000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826720000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826750000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826780000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826810000,
-              'y': 0,
-              'y0': 2
-            },
-            {
-              'x': 1415826840000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826870000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826900000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415826930000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826960000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415826990000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827020000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827050000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827080000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 1415827110000,
-              'y': 0,
-              'y0': 1
-            },
-            {
-              'x': 1415827140000,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  'xAxisOrderedValues': [
-    1415826240000,
-    1415826270000,
-    1415826300000,
-    1415826330000,
-    1415826360000,
-    1415826390000,
-    1415826420000,
-    1415826450000,
-    1415826480000,
-    1415826510000,
-    1415826540000,
-    1415826570000,
-    1415826600000,
-    1415826630000,
-    1415826660000,
-    1415826690000,
-    1415826720000,
-    1415826750000,
-    1415826780000,
-    1415826810000,
-    1415826840000,
-    1415826870000,
-    1415826900000,
-    1415826930000,
-    1415826960000,
-    1415826990000,
-    1415827020000,
-    1415827050000,
-    1415827080000,
-    1415827110000,
-    1415827140000,
-  ],
-  'hits': 236
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows_series_with_holes.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows_series_with_holes.js
deleted file mode 100644
index 4ca631c7fc4972..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_rows_series_with_holes.js
+++ /dev/null
@@ -1,123 +0,0 @@
-import moment from 'moment';
-
-export const rowsSeriesWithHoles = {
-  rows: [
-    {
-      'label': '',
-      'xAxisLabel': '@timestamp per 30 sec',
-      'ordered': {
-        'date': true,
-        'min': 1411761457636,
-        'max': 1411762357636,
-        'interval': 30000
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 1411761450000,
-              'y': 41
-            },
-            {
-              'x': 1411761510000,
-              'y': 22
-            },
-            {
-              'x': 1411761540000,
-              'y': 17
-            },
-            {
-              'x': 1411761840000,
-              'y': 20
-            },
-            {
-              'x': 1411761870000,
-              'y': 20
-            },
-            {
-              'x': 1411761900000,
-              'y': 21
-            },
-            {
-              'x': 1411761930000,
-              'y': 17
-            },
-            {
-              'x': 1411761960000,
-              'y': 20
-            },
-            {
-              'x': 1411761990000,
-              'y': 13
-            },
-            {
-              'x': 1411762020000,
-              'y': 14
-            },
-            {
-              'x': 1411762050000,
-              'y': 25
-            },
-            {
-              'x': 1411762080000,
-              'y': 17
-            },
-            {
-              'x': 1411762110000,
-              'y': 14
-            },
-            {
-              'x': 1411762140000,
-              'y': 22
-            },
-            {
-              'x': 1411762170000,
-              'y': 14
-            },
-            {
-              'x': 1411762200000,
-              'y': 19
-            },
-            {
-              'x': 1411762320000,
-              'y': 15
-            },
-            {
-              'x': 1411762350000,
-              'y': 4
-            }
-          ]
-        }
-      ],
-      'hits': 533,
-      'xAxisFormatter': function (thing) {
-        return moment(thing);
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'xAxisOrderedValues': [
-    1411761450000,
-    1411761510000,
-    1411761540000,
-    1411761840000,
-    1411761870000,
-    1411761900000,
-    1411761930000,
-    1411761960000,
-    1411761990000,
-    1411762020000,
-    1411762050000,
-    1411762080000,
-    1411762110000,
-    1411762140000,
-    1411762170000,
-    1411762200000,
-    1411762320000,
-    1411762350000,
-  ],
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series.js
deleted file mode 100644
index 13e2ab7b7fb1ac..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'label': '',
-  'xAxisLabel': '@timestamp per 30 sec',
-  'ordered': {
-    'date': true,
-    'min': 1411761457636,
-    'max': 1411762357636,
-    'interval': 30000
-  },
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 1411761450000,
-          'y': 41
-        },
-        {
-          'x': 1411761480000,
-          'y': 18
-        },
-        {
-          'x': 1411761510000,
-          'y': 22
-        },
-        {
-          'x': 1411761540000,
-          'y': 17
-        },
-        {
-          'x': 1411761570000,
-          'y': 17
-        },
-        {
-          'x': 1411761600000,
-          'y': 21
-        },
-        {
-          'x': 1411761630000,
-          'y': 16
-        },
-        {
-          'x': 1411761660000,
-          'y': 17
-        },
-        {
-          'x': 1411761690000,
-          'y': 15
-        },
-        {
-          'x': 1411761720000,
-          'y': 19
-        },
-        {
-          'x': 1411761750000,
-          'y': 11
-        },
-        {
-          'x': 1411761780000,
-          'y': 13
-        },
-        {
-          'x': 1411761810000,
-          'y': 24
-        },
-        {
-          'x': 1411761840000,
-          'y': 20
-        },
-        {
-          'x': 1411761870000,
-          'y': 20
-        },
-        {
-          'x': 1411761900000,
-          'y': 21
-        },
-        {
-          'x': 1411761930000,
-          'y': 17
-        },
-        {
-          'x': 1411761960000,
-          'y': 20
-        },
-        {
-          'x': 1411761990000,
-          'y': 13
-        },
-        {
-          'x': 1411762020000,
-          'y': 14
-        },
-        {
-          'x': 1411762050000,
-          'y': 25
-        },
-        {
-          'x': 1411762080000,
-          'y': 17
-        },
-        {
-          'x': 1411762110000,
-          'y': 14
-        },
-        {
-          'x': 1411762140000,
-          'y': 22
-        },
-        {
-          'x': 1411762170000,
-          'y': 14
-        },
-        {
-          'x': 1411762200000,
-          'y': 19
-        },
-        {
-          'x': 1411762230000,
-          'y': 22
-        },
-        {
-          'x': 1411762260000,
-          'y': 17
-        },
-        {
-          'x': 1411762290000,
-          'y': 8
-        },
-        {
-          'x': 1411762320000,
-          'y': 15
-        },
-        {
-          'x': 1411762350000,
-          'y': 4
-        }
-      ]
-    }
-  ],
-  'hits': 533,
-  'xAxisOrderedValues': [
-    1411761450000,
-    1411761480000,
-    1411761510000,
-    1411761540000,
-    1411761570000,
-    1411761600000,
-    1411761630000,
-    1411761660000,
-    1411761690000,
-    1411761720000,
-    1411761750000,
-    1411761780000,
-    1411761810000,
-    1411761840000,
-    1411761870000,
-    1411761900000,
-    1411761930000,
-    1411761960000,
-    1411761990000,
-    1411762020000,
-    1411762050000,
-    1411762080000,
-    1411762110000,
-    1411762140000,
-    1411762170000,
-    1411762200000,
-    1411762230000,
-    1411762260000,
-    1411762290000,
-    1411762320000,
-    1411762350000,
-  ],
-  'xAxisFormatter': function (thing) {
-    return moment(thing);
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_monthly_interval.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_monthly_interval.js
deleted file mode 100644
index 6b7c574ab55511..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_monthly_interval.js
+++ /dev/null
@@ -1,89 +0,0 @@
-import moment from 'moment';
-
-export const seriesMonthlyInterval = {
-  'label': '',
-  'xAxisLabel': '@timestamp per month',
-  'ordered': {
-    'date': true,
-    'min': 1451631600000,
-    'max': 1483254000000,
-    'interval': 2678000000
-  },
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 1451631600000,
-          'y': 10220
-        },
-        {
-          'x': 1454310000000,
-          'y': 9997,
-        },
-        {
-          'x': 1456815600000,
-          'y': 10792,
-        },
-        {
-          'x': 1459490400000,
-          'y': 10262
-        },
-        {
-          'x': 1462082400000,
-          'y': 10080
-        },
-        {
-          'x': 1464760800000,
-          'y': 11161
-        },
-        {
-          'x': 1467352800000,
-          'y': 9933
-        },
-        {
-          'x': 1470031200000,
-          'y': 10342
-        },
-        {
-          'x': 1472709600000,
-          'y': 10887
-        },
-        {
-          'x': 1475301600000,
-          'y': 9666
-        },
-        {
-          'x': 1477980000000,
-          'y': 9556
-        },
-        {
-          'x': 1480575600000,
-          'y': 11644
-        }
-      ]
-    }
-  ],
-  'hits': 533,
-  'xAxisOrderedValues': [
-    1451631600000,
-    1454310000000,
-    1456815600000,
-    1459490400000,
-    1462082400000,
-    1464760800000,
-    1467352800000,
-    1470031200000,
-    1472709600000,
-    1475301600000,
-    1477980000000,
-    1480575600000,
-  ],
-  'xAxisFormatter': function (thing) {
-    return moment(thing);
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_neg.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_neg.js
deleted file mode 100644
index ff5cd05b2f2d49..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_neg.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'label': '',
-  'xAxisLabel': '@timestamp per 30 sec',
-  'ordered': {
-    'date': true,
-    'min': 1411761457636,
-    'max': 1411762357636,
-    'interval': 30000
-  },
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 1411761450000,
-          'y': -41
-        },
-        {
-          'x': 1411761480000,
-          'y': -18
-        },
-        {
-          'x': 1411761510000,
-          'y': -22
-        },
-        {
-          'x': 1411761540000,
-          'y': -17
-        },
-        {
-          'x': 1411761570000,
-          'y': -17
-        },
-        {
-          'x': 1411761600000,
-          'y': -21
-        },
-        {
-          'x': 1411761630000,
-          'y': -16
-        },
-        {
-          'x': 1411761660000,
-          'y': -17
-        },
-        {
-          'x': 1411761690000,
-          'y': -15
-        },
-        {
-          'x': 1411761720000,
-          'y': -19
-        },
-        {
-          'x': 1411761750000,
-          'y': -11
-        },
-        {
-          'x': 1411761780000,
-          'y': -13
-        },
-        {
-          'x': 1411761810000,
-          'y': -24
-        },
-        {
-          'x': 1411761840000,
-          'y': -20
-        },
-        {
-          'x': 1411761870000,
-          'y': -20
-        },
-        {
-          'x': 1411761900000,
-          'y': -21
-        },
-        {
-          'x': 1411761930000,
-          'y': -17
-        },
-        {
-          'x': 1411761960000,
-          'y': -20
-        },
-        {
-          'x': 1411761990000,
-          'y': -13
-        },
-        {
-          'x': 1411762020000,
-          'y': -14
-        },
-        {
-          'x': 1411762050000,
-          'y': -25
-        },
-        {
-          'x': 1411762080000,
-          'y': -17
-        },
-        {
-          'x': 1411762110000,
-          'y': -14
-        },
-        {
-          'x': 1411762140000,
-          'y': -22
-        },
-        {
-          'x': 1411762170000,
-          'y': -14
-        },
-        {
-          'x': 1411762200000,
-          'y': -19
-        },
-        {
-          'x': 1411762230000,
-          'y': -22
-        },
-        {
-          'x': 1411762260000,
-          'y': -17
-        },
-        {
-          'x': 1411762290000,
-          'y': -8
-        },
-        {
-          'x': 1411762320000,
-          'y': -15
-        },
-        {
-          'x': 1411762350000,
-          'y': -4
-        }
-      ]
-    }
-  ],
-  'hits': 533,
-  'xAxisOrderedValues': [
-    1411761450000,
-    1411761480000,
-    1411761510000,
-    1411761540000,
-    1411761570000,
-    1411761600000,
-    1411761630000,
-    1411761660000,
-    1411761690000,
-    1411761720000,
-    1411761750000,
-    1411761780000,
-    1411761810000,
-    1411761840000,
-    1411761870000,
-    1411761900000,
-    1411761930000,
-    1411761960000,
-    1411761990000,
-    1411762020000,
-    1411762050000,
-    1411762080000,
-    1411762110000,
-    1411762140000,
-    1411762170000,
-    1411762200000,
-    1411762230000,
-    1411762260000,
-    1411762290000,
-    1411762320000,
-    1411762350000,
-  ],
-  'xAxisFormatter': function (thing) {
-    return moment(thing);
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_pos_neg.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_pos_neg.js
deleted file mode 100644
index 06d9b31dc6b578..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_series_pos_neg.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'label': '',
-  'xAxisLabel': '@timestamp per 30 sec',
-  'ordered': {
-    'date': true,
-    'min': 1411761457636,
-    'max': 1411762357636,
-    'interval': 30000
-  },
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 1411761450000,
-          'y': 41
-        },
-        {
-          'x': 1411761480000,
-          'y': 18
-        },
-        {
-          'x': 1411761510000,
-          'y': -22
-        },
-        {
-          'x': 1411761540000,
-          'y': -17
-        },
-        {
-          'x': 1411761570000,
-          'y': -17
-        },
-        {
-          'x': 1411761600000,
-          'y': -21
-        },
-        {
-          'x': 1411761630000,
-          'y': -16
-        },
-        {
-          'x': 1411761660000,
-          'y': 17
-        },
-        {
-          'x': 1411761690000,
-          'y': 15
-        },
-        {
-          'x': 1411761720000,
-          'y': 19
-        },
-        {
-          'x': 1411761750000,
-          'y': 11
-        },
-        {
-          'x': 1411761780000,
-          'y': -13
-        },
-        {
-          'x': 1411761810000,
-          'y': -24
-        },
-        {
-          'x': 1411761840000,
-          'y': -20
-        },
-        {
-          'x': 1411761870000,
-          'y': -20
-        },
-        {
-          'x': 1411761900000,
-          'y': -21
-        },
-        {
-          'x': 1411761930000,
-          'y': 17
-        },
-        {
-          'x': 1411761960000,
-          'y': 20
-        },
-        {
-          'x': 1411761990000,
-          'y': -13
-        },
-        {
-          'x': 1411762020000,
-          'y': -14
-        },
-        {
-          'x': 1411762050000,
-          'y': 25
-        },
-        {
-          'x': 1411762080000,
-          'y': -17
-        },
-        {
-          'x': 1411762110000,
-          'y': -14
-        },
-        {
-          'x': 1411762140000,
-          'y': -22
-        },
-        {
-          'x': 1411762170000,
-          'y': -14
-        },
-        {
-          'x': 1411762200000,
-          'y': 19
-        },
-        {
-          'x': 1411762230000,
-          'y': 22
-        },
-        {
-          'x': 1411762260000,
-          'y': 17
-        },
-        {
-          'x': 1411762290000,
-          'y': 8
-        },
-        {
-          'x': 1411762320000,
-          'y': -15
-        },
-        {
-          'x': 1411762350000,
-          'y': -4
-        }
-      ]
-    }
-  ],
-  'hits': 533,
-  'xAxisOrderedValues': [
-    1411761450000,
-    1411761480000,
-    1411761510000,
-    1411761540000,
-    1411761570000,
-    1411761600000,
-    1411761630000,
-    1411761660000,
-    1411761690000,
-    1411761720000,
-    1411761750000,
-    1411761780000,
-    1411761810000,
-    1411761840000,
-    1411761870000,
-    1411761900000,
-    1411761930000,
-    1411761960000,
-    1411761990000,
-    1411762020000,
-    1411762050000,
-    1411762080000,
-    1411762110000,
-    1411762140000,
-    1411762170000,
-    1411762200000,
-    1411762230000,
-    1411762260000,
-    1411762290000,
-    1411762320000,
-    1411762350000,
-  ],
-  'xAxisFormatter': function (thing) {
-    return moment(thing);
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_stacked_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_stacked_series.js
deleted file mode 100644
index 5208c7e996cd87..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/date_histogram/_stacked_series.js
+++ /dev/null
@@ -1,1557 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'label': '',
-  'xAxisLabel': '@timestamp per 10 min',
-  'ordered': {
-    'date': true,
-    'min': 1413544140087,
-    'max': 1413587340087,
-    'interval': 600000
-  },
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'html',
-      'values': [
-        {
-          'x': 1413543600000,
-          'y': 140
-        },
-        {
-          'x': 1413544200000,
-          'y': 1388
-        },
-        {
-          'x': 1413544800000,
-          'y': 1308
-        },
-        {
-          'x': 1413545400000,
-          'y': 1356
-        },
-        {
-          'x': 1413546000000,
-          'y': 1314
-        },
-        {
-          'x': 1413546600000,
-          'y': 1343
-        },
-        {
-          'x': 1413547200000,
-          'y': 1353
-        },
-        {
-          'x': 1413547800000,
-          'y': 1353
-        },
-        {
-          'x': 1413548400000,
-          'y': 1334
-        },
-        {
-          'x': 1413549000000,
-          'y': 1433
-        },
-        {
-          'x': 1413549600000,
-          'y': 1331
-        },
-        {
-          'x': 1413550200000,
-          'y': 1349
-        },
-        {
-          'x': 1413550800000,
-          'y': 1323
-        },
-        {
-          'x': 1413551400000,
-          'y': 1203
-        },
-        {
-          'x': 1413552000000,
-          'y': 1231
-        },
-        {
-          'x': 1413552600000,
-          'y': 1227
-        },
-        {
-          'x': 1413553200000,
-          'y': 1187
-        },
-        {
-          'x': 1413553800000,
-          'y': 1119
-        },
-        {
-          'x': 1413554400000,
-          'y': 1159
-        },
-        {
-          'x': 1413555000000,
-          'y': 1117
-        },
-        {
-          'x': 1413555600000,
-          'y': 1152
-        },
-        {
-          'x': 1413556200000,
-          'y': 1057
-        },
-        {
-          'x': 1413556800000,
-          'y': 1009
-        },
-        {
-          'x': 1413557400000,
-          'y': 979
-        },
-        {
-          'x': 1413558000000,
-          'y': 975
-        },
-        {
-          'x': 1413558600000,
-          'y': 848
-        },
-        {
-          'x': 1413559200000,
-          'y': 873
-        },
-        {
-          'x': 1413559800000,
-          'y': 808
-        },
-        {
-          'x': 1413560400000,
-          'y': 784
-        },
-        {
-          'x': 1413561000000,
-          'y': 799
-        },
-        {
-          'x': 1413561600000,
-          'y': 684
-        },
-        {
-          'x': 1413562200000,
-          'y': 727
-        },
-        {
-          'x': 1413562800000,
-          'y': 621
-        },
-        {
-          'x': 1413563400000,
-          'y': 615
-        },
-        {
-          'x': 1413564000000,
-          'y': 569
-        },
-        {
-          'x': 1413564600000,
-          'y': 523
-        },
-        {
-          'x': 1413565200000,
-          'y': 474
-        },
-        {
-          'x': 1413565800000,
-          'y': 470
-        },
-        {
-          'x': 1413566400000,
-          'y': 466
-        },
-        {
-          'x': 1413567000000,
-          'y': 394
-        },
-        {
-          'x': 1413567600000,
-          'y': 404
-        },
-        {
-          'x': 1413568200000,
-          'y': 389
-        },
-        {
-          'x': 1413568800000,
-          'y': 312
-        },
-        {
-          'x': 1413569400000,
-          'y': 274
-        },
-        {
-          'x': 1413570000000,
-          'y': 285
-        },
-        {
-          'x': 1413570600000,
-          'y': 299
-        },
-        {
-          'x': 1413571200000,
-          'y': 207
-        },
-        {
-          'x': 1413571800000,
-          'y': 213
-        },
-        {
-          'x': 1413572400000,
-          'y': 119
-        },
-        {
-          'x': 1413573600000,
-          'y': 122
-        },
-        {
-          'x': 1413574200000,
-          'y': 169
-        },
-        {
-          'x': 1413574800000,
-          'y': 151
-        },
-        {
-          'x': 1413575400000,
-          'y': 152
-        },
-        {
-          'x': 1413576000000,
-          'y': 115
-        },
-        {
-          'x': 1413576600000,
-          'y': 117
-        },
-        {
-          'x': 1413577200000,
-          'y': 108
-        },
-        {
-          'x': 1413577800000,
-          'y': 100
-        },
-        {
-          'x': 1413578400000,
-          'y': 78
-        },
-        {
-          'x': 1413579000000,
-          'y': 88
-        },
-        {
-          'x': 1413579600000,
-          'y': 63
-        },
-        {
-          'x': 1413580200000,
-          'y': 58
-        },
-        {
-          'x': 1413580800000,
-          'y': 45
-        },
-        {
-          'x': 1413581400000,
-          'y': 57
-        },
-        {
-          'x': 1413582000000,
-          'y': 34
-        },
-        {
-          'x': 1413582600000,
-          'y': 41
-        },
-        {
-          'x': 1413583200000,
-          'y': 24
-        },
-        {
-          'x': 1413583800000,
-          'y': 27
-        },
-        {
-          'x': 1413584400000,
-          'y': 19
-        },
-        {
-          'x': 1413585000000,
-          'y': 24
-        },
-        {
-          'x': 1413585600000,
-          'y': 18
-        },
-        {
-          'x': 1413586200000,
-          'y': 17
-        },
-        {
-          'x': 1413586800000,
-          'y': 14
-        }
-      ]
-    },
-    {
-      'label': 'php',
-      'values': [
-        {
-          'x': 1413543600000,
-          'y': 90
-        },
-        {
-          'x': 1413544200000,
-          'y': 949
-        },
-        {
-          'x': 1413544800000,
-          'y': 1012
-        },
-        {
-          'x': 1413545400000,
-          'y': 1027
-        },
-        {
-          'x': 1413546000000,
-          'y': 1073
-        },
-        {
-          'x': 1413546600000,
-          'y': 992
-        },
-        {
-          'x': 1413547200000,
-          'y': 1005
-        },
-        {
-          'x': 1413547800000,
-          'y': 1014
-        },
-        {
-          'x': 1413548400000,
-          'y': 987
-        },
-        {
-          'x': 1413549000000,
-          'y': 982
-        },
-        {
-          'x': 1413549600000,
-          'y': 1086
-        },
-        {
-          'x': 1413550200000,
-          'y': 998
-        },
-        {
-          'x': 1413550800000,
-          'y': 935
-        },
-        {
-          'x': 1413551400000,
-          'y': 995
-        },
-        {
-          'x': 1413552000000,
-          'y': 926
-        },
-        {
-          'x': 1413552600000,
-          'y': 897
-        },
-        {
-          'x': 1413553200000,
-          'y': 873
-        },
-        {
-          'x': 1413553800000,
-          'y': 885
-        },
-        {
-          'x': 1413554400000,
-          'y': 859
-        },
-        {
-          'x': 1413555000000,
-          'y': 852
-        },
-        {
-          'x': 1413555600000,
-          'y': 779
-        },
-        {
-          'x': 1413556200000,
-          'y': 739
-        },
-        {
-          'x': 1413556800000,
-          'y': 783
-        },
-        {
-          'x': 1413557400000,
-          'y': 784
-        },
-        {
-          'x': 1413558000000,
-          'y': 687
-        },
-        {
-          'x': 1413558600000,
-          'y': 660
-        },
-        {
-          'x': 1413559200000,
-          'y': 672
-        },
-        {
-          'x': 1413559800000,
-          'y': 600
-        },
-        {
-          'x': 1413560400000,
-          'y': 659
-        },
-        {
-          'x': 1413561000000,
-          'y': 540
-        },
-        {
-          'x': 1413561600000,
-          'y': 539
-        },
-        {
-          'x': 1413562200000,
-          'y': 481
-        },
-        {
-          'x': 1413562800000,
-          'y': 498
-        },
-        {
-          'x': 1413563400000,
-          'y': 444
-        },
-        {
-          'x': 1413564000000,
-          'y': 452
-        },
-        {
-          'x': 1413564600000,
-          'y': 408
-        },
-        {
-          'x': 1413565200000,
-          'y': 358
-        },
-        {
-          'x': 1413565800000,
-          'y': 321
-        },
-        {
-          'x': 1413566400000,
-          'y': 305
-        },
-        {
-          'x': 1413567000000,
-          'y': 292
-        },
-        {
-          'x': 1413567600000,
-          'y': 289
-        },
-        {
-          'x': 1413568200000,
-          'y': 239
-        },
-        {
-          'x': 1413568800000,
-          'y': 256
-        },
-        {
-          'x': 1413569400000,
-          'y': 220
-        },
-        {
-          'x': 1413570000000,
-          'y': 205
-        },
-        {
-          'x': 1413570600000,
-          'y': 201
-        },
-        {
-          'x': 1413571200000,
-          'y': 183
-        },
-        {
-          'x': 1413571800000,
-          'y': 172
-        },
-        {
-          'x': 1413572400000,
-          'y': 73
-        },
-        {
-          'x': 1413573600000,
-          'y': 90
-        },
-        {
-          'x': 1413574200000,
-          'y': 130
-        },
-        {
-          'x': 1413574800000,
-          'y': 104
-        },
-        {
-          'x': 1413575400000,
-          'y': 108
-        },
-        {
-          'x': 1413576000000,
-          'y': 92
-        },
-        {
-          'x': 1413576600000,
-          'y': 79
-        },
-        {
-          'x': 1413577200000,
-          'y': 90
-        },
-        {
-          'x': 1413577800000,
-          'y': 72
-        },
-        {
-          'x': 1413578400000,
-          'y': 68
-        },
-        {
-          'x': 1413579000000,
-          'y': 52
-        },
-        {
-          'x': 1413579600000,
-          'y': 60
-        },
-        {
-          'x': 1413580200000,
-          'y': 51
-        },
-        {
-          'x': 1413580800000,
-          'y': 32
-        },
-        {
-          'x': 1413581400000,
-          'y': 37
-        },
-        {
-          'x': 1413582000000,
-          'y': 30
-        },
-        {
-          'x': 1413582600000,
-          'y': 29
-        },
-        {
-          'x': 1413583200000,
-          'y': 24
-        },
-        {
-          'x': 1413583800000,
-          'y': 16
-        },
-        {
-          'x': 1413584400000,
-          'y': 15
-        },
-        {
-          'x': 1413585000000,
-          'y': 15
-        },
-        {
-          'x': 1413585600000,
-          'y': 10
-        },
-        {
-          'x': 1413586200000,
-          'y': 9
-        },
-        {
-          'x': 1413586800000,
-          'y': 9
-        }
-      ]
-    },
-    {
-      'label': 'png',
-      'values': [
-        {
-          'x': 1413543600000,
-          'y': 44
-        },
-        {
-          'x': 1413544200000,
-          'y': 495
-        },
-        {
-          'x': 1413544800000,
-          'y': 489
-        },
-        {
-          'x': 1413545400000,
-          'y': 492
-        },
-        {
-          'x': 1413546000000,
-          'y': 556
-        },
-        {
-          'x': 1413546600000,
-          'y': 536
-        },
-        {
-          'x': 1413547200000,
-          'y': 511
-        },
-        {
-          'x': 1413547800000,
-          'y': 479
-        },
-        {
-          'x': 1413548400000,
-          'y': 544
-        },
-        {
-          'x': 1413549000000,
-          'y': 513
-        },
-        {
-          'x': 1413549600000,
-          'y': 501
-        },
-        {
-          'x': 1413550200000,
-          'y': 532
-        },
-        {
-          'x': 1413550800000,
-          'y': 440
-        },
-        {
-          'x': 1413551400000,
-          'y': 455
-        },
-        {
-          'x': 1413552000000,
-          'y': 455
-        },
-        {
-          'x': 1413552600000,
-          'y': 471
-        },
-        {
-          'x': 1413553200000,
-          'y': 428
-        },
-        {
-          'x': 1413553800000,
-          'y': 457
-        },
-        {
-          'x': 1413554400000,
-          'y': 450
-        },
-        {
-          'x': 1413555000000,
-          'y': 418
-        },
-        {
-          'x': 1413555600000,
-          'y': 398
-        },
-        {
-          'x': 1413556200000,
-          'y': 397
-        },
-        {
-          'x': 1413556800000,
-          'y': 359
-        },
-        {
-          'x': 1413557400000,
-          'y': 398
-        },
-        {
-          'x': 1413558000000,
-          'y': 339
-        },
-        {
-          'x': 1413558600000,
-          'y': 363
-        },
-        {
-          'x': 1413559200000,
-          'y': 297
-        },
-        {
-          'x': 1413559800000,
-          'y': 323
-        },
-        {
-          'x': 1413560400000,
-          'y': 302
-        },
-        {
-          'x': 1413561000000,
-          'y': 260
-        },
-        {
-          'x': 1413561600000,
-          'y': 276
-        },
-        {
-          'x': 1413562200000,
-          'y': 249
-        },
-        {
-          'x': 1413562800000,
-          'y': 248
-        },
-        {
-          'x': 1413563400000,
-          'y': 235
-        },
-        {
-          'x': 1413564000000,
-          'y': 234
-        },
-        {
-          'x': 1413564600000,
-          'y': 188
-        },
-        {
-          'x': 1413565200000,
-          'y': 192
-        },
-        {
-          'x': 1413565800000,
-          'y': 173
-        },
-        {
-          'x': 1413566400000,
-          'y': 160
-        },
-        {
-          'x': 1413567000000,
-          'y': 137
-        },
-        {
-          'x': 1413567600000,
-          'y': 158
-        },
-        {
-          'x': 1413568200000,
-          'y': 111
-        },
-        {
-          'x': 1413568800000,
-          'y': 145
-        },
-        {
-          'x': 1413569400000,
-          'y': 118
-        },
-        {
-          'x': 1413570000000,
-          'y': 104
-        },
-        {
-          'x': 1413570600000,
-          'y': 80
-        },
-        {
-          'x': 1413571200000,
-          'y': 79
-        },
-        {
-          'x': 1413571800000,
-          'y': 86
-        },
-        {
-          'x': 1413572400000,
-          'y': 47
-        },
-        {
-          'x': 1413573600000,
-          'y': 49
-        },
-        {
-          'x': 1413574200000,
-          'y': 68
-        },
-        {
-          'x': 1413574800000,
-          'y': 78
-        },
-        {
-          'x': 1413575400000,
-          'y': 77
-        },
-        {
-          'x': 1413576000000,
-          'y': 50
-        },
-        {
-          'x': 1413576600000,
-          'y': 51
-        },
-        {
-          'x': 1413577200000,
-          'y': 40
-        },
-        {
-          'x': 1413577800000,
-          'y': 42
-        },
-        {
-          'x': 1413578400000,
-          'y': 29
-        },
-        {
-          'x': 1413579000000,
-          'y': 24
-        },
-        {
-          'x': 1413579600000,
-          'y': 30
-        },
-        {
-          'x': 1413580200000,
-          'y': 18
-        },
-        {
-          'x': 1413580800000,
-          'y': 15
-        },
-        {
-          'x': 1413581400000,
-          'y': 19
-        },
-        {
-          'x': 1413582000000,
-          'y': 18
-        },
-        {
-          'x': 1413582600000,
-          'y': 13
-        },
-        {
-          'x': 1413583200000,
-          'y': 11
-        },
-        {
-          'x': 1413583800000,
-          'y': 11
-        },
-        {
-          'x': 1413584400000,
-          'y': 13
-        },
-        {
-          'x': 1413585000000,
-          'y': 9
-        },
-        {
-          'x': 1413585600000,
-          'y': 9
-        },
-        {
-          'x': 1413586200000,
-          'y': 9
-        },
-        {
-          'x': 1413586800000,
-          'y': 3
-        }
-      ]
-    },
-    {
-      'label': 'css',
-      'values': [
-        {
-          'x': 1413543600000,
-          'y': 35
-        },
-        {
-          'x': 1413544200000,
-          'y': 360
-        },
-        {
-          'x': 1413544800000,
-          'y': 343
-        },
-        {
-          'x': 1413545400000,
-          'y': 329
-        },
-        {
-          'x': 1413546000000,
-          'y': 345
-        },
-        {
-          'x': 1413546600000,
-          'y': 336
-        },
-        {
-          'x': 1413547200000,
-          'y': 330
-        },
-        {
-          'x': 1413547800000,
-          'y': 334
-        },
-        {
-          'x': 1413548400000,
-          'y': 326
-        },
-        {
-          'x': 1413549000000,
-          'y': 351
-        },
-        {
-          'x': 1413549600000,
-          'y': 334
-        },
-        {
-          'x': 1413550200000,
-          'y': 351
-        },
-        {
-          'x': 1413550800000,
-          'y': 337
-        },
-        {
-          'x': 1413551400000,
-          'y': 306
-        },
-        {
-          'x': 1413552000000,
-          'y': 346
-        },
-        {
-          'x': 1413552600000,
-          'y': 317
-        },
-        {
-          'x': 1413553200000,
-          'y': 298
-        },
-        {
-          'x': 1413553800000,
-          'y': 288
-        },
-        {
-          'x': 1413554400000,
-          'y': 283
-        },
-        {
-          'x': 1413555000000,
-          'y': 262
-        },
-        {
-          'x': 1413555600000,
-          'y': 245
-        },
-        {
-          'x': 1413556200000,
-          'y': 259
-        },
-        {
-          'x': 1413556800000,
-          'y': 267
-        },
-        {
-          'x': 1413557400000,
-          'y': 230
-        },
-        {
-          'x': 1413558000000,
-          'y': 218
-        },
-        {
-          'x': 1413558600000,
-          'y': 241
-        },
-        {
-          'x': 1413559200000,
-          'y': 213
-        },
-        {
-          'x': 1413559800000,
-          'y': 239
-        },
-        {
-          'x': 1413560400000,
-          'y': 208
-        },
-        {
-          'x': 1413561000000,
-          'y': 187
-        },
-        {
-          'x': 1413561600000,
-          'y': 166
-        },
-        {
-          'x': 1413562200000,
-          'y': 154
-        },
-        {
-          'x': 1413562800000,
-          'y': 184
-        },
-        {
-          'x': 1413563400000,
-          'y': 148
-        },
-        {
-          'x': 1413564000000,
-          'y': 153
-        },
-        {
-          'x': 1413564600000,
-          'y': 149
-        },
-        {
-          'x': 1413565200000,
-          'y': 102
-        },
-        {
-          'x': 1413565800000,
-          'y': 110
-        },
-        {
-          'x': 1413566400000,
-          'y': 121
-        },
-        {
-          'x': 1413567000000,
-          'y': 120
-        },
-        {
-          'x': 1413567600000,
-          'y': 86
-        },
-        {
-          'x': 1413568200000,
-          'y': 96
-        },
-        {
-          'x': 1413568800000,
-          'y': 71
-        },
-        {
-          'x': 1413569400000,
-          'y': 92
-        },
-        {
-          'x': 1413570000000,
-          'y': 65
-        },
-        {
-          'x': 1413570600000,
-          'y': 54
-        },
-        {
-          'x': 1413571200000,
-          'y': 68
-        },
-        {
-          'x': 1413571800000,
-          'y': 57
-        },
-        {
-          'x': 1413572400000,
-          'y': 33
-        },
-        {
-          'x': 1413573600000,
-          'y': 47
-        },
-        {
-          'x': 1413574200000,
-          'y': 42
-        },
-        {
-          'x': 1413574800000,
-          'y': 39
-        },
-        {
-          'x': 1413575400000,
-          'y': 25
-        },
-        {
-          'x': 1413576000000,
-          'y': 31
-        },
-        {
-          'x': 1413576600000,
-          'y': 37
-        },
-        {
-          'x': 1413577200000,
-          'y': 35
-        },
-        {
-          'x': 1413577800000,
-          'y': 19
-        },
-        {
-          'x': 1413578400000,
-          'y': 15
-        },
-        {
-          'x': 1413579000000,
-          'y': 21
-        },
-        {
-          'x': 1413579600000,
-          'y': 16
-        },
-        {
-          'x': 1413580200000,
-          'y': 18
-        },
-        {
-          'x': 1413580800000,
-          'y': 10
-        },
-        {
-          'x': 1413581400000,
-          'y': 13
-        },
-        {
-          'x': 1413582000000,
-          'y': 14
-        },
-        {
-          'x': 1413582600000,
-          'y': 11
-        },
-        {
-          'x': 1413583200000,
-          'y': 4
-        },
-        {
-          'x': 1413583800000,
-          'y': 6
-        },
-        {
-          'x': 1413584400000,
-          'y': 3
-        },
-        {
-          'x': 1413585000000,
-          'y': 6
-        },
-        {
-          'x': 1413585600000,
-          'y': 6
-        },
-        {
-          'x': 1413586200000,
-          'y': 2
-        },
-        {
-          'x': 1413586800000,
-          'y': 3
-        }
-      ]
-    },
-    {
-      'label': 'gif',
-      'values': [
-        {
-          'x': 1413543600000,
-          'y': 21
-        },
-        {
-          'x': 1413544200000,
-          'y': 191
-        },
-        {
-          'x': 1413544800000,
-          'y': 176
-        },
-        {
-          'x': 1413545400000,
-          'y': 166
-        },
-        {
-          'x': 1413546000000,
-          'y': 183
-        },
-        {
-          'x': 1413546600000,
-          'y': 170
-        },
-        {
-          'x': 1413547200000,
-          'y': 153
-        },
-        {
-          'x': 1413547800000,
-          'y': 202
-        },
-        {
-          'x': 1413548400000,
-          'y': 175
-        },
-        {
-          'x': 1413549000000,
-          'y': 161
-        },
-        {
-          'x': 1413549600000,
-          'y': 174
-        },
-        {
-          'x': 1413550200000,
-          'y': 167
-        },
-        {
-          'x': 1413550800000,
-          'y': 171
-        },
-        {
-          'x': 1413551400000,
-          'y': 176
-        },
-        {
-          'x': 1413552000000,
-          'y': 139
-        },
-        {
-          'x': 1413552600000,
-          'y': 145
-        },
-        {
-          'x': 1413553200000,
-          'y': 157
-        },
-        {
-          'x': 1413553800000,
-          'y': 148
-        },
-        {
-          'x': 1413554400000,
-          'y': 149
-        },
-        {
-          'x': 1413555000000,
-          'y': 135
-        },
-        {
-          'x': 1413555600000,
-          'y': 118
-        },
-        {
-          'x': 1413556200000,
-          'y': 142
-        },
-        {
-          'x': 1413556800000,
-          'y': 141
-        },
-        {
-          'x': 1413557400000,
-          'y': 146
-        },
-        {
-          'x': 1413558000000,
-          'y': 114
-        },
-        {
-          'x': 1413558600000,
-          'y': 115
-        },
-        {
-          'x': 1413559200000,
-          'y': 136
-        },
-        {
-          'x': 1413559800000,
-          'y': 106
-        },
-        {
-          'x': 1413560400000,
-          'y': 92
-        },
-        {
-          'x': 1413561000000,
-          'y': 97
-        },
-        {
-          'x': 1413561600000,
-          'y': 90
-        },
-        {
-          'x': 1413562200000,
-          'y': 69
-        },
-        {
-          'x': 1413562800000,
-          'y': 66
-        },
-        {
-          'x': 1413563400000,
-          'y': 93
-        },
-        {
-          'x': 1413564000000,
-          'y': 75
-        },
-        {
-          'x': 1413564600000,
-          'y': 68
-        },
-        {
-          'x': 1413565200000,
-          'y': 55
-        },
-        {
-          'x': 1413565800000,
-          'y': 73
-        },
-        {
-          'x': 1413566400000,
-          'y': 57
-        },
-        {
-          'x': 1413567000000,
-          'y': 48
-        },
-        {
-          'x': 1413567600000,
-          'y': 41
-        },
-        {
-          'x': 1413568200000,
-          'y': 39
-        },
-        {
-          'x': 1413568800000,
-          'y': 32
-        },
-        {
-          'x': 1413569400000,
-          'y': 33
-        },
-        {
-          'x': 1413570000000,
-          'y': 39
-        },
-        {
-          'x': 1413570600000,
-          'y': 35
-        },
-        {
-          'x': 1413571200000,
-          'y': 25
-        },
-        {
-          'x': 1413571800000,
-          'y': 28
-        },
-        {
-          'x': 1413572400000,
-          'y': 8
-        },
-        {
-          'x': 1413573600000,
-          'y': 13
-        },
-        {
-          'x': 1413574200000,
-          'y': 23
-        },
-        {
-          'x': 1413574800000,
-          'y': 19
-        },
-        {
-          'x': 1413575400000,
-          'y': 16
-        },
-        {
-          'x': 1413576000000,
-          'y': 22
-        },
-        {
-          'x': 1413576600000,
-          'y': 13
-        },
-        {
-          'x': 1413577200000,
-          'y': 21
-        },
-        {
-          'x': 1413577800000,
-          'y': 11
-        },
-        {
-          'x': 1413578400000,
-          'y': 12
-        },
-        {
-          'x': 1413579000000,
-          'y': 10
-        },
-        {
-          'x': 1413579600000,
-          'y': 7
-        },
-        {
-          'x': 1413580200000,
-          'y': 4
-        },
-        {
-          'x': 1413580800000,
-          'y': 5
-        },
-        {
-          'x': 1413581400000,
-          'y': 7
-        },
-        {
-          'x': 1413582000000,
-          'y': 9
-        },
-        {
-          'x': 1413582600000,
-          'y': 2
-        },
-        {
-          'x': 1413583200000,
-          'y': 2
-        },
-        {
-          'x': 1413583800000,
-          'y': 4
-        },
-        {
-          'x': 1413584400000,
-          'y': 6
-        },
-        {
-          'x': 1413585600000,
-          'y': 2
-        },
-        {
-          'x': 1413586200000,
-          'y': 4
-        },
-        {
-          'x': 1413586800000,
-          'y': 4
-        }
-      ]
-    }
-  ],
-  'hits': 108970,
-  'xAxisOrderedValues': [
-    1413543600000,
-    1413544200000,
-    1413544800000,
-    1413545400000,
-    1413546000000,
-    1413546600000,
-    1413547200000,
-    1413547800000,
-    1413548400000,
-    1413549000000,
-    1413549600000,
-    1413550200000,
-    1413550800000,
-    1413551400000,
-    1413552000000,
-    1413552600000,
-    1413553200000,
-    1413553800000,
-    1413554400000,
-    1413555000000,
-    1413555600000,
-    1413556200000,
-    1413556800000,
-    1413557400000,
-    1413558000000,
-    1413558600000,
-    1413559200000,
-    1413559800000,
-    1413560400000,
-    1413561000000,
-    1413561600000,
-    1413562200000,
-    1413562800000,
-    1413563400000,
-    1413564000000,
-    1413564600000,
-    1413565200000,
-    1413565800000,
-    1413566400000,
-    1413567000000,
-    1413567600000,
-    1413568200000,
-    1413568800000,
-    1413569400000,
-    1413570000000,
-    1413570600000,
-    1413571200000,
-    1413571800000,
-    1413572400000,
-    1413573600000,
-    1413574200000,
-    1413574800000,
-    1413575400000,
-    1413576000000,
-    1413576600000,
-    1413577200000,
-    1413577800000,
-    1413578400000,
-    1413579000000,
-    1413579600000,
-    1413580200000,
-    1413580800000,
-    1413581400000,
-    1413582000000,
-    1413582600000,
-    1413583200000,
-    1413583800000,
-    1413584400000,
-    1413585000000,
-    1413585600000,
-    1413586200000,
-    1413586800000,
-  ],
-  'xAxisFormatter': function (thing) {
-    return moment(thing);
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_columns.js
deleted file mode 100644
index 041fad2ed15b9c..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_columns.js
+++ /dev/null
@@ -1,112 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'columns': [
-    {
-      'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
-      'xAxisLabel': 'filters',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'css',
-              'y': 10379
-            },
-            {
-              'x': 'png',
-              'y': 6395
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['css', 'png'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
-      'xAxisLabel': 'filters',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'css',
-              'y': 9253
-            },
-            {
-              'x': 'png',
-              'y': 5571
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['css', 'png'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
-      'xAxisLabel': 'filters',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'css',
-              'y': 7740
-            },
-            {
-              'x': 'png',
-              'y': 4697
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['css', 'png'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'hits': 171443
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_rows.js
deleted file mode 100644
index cc4f598c7b1b7f..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_rows.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'rows': [
-    {
-      'label': '200: response',
-      'xAxisLabel': 'filters',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'css',
-              'y': 25260
-            },
-            {
-              'x': 'png',
-              'y': 15311
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '404: response',
-      'xAxisLabel': 'filters',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'css',
-              'y': 1352
-            },
-            {
-              'x': 'png',
-              'y': 826
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '503: response',
-      'xAxisLabel': 'filters',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'css',
-              'y': 761
-            },
-            {
-              'x': 'png',
-              'y': 527
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'hits': 171443
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_series.js
deleted file mode 100644
index 2a2d14d59b67ea..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/filters/_series.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'xAxisLabel': 'filters',
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 'css',
-          'y': 27374
-        },
-        {
-          'x': 'html',
-          'y': 0
-        },
-        {
-          'x': 'png',
-          'y': 16663
-        }
-      ]
-    }
-  ],
-  'hits': 171454,
-  'xAxisOrderedValues': ['css', 'html', 'png'],
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_columns.js
deleted file mode 100644
index d283d793151772..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_columns.js
+++ /dev/null
@@ -1,3745 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'columns': [
-      {
-        'title': 'Top 2 geo.dest: CN',
-        'valueFormatter': _.identity,
-        'geoJson': {
-          'type': 'FeatureCollection',
-          'features': [
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 42,
-                'geohash': 's',
-                'center': [
-                  22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 's',
-                    'value': 's',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 42,
-                  'value': 42,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 31,
-                'geohash': 'd',
-                'center': [
-                  -67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'd',
-                    'value': 'd',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 31,
-                  'value': 31,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 30,
-                'geohash': 'w',
-                'center': [
-                  112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'w',
-                    'value': 'w',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 30,
-                  'value': 30,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 25,
-                'geohash': '9',
-                'center': [
-                  -112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '9',
-                    'value': '9',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 25,
-                  'value': 25,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 22,
-                'geohash': 't',
-                'center': [
-                  67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 't',
-                    'value': 't',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 22,
-                  'value': 22,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 22,
-                'geohash': 'k',
-                'center': [
-                  22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'k',
-                    'value': 'k',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 22,
-                  'value': 22,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 21,
-                'geohash': '6',
-                'center': [
-                  -67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '6',
-                    'value': '6',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 21,
-                  'value': 21,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -45
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 19,
-                'geohash': 'u',
-                'center': [
-                  22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'u',
-                    'value': 'u',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 19,
-                  'value': 19,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    45,
-                    90
-                  ],
-                  [
-                    0,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 18,
-                'geohash': 'v',
-                'center': [
-                  67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'v',
-                    'value': 'v',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 18,
-                  'value': 18,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    90,
-                    90
-                  ],
-                  [
-                    45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 11,
-                'geohash': 'c',
-                'center': [
-                  -112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'c',
-                    'value': 'c',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 11,
-                  'value': 11,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -90,
-                    90
-                  ],
-                  [
-                    -135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 10,
-                'geohash': 'r',
-                'center': [
-                  157.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'r',
-                    'value': 'r',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 10,
-                  'value': 10,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    180,
-                    -45
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 9,
-                'geohash': 'y',
-                'center': [
-                  112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'y',
-                    'value': 'y',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 9,
-                  'value': 9,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    135,
-                    90
-                  ],
-                  [
-                    90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 9,
-                'geohash': 'e',
-                'center': [
-                  -22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'e',
-                    'value': 'e',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 9,
-                  'value': 9,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 8,
-                'geohash': 'f',
-                'center': [
-                  -67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'f',
-                    'value': 'f',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 8,
-                  'value': 8,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -45,
-                    90
-                  ],
-                  [
-                    -90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 8,
-                'geohash': '7',
-                'center': [
-                  -22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '7',
-                    'value': '7',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 8,
-                  'value': 8,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'q',
-                'center': [
-                  112.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'q',
-                    'value': 'q',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'g',
-                'center': [
-                  -22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'g',
-                    'value': 'g',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    0,
-                    90
-                  ],
-                  [
-                    -45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 4,
-                'geohash': 'x',
-                'center': [
-                  157.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'x',
-                    'value': 'x',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 4,
-                  'value': 4,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 3,
-                'geohash': 'b',
-                'center': [
-                  -157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'b',
-                    'value': 'b',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 3,
-                  'value': 3,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -180,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -135,
-                    90
-                  ],
-                  [
-                    -180,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 2,
-                'geohash': 'z',
-                'center': [
-                  157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'z',
-                    'value': 'z',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 2,
-                  'value': 2,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    180,
-                    90
-                  ],
-                  [
-                    135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'm',
-                'center': [
-                  67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'm',
-                    'value': 'm',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '5',
-                'center': [
-                  -22.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '5',
-                    'value': '5',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    -90
-                  ],
-                  [
-                    0,
-                    -90
-                  ],
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    -45,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '4',
-                'center': [
-                  -67.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '4',
-                    'value': '4',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -90,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '3',
-                'center': [
-                  -112.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'CN',
-                      'value': 'CN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '3',
-                    'value': '3',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    -45
-                  ],
-                  [
-                    -90,
-                    -45
-                  ],
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -135,
-                    0
-                  ]
-                ]
-              }
-            }
-          ],
-          'properties': {
-            'min': 1,
-            'max': 42
-          }
-        }
-      },
-      {
-        'label': 'Top 2 geo.dest: IN',
-        'valueFormatter': _.identity,
-        'geoJson': {
-          'type': 'FeatureCollection',
-          'features': [
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 32,
-                'geohash': 's',
-                'center': [
-                  22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 's',
-                    'value': 's',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 32,
-                  'value': 32,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 31,
-                'geohash': '6',
-                'center': [
-                  -67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '6',
-                    'value': '6',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 31,
-                  'value': 31,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -45
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 28,
-                'geohash': 'd',
-                'center': [
-                  -67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'd',
-                    'value': 'd',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 28,
-                  'value': 28,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 27,
-                'geohash': 'w',
-                'center': [
-                  112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'w',
-                    'value': 'w',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 27,
-                  'value': 27,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 24,
-                'geohash': 't',
-                'center': [
-                  67.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 't',
-                    'value': 't',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 24,
-                  'value': 24,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 23,
-                'geohash': 'k',
-                'center': [
-                  22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'k',
-                    'value': 'k',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 23,
-                  'value': 23,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 17,
-                'geohash': 'u',
-                'center': [
-                  22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'u',
-                    'value': 'u',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 17,
-                  'value': 17,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    45,
-                    90
-                  ],
-                  [
-                    0,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 16,
-                'geohash': '9',
-                'center': [
-                  -112.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '9',
-                    'value': '9',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 16,
-                  'value': 16,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    0
-                  ],
-                  [
-                    -90,
-                    0
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 14,
-                'geohash': 'v',
-                'center': [
-                  67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'v',
-                    'value': 'v',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 14,
-                  'value': 14,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    45
-                  ],
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    90,
-                    90
-                  ],
-                  [
-                    45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 13,
-                'geohash': 'e',
-                'center': [
-                  -22.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'e',
-                    'value': 'e',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 13,
-                  'value': 13,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    0
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 9,
-                'geohash': 'r',
-                'center': [
-                  157.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'r',
-                    'value': 'r',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 9,
-                  'value': 9,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    180,
-                    -45
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    135,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'y',
-                'center': [
-                  112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'y',
-                    'value': 'y',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    135,
-                    90
-                  ],
-                  [
-                    90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'g',
-                'center': [
-                  -22.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'g',
-                    'value': 'g',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    0,
-                    45
-                  ],
-                  [
-                    0,
-                    90
-                  ],
-                  [
-                    -45,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 6,
-                'geohash': 'f',
-                'center': [
-                  -67.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'f',
-                    'value': 'f',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 6,
-                  'value': 6,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -45,
-                    45
-                  ],
-                  [
-                    -45,
-                    90
-                  ],
-                  [
-                    -90,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -112.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 5,
-                'geohash': 'c',
-                'center': [
-                  -112.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'c',
-                    'value': 'c',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 5,
-                  'value': 5,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -90,
-                    45
-                  ],
-                  [
-                    -90,
-                    90
-                  ],
-                  [
-                    -135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 4,
-                'geohash': 'b',
-                'center': [
-                  -157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'b',
-                    'value': 'b',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 4,
-                  'value': 4,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -180,
-                    45
-                  ],
-                  [
-                    -135,
-                    45
-                  ],
-                  [
-                    -135,
-                    90
-                  ],
-                  [
-                    -180,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  112.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 3,
-                'geohash': 'q',
-                'center': [
-                  112.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'q',
-                    'value': 'q',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 3,
-                  'value': 3,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    135,
-                    -45
-                  ],
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    90,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -67.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 2,
-                'geohash': '4',
-                'center': [
-                  -67.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '4',
-                    'value': '4',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 2,
-                  'value': 2,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -90,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -90
-                  ],
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    -90,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'z',
-                'center': [
-                  157.5,
-                  67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'z',
-                    'value': 'z',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    45
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    180,
-                    90
-                  ],
-                  [
-                    135,
-                    90
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'x',
-                'center': [
-                  157.5,
-                  22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'x',
-                    'value': 'x',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    0
-                  ],
-                  [
-                    180,
-                    0
-                  ],
-                  [
-                    180,
-                    45
-                  ],
-                  [
-                    135,
-                    45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  157.5,
-                  -67.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'p',
-                'center': [
-                  157.5,
-                  -67.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'p',
-                    'value': 'p',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    135,
-                    -90
-                  ],
-                  [
-                    180,
-                    -90
-                  ],
-                  [
-                    180,
-                    -45
-                  ],
-                  [
-                    135,
-                    -45
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  67.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': 'm',
-                'center': [
-                  67.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': 'm',
-                    'value': 'm',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    45,
-                    -45
-                  ],
-                  [
-                    90,
-                    -45
-                  ],
-                  [
-                    90,
-                    0
-                  ],
-                  [
-                    45,
-                    0
-                  ]
-                ]
-              }
-            },
-            {
-              'type': 'Feature',
-              'geometry': {
-                'type': 'Point',
-                'coordinates': [
-                  -22.5,
-                  -22.5
-                ]
-              },
-              'properties': {
-                'value': 1,
-                'geohash': '7',
-                'center': [
-                  -22.5,
-                  -22.5
-                ],
-                'aggConfigResult': {
-                  '$parent': {
-                    '$parent': {
-                      '$parent': null,
-                      'key': 'IN',
-                      'value': 'IN',
-                      'aggConfig': {
-                        'id': '3',
-                        'type': 'terms',
-                        'schema': 'split',
-                        'params': {
-                          'field': 'geo.dest',
-                          'size': 2,
-                          'order': 'desc',
-                          'orderBy': '1',
-                          'row': false
-                        }
-                      },
-                      'type': 'bucket'
-                    },
-                    'key': '7',
-                    'value': '7',
-                    'aggConfig': {
-                      'id': '2',
-                      'type': 'geohash_grid',
-                      'schema': 'segment',
-                      'params': {
-                        'field': 'geo.coordinates',
-                        'precision': 1
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 1,
-                  'value': 1,
-                  'aggConfig': {
-                    'id': '1',
-                    'type': 'count',
-                    'schema': 'metric',
-                    'params': {}
-                  },
-                  'type': 'metric'
-                },
-                'rectangle': [
-                  [
-                    -45,
-                    -45
-                  ],
-                  [
-                    0,
-                    -45
-                  ],
-                  [
-                    0,
-                    0
-                  ],
-                  [
-                    -45,
-                    0
-                  ]
-                ]
-              }
-            }
-          ],
-          'properties': {
-            'min': 1,
-            'max': 32
-          }
-        }
-      }
-    ]
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_geo_json.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_geo_json.js
deleted file mode 100644
index 4e65502f8d2788..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_geo_json.js
+++ /dev/null
@@ -1,1847 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'valueFormatter': _.identity,
-  'geohashGridAgg': { 'vis': { 'params': {} } },
-  'geoJson': {
-    'type': 'FeatureCollection',
-    'features': [
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            22.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 608,
-          'geohash': 's',
-          'center': [
-            22.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 's',
-              'value': 's',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 608,
-            'value': 608,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              0
-            ],
-            [
-              0,
-              45
-            ],
-            [
-              45,
-              45
-            ],
-            [
-              45,
-              0
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            112.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 522,
-          'geohash': 'w',
-          'center': [
-            112.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'w',
-              'value': 'w',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 522,
-            'value': 522,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              90
-            ],
-            [
-              0,
-              135
-            ],
-            [
-              45,
-              135
-            ],
-            [
-              45,
-              90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -67.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 517,
-          'geohash': '6',
-          'center': [
-            -67.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '6',
-              'value': '6',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 517,
-            'value': 517,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              -90
-            ],
-            [
-              -45,
-              -45
-            ],
-            [
-              0,
-              -45
-            ],
-            [
-              0,
-              -90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -67.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 446,
-          'geohash': 'd',
-          'center': [
-            -67.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'd',
-              'value': 'd',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 446,
-            'value': 446,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              -90
-            ],
-            [
-              0,
-              -45
-            ],
-            [
-              45,
-              -45
-            ],
-            [
-              45,
-              -90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            22.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 426,
-          'geohash': 'u',
-          'center': [
-            22.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'u',
-              'value': 'u',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 426,
-            'value': 426,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              0
-            ],
-            [
-              45,
-              45
-            ],
-            [
-              90,
-              45
-            ],
-            [
-              90,
-              0
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            67.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 413,
-          'geohash': 't',
-          'center': [
-            67.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 't',
-              'value': 't',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 413,
-            'value': 413,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              45
-            ],
-            [
-              0,
-              90
-            ],
-            [
-              45,
-              90
-            ],
-            [
-              45,
-              45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            22.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 362,
-          'geohash': 'k',
-          'center': [
-            22.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'k',
-              'value': 'k',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 362,
-            'value': 362,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              0
-            ],
-            [
-              -45,
-              45
-            ],
-            [
-              0,
-              45
-            ],
-            [
-              0,
-              0
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -112.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 352,
-          'geohash': '9',
-          'center': [
-            -112.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '9',
-              'value': '9',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 352,
-            'value': 352,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              -135
-            ],
-            [
-              0,
-              -90
-            ],
-            [
-              45,
-              -90
-            ],
-            [
-              45,
-              -135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -22.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 216,
-          'geohash': 'e',
-          'center': [
-            -22.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'e',
-              'value': 'e',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 216,
-            'value': 216,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              -45
-            ],
-            [
-              0,
-              0
-            ],
-            [
-              45,
-              0
-            ],
-            [
-              45,
-              -45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            67.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 183,
-          'geohash': 'v',
-          'center': [
-            67.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'v',
-              'value': 'v',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 183,
-            'value': 183,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              45
-            ],
-            [
-              45,
-              90
-            ],
-            [
-              90,
-              90
-            ],
-            [
-              90,
-              45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            157.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 158,
-          'geohash': 'r',
-          'center': [
-            157.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'r',
-              'value': 'r',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 158,
-            'value': 158,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              135
-            ],
-            [
-              -45,
-              180
-            ],
-            [
-              0,
-              180
-            ],
-            [
-              0,
-              135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            112.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 139,
-          'geohash': 'y',
-          'center': [
-            112.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'y',
-              'value': 'y',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 139,
-            'value': 139,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              90
-            ],
-            [
-              45,
-              135
-            ],
-            [
-              90,
-              135
-            ],
-            [
-              90,
-              90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -112.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 110,
-          'geohash': 'c',
-          'center': [
-            -112.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'c',
-              'value': 'c',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 110,
-            'value': 110,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              -135
-            ],
-            [
-              45,
-              -90
-            ],
-            [
-              90,
-              -90
-            ],
-            [
-              90,
-              -135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            112.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 101,
-          'geohash': 'q',
-          'center': [
-            112.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'q',
-              'value': 'q',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 101,
-            'value': 101,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              90
-            ],
-            [
-              -45,
-              135
-            ],
-            [
-              0,
-              135
-            ],
-            [
-              0,
-              90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -22.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 101,
-          'geohash': '7',
-          'center': [
-            -22.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '7',
-              'value': '7',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 101,
-            'value': 101,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              -45
-            ],
-            [
-              -45,
-              0
-            ],
-            [
-              0,
-              0
-            ],
-            [
-              0,
-              -45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -67.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 92,
-          'geohash': 'f',
-          'center': [
-            -67.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'f',
-              'value': 'f',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 92,
-            'value': 92,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              -90
-            ],
-            [
-              45,
-              -45
-            ],
-            [
-              90,
-              -45
-            ],
-            [
-              90,
-              -90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -157.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 75,
-          'geohash': 'b',
-          'center': [
-            -157.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'b',
-              'value': 'b',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 75,
-            'value': 75,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              -180
-            ],
-            [
-              45,
-              -135
-            ],
-            [
-              90,
-              -135
-            ],
-            [
-              90,
-              -180
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -22.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 64,
-          'geohash': 'g',
-          'center': [
-            -22.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'g',
-              'value': 'g',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 64,
-            'value': 64,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              -45
-            ],
-            [
-              45,
-              0
-            ],
-            [
-              90,
-              0
-            ],
-            [
-              90,
-              -45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            157.5,
-            67.5
-          ]
-        },
-        'properties': {
-          'value': 36,
-          'geohash': 'z',
-          'center': [
-            157.5,
-            67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'z',
-              'value': 'z',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 36,
-            'value': 36,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              45,
-              135
-            ],
-            [
-              45,
-              180
-            ],
-            [
-              90,
-              180
-            ],
-            [
-              90,
-              135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            157.5,
-            22.5
-          ]
-        },
-        'properties': {
-          'value': 34,
-          'geohash': 'x',
-          'center': [
-            157.5,
-            22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'x',
-              'value': 'x',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 34,
-            'value': 34,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              0,
-              135
-            ],
-            [
-              0,
-              180
-            ],
-            [
-              45,
-              180
-            ],
-            [
-              45,
-              135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -67.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 30,
-          'geohash': '4',
-          'center': [
-            -67.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '4',
-              'value': '4',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 30,
-            'value': 30,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              -90
-            ],
-            [
-              -90,
-              -45
-            ],
-            [
-              -45,
-              -45
-            ],
-            [
-              -45,
-              -90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            67.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 16,
-          'geohash': 'm',
-          'center': [
-            67.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'm',
-              'value': 'm',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 16,
-            'value': 16,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              45
-            ],
-            [
-              -45,
-              90
-            ],
-            [
-              0,
-              90
-            ],
-            [
-              0,
-              45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -22.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 10,
-          'geohash': '5',
-          'center': [
-            -22.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '5',
-              'value': '5',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 10,
-            'value': 10,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              -45
-            ],
-            [
-              -90,
-              0
-            ],
-            [
-              -45,
-              0
-            ],
-            [
-              -45,
-              -45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            157.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 6,
-          'geohash': 'p',
-          'center': [
-            157.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'p',
-              'value': 'p',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 6,
-            'value': 6,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              135
-            ],
-            [
-              -90,
-              180
-            ],
-            [
-              -45,
-              180
-            ],
-            [
-              -45,
-              135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -157.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 6,
-          'geohash': '2',
-          'center': [
-            -157.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '2',
-              'value': '2',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 6,
-            'value': 6,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              -180
-            ],
-            [
-              -45,
-              -135
-            ],
-            [
-              0,
-              -135
-            ],
-            [
-              0,
-              -180
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            22.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 4,
-          'geohash': 'h',
-          'center': [
-            22.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'h',
-              'value': 'h',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 4,
-            'value': 4,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              0
-            ],
-            [
-              -90,
-              45
-            ],
-            [
-              -45,
-              45
-            ],
-            [
-              -45,
-              0
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            112.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 2,
-          'geohash': 'n',
-          'center': [
-            112.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'n',
-              'value': 'n',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 2,
-            'value': 2,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              90
-            ],
-            [
-              -90,
-              135
-            ],
-            [
-              -45,
-              135
-            ],
-            [
-              -45,
-              90
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            67.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 2,
-          'geohash': 'j',
-          'center': [
-            67.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': 'j',
-              'value': 'j',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 2,
-            'value': 2,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              45
-            ],
-            [
-              -90,
-              90
-            ],
-            [
-              -45,
-              90
-            ],
-            [
-              -45,
-              45
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -112.5,
-            -22.5
-          ]
-        },
-        'properties': {
-          'value': 1,
-          'geohash': '3',
-          'center': [
-            -112.5,
-            -22.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '3',
-              'value': '3',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 1,
-            'value': 1,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -45,
-              -135
-            ],
-            [
-              -45,
-              -90
-            ],
-            [
-              0,
-              -90
-            ],
-            [
-              0,
-              -135
-            ]
-          ]
-        }
-      },
-      {
-        'type': 'Feature',
-        'geometry': {
-          'type': 'Point',
-          'coordinates': [
-            -112.5,
-            -67.5
-          ]
-        },
-        'properties': {
-          'value': 1,
-          'geohash': '1',
-          'center': [
-            -112.5,
-            -67.5
-          ],
-          'aggConfigResult': {
-            '$parent': {
-              'key': '1',
-              'value': '1',
-              'aggConfig': {
-                'id': '2',
-                'type': 'geohash_grid',
-                'schema': 'segment',
-                'params': {
-                  'field': 'geo.coordinates',
-                  'precision': 1
-                }
-              },
-              'type': 'bucket'
-            },
-            'key': 1,
-            'value': 1,
-            'aggConfig': {
-              'id': '1',
-              'type': 'count',
-              'schema': 'metric',
-              'params': {}
-            },
-            'type': 'metric'
-          },
-          'rectangle': [
-            [
-              -90,
-              -135
-            ],
-            [
-              -90,
-              -90
-            ],
-            [
-              -45,
-              -90
-            ],
-            [
-              -45,
-              -135
-            ]
-          ]
-        }
-      }
-    ],
-    'properties': {
-      'min': 1,
-      'max': 608,
-      'zoom': 2,
-      'center': [5, 15]
-    }
-  },
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_rows.js
deleted file mode 100644
index 64deea0e391a6e..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/geohash/_rows.js
+++ /dev/null
@@ -1,3667 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'rows': [
-    {
-      'title': 'Top 2 geo.dest: CN',
-      'valueFormatter': _.identity,
-      'geoJson': {
-        'type': 'FeatureCollection',
-        'features': [
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                22.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 39,
-              'geohash': 's',
-              'center': [
-                22.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 's',
-                  'value': 's',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 39,
-                'value': 39,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  0,
-                  0
-                ],
-                [
-                  45,
-                  0
-                ],
-                [
-                  45,
-                  45
-                ],
-                [
-                  0,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                112.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 31,
-              'geohash': 'w',
-              'center': [
-                112.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'w',
-                  'value': 'w',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 31,
-                'value': 31,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  90,
-                  0
-                ],
-                [
-                  135,
-                  0
-                ],
-                [
-                  135,
-                  45
-                ],
-                [
-                  90,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 30,
-              'geohash': 'd',
-              'center': [
-                -67.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'd',
-                  'value': 'd',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 30,
-                'value': 30,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  0
-                ],
-                [
-                  -45,
-                  0
-                ],
-                [
-                  -45,
-                  45
-                ],
-                [
-                  -90,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -112.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 25,
-              'geohash': '9',
-              'center': [
-                -112.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '9',
-                  'value': '9',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 25,
-                'value': 25,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -135,
-                  0
-                ],
-                [
-                  -90,
-                  0
-                ],
-                [
-                  -90,
-                  45
-                ],
-                [
-                  -135,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                67.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 23,
-              'geohash': 't',
-              'center': [
-                67.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 't',
-                  'value': 't',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 23,
-                'value': 23,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  45,
-                  0
-                ],
-                [
-                  90,
-                  0
-                ],
-                [
-                  90,
-                  45
-                ],
-                [
-                  45,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                22.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 23,
-              'geohash': 'k',
-              'center': [
-                22.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'k',
-                  'value': 'k',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 23,
-                'value': 23,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  0,
-                  -45
-                ],
-                [
-                  45,
-                  -45
-                ],
-                [
-                  45,
-                  0
-                ],
-                [
-                  0,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 22,
-              'geohash': '6',
-              'center': [
-                -67.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '6',
-                  'value': '6',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 22,
-                'value': 22,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  -45
-                ],
-                [
-                  -45,
-                  -45
-                ],
-                [
-                  -45,
-                  0
-                ],
-                [
-                  -90,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                22.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 20,
-              'geohash': 'u',
-              'center': [
-                22.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'u',
-                  'value': 'u',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 20,
-                'value': 20,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  0,
-                  45
-                ],
-                [
-                  45,
-                  45
-                ],
-                [
-                  45,
-                  90
-                ],
-                [
-                  0,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                67.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 18,
-              'geohash': 'v',
-              'center': [
-                67.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'v',
-                  'value': 'v',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 18,
-                'value': 18,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  45,
-                  45
-                ],
-                [
-                  90,
-                  45
-                ],
-                [
-                  90,
-                  90
-                ],
-                [
-                  45,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 11,
-              'geohash': 'r',
-              'center': [
-                157.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'r',
-                  'value': 'r',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 11,
-                'value': 11,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  -45
-                ],
-                [
-                  180,
-                  -45
-                ],
-                [
-                  180,
-                  0
-                ],
-                [
-                  135,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 11,
-              'geohash': 'e',
-              'center': [
-                -22.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'e',
-                  'value': 'e',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 11,
-                'value': 11,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  0
-                ],
-                [
-                  0,
-                  0
-                ],
-                [
-                  0,
-                  45
-                ],
-                [
-                  -45,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                112.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 10,
-              'geohash': 'y',
-              'center': [
-                112.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'y',
-                  'value': 'y',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 10,
-                'value': 10,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  90,
-                  45
-                ],
-                [
-                  135,
-                  45
-                ],
-                [
-                  135,
-                  90
-                ],
-                [
-                  90,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -112.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 10,
-              'geohash': 'c',
-              'center': [
-                -112.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'c',
-                  'value': 'c',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 10,
-                'value': 10,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -135,
-                  45
-                ],
-                [
-                  -90,
-                  45
-                ],
-                [
-                  -90,
-                  90
-                ],
-                [
-                  -135,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 8,
-              'geohash': 'f',
-              'center': [
-                -67.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'f',
-                  'value': 'f',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 8,
-                'value': 8,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  45
-                ],
-                [
-                  -45,
-                  45
-                ],
-                [
-                  -45,
-                  90
-                ],
-                [
-                  -90,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 8,
-              'geohash': '7',
-              'center': [
-                -22.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '7',
-                  'value': '7',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 8,
-                'value': 8,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  -45
-                ],
-                [
-                  0,
-                  -45
-                ],
-                [
-                  0,
-                  0
-                ],
-                [
-                  -45,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                112.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 6,
-              'geohash': 'q',
-              'center': [
-                112.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'q',
-                  'value': 'q',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 6,
-                'value': 6,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  90,
-                  -45
-                ],
-                [
-                  135,
-                  -45
-                ],
-                [
-                  135,
-                  0
-                ],
-                [
-                  90,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 6,
-              'geohash': 'g',
-              'center': [
-                -22.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'g',
-                  'value': 'g',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 6,
-                'value': 6,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  45
-                ],
-                [
-                  0,
-                  45
-                ],
-                [
-                  0,
-                  90
-                ],
-                [
-                  -45,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 4,
-              'geohash': 'x',
-              'center': [
-                157.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'x',
-                  'value': 'x',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 4,
-                'value': 4,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  0
-                ],
-                [
-                  180,
-                  0
-                ],
-                [
-                  180,
-                  45
-                ],
-                [
-                  135,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -157.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 3,
-              'geohash': 'b',
-              'center': [
-                -157.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'b',
-                  'value': 'b',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 3,
-                'value': 3,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -180,
-                  45
-                ],
-                [
-                  -135,
-                  45
-                ],
-                [
-                  -135,
-                  90
-                ],
-                [
-                  -180,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 2,
-              'geohash': 'z',
-              'center': [
-                157.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'z',
-                  'value': 'z',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 2,
-                'value': 2,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  45
-                ],
-                [
-                  180,
-                  45
-                ],
-                [
-                  180,
-                  90
-                ],
-                [
-                  135,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                -67.5
-              ]
-            },
-            'properties': {
-              'value': 2,
-              'geohash': '4',
-              'center': [
-                -67.5,
-                -67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '4',
-                  'value': '4',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 2,
-                'value': 2,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  -90
-                ],
-                [
-                  -45,
-                  -90
-                ],
-                [
-                  -45,
-                  -45
-                ],
-                [
-                  -90,
-                  -45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                -67.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': '5',
-              'center': [
-                -22.5,
-                -67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '5',
-                  'value': '5',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  -90
-                ],
-                [
-                  0,
-                  -90
-                ],
-                [
-                  0,
-                  -45
-                ],
-                [
-                  -45,
-                  -45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -112.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': '3',
-              'center': [
-                -112.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'CN',
-                    'value': 'CN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '3',
-                  'value': '3',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -135,
-                  -45
-                ],
-                [
-                  -90,
-                  -45
-                ],
-                [
-                  -90,
-                  0
-                ],
-                [
-                  -135,
-                  0
-                ]
-              ]
-            }
-          }
-        ],
-        'properties': {
-          'min': 1,
-          'max': 39
-        }
-      }
-    },
-    {
-      'label': 'Top 2 geo.dest: IN',
-      'valueFormatter': _.identity,
-      'geoJson': {
-        'type': 'FeatureCollection',
-        'features': [
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 31,
-              'geohash': '6',
-              'center': [
-                -67.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '6',
-                  'value': '6',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 31,
-                'value': 31,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  -45
-                ],
-                [
-                  -45,
-                  -45
-                ],
-                [
-                  -45,
-                  0
-                ],
-                [
-                  -90,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                22.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 30,
-              'geohash': 's',
-              'center': [
-                22.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 's',
-                  'value': 's',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 30,
-                'value': 30,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  0,
-                  0
-                ],
-                [
-                  45,
-                  0
-                ],
-                [
-                  45,
-                  45
-                ],
-                [
-                  0,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                112.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 29,
-              'geohash': 'w',
-              'center': [
-                112.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'w',
-                  'value': 'w',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 29,
-                'value': 29,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  90,
-                  0
-                ],
-                [
-                  135,
-                  0
-                ],
-                [
-                  135,
-                  45
-                ],
-                [
-                  90,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 28,
-              'geohash': 'd',
-              'center': [
-                -67.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'd',
-                  'value': 'd',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 28,
-                'value': 28,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  0
-                ],
-                [
-                  -45,
-                  0
-                ],
-                [
-                  -45,
-                  45
-                ],
-                [
-                  -90,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                67.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 25,
-              'geohash': 't',
-              'center': [
-                67.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 't',
-                  'value': 't',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 25,
-                'value': 25,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  45,
-                  0
-                ],
-                [
-                  90,
-                  0
-                ],
-                [
-                  90,
-                  45
-                ],
-                [
-                  45,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                22.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 24,
-              'geohash': 'k',
-              'center': [
-                22.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'k',
-                  'value': 'k',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 24,
-                'value': 24,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  0,
-                  -45
-                ],
-                [
-                  45,
-                  -45
-                ],
-                [
-                  45,
-                  0
-                ],
-                [
-                  0,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                22.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 20,
-              'geohash': 'u',
-              'center': [
-                22.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'u',
-                  'value': 'u',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 20,
-                'value': 20,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  0,
-                  45
-                ],
-                [
-                  45,
-                  45
-                ],
-                [
-                  45,
-                  90
-                ],
-                [
-                  0,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -112.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 18,
-              'geohash': '9',
-              'center': [
-                -112.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '9',
-                  'value': '9',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 18,
-                'value': 18,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -135,
-                  0
-                ],
-                [
-                  -90,
-                  0
-                ],
-                [
-                  -90,
-                  45
-                ],
-                [
-                  -135,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                67.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 14,
-              'geohash': 'v',
-              'center': [
-                67.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'v',
-                  'value': 'v',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 14,
-                'value': 14,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  45,
-                  45
-                ],
-                [
-                  90,
-                  45
-                ],
-                [
-                  90,
-                  90
-                ],
-                [
-                  45,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 11,
-              'geohash': 'e',
-              'center': [
-                -22.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'e',
-                  'value': 'e',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 11,
-                'value': 11,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  0
-                ],
-                [
-                  0,
-                  0
-                ],
-                [
-                  0,
-                  45
-                ],
-                [
-                  -45,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 9,
-              'geohash': 'r',
-              'center': [
-                157.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'r',
-                  'value': 'r',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 9,
-                'value': 9,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  -45
-                ],
-                [
-                  180,
-                  -45
-                ],
-                [
-                  180,
-                  0
-                ],
-                [
-                  135,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                112.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 6,
-              'geohash': 'y',
-              'center': [
-                112.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'y',
-                  'value': 'y',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 6,
-                'value': 6,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  90,
-                  45
-                ],
-                [
-                  135,
-                  45
-                ],
-                [
-                  135,
-                  90
-                ],
-                [
-                  90,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 6,
-              'geohash': 'f',
-              'center': [
-                -67.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'f',
-                  'value': 'f',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 6,
-                'value': 6,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  45
-                ],
-                [
-                  -45,
-                  45
-                ],
-                [
-                  -45,
-                  90
-                ],
-                [
-                  -90,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 5,
-              'geohash': 'g',
-              'center': [
-                -22.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'g',
-                  'value': 'g',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 5,
-                'value': 5,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  45
-                ],
-                [
-                  0,
-                  45
-                ],
-                [
-                  0,
-                  90
-                ],
-                [
-                  -45,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -112.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 5,
-              'geohash': 'c',
-              'center': [
-                -112.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'c',
-                  'value': 'c',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 5,
-                'value': 5,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -135,
-                  45
-                ],
-                [
-                  -90,
-                  45
-                ],
-                [
-                  -90,
-                  90
-                ],
-                [
-                  -135,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -157.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 4,
-              'geohash': 'b',
-              'center': [
-                -157.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'b',
-                  'value': 'b',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 4,
-                'value': 4,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -180,
-                  45
-                ],
-                [
-                  -135,
-                  45
-                ],
-                [
-                  -135,
-                  90
-                ],
-                [
-                  -180,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                112.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 3,
-              'geohash': 'q',
-              'center': [
-                112.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'q',
-                  'value': 'q',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 3,
-                'value': 3,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  90,
-                  -45
-                ],
-                [
-                  135,
-                  -45
-                ],
-                [
-                  135,
-                  0
-                ],
-                [
-                  90,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -67.5,
-                -67.5
-              ]
-            },
-            'properties': {
-              'value': 2,
-              'geohash': '4',
-              'center': [
-                -67.5,
-                -67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '4',
-                  'value': '4',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 2,
-                'value': 2,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -90,
-                  -90
-                ],
-                [
-                  -45,
-                  -90
-                ],
-                [
-                  -45,
-                  -45
-                ],
-                [
-                  -90,
-                  -45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                67.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': 'z',
-              'center': [
-                157.5,
-                67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'z',
-                  'value': 'z',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  45
-                ],
-                [
-                  180,
-                  45
-                ],
-                [
-                  180,
-                  90
-                ],
-                [
-                  135,
-                  90
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                22.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': 'x',
-              'center': [
-                157.5,
-                22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'x',
-                  'value': 'x',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  0
-                ],
-                [
-                  180,
-                  0
-                ],
-                [
-                  180,
-                  45
-                ],
-                [
-                  135,
-                  45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                157.5,
-                -67.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': 'p',
-              'center': [
-                157.5,
-                -67.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'p',
-                  'value': 'p',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  135,
-                  -90
-                ],
-                [
-                  180,
-                  -90
-                ],
-                [
-                  180,
-                  -45
-                ],
-                [
-                  135,
-                  -45
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                67.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': 'm',
-              'center': [
-                67.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': 'm',
-                  'value': 'm',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  45,
-                  -45
-                ],
-                [
-                  90,
-                  -45
-                ],
-                [
-                  90,
-                  0
-                ],
-                [
-                  45,
-                  0
-                ]
-              ]
-            }
-          },
-          {
-            'type': 'Feature',
-            'geometry': {
-              'type': 'Point',
-              'coordinates': [
-                -22.5,
-                -22.5
-              ]
-            },
-            'properties': {
-              'value': 1,
-              'geohash': '7',
-              'center': [
-                -22.5,
-                -22.5
-              ],
-              'aggConfigResult': {
-                '$parent': {
-                  '$parent': {
-                    '$parent': null,
-                    'key': 'IN',
-                    'value': 'IN',
-                    'aggConfig': {
-                      'id': '3',
-                      'type': 'terms',
-                      'schema': 'split',
-                      'params': {
-                        'field': 'geo.dest',
-                        'size': 2,
-                        'order': 'desc',
-                        'orderBy': '1',
-                        'row': true
-                      }
-                    },
-                    'type': 'bucket'
-                  },
-                  'key': '7',
-                  'value': '7',
-                  'aggConfig': {
-                    'id': '2',
-                    'type': 'geohash_grid',
-                    'schema': 'segment',
-                    'params': {
-                      'field': 'geo.coordinates',
-                      'precision': 1
-                    }
-                  },
-                  'type': 'bucket'
-                },
-                'key': 1,
-                'value': 1,
-                'aggConfig': {
-                  'id': '1',
-                  'type': 'count',
-                  'schema': 'metric',
-                  'params': {}
-                },
-                'type': 'metric'
-              },
-              'rectangle': [
-                [
-                  -45,
-                  -45
-                ],
-                [
-                  0,
-                  -45
-                ],
-                [
-                  0,
-                  0
-                ],
-                [
-                  -45,
-                  0
-                ]
-              ]
-            }
-          }
-        ],
-        'properties': {
-          'min': 1,
-          'max': 31
-        }
-      }
-    }
-  ],
-  'hits': 1639
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_columns.js
deleted file mode 100644
index 96d2cfd174579c..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_columns.js
+++ /dev/null
@@ -1,368 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'columns': [
-    {
-      'label': '404: response',
-      'xAxisLabel': 'machine.ram',
-      'ordered': {
-        'interval': 100
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 2147483600,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 3221225400,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 4294967200,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 5368709100,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 6442450900,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 7516192700,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 8589934500,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 10737418200,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 11811160000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 12884901800,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 13958643700,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 15032385500,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 16106127300,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 18253611000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 19327352800,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 20401094600,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 21474836400,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '200: response',
-      'xAxisLabel': 'machine.ram',
-      'ordered': {
-        'interval': 100
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 2147483600,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 3221225400,
-              'y': 2,
-              'y0': 0
-            },
-            {
-              'x': 4294967200,
-              'y': 3,
-              'y0': 0
-            },
-            {
-              'x': 5368709100,
-              'y': 3,
-              'y0': 0
-            },
-            {
-              'x': 6442450900,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 7516192700,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 8589934500,
-              'y': 4,
-              'y0': 0
-            },
-            {
-              'x': 10737418200,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 11811160000,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 12884901800,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 13958643700,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 15032385500,
-              'y': 2,
-              'y0': 0
-            },
-            {
-              'x': 16106127300,
-              'y': 3,
-              'y0': 0
-            },
-            {
-              'x': 18253611000,
-              'y': 4,
-              'y0': 0
-            },
-            {
-              'x': 19327352800,
-              'y': 5,
-              'y0': 0
-            },
-            {
-              'x': 20401094600,
-              'y': 2,
-              'y0': 0
-            },
-            {
-              'x': 21474836400,
-              'y': 2,
-              'y0': 0
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '503: response',
-      'xAxisLabel': 'machine.ram',
-      'ordered': {
-        'interval': 100
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 2147483600,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 3221225400,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 4294967200,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 5368709100,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 6442450900,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 7516192700,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 8589934500,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 10737418200,
-              'y': 1,
-              'y0': 0
-            },
-            {
-              'x': 11811160000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 12884901800,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 13958643700,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 15032385500,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 16106127300,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 18253611000,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 19327352800,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 20401094600,
-              'y': 0,
-              'y0': 0
-            },
-            {
-              'x': 21474836400,
-              'y': 0,
-              'y0': 0
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'xAxisOrderedValues': [
-    2147483600,
-    3221225400,
-    4294967200,
-    5368709100,
-    6442450900,
-    7516192700,
-    8589934500,
-    10737418200,
-    11811160000,
-    12884901800,
-    13958643700,
-    15032385500,
-    16106127300,
-    18253611000,
-    19327352800,
-    20401094600,
-    21474836400,
-  ],
-  'hits': 40
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_rows.js
deleted file mode 100644
index 27050030ebdfd5..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_rows.js
+++ /dev/null
@@ -1,212 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'rows': [
-    {
-      'label': '404: response',
-      'xAxisLabel': 'machine.ram',
-      'ordered': {
-        'interval': 100
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 2147483600,
-              'y': 1
-            },
-            {
-              'x': 10737418200,
-              'y': 1
-            },
-            {
-              'x': 15032385500,
-              'y': 2
-            },
-            {
-              'x': 19327352800,
-              'y': 1
-            },
-            {
-              'x': 32212254700,
-              'y': 1
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '200: response',
-      'xAxisLabel': 'machine.ram',
-      'ordered': {
-        'interval': 100
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 3221225400,
-              'y': 4
-            },
-            {
-              'x': 4294967200,
-              'y': 3
-            },
-            {
-              'x': 5368709100,
-              'y': 3
-            },
-            {
-              'x': 6442450900,
-              'y': 2
-            },
-            {
-              'x': 7516192700,
-              'y': 2
-            },
-            {
-              'x': 8589934500,
-              'y': 2
-            },
-            {
-              'x': 9663676400,
-              'y': 3
-            },
-            {
-              'x': 11811160000,
-              'y': 3
-            },
-            {
-              'x': 12884901800,
-              'y': 2
-            },
-            {
-              'x': 13958643700,
-              'y': 1
-            },
-            {
-              'x': 15032385500,
-              'y': 2
-            },
-            {
-              'x': 16106127300,
-              'y': 3
-            },
-            {
-              'x': 17179869100,
-              'y': 1
-            },
-            {
-              'x': 18253611000,
-              'y': 4
-            },
-            {
-              'x': 19327352800,
-              'y': 1
-            },
-            {
-              'x': 20401094600,
-              'y': 1
-            },
-            {
-              'x': 21474836400,
-              'y': 4
-            },
-            {
-              'x': 32212254700,
-              'y': 3
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '503: response',
-      'xAxisLabel': 'machine.ram',
-      'ordered': {
-        'interval': 100
-      },
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 10737418200,
-              'y': 1
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'xAxisOrderedValues': [
-    2147483600,
-    3221225400,
-    4294967200,
-    5368709100,
-    6442450900,
-    7516192700,
-    8589934500,
-    9663676400,
-    10737418200,
-    11811160000,
-    12884901800,
-    13958643700,
-    15032385500,
-    16106127300,
-    17179869100,
-    18253611000,
-    19327352800,
-    20401094600,
-    21474836400,
-    32212254700,
-  ],
-  'hits': 51
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_series.js
deleted file mode 100644
index 5c7554db2060df..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_series.js
+++ /dev/null
@@ -1,124 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'xAxisLabel': 'machine.ram',
-  'ordered': {
-    'interval': 100
-  },
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 3221225400,
-          'y': 5
-        },
-        {
-          'x': 4294967200,
-          'y': 2
-        },
-        {
-          'x': 5368709100,
-          'y': 5
-        },
-        {
-          'x': 6442450900,
-          'y': 4
-        },
-        {
-          'x': 7516192700,
-          'y': 1
-        },
-        {
-          'x': 9663676400,
-          'y': 9
-        },
-        {
-          'x': 10737418200,
-          'y': 5
-        },
-        {
-          'x': 11811160000,
-          'y': 5
-        },
-        {
-          'x': 12884901800,
-          'y': 2
-        },
-        {
-          'x': 13958643700,
-          'y': 3
-        },
-        {
-          'x': 15032385500,
-          'y': 3
-        },
-        {
-          'x': 16106127300,
-          'y': 3
-        },
-        {
-          'x': 17179869100,
-          'y': 1
-        },
-        {
-          'x': 18253611000,
-          'y': 6
-        },
-        {
-          'x': 19327352800,
-          'y': 3
-        },
-        {
-          'x': 20401094600,
-          'y': 3
-        },
-        {
-          'x': 21474836400,
-          'y': 7
-        },
-        {
-          'x': 32212254700,
-          'y': 4
-        }
-      ]
-    }
-  ],
-  'hits': 71,
-  'xAxisOrderedValues': [
-    3221225400,
-    4294967200,
-    5368709100,
-    6442450900,
-    7516192700,
-    9663676400,
-    10737418200,
-    11811160000,
-    12884901800,
-    13958643700,
-    15032385500,
-    16106127300,
-    17179869100,
-    18253611000,
-    19327352800,
-    20401094600,
-    21474836400,
-    32212254700,
-  ],
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_slices.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_slices.js
deleted file mode 100644
index c47155840cec50..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/histogram/_slices.js
+++ /dev/null
@@ -1,309 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'slices': {
-    'children': [
-      {
-        'name': 0,
-        'size': 378611,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 1000,
-        'size': 205997,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 2000,
-        'size': 397189,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 3000,
-        'size': 397195,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 4000,
-        'size': 398429,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 5000,
-        'size': 397843,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 6000,
-        'size': 398140,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 7000,
-        'size': 398076,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 8000,
-        'size': 396746,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 9000,
-        'size': 397418,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 10000,
-        'size': 20222,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 11000,
-        'size': 20173,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 12000,
-        'size': 20026,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 13000,
-        'size': 19986,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 14000,
-        'size': 20091,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 15000,
-        'size': 20052,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 16000,
-        'size': 20349,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 17000,
-        'size': 20290,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 18000,
-        'size': 20399,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 19000,
-        'size': 20133,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      },
-      {
-        'name': 20000,
-        'size': 9,
-        'aggConfig': {
-          'type': 'histogram',
-          'schema': 'segment',
-          'fieldFormatter': _.constant(String),
-          'params': {
-            'interval': 1000,
-            'extended_bounds': {}
-          }
-        }
-      }
-    ]
-  },
-  'names': [
-    0,
-    1000,
-    2000,
-    3000,
-    4000,
-    5000,
-    6000,
-    7000,
-    8000,
-    9000,
-    10000,
-    11000,
-    12000,
-    13000,
-    14000,
-    15000,
-    16000,
-    17000,
-    18000,
-    19000,
-    20000
-  ],
-  'hits': 3967374,
-  'tooltipFormatter': function (event) {
-    return event.point;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/not_enough_data/_one_point.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/not_enough_data/_one_point.js
deleted file mode 100644
index b05e258133963b..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/not_enough_data/_one_point.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'xAxisLabel': '',
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': '_all',
-          'y': 274
-        }
-      ]
-    }
-  ],
-  'hits': 274,
-  'xAxisOrderedValues': ['_all'],
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_columns.js
deleted file mode 100644
index d6f3fc4361f329..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_columns.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'columns': [
-    {
-      'label': 'apache: _type',
-      'xAxisLabel': 'bytes ranges',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': '0.0-1000.0',
-              'y': 13309
-            },
-            {
-              'x': '1000.0-2000.0',
-              'y': 7196
-            }
-          ]
-        }
-      ]
-    },
-    {
-      'label': 'nginx: _type',
-      'xAxisLabel': 'bytes ranges',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': '0.0-1000.0',
-              'y': 3278
-            },
-            {
-              'x': '1000.0-2000.0',
-              'y': 1804
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  'hits': 171499,
-  'xAxisOrderedValues': ['0.0-1000.0', '1000.0-2000.0'],
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_rows.js
deleted file mode 100644
index b420565b1c96b5..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_rows.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'rows': [
-    {
-      'label': 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
-      'xAxisLabel': 'bytes ranges',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': '0.0-1000.0',
-              'y': 6422,
-              'y0': 0
-            },
-            {
-              'x': '1000.0-2000.0',
-              'y': 3446,
-              'y0': 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      'label': 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
-      'xAxisLabel': 'bytes ranges',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': '0.0-1000.0',
-              'y': 5430,
-              'y0': 0
-            },
-            {
-              'x': '1000.0-2000.0',
-              'y': 3010,
-              'y0': 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      'label': 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
-      'xAxisLabel': 'bytes ranges',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': '0.0-1000.0',
-              'y': 4735,
-              'y0': 0
-            },
-            {
-              'x': '1000.0-2000.0',
-              'y': 2542,
-              'y0': 0
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  'hits': 171501,
-  'xAxisOrderedValues': ['0.0-1000.0', '1000.0-2000.0'],
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_series.js
deleted file mode 100644
index 2ac35efadc8f2f..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/range/_series.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'xAxisLabel': 'bytes ranges',
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': '0.0-1000.0',
-          'y': 16576
-        },
-        {
-          'x': '1000.0-2000.0',
-          'y': 9005
-        }
-      ]
-    }
-  ],
-  'hits': 171500,
-  'xAxisOrderedValues': ['0.0-1000.0', '1000.0-2000.0'],
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_columns.js
deleted file mode 100644
index 5b1e29ac0d54ae..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_columns.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'columns': [
-    {
-      'label': 'http: links',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 144000
-            },
-            {
-              'x': 'info',
-              'y': 128237
-            },
-            {
-              'x': 'security',
-              'y': 34518
-            },
-            {
-              'x': 'error',
-              'y': 10258
-            },
-            {
-              'x': 'warning',
-              'y': 17188
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'info: links',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 108148
-            },
-            {
-              'x': 'info',
-              'y': 96242
-            },
-            {
-              'x': 'security',
-              'y': 25889
-            },
-            {
-              'x': 'error',
-              'y': 7673
-            },
-            {
-              'x': 'warning',
-              'y': 12842
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'www.slate.com: links',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 98056
-            },
-            {
-              'x': 'info',
-              'y': 87344
-            },
-            {
-              'x': 'security',
-              'y': 23577
-            },
-            {
-              'x': 'error',
-              'y': 7004
-            },
-            {
-              'x': 'warning',
-              'y': 11759
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'twitter.com: links',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 74154
-            },
-            {
-              'x': 'info',
-              'y': 65963
-            },
-            {
-              'x': 'security',
-              'y': 17832
-            },
-            {
-              'x': 'error',
-              'y': 5258
-            },
-            {
-              'x': 'warning',
-              'y': 8906
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'www.www.slate.com: links',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 62591
-            },
-            {
-              'x': 'info',
-              'y': 55822
-            },
-            {
-              'x': 'security',
-              'y': 15100
-            },
-            {
-              'x': 'error',
-              'y': 4564
-            },
-            {
-              'x': 'warning',
-              'y': 7498
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'hits': 171446
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_rows.js
deleted file mode 100644
index 147eb691eb67bc..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_rows.js
+++ /dev/null
@@ -1,242 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'rows': [
-    {
-      'label': 'h3: headings',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 144000
-            },
-            {
-              'x': 'info',
-              'y': 128235
-            },
-            {
-              'x': 'security',
-              'y': 34518
-            },
-            {
-              'x': 'error',
-              'y': 10257
-            },
-            {
-              'x': 'warning',
-              'y': 17188
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'h5: headings',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 144000
-            },
-            {
-              'x': 'info',
-              'y': 128235
-            },
-            {
-              'x': 'security',
-              'y': 34518
-            },
-            {
-              'x': 'error',
-              'y': 10257
-            },
-            {
-              'x': 'warning',
-              'y': 17188
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'http: headings',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 144000
-            },
-            {
-              'x': 'info',
-              'y': 128235
-            },
-            {
-              'x': 'security',
-              'y': 34518
-            },
-            {
-              'x': 'error',
-              'y': 10257
-            },
-            {
-              'x': 'warning',
-              'y': 17188
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'success: headings',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 120689
-            },
-            {
-              'x': 'info',
-              'y': 107621
-            },
-            {
-              'x': 'security',
-              'y': 28916
-            },
-            {
-              'x': 'error',
-              'y': 8590
-            },
-            {
-              'x': 'warning',
-              'y': 14548
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': 'www.slate.com: headings',
-      'xAxisLabel': 'Top 5 unusual terms in @tags',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'success',
-              'y': 62292
-            },
-            {
-              'x': 'info',
-              'y': 55646
-            },
-            {
-              'x': 'security',
-              'y': 14823
-            },
-            {
-              'x': 'error',
-              'y': 4441
-            },
-            {
-              'x': 'warning',
-              'y': 7539
-            }
-          ]
-        }
-      ],
-      'xAxisOrderedValues': ['success', 'info', 'security', 'error', 'warning'],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'hits': 171445
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_series.js
deleted file mode 100644
index 3691d854c6c2a9..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/significant_terms/_series.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'xAxisLabel': 'Top 5 unusual terms in @tags',
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 'success',
-          'y': 143995
-        },
-        {
-          'x': 'info',
-          'y': 128233
-        },
-        {
-          'x': 'security',
-          'y': 34515
-        },
-        {
-          'x': 'error',
-          'y': 10256
-        },
-        {
-          'x': 'warning',
-          'y': 17188
-        }
-      ]
-    }
-  ],
-  'hits': 171439,
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/stacked/_stacked.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/stacked/_stacked.js
deleted file mode 100644
index 228a22ed534d59..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/stacked/_stacked.js
+++ /dev/null
@@ -1,1635 +0,0 @@
-import moment from 'moment';
-
-export default {
-  'label': '',
-  'xAxisLabel': '@timestamp per 30 sec',
-  'ordered': {
-    'date': true,
-    'interval': 30000,
-    'min': 1416850340336,
-    'max': 1416852140336
-  },
-  'yAxisLabel': 'Count of documents',
-  'xAxisOrderedValues': [
-    1416850320000,
-    1416850350000,
-    1416850380000,
-    1416850410000,
-    1416850440000,
-    1416850470000,
-    1416850500000,
-    1416850530000,
-    1416850560000,
-    1416850590000,
-    1416850620000,
-    1416850650000,
-    1416850680000,
-    1416850710000,
-    1416850740000,
-    1416850770000,
-    1416850800000,
-    1416850830000,
-    1416850860000,
-    1416850890000,
-    1416850920000,
-    1416850950000,
-    1416850980000,
-    1416851010000,
-    1416851040000,
-    1416851070000,
-    1416851100000,
-    1416851130000,
-    1416851160000,
-    1416851190000,
-    1416851220000,
-    1416851250000,
-    1416851280000,
-    1416851310000,
-    1416851340000,
-    1416851370000,
-    1416851400000,
-    1416851430000,
-    1416851460000,
-    1416851490000,
-    1416851520000,
-    1416851550000,
-    1416851580000,
-    1416851610000,
-    1416851640000,
-    1416851670000,
-    1416851700000,
-    1416851730000,
-    1416851760000,
-    1416851790000,
-    1416851820000,
-    1416851850000,
-    1416851880000,
-    1416851910000,
-    1416851940000,
-    1416851970000,
-    1416852000000,
-    1416852030000,
-    1416852060000,
-    1416852090000,
-    1416852120000,
-  ],
-  'series': [
-    {
-      'label': 'jpg',
-      'values': [
-        {
-          'x': 1416850320000,
-          'y': 110,
-          'y0': 0
-        },
-        {
-          'x': 1416850350000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416850380000,
-          'y': 34,
-          'y0': 0
-        },
-        {
-          'x': 1416850410000,
-          'y': 21,
-          'y0': 0
-        },
-        {
-          'x': 1416850440000,
-          'y': 32,
-          'y0': 0
-        },
-        {
-          'x': 1416850470000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416850500000,
-          'y': 16,
-          'y0': 0
-        },
-        {
-          'x': 1416850530000,
-          'y': 27,
-          'y0': 0
-        },
-        {
-          'x': 1416850560000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416850590000,
-          'y': 38,
-          'y0': 0
-        },
-        {
-          'x': 1416850620000,
-          'y': 33,
-          'y0': 0
-        },
-        {
-          'x': 1416850650000,
-          'y': 33,
-          'y0': 0
-        },
-        {
-          'x': 1416850680000,
-          'y': 31,
-          'y0': 0
-        },
-        {
-          'x': 1416850710000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416850740000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416850770000,
-          'y': 38,
-          'y0': 0
-        },
-        {
-          'x': 1416850800000,
-          'y': 34,
-          'y0': 0
-        },
-        {
-          'x': 1416850830000,
-          'y': 30,
-          'y0': 0
-        },
-        {
-          'x': 1416850860000,
-          'y': 38,
-          'y0': 0
-        },
-        {
-          'x': 1416850890000,
-          'y': 19,
-          'y0': 0
-        },
-        {
-          'x': 1416850920000,
-          'y': 23,
-          'y0': 0
-        },
-        {
-          'x': 1416850950000,
-          'y': 33,
-          'y0': 0
-        },
-        {
-          'x': 1416850980000,
-          'y': 28,
-          'y0': 0
-        },
-        {
-          'x': 1416851010000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416851040000,
-          'y': 22,
-          'y0': 0
-        },
-        {
-          'x': 1416851070000,
-          'y': 28,
-          'y0': 0
-        },
-        {
-          'x': 1416851100000,
-          'y': 27,
-          'y0': 0
-        },
-        {
-          'x': 1416851130000,
-          'y': 32,
-          'y0': 0
-        },
-        {
-          'x': 1416851160000,
-          'y': 32,
-          'y0': 0
-        },
-        {
-          'x': 1416851190000,
-          'y': 30,
-          'y0': 0
-        },
-        {
-          'x': 1416851220000,
-          'y': 32,
-          'y0': 0
-        },
-        {
-          'x': 1416851250000,
-          'y': 36,
-          'y0': 0
-        },
-        {
-          'x': 1416851280000,
-          'y': 32,
-          'y0': 0
-        },
-        {
-          'x': 1416851310000,
-          'y': 29,
-          'y0': 0
-        },
-        {
-          'x': 1416851340000,
-          'y': 22,
-          'y0': 0
-        },
-        {
-          'x': 1416851370000,
-          'y': 29,
-          'y0': 0
-        },
-        {
-          'x': 1416851400000,
-          'y': 33,
-          'y0': 0
-        },
-        {
-          'x': 1416851430000,
-          'y': 28,
-          'y0': 0
-        },
-        {
-          'x': 1416851460000,
-          'y': 39,
-          'y0': 0
-        },
-        {
-          'x': 1416851490000,
-          'y': 28,
-          'y0': 0
-        },
-        {
-          'x': 1416851520000,
-          'y': 28,
-          'y0': 0
-        },
-        {
-          'x': 1416851550000,
-          'y': 28,
-          'y0': 0
-        },
-        {
-          'x': 1416851580000,
-          'y': 30,
-          'y0': 0
-        },
-        {
-          'x': 1416851610000,
-          'y': 29,
-          'y0': 0
-        },
-        {
-          'x': 1416851640000,
-          'y': 30,
-          'y0': 0
-        },
-        {
-          'x': 1416851670000,
-          'y': 23,
-          'y0': 0
-        },
-        {
-          'x': 1416851700000,
-          'y': 23,
-          'y0': 0
-        },
-        {
-          'x': 1416851730000,
-          'y': 27,
-          'y0': 0
-        },
-        {
-          'x': 1416851760000,
-          'y': 21,
-          'y0': 0
-        },
-        {
-          'x': 1416851790000,
-          'y': 24,
-          'y0': 0
-        },
-        {
-          'x': 1416851820000,
-          'y': 26,
-          'y0': 0
-        },
-        {
-          'x': 1416851850000,
-          'y': 26,
-          'y0': 0
-        },
-        {
-          'x': 1416851880000,
-          'y': 21,
-          'y0': 0
-        },
-        {
-          'x': 1416851910000,
-          'y': 33,
-          'y0': 0
-        },
-        {
-          'x': 1416851940000,
-          'y': 23,
-          'y0': 0
-        },
-        {
-          'x': 1416851970000,
-          'y': 46,
-          'y0': 0
-        },
-        {
-          'x': 1416852000000,
-          'y': 27,
-          'y0': 0
-        },
-        {
-          'x': 1416852030000,
-          'y': 20,
-          'y0': 0
-        },
-        {
-          'x': 1416852060000,
-          'y': 34,
-          'y0': 0
-        },
-        {
-          'x': 1416852090000,
-          'y': 15,
-          'y0': 0
-        },
-        {
-          'x': 1416852120000,
-          'y': 18,
-          'y0': 0
-        }
-      ]
-    },
-    {
-      'label': 'css',
-      'values': [
-        {
-          'x': 1416850320000,
-          'y': 3,
-          'y0': 11
-        },
-        {
-          'x': 1416850350000,
-          'y': 13,
-          'y0': 24
-        },
-        {
-          'x': 1416850380000,
-          'y': 5,
-          'y0': 34
-        },
-        {
-          'x': 1416850410000,
-          'y': 12,
-          'y0': 21
-        },
-        {
-          'x': 1416850440000,
-          'y': 9,
-          'y0': 32
-        },
-        {
-          'x': 1416850470000,
-          'y': 12,
-          'y0': 24
-        },
-        {
-          'x': 1416850500000,
-          'y': 6,
-          'y0': 16
-        },
-        {
-          'x': 1416850530000,
-          'y': 6,
-          'y0': 27
-        },
-        {
-          'x': 1416850560000,
-          'y': 11,
-          'y0': 24
-        },
-        {
-          'x': 1416850590000,
-          'y': 11,
-          'y0': 38
-        },
-        {
-          'x': 1416850620000,
-          'y': 6,
-          'y0': 33
-        },
-        {
-          'x': 1416850650000,
-          'y': 8,
-          'y0': 33
-        },
-        {
-          'x': 1416850680000,
-          'y': 6,
-          'y0': 31
-        },
-        {
-          'x': 1416850710000,
-          'y': 4,
-          'y0': 24
-        },
-        {
-          'x': 1416850740000,
-          'y': 9,
-          'y0': 24
-        },
-        {
-          'x': 1416850770000,
-          'y': 3,
-          'y0': 38
-        },
-        {
-          'x': 1416850800000,
-          'y': 5,
-          'y0': 34
-        },
-        {
-          'x': 1416850830000,
-          'y': 6,
-          'y0': 30
-        },
-        {
-          'x': 1416850860000,
-          'y': 9,
-          'y0': 38
-        },
-        {
-          'x': 1416850890000,
-          'y': 5,
-          'y0': 19
-        },
-        {
-          'x': 1416850920000,
-          'y': 8,
-          'y0': 23
-        },
-        {
-          'x': 1416850950000,
-          'y': 9,
-          'y0': 33
-        },
-        {
-          'x': 1416850980000,
-          'y': 5,
-          'y0': 28
-        },
-        {
-          'x': 1416851010000,
-          'y': 6,
-          'y0': 24
-        },
-        {
-          'x': 1416851040000,
-          'y': 9,
-          'y0': 22
-        },
-        {
-          'x': 1416851070000,
-          'y': 9,
-          'y0': 28
-        },
-        {
-          'x': 1416851100000,
-          'y': 11,
-          'y0': 27
-        },
-        {
-          'x': 1416851130000,
-          'y': 5,
-          'y0': 32
-        },
-        {
-          'x': 1416851160000,
-          'y': 8,
-          'y0': 32
-        },
-        {
-          'x': 1416851190000,
-          'y': 6,
-          'y0': 30
-        },
-        {
-          'x': 1416851220000,
-          'y': 10,
-          'y0': 32
-        },
-        {
-          'x': 1416851250000,
-          'y': 5,
-          'y0': 36
-        },
-        {
-          'x': 1416851280000,
-          'y': 6,
-          'y0': 32
-        },
-        {
-          'x': 1416851310000,
-          'y': 4,
-          'y0': 29
-        },
-        {
-          'x': 1416851340000,
-          'y': 8,
-          'y0': 22
-        },
-        {
-          'x': 1416851370000,
-          'y': 3,
-          'y0': 29
-        },
-        {
-          'x': 1416851400000,
-          'y': 8,
-          'y0': 33
-        },
-        {
-          'x': 1416851430000,
-          'y': 10,
-          'y0': 28
-        },
-        {
-          'x': 1416851460000,
-          'y': 5,
-          'y0': 39
-        },
-        {
-          'x': 1416851490000,
-          'y': 7,
-          'y0': 28
-        },
-        {
-          'x': 1416851520000,
-          'y': 6,
-          'y0': 28
-        },
-        {
-          'x': 1416851550000,
-          'y': 4,
-          'y0': 28
-        },
-        {
-          'x': 1416851580000,
-          'y': 9,
-          'y0': 30
-        },
-        {
-          'x': 1416851610000,
-          'y': 3,
-          'y0': 29
-        },
-        {
-          'x': 1416851640000,
-          'y': 9,
-          'y0': 30
-        },
-        {
-          'x': 1416851670000,
-          'y': 6,
-          'y0': 23
-        },
-        {
-          'x': 1416851700000,
-          'y': 11,
-          'y0': 23
-        },
-        {
-          'x': 1416851730000,
-          'y': 4,
-          'y0': 27
-        },
-        {
-          'x': 1416851760000,
-          'y': 8,
-          'y0': 21
-        },
-        {
-          'x': 1416851790000,
-          'y': 5,
-          'y0': 24
-        },
-        {
-          'x': 1416851820000,
-          'y': 7,
-          'y0': 26
-        },
-        {
-          'x': 1416851850000,
-          'y': 7,
-          'y0': 26
-        },
-        {
-          'x': 1416851880000,
-          'y': 4,
-          'y0': 21
-        },
-        {
-          'x': 1416851910000,
-          'y': 8,
-          'y0': 33
-        },
-        {
-          'x': 1416851940000,
-          'y': 6,
-          'y0': 23
-        },
-        {
-          'x': 1416851970000,
-          'y': 6,
-          'y0': 46
-        },
-        {
-          'x': 1416852000000,
-          'y': 3,
-          'y0': 27
-        },
-        {
-          'x': 1416852030000,
-          'y': 6,
-          'y0': 20
-        },
-        {
-          'x': 1416852060000,
-          'y': 5,
-          'y0': 34
-        },
-        {
-          'x': 1416852090000,
-          'y': 5,
-          'y0': 15
-        },
-        {
-          'x': 1416852120000,
-          'y': 1,
-          'y0': 18
-        }
-      ]
-    },
-    {
-      'label': 'gif',
-      'values': [
-        {
-          'x': 1416850320000,
-          'y': 1,
-          'y0': 14
-        },
-        {
-          'x': 1416850350000,
-          'y': 2,
-          'y0': 37
-        },
-        {
-          'x': 1416850380000,
-          'y': 4,
-          'y0': 39
-        },
-        {
-          'x': 1416850410000,
-          'y': 2,
-          'y0': 33
-        },
-        {
-          'x': 1416850440000,
-          'y': 3,
-          'y0': 41
-        },
-        {
-          'x': 1416850470000,
-          'y': 1,
-          'y0': 36
-        },
-        {
-          'x': 1416850500000,
-          'y': 1,
-          'y0': 22
-        },
-        {
-          'x': 1416850530000,
-          'y': 1,
-          'y0': 33
-        },
-        {
-          'x': 1416850560000,
-          'y': 2,
-          'y0': 35
-        },
-        {
-          'x': 1416850590000,
-          'y': 5,
-          'y0': 49
-        },
-        {
-          'x': 1416850620000,
-          'y': 1,
-          'y0': 39
-        },
-        {
-          'x': 1416850650000,
-          'y': 1,
-          'y0': 41
-        },
-        {
-          'x': 1416850680000,
-          'y': 4,
-          'y0': 37
-        },
-        {
-          'x': 1416850710000,
-          'y': 1,
-          'y0': 28
-        },
-        {
-          'x': 1416850740000,
-          'y': 3,
-          'y0': 33
-        },
-        {
-          'x': 1416850770000,
-          'y': 2,
-          'y0': 41
-        },
-        {
-          'x': 1416850800000,
-          'y': 2,
-          'y0': 39
-        },
-        {
-          'x': 1416850830000,
-          'y': 5,
-          'y0': 36
-        },
-        {
-          'x': 1416850860000,
-          'y': 3,
-          'y0': 47
-        },
-        {
-          'x': 1416850890000,
-          'y': 1,
-          'y0': 24
-        },
-        {
-          'x': 1416850920000,
-          'y': 3,
-          'y0': 31
-        },
-        {
-          'x': 1416850950000,
-          'y': 4,
-          'y0': 42
-        },
-        {
-          'x': 1416850980000,
-          'y': 3,
-          'y0': 33
-        },
-        {
-          'x': 1416851010000,
-          'y': 5,
-          'y0': 30
-        },
-        {
-          'x': 1416851040000,
-          'y': 2,
-          'y0': 31
-        },
-        {
-          'x': 1416851070000,
-          'y': 3,
-          'y0': 37
-        },
-        {
-          'x': 1416851100000,
-          'y': 5,
-          'y0': 38
-        },
-        {
-          'x': 1416851130000,
-          'y': 3,
-          'y0': 37
-        },
-        {
-          'x': 1416851160000,
-          'y': 4,
-          'y0': 40
-        },
-        {
-          'x': 1416851190000,
-          'y': 9,
-          'y0': 36
-        },
-        {
-          'x': 1416851220000,
-          'y': 7,
-          'y0': 42
-        },
-        {
-          'x': 1416851250000,
-          'y': 2,
-          'y0': 41
-        },
-        {
-          'x': 1416851280000,
-          'y': 1,
-          'y0': 38
-        },
-        {
-          'x': 1416851310000,
-          'y': 2,
-          'y0': 33
-        },
-        {
-          'x': 1416851340000,
-          'y': 5,
-          'y0': 30
-        },
-        {
-          'x': 1416851370000,
-          'y': 3,
-          'y0': 32
-        },
-        {
-          'x': 1416851400000,
-          'y': 5,
-          'y0': 41
-        },
-        {
-          'x': 1416851430000,
-          'y': 4,
-          'y0': 38
-        },
-        {
-          'x': 1416851460000,
-          'y': 5,
-          'y0': 44
-        },
-        {
-          'x': 1416851490000,
-          'y': 2,
-          'y0': 35
-        },
-        {
-          'x': 1416851520000,
-          'y': 2,
-          'y0': 34
-        },
-        {
-          'x': 1416851550000,
-          'y': 4,
-          'y0': 32
-        },
-        {
-          'x': 1416851580000,
-          'y': 3,
-          'y0': 39
-        },
-        {
-          'x': 1416851610000,
-          'y': 4,
-          'y0': 32
-        },
-        {
-          'x': 1416851640000,
-          'y': 0,
-          'y0': 39
-        },
-        {
-          'x': 1416851670000,
-          'y': 2,
-          'y0': 29
-        },
-        {
-          'x': 1416851700000,
-          'y': 1,
-          'y0': 34
-        },
-        {
-          'x': 1416851730000,
-          'y': 3,
-          'y0': 31
-        },
-        {
-          'x': 1416851760000,
-          'y': 0,
-          'y0': 29
-        },
-        {
-          'x': 1416851790000,
-          'y': 4,
-          'y0': 29
-        },
-        {
-          'x': 1416851820000,
-          'y': 3,
-          'y0': 33
-        },
-        {
-          'x': 1416851850000,
-          'y': 3,
-          'y0': 33
-        },
-        {
-          'x': 1416851880000,
-          'y': 0,
-          'y0': 25
-        },
-        {
-          'x': 1416851910000,
-          'y': 0,
-          'y0': 41
-        },
-        {
-          'x': 1416851940000,
-          'y': 3,
-          'y0': 29
-        },
-        {
-          'x': 1416851970000,
-          'y': 3,
-          'y0': 52
-        },
-        {
-          'x': 1416852000000,
-          'y': 1,
-          'y0': 30
-        },
-        {
-          'x': 1416852030000,
-          'y': 5,
-          'y0': 26
-        },
-        {
-          'x': 1416852060000,
-          'y': 3,
-          'y0': 39
-        },
-        {
-          'x': 1416852090000,
-          'y': 1,
-          'y0': 20
-        },
-        {
-          'x': 1416852120000,
-          'y': 2,
-          'y0': 19
-        }
-      ]
-    },
-    {
-      'label': 'png',
-      'values': [
-        {
-          'x': 1416850320000,
-          'y': 1,
-          'y0': 15
-        },
-        {
-          'x': 1416850350000,
-          'y': 6,
-          'y0': 39
-        },
-        {
-          'x': 1416850380000,
-          'y': 6,
-          'y0': 43
-        },
-        {
-          'x': 1416850410000,
-          'y': 5,
-          'y0': 35
-        },
-        {
-          'x': 1416850440000,
-          'y': 3,
-          'y0': 44
-        },
-        {
-          'x': 1416850470000,
-          'y': 5,
-          'y0': 37
-        },
-        {
-          'x': 1416850500000,
-          'y': 6,
-          'y0': 23
-        },
-        {
-          'x': 1416850530000,
-          'y': 1,
-          'y0': 34
-        },
-        {
-          'x': 1416850560000,
-          'y': 3,
-          'y0': 37
-        },
-        {
-          'x': 1416850590000,
-          'y': 2,
-          'y0': 54
-        },
-        {
-          'x': 1416850620000,
-          'y': 1,
-          'y0': 40
-        },
-        {
-          'x': 1416850650000,
-          'y': 1,
-          'y0': 42
-        },
-        {
-          'x': 1416850680000,
-          'y': 2,
-          'y0': 41
-        },
-        {
-          'x': 1416850710000,
-          'y': 5,
-          'y0': 29
-        },
-        {
-          'x': 1416850740000,
-          'y': 7,
-          'y0': 36
-        },
-        {
-          'x': 1416850770000,
-          'y': 2,
-          'y0': 43
-        },
-        {
-          'x': 1416850800000,
-          'y': 3,
-          'y0': 41
-        },
-        {
-          'x': 1416850830000,
-          'y': 6,
-          'y0': 41
-        },
-        {
-          'x': 1416850860000,
-          'y': 2,
-          'y0': 50
-        },
-        {
-          'x': 1416850890000,
-          'y': 4,
-          'y0': 25
-        },
-        {
-          'x': 1416850920000,
-          'y': 2,
-          'y0': 34
-        },
-        {
-          'x': 1416850950000,
-          'y': 3,
-          'y0': 46
-        },
-        {
-          'x': 1416850980000,
-          'y': 8,
-          'y0': 36
-        },
-        {
-          'x': 1416851010000,
-          'y': 4,
-          'y0': 35
-        },
-        {
-          'x': 1416851040000,
-          'y': 4,
-          'y0': 33
-        },
-        {
-          'x': 1416851070000,
-          'y': 1,
-          'y0': 40
-        },
-        {
-          'x': 1416851100000,
-          'y': 2,
-          'y0': 43
-        },
-        {
-          'x': 1416851130000,
-          'y': 4,
-          'y0': 40
-        },
-        {
-          'x': 1416851160000,
-          'y': 3,
-          'y0': 44
-        },
-        {
-          'x': 1416851190000,
-          'y': 4,
-          'y0': 45
-        },
-        {
-          'x': 1416851220000,
-          'y': 2,
-          'y0': 49
-        },
-        {
-          'x': 1416851250000,
-          'y': 4,
-          'y0': 43
-        },
-        {
-          'x': 1416851280000,
-          'y': 8,
-          'y0': 39
-        },
-        {
-          'x': 1416851310000,
-          'y': 4,
-          'y0': 35
-        },
-        {
-          'x': 1416851340000,
-          'y': 4,
-          'y0': 35
-        },
-        {
-          'x': 1416851370000,
-          'y': 7,
-          'y0': 35
-        },
-        {
-          'x': 1416851400000,
-          'y': 2,
-          'y0': 46
-        },
-        {
-          'x': 1416851430000,
-          'y': 3,
-          'y0': 42
-        },
-        {
-          'x': 1416851460000,
-          'y': 3,
-          'y0': 49
-        },
-        {
-          'x': 1416851490000,
-          'y': 3,
-          'y0': 37
-        },
-        {
-          'x': 1416851520000,
-          'y': 4,
-          'y0': 36
-        },
-        {
-          'x': 1416851550000,
-          'y': 3,
-          'y0': 36
-        },
-        {
-          'x': 1416851580000,
-          'y': 4,
-          'y0': 42
-        },
-        {
-          'x': 1416851610000,
-          'y': 5,
-          'y0': 36
-        },
-        {
-          'x': 1416851640000,
-          'y': 3,
-          'y0': 39
-        },
-        {
-          'x': 1416851670000,
-          'y': 3,
-          'y0': 31
-        },
-        {
-          'x': 1416851700000,
-          'y': 2,
-          'y0': 35
-        },
-        {
-          'x': 1416851730000,
-          'y': 5,
-          'y0': 34
-        },
-        {
-          'x': 1416851760000,
-          'y': 4,
-          'y0': 29
-        },
-        {
-          'x': 1416851790000,
-          'y': 5,
-          'y0': 33
-        },
-        {
-          'x': 1416851820000,
-          'y': 1,
-          'y0': 36
-        },
-        {
-          'x': 1416851850000,
-          'y': 3,
-          'y0': 36
-        },
-        {
-          'x': 1416851880000,
-          'y': 6,
-          'y0': 25
-        },
-        {
-          'x': 1416851910000,
-          'y': 4,
-          'y0': 41
-        },
-        {
-          'x': 1416851940000,
-          'y': 7,
-          'y0': 32
-        },
-        {
-          'x': 1416851970000,
-          'y': 5,
-          'y0': 55
-        },
-        {
-          'x': 1416852000000,
-          'y': 2,
-          'y0': 31
-        },
-        {
-          'x': 1416852030000,
-          'y': 2,
-          'y0': 31
-        },
-        {
-          'x': 1416852060000,
-          'y': 4,
-          'y0': 42
-        },
-        {
-          'x': 1416852090000,
-          'y': 6,
-          'y0': 21
-        },
-        {
-          'x': 1416852120000,
-          'y': 2,
-          'y0': 21
-        }
-      ]
-    },
-    {
-      'label': 'php',
-      'values': [
-        {
-          'x': 1416850320000,
-          'y': 0,
-          'y0': 16
-        },
-        {
-          'x': 1416850350000,
-          'y': 1,
-          'y0': 45
-        },
-        {
-          'x': 1416850380000,
-          'y': 0,
-          'y0': 49
-        },
-        {
-          'x': 1416850410000,
-          'y': 2,
-          'y0': 40
-        },
-        {
-          'x': 1416850440000,
-          'y': 0,
-          'y0': 47
-        },
-        {
-          'x': 1416850470000,
-          'y': 0,
-          'y0': 42
-        },
-        {
-          'x': 1416850500000,
-          'y': 3,
-          'y0': 29
-        },
-        {
-          'x': 1416850530000,
-          'y': 1,
-          'y0': 35
-        },
-        {
-          'x': 1416850560000,
-          'y': 3,
-          'y0': 40
-        },
-        {
-          'x': 1416850590000,
-          'y': 2,
-          'y0': 56
-        },
-        {
-          'x': 1416850620000,
-          'y': 2,
-          'y0': 41
-        },
-        {
-          'x': 1416850650000,
-          'y': 5,
-          'y0': 43
-        },
-        {
-          'x': 1416850680000,
-          'y': 2,
-          'y0': 43
-        },
-        {
-          'x': 1416850710000,
-          'y': 1,
-          'y0': 34
-        },
-        {
-          'x': 1416850740000,
-          'y': 2,
-          'y0': 43
-        },
-        {
-          'x': 1416850770000,
-          'y': 2,
-          'y0': 45
-        },
-        {
-          'x': 1416850800000,
-          'y': 1,
-          'y0': 44
-        },
-        {
-          'x': 1416850830000,
-          'y': 1,
-          'y0': 47
-        },
-        {
-          'x': 1416850860000,
-          'y': 1,
-          'y0': 52
-        },
-        {
-          'x': 1416850890000,
-          'y': 1,
-          'y0': 29
-        },
-        {
-          'x': 1416850920000,
-          'y': 2,
-          'y0': 36
-        },
-        {
-          'x': 1416850950000,
-          'y': 2,
-          'y0': 49
-        },
-        {
-          'x': 1416850980000,
-          'y': 0,
-          'y0': 44
-        },
-        {
-          'x': 1416851010000,
-          'y': 3,
-          'y0': 39
-        },
-        {
-          'x': 1416851040000,
-          'y': 2,
-          'y0': 37
-        },
-        {
-          'x': 1416851070000,
-          'y': 2,
-          'y0': 41
-        },
-        {
-          'x': 1416851100000,
-          'y': 2,
-          'y0': 45
-        },
-        {
-          'x': 1416851130000,
-          'y': 0,
-          'y0': 44
-        },
-        {
-          'x': 1416851160000,
-          'y': 1,
-          'y0': 47
-        },
-        {
-          'x': 1416851190000,
-          'y': 2,
-          'y0': 49
-        },
-        {
-          'x': 1416851220000,
-          'y': 4,
-          'y0': 51
-        },
-        {
-          'x': 1416851250000,
-          'y': 0,
-          'y0': 47
-        },
-        {
-          'x': 1416851280000,
-          'y': 3,
-          'y0': 47
-        },
-        {
-          'x': 1416851310000,
-          'y': 3,
-          'y0': 39
-        },
-        {
-          'x': 1416851340000,
-          'y': 2,
-          'y0': 39
-        },
-        {
-          'x': 1416851370000,
-          'y': 2,
-          'y0': 42
-        },
-        {
-          'x': 1416851400000,
-          'y': 3,
-          'y0': 48
-        },
-        {
-          'x': 1416851430000,
-          'y': 1,
-          'y0': 45
-        },
-        {
-          'x': 1416851460000,
-          'y': 0,
-          'y0': 52
-        },
-        {
-          'x': 1416851490000,
-          'y': 2,
-          'y0': 40
-        },
-        {
-          'x': 1416851520000,
-          'y': 1,
-          'y0': 40
-        },
-        {
-          'x': 1416851550000,
-          'y': 3,
-          'y0': 39
-        },
-        {
-          'x': 1416851580000,
-          'y': 1,
-          'y0': 46
-        },
-        {
-          'x': 1416851610000,
-          'y': 2,
-          'y0': 41
-        },
-        {
-          'x': 1416851640000,
-          'y': 1,
-          'y0': 42
-        },
-        {
-          'x': 1416851670000,
-          'y': 2,
-          'y0': 34
-        },
-        {
-          'x': 1416851700000,
-          'y': 3,
-          'y0': 37
-        },
-        {
-          'x': 1416851730000,
-          'y': 1,
-          'y0': 39
-        },
-        {
-          'x': 1416851760000,
-          'y': 1,
-          'y0': 33
-        },
-        {
-          'x': 1416851790000,
-          'y': 1,
-          'y0': 38
-        },
-        {
-          'x': 1416851820000,
-          'y': 1,
-          'y0': 37
-        },
-        {
-          'x': 1416851850000,
-          'y': 1,
-          'y0': 39
-        },
-        {
-          'x': 1416851880000,
-          'y': 1,
-          'y0': 31
-        },
-        {
-          'x': 1416851910000,
-          'y': 2,
-          'y0': 45
-        },
-        {
-          'x': 1416851940000,
-          'y': 0,
-          'y0': 39
-        },
-        {
-          'x': 1416851970000,
-          'y': 0,
-          'y0': 60
-        },
-        {
-          'x': 1416852000000,
-          'y': 1,
-          'y0': 33
-        },
-        {
-          'x': 1416852030000,
-          'y': 2,
-          'y0': 33
-        },
-        {
-          'x': 1416852060000,
-          'y': 1,
-          'y0': 46
-        },
-        {
-          'x': 1416852090000,
-          'y': 1,
-          'y0': 27
-        },
-        {
-          'x': 1416852120000,
-          'y': 0,
-          'y0': 23
-        }
-      ]
-    }
-  ],
-  'hits': 2595,
-  'xAxisFormatter': function (thing) {
-    return moment(thing);
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_columns.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_columns.js
deleted file mode 100644
index 4683640725f2a8..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_columns.js
+++ /dev/null
@@ -1,146 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'columns': [
-    {
-      'label': 'logstash: index',
-      'xAxisLabel': 'Top 5 extension',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'jpg',
-              'y': 110710
-            },
-            {
-              'x': 'css',
-              'y': 27376
-            },
-            {
-              'x': 'png',
-              'y': 16664
-            },
-            {
-              'x': 'gif',
-              'y': 11264
-            },
-            {
-              'x': 'php',
-              'y': 5448
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '2014.11.12: index',
-      'xAxisLabel': 'Top 5 extension',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'jpg',
-              'y': 110643
-            },
-            {
-              'x': 'css',
-              'y': 27350
-            },
-            {
-              'x': 'png',
-              'y': 16648
-            },
-            {
-              'x': 'gif',
-              'y': 11257
-            },
-            {
-              'x': 'php',
-              'y': 5440
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '2014.11.11: index',
-      'xAxisLabel': 'Top 5 extension',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'jpg',
-              'y': 67
-            },
-            {
-              'x': 'css',
-              'y': 26
-            },
-            {
-              'x': 'png',
-              'y': 16
-            },
-            {
-              'x': 'gif',
-              'y': 7
-            },
-            {
-              'x': 'php',
-              'y': 8
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'xAxisOrderedValues': ['jpg', 'css', 'png', 'gif', 'php'],
-  'hits': 171462
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_rows.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_rows.js
deleted file mode 100644
index 2b4ee83eca44c7..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_rows.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'rows': [
-    {
-      'label': '0.0-1000.0: bytes',
-      'xAxisLabel': 'Top 5 extension',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'jpg',
-              'y': 3378
-            },
-            {
-              'x': 'css',
-              'y': 762
-            },
-            {
-              'x': 'png',
-              'y': 527
-            },
-            {
-              'x': 'gif',
-              'y': 11258
-            },
-            {
-              'x': 'php',
-              'y': 653
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    },
-    {
-      'label': '1000.0-2000.0: bytes',
-      'xAxisLabel': 'Top 5 extension',
-      'yAxisLabel': 'Count of documents',
-      'series': [
-        {
-          'label': 'Count',
-          'values': [
-            {
-              'x': 'jpg',
-              'y': 6422
-            },
-            {
-              'x': 'css',
-              'y': 1591
-            },
-            {
-              'x': 'png',
-              'y': 430
-            },
-            {
-              'x': 'gif',
-              'y': 8
-            },
-            {
-              'x': 'php',
-              'y': 561
-            }
-          ]
-        }
-      ],
-      'xAxisFormatter': function (val) {
-        if (_.isObject(val)) {
-          return JSON.stringify(val);
-        }
-        else if (val == null) {
-          return '';
-        }
-        else {
-          return '' + val;
-        }
-      },
-      'tooltipFormatter': function (d) {
-        return d;
-      }
-    }
-  ],
-  'xAxisOrderedValues': ['jpg', 'css', 'png', 'gif', 'php'],
-  'hits': 171458
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_series.js
deleted file mode 100644
index f717012d430cf3..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_series.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'label': '',
-  'xAxisLabel': 'Top 5 extension',
-  'xAxisOrderedValues': ['jpg', 'css', 'png', 'gif', 'php'],
-  'yAxisLabel': 'Count of documents',
-  'series': [
-    {
-      'label': 'Count',
-      'values': [
-        {
-          'x': 'jpg',
-          'y': 110710
-        },
-        {
-          'x': 'css',
-          'y': 27389
-        },
-        {
-          'x': 'png',
-          'y': 16661
-        },
-        {
-          'x': 'gif',
-          'y': 11269
-        },
-        {
-          'x': 'php',
-          'y': 5447
-        }
-      ]
-    }
-  ],
-  'hits': 171476,
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js
deleted file mode 100644
index 2b86663ab4673e..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/mock_data/terms/_seriesMultiple.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import _ from 'lodash';
-
-export default {
-  'xAxisOrderedValues': ['_all'],
-  'yAxisLabel': 'Count',
-  'zAxisLabel': 'machine.os.raw: Descending',
-  'yScale': null,
-  'series': [{
-    'label': 'ios',
-    'id': '1',
-    'yAxisFormatter': _.identity,
-    'values': [{
-      'x': '_all',
-      'y': 2820,
-      'series': 'ios'
-    }]
-  }, {
-    'label': 'win 7',
-    'aggId': '1',
-    'yAxisFormatter': _.identity,
-    'values': [{
-      'x': '_all',
-      'y': 2319,
-      'series': 'win 7'
-    }]
-  }, {
-    'label': 'win 8',
-    'id': '1',
-    'yAxisFormatter': _.identity,
-    'values': [{
-      'x': '_all',
-      'y': 1835,
-      'series': 'win 8'
-    }]
-  }, {
-    'label': 'windows xp service pack 2 version 20123452',
-    'id': '1',
-    'yAxisFormatter': _.identity,
-    'values': [{
-      'x': '_all',
-      'y': 734,
-      'series': 'win xp'
-    }]
-  }, {
-    'label': 'osx',
-    'id': '1',
-    'yAxisFormatter': _.identity,
-    'values': [{
-      'x': '_all',
-      'y': 1352,
-      'series': 'osx'
-    }]
-  }],
-  'hits': 14005,
-  'xAxisFormatter': function (val) {
-    if (_.isObject(val)) {
-      return JSON.stringify(val);
-    }
-    else if (val == null) {
-      return '';
-    }
-    else {
-      return '' + val;
-    }
-  },
-  'yAxisFormatter': function (val) {
-    return val;
-  },
-  'tooltipFormatter': function (d) {
-    return d;
-  }
-};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/point_series.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/point_series.js
deleted file mode 100644
index 03646d08298dd6..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/point_series.js
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import expect from '@kbn/expect';
-
-import percentileTestdata from './testdata_linechart_percentile.json';
-import percentileTestdataResult from './testdata_linechart_percentile_result.json';
-
-import { vislibPointSeriesTypes as pointSeriesConfig } from '../../../lib/types/point_series';
-
-describe('Point Series Config Type Class Test Suite', function() {
-  let parsedConfig;
-  const histogramConfig = {
-    type: 'histogram',
-    addLegend: true,
-    tooltip: {
-      show: true,
-    },
-    categoryAxes: [
-      {
-        id: 'CategoryAxis-1',
-        type: 'category',
-        title: {},
-      },
-    ],
-    valueAxes: [
-      {
-        id: 'ValueAxis-1',
-        type: 'value',
-        labels: {},
-        title: {},
-      },
-    ],
-  };
-
-  const data = {
-    get: prop => {
-      return data[prop] || data.data[prop] || null;
-    },
-    getLabels: () => [],
-    data: {
-      hits: 621,
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458,
-      },
-      series: [
-        { label: 's1', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's2', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's3', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's4', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's5', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's6', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's7', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's8', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's9', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's10', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's11', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's12', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's13', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's14', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's15', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's16', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's17', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's18', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's19', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's20', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's21', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's22', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's23', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's24', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's25', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's26', values: [{ x: 1408734060000, y: 8 }] },
-      ],
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'series',
-      yAxisFormatter: () => 'test',
-    },
-  };
-
-  describe('histogram chart', function() {
-    beforeEach(function() {
-      parsedConfig = pointSeriesConfig.column(histogramConfig, data);
-    });
-    it('should not throw an error when more than 25 series are provided', function() {
-      expect(parsedConfig.error).to.be.undefined;
-    });
-
-    it('should set axis title and formatter from data', () => {
-      expect(parsedConfig.categoryAxes[0].title.text).to.equal(data.data.xAxisLabel);
-      expect(parsedConfig.valueAxes[0].labels.axisFormatter).to.not.be.undefined;
-    });
-  });
-
-  describe('line chart', function() {
-    beforeEach(function() {
-      const percentileDataObj = {
-        get: prop => {
-          return data[prop] || data.data[prop] || null;
-        },
-        getLabels: () => [],
-        data: percentileTestdata.data,
-      };
-      parsedConfig = pointSeriesConfig.line(percentileTestdata.cfg, percentileDataObj);
-    });
-    it('should render a percentile line chart', function() {
-      expect(JSON.stringify(parsedConfig)).to.eql(JSON.stringify(percentileTestdataResult));
-    });
-  });
-});
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/vislib.js b/src/legacy/core_plugins/vis_type_vislib/public/vislib/vislib.js
deleted file mode 100644
index 024dee60ef2bf4..00000000000000
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/vislib.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import './lib/types/pie';
-import './lib/types/point_series';
-import './lib/types';
-import './lib/layout/layout_types';
-import './lib/data';
-import './visualizations/vis_types';
-import { Vis } from './vis';
-
-// prefetched for faster optimization runs
-// end prefetching
-
-/**
- * Provides the Kibana4 Visualization Library
- *
- * @module vislib
- * @main vislib
- * @return {Object} Contains the version number and the Vis Class for creating visualizations
- */
-export function VislibProvider() {
-  return {
-    version: '0.0.0',
-    Vis,
-  };
-}
diff --git a/src/plugins/vis_type_vislib/kibana.json b/src/plugins/vis_type_vislib/kibana.json
new file mode 100644
index 00000000000000..5b3088b399ebff
--- /dev/null
+++ b/src/plugins/vis_type_vislib/kibana.json
@@ -0,0 +1,8 @@
+{
+  "id": "visTypeVislib",
+  "version": "kibana",
+  "server": true,
+  "ui": true,
+  "requiredPlugins": ["charts", "data", "expressions", "visualizations"],
+  "optionalPlugins": ["visTypeXy"]
+}
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/__snapshots__/pie_fn.test.ts.snap b/src/plugins/vis_type_vislib/public/__snapshots__/pie_fn.test.ts.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/__snapshots__/pie_fn.test.ts.snap
rename to src/plugins/vis_type_vislib/public/__snapshots__/pie_fn.test.ts.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/area.ts b/src/plugins/vis_type_vislib/public/area.ts
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/area.ts
rename to src/plugins/vis_type_vislib/public/area.ts
index 8a196da64fc4bc..c42962ad50a4b0 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/area.ts
+++ b/src/plugins/vis_type_vislib/public/area.ts
@@ -23,8 +23,8 @@ import { palettes } from '@elastic/eui/lib/services';
 // @ts-ignore
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { AggGroupNames } from '../../../../plugins/data/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
@@ -39,7 +39,7 @@ import {
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
-import { Rotates } from '../../../../plugins/charts/public';
+import { Rotates } from '../../charts/public';
 
 export const createAreaVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'area',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/index.ts b/src/plugins/vis_type_vislib/public/components/common/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/index.ts
rename to src/plugins/vis_type_vislib/public/components/common/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/truncate_labels.tsx b/src/plugins/vis_type_vislib/public/components/common/truncate_labels.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/truncate_labels.tsx
rename to src/plugins/vis_type_vislib/public/components/common/truncate_labels.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/common/validation_wrapper.tsx b/src/plugins/vis_type_vislib/public/components/common/validation_wrapper.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/common/validation_wrapper.tsx
rename to src/plugins/vis_type_vislib/public/components/common/validation_wrapper.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/index.ts b/src/plugins/vis_type_vislib/public/components/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/index.ts
rename to src/plugins/vis_type_vislib/public/components/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/index.tsx b/src/plugins/vis_type_vislib/public/components/options/gauge/index.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/index.tsx
rename to src/plugins/vis_type_vislib/public/components/options/gauge/index.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
index 3fca9dc8adc08e..0bd5694f710213 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/gauge/labels_panel.tsx
@@ -22,8 +22,8 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { SwitchOption, TextInputOption } from '../../../../../../../plugins/charts/public';
-import { GaugeOptionsInternalProps } from '.';
+import { SwitchOption, TextInputOption } from '../../../../../charts/public';
+import { GaugeOptionsInternalProps } from '../gauge';
 
 function LabelsPanel({ stateParams, setValue, setGaugeValue }: GaugeOptionsInternalProps) {
   return (
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
index 433cc4edeb47b3..c297fb08e4b68b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/gauge/ranges_panel.tsx
@@ -29,8 +29,8 @@ import {
   SetColorRangeValue,
   SwitchOption,
   ColorSchemas,
-} from '../../../../../../../plugins/charts/public';
-import { GaugeOptionsInternalProps } from '.';
+} from '../../../../../charts/public';
+import { GaugeOptionsInternalProps } from '../gauge';
 import { Gauge } from '../../../gauge';
 
 function RangesPanel({
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
similarity index 91%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
index 48711de7d171af..b299b2e86ca403 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/gauge/style_panel.tsx
@@ -22,9 +22,9 @@ import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { SelectOption } from '../../../../../../../plugins/charts/public';
-import { GaugeOptionsInternalProps } from '.';
-import { AggGroupNames } from '../../../../../../../plugins/data/public';
+import { SelectOption } from '../../../../../charts/public';
+import { GaugeOptionsInternalProps } from '../gauge';
+import { AggGroupNames } from '../../../../../data/public';
 
 function StylePanel({ aggs, setGaugeValue, stateParams, vis }: GaugeOptionsInternalProps) {
   const diasableAlignment =
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx b/src/plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
rename to src/plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
index dc207ad89286f2..7a89496d9441e8 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/heatmap/index.tsx
@@ -33,7 +33,7 @@ import {
   SwitchOption,
   SetColorSchemaOptionsValue,
   SetColorRangeValue,
-} from '../../../../../../../plugins/charts/public';
+} from '../../../../../charts/public';
 import { HeatmapVisParams } from '../../../heatmap';
 import { ValueAxis } from '../../../types';
 import { LabelsPanel } from './labels_panel';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
index 3d1629740df2c8..8d5f529ce0fc76 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/heatmap/labels_panel.tsx
@@ -26,7 +26,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { ValueAxis } from '../../../types';
 import { HeatmapVisParams } from '../../../heatmap';
-import { SwitchOption } from '../../../../../../../plugins/charts/public';
+import { SwitchOption } from '../../../../../charts/public';
 
 const VERTICAL_ROTATION = 270;
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/index.ts b/src/plugins/vis_type_vislib/public/components/options/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/index.ts
rename to src/plugins/vis_type_vislib/public/components/options/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/category_axis_panel.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/category_axis_panel.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/category_axis_panel.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/category_axis_panel.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/chart_options.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/custom_extents_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/custom_extents_options.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/custom_extents_options.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/custom_extents_options.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/index.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/label_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/label_options.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/label_options.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/label_options.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/line_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/line_options.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/line_options.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/line_options.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axes_panel.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/value_axis_options.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/y_extents.test.tsx.snap b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/y_extents.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/y_extents.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/__snapshots__/y_extents.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx
index 91cdcd0f456b15..44ed0d5aeddabd 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.test.tsx
@@ -25,8 +25,6 @@ import { Positions } from '../../../utils/collections';
 import { LabelOptions } from './label_options';
 import { categoryAxis, vis } from './mocks';
 
-jest.mock('ui/new_platform');
-
 describe('CategoryAxisPanel component', () => {
   let setCategoryAxis: jest.Mock;
   let onPositionChanged: jest.Mock;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
index 246c20a14807c5..468fb1f8c315af 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/category_axis_panel.tsx
@@ -25,7 +25,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { Axis } from '../../../types';
-import { SelectOption, SwitchOption } from '../../../../../../../plugins/charts/public';
+import { SelectOption, SwitchOption } from '../../../../../charts/public';
 import { LabelOptions, SetAxisLabel } from './label_options';
 import { Positions } from '../../../utils/collections';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx
index c913fd4f35713d..e2d4a0db9f1f9c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.test.tsx
@@ -25,8 +25,6 @@ import { LineOptions } from './line_options';
 import { ChartTypes, ChartModes } from '../../../utils/collections';
 import { valueAxis, seriesParam, vis } from './mocks';
 
-jest.mock('ui/new_platform');
-
 describe('ChartOptions component', () => {
   let setParamByIndex: jest.Mock;
   let changeValueAxis: jest.Mock;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
index 89aab3a19c5897..623a8d1f348e93 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/chart_options.tsx
@@ -22,12 +22,12 @@ import React, { useMemo, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 
-import { Vis } from '../../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../../visualizations/public';
 import { SeriesParam, ValueAxis } from '../../../types';
 import { ChartTypes } from '../../../utils/collections';
-import { SelectOption } from '../../../../../../../plugins/charts/public';
+import { SelectOption } from '../../../../../charts/public';
 import { LineOptions } from './line_options';
-import { SetParamByIndex, ChangeValueAxis } from './';
+import { SetParamByIndex, ChangeValueAxis } from '.';
 
 export type SetChart = <T extends keyof SeriesParam>(paramName: T, value: SeriesParam[T]) => void;
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx
index a93ee454a7afd1..4798c67928f7f6 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.test.tsx
@@ -28,8 +28,6 @@ const DEFAULT_Y_EXTENTS = 'defaultYExtents';
 const SCALE = 'scale';
 const SET_Y_EXTENTS = 'setYExtents';
 
-jest.mock('ui/new_platform');
-
 describe('CustomExtentsOptions component', () => {
   let setValueAxis: jest.Mock;
   let setValueAxisScale: jest.Mock;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
index a3a97df9e35ae2..634d6b3f0641cd 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/custom_extents_options.tsx
@@ -21,7 +21,7 @@ import React, { useCallback, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 
 import { ValueAxis } from '../../../types';
-import { NumberInputOption, SwitchOption } from '../../../../../../../plugins/charts/public';
+import { NumberInputOption, SwitchOption } from '../../../../../charts/public';
 import { YExtents } from './y_extents';
 import { SetScale } from './value_axis_options';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.test.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/index.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx
index 48fcbdf8f9082e..f500b7e58e9fdb 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.test.tsx
@@ -23,8 +23,6 @@ import { LabelOptions, LabelOptionsProps } from './label_options';
 import { TruncateLabelsOption } from '../../common';
 import { valueAxis } from './mocks';
 
-jest.mock('ui/new_platform');
-
 const FILTER = 'filter';
 const ROTATE = 'rotate';
 const DISABLED = 'disabled';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
index bc687e56646f63..14e1da6ebcc701 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/label_options.tsx
@@ -26,7 +26,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { Axis } from '../../../types';
 import { TruncateLabelsOption } from '../../common';
 import { getRotateOptions } from '../../../utils/collections';
-import { SelectOption, SwitchOption } from '../../../../../../../plugins/charts/public';
+import { SelectOption, SwitchOption } from '../../../../../charts/public';
 
 export type SetAxisLabel = <T extends keyof Axis['labels']>(
   paramName: T,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
index 5354bc9c033e6e..e90c96146ec2cd 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.test.tsx
@@ -20,11 +20,9 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { LineOptions, LineOptionsParams } from './line_options';
-import { NumberInputOption } from '../../../../../../../plugins/charts/public';
+import { NumberInputOption } from '../../../../../charts/public';
 import { seriesParam, vis } from './mocks';
 
-jest.mock('ui/new_platform');
-
 const LINE_WIDTH = 'lineWidth';
 const DRAW_LINES = 'drawLinesBetweenPoints';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
index 76f95bd93caf8c..4b0cce94267f12 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/line_options.tsx
@@ -22,13 +22,9 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
 
-import { Vis } from '../../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../../visualizations/public';
 import { SeriesParam } from '../../../types';
-import {
-  NumberInputOption,
-  SelectOption,
-  SwitchOption,
-} from '../../../../../../../plugins/charts/public';
+import { NumberInputOption, SelectOption, SwitchOption } from '../../../../../charts/public';
 import { SetChart } from './chart_options';
 
 export interface LineOptionsParams {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
index a296281375daca..277fcf0cdbc3de 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/mocks.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Vis } from '../../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../../visualizations/public';
 import { Axis, ValueAxis, SeriesParam } from '../../../types';
 import {
   ChartTypes,
@@ -31,7 +31,7 @@ import {
   getPositions,
   getInterpolationModes,
 } from '../../../utils/collections';
-import { Style } from '../../../../../../../plugins/charts/public';
+import { Style } from '../../../../../charts/public';
 
 const defaultValueAxisId = 'ValueAxis-1';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx
similarity index 95%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx
index 22a726b53363b0..27c423860972c0 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/series_panel.tsx
@@ -23,10 +23,10 @@ import { EuiPanel, EuiTitle, EuiSpacer, EuiAccordion } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { Vis } from '../../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../../visualizations/public';
 import { ValueAxis, SeriesParam } from '../../../types';
 import { ChartOptions } from './chart_options';
-import { SetParamByIndex, ChangeValueAxis } from './';
+import { SetParamByIndex, ChangeValueAxis } from '.';
 
 export interface SeriesPanelProps {
   changeValueAxis: ChangeValueAxis;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/utils.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx
index 141273fa6bc3f8..2f7dd4071b52cd 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.test.tsx
@@ -25,8 +25,6 @@ import { Positions } from '../../../utils/collections';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { valueAxis, seriesParam, vis } from './mocks';
 
-jest.mock('ui/new_platform');
-
 describe('ValueAxesPanel component', () => {
   let setParamByIndex: jest.Mock;
   let onValueAxisPositionChanged: jest.Mock;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx
index 912c3b904b110b..b17f67b81d2b04 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axes_panel.tsx
@@ -31,10 +31,10 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { Vis } from '../../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../../visualizations/public';
 import { SeriesParam, ValueAxis } from '../../../types';
 import { ValueAxisOptions } from './value_axis_options';
-import { SetParamByIndex } from './';
+import { SetParamByIndex } from '.';
 
 export interface ValueAxesPanelProps {
   isCategoryAxisHorizontal: boolean;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
index 876a6917ee0b4c..1977bdba6eadfc 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.test.tsx
@@ -21,13 +21,11 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ValueAxisOptions, ValueAxisOptionsParams } from './value_axis_options';
 import { ValueAxis } from '../../../types';
-import { TextInputOption } from '../../../../../../../plugins/charts/public';
+import { TextInputOption } from '../../../../../charts/public';
 import { LabelOptions } from './label_options';
 import { ScaleTypes, Positions } from '../../../utils/collections';
 import { valueAxis, vis } from './mocks';
 
-jest.mock('ui/new_platform');
-
 const POSITION = 'position';
 
 interface PositionOption {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
index 1b89a766d05913..52962fe813b446 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/value_axis_options.tsx
@@ -21,18 +21,14 @@ import React, { useCallback, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiAccordion, EuiHorizontalRule } from '@elastic/eui';
 
-import { Vis } from '../../../../../../../plugins/visualizations/public';
+import { Vis } from '../../../../../visualizations/public';
 import { ValueAxis } from '../../../types';
 import { Positions } from '../../../utils/collections';
-import {
-  SelectOption,
-  SwitchOption,
-  TextInputOption,
-} from '../../../../../../../plugins/charts/public';
+import { SelectOption, SwitchOption, TextInputOption } from '../../../../../charts/public';
 import { LabelOptions, SetAxisLabel } from './label_options';
 import { CustomExtentsOptions } from './custom_extents_options';
 import { isAxisHorizontal } from './utils';
-import { SetParamByIndex } from './';
+import { SetParamByIndex } from '.';
 
 export type SetScale = <T extends keyof ValueAxis['scale']>(
   paramName: T,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
index b5ed475ca8e319..3bacb0be34d135 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.test.tsx
@@ -21,9 +21,7 @@ import React from 'react';
 import { mount, shallow } from 'enzyme';
 import { YExtents, YExtentsProps } from './y_extents';
 import { ScaleTypes } from '../../../utils/collections';
-import { NumberInputOption } from '../../../../../../../plugins/charts/public';
-
-jest.mock('ui/new_platform');
+import { NumberInputOption } from '../../../../../charts/public';
 
 describe('YExtents component', () => {
   let setMultipleValidity: jest.Mock;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
rename to src/plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
index faeb6069b51264..c2aa917dd3a6f6 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/metrics_axes/y_extents.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 
 import { Scale } from '../../../types';
 import { ScaleTypes } from '../../../utils/collections';
-import { NumberInputOption } from '../../../../../../../plugins/charts/public';
+import { NumberInputOption } from '../../../../../charts/public';
 import { SetScale } from './value_axis_options';
 
 const rangeError = i18n.translate('visTypeVislib.controls.pointSeries.valueAxes.minErrorMessage', {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx b/src/plugins/vis_type_vislib/public/components/options/pie.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx
rename to src/plugins/vis_type_vislib/public/components/options/pie.tsx
index f6be9cd0bd8fed..54ba307982967e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/pie.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/pie.tsx
@@ -24,7 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { TruncateLabelsOption } from '../common';
-import { BasicOptions, SwitchOption } from '../../../../../../plugins/charts/public';
+import { BasicOptions, SwitchOption } from '../../../../charts/public';
 import { PieVisParams } from '../../pie';
 
 function PieOptions(props: VisOptionsProps<PieVisParams>) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
index 392d180d2c5f26..0126dce37c9f24 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/point_series/grid_panel.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
-import { SelectOption, SwitchOption } from '../../../../../../../plugins/charts/public';
+import { SelectOption, SwitchOption } from '../../../../../charts/public';
 import { BasicVislibParams, ValueAxis } from '../../../types';
 
 function GridPanel({ stateParams, setValue, hasHistogramAgg }: VisOptionsProps<BasicVislibParams>) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/index.ts b/src/plugins/vis_type_vislib/public/components/options/point_series/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/index.ts
rename to src/plugins/vis_type_vislib/public/components/options/point_series/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx b/src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
rename to src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
index 903c1917751d9e..60458b1f5c41f0 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/point_series/point_series.tsx
@@ -22,7 +22,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 
 import { ValidationVisOptionsProps } from '../../common';
-import { BasicOptions, SwitchOption } from '../../../../../../../plugins/charts/public';
+import { BasicOptions, SwitchOption } from '../../../../../charts/public';
 import { GridPanel } from './grid_panel';
 import { ThresholdPanel } from './threshold_panel';
 import { BasicVislibParams } from '../../../types';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx b/src/plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
rename to src/plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
index 12f058ec7dd1fc..08231803007563 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
+++ b/src/plugins/vis_type_vislib/public/components/options/point_series/threshold_panel.tsx
@@ -26,7 +26,7 @@ import {
   SelectOption,
   SwitchOption,
   RequiredNumberInputOption,
-} from '../../../../../../../plugins/charts/public';
+} from '../../../../../charts/public';
 import { BasicVislibParams } from '../../../types';
 
 function ThresholdPanel({
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_config_normal.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_config_normal.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_config_normal.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_config_normal.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_config_percentage.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_config_percentage.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_config_percentage.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_config_percentage.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_d3.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_d3.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_d3.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_d3.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_data_point.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_data_point.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_bar_chart_data_point.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_bar_chart_data_point.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_heatmap_config.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_heatmap_config.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_heatmap_config.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_heatmap_config.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_heatmap_d3.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_heatmap_d3.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_heatmap_d3.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_heatmap_d3.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_heatmap_data_point.json b/src/plugins/vis_type_vislib/public/fixtures/dispatch_heatmap_data_point.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/fixtures/dispatch_heatmap_data_point.json
rename to src/plugins/vis_type_vislib/public/fixtures/dispatch_heatmap_data_point.json
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns.js
new file mode 100644
index 00000000000000..ff8538021d2756
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_columns.js
@@ -0,0 +1,319 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  columns: [
+    {
+      label: '200: response',
+      xAxisLabel: '@timestamp per 30 sec',
+      ordered: {
+        date: true,
+        interval: 30000,
+        min: 1415826608440,
+        max: 1415827508440,
+      },
+      yAxisLabel: 'Count of documents',
+      xAxisFormatter: function(thing) {
+        return moment(thing);
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 1415826600000,
+              y: 4,
+            },
+            {
+              x: 1415826630000,
+              y: 8,
+            },
+            {
+              x: 1415826660000,
+              y: 7,
+            },
+            {
+              x: 1415826690000,
+              y: 5,
+            },
+            {
+              x: 1415826720000,
+              y: 5,
+            },
+            {
+              x: 1415826750000,
+              y: 4,
+            },
+            {
+              x: 1415826780000,
+              y: 10,
+            },
+            {
+              x: 1415826810000,
+              y: 7,
+            },
+            {
+              x: 1415826840000,
+              y: 9,
+            },
+            {
+              x: 1415826870000,
+              y: 8,
+            },
+            {
+              x: 1415826900000,
+              y: 9,
+            },
+            {
+              x: 1415826930000,
+              y: 8,
+            },
+            {
+              x: 1415826960000,
+              y: 3,
+            },
+            {
+              x: 1415826990000,
+              y: 9,
+            },
+            {
+              x: 1415827020000,
+              y: 6,
+            },
+            {
+              x: 1415827050000,
+              y: 8,
+            },
+            {
+              x: 1415827080000,
+              y: 7,
+            },
+            {
+              x: 1415827110000,
+              y: 4,
+            },
+            {
+              x: 1415827140000,
+              y: 6,
+            },
+            {
+              x: 1415827170000,
+              y: 10,
+            },
+            {
+              x: 1415827200000,
+              y: 2,
+            },
+            {
+              x: 1415827230000,
+              y: 8,
+            },
+            {
+              x: 1415827260000,
+              y: 5,
+            },
+            {
+              x: 1415827290000,
+              y: 6,
+            },
+            {
+              x: 1415827320000,
+              y: 6,
+            },
+            {
+              x: 1415827350000,
+              y: 10,
+            },
+            {
+              x: 1415827380000,
+              y: 6,
+            },
+            {
+              x: 1415827410000,
+              y: 6,
+            },
+            {
+              x: 1415827440000,
+              y: 12,
+            },
+            {
+              x: 1415827470000,
+              y: 9,
+            },
+            {
+              x: 1415827500000,
+              y: 1,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      label: '503: response',
+      xAxisLabel: '@timestamp per 30 sec',
+      ordered: {
+        date: true,
+        interval: 30000,
+        min: 1415826608440,
+        max: 1415827508440,
+      },
+      yAxisLabel: 'Count of documents',
+      xAxisFormatter: function(thing) {
+        return moment(thing);
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 1415826630000,
+              y: 1,
+            },
+            {
+              x: 1415826660000,
+              y: 1,
+            },
+            {
+              x: 1415826720000,
+              y: 1,
+            },
+            {
+              x: 1415826780000,
+              y: 1,
+            },
+            {
+              x: 1415826900000,
+              y: 1,
+            },
+            {
+              x: 1415827020000,
+              y: 1,
+            },
+            {
+              x: 1415827080000,
+              y: 1,
+            },
+            {
+              x: 1415827110000,
+              y: 2,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      label: '404: response',
+      xAxisLabel: '@timestamp per 30 sec',
+      ordered: {
+        date: true,
+        interval: 30000,
+        min: 1415826608440,
+        max: 1415827508440,
+      },
+      yAxisLabel: 'Count of documents',
+      xAxisFormatter: function(thing) {
+        return moment(thing);
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 1415826660000,
+              y: 1,
+            },
+            {
+              x: 1415826720000,
+              y: 1,
+            },
+            {
+              x: 1415826810000,
+              y: 1,
+            },
+            {
+              x: 1415826960000,
+              y: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 1,
+            },
+            {
+              x: 1415827260000,
+              y: 1,
+            },
+            {
+              x: 1415827380000,
+              y: 1,
+            },
+            {
+              x: 1415827410000,
+              y: 1,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  xAxisOrderedValues: [
+    1415826600000,
+    1415826630000,
+    1415826660000,
+    1415826690000,
+    1415826720000,
+    1415826750000,
+    1415826780000,
+    1415826810000,
+    1415826840000,
+    1415826870000,
+    1415826900000,
+    1415826930000,
+    1415826960000,
+    1415826990000,
+    1415827020000,
+    1415827050000,
+    1415827080000,
+    1415827110000,
+    1415827140000,
+    1415827170000,
+    1415827200000,
+    1415827230000,
+    1415827260000,
+    1415827290000,
+    1415827320000,
+    1415827350000,
+    1415827380000,
+    1415827410000,
+    1415827440000,
+    1415827470000,
+    1415827500000,
+  ],
+  hits: 225,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows.js
new file mode 100644
index 00000000000000..6367197acdecea
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows.js
@@ -0,0 +1,1697 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  rows: [
+    {
+      label: '0.0-1000.0: bytes',
+      xAxisLabel: '@timestamp per 30 sec',
+      ordered: {
+        date: true,
+        interval: 30000,
+        min: 1415826260456,
+        max: 1415827160456,
+      },
+      yAxisLabel: 'Count of documents',
+      xAxisFormatter: function(thing) {
+        return moment(thing);
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+      series: [
+        {
+          label: 'jpg',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'css',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'png',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827110000,
+              y: 1,
+              y0: 1,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'php',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827110000,
+              y: 0,
+              y0: 2,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'gif',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 3,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826660000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 1,
+              y0: 1,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 1,
+              y0: 1,
+            },
+            {
+              x: 1415827110000,
+              y: 1,
+              y0: 2,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      label: '1000.0-2000.0: bytes',
+      xAxisLabel: '@timestamp per 30 sec',
+      ordered: {
+        date: true,
+        interval: 30000,
+        min: 1415826260457,
+        max: 1415827160457,
+      },
+      yAxisLabel: 'Count of documents',
+      xAxisFormatter: function(thing) {
+        return moment(thing);
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+      series: [
+        {
+          label: 'jpg',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826660000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826810000,
+              y: 2,
+              y0: 0,
+            },
+            {
+              x: 1415826840000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'css',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 2,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'png',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 2,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'php',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 2,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+        {
+          label: 'gif',
+          values: [
+            {
+              x: 1415826240000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826270000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826300000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826330000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826360000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826390000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826420000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826450000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826480000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826510000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826540000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826570000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826600000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826630000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826660000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826690000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826720000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826750000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826780000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826810000,
+              y: 0,
+              y0: 2,
+            },
+            {
+              x: 1415826840000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826870000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826900000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415826930000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826960000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415826990000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827020000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827050000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827080000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 1415827110000,
+              y: 0,
+              y0: 1,
+            },
+            {
+              x: 1415827140000,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  xAxisOrderedValues: [
+    1415826240000,
+    1415826270000,
+    1415826300000,
+    1415826330000,
+    1415826360000,
+    1415826390000,
+    1415826420000,
+    1415826450000,
+    1415826480000,
+    1415826510000,
+    1415826540000,
+    1415826570000,
+    1415826600000,
+    1415826630000,
+    1415826660000,
+    1415826690000,
+    1415826720000,
+    1415826750000,
+    1415826780000,
+    1415826810000,
+    1415826840000,
+    1415826870000,
+    1415826900000,
+    1415826930000,
+    1415826960000,
+    1415826990000,
+    1415827020000,
+    1415827050000,
+    1415827080000,
+    1415827110000,
+    1415827140000,
+  ],
+  hits: 236,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes.js
new file mode 100644
index 00000000000000..ba0d8bf251c6fa
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_rows_series_with_holes.js
@@ -0,0 +1,142 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export const rowsSeriesWithHoles = {
+  rows: [
+    {
+      label: '',
+      xAxisLabel: '@timestamp per 30 sec',
+      ordered: {
+        date: true,
+        min: 1411761457636,
+        max: 1411762357636,
+        interval: 30000,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 1411761450000,
+              y: 41,
+            },
+            {
+              x: 1411761510000,
+              y: 22,
+            },
+            {
+              x: 1411761540000,
+              y: 17,
+            },
+            {
+              x: 1411761840000,
+              y: 20,
+            },
+            {
+              x: 1411761870000,
+              y: 20,
+            },
+            {
+              x: 1411761900000,
+              y: 21,
+            },
+            {
+              x: 1411761930000,
+              y: 17,
+            },
+            {
+              x: 1411761960000,
+              y: 20,
+            },
+            {
+              x: 1411761990000,
+              y: 13,
+            },
+            {
+              x: 1411762020000,
+              y: 14,
+            },
+            {
+              x: 1411762050000,
+              y: 25,
+            },
+            {
+              x: 1411762080000,
+              y: 17,
+            },
+            {
+              x: 1411762110000,
+              y: 14,
+            },
+            {
+              x: 1411762140000,
+              y: 22,
+            },
+            {
+              x: 1411762170000,
+              y: 14,
+            },
+            {
+              x: 1411762200000,
+              y: 19,
+            },
+            {
+              x: 1411762320000,
+              y: 15,
+            },
+            {
+              x: 1411762350000,
+              y: 4,
+            },
+          ],
+        },
+      ],
+      hits: 533,
+      xAxisFormatter: function(thing) {
+        return moment(thing);
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  xAxisOrderedValues: [
+    1411761450000,
+    1411761510000,
+    1411761540000,
+    1411761840000,
+    1411761870000,
+    1411761900000,
+    1411761930000,
+    1411761960000,
+    1411761990000,
+    1411762020000,
+    1411762050000,
+    1411762080000,
+    1411762110000,
+    1411762140000,
+    1411762170000,
+    1411762200000,
+    1411762320000,
+    1411762350000,
+  ],
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series.js
new file mode 100644
index 00000000000000..89e4f9a32cee16
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series.js
@@ -0,0 +1,203 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  label: '',
+  xAxisLabel: '@timestamp per 30 sec',
+  ordered: {
+    date: true,
+    min: 1411761457636,
+    max: 1411762357636,
+    interval: 30000,
+  },
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 1411761450000,
+          y: 41,
+        },
+        {
+          x: 1411761480000,
+          y: 18,
+        },
+        {
+          x: 1411761510000,
+          y: 22,
+        },
+        {
+          x: 1411761540000,
+          y: 17,
+        },
+        {
+          x: 1411761570000,
+          y: 17,
+        },
+        {
+          x: 1411761600000,
+          y: 21,
+        },
+        {
+          x: 1411761630000,
+          y: 16,
+        },
+        {
+          x: 1411761660000,
+          y: 17,
+        },
+        {
+          x: 1411761690000,
+          y: 15,
+        },
+        {
+          x: 1411761720000,
+          y: 19,
+        },
+        {
+          x: 1411761750000,
+          y: 11,
+        },
+        {
+          x: 1411761780000,
+          y: 13,
+        },
+        {
+          x: 1411761810000,
+          y: 24,
+        },
+        {
+          x: 1411761840000,
+          y: 20,
+        },
+        {
+          x: 1411761870000,
+          y: 20,
+        },
+        {
+          x: 1411761900000,
+          y: 21,
+        },
+        {
+          x: 1411761930000,
+          y: 17,
+        },
+        {
+          x: 1411761960000,
+          y: 20,
+        },
+        {
+          x: 1411761990000,
+          y: 13,
+        },
+        {
+          x: 1411762020000,
+          y: 14,
+        },
+        {
+          x: 1411762050000,
+          y: 25,
+        },
+        {
+          x: 1411762080000,
+          y: 17,
+        },
+        {
+          x: 1411762110000,
+          y: 14,
+        },
+        {
+          x: 1411762140000,
+          y: 22,
+        },
+        {
+          x: 1411762170000,
+          y: 14,
+        },
+        {
+          x: 1411762200000,
+          y: 19,
+        },
+        {
+          x: 1411762230000,
+          y: 22,
+        },
+        {
+          x: 1411762260000,
+          y: 17,
+        },
+        {
+          x: 1411762290000,
+          y: 8,
+        },
+        {
+          x: 1411762320000,
+          y: 15,
+        },
+        {
+          x: 1411762350000,
+          y: 4,
+        },
+      ],
+    },
+  ],
+  hits: 533,
+  xAxisOrderedValues: [
+    1411761450000,
+    1411761480000,
+    1411761510000,
+    1411761540000,
+    1411761570000,
+    1411761600000,
+    1411761630000,
+    1411761660000,
+    1411761690000,
+    1411761720000,
+    1411761750000,
+    1411761780000,
+    1411761810000,
+    1411761840000,
+    1411761870000,
+    1411761900000,
+    1411761930000,
+    1411761960000,
+    1411761990000,
+    1411762020000,
+    1411762050000,
+    1411762080000,
+    1411762110000,
+    1411762140000,
+    1411762170000,
+    1411762200000,
+    1411762230000,
+    1411762260000,
+    1411762290000,
+    1411762320000,
+    1411762350000,
+  ],
+  xAxisFormatter: function(thing) {
+    return moment(thing);
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval.js
new file mode 100644
index 00000000000000..85078a2ec15af2
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_monthly_interval.js
@@ -0,0 +1,108 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export const seriesMonthlyInterval = {
+  label: '',
+  xAxisLabel: '@timestamp per month',
+  ordered: {
+    date: true,
+    min: 1451631600000,
+    max: 1483254000000,
+    interval: 2678000000,
+  },
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 1451631600000,
+          y: 10220,
+        },
+        {
+          x: 1454310000000,
+          y: 9997,
+        },
+        {
+          x: 1456815600000,
+          y: 10792,
+        },
+        {
+          x: 1459490400000,
+          y: 10262,
+        },
+        {
+          x: 1462082400000,
+          y: 10080,
+        },
+        {
+          x: 1464760800000,
+          y: 11161,
+        },
+        {
+          x: 1467352800000,
+          y: 9933,
+        },
+        {
+          x: 1470031200000,
+          y: 10342,
+        },
+        {
+          x: 1472709600000,
+          y: 10887,
+        },
+        {
+          x: 1475301600000,
+          y: 9666,
+        },
+        {
+          x: 1477980000000,
+          y: 9556,
+        },
+        {
+          x: 1480575600000,
+          y: 11644,
+        },
+      ],
+    },
+  ],
+  hits: 533,
+  xAxisOrderedValues: [
+    1451631600000,
+    1454310000000,
+    1456815600000,
+    1459490400000,
+    1462082400000,
+    1464760800000,
+    1467352800000,
+    1470031200000,
+    1472709600000,
+    1475301600000,
+    1477980000000,
+    1480575600000,
+  ],
+  xAxisFormatter: function(thing) {
+    return moment(thing);
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg.js
new file mode 100644
index 00000000000000..821c04685d22e5
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_neg.js
@@ -0,0 +1,203 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  label: '',
+  xAxisLabel: '@timestamp per 30 sec',
+  ordered: {
+    date: true,
+    min: 1411761457636,
+    max: 1411762357636,
+    interval: 30000,
+  },
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 1411761450000,
+          y: -41,
+        },
+        {
+          x: 1411761480000,
+          y: -18,
+        },
+        {
+          x: 1411761510000,
+          y: -22,
+        },
+        {
+          x: 1411761540000,
+          y: -17,
+        },
+        {
+          x: 1411761570000,
+          y: -17,
+        },
+        {
+          x: 1411761600000,
+          y: -21,
+        },
+        {
+          x: 1411761630000,
+          y: -16,
+        },
+        {
+          x: 1411761660000,
+          y: -17,
+        },
+        {
+          x: 1411761690000,
+          y: -15,
+        },
+        {
+          x: 1411761720000,
+          y: -19,
+        },
+        {
+          x: 1411761750000,
+          y: -11,
+        },
+        {
+          x: 1411761780000,
+          y: -13,
+        },
+        {
+          x: 1411761810000,
+          y: -24,
+        },
+        {
+          x: 1411761840000,
+          y: -20,
+        },
+        {
+          x: 1411761870000,
+          y: -20,
+        },
+        {
+          x: 1411761900000,
+          y: -21,
+        },
+        {
+          x: 1411761930000,
+          y: -17,
+        },
+        {
+          x: 1411761960000,
+          y: -20,
+        },
+        {
+          x: 1411761990000,
+          y: -13,
+        },
+        {
+          x: 1411762020000,
+          y: -14,
+        },
+        {
+          x: 1411762050000,
+          y: -25,
+        },
+        {
+          x: 1411762080000,
+          y: -17,
+        },
+        {
+          x: 1411762110000,
+          y: -14,
+        },
+        {
+          x: 1411762140000,
+          y: -22,
+        },
+        {
+          x: 1411762170000,
+          y: -14,
+        },
+        {
+          x: 1411762200000,
+          y: -19,
+        },
+        {
+          x: 1411762230000,
+          y: -22,
+        },
+        {
+          x: 1411762260000,
+          y: -17,
+        },
+        {
+          x: 1411762290000,
+          y: -8,
+        },
+        {
+          x: 1411762320000,
+          y: -15,
+        },
+        {
+          x: 1411762350000,
+          y: -4,
+        },
+      ],
+    },
+  ],
+  hits: 533,
+  xAxisOrderedValues: [
+    1411761450000,
+    1411761480000,
+    1411761510000,
+    1411761540000,
+    1411761570000,
+    1411761600000,
+    1411761630000,
+    1411761660000,
+    1411761690000,
+    1411761720000,
+    1411761750000,
+    1411761780000,
+    1411761810000,
+    1411761840000,
+    1411761870000,
+    1411761900000,
+    1411761930000,
+    1411761960000,
+    1411761990000,
+    1411762020000,
+    1411762050000,
+    1411762080000,
+    1411762110000,
+    1411762140000,
+    1411762170000,
+    1411762200000,
+    1411762230000,
+    1411762260000,
+    1411762290000,
+    1411762320000,
+    1411762350000,
+  ],
+  xAxisFormatter: function(thing) {
+    return moment(thing);
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg.js
new file mode 100644
index 00000000000000..65821ac58eb0db
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_series_pos_neg.js
@@ -0,0 +1,203 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  label: '',
+  xAxisLabel: '@timestamp per 30 sec',
+  ordered: {
+    date: true,
+    min: 1411761457636,
+    max: 1411762357636,
+    interval: 30000,
+  },
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 1411761450000,
+          y: 41,
+        },
+        {
+          x: 1411761480000,
+          y: 18,
+        },
+        {
+          x: 1411761510000,
+          y: -22,
+        },
+        {
+          x: 1411761540000,
+          y: -17,
+        },
+        {
+          x: 1411761570000,
+          y: -17,
+        },
+        {
+          x: 1411761600000,
+          y: -21,
+        },
+        {
+          x: 1411761630000,
+          y: -16,
+        },
+        {
+          x: 1411761660000,
+          y: 17,
+        },
+        {
+          x: 1411761690000,
+          y: 15,
+        },
+        {
+          x: 1411761720000,
+          y: 19,
+        },
+        {
+          x: 1411761750000,
+          y: 11,
+        },
+        {
+          x: 1411761780000,
+          y: -13,
+        },
+        {
+          x: 1411761810000,
+          y: -24,
+        },
+        {
+          x: 1411761840000,
+          y: -20,
+        },
+        {
+          x: 1411761870000,
+          y: -20,
+        },
+        {
+          x: 1411761900000,
+          y: -21,
+        },
+        {
+          x: 1411761930000,
+          y: 17,
+        },
+        {
+          x: 1411761960000,
+          y: 20,
+        },
+        {
+          x: 1411761990000,
+          y: -13,
+        },
+        {
+          x: 1411762020000,
+          y: -14,
+        },
+        {
+          x: 1411762050000,
+          y: 25,
+        },
+        {
+          x: 1411762080000,
+          y: -17,
+        },
+        {
+          x: 1411762110000,
+          y: -14,
+        },
+        {
+          x: 1411762140000,
+          y: -22,
+        },
+        {
+          x: 1411762170000,
+          y: -14,
+        },
+        {
+          x: 1411762200000,
+          y: 19,
+        },
+        {
+          x: 1411762230000,
+          y: 22,
+        },
+        {
+          x: 1411762260000,
+          y: 17,
+        },
+        {
+          x: 1411762290000,
+          y: 8,
+        },
+        {
+          x: 1411762320000,
+          y: -15,
+        },
+        {
+          x: 1411762350000,
+          y: -4,
+        },
+      ],
+    },
+  ],
+  hits: 533,
+  xAxisOrderedValues: [
+    1411761450000,
+    1411761480000,
+    1411761510000,
+    1411761540000,
+    1411761570000,
+    1411761600000,
+    1411761630000,
+    1411761660000,
+    1411761690000,
+    1411761720000,
+    1411761750000,
+    1411761780000,
+    1411761810000,
+    1411761840000,
+    1411761870000,
+    1411761900000,
+    1411761930000,
+    1411761960000,
+    1411761990000,
+    1411762020000,
+    1411762050000,
+    1411762080000,
+    1411762110000,
+    1411762140000,
+    1411762170000,
+    1411762200000,
+    1411762230000,
+    1411762260000,
+    1411762290000,
+    1411762320000,
+    1411762350000,
+  ],
+  xAxisFormatter: function(thing) {
+    return moment(thing);
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series.js
new file mode 100644
index 00000000000000..b6f731c9655d41
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/date_histogram/_stacked_series.js
@@ -0,0 +1,1576 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  label: '',
+  xAxisLabel: '@timestamp per 10 min',
+  ordered: {
+    date: true,
+    min: 1413544140087,
+    max: 1413587340087,
+    interval: 600000,
+  },
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'html',
+      values: [
+        {
+          x: 1413543600000,
+          y: 140,
+        },
+        {
+          x: 1413544200000,
+          y: 1388,
+        },
+        {
+          x: 1413544800000,
+          y: 1308,
+        },
+        {
+          x: 1413545400000,
+          y: 1356,
+        },
+        {
+          x: 1413546000000,
+          y: 1314,
+        },
+        {
+          x: 1413546600000,
+          y: 1343,
+        },
+        {
+          x: 1413547200000,
+          y: 1353,
+        },
+        {
+          x: 1413547800000,
+          y: 1353,
+        },
+        {
+          x: 1413548400000,
+          y: 1334,
+        },
+        {
+          x: 1413549000000,
+          y: 1433,
+        },
+        {
+          x: 1413549600000,
+          y: 1331,
+        },
+        {
+          x: 1413550200000,
+          y: 1349,
+        },
+        {
+          x: 1413550800000,
+          y: 1323,
+        },
+        {
+          x: 1413551400000,
+          y: 1203,
+        },
+        {
+          x: 1413552000000,
+          y: 1231,
+        },
+        {
+          x: 1413552600000,
+          y: 1227,
+        },
+        {
+          x: 1413553200000,
+          y: 1187,
+        },
+        {
+          x: 1413553800000,
+          y: 1119,
+        },
+        {
+          x: 1413554400000,
+          y: 1159,
+        },
+        {
+          x: 1413555000000,
+          y: 1117,
+        },
+        {
+          x: 1413555600000,
+          y: 1152,
+        },
+        {
+          x: 1413556200000,
+          y: 1057,
+        },
+        {
+          x: 1413556800000,
+          y: 1009,
+        },
+        {
+          x: 1413557400000,
+          y: 979,
+        },
+        {
+          x: 1413558000000,
+          y: 975,
+        },
+        {
+          x: 1413558600000,
+          y: 848,
+        },
+        {
+          x: 1413559200000,
+          y: 873,
+        },
+        {
+          x: 1413559800000,
+          y: 808,
+        },
+        {
+          x: 1413560400000,
+          y: 784,
+        },
+        {
+          x: 1413561000000,
+          y: 799,
+        },
+        {
+          x: 1413561600000,
+          y: 684,
+        },
+        {
+          x: 1413562200000,
+          y: 727,
+        },
+        {
+          x: 1413562800000,
+          y: 621,
+        },
+        {
+          x: 1413563400000,
+          y: 615,
+        },
+        {
+          x: 1413564000000,
+          y: 569,
+        },
+        {
+          x: 1413564600000,
+          y: 523,
+        },
+        {
+          x: 1413565200000,
+          y: 474,
+        },
+        {
+          x: 1413565800000,
+          y: 470,
+        },
+        {
+          x: 1413566400000,
+          y: 466,
+        },
+        {
+          x: 1413567000000,
+          y: 394,
+        },
+        {
+          x: 1413567600000,
+          y: 404,
+        },
+        {
+          x: 1413568200000,
+          y: 389,
+        },
+        {
+          x: 1413568800000,
+          y: 312,
+        },
+        {
+          x: 1413569400000,
+          y: 274,
+        },
+        {
+          x: 1413570000000,
+          y: 285,
+        },
+        {
+          x: 1413570600000,
+          y: 299,
+        },
+        {
+          x: 1413571200000,
+          y: 207,
+        },
+        {
+          x: 1413571800000,
+          y: 213,
+        },
+        {
+          x: 1413572400000,
+          y: 119,
+        },
+        {
+          x: 1413573600000,
+          y: 122,
+        },
+        {
+          x: 1413574200000,
+          y: 169,
+        },
+        {
+          x: 1413574800000,
+          y: 151,
+        },
+        {
+          x: 1413575400000,
+          y: 152,
+        },
+        {
+          x: 1413576000000,
+          y: 115,
+        },
+        {
+          x: 1413576600000,
+          y: 117,
+        },
+        {
+          x: 1413577200000,
+          y: 108,
+        },
+        {
+          x: 1413577800000,
+          y: 100,
+        },
+        {
+          x: 1413578400000,
+          y: 78,
+        },
+        {
+          x: 1413579000000,
+          y: 88,
+        },
+        {
+          x: 1413579600000,
+          y: 63,
+        },
+        {
+          x: 1413580200000,
+          y: 58,
+        },
+        {
+          x: 1413580800000,
+          y: 45,
+        },
+        {
+          x: 1413581400000,
+          y: 57,
+        },
+        {
+          x: 1413582000000,
+          y: 34,
+        },
+        {
+          x: 1413582600000,
+          y: 41,
+        },
+        {
+          x: 1413583200000,
+          y: 24,
+        },
+        {
+          x: 1413583800000,
+          y: 27,
+        },
+        {
+          x: 1413584400000,
+          y: 19,
+        },
+        {
+          x: 1413585000000,
+          y: 24,
+        },
+        {
+          x: 1413585600000,
+          y: 18,
+        },
+        {
+          x: 1413586200000,
+          y: 17,
+        },
+        {
+          x: 1413586800000,
+          y: 14,
+        },
+      ],
+    },
+    {
+      label: 'php',
+      values: [
+        {
+          x: 1413543600000,
+          y: 90,
+        },
+        {
+          x: 1413544200000,
+          y: 949,
+        },
+        {
+          x: 1413544800000,
+          y: 1012,
+        },
+        {
+          x: 1413545400000,
+          y: 1027,
+        },
+        {
+          x: 1413546000000,
+          y: 1073,
+        },
+        {
+          x: 1413546600000,
+          y: 992,
+        },
+        {
+          x: 1413547200000,
+          y: 1005,
+        },
+        {
+          x: 1413547800000,
+          y: 1014,
+        },
+        {
+          x: 1413548400000,
+          y: 987,
+        },
+        {
+          x: 1413549000000,
+          y: 982,
+        },
+        {
+          x: 1413549600000,
+          y: 1086,
+        },
+        {
+          x: 1413550200000,
+          y: 998,
+        },
+        {
+          x: 1413550800000,
+          y: 935,
+        },
+        {
+          x: 1413551400000,
+          y: 995,
+        },
+        {
+          x: 1413552000000,
+          y: 926,
+        },
+        {
+          x: 1413552600000,
+          y: 897,
+        },
+        {
+          x: 1413553200000,
+          y: 873,
+        },
+        {
+          x: 1413553800000,
+          y: 885,
+        },
+        {
+          x: 1413554400000,
+          y: 859,
+        },
+        {
+          x: 1413555000000,
+          y: 852,
+        },
+        {
+          x: 1413555600000,
+          y: 779,
+        },
+        {
+          x: 1413556200000,
+          y: 739,
+        },
+        {
+          x: 1413556800000,
+          y: 783,
+        },
+        {
+          x: 1413557400000,
+          y: 784,
+        },
+        {
+          x: 1413558000000,
+          y: 687,
+        },
+        {
+          x: 1413558600000,
+          y: 660,
+        },
+        {
+          x: 1413559200000,
+          y: 672,
+        },
+        {
+          x: 1413559800000,
+          y: 600,
+        },
+        {
+          x: 1413560400000,
+          y: 659,
+        },
+        {
+          x: 1413561000000,
+          y: 540,
+        },
+        {
+          x: 1413561600000,
+          y: 539,
+        },
+        {
+          x: 1413562200000,
+          y: 481,
+        },
+        {
+          x: 1413562800000,
+          y: 498,
+        },
+        {
+          x: 1413563400000,
+          y: 444,
+        },
+        {
+          x: 1413564000000,
+          y: 452,
+        },
+        {
+          x: 1413564600000,
+          y: 408,
+        },
+        {
+          x: 1413565200000,
+          y: 358,
+        },
+        {
+          x: 1413565800000,
+          y: 321,
+        },
+        {
+          x: 1413566400000,
+          y: 305,
+        },
+        {
+          x: 1413567000000,
+          y: 292,
+        },
+        {
+          x: 1413567600000,
+          y: 289,
+        },
+        {
+          x: 1413568200000,
+          y: 239,
+        },
+        {
+          x: 1413568800000,
+          y: 256,
+        },
+        {
+          x: 1413569400000,
+          y: 220,
+        },
+        {
+          x: 1413570000000,
+          y: 205,
+        },
+        {
+          x: 1413570600000,
+          y: 201,
+        },
+        {
+          x: 1413571200000,
+          y: 183,
+        },
+        {
+          x: 1413571800000,
+          y: 172,
+        },
+        {
+          x: 1413572400000,
+          y: 73,
+        },
+        {
+          x: 1413573600000,
+          y: 90,
+        },
+        {
+          x: 1413574200000,
+          y: 130,
+        },
+        {
+          x: 1413574800000,
+          y: 104,
+        },
+        {
+          x: 1413575400000,
+          y: 108,
+        },
+        {
+          x: 1413576000000,
+          y: 92,
+        },
+        {
+          x: 1413576600000,
+          y: 79,
+        },
+        {
+          x: 1413577200000,
+          y: 90,
+        },
+        {
+          x: 1413577800000,
+          y: 72,
+        },
+        {
+          x: 1413578400000,
+          y: 68,
+        },
+        {
+          x: 1413579000000,
+          y: 52,
+        },
+        {
+          x: 1413579600000,
+          y: 60,
+        },
+        {
+          x: 1413580200000,
+          y: 51,
+        },
+        {
+          x: 1413580800000,
+          y: 32,
+        },
+        {
+          x: 1413581400000,
+          y: 37,
+        },
+        {
+          x: 1413582000000,
+          y: 30,
+        },
+        {
+          x: 1413582600000,
+          y: 29,
+        },
+        {
+          x: 1413583200000,
+          y: 24,
+        },
+        {
+          x: 1413583800000,
+          y: 16,
+        },
+        {
+          x: 1413584400000,
+          y: 15,
+        },
+        {
+          x: 1413585000000,
+          y: 15,
+        },
+        {
+          x: 1413585600000,
+          y: 10,
+        },
+        {
+          x: 1413586200000,
+          y: 9,
+        },
+        {
+          x: 1413586800000,
+          y: 9,
+        },
+      ],
+    },
+    {
+      label: 'png',
+      values: [
+        {
+          x: 1413543600000,
+          y: 44,
+        },
+        {
+          x: 1413544200000,
+          y: 495,
+        },
+        {
+          x: 1413544800000,
+          y: 489,
+        },
+        {
+          x: 1413545400000,
+          y: 492,
+        },
+        {
+          x: 1413546000000,
+          y: 556,
+        },
+        {
+          x: 1413546600000,
+          y: 536,
+        },
+        {
+          x: 1413547200000,
+          y: 511,
+        },
+        {
+          x: 1413547800000,
+          y: 479,
+        },
+        {
+          x: 1413548400000,
+          y: 544,
+        },
+        {
+          x: 1413549000000,
+          y: 513,
+        },
+        {
+          x: 1413549600000,
+          y: 501,
+        },
+        {
+          x: 1413550200000,
+          y: 532,
+        },
+        {
+          x: 1413550800000,
+          y: 440,
+        },
+        {
+          x: 1413551400000,
+          y: 455,
+        },
+        {
+          x: 1413552000000,
+          y: 455,
+        },
+        {
+          x: 1413552600000,
+          y: 471,
+        },
+        {
+          x: 1413553200000,
+          y: 428,
+        },
+        {
+          x: 1413553800000,
+          y: 457,
+        },
+        {
+          x: 1413554400000,
+          y: 450,
+        },
+        {
+          x: 1413555000000,
+          y: 418,
+        },
+        {
+          x: 1413555600000,
+          y: 398,
+        },
+        {
+          x: 1413556200000,
+          y: 397,
+        },
+        {
+          x: 1413556800000,
+          y: 359,
+        },
+        {
+          x: 1413557400000,
+          y: 398,
+        },
+        {
+          x: 1413558000000,
+          y: 339,
+        },
+        {
+          x: 1413558600000,
+          y: 363,
+        },
+        {
+          x: 1413559200000,
+          y: 297,
+        },
+        {
+          x: 1413559800000,
+          y: 323,
+        },
+        {
+          x: 1413560400000,
+          y: 302,
+        },
+        {
+          x: 1413561000000,
+          y: 260,
+        },
+        {
+          x: 1413561600000,
+          y: 276,
+        },
+        {
+          x: 1413562200000,
+          y: 249,
+        },
+        {
+          x: 1413562800000,
+          y: 248,
+        },
+        {
+          x: 1413563400000,
+          y: 235,
+        },
+        {
+          x: 1413564000000,
+          y: 234,
+        },
+        {
+          x: 1413564600000,
+          y: 188,
+        },
+        {
+          x: 1413565200000,
+          y: 192,
+        },
+        {
+          x: 1413565800000,
+          y: 173,
+        },
+        {
+          x: 1413566400000,
+          y: 160,
+        },
+        {
+          x: 1413567000000,
+          y: 137,
+        },
+        {
+          x: 1413567600000,
+          y: 158,
+        },
+        {
+          x: 1413568200000,
+          y: 111,
+        },
+        {
+          x: 1413568800000,
+          y: 145,
+        },
+        {
+          x: 1413569400000,
+          y: 118,
+        },
+        {
+          x: 1413570000000,
+          y: 104,
+        },
+        {
+          x: 1413570600000,
+          y: 80,
+        },
+        {
+          x: 1413571200000,
+          y: 79,
+        },
+        {
+          x: 1413571800000,
+          y: 86,
+        },
+        {
+          x: 1413572400000,
+          y: 47,
+        },
+        {
+          x: 1413573600000,
+          y: 49,
+        },
+        {
+          x: 1413574200000,
+          y: 68,
+        },
+        {
+          x: 1413574800000,
+          y: 78,
+        },
+        {
+          x: 1413575400000,
+          y: 77,
+        },
+        {
+          x: 1413576000000,
+          y: 50,
+        },
+        {
+          x: 1413576600000,
+          y: 51,
+        },
+        {
+          x: 1413577200000,
+          y: 40,
+        },
+        {
+          x: 1413577800000,
+          y: 42,
+        },
+        {
+          x: 1413578400000,
+          y: 29,
+        },
+        {
+          x: 1413579000000,
+          y: 24,
+        },
+        {
+          x: 1413579600000,
+          y: 30,
+        },
+        {
+          x: 1413580200000,
+          y: 18,
+        },
+        {
+          x: 1413580800000,
+          y: 15,
+        },
+        {
+          x: 1413581400000,
+          y: 19,
+        },
+        {
+          x: 1413582000000,
+          y: 18,
+        },
+        {
+          x: 1413582600000,
+          y: 13,
+        },
+        {
+          x: 1413583200000,
+          y: 11,
+        },
+        {
+          x: 1413583800000,
+          y: 11,
+        },
+        {
+          x: 1413584400000,
+          y: 13,
+        },
+        {
+          x: 1413585000000,
+          y: 9,
+        },
+        {
+          x: 1413585600000,
+          y: 9,
+        },
+        {
+          x: 1413586200000,
+          y: 9,
+        },
+        {
+          x: 1413586800000,
+          y: 3,
+        },
+      ],
+    },
+    {
+      label: 'css',
+      values: [
+        {
+          x: 1413543600000,
+          y: 35,
+        },
+        {
+          x: 1413544200000,
+          y: 360,
+        },
+        {
+          x: 1413544800000,
+          y: 343,
+        },
+        {
+          x: 1413545400000,
+          y: 329,
+        },
+        {
+          x: 1413546000000,
+          y: 345,
+        },
+        {
+          x: 1413546600000,
+          y: 336,
+        },
+        {
+          x: 1413547200000,
+          y: 330,
+        },
+        {
+          x: 1413547800000,
+          y: 334,
+        },
+        {
+          x: 1413548400000,
+          y: 326,
+        },
+        {
+          x: 1413549000000,
+          y: 351,
+        },
+        {
+          x: 1413549600000,
+          y: 334,
+        },
+        {
+          x: 1413550200000,
+          y: 351,
+        },
+        {
+          x: 1413550800000,
+          y: 337,
+        },
+        {
+          x: 1413551400000,
+          y: 306,
+        },
+        {
+          x: 1413552000000,
+          y: 346,
+        },
+        {
+          x: 1413552600000,
+          y: 317,
+        },
+        {
+          x: 1413553200000,
+          y: 298,
+        },
+        {
+          x: 1413553800000,
+          y: 288,
+        },
+        {
+          x: 1413554400000,
+          y: 283,
+        },
+        {
+          x: 1413555000000,
+          y: 262,
+        },
+        {
+          x: 1413555600000,
+          y: 245,
+        },
+        {
+          x: 1413556200000,
+          y: 259,
+        },
+        {
+          x: 1413556800000,
+          y: 267,
+        },
+        {
+          x: 1413557400000,
+          y: 230,
+        },
+        {
+          x: 1413558000000,
+          y: 218,
+        },
+        {
+          x: 1413558600000,
+          y: 241,
+        },
+        {
+          x: 1413559200000,
+          y: 213,
+        },
+        {
+          x: 1413559800000,
+          y: 239,
+        },
+        {
+          x: 1413560400000,
+          y: 208,
+        },
+        {
+          x: 1413561000000,
+          y: 187,
+        },
+        {
+          x: 1413561600000,
+          y: 166,
+        },
+        {
+          x: 1413562200000,
+          y: 154,
+        },
+        {
+          x: 1413562800000,
+          y: 184,
+        },
+        {
+          x: 1413563400000,
+          y: 148,
+        },
+        {
+          x: 1413564000000,
+          y: 153,
+        },
+        {
+          x: 1413564600000,
+          y: 149,
+        },
+        {
+          x: 1413565200000,
+          y: 102,
+        },
+        {
+          x: 1413565800000,
+          y: 110,
+        },
+        {
+          x: 1413566400000,
+          y: 121,
+        },
+        {
+          x: 1413567000000,
+          y: 120,
+        },
+        {
+          x: 1413567600000,
+          y: 86,
+        },
+        {
+          x: 1413568200000,
+          y: 96,
+        },
+        {
+          x: 1413568800000,
+          y: 71,
+        },
+        {
+          x: 1413569400000,
+          y: 92,
+        },
+        {
+          x: 1413570000000,
+          y: 65,
+        },
+        {
+          x: 1413570600000,
+          y: 54,
+        },
+        {
+          x: 1413571200000,
+          y: 68,
+        },
+        {
+          x: 1413571800000,
+          y: 57,
+        },
+        {
+          x: 1413572400000,
+          y: 33,
+        },
+        {
+          x: 1413573600000,
+          y: 47,
+        },
+        {
+          x: 1413574200000,
+          y: 42,
+        },
+        {
+          x: 1413574800000,
+          y: 39,
+        },
+        {
+          x: 1413575400000,
+          y: 25,
+        },
+        {
+          x: 1413576000000,
+          y: 31,
+        },
+        {
+          x: 1413576600000,
+          y: 37,
+        },
+        {
+          x: 1413577200000,
+          y: 35,
+        },
+        {
+          x: 1413577800000,
+          y: 19,
+        },
+        {
+          x: 1413578400000,
+          y: 15,
+        },
+        {
+          x: 1413579000000,
+          y: 21,
+        },
+        {
+          x: 1413579600000,
+          y: 16,
+        },
+        {
+          x: 1413580200000,
+          y: 18,
+        },
+        {
+          x: 1413580800000,
+          y: 10,
+        },
+        {
+          x: 1413581400000,
+          y: 13,
+        },
+        {
+          x: 1413582000000,
+          y: 14,
+        },
+        {
+          x: 1413582600000,
+          y: 11,
+        },
+        {
+          x: 1413583200000,
+          y: 4,
+        },
+        {
+          x: 1413583800000,
+          y: 6,
+        },
+        {
+          x: 1413584400000,
+          y: 3,
+        },
+        {
+          x: 1413585000000,
+          y: 6,
+        },
+        {
+          x: 1413585600000,
+          y: 6,
+        },
+        {
+          x: 1413586200000,
+          y: 2,
+        },
+        {
+          x: 1413586800000,
+          y: 3,
+        },
+      ],
+    },
+    {
+      label: 'gif',
+      values: [
+        {
+          x: 1413543600000,
+          y: 21,
+        },
+        {
+          x: 1413544200000,
+          y: 191,
+        },
+        {
+          x: 1413544800000,
+          y: 176,
+        },
+        {
+          x: 1413545400000,
+          y: 166,
+        },
+        {
+          x: 1413546000000,
+          y: 183,
+        },
+        {
+          x: 1413546600000,
+          y: 170,
+        },
+        {
+          x: 1413547200000,
+          y: 153,
+        },
+        {
+          x: 1413547800000,
+          y: 202,
+        },
+        {
+          x: 1413548400000,
+          y: 175,
+        },
+        {
+          x: 1413549000000,
+          y: 161,
+        },
+        {
+          x: 1413549600000,
+          y: 174,
+        },
+        {
+          x: 1413550200000,
+          y: 167,
+        },
+        {
+          x: 1413550800000,
+          y: 171,
+        },
+        {
+          x: 1413551400000,
+          y: 176,
+        },
+        {
+          x: 1413552000000,
+          y: 139,
+        },
+        {
+          x: 1413552600000,
+          y: 145,
+        },
+        {
+          x: 1413553200000,
+          y: 157,
+        },
+        {
+          x: 1413553800000,
+          y: 148,
+        },
+        {
+          x: 1413554400000,
+          y: 149,
+        },
+        {
+          x: 1413555000000,
+          y: 135,
+        },
+        {
+          x: 1413555600000,
+          y: 118,
+        },
+        {
+          x: 1413556200000,
+          y: 142,
+        },
+        {
+          x: 1413556800000,
+          y: 141,
+        },
+        {
+          x: 1413557400000,
+          y: 146,
+        },
+        {
+          x: 1413558000000,
+          y: 114,
+        },
+        {
+          x: 1413558600000,
+          y: 115,
+        },
+        {
+          x: 1413559200000,
+          y: 136,
+        },
+        {
+          x: 1413559800000,
+          y: 106,
+        },
+        {
+          x: 1413560400000,
+          y: 92,
+        },
+        {
+          x: 1413561000000,
+          y: 97,
+        },
+        {
+          x: 1413561600000,
+          y: 90,
+        },
+        {
+          x: 1413562200000,
+          y: 69,
+        },
+        {
+          x: 1413562800000,
+          y: 66,
+        },
+        {
+          x: 1413563400000,
+          y: 93,
+        },
+        {
+          x: 1413564000000,
+          y: 75,
+        },
+        {
+          x: 1413564600000,
+          y: 68,
+        },
+        {
+          x: 1413565200000,
+          y: 55,
+        },
+        {
+          x: 1413565800000,
+          y: 73,
+        },
+        {
+          x: 1413566400000,
+          y: 57,
+        },
+        {
+          x: 1413567000000,
+          y: 48,
+        },
+        {
+          x: 1413567600000,
+          y: 41,
+        },
+        {
+          x: 1413568200000,
+          y: 39,
+        },
+        {
+          x: 1413568800000,
+          y: 32,
+        },
+        {
+          x: 1413569400000,
+          y: 33,
+        },
+        {
+          x: 1413570000000,
+          y: 39,
+        },
+        {
+          x: 1413570600000,
+          y: 35,
+        },
+        {
+          x: 1413571200000,
+          y: 25,
+        },
+        {
+          x: 1413571800000,
+          y: 28,
+        },
+        {
+          x: 1413572400000,
+          y: 8,
+        },
+        {
+          x: 1413573600000,
+          y: 13,
+        },
+        {
+          x: 1413574200000,
+          y: 23,
+        },
+        {
+          x: 1413574800000,
+          y: 19,
+        },
+        {
+          x: 1413575400000,
+          y: 16,
+        },
+        {
+          x: 1413576000000,
+          y: 22,
+        },
+        {
+          x: 1413576600000,
+          y: 13,
+        },
+        {
+          x: 1413577200000,
+          y: 21,
+        },
+        {
+          x: 1413577800000,
+          y: 11,
+        },
+        {
+          x: 1413578400000,
+          y: 12,
+        },
+        {
+          x: 1413579000000,
+          y: 10,
+        },
+        {
+          x: 1413579600000,
+          y: 7,
+        },
+        {
+          x: 1413580200000,
+          y: 4,
+        },
+        {
+          x: 1413580800000,
+          y: 5,
+        },
+        {
+          x: 1413581400000,
+          y: 7,
+        },
+        {
+          x: 1413582000000,
+          y: 9,
+        },
+        {
+          x: 1413582600000,
+          y: 2,
+        },
+        {
+          x: 1413583200000,
+          y: 2,
+        },
+        {
+          x: 1413583800000,
+          y: 4,
+        },
+        {
+          x: 1413584400000,
+          y: 6,
+        },
+        {
+          x: 1413585600000,
+          y: 2,
+        },
+        {
+          x: 1413586200000,
+          y: 4,
+        },
+        {
+          x: 1413586800000,
+          y: 4,
+        },
+      ],
+    },
+  ],
+  hits: 108970,
+  xAxisOrderedValues: [
+    1413543600000,
+    1413544200000,
+    1413544800000,
+    1413545400000,
+    1413546000000,
+    1413546600000,
+    1413547200000,
+    1413547800000,
+    1413548400000,
+    1413549000000,
+    1413549600000,
+    1413550200000,
+    1413550800000,
+    1413551400000,
+    1413552000000,
+    1413552600000,
+    1413553200000,
+    1413553800000,
+    1413554400000,
+    1413555000000,
+    1413555600000,
+    1413556200000,
+    1413556800000,
+    1413557400000,
+    1413558000000,
+    1413558600000,
+    1413559200000,
+    1413559800000,
+    1413560400000,
+    1413561000000,
+    1413561600000,
+    1413562200000,
+    1413562800000,
+    1413563400000,
+    1413564000000,
+    1413564600000,
+    1413565200000,
+    1413565800000,
+    1413566400000,
+    1413567000000,
+    1413567600000,
+    1413568200000,
+    1413568800000,
+    1413569400000,
+    1413570000000,
+    1413570600000,
+    1413571200000,
+    1413571800000,
+    1413572400000,
+    1413573600000,
+    1413574200000,
+    1413574800000,
+    1413575400000,
+    1413576000000,
+    1413576600000,
+    1413577200000,
+    1413577800000,
+    1413578400000,
+    1413579000000,
+    1413579600000,
+    1413580200000,
+    1413580800000,
+    1413581400000,
+    1413582000000,
+    1413582600000,
+    1413583200000,
+    1413583800000,
+    1413584400000,
+    1413585000000,
+    1413585600000,
+    1413586200000,
+    1413586800000,
+  ],
+  xAxisFormatter: function(thing) {
+    return moment(thing);
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js
new file mode 100644
index 00000000000000..8144a996e3424b
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_columns.js
@@ -0,0 +1,127 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  columns: [
+    {
+      label: 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
+      xAxisLabel: 'filters',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'css',
+              y: 10379,
+            },
+            {
+              x: 'png',
+              y: 6395,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['css', 'png'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label:
+        'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
+      xAxisLabel: 'filters',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'css',
+              y: 9253,
+            },
+            {
+              x: 'png',
+              y: 5571,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['css', 'png'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label:
+        'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
+      xAxisLabel: 'filters',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'css',
+              y: 7740,
+            },
+            {
+              x: 'png',
+              y: 4697,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['css', 'png'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  hits: 171443,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js
new file mode 100644
index 00000000000000..e783246972e4a6
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_rows.js
@@ -0,0 +1,122 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  rows: [
+    {
+      label: '200: response',
+      xAxisLabel: 'filters',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'css',
+              y: 25260,
+            },
+            {
+              x: 'png',
+              y: 15311,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '404: response',
+      xAxisLabel: 'filters',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'css',
+              y: 1352,
+            },
+            {
+              x: 'png',
+              y: 826,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '503: response',
+      xAxisLabel: 'filters',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'css',
+              y: 761,
+            },
+            {
+              x: 'png',
+              y: 527,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  hits: 171443,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js
new file mode 100644
index 00000000000000..71ee039f989383
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/filters/_series.js
@@ -0,0 +1,59 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  label: '',
+  xAxisLabel: 'filters',
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 'css',
+          y: 27374,
+        },
+        {
+          x: 'html',
+          y: 0,
+        },
+        {
+          x: 'png',
+          y: 16663,
+        },
+      ],
+    },
+  ],
+  hits: 171454,
+  xAxisOrderedValues: ['css', 'html', 'png'],
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js
new file mode 100644
index 00000000000000..c1044160c0e7a6
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_columns.js
@@ -0,0 +1,2918 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  columns: [
+    {
+      title: 'Top 2 geo.dest: CN',
+      valueFormatter: _.identity,
+      geoJson: {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 22.5],
+            },
+            properties: {
+              value: 42,
+              geohash: 's',
+              center: [22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 's',
+                  value: 's',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 42,
+                value: 42,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 0],
+                [45, 0],
+                [45, 45],
+                [0, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 22.5],
+            },
+            properties: {
+              value: 31,
+              geohash: 'd',
+              center: [-67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'd',
+                  value: 'd',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 31,
+                value: 31,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 0],
+                [-45, 0],
+                [-45, 45],
+                [-90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 22.5],
+            },
+            properties: {
+              value: 30,
+              geohash: 'w',
+              center: [112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'w',
+                  value: 'w',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 30,
+                value: 30,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 0],
+                [135, 0],
+                [135, 45],
+                [90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 22.5],
+            },
+            properties: {
+              value: 25,
+              geohash: '9',
+              center: [-112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '9',
+                  value: '9',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 25,
+                value: 25,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 0],
+                [-90, 0],
+                [-90, 45],
+                [-135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 22.5],
+            },
+            properties: {
+              value: 22,
+              geohash: 't',
+              center: [67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 't',
+                  value: 't',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 22,
+                value: 22,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 0],
+                [90, 0],
+                [90, 45],
+                [45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, -22.5],
+            },
+            properties: {
+              value: 22,
+              geohash: 'k',
+              center: [22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'k',
+                  value: 'k',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 22,
+                value: 22,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, -45],
+                [45, -45],
+                [45, 0],
+                [0, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -22.5],
+            },
+            properties: {
+              value: 21,
+              geohash: '6',
+              center: [-67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '6',
+                  value: '6',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 21,
+                value: 21,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -45],
+                [-45, -45],
+                [-45, 0],
+                [-90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 67.5],
+            },
+            properties: {
+              value: 19,
+              geohash: 'u',
+              center: [22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'u',
+                  value: 'u',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 19,
+                value: 19,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 45],
+                [45, 45],
+                [45, 90],
+                [0, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 67.5],
+            },
+            properties: {
+              value: 18,
+              geohash: 'v',
+              center: [67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'v',
+                  value: 'v',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 18,
+                value: 18,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 45],
+                [90, 45],
+                [90, 90],
+                [45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 67.5],
+            },
+            properties: {
+              value: 11,
+              geohash: 'c',
+              center: [-112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'c',
+                  value: 'c',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 11,
+                value: 11,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 45],
+                [-90, 45],
+                [-90, 90],
+                [-135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, -22.5],
+            },
+            properties: {
+              value: 10,
+              geohash: 'r',
+              center: [157.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'r',
+                  value: 'r',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 10,
+                value: 10,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, -45],
+                [180, -45],
+                [180, 0],
+                [135, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 67.5],
+            },
+            properties: {
+              value: 9,
+              geohash: 'y',
+              center: [112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'y',
+                  value: 'y',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 9,
+                value: 9,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 45],
+                [135, 45],
+                [135, 90],
+                [90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 22.5],
+            },
+            properties: {
+              value: 9,
+              geohash: 'e',
+              center: [-22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'e',
+                  value: 'e',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 9,
+                value: 9,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 0],
+                [0, 0],
+                [0, 45],
+                [-45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 67.5],
+            },
+            properties: {
+              value: 8,
+              geohash: 'f',
+              center: [-67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'f',
+                  value: 'f',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 8,
+                value: 8,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 45],
+                [-45, 45],
+                [-45, 90],
+                [-90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, -22.5],
+            },
+            properties: {
+              value: 8,
+              geohash: '7',
+              center: [-22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '7',
+                  value: '7',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 8,
+                value: 8,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, -45],
+                [0, -45],
+                [0, 0],
+                [-45, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, -22.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'q',
+              center: [112.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'q',
+                  value: 'q',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, -45],
+                [135, -45],
+                [135, 0],
+                [90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'g',
+              center: [-22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'g',
+                  value: 'g',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 45],
+                [0, 45],
+                [0, 90],
+                [-45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 22.5],
+            },
+            properties: {
+              value: 4,
+              geohash: 'x',
+              center: [157.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'x',
+                  value: 'x',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 4,
+                value: 4,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 0],
+                [180, 0],
+                [180, 45],
+                [135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-157.5, 67.5],
+            },
+            properties: {
+              value: 3,
+              geohash: 'b',
+              center: [-157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'b',
+                  value: 'b',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 3,
+                value: 3,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-180, 45],
+                [-135, 45],
+                [-135, 90],
+                [-180, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 67.5],
+            },
+            properties: {
+              value: 2,
+              geohash: 'z',
+              center: [157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'z',
+                  value: 'z',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 2,
+                value: 2,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 45],
+                [180, 45],
+                [180, 90],
+                [135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'm',
+              center: [67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'm',
+                  value: 'm',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, -45],
+                [90, -45],
+                [90, 0],
+                [45, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, -67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '5',
+              center: [-22.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '5',
+                  value: '5',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, -90],
+                [0, -90],
+                [0, -45],
+                [-45, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '4',
+              center: [-67.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '4',
+                  value: '4',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -90],
+                [-45, -90],
+                [-45, -45],
+                [-90, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '3',
+              center: [-112.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '3',
+                  value: '3',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, -45],
+                [-90, -45],
+                [-90, 0],
+                [-135, 0],
+              ],
+            },
+          },
+        ],
+        properties: {
+          min: 1,
+          max: 42,
+        },
+      },
+    },
+    {
+      label: 'Top 2 geo.dest: IN',
+      valueFormatter: _.identity,
+      geoJson: {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 22.5],
+            },
+            properties: {
+              value: 32,
+              geohash: 's',
+              center: [22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 's',
+                  value: 's',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 32,
+                value: 32,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 0],
+                [45, 0],
+                [45, 45],
+                [0, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -22.5],
+            },
+            properties: {
+              value: 31,
+              geohash: '6',
+              center: [-67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '6',
+                  value: '6',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 31,
+                value: 31,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -45],
+                [-45, -45],
+                [-45, 0],
+                [-90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 22.5],
+            },
+            properties: {
+              value: 28,
+              geohash: 'd',
+              center: [-67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'd',
+                  value: 'd',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 28,
+                value: 28,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 0],
+                [-45, 0],
+                [-45, 45],
+                [-90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 22.5],
+            },
+            properties: {
+              value: 27,
+              geohash: 'w',
+              center: [112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'w',
+                  value: 'w',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 27,
+                value: 27,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 0],
+                [135, 0],
+                [135, 45],
+                [90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 22.5],
+            },
+            properties: {
+              value: 24,
+              geohash: 't',
+              center: [67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 't',
+                  value: 't',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 24,
+                value: 24,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 0],
+                [90, 0],
+                [90, 45],
+                [45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, -22.5],
+            },
+            properties: {
+              value: 23,
+              geohash: 'k',
+              center: [22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'k',
+                  value: 'k',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 23,
+                value: 23,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, -45],
+                [45, -45],
+                [45, 0],
+                [0, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 67.5],
+            },
+            properties: {
+              value: 17,
+              geohash: 'u',
+              center: [22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'u',
+                  value: 'u',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 17,
+                value: 17,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 45],
+                [45, 45],
+                [45, 90],
+                [0, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 22.5],
+            },
+            properties: {
+              value: 16,
+              geohash: '9',
+              center: [-112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '9',
+                  value: '9',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 16,
+                value: 16,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 0],
+                [-90, 0],
+                [-90, 45],
+                [-135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 67.5],
+            },
+            properties: {
+              value: 14,
+              geohash: 'v',
+              center: [67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'v',
+                  value: 'v',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 14,
+                value: 14,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 45],
+                [90, 45],
+                [90, 90],
+                [45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 22.5],
+            },
+            properties: {
+              value: 13,
+              geohash: 'e',
+              center: [-22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'e',
+                  value: 'e',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 13,
+                value: 13,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 0],
+                [0, 0],
+                [0, 45],
+                [-45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, -22.5],
+            },
+            properties: {
+              value: 9,
+              geohash: 'r',
+              center: [157.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'r',
+                  value: 'r',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 9,
+                value: 9,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, -45],
+                [180, -45],
+                [180, 0],
+                [135, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'y',
+              center: [112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'y',
+                  value: 'y',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 45],
+                [135, 45],
+                [135, 90],
+                [90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'g',
+              center: [-22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'g',
+                  value: 'g',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 45],
+                [0, 45],
+                [0, 90],
+                [-45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'f',
+              center: [-67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'f',
+                  value: 'f',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 45],
+                [-45, 45],
+                [-45, 90],
+                [-90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 67.5],
+            },
+            properties: {
+              value: 5,
+              geohash: 'c',
+              center: [-112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'c',
+                  value: 'c',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 5,
+                value: 5,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 45],
+                [-90, 45],
+                [-90, 90],
+                [-135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-157.5, 67.5],
+            },
+            properties: {
+              value: 4,
+              geohash: 'b',
+              center: [-157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'b',
+                  value: 'b',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 4,
+                value: 4,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-180, 45],
+                [-135, 45],
+                [-135, 90],
+                [-180, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, -22.5],
+            },
+            properties: {
+              value: 3,
+              geohash: 'q',
+              center: [112.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'q',
+                  value: 'q',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 3,
+                value: 3,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, -45],
+                [135, -45],
+                [135, 0],
+                [90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -67.5],
+            },
+            properties: {
+              value: 2,
+              geohash: '4',
+              center: [-67.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '4',
+                  value: '4',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 2,
+                value: 2,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -90],
+                [-45, -90],
+                [-45, -45],
+                [-90, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'z',
+              center: [157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'z',
+                  value: 'z',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 45],
+                [180, 45],
+                [180, 90],
+                [135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'x',
+              center: [157.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'x',
+                  value: 'x',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 0],
+                [180, 0],
+                [180, 45],
+                [135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, -67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'p',
+              center: [157.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'p',
+                  value: 'p',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, -90],
+                [180, -90],
+                [180, -45],
+                [135, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'm',
+              center: [67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'm',
+                  value: 'm',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, -45],
+                [90, -45],
+                [90, 0],
+                [45, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '7',
+              center: [-22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: false,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '7',
+                  value: '7',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, -45],
+                [0, -45],
+                [0, 0],
+                [-45, 0],
+              ],
+            },
+          },
+        ],
+        properties: {
+          min: 1,
+          max: 32,
+        },
+      },
+    },
+  ],
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js
new file mode 100644
index 00000000000000..a26dc9bd8b181c
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_geo_json.js
@@ -0,0 +1,1326 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  valueFormatter: _.identity,
+  geohashGridAgg: { vis: { params: {} } },
+  geoJson: {
+    type: 'FeatureCollection',
+    features: [
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [22.5, 22.5],
+        },
+        properties: {
+          value: 608,
+          geohash: 's',
+          center: [22.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 's',
+              value: 's',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 608,
+            value: 608,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, 0],
+            [0, 45],
+            [45, 45],
+            [45, 0],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [112.5, 22.5],
+        },
+        properties: {
+          value: 522,
+          geohash: 'w',
+          center: [112.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'w',
+              value: 'w',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 522,
+            value: 522,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, 90],
+            [0, 135],
+            [45, 135],
+            [45, 90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-67.5, -22.5],
+        },
+        properties: {
+          value: 517,
+          geohash: '6',
+          center: [-67.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: '6',
+              value: '6',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 517,
+            value: 517,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, -90],
+            [-45, -45],
+            [0, -45],
+            [0, -90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-67.5, 22.5],
+        },
+        properties: {
+          value: 446,
+          geohash: 'd',
+          center: [-67.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'd',
+              value: 'd',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 446,
+            value: 446,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, -90],
+            [0, -45],
+            [45, -45],
+            [45, -90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [22.5, 67.5],
+        },
+        properties: {
+          value: 426,
+          geohash: 'u',
+          center: [22.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'u',
+              value: 'u',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 426,
+            value: 426,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, 0],
+            [45, 45],
+            [90, 45],
+            [90, 0],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [67.5, 22.5],
+        },
+        properties: {
+          value: 413,
+          geohash: 't',
+          center: [67.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 't',
+              value: 't',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 413,
+            value: 413,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, 45],
+            [0, 90],
+            [45, 90],
+            [45, 45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [22.5, -22.5],
+        },
+        properties: {
+          value: 362,
+          geohash: 'k',
+          center: [22.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'k',
+              value: 'k',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 362,
+            value: 362,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, 0],
+            [-45, 45],
+            [0, 45],
+            [0, 0],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-112.5, 22.5],
+        },
+        properties: {
+          value: 352,
+          geohash: '9',
+          center: [-112.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: '9',
+              value: '9',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 352,
+            value: 352,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, -135],
+            [0, -90],
+            [45, -90],
+            [45, -135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-22.5, 22.5],
+        },
+        properties: {
+          value: 216,
+          geohash: 'e',
+          center: [-22.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'e',
+              value: 'e',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 216,
+            value: 216,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, -45],
+            [0, 0],
+            [45, 0],
+            [45, -45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [67.5, 67.5],
+        },
+        properties: {
+          value: 183,
+          geohash: 'v',
+          center: [67.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'v',
+              value: 'v',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 183,
+            value: 183,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, 45],
+            [45, 90],
+            [90, 90],
+            [90, 45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [157.5, -22.5],
+        },
+        properties: {
+          value: 158,
+          geohash: 'r',
+          center: [157.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'r',
+              value: 'r',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 158,
+            value: 158,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, 135],
+            [-45, 180],
+            [0, 180],
+            [0, 135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [112.5, 67.5],
+        },
+        properties: {
+          value: 139,
+          geohash: 'y',
+          center: [112.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'y',
+              value: 'y',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 139,
+            value: 139,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, 90],
+            [45, 135],
+            [90, 135],
+            [90, 90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-112.5, 67.5],
+        },
+        properties: {
+          value: 110,
+          geohash: 'c',
+          center: [-112.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'c',
+              value: 'c',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 110,
+            value: 110,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, -135],
+            [45, -90],
+            [90, -90],
+            [90, -135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [112.5, -22.5],
+        },
+        properties: {
+          value: 101,
+          geohash: 'q',
+          center: [112.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'q',
+              value: 'q',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 101,
+            value: 101,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, 90],
+            [-45, 135],
+            [0, 135],
+            [0, 90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-22.5, -22.5],
+        },
+        properties: {
+          value: 101,
+          geohash: '7',
+          center: [-22.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: '7',
+              value: '7',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 101,
+            value: 101,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, -45],
+            [-45, 0],
+            [0, 0],
+            [0, -45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-67.5, 67.5],
+        },
+        properties: {
+          value: 92,
+          geohash: 'f',
+          center: [-67.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'f',
+              value: 'f',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 92,
+            value: 92,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, -90],
+            [45, -45],
+            [90, -45],
+            [90, -90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-157.5, 67.5],
+        },
+        properties: {
+          value: 75,
+          geohash: 'b',
+          center: [-157.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'b',
+              value: 'b',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 75,
+            value: 75,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, -180],
+            [45, -135],
+            [90, -135],
+            [90, -180],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-22.5, 67.5],
+        },
+        properties: {
+          value: 64,
+          geohash: 'g',
+          center: [-22.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'g',
+              value: 'g',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 64,
+            value: 64,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, -45],
+            [45, 0],
+            [90, 0],
+            [90, -45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [157.5, 67.5],
+        },
+        properties: {
+          value: 36,
+          geohash: 'z',
+          center: [157.5, 67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'z',
+              value: 'z',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 36,
+            value: 36,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [45, 135],
+            [45, 180],
+            [90, 180],
+            [90, 135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [157.5, 22.5],
+        },
+        properties: {
+          value: 34,
+          geohash: 'x',
+          center: [157.5, 22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'x',
+              value: 'x',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 34,
+            value: 34,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [0, 135],
+            [0, 180],
+            [45, 180],
+            [45, 135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-67.5, -67.5],
+        },
+        properties: {
+          value: 30,
+          geohash: '4',
+          center: [-67.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: '4',
+              value: '4',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 30,
+            value: 30,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, -90],
+            [-90, -45],
+            [-45, -45],
+            [-45, -90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [67.5, -22.5],
+        },
+        properties: {
+          value: 16,
+          geohash: 'm',
+          center: [67.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'm',
+              value: 'm',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 16,
+            value: 16,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, 45],
+            [-45, 90],
+            [0, 90],
+            [0, 45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-22.5, -67.5],
+        },
+        properties: {
+          value: 10,
+          geohash: '5',
+          center: [-22.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: '5',
+              value: '5',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 10,
+            value: 10,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, -45],
+            [-90, 0],
+            [-45, 0],
+            [-45, -45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [157.5, -67.5],
+        },
+        properties: {
+          value: 6,
+          geohash: 'p',
+          center: [157.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'p',
+              value: 'p',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 6,
+            value: 6,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, 135],
+            [-90, 180],
+            [-45, 180],
+            [-45, 135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-157.5, -22.5],
+        },
+        properties: {
+          value: 6,
+          geohash: '2',
+          center: [-157.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: '2',
+              value: '2',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 6,
+            value: 6,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, -180],
+            [-45, -135],
+            [0, -135],
+            [0, -180],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [22.5, -67.5],
+        },
+        properties: {
+          value: 4,
+          geohash: 'h',
+          center: [22.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'h',
+              value: 'h',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 4,
+            value: 4,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, 0],
+            [-90, 45],
+            [-45, 45],
+            [-45, 0],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [112.5, -67.5],
+        },
+        properties: {
+          value: 2,
+          geohash: 'n',
+          center: [112.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'n',
+              value: 'n',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 2,
+            value: 2,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, 90],
+            [-90, 135],
+            [-45, 135],
+            [-45, 90],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [67.5, -67.5],
+        },
+        properties: {
+          value: 2,
+          geohash: 'j',
+          center: [67.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: 'j',
+              value: 'j',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 2,
+            value: 2,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, 45],
+            [-90, 90],
+            [-45, 90],
+            [-45, 45],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-112.5, -22.5],
+        },
+        properties: {
+          value: 1,
+          geohash: '3',
+          center: [-112.5, -22.5],
+          aggConfigResult: {
+            $parent: {
+              key: '3',
+              value: '3',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 1,
+            value: 1,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-45, -135],
+            [-45, -90],
+            [0, -90],
+            [0, -135],
+          ],
+        },
+      },
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Point',
+          coordinates: [-112.5, -67.5],
+        },
+        properties: {
+          value: 1,
+          geohash: '1',
+          center: [-112.5, -67.5],
+          aggConfigResult: {
+            $parent: {
+              key: '1',
+              value: '1',
+              aggConfig: {
+                id: '2',
+                type: 'geohash_grid',
+                schema: 'segment',
+                params: {
+                  field: 'geo.coordinates',
+                  precision: 1,
+                },
+              },
+              type: 'bucket',
+            },
+            key: 1,
+            value: 1,
+            aggConfig: {
+              id: '1',
+              type: 'count',
+              schema: 'metric',
+              params: {},
+            },
+            type: 'metric',
+          },
+          rectangle: [
+            [-90, -135],
+            [-90, -90],
+            [-45, -90],
+            [-45, -135],
+          ],
+        },
+      },
+    ],
+    properties: {
+      min: 1,
+      max: 608,
+      zoom: 2,
+      center: [5, 15],
+    },
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js
new file mode 100644
index 00000000000000..ca4cb2a7feee1f
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/geohash/_rows.js
@@ -0,0 +1,2858 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  rows: [
+    {
+      title: 'Top 2 geo.dest: CN',
+      valueFormatter: _.identity,
+      geoJson: {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 22.5],
+            },
+            properties: {
+              value: 39,
+              geohash: 's',
+              center: [22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 's',
+                  value: 's',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 39,
+                value: 39,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 0],
+                [45, 0],
+                [45, 45],
+                [0, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 22.5],
+            },
+            properties: {
+              value: 31,
+              geohash: 'w',
+              center: [112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'w',
+                  value: 'w',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 31,
+                value: 31,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 0],
+                [135, 0],
+                [135, 45],
+                [90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 22.5],
+            },
+            properties: {
+              value: 30,
+              geohash: 'd',
+              center: [-67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'd',
+                  value: 'd',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 30,
+                value: 30,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 0],
+                [-45, 0],
+                [-45, 45],
+                [-90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 22.5],
+            },
+            properties: {
+              value: 25,
+              geohash: '9',
+              center: [-112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '9',
+                  value: '9',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 25,
+                value: 25,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 0],
+                [-90, 0],
+                [-90, 45],
+                [-135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 22.5],
+            },
+            properties: {
+              value: 23,
+              geohash: 't',
+              center: [67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 't',
+                  value: 't',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 23,
+                value: 23,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 0],
+                [90, 0],
+                [90, 45],
+                [45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, -22.5],
+            },
+            properties: {
+              value: 23,
+              geohash: 'k',
+              center: [22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'k',
+                  value: 'k',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 23,
+                value: 23,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, -45],
+                [45, -45],
+                [45, 0],
+                [0, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -22.5],
+            },
+            properties: {
+              value: 22,
+              geohash: '6',
+              center: [-67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '6',
+                  value: '6',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 22,
+                value: 22,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -45],
+                [-45, -45],
+                [-45, 0],
+                [-90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 67.5],
+            },
+            properties: {
+              value: 20,
+              geohash: 'u',
+              center: [22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'u',
+                  value: 'u',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 20,
+                value: 20,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 45],
+                [45, 45],
+                [45, 90],
+                [0, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 67.5],
+            },
+            properties: {
+              value: 18,
+              geohash: 'v',
+              center: [67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'v',
+                  value: 'v',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 18,
+                value: 18,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 45],
+                [90, 45],
+                [90, 90],
+                [45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, -22.5],
+            },
+            properties: {
+              value: 11,
+              geohash: 'r',
+              center: [157.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'r',
+                  value: 'r',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 11,
+                value: 11,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, -45],
+                [180, -45],
+                [180, 0],
+                [135, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 22.5],
+            },
+            properties: {
+              value: 11,
+              geohash: 'e',
+              center: [-22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'e',
+                  value: 'e',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 11,
+                value: 11,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 0],
+                [0, 0],
+                [0, 45],
+                [-45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 67.5],
+            },
+            properties: {
+              value: 10,
+              geohash: 'y',
+              center: [112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'y',
+                  value: 'y',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 10,
+                value: 10,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 45],
+                [135, 45],
+                [135, 90],
+                [90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 67.5],
+            },
+            properties: {
+              value: 10,
+              geohash: 'c',
+              center: [-112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'c',
+                  value: 'c',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 10,
+                value: 10,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 45],
+                [-90, 45],
+                [-90, 90],
+                [-135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 67.5],
+            },
+            properties: {
+              value: 8,
+              geohash: 'f',
+              center: [-67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'f',
+                  value: 'f',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 8,
+                value: 8,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 45],
+                [-45, 45],
+                [-45, 90],
+                [-90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, -22.5],
+            },
+            properties: {
+              value: 8,
+              geohash: '7',
+              center: [-22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '7',
+                  value: '7',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 8,
+                value: 8,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, -45],
+                [0, -45],
+                [0, 0],
+                [-45, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, -22.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'q',
+              center: [112.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'q',
+                  value: 'q',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, -45],
+                [135, -45],
+                [135, 0],
+                [90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'g',
+              center: [-22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'g',
+                  value: 'g',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 45],
+                [0, 45],
+                [0, 90],
+                [-45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 22.5],
+            },
+            properties: {
+              value: 4,
+              geohash: 'x',
+              center: [157.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'x',
+                  value: 'x',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 4,
+                value: 4,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 0],
+                [180, 0],
+                [180, 45],
+                [135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-157.5, 67.5],
+            },
+            properties: {
+              value: 3,
+              geohash: 'b',
+              center: [-157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'b',
+                  value: 'b',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 3,
+                value: 3,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-180, 45],
+                [-135, 45],
+                [-135, 90],
+                [-180, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 67.5],
+            },
+            properties: {
+              value: 2,
+              geohash: 'z',
+              center: [157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'z',
+                  value: 'z',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 2,
+                value: 2,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 45],
+                [180, 45],
+                [180, 90],
+                [135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -67.5],
+            },
+            properties: {
+              value: 2,
+              geohash: '4',
+              center: [-67.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '4',
+                  value: '4',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 2,
+                value: 2,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -90],
+                [-45, -90],
+                [-45, -45],
+                [-90, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, -67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '5',
+              center: [-22.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '5',
+                  value: '5',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, -90],
+                [0, -90],
+                [0, -45],
+                [-45, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '3',
+              center: [-112.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'CN',
+                    value: 'CN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '3',
+                  value: '3',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, -45],
+                [-90, -45],
+                [-90, 0],
+                [-135, 0],
+              ],
+            },
+          },
+        ],
+        properties: {
+          min: 1,
+          max: 39,
+        },
+      },
+    },
+    {
+      label: 'Top 2 geo.dest: IN',
+      valueFormatter: _.identity,
+      geoJson: {
+        type: 'FeatureCollection',
+        features: [
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -22.5],
+            },
+            properties: {
+              value: 31,
+              geohash: '6',
+              center: [-67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '6',
+                  value: '6',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 31,
+                value: 31,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -45],
+                [-45, -45],
+                [-45, 0],
+                [-90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 22.5],
+            },
+            properties: {
+              value: 30,
+              geohash: 's',
+              center: [22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 's',
+                  value: 's',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 30,
+                value: 30,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 0],
+                [45, 0],
+                [45, 45],
+                [0, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 22.5],
+            },
+            properties: {
+              value: 29,
+              geohash: 'w',
+              center: [112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'w',
+                  value: 'w',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 29,
+                value: 29,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 0],
+                [135, 0],
+                [135, 45],
+                [90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 22.5],
+            },
+            properties: {
+              value: 28,
+              geohash: 'd',
+              center: [-67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'd',
+                  value: 'd',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 28,
+                value: 28,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 0],
+                [-45, 0],
+                [-45, 45],
+                [-90, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 22.5],
+            },
+            properties: {
+              value: 25,
+              geohash: 't',
+              center: [67.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 't',
+                  value: 't',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 25,
+                value: 25,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 0],
+                [90, 0],
+                [90, 45],
+                [45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, -22.5],
+            },
+            properties: {
+              value: 24,
+              geohash: 'k',
+              center: [22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'k',
+                  value: 'k',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 24,
+                value: 24,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, -45],
+                [45, -45],
+                [45, 0],
+                [0, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [22.5, 67.5],
+            },
+            properties: {
+              value: 20,
+              geohash: 'u',
+              center: [22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'u',
+                  value: 'u',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 20,
+                value: 20,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [0, 45],
+                [45, 45],
+                [45, 90],
+                [0, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 22.5],
+            },
+            properties: {
+              value: 18,
+              geohash: '9',
+              center: [-112.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '9',
+                  value: '9',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 18,
+                value: 18,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 0],
+                [-90, 0],
+                [-90, 45],
+                [-135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, 67.5],
+            },
+            properties: {
+              value: 14,
+              geohash: 'v',
+              center: [67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'v',
+                  value: 'v',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 14,
+                value: 14,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, 45],
+                [90, 45],
+                [90, 90],
+                [45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 22.5],
+            },
+            properties: {
+              value: 11,
+              geohash: 'e',
+              center: [-22.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'e',
+                  value: 'e',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 11,
+                value: 11,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 0],
+                [0, 0],
+                [0, 45],
+                [-45, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, -22.5],
+            },
+            properties: {
+              value: 9,
+              geohash: 'r',
+              center: [157.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'r',
+                  value: 'r',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 9,
+                value: 9,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, -45],
+                [180, -45],
+                [180, 0],
+                [135, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'y',
+              center: [112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'y',
+                  value: 'y',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, 45],
+                [135, 45],
+                [135, 90],
+                [90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, 67.5],
+            },
+            properties: {
+              value: 6,
+              geohash: 'f',
+              center: [-67.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'f',
+                  value: 'f',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 6,
+                value: 6,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, 45],
+                [-45, 45],
+                [-45, 90],
+                [-90, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, 67.5],
+            },
+            properties: {
+              value: 5,
+              geohash: 'g',
+              center: [-22.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'g',
+                  value: 'g',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 5,
+                value: 5,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, 45],
+                [0, 45],
+                [0, 90],
+                [-45, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-112.5, 67.5],
+            },
+            properties: {
+              value: 5,
+              geohash: 'c',
+              center: [-112.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'c',
+                  value: 'c',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 5,
+                value: 5,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-135, 45],
+                [-90, 45],
+                [-90, 90],
+                [-135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-157.5, 67.5],
+            },
+            properties: {
+              value: 4,
+              geohash: 'b',
+              center: [-157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'b',
+                  value: 'b',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 4,
+                value: 4,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-180, 45],
+                [-135, 45],
+                [-135, 90],
+                [-180, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [112.5, -22.5],
+            },
+            properties: {
+              value: 3,
+              geohash: 'q',
+              center: [112.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'q',
+                  value: 'q',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 3,
+                value: 3,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [90, -45],
+                [135, -45],
+                [135, 0],
+                [90, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-67.5, -67.5],
+            },
+            properties: {
+              value: 2,
+              geohash: '4',
+              center: [-67.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '4',
+                  value: '4',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 2,
+                value: 2,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-90, -90],
+                [-45, -90],
+                [-45, -45],
+                [-90, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'z',
+              center: [157.5, 67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'z',
+                  value: 'z',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 45],
+                [180, 45],
+                [180, 90],
+                [135, 90],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, 22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'x',
+              center: [157.5, 22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'x',
+                  value: 'x',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, 0],
+                [180, 0],
+                [180, 45],
+                [135, 45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [157.5, -67.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'p',
+              center: [157.5, -67.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'p',
+                  value: 'p',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [135, -90],
+                [180, -90],
+                [180, -45],
+                [135, -45],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [67.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: 'm',
+              center: [67.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: 'm',
+                  value: 'm',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [45, -45],
+                [90, -45],
+                [90, 0],
+                [45, 0],
+              ],
+            },
+          },
+          {
+            type: 'Feature',
+            geometry: {
+              type: 'Point',
+              coordinates: [-22.5, -22.5],
+            },
+            properties: {
+              value: 1,
+              geohash: '7',
+              center: [-22.5, -22.5],
+              aggConfigResult: {
+                $parent: {
+                  $parent: {
+                    $parent: null,
+                    key: 'IN',
+                    value: 'IN',
+                    aggConfig: {
+                      id: '3',
+                      type: 'terms',
+                      schema: 'split',
+                      params: {
+                        field: 'geo.dest',
+                        size: 2,
+                        order: 'desc',
+                        orderBy: '1',
+                        row: true,
+                      },
+                    },
+                    type: 'bucket',
+                  },
+                  key: '7',
+                  value: '7',
+                  aggConfig: {
+                    id: '2',
+                    type: 'geohash_grid',
+                    schema: 'segment',
+                    params: {
+                      field: 'geo.coordinates',
+                      precision: 1,
+                    },
+                  },
+                  type: 'bucket',
+                },
+                key: 1,
+                value: 1,
+                aggConfig: {
+                  id: '1',
+                  type: 'count',
+                  schema: 'metric',
+                  params: {},
+                },
+                type: 'metric',
+              },
+              rectangle: [
+                [-45, -45],
+                [0, -45],
+                [0, 0],
+                [-45, 0],
+              ],
+            },
+          },
+        ],
+        properties: {
+          min: 1,
+          max: 31,
+        },
+      },
+    },
+  ],
+  hits: 1639,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js
new file mode 100644
index 00000000000000..c93365234d1582
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_columns.js
@@ -0,0 +1,381 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  columns: [
+    {
+      label: '404: response',
+      xAxisLabel: 'machine.ram',
+      ordered: {
+        interval: 100,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 2147483600,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 3221225400,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 4294967200,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 5368709100,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 6442450900,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 7516192700,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 8589934500,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 10737418200,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 11811160000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 12884901800,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 13958643700,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 15032385500,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 16106127300,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 18253611000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 19327352800,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 20401094600,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 21474836400,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '200: response',
+      xAxisLabel: 'machine.ram',
+      ordered: {
+        interval: 100,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 2147483600,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 3221225400,
+              y: 2,
+              y0: 0,
+            },
+            {
+              x: 4294967200,
+              y: 3,
+              y0: 0,
+            },
+            {
+              x: 5368709100,
+              y: 3,
+              y0: 0,
+            },
+            {
+              x: 6442450900,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 7516192700,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 8589934500,
+              y: 4,
+              y0: 0,
+            },
+            {
+              x: 10737418200,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 11811160000,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 12884901800,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 13958643700,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 15032385500,
+              y: 2,
+              y0: 0,
+            },
+            {
+              x: 16106127300,
+              y: 3,
+              y0: 0,
+            },
+            {
+              x: 18253611000,
+              y: 4,
+              y0: 0,
+            },
+            {
+              x: 19327352800,
+              y: 5,
+              y0: 0,
+            },
+            {
+              x: 20401094600,
+              y: 2,
+              y0: 0,
+            },
+            {
+              x: 21474836400,
+              y: 2,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '503: response',
+      xAxisLabel: 'machine.ram',
+      ordered: {
+        interval: 100,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 2147483600,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 3221225400,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 4294967200,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 5368709100,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 6442450900,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 7516192700,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 8589934500,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 10737418200,
+              y: 1,
+              y0: 0,
+            },
+            {
+              x: 11811160000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 12884901800,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 13958643700,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 15032385500,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 16106127300,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 18253611000,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 19327352800,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 20401094600,
+              y: 0,
+              y0: 0,
+            },
+            {
+              x: 21474836400,
+              y: 0,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  xAxisOrderedValues: [
+    2147483600,
+    3221225400,
+    4294967200,
+    5368709100,
+    6442450900,
+    7516192700,
+    8589934500,
+    10737418200,
+    11811160000,
+    12884901800,
+    13958643700,
+    15032385500,
+    16106127300,
+    18253611000,
+    19327352800,
+    20401094600,
+    21474836400,
+  ],
+  hits: 40,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js
new file mode 100644
index 00000000000000..d88197c3737e52
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_rows.js
@@ -0,0 +1,225 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  rows: [
+    {
+      label: '404: response',
+      xAxisLabel: 'machine.ram',
+      ordered: {
+        interval: 100,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 2147483600,
+              y: 1,
+            },
+            {
+              x: 10737418200,
+              y: 1,
+            },
+            {
+              x: 15032385500,
+              y: 2,
+            },
+            {
+              x: 19327352800,
+              y: 1,
+            },
+            {
+              x: 32212254700,
+              y: 1,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '200: response',
+      xAxisLabel: 'machine.ram',
+      ordered: {
+        interval: 100,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 3221225400,
+              y: 4,
+            },
+            {
+              x: 4294967200,
+              y: 3,
+            },
+            {
+              x: 5368709100,
+              y: 3,
+            },
+            {
+              x: 6442450900,
+              y: 2,
+            },
+            {
+              x: 7516192700,
+              y: 2,
+            },
+            {
+              x: 8589934500,
+              y: 2,
+            },
+            {
+              x: 9663676400,
+              y: 3,
+            },
+            {
+              x: 11811160000,
+              y: 3,
+            },
+            {
+              x: 12884901800,
+              y: 2,
+            },
+            {
+              x: 13958643700,
+              y: 1,
+            },
+            {
+              x: 15032385500,
+              y: 2,
+            },
+            {
+              x: 16106127300,
+              y: 3,
+            },
+            {
+              x: 17179869100,
+              y: 1,
+            },
+            {
+              x: 18253611000,
+              y: 4,
+            },
+            {
+              x: 19327352800,
+              y: 1,
+            },
+            {
+              x: 20401094600,
+              y: 1,
+            },
+            {
+              x: 21474836400,
+              y: 4,
+            },
+            {
+              x: 32212254700,
+              y: 3,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '503: response',
+      xAxisLabel: 'machine.ram',
+      ordered: {
+        interval: 100,
+      },
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 10737418200,
+              y: 1,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  xAxisOrderedValues: [
+    2147483600,
+    3221225400,
+    4294967200,
+    5368709100,
+    6442450900,
+    7516192700,
+    8589934500,
+    9663676400,
+    10737418200,
+    11811160000,
+    12884901800,
+    13958643700,
+    15032385500,
+    16106127300,
+    17179869100,
+    18253611000,
+    19327352800,
+    20401094600,
+    21474836400,
+    32212254700,
+  ],
+  hits: 51,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js
new file mode 100644
index 00000000000000..99511e693ff023
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_series.js
@@ -0,0 +1,141 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  label: '',
+  xAxisLabel: 'machine.ram',
+  ordered: {
+    interval: 100,
+  },
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 3221225400,
+          y: 5,
+        },
+        {
+          x: 4294967200,
+          y: 2,
+        },
+        {
+          x: 5368709100,
+          y: 5,
+        },
+        {
+          x: 6442450900,
+          y: 4,
+        },
+        {
+          x: 7516192700,
+          y: 1,
+        },
+        {
+          x: 9663676400,
+          y: 9,
+        },
+        {
+          x: 10737418200,
+          y: 5,
+        },
+        {
+          x: 11811160000,
+          y: 5,
+        },
+        {
+          x: 12884901800,
+          y: 2,
+        },
+        {
+          x: 13958643700,
+          y: 3,
+        },
+        {
+          x: 15032385500,
+          y: 3,
+        },
+        {
+          x: 16106127300,
+          y: 3,
+        },
+        {
+          x: 17179869100,
+          y: 1,
+        },
+        {
+          x: 18253611000,
+          y: 6,
+        },
+        {
+          x: 19327352800,
+          y: 3,
+        },
+        {
+          x: 20401094600,
+          y: 3,
+        },
+        {
+          x: 21474836400,
+          y: 7,
+        },
+        {
+          x: 32212254700,
+          y: 4,
+        },
+      ],
+    },
+  ],
+  hits: 71,
+  xAxisOrderedValues: [
+    3221225400,
+    4294967200,
+    5368709100,
+    6442450900,
+    7516192700,
+    9663676400,
+    10737418200,
+    11811160000,
+    12884901800,
+    13958643700,
+    15032385500,
+    16106127300,
+    17179869100,
+    18253611000,
+    19327352800,
+    20401094600,
+    21474836400,
+    32212254700,
+  ],
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js
new file mode 100644
index 00000000000000..c23a89b755b5b3
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/histogram/_slices.js
@@ -0,0 +1,328 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  label: '',
+  slices: {
+    children: [
+      {
+        name: 0,
+        size: 378611,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 1000,
+        size: 205997,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 2000,
+        size: 397189,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 3000,
+        size: 397195,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 4000,
+        size: 398429,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 5000,
+        size: 397843,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 6000,
+        size: 398140,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 7000,
+        size: 398076,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 8000,
+        size: 396746,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 9000,
+        size: 397418,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 10000,
+        size: 20222,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 11000,
+        size: 20173,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 12000,
+        size: 20026,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 13000,
+        size: 19986,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 14000,
+        size: 20091,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 15000,
+        size: 20052,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 16000,
+        size: 20349,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 17000,
+        size: 20290,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 18000,
+        size: 20399,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 19000,
+        size: 20133,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+      {
+        name: 20000,
+        size: 9,
+        aggConfig: {
+          type: 'histogram',
+          schema: 'segment',
+          fieldFormatter: _.constant(String),
+          params: {
+            interval: 1000,
+            extended_bounds: {},
+          },
+        },
+      },
+    ],
+  },
+  names: [
+    0,
+    1000,
+    2000,
+    3000,
+    4000,
+    5000,
+    6000,
+    7000,
+    8000,
+    9000,
+    10000,
+    11000,
+    12000,
+    13000,
+    14000,
+    15000,
+    16000,
+    17000,
+    18000,
+    19000,
+    20000,
+  ],
+  hits: 3967374,
+  tooltipFormatter: function(event) {
+    return event.point;
+  },
+};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/index.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js
similarity index 61%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/index.js
rename to src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js
index 734c6d003278fd..df71f4efc58b55 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/index.js
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/not_enough_data/_one_point.js
@@ -18,22 +18,34 @@
  */
 
 import _ from 'lodash';
-import expect from '@kbn/expect';
 
-import VislibProvider from '..';
-
-describe('Vislib Index Test Suite', function() {
-  let vislib;
-
-  beforeEach(() => {
-    vislib = new VislibProvider();
-  });
-
-  it('should return an object', function() {
-    expect(_.isObject(vislib)).to.be(true);
-  });
-
-  it('should return a Vis function', function() {
-    expect(_.isFunction(vislib.Vis)).to.be(true);
-  });
-});
+export default {
+  label: '',
+  xAxisLabel: '',
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: '_all',
+          y: 274,
+        },
+      ],
+    },
+  ],
+  hits: 274,
+  xAxisOrderedValues: ['_all'],
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js
new file mode 100644
index 00000000000000..b5b931383f7321
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_columns.js
@@ -0,0 +1,79 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  columns: [
+    {
+      label: 'apache: _type',
+      xAxisLabel: 'bytes ranges',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: '0.0-1000.0',
+              y: 13309,
+            },
+            {
+              x: '1000.0-2000.0',
+              y: 7196,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      label: 'nginx: _type',
+      xAxisLabel: 'bytes ranges',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: '0.0-1000.0',
+              y: 3278,
+            },
+            {
+              x: '1000.0-2000.0',
+              y: 1804,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  hits: 171499,
+  xAxisOrderedValues: ['0.0-1000.0', '1000.0-2000.0'],
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js
new file mode 100644
index 00000000000000..bc7e4c9f49625f
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_rows.js
@@ -0,0 +1,107 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  rows: [
+    {
+      label: 'Mozilla/5.0 (X11; Linux x86_64; rv:6.0a1) Gecko/20110421 Firefox/6.0a1: agent.raw',
+      xAxisLabel: 'bytes ranges',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: '0.0-1000.0',
+              y: 6422,
+              y0: 0,
+            },
+            {
+              x: '1000.0-2000.0',
+              y: 3446,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      label:
+        'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.50 Safari/534.24: agent.raw',
+      xAxisLabel: 'bytes ranges',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: '0.0-1000.0',
+              y: 5430,
+              y0: 0,
+            },
+            {
+              x: '1000.0-2000.0',
+              y: 3010,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+    },
+    {
+      label:
+        'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322): agent.raw',
+      xAxisLabel: 'bytes ranges',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: '0.0-1000.0',
+              y: 4735,
+              y0: 0,
+            },
+            {
+              x: '1000.0-2000.0',
+              y: 2542,
+              y0: 0,
+            },
+          ],
+        },
+      ],
+    },
+  ],
+  hits: 171501,
+  xAxisOrderedValues: ['0.0-1000.0', '1000.0-2000.0'],
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js
new file mode 100644
index 00000000000000..40c14beeb4f3ef
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/range/_series.js
@@ -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 _ from 'lodash';
+
+export default {
+  label: '',
+  xAxisLabel: 'bytes ranges',
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: '0.0-1000.0',
+          y: 16576,
+        },
+        {
+          x: '1000.0-2000.0',
+          y: 9005,
+        },
+      ],
+    },
+  ],
+  hits: 171500,
+  xAxisOrderedValues: ['0.0-1000.0', '1000.0-2000.0'],
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js
new file mode 100644
index 00000000000000..bf4fcb7e9e526a
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_columns.js
@@ -0,0 +1,251 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  columns: [
+    {
+      label: 'http: links',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 144000,
+            },
+            {
+              x: 'info',
+              y: 128237,
+            },
+            {
+              x: 'security',
+              y: 34518,
+            },
+            {
+              x: 'error',
+              y: 10258,
+            },
+            {
+              x: 'warning',
+              y: 17188,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'info: links',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 108148,
+            },
+            {
+              x: 'info',
+              y: 96242,
+            },
+            {
+              x: 'security',
+              y: 25889,
+            },
+            {
+              x: 'error',
+              y: 7673,
+            },
+            {
+              x: 'warning',
+              y: 12842,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'www.slate.com: links',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 98056,
+            },
+            {
+              x: 'info',
+              y: 87344,
+            },
+            {
+              x: 'security',
+              y: 23577,
+            },
+            {
+              x: 'error',
+              y: 7004,
+            },
+            {
+              x: 'warning',
+              y: 11759,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'twitter.com: links',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 74154,
+            },
+            {
+              x: 'info',
+              y: 65963,
+            },
+            {
+              x: 'security',
+              y: 17832,
+            },
+            {
+              x: 'error',
+              y: 5258,
+            },
+            {
+              x: 'warning',
+              y: 8906,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'www.www.slate.com: links',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 62591,
+            },
+            {
+              x: 'info',
+              y: 55822,
+            },
+            {
+              x: 'security',
+              y: 15100,
+            },
+            {
+              x: 'error',
+              y: 4564,
+            },
+            {
+              x: 'warning',
+              y: 7498,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  hits: 171446,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js
new file mode 100644
index 00000000000000..5d737131dc9980
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_rows.js
@@ -0,0 +1,251 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  rows: [
+    {
+      label: 'h3: headings',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 144000,
+            },
+            {
+              x: 'info',
+              y: 128235,
+            },
+            {
+              x: 'security',
+              y: 34518,
+            },
+            {
+              x: 'error',
+              y: 10257,
+            },
+            {
+              x: 'warning',
+              y: 17188,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'h5: headings',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 144000,
+            },
+            {
+              x: 'info',
+              y: 128235,
+            },
+            {
+              x: 'security',
+              y: 34518,
+            },
+            {
+              x: 'error',
+              y: 10257,
+            },
+            {
+              x: 'warning',
+              y: 17188,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'http: headings',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 144000,
+            },
+            {
+              x: 'info',
+              y: 128235,
+            },
+            {
+              x: 'security',
+              y: 34518,
+            },
+            {
+              x: 'error',
+              y: 10257,
+            },
+            {
+              x: 'warning',
+              y: 17188,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'success: headings',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 120689,
+            },
+            {
+              x: 'info',
+              y: 107621,
+            },
+            {
+              x: 'security',
+              y: 28916,
+            },
+            {
+              x: 'error',
+              y: 8590,
+            },
+            {
+              x: 'warning',
+              y: 14548,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: 'www.slate.com: headings',
+      xAxisLabel: 'Top 5 unusual terms in @tags',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'success',
+              y: 62292,
+            },
+            {
+              x: 'info',
+              y: 55646,
+            },
+            {
+              x: 'security',
+              y: 14823,
+            },
+            {
+              x: 'error',
+              y: 4441,
+            },
+            {
+              x: 'warning',
+              y: 7539,
+            },
+          ],
+        },
+      ],
+      xAxisOrderedValues: ['success', 'info', 'security', 'error', 'warning'],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  hits: 171445,
+};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js
similarity index 50%
rename from src/legacy/core_plugins/vis_type_vislib/public/legacy.ts
rename to src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js
index 579caa1cb88f67..36df8e091ba895 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/significant_terms/_series.js
@@ -17,27 +17,50 @@
  * under the License.
  */
 
-import { npSetup, npStart } from 'ui/new_platform';
-import { PluginInitializerContext } from 'kibana/public';
+import _ from 'lodash';
 
-import { plugin } from '.';
-import {
-  VisTypeVislibPluginSetupDependencies,
-  VisTypeVislibPluginStartDependencies,
-} from './plugin';
-
-const setupPlugins: Readonly<VisTypeVislibPluginSetupDependencies> = {
-  expressions: npSetup.plugins.expressions,
-  visualizations: npSetup.plugins.visualizations,
-  charts: npSetup.plugins.charts,
-  visTypeXy: npSetup.plugins.visTypeXy,
-};
-
-const startPlugins: Readonly<VisTypeVislibPluginStartDependencies> = {
-  data: npStart.plugins.data,
+export default {
+  label: '',
+  xAxisLabel: 'Top 5 unusual terms in @tags',
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 'success',
+          y: 143995,
+        },
+        {
+          x: 'info',
+          y: 128233,
+        },
+        {
+          x: 'security',
+          y: 34515,
+        },
+        {
+          x: 'error',
+          y: 10256,
+        },
+        {
+          x: 'warning',
+          y: 17188,
+        },
+      ],
+    },
+  ],
+  hits: 171439,
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
 };
-
-const pluginInstance = plugin({} as PluginInitializerContext);
-
-export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core, startPlugins);
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/stacked/_stacked.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/stacked/_stacked.js
new file mode 100644
index 00000000000000..a914f20a7ffc6f
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/stacked/_stacked.js
@@ -0,0 +1,1654 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import moment from 'moment';
+
+export default {
+  label: '',
+  xAxisLabel: '@timestamp per 30 sec',
+  ordered: {
+    date: true,
+    interval: 30000,
+    min: 1416850340336,
+    max: 1416852140336,
+  },
+  yAxisLabel: 'Count of documents',
+  xAxisOrderedValues: [
+    1416850320000,
+    1416850350000,
+    1416850380000,
+    1416850410000,
+    1416850440000,
+    1416850470000,
+    1416850500000,
+    1416850530000,
+    1416850560000,
+    1416850590000,
+    1416850620000,
+    1416850650000,
+    1416850680000,
+    1416850710000,
+    1416850740000,
+    1416850770000,
+    1416850800000,
+    1416850830000,
+    1416850860000,
+    1416850890000,
+    1416850920000,
+    1416850950000,
+    1416850980000,
+    1416851010000,
+    1416851040000,
+    1416851070000,
+    1416851100000,
+    1416851130000,
+    1416851160000,
+    1416851190000,
+    1416851220000,
+    1416851250000,
+    1416851280000,
+    1416851310000,
+    1416851340000,
+    1416851370000,
+    1416851400000,
+    1416851430000,
+    1416851460000,
+    1416851490000,
+    1416851520000,
+    1416851550000,
+    1416851580000,
+    1416851610000,
+    1416851640000,
+    1416851670000,
+    1416851700000,
+    1416851730000,
+    1416851760000,
+    1416851790000,
+    1416851820000,
+    1416851850000,
+    1416851880000,
+    1416851910000,
+    1416851940000,
+    1416851970000,
+    1416852000000,
+    1416852030000,
+    1416852060000,
+    1416852090000,
+    1416852120000,
+  ],
+  series: [
+    {
+      label: 'jpg',
+      values: [
+        {
+          x: 1416850320000,
+          y: 110,
+          y0: 0,
+        },
+        {
+          x: 1416850350000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416850380000,
+          y: 34,
+          y0: 0,
+        },
+        {
+          x: 1416850410000,
+          y: 21,
+          y0: 0,
+        },
+        {
+          x: 1416850440000,
+          y: 32,
+          y0: 0,
+        },
+        {
+          x: 1416850470000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416850500000,
+          y: 16,
+          y0: 0,
+        },
+        {
+          x: 1416850530000,
+          y: 27,
+          y0: 0,
+        },
+        {
+          x: 1416850560000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416850590000,
+          y: 38,
+          y0: 0,
+        },
+        {
+          x: 1416850620000,
+          y: 33,
+          y0: 0,
+        },
+        {
+          x: 1416850650000,
+          y: 33,
+          y0: 0,
+        },
+        {
+          x: 1416850680000,
+          y: 31,
+          y0: 0,
+        },
+        {
+          x: 1416850710000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416850740000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416850770000,
+          y: 38,
+          y0: 0,
+        },
+        {
+          x: 1416850800000,
+          y: 34,
+          y0: 0,
+        },
+        {
+          x: 1416850830000,
+          y: 30,
+          y0: 0,
+        },
+        {
+          x: 1416850860000,
+          y: 38,
+          y0: 0,
+        },
+        {
+          x: 1416850890000,
+          y: 19,
+          y0: 0,
+        },
+        {
+          x: 1416850920000,
+          y: 23,
+          y0: 0,
+        },
+        {
+          x: 1416850950000,
+          y: 33,
+          y0: 0,
+        },
+        {
+          x: 1416850980000,
+          y: 28,
+          y0: 0,
+        },
+        {
+          x: 1416851010000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416851040000,
+          y: 22,
+          y0: 0,
+        },
+        {
+          x: 1416851070000,
+          y: 28,
+          y0: 0,
+        },
+        {
+          x: 1416851100000,
+          y: 27,
+          y0: 0,
+        },
+        {
+          x: 1416851130000,
+          y: 32,
+          y0: 0,
+        },
+        {
+          x: 1416851160000,
+          y: 32,
+          y0: 0,
+        },
+        {
+          x: 1416851190000,
+          y: 30,
+          y0: 0,
+        },
+        {
+          x: 1416851220000,
+          y: 32,
+          y0: 0,
+        },
+        {
+          x: 1416851250000,
+          y: 36,
+          y0: 0,
+        },
+        {
+          x: 1416851280000,
+          y: 32,
+          y0: 0,
+        },
+        {
+          x: 1416851310000,
+          y: 29,
+          y0: 0,
+        },
+        {
+          x: 1416851340000,
+          y: 22,
+          y0: 0,
+        },
+        {
+          x: 1416851370000,
+          y: 29,
+          y0: 0,
+        },
+        {
+          x: 1416851400000,
+          y: 33,
+          y0: 0,
+        },
+        {
+          x: 1416851430000,
+          y: 28,
+          y0: 0,
+        },
+        {
+          x: 1416851460000,
+          y: 39,
+          y0: 0,
+        },
+        {
+          x: 1416851490000,
+          y: 28,
+          y0: 0,
+        },
+        {
+          x: 1416851520000,
+          y: 28,
+          y0: 0,
+        },
+        {
+          x: 1416851550000,
+          y: 28,
+          y0: 0,
+        },
+        {
+          x: 1416851580000,
+          y: 30,
+          y0: 0,
+        },
+        {
+          x: 1416851610000,
+          y: 29,
+          y0: 0,
+        },
+        {
+          x: 1416851640000,
+          y: 30,
+          y0: 0,
+        },
+        {
+          x: 1416851670000,
+          y: 23,
+          y0: 0,
+        },
+        {
+          x: 1416851700000,
+          y: 23,
+          y0: 0,
+        },
+        {
+          x: 1416851730000,
+          y: 27,
+          y0: 0,
+        },
+        {
+          x: 1416851760000,
+          y: 21,
+          y0: 0,
+        },
+        {
+          x: 1416851790000,
+          y: 24,
+          y0: 0,
+        },
+        {
+          x: 1416851820000,
+          y: 26,
+          y0: 0,
+        },
+        {
+          x: 1416851850000,
+          y: 26,
+          y0: 0,
+        },
+        {
+          x: 1416851880000,
+          y: 21,
+          y0: 0,
+        },
+        {
+          x: 1416851910000,
+          y: 33,
+          y0: 0,
+        },
+        {
+          x: 1416851940000,
+          y: 23,
+          y0: 0,
+        },
+        {
+          x: 1416851970000,
+          y: 46,
+          y0: 0,
+        },
+        {
+          x: 1416852000000,
+          y: 27,
+          y0: 0,
+        },
+        {
+          x: 1416852030000,
+          y: 20,
+          y0: 0,
+        },
+        {
+          x: 1416852060000,
+          y: 34,
+          y0: 0,
+        },
+        {
+          x: 1416852090000,
+          y: 15,
+          y0: 0,
+        },
+        {
+          x: 1416852120000,
+          y: 18,
+          y0: 0,
+        },
+      ],
+    },
+    {
+      label: 'css',
+      values: [
+        {
+          x: 1416850320000,
+          y: 3,
+          y0: 11,
+        },
+        {
+          x: 1416850350000,
+          y: 13,
+          y0: 24,
+        },
+        {
+          x: 1416850380000,
+          y: 5,
+          y0: 34,
+        },
+        {
+          x: 1416850410000,
+          y: 12,
+          y0: 21,
+        },
+        {
+          x: 1416850440000,
+          y: 9,
+          y0: 32,
+        },
+        {
+          x: 1416850470000,
+          y: 12,
+          y0: 24,
+        },
+        {
+          x: 1416850500000,
+          y: 6,
+          y0: 16,
+        },
+        {
+          x: 1416850530000,
+          y: 6,
+          y0: 27,
+        },
+        {
+          x: 1416850560000,
+          y: 11,
+          y0: 24,
+        },
+        {
+          x: 1416850590000,
+          y: 11,
+          y0: 38,
+        },
+        {
+          x: 1416850620000,
+          y: 6,
+          y0: 33,
+        },
+        {
+          x: 1416850650000,
+          y: 8,
+          y0: 33,
+        },
+        {
+          x: 1416850680000,
+          y: 6,
+          y0: 31,
+        },
+        {
+          x: 1416850710000,
+          y: 4,
+          y0: 24,
+        },
+        {
+          x: 1416850740000,
+          y: 9,
+          y0: 24,
+        },
+        {
+          x: 1416850770000,
+          y: 3,
+          y0: 38,
+        },
+        {
+          x: 1416850800000,
+          y: 5,
+          y0: 34,
+        },
+        {
+          x: 1416850830000,
+          y: 6,
+          y0: 30,
+        },
+        {
+          x: 1416850860000,
+          y: 9,
+          y0: 38,
+        },
+        {
+          x: 1416850890000,
+          y: 5,
+          y0: 19,
+        },
+        {
+          x: 1416850920000,
+          y: 8,
+          y0: 23,
+        },
+        {
+          x: 1416850950000,
+          y: 9,
+          y0: 33,
+        },
+        {
+          x: 1416850980000,
+          y: 5,
+          y0: 28,
+        },
+        {
+          x: 1416851010000,
+          y: 6,
+          y0: 24,
+        },
+        {
+          x: 1416851040000,
+          y: 9,
+          y0: 22,
+        },
+        {
+          x: 1416851070000,
+          y: 9,
+          y0: 28,
+        },
+        {
+          x: 1416851100000,
+          y: 11,
+          y0: 27,
+        },
+        {
+          x: 1416851130000,
+          y: 5,
+          y0: 32,
+        },
+        {
+          x: 1416851160000,
+          y: 8,
+          y0: 32,
+        },
+        {
+          x: 1416851190000,
+          y: 6,
+          y0: 30,
+        },
+        {
+          x: 1416851220000,
+          y: 10,
+          y0: 32,
+        },
+        {
+          x: 1416851250000,
+          y: 5,
+          y0: 36,
+        },
+        {
+          x: 1416851280000,
+          y: 6,
+          y0: 32,
+        },
+        {
+          x: 1416851310000,
+          y: 4,
+          y0: 29,
+        },
+        {
+          x: 1416851340000,
+          y: 8,
+          y0: 22,
+        },
+        {
+          x: 1416851370000,
+          y: 3,
+          y0: 29,
+        },
+        {
+          x: 1416851400000,
+          y: 8,
+          y0: 33,
+        },
+        {
+          x: 1416851430000,
+          y: 10,
+          y0: 28,
+        },
+        {
+          x: 1416851460000,
+          y: 5,
+          y0: 39,
+        },
+        {
+          x: 1416851490000,
+          y: 7,
+          y0: 28,
+        },
+        {
+          x: 1416851520000,
+          y: 6,
+          y0: 28,
+        },
+        {
+          x: 1416851550000,
+          y: 4,
+          y0: 28,
+        },
+        {
+          x: 1416851580000,
+          y: 9,
+          y0: 30,
+        },
+        {
+          x: 1416851610000,
+          y: 3,
+          y0: 29,
+        },
+        {
+          x: 1416851640000,
+          y: 9,
+          y0: 30,
+        },
+        {
+          x: 1416851670000,
+          y: 6,
+          y0: 23,
+        },
+        {
+          x: 1416851700000,
+          y: 11,
+          y0: 23,
+        },
+        {
+          x: 1416851730000,
+          y: 4,
+          y0: 27,
+        },
+        {
+          x: 1416851760000,
+          y: 8,
+          y0: 21,
+        },
+        {
+          x: 1416851790000,
+          y: 5,
+          y0: 24,
+        },
+        {
+          x: 1416851820000,
+          y: 7,
+          y0: 26,
+        },
+        {
+          x: 1416851850000,
+          y: 7,
+          y0: 26,
+        },
+        {
+          x: 1416851880000,
+          y: 4,
+          y0: 21,
+        },
+        {
+          x: 1416851910000,
+          y: 8,
+          y0: 33,
+        },
+        {
+          x: 1416851940000,
+          y: 6,
+          y0: 23,
+        },
+        {
+          x: 1416851970000,
+          y: 6,
+          y0: 46,
+        },
+        {
+          x: 1416852000000,
+          y: 3,
+          y0: 27,
+        },
+        {
+          x: 1416852030000,
+          y: 6,
+          y0: 20,
+        },
+        {
+          x: 1416852060000,
+          y: 5,
+          y0: 34,
+        },
+        {
+          x: 1416852090000,
+          y: 5,
+          y0: 15,
+        },
+        {
+          x: 1416852120000,
+          y: 1,
+          y0: 18,
+        },
+      ],
+    },
+    {
+      label: 'gif',
+      values: [
+        {
+          x: 1416850320000,
+          y: 1,
+          y0: 14,
+        },
+        {
+          x: 1416850350000,
+          y: 2,
+          y0: 37,
+        },
+        {
+          x: 1416850380000,
+          y: 4,
+          y0: 39,
+        },
+        {
+          x: 1416850410000,
+          y: 2,
+          y0: 33,
+        },
+        {
+          x: 1416850440000,
+          y: 3,
+          y0: 41,
+        },
+        {
+          x: 1416850470000,
+          y: 1,
+          y0: 36,
+        },
+        {
+          x: 1416850500000,
+          y: 1,
+          y0: 22,
+        },
+        {
+          x: 1416850530000,
+          y: 1,
+          y0: 33,
+        },
+        {
+          x: 1416850560000,
+          y: 2,
+          y0: 35,
+        },
+        {
+          x: 1416850590000,
+          y: 5,
+          y0: 49,
+        },
+        {
+          x: 1416850620000,
+          y: 1,
+          y0: 39,
+        },
+        {
+          x: 1416850650000,
+          y: 1,
+          y0: 41,
+        },
+        {
+          x: 1416850680000,
+          y: 4,
+          y0: 37,
+        },
+        {
+          x: 1416850710000,
+          y: 1,
+          y0: 28,
+        },
+        {
+          x: 1416850740000,
+          y: 3,
+          y0: 33,
+        },
+        {
+          x: 1416850770000,
+          y: 2,
+          y0: 41,
+        },
+        {
+          x: 1416850800000,
+          y: 2,
+          y0: 39,
+        },
+        {
+          x: 1416850830000,
+          y: 5,
+          y0: 36,
+        },
+        {
+          x: 1416850860000,
+          y: 3,
+          y0: 47,
+        },
+        {
+          x: 1416850890000,
+          y: 1,
+          y0: 24,
+        },
+        {
+          x: 1416850920000,
+          y: 3,
+          y0: 31,
+        },
+        {
+          x: 1416850950000,
+          y: 4,
+          y0: 42,
+        },
+        {
+          x: 1416850980000,
+          y: 3,
+          y0: 33,
+        },
+        {
+          x: 1416851010000,
+          y: 5,
+          y0: 30,
+        },
+        {
+          x: 1416851040000,
+          y: 2,
+          y0: 31,
+        },
+        {
+          x: 1416851070000,
+          y: 3,
+          y0: 37,
+        },
+        {
+          x: 1416851100000,
+          y: 5,
+          y0: 38,
+        },
+        {
+          x: 1416851130000,
+          y: 3,
+          y0: 37,
+        },
+        {
+          x: 1416851160000,
+          y: 4,
+          y0: 40,
+        },
+        {
+          x: 1416851190000,
+          y: 9,
+          y0: 36,
+        },
+        {
+          x: 1416851220000,
+          y: 7,
+          y0: 42,
+        },
+        {
+          x: 1416851250000,
+          y: 2,
+          y0: 41,
+        },
+        {
+          x: 1416851280000,
+          y: 1,
+          y0: 38,
+        },
+        {
+          x: 1416851310000,
+          y: 2,
+          y0: 33,
+        },
+        {
+          x: 1416851340000,
+          y: 5,
+          y0: 30,
+        },
+        {
+          x: 1416851370000,
+          y: 3,
+          y0: 32,
+        },
+        {
+          x: 1416851400000,
+          y: 5,
+          y0: 41,
+        },
+        {
+          x: 1416851430000,
+          y: 4,
+          y0: 38,
+        },
+        {
+          x: 1416851460000,
+          y: 5,
+          y0: 44,
+        },
+        {
+          x: 1416851490000,
+          y: 2,
+          y0: 35,
+        },
+        {
+          x: 1416851520000,
+          y: 2,
+          y0: 34,
+        },
+        {
+          x: 1416851550000,
+          y: 4,
+          y0: 32,
+        },
+        {
+          x: 1416851580000,
+          y: 3,
+          y0: 39,
+        },
+        {
+          x: 1416851610000,
+          y: 4,
+          y0: 32,
+        },
+        {
+          x: 1416851640000,
+          y: 0,
+          y0: 39,
+        },
+        {
+          x: 1416851670000,
+          y: 2,
+          y0: 29,
+        },
+        {
+          x: 1416851700000,
+          y: 1,
+          y0: 34,
+        },
+        {
+          x: 1416851730000,
+          y: 3,
+          y0: 31,
+        },
+        {
+          x: 1416851760000,
+          y: 0,
+          y0: 29,
+        },
+        {
+          x: 1416851790000,
+          y: 4,
+          y0: 29,
+        },
+        {
+          x: 1416851820000,
+          y: 3,
+          y0: 33,
+        },
+        {
+          x: 1416851850000,
+          y: 3,
+          y0: 33,
+        },
+        {
+          x: 1416851880000,
+          y: 0,
+          y0: 25,
+        },
+        {
+          x: 1416851910000,
+          y: 0,
+          y0: 41,
+        },
+        {
+          x: 1416851940000,
+          y: 3,
+          y0: 29,
+        },
+        {
+          x: 1416851970000,
+          y: 3,
+          y0: 52,
+        },
+        {
+          x: 1416852000000,
+          y: 1,
+          y0: 30,
+        },
+        {
+          x: 1416852030000,
+          y: 5,
+          y0: 26,
+        },
+        {
+          x: 1416852060000,
+          y: 3,
+          y0: 39,
+        },
+        {
+          x: 1416852090000,
+          y: 1,
+          y0: 20,
+        },
+        {
+          x: 1416852120000,
+          y: 2,
+          y0: 19,
+        },
+      ],
+    },
+    {
+      label: 'png',
+      values: [
+        {
+          x: 1416850320000,
+          y: 1,
+          y0: 15,
+        },
+        {
+          x: 1416850350000,
+          y: 6,
+          y0: 39,
+        },
+        {
+          x: 1416850380000,
+          y: 6,
+          y0: 43,
+        },
+        {
+          x: 1416850410000,
+          y: 5,
+          y0: 35,
+        },
+        {
+          x: 1416850440000,
+          y: 3,
+          y0: 44,
+        },
+        {
+          x: 1416850470000,
+          y: 5,
+          y0: 37,
+        },
+        {
+          x: 1416850500000,
+          y: 6,
+          y0: 23,
+        },
+        {
+          x: 1416850530000,
+          y: 1,
+          y0: 34,
+        },
+        {
+          x: 1416850560000,
+          y: 3,
+          y0: 37,
+        },
+        {
+          x: 1416850590000,
+          y: 2,
+          y0: 54,
+        },
+        {
+          x: 1416850620000,
+          y: 1,
+          y0: 40,
+        },
+        {
+          x: 1416850650000,
+          y: 1,
+          y0: 42,
+        },
+        {
+          x: 1416850680000,
+          y: 2,
+          y0: 41,
+        },
+        {
+          x: 1416850710000,
+          y: 5,
+          y0: 29,
+        },
+        {
+          x: 1416850740000,
+          y: 7,
+          y0: 36,
+        },
+        {
+          x: 1416850770000,
+          y: 2,
+          y0: 43,
+        },
+        {
+          x: 1416850800000,
+          y: 3,
+          y0: 41,
+        },
+        {
+          x: 1416850830000,
+          y: 6,
+          y0: 41,
+        },
+        {
+          x: 1416850860000,
+          y: 2,
+          y0: 50,
+        },
+        {
+          x: 1416850890000,
+          y: 4,
+          y0: 25,
+        },
+        {
+          x: 1416850920000,
+          y: 2,
+          y0: 34,
+        },
+        {
+          x: 1416850950000,
+          y: 3,
+          y0: 46,
+        },
+        {
+          x: 1416850980000,
+          y: 8,
+          y0: 36,
+        },
+        {
+          x: 1416851010000,
+          y: 4,
+          y0: 35,
+        },
+        {
+          x: 1416851040000,
+          y: 4,
+          y0: 33,
+        },
+        {
+          x: 1416851070000,
+          y: 1,
+          y0: 40,
+        },
+        {
+          x: 1416851100000,
+          y: 2,
+          y0: 43,
+        },
+        {
+          x: 1416851130000,
+          y: 4,
+          y0: 40,
+        },
+        {
+          x: 1416851160000,
+          y: 3,
+          y0: 44,
+        },
+        {
+          x: 1416851190000,
+          y: 4,
+          y0: 45,
+        },
+        {
+          x: 1416851220000,
+          y: 2,
+          y0: 49,
+        },
+        {
+          x: 1416851250000,
+          y: 4,
+          y0: 43,
+        },
+        {
+          x: 1416851280000,
+          y: 8,
+          y0: 39,
+        },
+        {
+          x: 1416851310000,
+          y: 4,
+          y0: 35,
+        },
+        {
+          x: 1416851340000,
+          y: 4,
+          y0: 35,
+        },
+        {
+          x: 1416851370000,
+          y: 7,
+          y0: 35,
+        },
+        {
+          x: 1416851400000,
+          y: 2,
+          y0: 46,
+        },
+        {
+          x: 1416851430000,
+          y: 3,
+          y0: 42,
+        },
+        {
+          x: 1416851460000,
+          y: 3,
+          y0: 49,
+        },
+        {
+          x: 1416851490000,
+          y: 3,
+          y0: 37,
+        },
+        {
+          x: 1416851520000,
+          y: 4,
+          y0: 36,
+        },
+        {
+          x: 1416851550000,
+          y: 3,
+          y0: 36,
+        },
+        {
+          x: 1416851580000,
+          y: 4,
+          y0: 42,
+        },
+        {
+          x: 1416851610000,
+          y: 5,
+          y0: 36,
+        },
+        {
+          x: 1416851640000,
+          y: 3,
+          y0: 39,
+        },
+        {
+          x: 1416851670000,
+          y: 3,
+          y0: 31,
+        },
+        {
+          x: 1416851700000,
+          y: 2,
+          y0: 35,
+        },
+        {
+          x: 1416851730000,
+          y: 5,
+          y0: 34,
+        },
+        {
+          x: 1416851760000,
+          y: 4,
+          y0: 29,
+        },
+        {
+          x: 1416851790000,
+          y: 5,
+          y0: 33,
+        },
+        {
+          x: 1416851820000,
+          y: 1,
+          y0: 36,
+        },
+        {
+          x: 1416851850000,
+          y: 3,
+          y0: 36,
+        },
+        {
+          x: 1416851880000,
+          y: 6,
+          y0: 25,
+        },
+        {
+          x: 1416851910000,
+          y: 4,
+          y0: 41,
+        },
+        {
+          x: 1416851940000,
+          y: 7,
+          y0: 32,
+        },
+        {
+          x: 1416851970000,
+          y: 5,
+          y0: 55,
+        },
+        {
+          x: 1416852000000,
+          y: 2,
+          y0: 31,
+        },
+        {
+          x: 1416852030000,
+          y: 2,
+          y0: 31,
+        },
+        {
+          x: 1416852060000,
+          y: 4,
+          y0: 42,
+        },
+        {
+          x: 1416852090000,
+          y: 6,
+          y0: 21,
+        },
+        {
+          x: 1416852120000,
+          y: 2,
+          y0: 21,
+        },
+      ],
+    },
+    {
+      label: 'php',
+      values: [
+        {
+          x: 1416850320000,
+          y: 0,
+          y0: 16,
+        },
+        {
+          x: 1416850350000,
+          y: 1,
+          y0: 45,
+        },
+        {
+          x: 1416850380000,
+          y: 0,
+          y0: 49,
+        },
+        {
+          x: 1416850410000,
+          y: 2,
+          y0: 40,
+        },
+        {
+          x: 1416850440000,
+          y: 0,
+          y0: 47,
+        },
+        {
+          x: 1416850470000,
+          y: 0,
+          y0: 42,
+        },
+        {
+          x: 1416850500000,
+          y: 3,
+          y0: 29,
+        },
+        {
+          x: 1416850530000,
+          y: 1,
+          y0: 35,
+        },
+        {
+          x: 1416850560000,
+          y: 3,
+          y0: 40,
+        },
+        {
+          x: 1416850590000,
+          y: 2,
+          y0: 56,
+        },
+        {
+          x: 1416850620000,
+          y: 2,
+          y0: 41,
+        },
+        {
+          x: 1416850650000,
+          y: 5,
+          y0: 43,
+        },
+        {
+          x: 1416850680000,
+          y: 2,
+          y0: 43,
+        },
+        {
+          x: 1416850710000,
+          y: 1,
+          y0: 34,
+        },
+        {
+          x: 1416850740000,
+          y: 2,
+          y0: 43,
+        },
+        {
+          x: 1416850770000,
+          y: 2,
+          y0: 45,
+        },
+        {
+          x: 1416850800000,
+          y: 1,
+          y0: 44,
+        },
+        {
+          x: 1416850830000,
+          y: 1,
+          y0: 47,
+        },
+        {
+          x: 1416850860000,
+          y: 1,
+          y0: 52,
+        },
+        {
+          x: 1416850890000,
+          y: 1,
+          y0: 29,
+        },
+        {
+          x: 1416850920000,
+          y: 2,
+          y0: 36,
+        },
+        {
+          x: 1416850950000,
+          y: 2,
+          y0: 49,
+        },
+        {
+          x: 1416850980000,
+          y: 0,
+          y0: 44,
+        },
+        {
+          x: 1416851010000,
+          y: 3,
+          y0: 39,
+        },
+        {
+          x: 1416851040000,
+          y: 2,
+          y0: 37,
+        },
+        {
+          x: 1416851070000,
+          y: 2,
+          y0: 41,
+        },
+        {
+          x: 1416851100000,
+          y: 2,
+          y0: 45,
+        },
+        {
+          x: 1416851130000,
+          y: 0,
+          y0: 44,
+        },
+        {
+          x: 1416851160000,
+          y: 1,
+          y0: 47,
+        },
+        {
+          x: 1416851190000,
+          y: 2,
+          y0: 49,
+        },
+        {
+          x: 1416851220000,
+          y: 4,
+          y0: 51,
+        },
+        {
+          x: 1416851250000,
+          y: 0,
+          y0: 47,
+        },
+        {
+          x: 1416851280000,
+          y: 3,
+          y0: 47,
+        },
+        {
+          x: 1416851310000,
+          y: 3,
+          y0: 39,
+        },
+        {
+          x: 1416851340000,
+          y: 2,
+          y0: 39,
+        },
+        {
+          x: 1416851370000,
+          y: 2,
+          y0: 42,
+        },
+        {
+          x: 1416851400000,
+          y: 3,
+          y0: 48,
+        },
+        {
+          x: 1416851430000,
+          y: 1,
+          y0: 45,
+        },
+        {
+          x: 1416851460000,
+          y: 0,
+          y0: 52,
+        },
+        {
+          x: 1416851490000,
+          y: 2,
+          y0: 40,
+        },
+        {
+          x: 1416851520000,
+          y: 1,
+          y0: 40,
+        },
+        {
+          x: 1416851550000,
+          y: 3,
+          y0: 39,
+        },
+        {
+          x: 1416851580000,
+          y: 1,
+          y0: 46,
+        },
+        {
+          x: 1416851610000,
+          y: 2,
+          y0: 41,
+        },
+        {
+          x: 1416851640000,
+          y: 1,
+          y0: 42,
+        },
+        {
+          x: 1416851670000,
+          y: 2,
+          y0: 34,
+        },
+        {
+          x: 1416851700000,
+          y: 3,
+          y0: 37,
+        },
+        {
+          x: 1416851730000,
+          y: 1,
+          y0: 39,
+        },
+        {
+          x: 1416851760000,
+          y: 1,
+          y0: 33,
+        },
+        {
+          x: 1416851790000,
+          y: 1,
+          y0: 38,
+        },
+        {
+          x: 1416851820000,
+          y: 1,
+          y0: 37,
+        },
+        {
+          x: 1416851850000,
+          y: 1,
+          y0: 39,
+        },
+        {
+          x: 1416851880000,
+          y: 1,
+          y0: 31,
+        },
+        {
+          x: 1416851910000,
+          y: 2,
+          y0: 45,
+        },
+        {
+          x: 1416851940000,
+          y: 0,
+          y0: 39,
+        },
+        {
+          x: 1416851970000,
+          y: 0,
+          y0: 60,
+        },
+        {
+          x: 1416852000000,
+          y: 1,
+          y0: 33,
+        },
+        {
+          x: 1416852030000,
+          y: 2,
+          y0: 33,
+        },
+        {
+          x: 1416852060000,
+          y: 1,
+          y0: 46,
+        },
+        {
+          x: 1416852090000,
+          y: 1,
+          y0: 27,
+        },
+        {
+          x: 1416852120000,
+          y: 0,
+          y0: 23,
+        },
+      ],
+    },
+  ],
+  hits: 2595,
+  xAxisFormatter: function(thing) {
+    return moment(thing);
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js
new file mode 100644
index 00000000000000..8891d9badb2be3
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_columns.js
@@ -0,0 +1,159 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  columns: [
+    {
+      label: 'logstash: index',
+      xAxisLabel: 'Top 5 extension',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'jpg',
+              y: 110710,
+            },
+            {
+              x: 'css',
+              y: 27376,
+            },
+            {
+              x: 'png',
+              y: 16664,
+            },
+            {
+              x: 'gif',
+              y: 11264,
+            },
+            {
+              x: 'php',
+              y: 5448,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '2014.11.12: index',
+      xAxisLabel: 'Top 5 extension',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'jpg',
+              y: 110643,
+            },
+            {
+              x: 'css',
+              y: 27350,
+            },
+            {
+              x: 'png',
+              y: 16648,
+            },
+            {
+              x: 'gif',
+              y: 11257,
+            },
+            {
+              x: 'php',
+              y: 5440,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '2014.11.11: index',
+      xAxisLabel: 'Top 5 extension',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'jpg',
+              y: 67,
+            },
+            {
+              x: 'css',
+              y: 26,
+            },
+            {
+              x: 'png',
+              y: 16,
+            },
+            {
+              x: 'gif',
+              y: 7,
+            },
+            {
+              x: 'php',
+              y: 8,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  xAxisOrderedValues: ['jpg', 'css', 'png', 'gif', 'php'],
+  hits: 171462,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js
new file mode 100644
index 00000000000000..09a1c159897603
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_rows.js
@@ -0,0 +1,115 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  rows: [
+    {
+      label: '0.0-1000.0: bytes',
+      xAxisLabel: 'Top 5 extension',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'jpg',
+              y: 3378,
+            },
+            {
+              x: 'css',
+              y: 762,
+            },
+            {
+              x: 'png',
+              y: 527,
+            },
+            {
+              x: 'gif',
+              y: 11258,
+            },
+            {
+              x: 'php',
+              y: 653,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+    {
+      label: '1000.0-2000.0: bytes',
+      xAxisLabel: 'Top 5 extension',
+      yAxisLabel: 'Count of documents',
+      series: [
+        {
+          label: 'Count',
+          values: [
+            {
+              x: 'jpg',
+              y: 6422,
+            },
+            {
+              x: 'css',
+              y: 1591,
+            },
+            {
+              x: 'png',
+              y: 430,
+            },
+            {
+              x: 'gif',
+              y: 8,
+            },
+            {
+              x: 'php',
+              y: 561,
+            },
+          ],
+        },
+      ],
+      xAxisFormatter: function(val) {
+        if (_.isObject(val)) {
+          return JSON.stringify(val);
+        } else if (val == null) {
+          return '';
+        } else {
+          return '' + val;
+        }
+      },
+      tooltipFormatter: function(d) {
+        return d;
+      },
+    },
+  ],
+  xAxisOrderedValues: ['jpg', 'css', 'png', 'gif', 'php'],
+  hits: 171458,
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js
new file mode 100644
index 00000000000000..c55bff5631e888
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series.js
@@ -0,0 +1,67 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  label: '',
+  xAxisLabel: 'Top 5 extension',
+  xAxisOrderedValues: ['jpg', 'css', 'png', 'gif', 'php'],
+  yAxisLabel: 'Count of documents',
+  series: [
+    {
+      label: 'Count',
+      values: [
+        {
+          x: 'jpg',
+          y: 110710,
+        },
+        {
+          x: 'css',
+          y: 27389,
+        },
+        {
+          x: 'png',
+          y: 16661,
+        },
+        {
+          x: 'gif',
+          y: 11269,
+        },
+        {
+          x: 'php',
+          y: 5447,
+        },
+      ],
+    },
+  ],
+  hits: 171476,
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js
new file mode 100644
index 00000000000000..372325120ee8ec
--- /dev/null
+++ b/src/plugins/vis_type_vislib/public/fixtures/mock_data/terms/_series_multiple.js
@@ -0,0 +1,105 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import _ from 'lodash';
+
+export default {
+  xAxisOrderedValues: ['_all'],
+  yAxisLabel: 'Count',
+  zAxisLabel: 'machine.os.raw: Descending',
+  yScale: null,
+  series: [
+    {
+      label: 'ios',
+      id: '1',
+      yAxisFormatter: _.identity,
+      values: [
+        {
+          x: '_all',
+          y: 2820,
+          series: 'ios',
+        },
+      ],
+    },
+    {
+      label: 'win 7',
+      aggId: '1',
+      yAxisFormatter: _.identity,
+      values: [
+        {
+          x: '_all',
+          y: 2319,
+          series: 'win 7',
+        },
+      ],
+    },
+    {
+      label: 'win 8',
+      id: '1',
+      yAxisFormatter: _.identity,
+      values: [
+        {
+          x: '_all',
+          y: 1835,
+          series: 'win 8',
+        },
+      ],
+    },
+    {
+      label: 'windows xp service pack 2 version 20123452',
+      id: '1',
+      yAxisFormatter: _.identity,
+      values: [
+        {
+          x: '_all',
+          y: 734,
+          series: 'win xp',
+        },
+      ],
+    },
+    {
+      label: 'osx',
+      id: '1',
+      yAxisFormatter: _.identity,
+      values: [
+        {
+          x: '_all',
+          y: 1352,
+          series: 'osx',
+        },
+      ],
+    },
+  ],
+  hits: 14005,
+  xAxisFormatter: function(val) {
+    if (_.isObject(val)) {
+      return JSON.stringify(val);
+    } else if (val == null) {
+      return '';
+    } else {
+      return '' + val;
+    }
+  },
+  yAxisFormatter: function(val) {
+    return val;
+  },
+  tooltipFormatter: function(d) {
+    return d;
+  },
+};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts b/src/plugins/vis_type_vislib/public/fixtures/mocks.js
similarity index 68%
rename from src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
rename to src/plugins/vis_type_vislib/public/fixtures/mocks.js
index c04ffa506eb04d..60edf6c1ff05cc 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/legacy_imports.ts
+++ b/src/plugins/vis_type_vislib/public/fixtures/mocks.js
@@ -17,5 +17,21 @@
  * under the License.
  */
 
-import { search } from '../../../../plugins/data/public';
-export const { tabifyAggResponse, tabifyGetColumns } = search;
+import { setFormatService } from '../services';
+
+setFormatService({
+  deserialize: () => ({
+    convert: v => v,
+  }),
+});
+
+export const getMockUiState = () => {
+  const map = new Map();
+
+  return (() => ({
+    get: (...args) => map.get(...args),
+    set: (...args) => map.set(...args),
+    setSilent: (...args) => map.set(...args),
+    on: () => undefined,
+  }))();
+};
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts b/src/plugins/vis_type_vislib/public/gauge.ts
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
rename to src/plugins/vis_type_vislib/public/gauge.ts
index 5e0b2b8fbd36cb..561c45d26fa7f6 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/gauge.ts
+++ b/src/plugins/vis_type_vislib/public/gauge.ts
@@ -19,17 +19,11 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { RangeValues, Schemas } from '../../../../plugins/vis_default_editor/public';
-import { AggGroupNames } from '../../../../plugins/data/public';
+import { RangeValues, Schemas } from '../../vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
 import { GaugeOptions } from './components/options';
 import { getGaugeCollections, Alignments, GaugeTypes } from './utils/collections';
-import {
-  ColorModes,
-  ColorSchemas,
-  ColorSchemaParams,
-  Labels,
-  Style,
-} from '../../../../plugins/charts/public';
+import { ColorModes, ColorSchemas, ColorSchemaParams, Labels, Style } from '../../charts/public';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/goal.ts b/src/plugins/vis_type_vislib/public/goal.ts
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/goal.ts
rename to src/plugins/vis_type_vislib/public/goal.ts
index 0f70dca69728d2..5f74698938a0b1 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/goal.ts
+++ b/src/plugins/vis_type_vislib/public/goal.ts
@@ -23,9 +23,9 @@ import { GaugeOptions } from './components/options';
 import { getGaugeCollections, GaugeTypes } from './utils/collections';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
-import { ColorModes, ColorSchemas } from '../../../../plugins/charts/public';
-import { AggGroupNames } from '../../../../plugins/data/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { ColorModes, ColorSchemas } from '../../charts/public';
+import { AggGroupNames } from '../../data/public';
+import { Schemas } from '../../vis_default_editor/public';
 
 export const createGoalVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'goal',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts b/src/plugins/vis_type_vislib/public/heatmap.ts
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
rename to src/plugins/vis_type_vislib/public/heatmap.ts
index 9feed60b984bae..ced7a38568ffd0 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/heatmap.ts
+++ b/src/plugins/vis_type_vislib/public/heatmap.ts
@@ -19,15 +19,15 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { RangeValues, Schemas } from '../../../../plugins/vis_default_editor/public';
-import { AggGroupNames } from '../../../../plugins/data/public';
+import { RangeValues, Schemas } from '../../vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
 import { AxisTypes, getHeatmapCollections, Positions, ScaleTypes } from './utils/collections';
 import { HeatmapOptions } from './components/options';
 import { createVislibVisController } from './vis_controller';
 import { TimeMarker } from './vislib/visualizations/time_marker';
 import { CommonVislibParams, ValueAxis } from './types';
 import { VisTypeVislibDependencies } from './plugin';
-import { ColorSchemas, ColorSchemaParams } from '../../../../plugins/charts/public';
+import { ColorSchemas, ColorSchemaParams } from '../../charts/public';
 
 export interface HeatmapVisParams extends CommonVislibParams, ColorSchemaParams {
   type: 'heatmap';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts b/src/plugins/vis_type_vislib/public/histogram.ts
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
rename to src/plugins/vis_type_vislib/public/histogram.ts
index 54ccf66f362ca3..52242ad11e8f58 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/histogram.ts
+++ b/src/plugins/vis_type_vislib/public/histogram.ts
@@ -23,8 +23,8 @@ import { palettes } from '@elastic/eui/lib/services';
 // @ts-ignore
 import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { AggGroupNames } from '../../../../plugins/data/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
@@ -38,7 +38,7 @@ import {
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
-import { Rotates } from '../../../../plugins/charts/public';
+import { Rotates } from '../../charts/public';
 
 export const createHistogramVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'histogram',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts b/src/plugins/vis_type_vislib/public/horizontal_bar.ts
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
rename to src/plugins/vis_type_vislib/public/horizontal_bar.ts
index 6f732717266601..a58c15f136431e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/horizontal_bar.ts
+++ b/src/plugins/vis_type_vislib/public/horizontal_bar.ts
@@ -19,12 +19,10 @@
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
-import { palettes } from '@elastic/eui/lib/services';
-// @ts-ignore
-import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
+import { palettes, euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { AggGroupNames } from '../../../../plugins/data/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
@@ -38,7 +36,7 @@ import {
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
-import { Rotates } from '../../../../plugins/charts/public';
+import { Rotates } from '../../charts/public';
 
 export const createHorizontalBarVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'horizontal_bar',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/_index.scss b/src/plugins/vis_type_vislib/public/index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/_index.scss
rename to src/plugins/vis_type_vislib/public/index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/index.ts b/src/plugins/vis_type_vislib/public/index.ts
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/index.ts
rename to src/plugins/vis_type_vislib/public/index.ts
index 4d7091ffb204be..665643a6763f6b 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/index.ts
+++ b/src/plugins/vis_type_vislib/public/index.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '../../../core/public';
 import { VisTypeVislibPlugin as Plugin } from './plugin';
 
 export function plugin(initializerContext: PluginInitializerContext) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/line.ts b/src/plugins/vis_type_vislib/public/line.ts
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/line.ts
rename to src/plugins/vis_type_vislib/public/line.ts
index 1f9a8d77398e63..a94fd3f3945ab7 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/line.ts
+++ b/src/plugins/vis_type_vislib/public/line.ts
@@ -19,12 +19,10 @@
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
-import { palettes } from '@elastic/eui/lib/services';
-// @ts-ignore
-import { euiPaletteColorBlind } from '@elastic/eui/lib/services';
+import { palettes, euiPaletteColorBlind } from '@elastic/eui/lib/services';
 
-import { AggGroupNames } from '../../../../plugins/data/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import {
   Positions,
   ChartTypes,
@@ -39,7 +37,7 @@ import {
 import { getAreaOptionTabs, countLabel } from './utils/common_config';
 import { createVislibVisController } from './vis_controller';
 import { VisTypeVislibDependencies } from './plugin';
-import { Rotates } from '../../../../plugins/charts/public';
+import { Rotates } from '../../charts/public';
 
 export const createLineVisTypeDefinition = (deps: VisTypeVislibDependencies) => ({
   name: 'line',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/pie.ts b/src/plugins/vis_type_vislib/public/pie.ts
similarity index 95%
rename from src/legacy/core_plugins/vis_type_vislib/public/pie.ts
rename to src/plugins/vis_type_vislib/public/pie.ts
index 2774836baa3817..a68bc5893406f5 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/pie.ts
+++ b/src/plugins/vis_type_vislib/public/pie.ts
@@ -19,8 +19,8 @@
 
 import { i18n } from '@kbn/i18n';
 
-import { AggGroupNames } from '../../../../plugins/data/public';
-import { Schemas } from '../../../../plugins/vis_default_editor/public';
+import { AggGroupNames } from '../../data/public';
+import { Schemas } from '../../vis_default_editor/public';
 import { PieOptions } from './components/options';
 import { getPositions, Positions } from './utils/collections';
 import { createVislibVisController } from './vis_controller';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/pie_fn.test.ts b/src/plugins/vis_type_vislib/public/pie_fn.test.ts
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/pie_fn.test.ts
rename to src/plugins/vis_type_vislib/public/pie_fn.test.ts
index 15c80e47194872..a8c03eba2b4499 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/pie_fn.test.ts
+++ b/src/plugins/vis_type_vislib/public/pie_fn.test.ts
@@ -18,12 +18,11 @@
  */
 
 // eslint-disable-next-line
-import { functionWrapper } from '../../../../plugins/expressions/common/expression_functions/specs/tests/utils';
+import { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
 import { createPieVisFn } from './pie_fn';
 // @ts-ignore
 import { vislibSlicesResponseHandler } from './vislib/response_handler';
 
-jest.mock('ui/new_platform');
 jest.mock('./vislib/response_handler', () => ({
   vislibSlicesResponseHandler: jest.fn().mockReturnValue({
     hits: 1,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/pie_fn.ts b/src/plugins/vis_type_vislib/public/pie_fn.ts
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/pie_fn.ts
rename to src/plugins/vis_type_vislib/public/pie_fn.ts
index 452e0be0df3e4a..52da0f7ac14eca 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/pie_fn.ts
+++ b/src/plugins/vis_type_vislib/public/pie_fn.ts
@@ -18,11 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  ExpressionFunctionDefinition,
-  KibanaDatatable,
-  Render,
-} from '../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition, KibanaDatatable, Render } from '../../expressions/public';
 // @ts-ignore
 import { vislibSlicesResponseHandler } from './vislib/response_handler';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts b/src/plugins/vis_type_vislib/public/plugin.ts
similarity index 92%
rename from src/legacy/core_plugins/vis_type_vislib/public/plugin.ts
rename to src/plugins/vis_type_vislib/public/plugin.ts
index 26800f8a1620ed..e19a2ec451f2b8 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts
+++ b/src/plugins/vis_type_vislib/public/plugin.ts
@@ -16,6 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+import './index.scss';
+
 import {
   CoreSetup,
   CoreStart,
@@ -25,8 +28,8 @@ import {
 } from 'kibana/public';
 
 import { VisTypeXyPluginSetup } from 'src/plugins/vis_type_xy/public';
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { VisualizationsSetup } from '../../visualizations/public';
 import { createVisTypeVislibVisFn } from './vis_type_vislib_vis_fn';
 import { createPieVisFn } from './pie_fn';
 import {
@@ -39,8 +42,8 @@ import {
   createGaugeVisTypeDefinition,
   createGoalVisTypeDefinition,
 } from './vis_type_vislib_vis_types';
-import { ChartsPluginSetup } from '../../../../plugins/charts/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { ChartsPluginSetup } from '../../charts/public';
+import { DataPublicPluginStart } from '../../data/public';
 import { setFormatService, setDataActions } from './services';
 
 export interface VisTypeVislibDependencies {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/services.ts b/src/plugins/vis_type_vislib/public/services.ts
similarity index 87%
rename from src/legacy/core_plugins/vis_type_vislib/public/services.ts
rename to src/plugins/vis_type_vislib/public/services.ts
index 0d6b1b5e8de589..633fae9c7f2a61 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/services.ts
+++ b/src/plugins/vis_type_vislib/public/services.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { createGetterSetter } from '../../../../plugins/kibana_utils/public';
-import { DataPublicPluginStart } from '../../../../plugins/data/public';
+import { createGetterSetter } from '../../kibana_utils/public';
+import { DataPublicPluginStart } from '../../data/public';
 
 export const [getDataActions, setDataActions] = createGetterSetter<
   DataPublicPluginStart['actions']
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/types.ts b/src/plugins/vis_type_vislib/public/types.ts
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/types.ts
rename to src/plugins/vis_type_vislib/public/types.ts
index 25c6ae5439fe85..83d0b49b1c5518 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/types.ts
+++ b/src/plugins/vis_type_vislib/public/types.ts
@@ -28,7 +28,7 @@ import {
   ScaleTypes,
   ThresholdLineStyles,
 } from './utils/collections';
-import { Labels, Style } from '../../../../plugins/charts/public';
+import { Labels, Style } from '../../charts/public';
 
 export interface CommonVislibParams {
   addTooltip: boolean;
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts b/src/plugins/vis_type_vislib/public/utils/collections.ts
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts
rename to src/plugins/vis_type_vislib/public/utils/collections.ts
index 2024c43dd1c8b4..44df4864bfd68c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/utils/collections.ts
+++ b/src/plugins/vis_type_vislib/public/utils/collections.ts
@@ -20,7 +20,7 @@
 import { i18n } from '@kbn/i18n';
 import { $Values } from '@kbn/utility-types';
 
-import { colorSchemas, Rotates } from '../../../../../plugins/charts/public';
+import { colorSchemas, Rotates } from '../../../charts/public';
 
 export const Positions = Object.freeze({
   RIGHT: 'right' as 'right',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/utils/common_config.tsx b/src/plugins/vis_type_vislib/public/utils/common_config.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/utils/common_config.tsx
rename to src/plugins/vis_type_vislib/public/utils/common_config.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx b/src/plugins/vis_type_vislib/public/vis_controller.tsx
similarity index 96%
rename from src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx
rename to src/plugins/vis_type_vislib/public/vis_controller.tsx
index ec091e5d29cfdf..65acc08b58da02 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vis_controller.tsx
+++ b/src/plugins/vis_type_vislib/public/vis_controller.tsx
@@ -24,9 +24,9 @@ import React, { RefObject } from 'react';
 import { Vis as Vislib } from './vislib/vis';
 import { Positions } from './utils/collections';
 import { VisTypeVislibDependencies } from './plugin';
-import { mountReactNode } from '../../../../core/public/utils';
+import { mountReactNode } from '../../../core/public/utils';
 import { VisLegend, CUSTOM_LEGEND_VIS_TYPES } from './vislib/components/legend';
-import { VisParams, ExprVis } from '../../../../plugins/visualizations/public';
+import { VisParams, ExprVis } from '../../visualizations/public';
 
 const legendClassName = {
   top: 'visLib--legend-top',
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vis_type_vislib_vis_fn.ts b/src/plugins/vis_type_vislib/public/vis_type_vislib_vis_fn.ts
similarity index 94%
rename from src/legacy/core_plugins/vis_type_vislib/public/vis_type_vislib_vis_fn.ts
rename to src/plugins/vis_type_vislib/public/vis_type_vislib_vis_fn.ts
index 854b70b04e58a6..a4243c6d25c417 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vis_type_vislib_vis_fn.ts
+++ b/src/plugins/vis_type_vislib/public/vis_type_vislib_vis_fn.ts
@@ -18,11 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import {
-  ExpressionFunctionDefinition,
-  KibanaDatatable,
-  Render,
-} from '../../../../plugins/expressions/public';
+import { ExpressionFunctionDefinition, KibanaDatatable, Render } from '../../expressions/public';
 // @ts-ignore
 import { vislibSeriesResponseHandler } from './vislib/response_handler';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vis_type_vislib_vis_types.ts b/src/plugins/vis_type_vislib/public/vis_type_vislib_vis_types.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vis_type_vislib_vis_types.ts
rename to src/plugins/vis_type_vislib/public/vis_type_vislib_vis_types.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/VISLIB.md b/src/plugins/vis_type_vislib/public/vislib/VISLIB.md
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/VISLIB.md
rename to src/plugins/vis_type_vislib/public/vislib/VISLIB.md
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/_index.scss b/src/plugins/vis_type_vislib/public/vislib/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/_variables.scss b/src/plugins/vis_type_vislib/public/vislib/_variables.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/_variables.scss
rename to src/plugins/vis_type_vislib/public/vislib/_variables.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/_vislib_vis_type.scss b/src/plugins/vis_type_vislib/public/vislib/_vislib_vis_type.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/_vislib_vis_type.scss
rename to src/plugins/vis_type_vislib/public/vislib/_vislib_vis_type.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/data_array.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/data_array.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/data_array.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/flatten_series.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/index.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/index.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/index.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/labels.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/labels.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js
similarity index 80%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/labels.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js
index db99b881a6e380..838275d44d2a1a 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/labels.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/labels/labels.test.js
@@ -18,12 +18,11 @@
  */
 
 import _ from 'lodash';
-import expect from '@kbn/expect';
 
-import { labels } from '../../components/labels/labels';
-import { dataArray } from '../../components/labels/data_array';
-import { uniqLabels } from '../../components/labels/uniq_labels';
-import { flattenSeries as getSeries } from '../../components/labels/flatten_series';
+import { labels } from './labels';
+import { dataArray } from './data_array';
+import { uniqLabels } from './uniq_labels';
+import { flattenSeries as getSeries } from './flatten_series';
 
 let seriesLabels;
 let rowsLabels;
@@ -175,27 +174,27 @@ describe('Vislib Labels Module Test Suite', function() {
     });
 
     it('should be a function', function() {
-      expect(typeof labels).to.be('function');
+      expect(typeof labels).toBe('function');
     });
 
     it('should return an array if input is data.series', function() {
-      expect(seriesArr).to.be(true);
+      expect(seriesArr).toBe(true);
     });
 
     it('should return an array if input is data.rows', function() {
-      expect(rowsArr).to.be(true);
+      expect(rowsArr).toBe(true);
     });
 
     it('should throw an error if input is not an object', function() {
       expect(function() {
         labels('string not object');
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should return unique label values', function() {
-      expect(rowsLabels[0]).to.equal(uniqSeriesLabels[0]);
-      expect(rowsLabels[1]).to.equal(uniqSeriesLabels[1]);
-      expect(rowsLabels[2]).to.equal(uniqSeriesLabels[2]);
+      expect(rowsLabels[0]).toEqual(uniqSeriesLabels[0]);
+      expect(rowsLabels[1]).toEqual(uniqSeriesLabels[1]);
+      expect(rowsLabels[2]).toEqual(uniqSeriesLabels[2]);
     });
   });
 
@@ -231,27 +230,27 @@ describe('Vislib Labels Module Test Suite', function() {
     it('should throw an error if the input is not an object', function() {
       expect(function() {
         dataArray(string);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         dataArray(number);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         dataArray(boolean);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         dataArray(emptyArray);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         dataArray(nullValue);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         dataArray(notAValue);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it(
@@ -259,7 +258,7 @@ describe('Vislib Labels Module Test Suite', function() {
       function() {
         expect(function() {
           dataArray(childrenObject);
-        }).to.throwError();
+        }).toThrow();
       }
     );
 
@@ -268,42 +267,42 @@ describe('Vislib Labels Module Test Suite', function() {
       function() {
         expect(function() {
           dataArray(seriesObject);
-        }).to.not.throwError();
+        }).not.toThrow();
 
         expect(function() {
           dataArray(rowsObject);
-        }).to.not.throwError();
+        }).not.toThrow();
 
         expect(function() {
           dataArray(columnsObject);
-        }).to.not.throwError();
+        }).not.toThrow();
       }
     );
 
     it('should be a function', function() {
-      expect(typeof dataArray).to.equal('function');
+      expect(typeof dataArray).toEqual('function');
     });
 
     it('should return an array of objects if input is data.series', function() {
-      expect(testSeries).to.equal(true);
+      expect(testSeries).toEqual(true);
     });
 
     it('should return an array of objects if input is data.rows', function() {
-      expect(testRows).to.equal(true);
+      expect(testRows).toEqual(true);
     });
 
     it('should return an array of same length as input data.series', function() {
-      expect(seriesLabels.length).to.equal(seriesData.series.length);
+      expect(seriesLabels.length).toEqual(seriesData.series.length);
     });
 
     it('should return an array of same length as input data.rows', function() {
-      expect(rowsLabels.length).to.equal(rowsData.rows.length);
+      expect(rowsLabels.length).toEqual(rowsData.rows.length);
     });
 
     it('should return an array of objects with obj.labels and obj.values', function() {
-      expect(seriesLabels[0].label).to.equal('100');
-      expect(seriesLabels[0].values[0].x).to.equal(0);
-      expect(seriesLabels[0].values[0].y).to.equal(1);
+      expect(seriesLabels[0].label).toEqual('100');
+      expect(seriesLabels[0].values[0].x).toEqual(0);
+      expect(seriesLabels[0].values[0].y).toEqual(1);
     });
   });
 
@@ -337,45 +336,45 @@ describe('Vislib Labels Module Test Suite', function() {
     it('should throw an error if input is not an array', function() {
       expect(function() {
         uniqLabels(string);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         uniqLabels(number);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         uniqLabels(boolean);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         uniqLabels(nullValue);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         uniqLabels(emptyObject);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         uniqLabels(notAValue);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should not throw an error if the input is an array', function() {
       expect(function() {
         uniqLabels(emptyArray);
-      }).to.not.throwError();
+      }).not.toThrow();
     });
 
     it('should be a function', function() {
-      expect(typeof uniqLabels).to.be('function');
+      expect(typeof uniqLabels).toBe('function');
     });
 
     it('should return an array', function() {
-      expect(testArr).to.be(true);
+      expect(testArr).toBe(true);
     });
 
     it('should return array of 5 unique values', function() {
-      expect(uniq.length).to.be(5);
+      expect(uniq.length).toBe(5);
     });
   });
 
@@ -408,63 +407,63 @@ describe('Vislib Labels Module Test Suite', function() {
     it('should throw an error if input is not an object', function() {
       expect(function() {
         getSeries(string);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getSeries(number);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getSeries(boolean);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getSeries(nullValue);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getSeries(emptyArray);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getSeries(notAValue);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should throw an if property rows or columns is not set on the object', function() {
       expect(function() {
         getSeries(emptyObject);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should not throw an error if rows or columns set on object', function() {
       expect(function() {
         getSeries(rowsObject);
-      }).to.not.throwError();
+      }).not.toThrow();
 
       expect(function() {
         getSeries(columnsObject);
-      }).to.not.throwError();
+      }).not.toThrow();
     });
 
     it('should be a function', function() {
-      expect(typeof getSeries).to.be('function');
+      expect(typeof getSeries).toBe('function');
     });
 
     it('should return an array if input is data.columns', function() {
-      expect(columnsArr).to.be(true);
+      expect(columnsArr).toBe(true);
     });
 
     it('should return an array if input is data.rows', function() {
-      expect(rowsArr).to.be(true);
+      expect(rowsArr).toBe(true);
     });
 
     it('should return an array of the same length as as input data.columns', function() {
-      expect(columnsLabels.length).to.be(columnsData.columns.length);
+      expect(columnsLabels.length).toBe(columnsData.columns.length);
     });
 
     it('should return an array of the same length as as input data.rows', function() {
-      expect(rowsLabels.length).to.be(rowsData.rows.length);
+      expect(rowsLabels.length).toBe(rowsData.rows.length);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/truncate_labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/truncate_labels.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/truncate_labels.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/truncate_labels.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js b/src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js
rename to src/plugins/vis_type_vislib/public/vislib/components/labels/uniq_labels.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap b/src/plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/_index.scss b/src/plugins/vis_type_vislib/public/vislib/components/legend/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss b/src/plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/_legend.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/index.ts b/src/plugins/vis_type_vislib/public/vislib/components/legend/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/index.ts
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx
index 6bf66c2bdd788b..c203642f353c53 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.test.tsx
@@ -31,10 +31,6 @@ jest.mock('@elastic/eui', () => ({
   htmlIdGenerator: jest.fn().mockReturnValue(() => 'legendId'),
 }));
 
-jest.mock('../../../legacy_imports', () => ({
-  getTableAggs: jest.fn(),
-}));
-
 jest.mock('../../../services', () => ({
   getDataActions: () => ({
     createFiltersFromValueClickAction: jest.fn().mockResolvedValue(['yes']),
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/legend.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx b/src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/legend_item.tsx
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/models.ts b/src/plugins/vis_type_vislib/public/vislib/components/legend/models.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/models.ts
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/models.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts b/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
rename to src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
index d9eea83d40b48c..0167a542c6372e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/pie_utils.ts
@@ -25,7 +25,7 @@ import _ from 'lodash';
  *
  * > Duplicated utilty method from vislib Data class to decouple `vislib_vis_legend` from `vislib`
  *
- * @see src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js
+ * @see src/plugins/vis_type_vislib/public/vislib/lib/data.js
  *
  * @returns {Array} Array of unique names (strings)
  */
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.test.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.test.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_collect_branch.test.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_hierarchical_tooltip_formatter.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_index.scss b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/_tooltip_formatter.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js
similarity index 83%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/_tooltip_formatter.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js
index a3aabcb90be624..953c115cc0d024 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/_tooltip_formatter.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js
@@ -19,9 +19,8 @@
 
 import _ from 'lodash';
 import $ from 'jquery';
-import expect from '@kbn/expect';
 
-import { pointSeriesTooltipFormatter } from '../../components/tooltip';
+import { pointSeriesTooltipFormatter } from './_pointseries_tooltip_formatter';
 
 describe('tooltipFormatter', function() {
   const tooltipFormatter = pointSeriesTooltipFormatter();
@@ -64,19 +63,19 @@ describe('tooltipFormatter', function() {
     const event = _.cloneDeep(baseEvent);
     const $el = $(tooltipFormatter(event));
     const $rows = $el.find('tr');
-    expect($rows.length).to.be(3);
+    expect($rows.length).toBe(3);
 
     const $row1 = $rows.eq(0).find('td');
-    expect(cell($row1, 0)).to.be('inner');
-    expect(cell($row1, 1)).to.be('3');
+    expect(cell($row1, 0)).toBe('inner');
+    expect(cell($row1, 1)).toBe('3');
 
     const $row2 = $rows.eq(1).find('td');
-    expect(cell($row2, 0)).to.be('middle');
-    expect(cell($row2, 1)).to.be('2');
+    expect(cell($row2, 0)).toBe('middle');
+    expect(cell($row2, 1)).toBe('2');
 
     const $row3 = $rows.eq(2).find('td');
-    expect(cell($row3, 0)).to.be('top');
-    expect(cell($row3, 1)).to.be('1');
+    expect(cell($row3, 0)).toBe('top');
+    expect(cell($row3, 1)).toBe('1');
   });
 
   it('renders correctly on missing extraMetrics in datum', function() {
@@ -84,6 +83,6 @@ describe('tooltipFormatter', function() {
     delete event.datum.extraMetrics;
     const $el = $(tooltipFormatter(event));
     const $rows = $el.find('tr');
-    expect($rows.length).to.be(3);
+    expect($rows.length).toBe(3);
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_tooltip.scss b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_tooltip.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/_tooltip.scss
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/_tooltip.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/index.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/index.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/index.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/positioning.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js
similarity index 82%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/positioning.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js
index f1c80c99810204..c184d0e9fbcf7f 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/components/positioning.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/position_tooltip.test.js
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
 import $ from 'jquery';
 import _ from 'lodash';
 import sinon from 'sinon';
 
-import { positionTooltip } from '../../components/tooltip/position_tooltip';
+import { positionTooltip } from './position_tooltip';
 
 describe('Tooltip Positioning', function() {
   const sandbox = sinon.createSandbox();
@@ -95,11 +94,11 @@ describe('Tooltip Positioning', function() {
       positionTooltip.getTtSize($tooltip.html(), $sizer);
 
       [w, h].forEach(function(spy) {
-        expect(spy).to.have.property('callCount', 1);
+        expect(spy).toHaveProperty('callCount', 1);
         const matchHtml = w.thisValues.filter(function($t) {
           return !$t.is($tooltip) && $t.html() === $tooltip.html();
         });
-        expect(matchHtml).to.have.length(1);
+        expect(matchHtml).toHaveLength(1);
       });
     });
   });
@@ -110,11 +109,11 @@ describe('Tooltip Positioning', function() {
       const pos = positionTooltip.getBasePosition(size, makeEvent());
 
       positions.forEach(function(p) {
-        expect(pos).to.have.property(p);
+        expect(pos).toHaveProperty(p);
       });
 
-      expect(pos.north).to.be.lessThan(pos.south);
-      expect(pos.east).to.be.greaterThan(pos.west);
+      expect(pos.north).toBeLessThan(pos.south);
+      expect(pos.east).toBeGreaterThan(pos.west);
     });
   });
 
@@ -123,11 +122,11 @@ describe('Tooltip Positioning', function() {
       const cbounds = positionTooltip.getBounds($chart);
 
       bounds.forEach(function(b) {
-        expect(cbounds).to.have.property(b);
+        expect(cbounds).toHaveProperty(b);
       });
 
-      expect(cbounds.top).to.be.lessThan(cbounds.bottom);
-      expect(cbounds.left).to.be.lessThan(cbounds.right);
+      expect(cbounds.top).toBeLessThan(cbounds.bottom);
+      expect(cbounds.left).toBeLessThan(cbounds.right);
     });
   });
 
@@ -137,18 +136,18 @@ describe('Tooltip Positioning', function() {
       $tooltip.css({ width: 15, height: 15 });
       $sizer.css({ width: 15, height: 15 });
       const size = positionTooltip.getTtSize($tooltip.html(), $sizer);
-      expect(size).to.have.property('width', 15);
-      expect(size).to.have.property('height', 15);
+      expect(size).toHaveProperty('width', 15);
+      expect(size).toHaveProperty('height', 15);
 
       // position the element based on a mouse that is in the middle of the chart
       const pos = positionTooltip.getBasePosition(size, makeEvent(0.5, 0.5));
 
       const overflow = positionTooltip.getOverflow(size, pos, [$chart, $window]);
       positions.forEach(function(p) {
-        expect(overflow).to.have.property(p);
+        expect(overflow).toHaveProperty(p);
 
         // all positions should be less than 0 because the tooltip is so much smaller than the chart
-        expect(overflow[p]).to.be.lessThan(0);
+        expect(overflow[p]).toBeLessThan(0);
       });
     });
 
@@ -160,12 +159,12 @@ describe('Tooltip Positioning', function() {
       const overflow = positionTooltip.getOverflow(size, pos, [$chart, $window]);
 
       positions.forEach(function(p) {
-        expect(overflow).to.have.property(p);
+        expect(overflow).toHaveProperty(p);
 
         if (p === 'south' || p === 'east') {
-          expect(overflow[p]).to.be.greaterThan(0);
+          expect(overflow[p]).toBeGreaterThan(0);
         } else {
-          expect(overflow[p]).to.be.lessThan(0);
+          expect(overflow[p]).toBeLessThan(0);
         }
       });
     });
@@ -176,10 +175,10 @@ describe('Tooltip Positioning', function() {
       $tooltip.css({ width: largeWidth });
       $sizer.css({ width: largeWidth });
       const size = positionTooltip.getTtSize($tooltip.html(), $sizer);
-      expect(size).to.have.property('width', largeWidth);
+      expect(size).toHaveProperty('width', largeWidth);
 
       // $chart is flush with the $window on the left side
-      expect(positionTooltip.getBounds($chart).left).to.be(0);
+      expect(positionTooltip.getBounds($chart).left).toBe(0);
 
       // Size $window large enough for tooltip on right side
       $window.css({ width: $chart.width() * 3 });
@@ -190,17 +189,17 @@ describe('Tooltip Positioning', function() {
       const overflow = positionTooltip.getOverflow(size, pos, [$chart, $window]);
 
       // no overflow on left (east)
-      expect(overflow.east).to.be.lessThan(0);
+      expect(overflow.east).toBeLessThan(0);
       // overflow on right (west)
-      expect(overflow.west).to.be.greaterThan(0);
+      expect(overflow.west).toBeGreaterThan(0);
     });
   });
 
   describe('positionTooltip() integration', function() {
     it('returns nothing if the $chart or $tooltip are not passed in', function() {
-      expect(positionTooltip() === void 0).to.be(true);
-      expect(positionTooltip(null, null, null) === void 0).to.be(true);
-      expect(positionTooltip(null, $(), $()) === void 0).to.be(true);
+      expect(positionTooltip() === void 0).toBe(true);
+      expect(positionTooltip(null, null, null) === void 0).toBe(true);
+      expect(positionTooltip(null, $(), $()) === void 0).toBe(true);
     });
 
     function check(xPercent, yPercent /*, prev, directions... */) {
@@ -215,23 +214,22 @@ describe('Tooltip Positioning', function() {
         prev: _.isObject(directions[0]) ? directions.shift() : null,
       });
 
-      expect(placement)
-        .to.have.property('top')
-        .and.property('left');
+      expect(placement).toHaveProperty('top');
+      expect(placement).toHaveProperty('left');
 
       directions.forEach(function(dir) {
         switch (dir) {
           case 'top':
-            expect(placement.top).to.be.lessThan(event.clientY);
+            expect(placement.top).toBeLessThan(event.clientY);
             return;
           case 'bottom':
-            expect(placement.top).to.be.greaterThan(event.clientY);
+            expect(placement.top).toBeGreaterThan(event.clientY);
             return;
           case 'right':
-            expect(placement.left).to.be.greaterThan(event.clientX);
+            expect(placement.left).toBeGreaterThan(event.clientX);
             return;
           case 'left':
-            expect(placement.left).to.be.lessThan(event.clientX);
+            expect(placement.left).toBeLessThan(event.clientX);
             return;
         }
       });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js
rename to src/plugins/vis_type_vislib/public/vislib/components/tooltip/tooltip.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/flatten_data.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/inject_zeros.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/inject_zeros.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/inject_zeros.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/inject_zeros.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/ordered_x_keys.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/uniq_keys.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_fill_data_array.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_filled_array.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_filled_array.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_filled_array.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_filled_array.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js
similarity index 65%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js
rename to src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js
index 129006cdf0ca37..df502b7cde3dfb 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/zero_injection/zero_injection.test.js
@@ -18,7 +18,6 @@
  */
 
 import _ from 'lodash';
-import expect from '@kbn/expect';
 import { injectZeros } from './inject_zeros';
 import { orderXValues } from './ordered_x_keys';
 import { getUniqKeys } from './uniq_keys';
@@ -159,45 +158,45 @@ describe('Vislib Zero Injection Module Test Suite', function() {
     });
 
     it('should be a function', function() {
-      expect(_.isFunction(injectZeros)).to.be(true);
+      expect(_.isFunction(injectZeros)).toBe(true);
     });
 
     it('should return an object with series[0].values', function() {
-      expect(_.isObject(sample1)).to.be(true);
-      expect(_.isObject(sample1[0].values)).to.be(true);
+      expect(_.isObject(sample1)).toBe(true);
+      expect(_.isObject(sample1[0].values)).toBe(true);
     });
 
     it('should return the same array of objects when the length of the series array is 1', function() {
-      expect(sample1[0].values[0].x).to.be(seriesData[0].values[0].x);
-      expect(sample1[0].values[1].x).to.be(seriesData[0].values[1].x);
-      expect(sample1[0].values[2].x).to.be(seriesData[0].values[2].x);
-      expect(sample1[0].values[3].x).to.be(seriesData[0].values[3].x);
-      expect(sample1[0].values[4].x).to.be(seriesData[0].values[4].x);
+      expect(sample1[0].values[0].x).toBe(seriesData[0].values[0].x);
+      expect(sample1[0].values[1].x).toBe(seriesData[0].values[1].x);
+      expect(sample1[0].values[2].x).toBe(seriesData[0].values[2].x);
+      expect(sample1[0].values[3].x).toBe(seriesData[0].values[3].x);
+      expect(sample1[0].values[4].x).toBe(seriesData[0].values[4].x);
     });
 
     it('should inject zeros in the input array', function() {
-      expect(sample2[1].values[1].y).to.be(0);
-      expect(sample2[2].values[0].y).to.be(0);
-      expect(sample2[2].values[1].y).to.be(0);
-      expect(sample2[2].values[4].y).to.be(0);
-      expect(sample3[1].values[1].y).to.be(0);
-      expect(sample3[2].values[0].y).to.be(0);
-      expect(sample3[2].values[1].y).to.be(0);
-      expect(sample3[2].values[4].y).to.be(0);
+      expect(sample2[1].values[1].y).toBe(0);
+      expect(sample2[2].values[0].y).toBe(0);
+      expect(sample2[2].values[1].y).toBe(0);
+      expect(sample2[2].values[4].y).toBe(0);
+      expect(sample3[1].values[1].y).toBe(0);
+      expect(sample3[2].values[0].y).toBe(0);
+      expect(sample3[2].values[1].y).toBe(0);
+      expect(sample3[2].values[4].y).toBe(0);
     });
 
     it('should return values arrays with the same x values', function() {
-      expect(sample2[1].values[0].x).to.be(sample2[2].values[0].x);
-      expect(sample2[1].values[1].x).to.be(sample2[2].values[1].x);
-      expect(sample2[1].values[2].x).to.be(sample2[2].values[2].x);
-      expect(sample2[1].values[3].x).to.be(sample2[2].values[3].x);
-      expect(sample2[1].values[4].x).to.be(sample2[2].values[4].x);
+      expect(sample2[1].values[0].x).toBe(sample2[2].values[0].x);
+      expect(sample2[1].values[1].x).toBe(sample2[2].values[1].x);
+      expect(sample2[1].values[2].x).toBe(sample2[2].values[2].x);
+      expect(sample2[1].values[3].x).toBe(sample2[2].values[3].x);
+      expect(sample2[1].values[4].x).toBe(sample2[2].values[4].x);
     });
 
     it('should return values arrays of the same length', function() {
-      expect(sample2[0].values.length).to.be(sample2[1].values.length);
-      expect(sample2[0].values.length).to.be(sample2[2].values.length);
-      expect(sample2[1].values.length).to.be(sample2[2].values.length);
+      expect(sample2[0].values.length).toBe(sample2[1].values.length);
+      expect(sample2[0].values.length).toBe(sample2[2].values.length);
+      expect(sample2[1].values.length).toBe(sample2[2].values.length);
     });
   });
 
@@ -211,24 +210,24 @@ describe('Vislib Zero Injection Module Test Suite', function() {
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(orderXValues)).to.be(true);
+      expect(_.isFunction(orderXValues)).toBe(true);
     });
 
     it('should return an array', function() {
-      expect(Array.isArray(results)).to.be(true);
+      expect(Array.isArray(results)).toBe(true);
     });
 
     it('should return an array of values ordered by their index by default', function() {
-      expect(results[0]).to.be('1');
-      expect(results[1]).to.be('2');
-      expect(results[2]).to.be('3');
-      expect(results[3]).to.be('4');
-      expect(results[4]).to.be('5');
-      expect(numberedResults[0]).to.be(1);
-      expect(numberedResults[1]).to.be(2);
-      expect(numberedResults[2]).to.be(3);
-      expect(numberedResults[3]).to.be(4);
-      expect(numberedResults[4]).to.be(5);
+      expect(results[0]).toBe('1');
+      expect(results[1]).toBe('2');
+      expect(results[2]).toBe('3');
+      expect(results[3]).toBe('4');
+      expect(results[4]).toBe('5');
+      expect(numberedResults[0]).toBe(1);
+      expect(numberedResults[1]).toBe(2);
+      expect(numberedResults[2]).toBe(3);
+      expect(numberedResults[3]).toBe(4);
+      expect(numberedResults[4]).toBe(5);
     });
 
     it('should return an array of values that preserve the index from xAxisOrderedValues', function() {
@@ -257,7 +256,7 @@ describe('Vislib Zero Injection Module Test Suite', function() {
         ],
       };
       const result = orderXValues(data);
-      expect(result).to.eql(['1', '2', '3', '4', '5']);
+      expect(result).toEqual(['1', '2', '3', '4', '5']);
     });
 
     it('should return an array of values ordered by their sum when orderBucketsBySum is true', function() {
@@ -265,16 +264,16 @@ describe('Vislib Zero Injection Module Test Suite', function() {
       results = orderXValues(multiSeriesDataObj, orderBucketsBySum);
       numberedResults = orderXValues(multiSeriesNumberedDataObj, orderBucketsBySum);
 
-      expect(results[0]).to.be('3');
-      expect(results[1]).to.be('1');
-      expect(results[2]).to.be('4');
-      expect(results[3]).to.be('5');
-      expect(results[4]).to.be('2');
-      expect(numberedResults[0]).to.be(3);
-      expect(numberedResults[1]).to.be(1);
-      expect(numberedResults[2]).to.be(4);
-      expect(numberedResults[3]).to.be(5);
-      expect(numberedResults[4]).to.be(2);
+      expect(results[0]).toBe('3');
+      expect(results[1]).toBe('1');
+      expect(results[2]).toBe('4');
+      expect(results[3]).toBe('5');
+      expect(results[4]).toBe('2');
+      expect(numberedResults[0]).toBe(3);
+      expect(numberedResults[1]).toBe(1);
+      expect(numberedResults[2]).toBe(4);
+      expect(numberedResults[3]).toBe(5);
+      expect(numberedResults[4]).toBe(2);
     });
   });
 
@@ -288,39 +287,39 @@ describe('Vislib Zero Injection Module Test Suite', function() {
     it('should throw an error if input is not an object', function() {
       expect(function() {
         getUniqKeys(str);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getUniqKeys(number);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getUniqKeys(boolean);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getUniqKeys(nullValue);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getUniqKeys(emptyArray);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         getUniqKeys(notAValue);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(getUniqKeys)).to.be(true);
+      expect(_.isFunction(getUniqKeys)).toBe(true);
     });
 
     it('should return an object', function() {
-      expect(_.isObject(results)).to.be(true);
+      expect(_.isObject(results)).toBe(true);
     });
 
     it('should return an object of unique keys', function() {
-      expect(_.uniq(_.keys(results)).length).to.be(_.keys(results).length);
+      expect(_.uniq(_.keys(results)).length).toBe(_.keys(results).length);
     });
   });
 
@@ -332,17 +331,17 @@ describe('Vislib Zero Injection Module Test Suite', function() {
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(flattenData)).to.be(true);
+      expect(_.isFunction(flattenData)).toBe(true);
     });
 
     it('should return an array', function() {
-      expect(Array.isArray(results)).to.be(true);
+      expect(Array.isArray(results)).toBe(true);
     });
 
     it('should return an array of objects', function() {
-      expect(_.isObject(results[0])).to.be(true);
-      expect(_.isObject(results[1])).to.be(true);
-      expect(_.isObject(results[2])).to.be(true);
+      expect(_.isObject(results[0])).toBe(true);
+      expect(_.isObject(results[1])).toBe(true);
+      expect(_.isObject(results[2])).toBe(true);
     });
   });
 
@@ -360,67 +359,67 @@ describe('Vislib Zero Injection Module Test Suite', function() {
     it('should throw an error if input is not an array', function() {
       expect(function() {
         createZeroFilledArray(str);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         createZeroFilledArray(number);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         createZeroFilledArray(boolean);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         createZeroFilledArray(nullValue);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         createZeroFilledArray(emptyObject);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         createZeroFilledArray(notAValue);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(createZeroFilledArray)).to.be(true);
+      expect(_.isFunction(createZeroFilledArray)).toBe(true);
     });
 
     it('should return an array', function() {
-      expect(Array.isArray(results1)).to.be(true);
+      expect(Array.isArray(results1)).toBe(true);
     });
 
     it('should return an array of objects', function() {
-      expect(_.isObject(results1[0])).to.be(true);
-      expect(_.isObject(results1[1])).to.be(true);
-      expect(_.isObject(results1[2])).to.be(true);
-      expect(_.isObject(results1[3])).to.be(true);
-      expect(_.isObject(results1[4])).to.be(true);
+      expect(_.isObject(results1[0])).toBe(true);
+      expect(_.isObject(results1[1])).toBe(true);
+      expect(_.isObject(results1[2])).toBe(true);
+      expect(_.isObject(results1[3])).toBe(true);
+      expect(_.isObject(results1[4])).toBe(true);
     });
 
     it('should return an array of objects where each y value is 0', function() {
-      expect(results1[0].y).to.be(0);
-      expect(results1[1].y).to.be(0);
-      expect(results1[2].y).to.be(0);
-      expect(results1[3].y).to.be(0);
-      expect(results1[4].y).to.be(0);
+      expect(results1[0].y).toBe(0);
+      expect(results1[1].y).toBe(0);
+      expect(results1[2].y).toBe(0);
+      expect(results1[3].y).toBe(0);
+      expect(results1[4].y).toBe(0);
     });
 
     it('should return an array of objects where each x values are numbers', function() {
-      expect(_.isNumber(results1[0].x)).to.be(true);
-      expect(_.isNumber(results1[1].x)).to.be(true);
-      expect(_.isNumber(results1[2].x)).to.be(true);
-      expect(_.isNumber(results1[3].x)).to.be(true);
-      expect(_.isNumber(results1[4].x)).to.be(true);
+      expect(_.isNumber(results1[0].x)).toBe(true);
+      expect(_.isNumber(results1[1].x)).toBe(true);
+      expect(_.isNumber(results1[2].x)).toBe(true);
+      expect(_.isNumber(results1[3].x)).toBe(true);
+      expect(_.isNumber(results1[4].x)).toBe(true);
     });
 
     it('should return an array of objects where each x values are strings', function() {
-      expect(_.isString(results2[0].x)).to.be(true);
-      expect(_.isString(results2[1].x)).to.be(true);
-      expect(_.isString(results2[2].x)).to.be(true);
-      expect(_.isString(results2[3].x)).to.be(true);
-      expect(_.isString(results2[4].x)).to.be(true);
+      expect(_.isString(results2[0].x)).toBe(true);
+      expect(_.isString(results2[1].x)).toBe(true);
+      expect(_.isString(results2[2].x)).toBe(true);
+      expect(_.isString(results2[3].x)).toBe(true);
+      expect(_.isString(results2[4].x)).toBe(true);
     });
   });
 
@@ -439,48 +438,48 @@ describe('Vislib Zero Injection Module Test Suite', function() {
     it('should throw an error if input are not arrays', function() {
       expect(function() {
         zeroFillDataArray(str, str);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         zeroFillDataArray(number, number);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         zeroFillDataArray(boolean, boolean);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         zeroFillDataArray(nullValue, nullValue);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         zeroFillDataArray(emptyObject, emptyObject);
-      }).to.throwError();
+      }).toThrow();
 
       expect(function() {
         zeroFillDataArray(notAValue, notAValue);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(zeroFillDataArray)).to.be(true);
+      expect(_.isFunction(zeroFillDataArray)).toBe(true);
     });
 
     it('should return an array', function() {
-      expect(Array.isArray(results)).to.be(true);
+      expect(Array.isArray(results)).toBe(true);
     });
 
     it('should return an array of objects', function() {
-      expect(_.isObject(results[0])).to.be(true);
-      expect(_.isObject(results[1])).to.be(true);
-      expect(_.isObject(results[2])).to.be(true);
+      expect(_.isObject(results[0])).toBe(true);
+      expect(_.isObject(results[1])).toBe(true);
+      expect(_.isObject(results[2])).toBe(true);
     });
 
     it('should return an array with zeros injected in the appropriate objects as y values', function() {
-      expect(results[0].y).to.be(0);
-      expect(results[1].y).to.be(0);
-      expect(results[3].y).to.be(0);
-      expect(results[4].y).to.be(0);
+      expect(results[0].y).toBe(0);
+      expect(results[1].y).toBe(0);
+      expect(results[3].y).toBe(0);
+      expect(results[4].y).toBe(0);
     });
   });
 
@@ -493,18 +492,18 @@ describe('Vislib Zero Injection Module Test Suite', function() {
 
     it('should return an array of objects', function() {
       results.forEach(function(row) {
-        expect(Array.isArray(row.values)).to.be(true);
+        expect(Array.isArray(row.values)).toBe(true);
       });
     });
 
     it('should return ordered x values', function() {
       const values = results[0].values;
-      expect(values[0].x).to.be.lessThan(values[1].x);
-      expect(values[1].x).to.be.lessThan(values[2].x);
-      expect(values[2].x).to.be.lessThan(values[3].x);
-      expect(values[3].x).to.be.lessThan(values[4].x);
-      expect(values[4].x).to.be.lessThan(values[5].x);
-      expect(values[5].x).to.be.lessThan(values[6].x);
+      expect(values[0].x).toBeLessThan(values[1].x);
+      expect(values[1].x).toBeLessThan(values[2].x);
+      expect(values[2].x).toBeLessThan(values[3].x);
+      expect(values[3].x).toBeLessThan(values[4].x);
+      expect(values[4].x).toBeLessThan(values[5].x);
+      expect(values[5].x).toBeLessThan(values[6].x);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/errors.ts b/src/plugins/vis_type_vislib/public/vislib/errors.ts
similarity index 95%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/errors.ts
rename to src/plugins/vis_type_vislib/public/vislib/errors.ts
index 9014349c38d253..c2965e81657596 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/errors.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/errors.ts
@@ -19,7 +19,7 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { KbnError } from '../../../../../plugins/kibana_utils/public';
+import { KbnError } from '../../../kibana_utils/public';
 
 export class VislibError extends KbnError {
   constructor(message: string) {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
index 2c6d62ed084b57..c3b82f72af482e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
@@ -18,7 +18,7 @@
  */
 
 import { toArray } from 'lodash';
-import { SerializedFieldFormat } from '../../../../../../../plugins/expressions/common/types';
+import { SerializedFieldFormat } from '../../../../../expressions/common/types';
 import { getFormatService } from '../../../services';
 import { Table } from '../../types';
 
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/index.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/index.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_add_to_siri.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_fake_x_aspect.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_aspects.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts
similarity index 97%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts
index 0c79c5b263ceac..dc10c9f4938a0e 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.test.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { IFieldFormatsRegistry } from '../../../../../../../plugins/data/common';
+import { IFieldFormatsRegistry } from '../../../../../data/common';
 import { getPoint } from './_get_point';
 import { setFormatService } from '../../../services';
 import { Aspect } from './point_series';
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_point.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_get_series.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_x_axis.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_init_y_axis.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/_ordered_date_axis.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/index.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/index.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/index.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/index.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts
rename to src/plugins/vis_type_vislib/public/vislib/helpers/point_series/point_series.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/__snapshots__/dispatch_heatmap.test.js.snap b/src/plugins/vis_type_vislib/public/vislib/lib/__snapshots__/dispatch_heatmap.test.js.snap
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/__snapshots__/dispatch_heatmap.test.js.snap
rename to src/plugins/vis_type_vislib/public/vislib/lib/__snapshots__/dispatch_heatmap.test.js.snap
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_alerts.scss b/src/plugins/vis_type_vislib/public/vislib/lib/_alerts.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_alerts.scss
rename to src/plugins/vis_type_vislib/public/vislib/lib/_alerts.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_data_label.js b/src/plugins/vis_type_vislib/public/vislib/lib/_data_label.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_data_label.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/_data_label.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_error_handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_error_handler.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/error_handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.test.js
similarity index 88%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/error_handler.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.test.js
index 4523e70ccbb4cb..b7764b92b78059 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/error_handler.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/_error_handler.test.js
@@ -17,9 +17,7 @@
  * under the License.
  */
 
-import expect from '@kbn/expect';
-
-import { ErrorHandler } from '../../lib/_error_handler';
+import { ErrorHandler } from './_error_handler';
 
 describe('Vislib ErrorHandler Test Suite', function() {
   let errorHandler;
@@ -32,19 +30,19 @@ describe('Vislib ErrorHandler Test Suite', function() {
     it('should throw an error when width and/or height is 0', function() {
       expect(function() {
         errorHandler.validateWidthandHeight(0, 200);
-      }).to.throwError();
+      }).toThrow();
       expect(function() {
         errorHandler.validateWidthandHeight(200, 0);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should throw an error when width and/or height is NaN', function() {
       expect(function() {
         errorHandler.validateWidthandHeight(null, 200);
-      }).to.throwError();
+      }).toThrow();
       expect(function() {
         errorHandler.validateWidthandHeight(200, null);
-      }).to.throwError();
+      }).toThrow();
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_handler.scss b/src/plugins/vis_type_vislib/public/vislib/lib/_handler.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_handler.scss
rename to src/plugins/vis_type_vislib/public/vislib/lib/_handler.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_index.scss b/src/plugins/vis_type_vislib/public/vislib/lib/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/lib/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/alerts.js b/src/plugins/vis_type_vislib/public/vislib/lib/alerts.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/alerts.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/alerts.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis/axis.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis/axis.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js
index bc4a4f9925513c..dec7de5ceeda95 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis/axis.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis.test.js
@@ -19,12 +19,11 @@
 
 import d3 from 'd3';
 import _ from 'lodash';
-import expect from '@kbn/expect';
 import $ from 'jquery';
 
-import { Axis } from '../../../lib/axis';
-import { VisConfig } from '../../../lib/vis_config';
-import { getMockUiState } from '../fixtures/_vis_fixture';
+import { Axis } from './axis';
+import { VisConfig } from '../vis_config';
+import { getMockUiState } from '../../../fixtures/mocks';
 
 describe('Vislib Axis Class Test Suite', function() {
   let mockUiState;
@@ -164,7 +163,7 @@ describe('Vislib Axis Class Test Suite', function() {
         },
       ];
       const stackedData = yAxis._stackNegAndPosVals(seriesData);
-      expect(stackedData[1]).to.eql(expectedResult);
+      expect(stackedData[1]).toEqual(expectedResult);
     });
 
     it('should correctly stack pos and neg values', function() {
@@ -200,7 +199,7 @@ describe('Vislib Axis Class Test Suite', function() {
         value.y = -value.y;
       });
       const stackedData = yAxis._stackNegAndPosVals(dataClone);
-      expect(stackedData[1]).to.eql(expectedResult);
+      expect(stackedData[1]).toEqual(expectedResult);
     });
 
     it('should correctly stack mixed pos and neg values', function() {
@@ -236,7 +235,7 @@ describe('Vislib Axis Class Test Suite', function() {
         if (i % 2 === 1) value.y = -value.y;
       });
       const stackedData = yAxis._stackNegAndPosVals(dataClone);
-      expect(stackedData[1]).to.eql(expectedResult);
+      expect(stackedData[1]).toEqual(expectedResult);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_config.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_labels.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_labels.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_labels.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_labels.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_scale.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis_title.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js
similarity index 91%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis_title.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js
index fd25335dd2cd4c..7901919d306d27 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/axis_title.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_title.test.js
@@ -20,13 +20,12 @@
 import d3 from 'd3';
 import _ from 'lodash';
 import $ from 'jquery';
-import expect from '@kbn/expect';
 
-import { AxisTitle } from '../../lib/axis/axis_title';
-import { AxisConfig } from '../../lib/axis/axis_config';
-import { VisConfig } from '../../lib/vis_config';
-import { Data } from '../../lib/data';
-import { getMockUiState } from './fixtures/_vis_fixture';
+import { AxisTitle } from './axis_title';
+import { AxisConfig } from './axis_config';
+import { VisConfig } from '../vis_config';
+import { Data } from '../data';
+import { getMockUiState } from '../../../fixtures/mocks';
 
 describe('Vislib AxisTitle Class Test Suite', function() {
   let el;
@@ -159,7 +158,7 @@ describe('Vislib AxisTitle Class Test Suite', function() {
       $(el.node())
         .find('.x-axis-title')
         .find('svg').length
-    ).to.be(0);
+    ).toBe(0);
   });
 
   describe('render Method', function() {
@@ -169,8 +168,8 @@ describe('Vislib AxisTitle Class Test Suite', function() {
     });
 
     it('should append an svg to div', function() {
-      expect(el.select('.x-axis-title').selectAll('svg').length).to.be(1);
-      expect(el.select('.y-axis-title').selectAll('svg').length).to.be(1);
+      expect(el.select('.x-axis-title').selectAll('svg').length).toBe(1);
+      expect(el.select('.y-axis-title').selectAll('svg').length).toBe(1);
     });
 
     it('should append a g element to the svg', function() {
@@ -179,13 +178,13 @@ describe('Vislib AxisTitle Class Test Suite', function() {
           .select('.x-axis-title')
           .selectAll('svg')
           .select('g').length
-      ).to.be(1);
+      ).toBe(1);
       expect(
         el
           .select('.y-axis-title')
           .selectAll('svg')
           .select('g').length
-      ).to.be(1);
+      ).toBe(1);
     });
 
     it('should append text', function() {
@@ -194,19 +193,19 @@ describe('Vislib AxisTitle Class Test Suite', function() {
           .select('.x-axis-title')
           .selectAll('svg')
           .selectAll('text')
-      ).to.be(true);
+      ).toBe(true);
       expect(
         !!el
           .select('.y-axis-title')
           .selectAll('svg')
           .selectAll('text')
-      ).to.be(true);
+      ).toBe(true);
     });
   });
 
   describe('draw Method', function() {
     it('should be a function', function() {
-      expect(_.isFunction(xTitle.draw())).to.be(true);
+      expect(_.isFunction(xTitle.draw())).toBe(true);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/index.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/index.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/index.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/scale_modes.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/scale_modes.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/scale_modes.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/scale_modes.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.test.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.test.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/time_ticks.test.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/x_axis.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js
similarity index 79%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/x_axis.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js
index d42562a87b825a..d007a8a14de131 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/x_axis.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/x_axis.test.js
@@ -19,12 +19,11 @@
 
 import d3 from 'd3';
 import _ from 'lodash';
-import expect from '@kbn/expect';
 import $ from 'jquery';
 
-import { Axis } from '../../lib/axis';
-import { VisConfig } from '../../lib/vis_config';
-import { getMockUiState } from './fixtures/_vis_fixture';
+import { Axis } from './axis';
+import { VisConfig } from '../vis_config';
+import { getMockUiState } from '../../../fixtures/mocks';
 
 describe('Vislib xAxis Class Test Suite', function() {
   let mockUiState;
@@ -141,15 +140,15 @@ describe('Vislib xAxis Class Test Suite', function() {
     });
 
     it('should append an svg to div', function() {
-      expect(el.selectAll('svg').length).to.be(1);
+      expect(el.selectAll('svg').length).toBe(1);
     });
 
     it('should append a g element to the svg', function() {
-      expect(el.selectAll('svg').select('g').length).to.be(1);
+      expect(el.selectAll('svg').select('g').length).toBe(1);
     });
 
     it('should append ticks with text', function() {
-      expect(!!el.selectAll('svg').selectAll('.tick text')).to.be(true);
+      expect(!!el.selectAll('svg').selectAll('.tick text')).toBe(true);
     });
   });
 
@@ -166,22 +165,22 @@ describe('Vislib xAxis Class Test Suite', function() {
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(timeScale)).to.be(true);
+      expect(_.isFunction(timeScale)).toBe(true);
     });
 
     it('should return the correct domain', function() {
-      expect(_.isDate(timeScale.domain()[0])).to.be(true);
-      expect(_.isDate(timeScale.domain()[1])).to.be(true);
+      expect(_.isDate(timeScale.domain()[0])).toBe(true);
+      expect(_.isDate(timeScale.domain()[1])).toBe(true);
     });
 
     it('should return the min and max dates', function() {
-      expect(timeScale.domain()[0].toDateString()).to.be(new Date(1408734060000).toDateString());
-      expect(timeScale.domain()[1].toDateString()).to.be(new Date(1408734330000).toDateString());
+      expect(timeScale.domain()[0].toDateString()).toBe(new Date(1408734060000).toDateString());
+      expect(timeScale.domain()[1].toDateString()).toBe(new Date(1408734330000).toDateString());
     });
 
     it('should return the correct range', function() {
-      expect(range[0]).to.be(0);
-      expect(range[1]).to.be(width);
+      expect(range[0]).toBe(0);
+      expect(range[1]).toBe(width);
     });
   });
 
@@ -200,12 +199,12 @@ describe('Vislib xAxis Class Test Suite', function() {
     });
 
     it('should return an ordinal scale', function() {
-      expect(ordinalDomain.domain()[0]).to.be('this');
-      expect(ordinalDomain.domain()[4]).to.be('array');
+      expect(ordinalDomain.domain()[0]).toBe('this');
+      expect(ordinalDomain.domain()[4]).toBe('array');
     });
 
     it('should return an array of values', function() {
-      expect(Array.isArray(ordinalDomain.domain())).to.be(true);
+      expect(Array.isArray(ordinalDomain.domain())).toBe(true);
     });
   });
 
@@ -220,17 +219,17 @@ describe('Vislib xAxis Class Test Suite', function() {
     });
 
     it('should return a function', function() {
-      expect(_.isFunction(xScale)).to.be(true);
+      expect(_.isFunction(xScale)).toBe(true);
     });
 
     it('should return a domain', function() {
-      expect(_.isDate(xScale.domain()[0])).to.be(true);
-      expect(_.isDate(xScale.domain()[1])).to.be(true);
+      expect(_.isDate(xScale.domain()[0])).toBe(true);
+      expect(_.isDate(xScale.domain()[1])).toBe(true);
     });
 
     it('should return a range', function() {
-      expect(xScale.range()[0]).to.be(0);
-      expect(xScale.range()[1]).to.be(width);
+      expect(xScale.range()[0]).toBe(0);
+      expect(xScale.range()[1]).toBe(width);
     });
   });
 
@@ -243,13 +242,13 @@ describe('Vislib xAxis Class Test Suite', function() {
     });
 
     it('should create an getScale function on the xAxis class', function() {
-      expect(_.isFunction(xAxis.getScale())).to.be(true);
+      expect(_.isFunction(xAxis.getScale())).toBe(true);
     });
   });
 
   describe('draw Method', function() {
     it('should be a function', function() {
-      expect(_.isFunction(xAxis.draw())).to.be(true);
+      expect(_.isFunction(xAxis.draw())).toBe(true);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/y_axis.js b/src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js
similarity index 83%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/y_axis.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js
index f73011d6616451..85378ff1a14e87 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/y_axis.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/axis/y_axis.test.js
@@ -20,11 +20,10 @@
 import _ from 'lodash';
 import d3 from 'd3';
 import $ from 'jquery';
-import expect from '@kbn/expect';
 
-import { Axis } from '../../lib/axis';
-import { VisConfig } from '../../lib/vis_config';
-import { getMockUiState } from './fixtures/_vis_fixture';
+import { Axis } from './axis';
+import { VisConfig } from '../vis_config';
+import { getMockUiState } from '../../../fixtures/mocks';
 
 const YAxis = Axis;
 let mockUiState;
@@ -123,7 +122,7 @@ function createData(seriesData) {
 describe('Vislib yAxis Class Test Suite', function() {
   beforeEach(() => {
     mockUiState = getMockUiState();
-    expect($('.y-axis-wrapper')).to.have.length(0);
+    expect($('.y-axis-wrapper')).toHaveLength(0);
   });
 
   afterEach(function() {
@@ -140,15 +139,15 @@ describe('Vislib yAxis Class Test Suite', function() {
     });
 
     it('should append an svg to div', function() {
-      expect(el.selectAll('svg').length).to.be(1);
+      expect(el.selectAll('svg').length).toBe(1);
     });
 
     it('should append a g element to the svg', function() {
-      expect(el.selectAll('svg').select('g').length).to.be(1);
+      expect(el.selectAll('svg').select('g').length).toBe(1);
     });
 
     it('should append ticks with text', function() {
-      expect(!!el.selectAll('svg').selectAll('.tick text')).to.be(true);
+      expect(!!el.selectAll('svg').selectAll('.tick text')).toBe(true);
     });
   });
 
@@ -160,14 +159,14 @@ describe('Vislib yAxis Class Test Suite', function() {
 
     function checkDomain(min, max) {
       const domain = yScale.domain();
-      expect(domain[0]).to.be.lessThan(min + 1);
-      expect(domain[1]).to.be.greaterThan(max - 1);
+      expect(domain[0]).toBeLessThan(min + 1);
+      expect(domain[1]).toBeGreaterThan(max - 1);
       return domain;
     }
 
     function checkRange() {
-      expect(yScale.range()[0]).to.be(height);
-      expect(yScale.range()[1]).to.be(0);
+      expect(yScale.range()[0]).toBe(height);
+      expect(yScale.range()[1]).toBe(0);
     }
 
     describe('API', function() {
@@ -178,7 +177,7 @@ describe('Vislib yAxis Class Test Suite', function() {
       });
 
       it('should return a function', function() {
-        expect(_.isFunction(yScale)).to.be(true);
+        expect(_.isFunction(yScale)).toBe(true);
       });
     });
 
@@ -194,7 +193,7 @@ describe('Vislib yAxis Class Test Suite', function() {
         const min = 0;
         const max = _.max(_.flattenDeep(graphData));
         const domain = checkDomain(min, max);
-        expect(domain[1]).to.be.greaterThan(0);
+        expect(domain[1]).toBeGreaterThan(0);
         checkRange();
       });
     });
@@ -214,7 +213,7 @@ describe('Vislib yAxis Class Test Suite', function() {
         const min = _.min(_.flattenDeep(graphData));
         const max = 0;
         const domain = checkDomain(min, max);
-        expect(domain[0]).to.be.lessThan(0);
+        expect(domain[0]).toBeLessThan(0);
         checkRange();
       });
     });
@@ -234,8 +233,8 @@ describe('Vislib yAxis Class Test Suite', function() {
         const min = _.min(_.flattenDeep(graphData));
         const max = _.max(_.flattenDeep(graphData));
         const domain = checkDomain(min, max);
-        expect(domain[0]).to.be.lessThan(0);
-        expect(domain[1]).to.be.greaterThan(0);
+        expect(domain[0]).toBeLessThan(0);
+        expect(domain[1]).toBeGreaterThan(0);
         checkRange();
       });
     });
@@ -255,7 +254,7 @@ describe('Vislib yAxis Class Test Suite', function() {
 
         expect(function() {
           yAxis.axisScale.validateUserExtents(min, max);
-        }).to.throwError();
+        }).toThrow();
       });
 
       it('should return a decimal value', function() {
@@ -267,16 +266,16 @@ describe('Vislib yAxis Class Test Suite', function() {
         domain[1] = 80;
         const newDomain = yAxis.axisScale.validateUserExtents(domain);
 
-        expect(newDomain[0]).to.be(domain[0] / 100);
-        expect(newDomain[1]).to.be(domain[1] / 100);
+        expect(newDomain[0]).toBe(domain[0] / 100);
+        expect(newDomain[1]).toBe(domain[1] / 100);
       });
 
       it('should return the user defined value', function() {
         domain = [20, 50];
         const newDomain = yAxis.axisScale.validateUserExtents(domain);
 
-        expect(newDomain[0]).to.be(domain[0]);
-        expect(newDomain[1]).to.be(domain[1]);
+        expect(newDomain[0]).toBe(domain[0]);
+        expect(newDomain[1]).toBe(domain[1]);
       });
     });
 
@@ -287,7 +286,7 @@ describe('Vislib yAxis Class Test Suite', function() {
 
         expect(function() {
           yAxis.axisScale.validateAxisExtents(min, max);
-        }).to.throwError();
+        }).toThrow();
       });
 
       it('min > max', function() {
@@ -296,7 +295,7 @@ describe('Vislib yAxis Class Test Suite', function() {
 
         expect(function() {
           yAxis.axisScale.validateAxisExtents(min, max);
-        }).to.throwError();
+        }).toThrow();
       });
     });
   });
@@ -306,17 +305,17 @@ describe('Vislib yAxis Class Test Suite', function() {
 
     it('should return a function', function() {
       fnNames.forEach(function(fnName) {
-        expect(yAxis.axisScale.getD3Scale(fnName)).to.be.a(Function);
+        expect(yAxis.axisScale.getD3Scale(fnName)).toEqual(expect.any(Function));
       });
 
       // if no value is provided to the function, scale should default to a linear scale
-      expect(yAxis.axisScale.getD3Scale()).to.be.a(Function);
+      expect(yAxis.axisScale.getD3Scale()).toEqual(expect.any(Function));
     });
 
     it('should throw an error if function name is undefined', function() {
       expect(function() {
         yAxis.axisScale.getD3Scale('square');
-      }).to.throwError();
+      }).toThrow();
     });
   });
 
@@ -324,18 +323,18 @@ describe('Vislib yAxis Class Test Suite', function() {
     it('should throw an error', function() {
       expect(function() {
         yAxis.axisScale.logDomain(-10, -5);
-      }).to.throwError();
+      }).toThrow();
       expect(function() {
         yAxis.axisScale.logDomain(-10, 5);
-      }).to.throwError();
+      }).toThrow();
       expect(function() {
         yAxis.axisScale.logDomain(0, -5);
-      }).to.throwError();
+      }).toThrow();
     });
 
     it('should return a yMin value of 1', function() {
       const yMin = yAxis.axisScale.logDomain(0, 200)[0];
-      expect(yMin).to.be(1);
+      expect(yMin).toBe(1);
     });
   });
 
@@ -354,7 +353,7 @@ describe('Vislib yAxis Class Test Suite', function() {
     it('should use decimal format for small values', function() {
       yAxis.yMax = 1;
       const tickFormat = yAxis.getAxis().tickFormat();
-      expect(tickFormat(0.8)).to.be('0.8');
+      expect(tickFormat(0.8)).toBe('0.8');
     });
   });
 
@@ -364,7 +363,7 @@ describe('Vislib yAxis Class Test Suite', function() {
     });
 
     it('should be a function', function() {
-      expect(_.isFunction(yAxis.draw())).to.be(true);
+      expect(_.isFunction(yAxis.draw())).toBe(true);
     });
   });
 
@@ -374,9 +373,9 @@ describe('Vislib yAxis Class Test Suite', function() {
     });
 
     it('should return the correct number of ticks', function() {
-      expect(yAxis.tickScale(1000)).to.be(11);
-      expect(yAxis.tickScale(40)).to.be(3);
-      expect(yAxis.tickScale(20)).to.be(0);
+      expect(yAxis.tickScale(1000)).toBe(11);
+      expect(yAxis.tickScale(40)).toBe(3);
+      expect(yAxis.tickScale(20)).toBe(0);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/binder.ts b/src/plugins/vis_type_vislib/public/vislib/lib/binder.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/binder.ts
rename to src/plugins/vis_type_vislib/public/vislib/lib/binder.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/chart_grid.js b/src/plugins/vis_type_vislib/public/vislib/lib/chart_grid.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/chart_grid.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/chart_grid.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/chart_title.js b/src/plugins/vis_type_vislib/public/vislib/lib/chart_title.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/chart_title.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/chart_title.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js b/src/plugins/vis_type_vislib/public/vislib/lib/data.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/data.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/data.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/data.js b/src/plugins/vis_type_vislib/public/vislib/lib/data.test.js
similarity index 91%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/data.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/data.test.js
index d4ec6f363a75b0..b1a91979b3d9d8 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/data.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/data.test.js
@@ -18,10 +18,9 @@
  */
 
 import _ from 'lodash';
-import expect from '@kbn/expect';
 
-import { Data } from '../../lib/data';
-import { getMockUiState } from './fixtures/_vis_fixture';
+import { Data } from './data';
+import { getMockUiState } from '../../fixtures/mocks';
 
 const seriesData = {
   label: '',
@@ -160,12 +159,12 @@ describe('Vislib Data Class Test Suite', function() {
 
   describe('Data Class (main)', function() {
     it('should be a function', function() {
-      expect(_.isFunction(Data)).to.be(true);
+      expect(_.isFunction(Data)).toBe(true);
     });
 
     it('should return an object', function() {
       const rowIn = new Data(rowsData, mockUiState, () => undefined);
-      expect(_.isObject(rowIn)).to.be(true);
+      expect(_.isObject(rowIn)).toBe(true);
     });
   });
 
@@ -183,7 +182,7 @@ describe('Vislib Data Class Test Suite', function() {
 
     it('should remove zero values', function() {
       const slices = data._removeZeroSlices(data.data.slices);
-      expect(slices.children.length).to.be(2);
+      expect(slices.children.length).toBe(2);
     });
   });
 
@@ -197,7 +196,7 @@ describe('Vislib Data Class Test Suite', function() {
     });
 
     it('should return an array of value objects from every series', function() {
-      expect(serOut.every(_.isObject)).to.be(true);
+      expect(serOut.every(_.isObject)).toBe(true);
     });
 
     it('should return all points from every series', testLength(seriesData));
@@ -220,7 +219,7 @@ describe('Vislib Data Class Test Suite', function() {
           0
         );
 
-        expect(data.flatten()).to.have.length(len);
+        expect(data.flatten()).toHaveLength(len);
       };
     }
   });
@@ -268,15 +267,15 @@ describe('Vislib Data Class Test Suite', function() {
     describe('getVisData', function() {
       it('should return the rows property', function() {
         const visData = data.getVisData();
-        expect(visData[0].title).to.eql(geohashGridData.rows[0].title);
+        expect(visData[0].title).toEqual(geohashGridData.rows[0].title);
       });
     });
 
     describe('getGeoExtents', function() {
       it('should return the min and max geoJson properties', function() {
         const minMax = data.getGeoExtents();
-        expect(minMax.min).to.be(1);
-        expect(minMax.max).to.be(331);
+        expect(minMax.min).toBe(1);
+        expect(minMax.max).toBe(331);
       });
     });
   });
@@ -284,7 +283,7 @@ describe('Vislib Data Class Test Suite', function() {
   describe('null value check', function() {
     it('should return false', function() {
       const data = new Data(rowsData, mockUiState, () => undefined);
-      expect(data.hasNullValues()).to.be(false);
+      expect(data.hasNullValues()).toBe(false);
     });
 
     it('should return true', function() {
@@ -304,7 +303,7 @@ describe('Vislib Data Class Test Suite', function() {
       });
 
       const data = new Data(nullRowData, mockUiState, () => undefined);
-      expect(data.hasNullValues()).to.be(true);
+      expect(data.hasNullValues()).toBe(true);
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/dispatch.js b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/dispatch.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/dispatch.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch_heatmap.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch_heatmap.test.js
similarity index 75%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch_heatmap.test.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/dispatch_heatmap.test.js
index e22f19ea643fd3..4e650d4c20f977 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch_heatmap.test.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch_heatmap.test.js
@@ -17,12 +17,11 @@
  * under the License.
  */
 
-import mockDispatchDataD3 from './fixtures/dispatch_heatmap_d3.json';
-import { Dispatch } from '../../lib/dispatch';
-import mockdataPoint from './fixtures/dispatch_heatmap_data_point.json';
-import mockConfigPercentage from './fixtures/dispatch_heatmap_config.json';
+import mockDispatchDataD3 from '../../fixtures/dispatch_heatmap_d3.json';
+import { Dispatch } from './dispatch';
+import mockdataPoint from '../../fixtures/dispatch_heatmap_data_point.json';
+import mockConfigPercentage from '../../fixtures/dispatch_heatmap_config.json';
 
-jest.mock('ui/new_platform');
 jest.mock('d3', () => ({
   event: {
     target: {
@@ -32,15 +31,6 @@ jest.mock('d3', () => ({
     },
   },
 }));
-jest.mock('../../../legacy_imports.ts', () => ({
-  ...jest.requireActual('../../../legacy_imports.ts'),
-  chrome: {
-    getUiSettingsClient: () => ({
-      get: () => '',
-    }),
-    addBasePath: () => {},
-  },
-}));
 
 function getHandlerMock(config = {}, data = {}) {
   return {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch_vertical_bar_chart.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch_vertical_bar_chart.test.js
similarity index 74%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch_vertical_bar_chart.test.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/dispatch_vertical_bar_chart.test.js
index 8fe9ac24db77b5..a680788281fb16 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/dispatch_vertical_bar_chart.test.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/dispatch_vertical_bar_chart.test.js
@@ -17,13 +17,12 @@
  * under the License.
  */
 
-import mockDispatchDataD3 from './fixtures/dispatch_bar_chart_d3.json';
-import { Dispatch } from '../../lib/dispatch';
-import mockdataPoint from './fixtures/dispatch_bar_chart_data_point.json';
-import mockConfigPercentage from './fixtures/dispatch_bar_chart_config_percentage.json';
-import mockConfigNormal from './fixtures/dispatch_bar_chart_config_normal.json';
+import mockDispatchDataD3 from '../../fixtures/dispatch_bar_chart_d3.json';
+import { Dispatch } from './dispatch';
+import mockdataPoint from '../../fixtures/dispatch_bar_chart_data_point.json';
+import mockConfigPercentage from '../../fixtures/dispatch_bar_chart_config_percentage.json';
+import mockConfigNormal from '../../fixtures/dispatch_bar_chart_config_normal.json';
 
-jest.mock('ui/new_platform');
 jest.mock('d3', () => ({
   event: {
     target: {
@@ -33,15 +32,6 @@ jest.mock('d3', () => ({
     },
   },
 }));
-jest.mock('../../../legacy_imports.ts', () => ({
-  ...jest.requireActual('../../../legacy_imports.ts'),
-  chrome: {
-    getUiSettingsClient: () => ({
-      get: () => '',
-    }),
-    addBasePath: () => {},
-  },
-}));
 
 function getHandlerMock(config = {}, data = {}) {
   return {
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/handler.js b/src/plugins/vis_type_vislib/public/vislib/lib/handler.js
similarity index 98%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/handler.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/handler.js
index f33ce0395af1fd..f5b1c13f1a83f7 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/handler.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/handler.js
@@ -29,7 +29,7 @@ import { Axis } from './axis/axis';
 import { ChartGrid as Grid } from './chart_grid';
 import { visTypes as chartTypes } from '../visualizations/vis_types';
 import { Binder } from './binder';
-import { dispatchRenderComplete } from '../../../../../../plugins/kibana_utils/public';
+import { dispatchRenderComplete } from '../../../../kibana_utils/public';
 
 const markdownIt = new MarkdownIt({
   html: false,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/_index.scss b/src/plugins/vis_type_vislib/public/vislib/lib/layout/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/_layout.scss b/src/plugins/vis_type_vislib/public/vislib/lib/layout/_layout.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/_layout.scss
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/_layout.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/index.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/index.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/index.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/layout.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/layout.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout_types.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js
similarity index 83%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout_types.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js
index cc6d33a2d98daf..0bc11e5124a077 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/layout_types.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/layout_types.test.js
@@ -18,9 +18,8 @@
  */
 
 import _ from 'lodash';
-import expect from '@kbn/expect';
 
-import { layoutTypes as layoutType } from '../../../lib/layout/layout_types';
+import { layoutTypes as layoutType } from './layout_types';
 
 describe('Vislib Layout Types Test Suite', function() {
   let layoutFunc;
@@ -30,10 +29,10 @@ describe('Vislib Layout Types Test Suite', function() {
   });
 
   it('should be an object', function() {
-    expect(_.isObject(layoutType)).to.be(true);
+    expect(_.isObject(layoutType)).toBe(true);
   });
 
   it('should return a function', function() {
-    expect(typeof layoutFunc).to.be('function');
+    expect(typeof layoutFunc).toBe('function');
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_title_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/chart_title_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/splits.test.js
similarity index 89%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/splits.test.js
index 3942aa18891b84..117b346efda898 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/splits.test.js
@@ -18,13 +18,12 @@
  */
 
 import d3 from 'd3';
-import expect from '@kbn/expect';
 import $ from 'jquery';
 
-import { chartSplit } from '../../../../../lib/layout/splits/column_chart/chart_split';
-import { chartTitleSplit } from '../../../../../lib/layout/splits/column_chart/chart_title_split';
-import { xAxisSplit } from '../../../../../lib/layout/splits/column_chart/x_axis_split';
-import { yAxisSplit } from '../../../../../lib/layout/splits/column_chart/y_axis_split';
+import { chartSplit } from './chart_split';
+import { chartTitleSplit } from './chart_title_split';
+import { xAxisSplit } from './x_axis_split';
+import { yAxisSplit } from './y_axis_split';
 
 describe('Vislib Split Function Test Suite', function() {
   describe('Column Chart', function() {
@@ -174,11 +173,11 @@ describe('Vislib Split Function Test Suite', function() {
       });
 
       it('should append the correct number of divs', function() {
-        expect($('.chart').length).to.be(2);
+        expect($('.chart').length).toBe(2);
       });
 
       it('should add the correct class name', function() {
-        expect(!!$('.visWrapper__splitCharts--row').length).to.be(true);
+        expect(!!$('.visWrapper__splitCharts--row').length).toBe(true);
       });
     });
 
@@ -213,16 +212,16 @@ describe('Vislib Split Function Test Suite', function() {
       });
 
       it('should append the correct number of divs', function() {
-        expect($('.chart-title').length).to.be(2);
+        expect($('.chart-title').length).toBe(2);
       });
 
       it('should remove the correct div', function() {
-        expect($('.visAxis__splitTitles--y').length).to.be(1);
-        expect($('.visAxis__splitTitles--x').length).to.be(0);
+        expect($('.visAxis__splitTitles--y').length).toBe(1);
+        expect($('.visAxis__splitTitles--x').length).toBe(0);
       });
 
       it('should remove all chart title divs when only one chart is rendered', function() {
-        expect(fixture).to.be(0);
+        expect(fixture).toBe(0);
       });
     });
 
@@ -246,7 +245,7 @@ describe('Vislib Split Function Test Suite', function() {
       });
 
       it('should append the correct number of divs', function() {
-        expect(divs.length).to.be(2);
+        expect(divs.length).toBe(2);
       });
     });
 
@@ -272,7 +271,7 @@ describe('Vislib Split Function Test Suite', function() {
       });
 
       it('should append the correct number of divs', function() {
-        expect(divs.length).to.be(2);
+        expect(divs.length).toBe(2);
       });
     });
   });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/x_axis_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/x_axis_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/y_axis_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/column_chart/y_axis_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_title_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_title_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_title_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/chart_title_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/gauge_chart/splits.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/splits.test.js
similarity index 93%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/gauge_chart/splits.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/splits.test.js
index 8978f80f58dde8..05f6f72246d4a8 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/splits/gauge_chart/splits.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/gauge_chart/splits.test.js
@@ -18,11 +18,10 @@
  */
 
 import d3 from 'd3';
-import expect from '@kbn/expect';
 import $ from 'jquery';
 
-import { chartSplit } from '../../../../../lib/layout/splits/gauge_chart/chart_split';
-import { chartTitleSplit } from '../../../../../lib/layout/splits/gauge_chart/chart_title_split';
+import { chartSplit } from './chart_split';
+import { chartTitleSplit } from './chart_title_split';
 
 describe('Vislib Gauge Split Function Test Suite', function() {
   describe('Column Chart', function() {
@@ -172,11 +171,11 @@ describe('Vislib Gauge Split Function Test Suite', function() {
       });
 
       it('should append the correct number of divs', function() {
-        expect($('.chart').length).to.be(2);
+        expect($('.chart').length).toBe(2);
       });
 
       it('should add the correct class name', function() {
-        expect(!!$('.visWrapper__splitCharts--row').length).to.be(true);
+        expect(!!$('.visWrapper__splitCharts--row').length).toBe(true);
       });
     });
 
@@ -196,8 +195,8 @@ describe('Vislib Gauge Split Function Test Suite', function() {
       });
 
       it('should append the correct number of divs', function() {
-        expect($('.visAxis__splitTitles--x .chart-title').length).to.be(2);
-        expect($('.visAxis__splitTitles--y .chart-title').length).to.be(2);
+        expect($('.visAxis__splitTitles--x .chart-title').length).toBe(2);
+        expect($('.visAxis__splitTitles--y .chart-title').length).toBe(2);
       });
     });
   });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/splits/pie_chart/chart_title_split.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/types/column_layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js
similarity index 91%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/types/column_layout.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js
index e9c2ff0d2fa078..a27ee57e64a5a9 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/layout/types/column_layout.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/column_layout.test.js
@@ -19,9 +19,8 @@
 
 import d3 from 'd3';
 import _ from 'lodash';
-import expect from '@kbn/expect';
 
-import { layoutTypes } from '../../../../lib/layout/layout_types';
+import { layoutTypes } from '../layout_types';
 
 describe('Vislib Column Layout Test Suite', function() {
   let columnLayout;
@@ -98,13 +97,13 @@ describe('Vislib Column Layout Test Suite', function() {
   });
 
   it('should return an array of objects', function() {
-    expect(Array.isArray(columnLayout)).to.be(true);
-    expect(_.isObject(columnLayout[0])).to.be(true);
+    expect(Array.isArray(columnLayout)).toBe(true);
+    expect(_.isObject(columnLayout[0])).toBe(true);
   });
 
   it('should throw an error when the wrong number or no arguments provided', function() {
     expect(function() {
       layoutTypes.point_series(el);
-    }).to.throwError();
+    }).toThrow();
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/types/gauge_layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/gauge_layout.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/types/gauge_layout.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/types/gauge_layout.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/types/pie_layout.js b/src/plugins/vis_type_vislib/public/vislib/lib/layout/types/pie_layout.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/layout/types/pie_layout.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/layout/types/pie_layout.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/gauge.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/gauge.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/gauge.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/gauge.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/index.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/index.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/index.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/index.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/pie.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/pie.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/pie.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/pie.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/point_series.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/point_series.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/point_series.test.js b/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.test.js
similarity index 53%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/point_series.test.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.test.js
index 38a6be548594f3..684d8f346744e2 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/types/point_series.test.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/types/point_series.test.js
@@ -16,8 +16,57 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import stackedSeries from '../../__tests__/lib/fixtures/mock_data/date_histogram/_stacked_series';
+import stackedSeries from '../../../fixtures/mock_data/date_histogram/_stacked_series';
 import { vislibPointSeriesTypes } from './point_series';
+import percentileTestdata from './testdata_linechart_percentile.json';
+import percentileTestdataResult from './testdata_linechart_percentile_result.json';
+
+const maxBucketData = {
+  get: prop => {
+    return maxBucketData[prop] || maxBucketData.data[prop] || null;
+  },
+  getLabels: () => [],
+  data: {
+    hits: 621,
+    ordered: {
+      date: true,
+      interval: 30000,
+      max: 1408734982458,
+      min: 1408734082458,
+    },
+    series: [
+      { label: 's1', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's2', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's3', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's4', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's5', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's6', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's7', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's8', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's9', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's10', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's11', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's12', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's13', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's14', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's15', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's16', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's17', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's18', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's19', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's20', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's21', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's22', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's23', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's24', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's25', values: [{ x: 1408734060000, y: 8 }] },
+      { label: 's26', values: [{ x: 1408734060000, y: 8 }] },
+    ],
+    xAxisLabel: 'Date Histogram',
+    yAxisLabel: 'series',
+    yAxisFormatter: () => 'test',
+  },
+};
 
 describe('vislibPointSeriesTypes', () => {
   const heatmapConfig = {
@@ -41,53 +90,6 @@ describe('vislibPointSeriesTypes', () => {
     data: stackedSeries,
   };
 
-  const maxBucketData = {
-    get: prop => {
-      return maxBucketData[prop] || maxBucketData.data[prop] || null;
-    },
-    getLabels: () => [],
-    data: {
-      hits: 621,
-      ordered: {
-        date: true,
-        interval: 30000,
-        max: 1408734982458,
-        min: 1408734082458,
-      },
-      series: [
-        { label: 's1', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's2', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's3', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's4', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's5', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's6', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's7', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's8', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's9', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's10', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's11', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's12', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's13', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's14', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's15', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's16', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's17', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's18', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's19', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's20', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's21', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's22', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's23', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's24', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's25', values: [{ x: 1408734060000, y: 8 }] },
-        { label: 's26', values: [{ x: 1408734060000, y: 8 }] },
-      ],
-      xAxisLabel: 'Date Histogram',
-      yAxisLabel: 'series',
-      yAxisFormatter: () => 'test',
-    },
-  };
-
   describe('axis formatters', () => {
     it('should create a value axis config with the default y axis formatter', () => {
       const parsedConfig = vislibPointSeriesTypes.line({}, maxBucketData);
@@ -172,3 +174,59 @@ describe('vislibPointSeriesTypes', () => {
     });
   });
 });
+
+describe('Point Series Config Type Class Test Suite', function() {
+  let parsedConfig;
+  const histogramConfig = {
+    type: 'histogram',
+    addLegend: true,
+    tooltip: {
+      show: true,
+    },
+    categoryAxes: [
+      {
+        id: 'CategoryAxis-1',
+        type: 'category',
+        title: {},
+      },
+    ],
+    valueAxes: [
+      {
+        id: 'ValueAxis-1',
+        type: 'value',
+        labels: {},
+        title: {},
+      },
+    ],
+  };
+
+  describe('histogram chart', function() {
+    beforeEach(function() {
+      parsedConfig = vislibPointSeriesTypes.column(histogramConfig, maxBucketData);
+    });
+    it('should not throw an error when more than 25 series are provided', function() {
+      expect(parsedConfig.error).toBeUndefined();
+    });
+
+    it('should set axis title and formatter from data', () => {
+      expect(parsedConfig.categoryAxes[0].title.text).toEqual(maxBucketData.data.xAxisLabel);
+      expect(parsedConfig.valueAxes[0].labels.axisFormatter).toBeDefined();
+    });
+  });
+
+  describe('line chart', function() {
+    beforeEach(function() {
+      const percentileDataObj = {
+        get: prop => {
+          return maxBucketData[prop] || maxBucketData.data[prop] || null;
+        },
+        getLabels: () => [],
+        data: percentileTestdata.data,
+      };
+      parsedConfig = vislibPointSeriesTypes.line(percentileTestdata.cfg, percentileDataObj);
+    });
+    it('should render a percentile line chart', function() {
+      expect(JSON.stringify(parsedConfig)).toEqual(JSON.stringify(percentileTestdataResult));
+    });
+  });
+});
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/testdata_linechart_percentile.json b/src/plugins/vis_type_vislib/public/vislib/lib/types/testdata_linechart_percentile.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/testdata_linechart_percentile.json
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/testdata_linechart_percentile.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/testdata_linechart_percentile_result.json b/src/plugins/vis_type_vislib/public/vislib/lib/types/testdata_linechart_percentile_result.json
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/types/testdata_linechart_percentile_result.json
rename to src/plugins/vis_type_vislib/public/vislib/lib/types/testdata_linechart_percentile_result.json
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/vis_config.js b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/vis_config.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/vis_config.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/vis_config.js b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.test.js
similarity index 86%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/vis_config.js
rename to src/plugins/vis_type_vislib/public/vislib/lib/vis_config.test.js
index 7dfd2ded36a667..1ba7d4aaa8a0c9 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/lib/vis_config.js
+++ b/src/plugins/vis_type_vislib/public/vislib/lib/vis_config.test.js
@@ -18,10 +18,9 @@
  */
 
 import d3 from 'd3';
-import expect from '@kbn/expect';
 
-import { VisConfig } from '../../lib/vis_config';
-import { getMockUiState } from './fixtures/_vis_fixture';
+import { VisConfig } from './vis_config';
+import { getMockUiState } from '../../fixtures/mocks';
 
 describe('Vislib VisConfig Class Test Suite', function() {
   let el;
@@ -109,33 +108,33 @@ describe('Vislib VisConfig Class Test Suite', function() {
 
   describe('get Method', function() {
     it('should be a function', function() {
-      expect(typeof visConfig.get).to.be('function');
+      expect(typeof visConfig.get).toBe('function');
     });
 
     it('should get the property', function() {
-      expect(visConfig.get('el')).to.be(el);
-      expect(visConfig.get('type')).to.be('point_series');
+      expect(visConfig.get('el')).toBe(el);
+      expect(visConfig.get('type')).toBe('point_series');
     });
 
     it('should return defaults if property does not exist', function() {
-      expect(visConfig.get('this.does.not.exist', 'defaults')).to.be('defaults');
+      expect(visConfig.get('this.does.not.exist', 'defaults')).toBe('defaults');
     });
 
     it('should throw an error if property does not exist and defaults were not provided', function() {
       expect(function() {
         visConfig.get('this.does.not.exist');
-      }).to.throwError();
+      }).toThrow();
     });
   });
 
   describe('set Method', function() {
     it('should be a function', function() {
-      expect(typeof visConfig.set).to.be('function');
+      expect(typeof visConfig.set).toBe('function');
     });
 
     it('should set a property', function() {
       visConfig.set('this.does.not.exist', 'it.does.now');
-      expect(visConfig.get('this.does.not.exist')).to.be('it.does.now');
+      expect(visConfig.get('this.does.not.exist')).toBe('it.does.now');
     });
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/partials/touchdown.tmpl.html b/src/plugins/vis_type_vislib/public/vislib/partials/touchdown.tmpl.html
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/partials/touchdown.tmpl.html
rename to src/plugins/vis_type_vislib/public/vislib/partials/touchdown.tmpl.html
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.js b/src/plugins/vis_type_vislib/public/vislib/response_handler.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.js
rename to src/plugins/vis_type_vislib/public/vislib/response_handler.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.test.ts b/src/plugins/vis_type_vislib/public/vislib/response_handler.test.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/response_handler.test.ts
rename to src/plugins/vis_type_vislib/public/vislib/response_handler.test.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/types.ts b/src/plugins/vis_type_vislib/public/vislib/types.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/types.ts
rename to src/plugins/vis_type_vislib/public/vislib/types.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/vis.js b/src/plugins/vis_type_vislib/public/vislib/vis.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/vis.js
rename to src/plugins/vis_type_vislib/public/vislib/vis.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/_chart.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/_chart.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/gauge_chart.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/_index.scss b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/_meter.scss b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/_meter.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/_meter.scss
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/_meter.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/gauge_types.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/gauge_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/gauge_types.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/gauge_types.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js
index 62de6d84136641..deafe010b6773c 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/gauges/meter.js
@@ -20,7 +20,7 @@
 import d3 from 'd3';
 import _ from 'lodash';
 
-import { getHeatmapColors } from '../../../../../../../plugins/charts/public';
+import { getHeatmapColors } from '../../../../../charts/public';
 
 const arcAngles = {
   angleFactor: 0.75,
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/pie_chart.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/_index.scss b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_index.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/_index.scss
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/_labels.scss b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_labels.scss
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/_labels.scss
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_labels.scss
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/_point_series.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/area_chart.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/column_chart.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js
similarity index 99%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js
index 9822932c6071b8..6f497ae057d726 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/heatmap_chart.js
@@ -23,7 +23,7 @@ import moment from 'moment';
 import { isColorDark } from '@elastic/eui';
 
 import { PointSeries } from './_point_series';
-import { getHeatmapColors } from '../../.../../../../../../../plugins/charts/public';
+import { getHeatmapColors } from '../../../../../../plugins/charts/public';
 
 const defaults = {
   color: undefined, // todo
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/line_chart.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/series_types.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/series_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/point_series/series_types.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/point_series/series_types.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/time_marker.d.ts b/src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.d.ts
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/time_marker.d.ts
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.d.ts
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/time_marker.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/time_marker.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/time_marker.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.test.js
similarity index 83%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/time_marker.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.test.js
index d69f952325ed02..058bdb5de8785f 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/time_marker.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/time_marker.test.js
@@ -19,11 +19,10 @@
 
 import d3 from 'd3';
 import $ from 'jquery';
-import expect from '@kbn/expect';
 
-import series from '../lib/fixtures/mock_data/date_histogram/_series';
-import terms from '../lib/fixtures/mock_data/terms/_columns';
-import { TimeMarker } from '../../visualizations/time_marker';
+import series from '../../fixtures/mock_data/date_histogram/_series';
+import terms from '../../fixtures/mock_data/terms/_columns';
+import { TimeMarker } from './time_marker';
 
 describe('Vislib Time Marker Test Suite', function() {
   const height = 50;
@@ -87,13 +86,13 @@ describe('Vislib Time Marker Test Suite', function() {
 
     it('should return true when data is time based', function() {
       boolean = defaultMarker._isTimeBasedChart(selection);
-      expect(boolean).to.be(true);
+      expect(boolean).toBe(true);
     });
 
     it('should return false when data is not time based', function() {
       newSelection = selection.datum(terms);
       boolean = defaultMarker._isTimeBasedChart(newSelection);
-      expect(boolean).to.be(false);
+      expect(boolean).toBe(false);
     });
   });
 
@@ -107,34 +106,34 @@ describe('Vislib Time Marker Test Suite', function() {
     });
 
     it('should render the default line', function() {
-      expect(!!$('line.time-marker').length).to.be(true);
+      expect(!!$('line.time-marker').length).toBe(true);
     });
 
     it('should render the custom (user defined) lines', function() {
-      expect($('line.custom-time-marker').length).to.be(myTimes.length);
+      expect($('line.custom-time-marker').length).toBe(myTimes.length);
     });
 
     it('should set the class', function() {
       Array.prototype.forEach.call(lineArray, function(line) {
-        expect(line.getAttribute('class')).to.be(customClass);
+        expect(line.getAttribute('class')).toBe(customClass);
       });
     });
 
     it('should set the stroke', function() {
       Array.prototype.forEach.call(lineArray, function(line) {
-        expect(line.getAttribute('stroke')).to.be(color);
+        expect(line.getAttribute('stroke')).toBe(color);
       });
     });
 
     it('should set the stroke-opacity', function() {
       Array.prototype.forEach.call(lineArray, function(line) {
-        expect(+line.getAttribute('stroke-opacity')).to.be(opacity);
+        expect(+line.getAttribute('stroke-opacity')).toBe(opacity);
       });
     });
 
     it('should set the stroke-width', function() {
       Array.prototype.forEach.call(lineArray, function(line) {
-        expect(+line.getAttribute('stroke-width')).to.be(width);
+        expect(+line.getAttribute('stroke-width')).toBe(width);
       });
     });
   });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/vis_types.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.js
similarity index 100%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/visualizations/vis_types.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.js
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/vis_types.js b/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js
similarity index 85%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/vis_types.js
rename to src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js
index c8f0faf8dcca5d..df044f46460c87 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/__tests__/visualizations/vis_types.js
+++ b/src/plugins/vis_type_vislib/public/vislib/visualizations/vis_types.test.js
@@ -18,9 +18,8 @@
  */
 
 import _ from 'lodash';
-import expect from '@kbn/expect';
 
-import { visTypes } from '../../visualizations/vis_types';
+import { visTypes } from './vis_types';
 
 describe('Vislib Vis Types Test Suite', function() {
   let visFunc;
@@ -30,10 +29,10 @@ describe('Vislib Vis Types Test Suite', function() {
   });
 
   it('should be an object', function() {
-    expect(_.isObject(visTypes)).to.be(true);
+    expect(_.isObject(visTypes)).toBe(true);
   });
 
   it('should return a function', function() {
-    expect(typeof visFunc).to.be('function');
+    expect(typeof visFunc).toBe('function');
   });
 });
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/vislib/index.js b/src/plugins/vis_type_vislib/server/index.ts
similarity index 78%
rename from src/legacy/core_plugins/vis_type_vislib/public/vislib/index.js
rename to src/plugins/vis_type_vislib/server/index.ts
index b2559c085aeab3..355c01d255ce77 100644
--- a/src/legacy/core_plugins/vis_type_vislib/public/vislib/index.js
+++ b/src/plugins/vis_type_vislib/server/index.ts
@@ -17,7 +17,13 @@
  * under the License.
  */
 
-import { VislibProvider } from './vislib';
+import { schema } from '@kbn/config-schema';
 
-// eslint-disable-next-line import/no-default-export
-export default VislibProvider;
+export const config = {
+  schema: schema.object({ enabled: schema.boolean({ defaultValue: true }) }),
+};
+
+export const plugin = () => ({
+  setup() {},
+  start() {},
+});
diff --git a/x-pack/plugins/ml/public/application/util/chart_utils.js b/x-pack/plugins/ml/public/application/util/chart_utils.js
index 3fd228377c57e4..5a062320ca6c5c 100644
--- a/x-pack/plugins/ml/public/application/util/chart_utils.js
+++ b/x-pack/plugins/ml/public/application/util/chart_utils.js
@@ -107,7 +107,7 @@ export function drawLineChartDots(data, lineChartGroup, lineChartValuesLine, rad
 }
 
 // this replicates Kibana's filterAxisLabels() behavior
-// which can be found in src/legacy/core_plugins/vis_type_vislib/public/vislib/lib/axis/axis_labels.js
+// which can be found in src/plugins/vis_type_vislib/public/vislib/lib/axis/axis_labels.js
 // axis labels which overflow the chart's boundaries will be removed
 export function filterAxisLabels(selection, chartWidth) {
   if (selection === undefined || selection.selectAll === undefined) {

From 512e09761b60bb0394ebd90691b216cef0c5188a Mon Sep 17 00:00:00 2001
From: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Date: Tue, 28 Apr 2020 15:31:21 +0200
Subject: [PATCH 05/17] [EPM] Use index templates v2 (#64305)

* Install prebuilt index templates as v2

* Correctly handle pre-build v1 index templates

* Generate index templates v2 during package install

* Update unit tests for index template v2

* Fix imports.

* Fix types.

* Use index template v2 API for template deletion

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../ingest_manager/common/types/models/epm.ts |   15 +-
 .../ingest_manager/sections/epm/constants.tsx |    1 +
 .../__snapshots__/template.test.ts.snap       | 2836 +++++++++--------
 .../epm/elasticsearch/template/install.ts     |  101 +-
 .../epm/elasticsearch/template/template.ts    |   96 +-
 .../server/services/epm/packages/remove.ts    |   16 +-
 6 files changed, 1590 insertions(+), 1475 deletions(-)

diff --git a/x-pack/plugins/ingest_manager/common/types/models/epm.ts b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
index c750aa99204fa9..fb6bf235d1e26b 100644
--- a/x-pack/plugins/ingest_manager/common/types/models/epm.ts
+++ b/x-pack/plugins/ingest_manager/common/types/models/epm.ts
@@ -32,6 +32,7 @@ export enum KibanaAssetType {
 }
 
 export enum ElasticsearchAssetType {
+  componentTemplate = 'component-template',
   ingestPipeline = 'ingest-pipeline',
   indexTemplate = 'index-template',
   ilmPolicy = 'ilm-policy',
@@ -246,6 +247,7 @@ export enum IngestAssetType {
   DataFrameTransform = 'data-frame-transform',
   IlmPolicy = 'ilm-policy',
   IndexTemplate = 'index-template',
+  ComponentTemplate = 'component-template',
   IngestPipeline = 'ingest-pipeline',
   MlJob = 'ml-job',
   RollupJob = 'rollup-job',
@@ -261,12 +263,17 @@ export interface IndexTemplateMappings {
   properties: any;
 }
 
+// This is an index template v2, see https://github.com/elastic/elasticsearch/issues/53101
+// until "proper" documentation of the new format is available.
+// Ingest Manager does not use nor support the legacy index template v1 format at all
 export interface IndexTemplate {
-  order: number;
+  priority: number;
   index_patterns: string[];
-  settings: any;
-  mappings: object;
-  aliases: object;
+  template: {
+    settings: any;
+    mappings: object;
+    aliases: object;
+  };
 }
 
 export interface TemplateRef {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/constants.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/constants.tsx
index 685199245df18f..54cb5171f5a3e3 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/constants.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/epm/constants.tsx
@@ -21,6 +21,7 @@ export const AssetTitleMap: Record<AssetType, string> = {
   'ingest-pipeline': 'Ingest Pipeline',
   'index-pattern': 'Index Pattern',
   'index-template': 'Index Template',
+  'component-template': 'Component Template',
   search: 'Saved Search',
   visualization: 'Visualization',
   input: 'Agent input',
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
index 5cf1f241a709fe..440060aff96169 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
@@ -2,850 +2,856 @@
 
 exports[`tests loading base.yml: base.yml 1`] = `
 {
-  "order": 1,
+  "priority": 1,
   "index_patterns": [
     "foo-*"
   ],
-  "settings": {
-    "index": {
-      "lifecycle": {
-        "name": "logs-default"
-      },
-      "codec": "best_compression",
-      "mapping": {
-        "total_fields": {
-          "limit": "10000"
-        }
-      },
-      "refresh_interval": "5s",
-      "number_of_shards": "1",
-      "query": {
-        "default_field": [
-          "message"
-        ]
-      },
-      "number_of_routing_shards": "30"
-    }
-  },
-  "mappings": {
-    "dynamic_templates": [
-      {
-        "strings_as_keyword": {
-          "mapping": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "match_mapping_type": "string"
-        }
+  "template": {
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "name": "logs-default"
+        },
+        "codec": "best_compression",
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "refresh_interval": "5s",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "message"
+          ]
+        },
+        "number_of_routing_shards": "30"
       }
-    ],
-    "date_detection": false,
-    "properties": {
-      "user": {
-        "properties": {
-          "auid": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "euid": {
-            "ignore_above": 1024,
-            "type": "keyword"
+    },
+    "mappings": {
+      "dynamic_templates": [
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
           }
         }
-      },
-      "long": {
-        "properties": {
-          "nested": {
-            "properties": {
-              "foo": {
-                "type": "text"
-              },
-              "bar": {
-                "type": "long"
+      ],
+      "date_detection": false,
+      "properties": {
+        "user": {
+          "properties": {
+            "auid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "euid": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
+          }
+        },
+        "long": {
+          "properties": {
+            "nested": {
+              "properties": {
+                "foo": {
+                  "type": "text"
+                },
+                "bar": {
+                  "type": "long"
+                }
               }
             }
           }
-        }
-      },
-      "nested": {
-        "properties": {
-          "bar": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "baz": {
-            "ignore_above": 1024,
-            "type": "keyword"
+        },
+        "nested": {
+          "properties": {
+            "bar": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "baz": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            }
           }
+        },
+        "myalias": {
+          "type": "alias",
+          "path": "user.euid"
+        },
+        "validarray": {
+          "type": "integer"
         }
-      },
-      "myalias": {
-        "type": "alias",
-        "path": "user.euid"
-      },
-      "validarray": {
-        "type": "integer"
       }
-    }
-  },
-  "aliases": {}
+    },
+    "aliases": {}
+  }
 }
 `;
 
 exports[`tests loading coredns.logs.yml: coredns.logs.yml 1`] = `
 {
-  "order": 1,
+  "priority": 1,
   "index_patterns": [
     "foo-*"
   ],
-  "settings": {
-    "index": {
-      "lifecycle": {
-        "name": "logs-default"
-      },
-      "codec": "best_compression",
-      "mapping": {
-        "total_fields": {
-          "limit": "10000"
-        }
-      },
-      "refresh_interval": "5s",
-      "number_of_shards": "1",
-      "query": {
-        "default_field": [
-          "message"
-        ]
-      },
-      "number_of_routing_shards": "30"
-    }
-  },
-  "mappings": {
-    "dynamic_templates": [
-      {
-        "strings_as_keyword": {
-          "mapping": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "match_mapping_type": "string"
-        }
+  "template": {
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "name": "logs-default"
+        },
+        "codec": "best_compression",
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "refresh_interval": "5s",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "message"
+          ]
+        },
+        "number_of_routing_shards": "30"
       }
-    ],
-    "date_detection": false,
-    "properties": {
-      "coredns": {
-        "properties": {
-          "id": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "query": {
-            "properties": {
-              "size": {
-                "type": "long"
-              },
-              "class": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "type": {
-                "ignore_above": 1024,
-                "type": "keyword"
+    },
+    "mappings": {
+      "dynamic_templates": [
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        }
+      ],
+      "date_detection": false,
+      "properties": {
+        "coredns": {
+          "properties": {
+            "id": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "query": {
+              "properties": {
+                "size": {
+                  "type": "long"
+                },
+                "class": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
               }
-            }
-          },
-          "response": {
-            "properties": {
-              "code": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "flags": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "size": {
-                "type": "long"
+            },
+            "response": {
+              "properties": {
+                "code": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "flags": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "size": {
+                  "type": "long"
+                }
               }
+            },
+            "dnssec_ok": {
+              "type": "boolean"
             }
-          },
-          "dnssec_ok": {
-            "type": "boolean"
           }
         }
       }
-    }
-  },
-  "aliases": {}
+    },
+    "aliases": {}
+  }
 }
 `;
 
 exports[`tests loading system.yml: system.yml 1`] = `
 {
-  "order": 1,
+  "priority": 1,
   "index_patterns": [
     "whatsthis-*"
   ],
-  "settings": {
-    "index": {
-      "lifecycle": {
-        "name": "metrics-default"
-      },
-      "codec": "best_compression",
-      "mapping": {
-        "total_fields": {
-          "limit": "10000"
-        }
-      },
-      "refresh_interval": "5s",
-      "number_of_shards": "1",
-      "query": {
-        "default_field": [
-          "message"
-        ]
-      },
-      "number_of_routing_shards": "30"
-    }
-  },
-  "mappings": {
-    "dynamic_templates": [
-      {
-        "strings_as_keyword": {
-          "mapping": {
-            "ignore_above": 1024,
-            "type": "keyword"
-          },
-          "match_mapping_type": "string"
-        }
+  "template": {
+    "settings": {
+      "index": {
+        "lifecycle": {
+          "name": "metrics-default"
+        },
+        "codec": "best_compression",
+        "mapping": {
+          "total_fields": {
+            "limit": "10000"
+          }
+        },
+        "refresh_interval": "5s",
+        "number_of_shards": "1",
+        "query": {
+          "default_field": [
+            "message"
+          ]
+        },
+        "number_of_routing_shards": "30"
       }
-    ],
-    "date_detection": false,
-    "properties": {
-      "system": {
-        "properties": {
-          "core": {
-            "properties": {
-              "id": {
-                "type": "long"
-              },
-              "user": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+    },
+    "mappings": {
+      "dynamic_templates": [
+        {
+          "strings_as_keyword": {
+            "mapping": {
+              "ignore_above": 1024,
+              "type": "keyword"
+            },
+            "match_mapping_type": "string"
+          }
+        }
+      ],
+      "date_detection": false,
+      "properties": {
+        "system": {
+          "properties": {
+            "core": {
+              "properties": {
+                "id": {
+                  "type": "long"
+                },
+                "user": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "system": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "system": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "nice": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "nice": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "idle": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "idle": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "iowait": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "iowait": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "irq": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "irq": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "softirq": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "softirq": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "steal": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "ticks": {
-                    "type": "long"
+                },
+                "steal": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "ticks": {
+                      "type": "long"
+                    }
                   }
                 }
               }
-            }
-          },
-          "cpu": {
-            "properties": {
-              "cores": {
-                "type": "long"
-              },
-              "user": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+            },
+            "cpu": {
+              "properties": {
+                "cores": {
+                  "type": "long"
+                },
+                "user": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "system": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "system": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "nice": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "nice": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "idle": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "idle": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "iowait": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "iowait": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "irq": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "irq": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "softirq": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "softirq": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "steal": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "steal": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "ticks": {
+                      "type": "long"
                     }
-                  },
-                  "ticks": {
-                    "type": "long"
                   }
-                }
-              },
-              "total": {
-                "properties": {
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
-                  },
-                  "norm": {
-                    "properties": {
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "total": {
+                  "properties": {
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    },
+                    "norm": {
+                      "properties": {
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
                     }
                   }
                 }
               }
-            }
-          },
-          "diskio": {
-            "properties": {
-              "name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "serial_number": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "read": {
-                "properties": {
-                  "count": {
-                    "type": "long"
-                  },
-                  "bytes": {
-                    "type": "long"
-                  },
-                  "time": {
-                    "type": "long"
+            },
+            "diskio": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "serial_number": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "read": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "write": {
-                "properties": {
-                  "count": {
-                    "type": "long"
-                  },
-                  "bytes": {
-                    "type": "long"
-                  },
-                  "time": {
-                    "type": "long"
+                },
+                "write": {
+                  "properties": {
+                    "count": {
+                      "type": "long"
+                    },
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "time": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "io": {
-                "properties": {
-                  "time": {
-                    "type": "long"
+                },
+                "io": {
+                  "properties": {
+                    "time": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "iostat": {
-                "properties": {
-                  "read": {
-                    "properties": {
-                      "request": {
-                        "properties": {
-                          "merges_per_sec": {
-                            "type": "float"
-                          },
-                          "per_sec": {
-                            "type": "float"
+                },
+                "iostat": {
+                  "properties": {
+                    "read": {
+                      "properties": {
+                        "request": {
+                          "properties": {
+                            "merges_per_sec": {
+                              "type": "float"
+                            },
+                            "per_sec": {
+                              "type": "float"
+                            }
                           }
-                        }
-                      },
-                      "per_sec": {
-                        "properties": {
-                          "bytes": {
-                            "type": "float"
+                        },
+                        "per_sec": {
+                          "properties": {
+                            "bytes": {
+                              "type": "float"
+                            }
                           }
+                        },
+                        "await": {
+                          "type": "float"
                         }
-                      },
-                      "await": {
-                        "type": "float"
                       }
-                    }
-                  },
-                  "write": {
-                    "properties": {
-                      "request": {
-                        "properties": {
-                          "merges_per_sec": {
-                            "type": "float"
-                          },
-                          "per_sec": {
-                            "type": "float"
+                    },
+                    "write": {
+                      "properties": {
+                        "request": {
+                          "properties": {
+                            "merges_per_sec": {
+                              "type": "float"
+                            },
+                            "per_sec": {
+                              "type": "float"
+                            }
                           }
-                        }
-                      },
-                      "per_sec": {
-                        "properties": {
-                          "bytes": {
-                            "type": "float"
+                        },
+                        "per_sec": {
+                          "properties": {
+                            "bytes": {
+                              "type": "float"
+                            }
                           }
+                        },
+                        "await": {
+                          "type": "float"
                         }
-                      },
-                      "await": {
-                        "type": "float"
                       }
-                    }
-                  },
-                  "request": {
-                    "properties": {
-                      "avg_size": {
-                        "type": "float"
+                    },
+                    "request": {
+                      "properties": {
+                        "avg_size": {
+                          "type": "float"
+                        }
                       }
-                    }
-                  },
-                  "queue": {
-                    "properties": {
-                      "avg_size": {
-                        "type": "float"
+                    },
+                    "queue": {
+                      "properties": {
+                        "avg_size": {
+                          "type": "float"
+                        }
                       }
+                    },
+                    "await": {
+                      "type": "float"
+                    },
+                    "service_time": {
+                      "type": "float"
+                    },
+                    "busy": {
+                      "type": "float"
                     }
-                  },
-                  "await": {
-                    "type": "float"
-                  },
-                  "service_time": {
-                    "type": "float"
-                  },
-                  "busy": {
-                    "type": "float"
                   }
                 }
               }
-            }
-          },
-          "entropy": {
-            "properties": {
-              "available_bits": {
-                "type": "long"
-              },
-              "pct": {
-                "type": "scaled_float",
-                "scaling_factor": 1000
+            },
+            "entropy": {
+              "properties": {
+                "available_bits": {
+                  "type": "long"
+                },
+                "pct": {
+                  "type": "scaled_float",
+                  "scaling_factor": 1000
+                }
               }
-            }
-          },
-          "filesystem": {
-            "properties": {
-              "available": {
-                "type": "long"
-              },
-              "device_name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "type": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "mount_point": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "files": {
-                "type": "long"
-              },
-              "free": {
-                "type": "long"
-              },
-              "free_files": {
-                "type": "long"
-              },
-              "total": {
-                "type": "long"
-              },
-              "used": {
-                "properties": {
-                  "bytes": {
-                    "type": "long"
-                  },
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
+            },
+            "filesystem": {
+              "properties": {
+                "available": {
+                  "type": "long"
+                },
+                "device_name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "mount_point": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "files": {
+                  "type": "long"
+                },
+                "free": {
+                  "type": "long"
+                },
+                "free_files": {
+                  "type": "long"
+                },
+                "total": {
+                  "type": "long"
+                },
+                "used": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    }
                   }
                 }
               }
-            }
-          },
-          "fsstat": {
-            "properties": {
-              "count": {
-                "type": "long"
-              },
-              "total_files": {
-                "type": "long"
-              },
-              "total_size": {
-                "properties": {
-                  "free": {
-                    "type": "long"
-                  },
-                  "used": {
-                    "type": "long"
-                  },
-                  "total": {
-                    "type": "long"
+            },
+            "fsstat": {
+              "properties": {
+                "count": {
+                  "type": "long"
+                },
+                "total_files": {
+                  "type": "long"
+                },
+                "total_size": {
+                  "properties": {
+                    "free": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    }
                   }
                 }
               }
-            }
-          },
-          "load": {
-            "properties": {
-              "1": {
-                "type": "scaled_float",
-                "scaling_factor": 100
-              },
-              "5": {
-                "type": "scaled_float",
-                "scaling_factor": 100
-              },
-              "15": {
-                "type": "scaled_float",
-                "scaling_factor": 100
-              },
-              "norm": {
-                "properties": {
-                  "1": {
-                    "type": "scaled_float",
-                    "scaling_factor": 100
-                  },
-                  "5": {
-                    "type": "scaled_float",
-                    "scaling_factor": 100
-                  },
-                  "15": {
-                    "type": "scaled_float",
-                    "scaling_factor": 100
+            },
+            "load": {
+              "properties": {
+                "1": {
+                  "type": "scaled_float",
+                  "scaling_factor": 100
+                },
+                "5": {
+                  "type": "scaled_float",
+                  "scaling_factor": 100
+                },
+                "15": {
+                  "type": "scaled_float",
+                  "scaling_factor": 100
+                },
+                "norm": {
+                  "properties": {
+                    "1": {
+                      "type": "scaled_float",
+                      "scaling_factor": 100
+                    },
+                    "5": {
+                      "type": "scaled_float",
+                      "scaling_factor": 100
+                    },
+                    "15": {
+                      "type": "scaled_float",
+                      "scaling_factor": 100
+                    }
                   }
+                },
+                "cores": {
+                  "type": "long"
                 }
-              },
-              "cores": {
-                "type": "long"
               }
-            }
-          },
-          "memory": {
-            "properties": {
-              "total": {
-                "type": "long"
-              },
-              "used": {
-                "properties": {
-                  "bytes": {
-                    "type": "long"
-                  },
-                  "pct": {
-                    "type": "scaled_float",
-                    "scaling_factor": 1000
+            },
+            "memory": {
+              "properties": {
+                "total": {
+                  "type": "long"
+                },
+                "used": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "pct": {
+                      "type": "scaled_float",
+                      "scaling_factor": 1000
+                    }
                   }
-                }
-              },
-              "free": {
-                "type": "long"
-              },
-              "actual": {
-                "properties": {
-                  "used": {
-                    "properties": {
-                      "bytes": {
-                        "type": "long"
-                      },
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "free": {
+                  "type": "long"
+                },
+                "actual": {
+                  "properties": {
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "free": {
+                      "type": "long"
                     }
-                  },
-                  "free": {
-                    "type": "long"
                   }
-                }
-              },
-              "swap": {
-                "properties": {
-                  "total": {
-                    "type": "long"
-                  },
-                  "used": {
-                    "properties": {
-                      "bytes": {
-                        "type": "long"
-                      },
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "swap": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
-                    }
-                  },
-                  "free": {
-                    "type": "long"
-                  },
-                  "out": {
-                    "properties": {
-                      "pages": {
-                        "type": "long"
+                    },
+                    "free": {
+                      "type": "long"
+                    },
+                    "out": {
+                      "properties": {
+                        "pages": {
+                          "type": "long"
+                        }
                       }
-                    }
-                  },
-                  "in": {
-                    "properties": {
-                      "pages": {
-                        "type": "long"
+                    },
+                    "in": {
+                      "properties": {
+                        "pages": {
+                          "type": "long"
+                        }
                       }
-                    }
-                  },
-                  "readahead": {
-                    "properties": {
-                      "pages": {
-                        "type": "long"
-                      },
-                      "cached": {
-                        "type": "long"
+                    },
+                    "readahead": {
+                      "properties": {
+                        "pages": {
+                          "type": "long"
+                        },
+                        "cached": {
+                          "type": "long"
+                        }
                       }
                     }
                   }
-                }
-              },
-              "hugepages": {
-                "properties": {
-                  "total": {
-                    "type": "long"
-                  },
-                  "used": {
-                    "properties": {
-                      "bytes": {
-                        "type": "long"
-                      },
-                      "pct": {
-                        "type": "long"
+                },
+                "hugepages": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "used": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "long"
+                        }
                       }
-                    }
-                  },
-                  "free": {
-                    "type": "long"
-                  },
-                  "reserved": {
-                    "type": "long"
-                  },
-                  "surplus": {
-                    "type": "long"
-                  },
-                  "default_size": {
-                    "type": "long"
-                  },
-                  "swap": {
-                    "properties": {
-                      "out": {
-                        "properties": {
-                          "pages": {
-                            "type": "long"
-                          },
-                          "fallback": {
-                            "type": "long"
+                    },
+                    "free": {
+                      "type": "long"
+                    },
+                    "reserved": {
+                      "type": "long"
+                    },
+                    "surplus": {
+                      "type": "long"
+                    },
+                    "default_size": {
+                      "type": "long"
+                    },
+                    "swap": {
+                      "properties": {
+                        "out": {
+                          "properties": {
+                            "pages": {
+                              "type": "long"
+                            },
+                            "fallback": {
+                              "type": "long"
+                            }
                           }
                         }
                       }
@@ -853,743 +859,743 @@ exports[`tests loading system.yml: system.yml 1`] = `
                   }
                 }
               }
-            }
-          },
-          "network": {
-            "properties": {
-              "name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "out": {
-                "properties": {
-                  "bytes": {
-                    "type": "long"
-                  },
-                  "packets": {
-                    "type": "long"
-                  },
-                  "errors": {
-                    "type": "long"
-                  },
-                  "dropped": {
-                    "type": "long"
+            },
+            "network": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "out": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "in": {
-                "properties": {
-                  "bytes": {
-                    "type": "long"
-                  },
-                  "packets": {
-                    "type": "long"
-                  },
-                  "errors": {
-                    "type": "long"
-                  },
-                  "dropped": {
-                    "type": "long"
+                },
+                "in": {
+                  "properties": {
+                    "bytes": {
+                      "type": "long"
+                    },
+                    "packets": {
+                      "type": "long"
+                    },
+                    "errors": {
+                      "type": "long"
+                    },
+                    "dropped": {
+                      "type": "long"
+                    }
                   }
                 }
               }
-            }
-          },
-          "network_summary": {
-            "properties": {
-              "ip": {
-                "properties": {
-                  "*": {
-                    "type": "object"
+            },
+            "network_summary": {
+              "properties": {
+                "ip": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
                   }
-                }
-              },
-              "tcp": {
-                "properties": {
-                  "*": {
-                    "type": "object"
+                },
+                "tcp": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
                   }
-                }
-              },
-              "udp": {
-                "properties": {
-                  "*": {
-                    "type": "object"
+                },
+                "udp": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
                   }
-                }
-              },
-              "udp_lite": {
-                "properties": {
-                  "*": {
-                    "type": "object"
+                },
+                "udp_lite": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
                   }
-                }
-              },
-              "icmp": {
-                "properties": {
-                  "*": {
-                    "type": "object"
+                },
+                "icmp": {
+                  "properties": {
+                    "*": {
+                      "type": "object"
+                    }
                   }
                 }
               }
-            }
-          },
-          "process": {
-            "properties": {
-              "state": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "cmdline": {
-                "ignore_above": 2048,
-                "type": "keyword"
-              },
-              "env": {
-                "type": "object"
-              },
-              "cpu": {
-                "properties": {
-                  "user": {
-                    "properties": {
-                      "ticks": {
-                        "type": "long"
+            },
+            "process": {
+              "properties": {
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "cmdline": {
+                  "ignore_above": 2048,
+                  "type": "keyword"
+                },
+                "env": {
+                  "type": "object"
+                },
+                "cpu": {
+                  "properties": {
+                    "user": {
+                      "properties": {
+                        "ticks": {
+                          "type": "long"
+                        }
                       }
-                    }
-                  },
-                  "total": {
-                    "properties": {
-                      "value": {
-                        "type": "long"
-                      },
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
-                      },
-                      "norm": {
-                        "properties": {
-                          "pct": {
-                            "type": "scaled_float",
-                            "scaling_factor": 1000
+                    },
+                    "total": {
+                      "properties": {
+                        "value": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        },
+                        "norm": {
+                          "properties": {
+                            "pct": {
+                              "type": "scaled_float",
+                              "scaling_factor": 1000
+                            }
                           }
+                        },
+                        "ticks": {
+                          "type": "long"
                         }
-                      },
-                      "ticks": {
-                        "type": "long"
                       }
-                    }
-                  },
-                  "system": {
-                    "properties": {
-                      "ticks": {
-                        "type": "long"
+                    },
+                    "system": {
+                      "properties": {
+                        "ticks": {
+                          "type": "long"
+                        }
                       }
+                    },
+                    "start_time": {
+                      "type": "date"
                     }
-                  },
-                  "start_time": {
-                    "type": "date"
                   }
-                }
-              },
-              "memory": {
-                "properties": {
-                  "size": {
-                    "type": "long"
-                  },
-                  "rss": {
-                    "properties": {
-                      "bytes": {
-                        "type": "long"
-                      },
-                      "pct": {
-                        "type": "scaled_float",
-                        "scaling_factor": 1000
+                },
+                "memory": {
+                  "properties": {
+                    "size": {
+                      "type": "long"
+                    },
+                    "rss": {
+                      "properties": {
+                        "bytes": {
+                          "type": "long"
+                        },
+                        "pct": {
+                          "type": "scaled_float",
+                          "scaling_factor": 1000
+                        }
                       }
+                    },
+                    "share": {
+                      "type": "long"
                     }
-                  },
-                  "share": {
-                    "type": "long"
                   }
-                }
-              },
-              "fd": {
-                "properties": {
-                  "open": {
-                    "type": "long"
-                  },
-                  "limit": {
-                    "properties": {
-                      "soft": {
-                        "type": "long"
-                      },
-                      "hard": {
-                        "type": "long"
+                },
+                "fd": {
+                  "properties": {
+                    "open": {
+                      "type": "long"
+                    },
+                    "limit": {
+                      "properties": {
+                        "soft": {
+                          "type": "long"
+                        },
+                        "hard": {
+                          "type": "long"
+                        }
                       }
                     }
                   }
-                }
-              },
-              "cgroup": {
-                "properties": {
-                  "id": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "path": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "cpu": {
-                    "properties": {
-                      "id": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "path": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "cfs": {
-                        "properties": {
-                          "period": {
-                            "properties": {
-                              "us": {
-                                "type": "long"
+                },
+                "cgroup": {
+                  "properties": {
+                    "id": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "path": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "cpu": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "cfs": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "quota": {
-                            "properties": {
-                              "us": {
-                                "type": "long"
+                            },
+                            "quota": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
                               }
+                            },
+                            "shares": {
+                              "type": "long"
                             }
-                          },
-                          "shares": {
-                            "type": "long"
                           }
-                        }
-                      },
-                      "rt": {
-                        "properties": {
-                          "period": {
-                            "properties": {
-                              "us": {
-                                "type": "long"
+                        },
+                        "rt": {
+                          "properties": {
+                            "period": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "runtime": {
-                            "properties": {
-                              "us": {
-                                "type": "long"
+                            },
+                            "runtime": {
+                              "properties": {
+                                "us": {
+                                  "type": "long"
+                                }
                               }
                             }
                           }
-                        }
-                      },
-                      "stats": {
-                        "properties": {
-                          "periods": {
-                            "type": "long"
-                          },
-                          "throttled": {
-                            "properties": {
-                              "periods": {
-                                "type": "long"
-                              },
-                              "ns": {
-                                "type": "long"
+                        },
+                        "stats": {
+                          "properties": {
+                            "periods": {
+                              "type": "long"
+                            },
+                            "throttled": {
+                              "properties": {
+                                "periods": {
+                                  "type": "long"
+                                },
+                                "ns": {
+                                  "type": "long"
+                                }
                               }
                             }
                           }
                         }
                       }
-                    }
-                  },
-                  "cpuacct": {
-                    "properties": {
-                      "id": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "path": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "total": {
-                        "properties": {
-                          "ns": {
-                            "type": "long"
+                    },
+                    "cpuacct": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "ns": {
+                              "type": "long"
+                            }
                           }
-                        }
-                      },
-                      "stats": {
-                        "properties": {
-                          "user": {
-                            "properties": {
-                              "ns": {
-                                "type": "long"
+                        },
+                        "stats": {
+                          "properties": {
+                            "user": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "system": {
-                            "properties": {
-                              "ns": {
-                                "type": "long"
+                            },
+                            "system": {
+                              "properties": {
+                                "ns": {
+                                  "type": "long"
+                                }
                               }
                             }
                           }
+                        },
+                        "percpu": {
+                          "type": "object"
                         }
-                      },
-                      "percpu": {
-                        "type": "object"
                       }
-                    }
-                  },
-                  "memory": {
-                    "properties": {
-                      "id": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "path": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "mem": {
-                        "properties": {
-                          "usage": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
-                              },
-                              "max": {
-                                "properties": {
-                                  "bytes": {
-                                    "type": "long"
+                    },
+                    "memory": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "mem": {
+                          "properties": {
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
                                   }
                                 }
                               }
-                            }
-                          },
-                          "limit": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
+                            },
+                            "failures": {
+                              "type": "long"
                             }
-                          },
-                          "failures": {
-                            "type": "long"
                           }
-                        }
-                      },
-                      "memsw": {
-                        "properties": {
-                          "usage": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
-                              },
-                              "max": {
-                                "properties": {
-                                  "bytes": {
-                                    "type": "long"
+                        },
+                        "memsw": {
+                          "properties": {
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
                                   }
                                 }
                               }
-                            }
-                          },
-                          "limit": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
+                            },
+                            "failures": {
+                              "type": "long"
                             }
-                          },
-                          "failures": {
-                            "type": "long"
                           }
-                        }
-                      },
-                      "kmem": {
-                        "properties": {
-                          "usage": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
-                              },
-                              "max": {
-                                "properties": {
-                                  "bytes": {
-                                    "type": "long"
+                        },
+                        "kmem": {
+                          "properties": {
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
                                   }
                                 }
                               }
-                            }
-                          },
-                          "limit": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
+                            },
+                            "failures": {
+                              "type": "long"
                             }
-                          },
-                          "failures": {
-                            "type": "long"
                           }
-                        }
-                      },
-                      "kmem_tcp": {
-                        "properties": {
-                          "usage": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
-                              },
-                              "max": {
-                                "properties": {
-                                  "bytes": {
-                                    "type": "long"
+                        },
+                        "kmem_tcp": {
+                          "properties": {
+                            "usage": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                },
+                                "max": {
+                                  "properties": {
+                                    "bytes": {
+                                      "type": "long"
+                                    }
                                   }
                                 }
                               }
-                            }
-                          },
-                          "limit": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
+                            },
+                            "failures": {
+                              "type": "long"
                             }
-                          },
-                          "failures": {
-                            "type": "long"
                           }
-                        }
-                      },
-                      "stats": {
-                        "properties": {
-                          "active_anon": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                        },
+                        "stats": {
+                          "properties": {
+                            "active_anon": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "active_file": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "active_file": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "cache": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "cache": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "hierarchical_memory_limit": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "hierarchical_memory_limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "hierarchical_memsw_limit": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "hierarchical_memsw_limit": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "inactive_anon": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "inactive_anon": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "inactive_file": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "inactive_file": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "mapped_file": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "mapped_file": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "page_faults": {
-                            "type": "long"
-                          },
-                          "major_page_faults": {
-                            "type": "long"
-                          },
-                          "pages_in": {
-                            "type": "long"
-                          },
-                          "pages_out": {
-                            "type": "long"
-                          },
-                          "rss": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "page_faults": {
+                              "type": "long"
+                            },
+                            "major_page_faults": {
+                              "type": "long"
+                            },
+                            "pages_in": {
+                              "type": "long"
+                            },
+                            "pages_out": {
+                              "type": "long"
+                            },
+                            "rss": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "rss_huge": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "rss_huge": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "swap": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "swap": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
-                            }
-                          },
-                          "unevictable": {
-                            "properties": {
-                              "bytes": {
-                                "type": "long"
+                            },
+                            "unevictable": {
+                              "properties": {
+                                "bytes": {
+                                  "type": "long"
+                                }
                               }
                             }
                           }
                         }
                       }
-                    }
-                  },
-                  "blkio": {
-                    "properties": {
-                      "id": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "path": {
-                        "ignore_above": 1024,
-                        "type": "keyword"
-                      },
-                      "total": {
-                        "properties": {
-                          "bytes": {
-                            "type": "long"
-                          },
-                          "ios": {
-                            "type": "long"
+                    },
+                    "blkio": {
+                      "properties": {
+                        "id": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "path": {
+                          "ignore_above": 1024,
+                          "type": "keyword"
+                        },
+                        "total": {
+                          "properties": {
+                            "bytes": {
+                              "type": "long"
+                            },
+                            "ios": {
+                              "type": "long"
+                            }
                           }
                         }
                       }
                     }
                   }
-                }
-              },
-              "summary": {
-                "properties": {
-                  "total": {
-                    "type": "long"
-                  },
-                  "running": {
-                    "type": "long"
-                  },
-                  "idle": {
-                    "type": "long"
-                  },
-                  "sleeping": {
-                    "type": "long"
-                  },
-                  "stopped": {
-                    "type": "long"
-                  },
-                  "zombie": {
-                    "type": "long"
-                  },
-                  "dead": {
-                    "type": "long"
-                  },
-                  "unknown": {
-                    "type": "long"
+                },
+                "summary": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "running": {
+                      "type": "long"
+                    },
+                    "idle": {
+                      "type": "long"
+                    },
+                    "sleeping": {
+                      "type": "long"
+                    },
+                    "stopped": {
+                      "type": "long"
+                    },
+                    "zombie": {
+                      "type": "long"
+                    },
+                    "dead": {
+                      "type": "long"
+                    },
+                    "unknown": {
+                      "type": "long"
+                    }
                   }
                 }
               }
-            }
-          },
-          "raid": {
-            "properties": {
-              "name": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "status": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "level": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "sync_action": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "disks": {
-                "properties": {
-                  "active": {
-                    "type": "long"
-                  },
-                  "total": {
-                    "type": "long"
-                  },
-                  "spare": {
-                    "type": "long"
-                  },
-                  "failed": {
-                    "type": "long"
-                  },
-                  "states": {
-                    "properties": {
-                      "*": {
-                        "type": "object"
+            },
+            "raid": {
+              "properties": {
+                "name": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "status": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "level": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "sync_action": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "disks": {
+                  "properties": {
+                    "active": {
+                      "type": "long"
+                    },
+                    "total": {
+                      "type": "long"
+                    },
+                    "spare": {
+                      "type": "long"
+                    },
+                    "failed": {
+                      "type": "long"
+                    },
+                    "states": {
+                      "properties": {
+                        "*": {
+                          "type": "object"
+                        }
                       }
                     }
                   }
-                }
-              },
-              "blocks": {
-                "properties": {
-                  "total": {
-                    "type": "long"
-                  },
-                  "synced": {
-                    "type": "long"
+                },
+                "blocks": {
+                  "properties": {
+                    "total": {
+                      "type": "long"
+                    },
+                    "synced": {
+                      "type": "long"
+                    }
                   }
                 }
               }
-            }
-          },
-          "socket": {
-            "properties": {
-              "local": {
-                "properties": {
-                  "ip": {
-                    "type": "ip"
-                  },
-                  "port": {
-                    "type": "long"
+            },
+            "socket": {
+              "properties": {
+                "local": {
+                  "properties": {
+                    "ip": {
+                      "type": "ip"
+                    },
+                    "port": {
+                      "type": "long"
+                    }
                   }
-                }
-              },
-              "remote": {
-                "properties": {
-                  "ip": {
-                    "type": "ip"
-                  },
-                  "port": {
-                    "type": "long"
-                  },
-                  "host": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "etld_plus_one": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
-                  },
-                  "host_error": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
+                },
+                "remote": {
+                  "properties": {
+                    "ip": {
+                      "type": "ip"
+                    },
+                    "port": {
+                      "type": "long"
+                    },
+                    "host": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "etld_plus_one": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    },
+                    "host_error": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
                   }
-                }
-              },
-              "process": {
-                "properties": {
-                  "cmdline": {
-                    "ignore_above": 1024,
-                    "type": "keyword"
+                },
+                "process": {
+                  "properties": {
+                    "cmdline": {
+                      "ignore_above": 1024,
+                      "type": "keyword"
+                    }
                   }
-                }
-              },
-              "user": {
-                "properties": {}
-              },
-              "summary": {
-                "properties": {
-                  "all": {
-                    "properties": {
-                      "count": {
-                        "type": "long"
-                      },
-                      "listening": {
-                        "type": "long"
+                },
+                "user": {
+                  "properties": {}
+                },
+                "summary": {
+                  "properties": {
+                    "all": {
+                      "properties": {
+                        "count": {
+                          "type": "long"
+                        },
+                        "listening": {
+                          "type": "long"
+                        }
                       }
-                    }
-                  },
-                  "tcp": {
-                    "properties": {
-                      "memory": {
-                        "type": "long"
-                      },
-                      "all": {
-                        "properties": {
-                          "orphan": {
-                            "type": "long"
-                          },
-                          "count": {
-                            "type": "long"
-                          },
-                          "listening": {
-                            "type": "long"
-                          },
-                          "established": {
-                            "type": "long"
-                          },
-                          "close_wait": {
-                            "type": "long"
-                          },
-                          "time_wait": {
-                            "type": "long"
-                          },
-                          "syn_sent": {
-                            "type": "long"
-                          },
-                          "syn_recv": {
-                            "type": "long"
-                          },
-                          "fin_wait1": {
-                            "type": "long"
-                          },
-                          "fin_wait2": {
-                            "type": "long"
-                          },
-                          "last_ack": {
-                            "type": "long"
-                          },
-                          "closing": {
-                            "type": "long"
+                    },
+                    "tcp": {
+                      "properties": {
+                        "memory": {
+                          "type": "long"
+                        },
+                        "all": {
+                          "properties": {
+                            "orphan": {
+                              "type": "long"
+                            },
+                            "count": {
+                              "type": "long"
+                            },
+                            "listening": {
+                              "type": "long"
+                            },
+                            "established": {
+                              "type": "long"
+                            },
+                            "close_wait": {
+                              "type": "long"
+                            },
+                            "time_wait": {
+                              "type": "long"
+                            },
+                            "syn_sent": {
+                              "type": "long"
+                            },
+                            "syn_recv": {
+                              "type": "long"
+                            },
+                            "fin_wait1": {
+                              "type": "long"
+                            },
+                            "fin_wait2": {
+                              "type": "long"
+                            },
+                            "last_ack": {
+                              "type": "long"
+                            },
+                            "closing": {
+                              "type": "long"
+                            }
                           }
                         }
                       }
-                    }
-                  },
-                  "udp": {
-                    "properties": {
-                      "memory": {
-                        "type": "long"
-                      },
-                      "all": {
-                        "properties": {
-                          "count": {
-                            "type": "long"
+                    },
+                    "udp": {
+                      "properties": {
+                        "memory": {
+                          "type": "long"
+                        },
+                        "all": {
+                          "properties": {
+                            "count": {
+                              "type": "long"
+                            }
                           }
                         }
                       }
@@ -1597,65 +1603,65 @@ exports[`tests loading system.yml: system.yml 1`] = `
                   }
                 }
               }
-            }
-          },
-          "uptime": {
-            "properties": {
-              "duration": {
-                "properties": {
-                  "ms": {
-                    "type": "long"
+            },
+            "uptime": {
+              "properties": {
+                "duration": {
+                  "properties": {
+                    "ms": {
+                      "type": "long"
+                    }
                   }
                 }
               }
-            }
-          },
-          "users": {
-            "properties": {
-              "id": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "seat": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "path": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "type": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "service": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "remote": {
-                "type": "boolean"
-              },
-              "state": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "scope": {
-                "ignore_above": 1024,
-                "type": "keyword"
-              },
-              "leader": {
-                "type": "long"
-              },
-              "remote_host": {
-                "ignore_above": 1024,
-                "type": "keyword"
+            },
+            "users": {
+              "properties": {
+                "id": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "seat": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "path": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "type": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "service": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "remote": {
+                  "type": "boolean"
+                },
+                "state": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "scope": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                },
+                "leader": {
+                  "type": "long"
+                },
+                "remote_host": {
+                  "ignore_above": 1024,
+                  "type": "keyword"
+                }
               }
             }
           }
         }
       }
-    }
-  },
-  "aliases": {}
+    },
+    "aliases": {}
+  }
 }
 `;
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/install.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/install.ts
index 4df626259ece76..6ef6f863753b55 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/install.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/install.ts
@@ -18,7 +18,9 @@ export const installTemplates = async (
   pkgVersion: string
 ): Promise<TemplateRef[]> => {
   // install any pre-built index template assets,
-  // atm, this is only the base package's global template
+  // atm, this is only the base package's global index templates
+  // Install component templates first, as they are used by the index templates
+  installPreBuiltComponentTemplates(pkgName, pkgVersion, callCluster);
   installPreBuiltTemplates(pkgName, pkgVersion, callCluster);
 
   // build templates per dataset from yml files
@@ -41,7 +43,6 @@ export const installTemplates = async (
   return [];
 };
 
-// this is temporary until we update the registry to use index templates v2 structure
 const installPreBuiltTemplates = async (
   pkgName: string,
   pkgVersion: string,
@@ -52,20 +53,91 @@ const installPreBuiltTemplates = async (
     pkgVersion,
     (entry: Registry.ArchiveEntry) => isTemplate(entry)
   );
+  // templatePaths.forEach(async path => {
+  //   const { file } = Registry.pathParts(path);
+  //   const templateName = file.substr(0, file.lastIndexOf('.'));
+  //   const content = JSON.parse(Registry.getAsset(path).toString('utf8'));
+  //   await callCluster('indices.putTemplate', {
+  //     name: templateName,
+  //     body: content,
+  //   });
+  // });
   templatePaths.forEach(async path => {
     const { file } = Registry.pathParts(path);
     const templateName = file.substr(0, file.lastIndexOf('.'));
     const content = JSON.parse(Registry.getAsset(path).toString('utf8'));
-    await callCluster('indices.putTemplate', {
-      name: templateName,
+    let templateAPIPath = '_template';
+
+    // v2 index templates need to be installed through the new API endpoint.
+    // Checking for 'template' and 'composed_of' should catch them all.
+    // For the new v2 format, see https://github.com/elastic/elasticsearch/issues/53101
+    if (content.hasOwnProperty('template') || content.hasOwnProperty('composed_of')) {
+      templateAPIPath = '_index_template';
+    }
+
+    const callClusterParams: {
+      method: string;
+      path: string;
+      ignore: number[];
+      body: any;
+    } = {
+      method: 'PUT',
+      path: `/${templateAPIPath}/${templateName}`,
+      ignore: [404],
       body: content,
-    });
+    };
+    // This uses the catch-all endpoint 'transport.request' because there is no
+    // convenience endpoint using the new _index_template API yet.
+    // The existing convenience endpoint `indices.putTemplate` only sends to _template,
+    // which does not support v2 templates.
+    // See src/core/server/elasticsearch/api_types.ts for available endpoints.
+    await callCluster('transport.request', callClusterParams);
   });
 };
+
+const installPreBuiltComponentTemplates = async (
+  pkgName: string,
+  pkgVersion: string,
+  callCluster: CallESAsCurrentUser
+) => {
+  const templatePaths = await Registry.getArchiveInfo(
+    pkgName,
+    pkgVersion,
+    (entry: Registry.ArchiveEntry) => isComponentTemplate(entry)
+  );
+  templatePaths.forEach(async path => {
+    const { file } = Registry.pathParts(path);
+    const templateName = file.substr(0, file.lastIndexOf('.'));
+    const content = JSON.parse(Registry.getAsset(path).toString('utf8'));
+
+    const callClusterParams: {
+      method: string;
+      path: string;
+      ignore: number[];
+      body: any;
+    } = {
+      method: 'PUT',
+      path: `/_component_template/${templateName}`,
+      ignore: [404],
+      body: content,
+    };
+    // This uses the catch-all endpoint 'transport.request' because there is no
+    // convenience endpoint for component templates yet.
+    // See src/core/server/elasticsearch/api_types.ts for available endpoints.
+    await callCluster('transport.request', callClusterParams);
+  });
+};
+
 const isTemplate = ({ path }: Registry.ArchiveEntry) => {
   const pathParts = Registry.pathParts(path);
   return pathParts.type === ElasticsearchAssetType.indexTemplate;
 };
+
+const isComponentTemplate = ({ path }: Registry.ArchiveEntry) => {
+  const pathParts = Registry.pathParts(path);
+  return pathParts.type === ElasticsearchAssetType.componentTemplate;
+};
+
 /**
  * installTemplatesForDataset installs one template for each dataset
  *
@@ -113,10 +185,23 @@ export async function installTemplate({
   }
   const template = getTemplate(dataset.type, templateName, mappings, pipelineName);
   // TODO: Check return values for errors
-  await callCluster('indices.putTemplate', {
-    name: templateName,
+  const callClusterParams: {
+    method: string;
+    path: string;
+    ignore: number[];
+    body: any;
+  } = {
+    method: 'PUT',
+    path: `/_index_template/${templateName}`,
+    ignore: [404],
     body: template,
-  });
+  };
+  // This uses the catch-all endpoint 'transport.request' because there is no
+  // convenience endpoint using the new _index_template API yet.
+  // The existing convenience endpoint `indices.putTemplate` only sends to _template,
+  // which does not support v2 templates.
+  // See src/core/server/elasticsearch/api_types.ts for available endpoints.
+  await callCluster('transport.request', callClusterParams);
 
   return {
     templateName,
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
index 46b6923962462e..9736f6d1cbd3cd 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/elasticsearch/template/template.ts
@@ -45,7 +45,7 @@ export function getTemplate(
 ): IndexTemplate {
   const template = getBaseTemplate(type, templateName, mappings);
   if (pipelineName) {
-    template.settings.index.default_pipeline = pipelineName;
+    template.template.settings.index.default_pipeline = pipelineName;
   }
   return template;
 }
@@ -212,59 +212,61 @@ function getBaseTemplate(
   mappings: IndexTemplateMappings
 ): IndexTemplate {
   return {
-    // We need to decide which order we use for the templates
-    order: 1,
+    // This takes precedence over all index templates installed with the 'base' package
+    priority: 1,
     // To be completed with the correct index patterns
     index_patterns: [`${templateName}-*`],
-    settings: {
-      index: {
-        // ILM Policy must be added here, for now point to the default global ILM policy name
-        lifecycle: {
-          name: `${type}-default`,
-        },
-        // What should be our default for the compression?
-        codec: 'best_compression',
-        // W
-        mapping: {
-          total_fields: {
-            limit: '10000',
+    template: {
+      settings: {
+        index: {
+          // ILM Policy must be added here, for now point to the default global ILM policy name
+          lifecycle: {
+            name: `${type}-default`,
           },
+          // What should be our default for the compression?
+          codec: 'best_compression',
+          // W
+          mapping: {
+            total_fields: {
+              limit: '10000',
+            },
+          },
+          // This is the default from Beats? So far seems to be a good value
+          refresh_interval: '5s',
+          // Default in the stack now, still good to have it in
+          number_of_shards: '1',
+          // All the default fields which should be queried have to be added here.
+          // So far we add all keyword and text fields here.
+          query: {
+            default_field: ['message'],
+          },
+          // We are setting 30 because it can be devided by several numbers. Useful when shrinking.
+          number_of_routing_shards: '30',
         },
-        // This is the default from Beats? So far seems to be a good value
-        refresh_interval: '5s',
-        // Default in the stack now, still good to have it in
-        number_of_shards: '1',
-        // All the default fields which should be queried have to be added here.
-        // So far we add all keyword and text fields here.
-        query: {
-          default_field: ['message'],
-        },
-        // We are setting 30 because it can be devided by several numbers. Useful when shrinking.
-        number_of_routing_shards: '30',
       },
-    },
-    mappings: {
-      // All the dynamic field mappings
-      dynamic_templates: [
-        // This makes sure all mappings are keywords by default
-        {
-          strings_as_keyword: {
-            mapping: {
-              ignore_above: 1024,
-              type: 'keyword',
+      mappings: {
+        // All the dynamic field mappings
+        dynamic_templates: [
+          // This makes sure all mappings are keywords by default
+          {
+            strings_as_keyword: {
+              mapping: {
+                ignore_above: 1024,
+                type: 'keyword',
+              },
+              match_mapping_type: 'string',
             },
-            match_mapping_type: 'string',
           },
-        },
-      ],
-      // As we define fields ahead, we don't need any automatic field detection
-      // This makes sure all the fields are mapped to keyword by default to prevent mapping conflicts
-      date_detection: false,
-      // All the properties we know from the fields.yml file
-      properties: mappings.properties,
+        ],
+        // As we define fields ahead, we don't need any automatic field detection
+        // This makes sure all the fields are mapped to keyword by default to prevent mapping conflicts
+        date_detection: false,
+        // All the properties we know from the fields.yml file
+        properties: mappings.properties,
+      },
+      // To be filled with the aliases that we need
+      aliases: {},
     },
-    // To be filled with the aliases that we need
-    aliases: {},
   };
 }
 
@@ -322,7 +324,7 @@ const updateExistingIndex = async ({
   callCluster: CallESAsCurrentUser;
   indexTemplate: IndexTemplate;
 }) => {
-  const { settings, mappings } = indexTemplate;
+  const { settings, mappings } = indexTemplate.template;
   // try to update the mappings first
   // for now we assume updates are compatible
   try {
diff --git a/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts b/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
index 498796438c6c8e..ac2c869f3b9e9f 100644
--- a/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/ingest_manager/server/services/epm/packages/remove.ts
@@ -74,7 +74,21 @@ async function deleteTemplate(callCluster: CallESAsCurrentUser, name: string): P
   // '*' shouldn't ever appear here, but it still would delete all templates
   if (name && name !== '*') {
     try {
-      await callCluster('indices.deleteTemplate', { name });
+      const callClusterParams: {
+        method: string;
+        path: string;
+        ignore: number[];
+      } = {
+        method: 'DELETE',
+        path: `/_index_template/${name}`,
+        ignore: [404],
+      };
+      // This uses the catch-all endpoint 'transport.request' because there is no
+      // convenience endpoint using the new _index_template API yet.
+      // The existing convenience endpoint `indices.putTemplate` only sends to _template,
+      // which does not support v2 templates.
+      // See src/core/server/elasticsearch/api_types.ts for available endpoints.
+      await callCluster('transport.request', callClusterParams);
     } catch {
       throw new Error(`error deleting template ${name}`);
     }

From e09e6a2b0b2a295d70e4336b803918f933cacd54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20C=C3=B4t=C3=A9?= <mikecote@users.noreply.github.com>
Date: Tue, 28 Apr 2020 09:58:12 -0400
Subject: [PATCH 06/17] Fix flaky test in alert details page (#64572)

---
 .../apps/triggers_actions_ui/details.ts              | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
index 1b75f4a27766a7..d0ce18bbc1c54c 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/details.ts
@@ -504,6 +504,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           }
         );
 
+        // await first run to complete so we have an initial state
+        await retry.try(async () => {
+          const { alertInstances } = await alerting.alerts.getAlertState(alert.id);
+          expect(Object.keys(alertInstances).length).to.eql(instances.length);
+        });
+
         // refresh to see alert
         await browser.refresh();
 
@@ -514,12 +520,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
         // click on first alert
         await pageObjects.triggersActionsUI.clickOnAlertInAlertsList(alert.name);
-
-        // await first run to complete so we have an initial state
-        await retry.try(async () => {
-          const { alertInstances } = await alerting.alerts.getAlertState(alert.id);
-          expect(Object.keys(alertInstances).length).to.eql(instances.length);
-        });
       });
 
       const PAGE_SIZE = 10;

From fa219bc2d85a126d4151c2c4952ebd5d8e5e16e0 Mon Sep 17 00:00:00 2001
From: Vadim Dalecky <streamich@users.noreply.github.com>
Date: Tue, 28 Apr 2020 16:40:46 +0200
Subject: [PATCH 07/17] =?UTF-8?q?fix:=20=F0=9F=90=9B=20subsribe=20to=20"ab?=
 =?UTF-8?q?ort"=20event=20in=20abort=20controller=20(#63199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 🐛 subsribe to "abort" event in abort controller

* test: 💍 add test for execution cancellation after completion

* feat: 🎸 use a more meaningful sentinel

* refactor: 💡 use toPromise() from data plugin

* chore: 🤖 disable most new tests

* test: 💍 remove fake timers from abort tests

* test: 💍 remove new tests completely

There seems to be some async race condition in Jest test runner not
related to this PR, but for some reason Jest fails. Removing these tests
temporarily to check if this file cases Jest to fail.

* chore: 🤖 try adding .catch clause to abortion promise

* chore: 🤖 revert tests back and add .catch() comment
---
 src/plugins/data/common/utils/abort_utils.ts  | 16 +++-
 .../execution/execution.abortion.test.ts      | 96 +++++++++++++++++++
 .../expressions/common/execution/execution.ts | 46 ++++++---
 .../common/expression_types/specs/error.ts    |  2 +-
 .../expressions/common/util/create_error.ts   |  6 +-
 5 files changed, 147 insertions(+), 19 deletions(-)
 create mode 100644 src/plugins/expressions/common/execution/execution.abortion.test.ts

diff --git a/src/plugins/data/common/utils/abort_utils.ts b/src/plugins/data/common/utils/abort_utils.ts
index 5051515f3a8265..9aec787170840f 100644
--- a/src/plugins/data/common/utils/abort_utils.ts
+++ b/src/plugins/data/common/utils/abort_utils.ts
@@ -33,19 +33,31 @@ export class AbortError extends Error {
  * Returns a `Promise` corresponding with when the given `AbortSignal` is aborted. Useful for
  * situations when you might need to `Promise.race` multiple `AbortSignal`s, or an `AbortSignal`
  * with any other expected errors (or completions).
+ *
  * @param signal The `AbortSignal` to generate the `Promise` from
  * @param shouldReject If `false`, the promise will be resolved, otherwise it will be rejected
  */
-export function toPromise(signal: AbortSignal, shouldReject = false) {
-  return new Promise((resolve, reject) => {
+export function toPromise(signal: AbortSignal, shouldReject?: false): Promise<undefined | Event>;
+export function toPromise(signal: AbortSignal, shouldReject?: true): Promise<never>;
+export function toPromise(signal: AbortSignal, shouldReject: boolean = false) {
+  const promise = new Promise((resolve, reject) => {
     const action = shouldReject ? reject : resolve;
     if (signal.aborted) action();
     signal.addEventListener('abort', action);
   });
+
+  /**
+   * Below is to make sure we don't have unhandled promise rejections. Otherwise
+   * Jest tests fail.
+   */
+  promise.catch(() => {});
+
+  return promise;
 }
 
 /**
  * Returns an `AbortSignal` that will be aborted when the first of the given signals aborts.
+ *
  * @param signals
  */
 export function getCombinedSignal(signals: AbortSignal[]) {
diff --git a/src/plugins/expressions/common/execution/execution.abortion.test.ts b/src/plugins/expressions/common/execution/execution.abortion.test.ts
new file mode 100644
index 00000000000000..ecbf94eceae642
--- /dev/null
+++ b/src/plugins/expressions/common/execution/execution.abortion.test.ts
@@ -0,0 +1,96 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Execution } from './execution';
+import { parseExpression } from '../ast';
+import { createUnitTestExecutor } from '../test_helpers';
+
+jest.useFakeTimers();
+
+beforeEach(() => {
+  jest.clearAllTimers();
+});
+
+const createExecution = (
+  expression: string = 'foo bar=123',
+  context: Record<string, unknown> = {},
+  debug: boolean = false
+) => {
+  const executor = createUnitTestExecutor();
+  const execution = new Execution({
+    executor,
+    ast: parseExpression(expression),
+    context,
+    debug,
+  });
+  return execution;
+};
+
+describe('Execution abortion tests', () => {
+  test('can abort an expression immediately', async () => {
+    const execution = createExecution('sleep 10');
+
+    execution.start();
+    execution.cancel();
+
+    const result = await execution.result;
+
+    expect(result).toMatchObject({
+      type: 'error',
+      error: {
+        message: 'The expression was aborted.',
+        name: 'AbortError',
+      },
+    });
+  });
+
+  test('can abort an expression which has function running mid flight', async () => {
+    const execution = createExecution('sleep 300');
+
+    execution.start();
+    jest.advanceTimersByTime(100);
+    execution.cancel();
+
+    const result = await execution.result;
+
+    expect(result).toMatchObject({
+      type: 'error',
+      error: {
+        message: 'The expression was aborted.',
+        name: 'AbortError',
+      },
+    });
+  });
+
+  test('cancelling execution after it completed has no effect', async () => {
+    jest.useRealTimers();
+
+    const execution = createExecution('sleep 1');
+
+    execution.start();
+
+    const result = await execution.result;
+
+    execution.cancel();
+
+    expect(result).toBe(null);
+
+    jest.useFakeTimers();
+  });
+});
diff --git a/src/plugins/expressions/common/execution/execution.ts b/src/plugins/expressions/common/execution/execution.ts
index d0ab178296408a..6ee12d97a64226 100644
--- a/src/plugins/expressions/common/execution/execution.ts
+++ b/src/plugins/expressions/common/execution/execution.ts
@@ -22,7 +22,7 @@ import { Executor } from '../executor';
 import { createExecutionContainer, ExecutionContainer } from './container';
 import { createError } from '../util';
 import { Defer, now } from '../../../kibana_utils/common';
-import { AbortError } from '../../../data/common';
+import { toPromise } from '../../../data/common/utils/abort_utils';
 import { RequestAdapter, DataAdapter } from '../../../inspector/common';
 import { isExpressionValueError, ExpressionValueError } from '../expression_types/specs/error';
 import {
@@ -38,6 +38,12 @@ import { ArgumentType, ExpressionFunction } from '../expression_functions';
 import { getByAlias } from '../util/get_by_alias';
 import { ExecutionContract } from './execution_contract';
 
+const createAbortErrorValue = () =>
+  createError({
+    message: 'The expression was aborted.',
+    name: 'AbortError',
+  });
+
 export interface ExecutionParams<
   ExtraContext extends Record<string, unknown> = Record<string, unknown>
 > {
@@ -70,7 +76,7 @@ export class Execution<
   /**
    * Dynamic state of the execution.
    */
-  public readonly state: ExecutionContainer<Output>;
+  public readonly state: ExecutionContainer<Output | ExpressionValueError>;
 
   /**
    * Initial input of the execution.
@@ -91,6 +97,18 @@ export class Execution<
    */
   private readonly abortController = new AbortController();
 
+  /**
+   * Promise that rejects if/when abort controller sends "abort" signal.
+   */
+  private readonly abortRejection = toPromise(this.abortController.signal, true);
+
+  /**
+   * Races a given promise against the "abort" event of `abortController`.
+   */
+  private race<T>(promise: Promise<T>): Promise<T> {
+    return Promise.race<T>([this.abortRejection, promise]);
+  }
+
   /**
    * Whether .start() method has been called.
    */
@@ -99,7 +117,7 @@ export class Execution<
   /**
    * Future that tracks result or error of this execution.
    */
-  private readonly firstResultFuture = new Defer<Output>();
+  private readonly firstResultFuture = new Defer<Output | ExpressionValueError>();
 
   /**
    * Contract is a public representation of `Execution` instances. Contract we
@@ -114,7 +132,7 @@ export class Execution<
 
   public readonly expression: string;
 
-  public get result(): Promise<unknown> {
+  public get result(): Promise<Output | ExpressionValueError> {
     return this.firstResultFuture.promise;
   }
 
@@ -134,7 +152,7 @@ export class Execution<
     this.expression = params.expression || formatExpression(params.ast!);
     const ast = params.ast || parseExpression(this.expression);
 
-    this.state = createExecutionContainer<Output>({
+    this.state = createExecutionContainer<Output | ExpressionValueError>({
       ...executor.state.get(),
       state: 'not-started',
       ast,
@@ -173,7 +191,12 @@ export class Execution<
     this.state.transitions.start();
 
     const { resolve, reject } = this.firstResultFuture;
-    this.invokeChain(this.state.get().ast.chain, input).then(resolve, reject);
+    const chainPromise = this.invokeChain(this.state.get().ast.chain, input);
+
+    this.race(chainPromise).then(resolve, error => {
+      if (this.abortController.signal.aborted) resolve(createAbortErrorValue());
+      else reject(error);
+    });
 
     this.firstResultFuture.promise.then(
       result => {
@@ -189,11 +212,6 @@ export class Execution<
     if (!chainArr.length) return input;
 
     for (const link of chainArr) {
-      // if execution was aborted return error
-      if (this.context.abortSignal && this.context.abortSignal.aborted) {
-        return createError(new AbortError('The expression was aborted.'));
-      }
-
       const { function: fnName, arguments: fnArgs } = link;
       const fn = getByAlias(this.state.get().functions, fnName);
 
@@ -207,10 +225,10 @@ export class Execution<
       try {
         // `resolveArgs` returns an object because the arguments themselves might
         // actually have a `then` function which would be treated as a `Promise`.
-        const { resolvedArgs } = await this.resolveArgs(fn, input, fnArgs);
+        const { resolvedArgs } = await this.race(this.resolveArgs(fn, input, fnArgs));
         args = resolvedArgs;
         timeStart = this.params.debug ? now() : 0;
-        const output = await this.invokeFunction(fn, input, resolvedArgs);
+        const output = await this.race(this.invokeFunction(fn, input, resolvedArgs));
 
         if (this.params.debug) {
           const timeEnd: number = now();
@@ -256,7 +274,7 @@ export class Execution<
     args: Record<string, unknown>
   ): Promise<any> {
     const normalizedInput = this.cast(input, fn.inputTypes);
-    const output = await fn.fn(normalizedInput, args, this.context);
+    const output = await this.race(fn.fn(normalizedInput, args, this.context));
 
     // Validate that the function returned the type it said it would.
     // This isn't required, but it keeps function developers honest.
diff --git a/src/plugins/expressions/common/expression_types/specs/error.ts b/src/plugins/expressions/common/expression_types/specs/error.ts
index 4b255a0f967b26..35554954d08282 100644
--- a/src/plugins/expressions/common/expression_types/specs/error.ts
+++ b/src/plugins/expressions/common/expression_types/specs/error.ts
@@ -31,7 +31,7 @@ export type ExpressionValueError = ExpressionValueBoxed<
       name?: string;
       stack?: string;
     };
-    info: unknown;
+    info?: unknown;
   }
 >;
 
diff --git a/src/plugins/expressions/common/util/create_error.ts b/src/plugins/expressions/common/util/create_error.ts
index 8236ff8709a823..bc27b0eda49598 100644
--- a/src/plugins/expressions/common/util/create_error.ts
+++ b/src/plugins/expressions/common/util/create_error.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 
+import { ExpressionValueError } from '../../public';
+
 type ErrorLike = Partial<Pick<Error, 'name' | 'message' | 'stack'>>;
 
-export const createError = (err: string | ErrorLike) => ({
+export const createError = (err: string | ErrorLike): ExpressionValueError => ({
   type: 'error',
   error: {
     stack:
@@ -28,7 +30,7 @@ export const createError = (err: string | ErrorLike) => ({
         : typeof err === 'object'
         ? err.stack
         : undefined,
-    message: typeof err === 'string' ? err : err.message,
+    message: typeof err === 'string' ? err : String(err.message),
     name: typeof err === 'object' ? err.name || 'Error' : 'Error',
   },
 });

From f7f245f4bc6630149c5867f626a042e33f59a158 Mon Sep 17 00:00:00 2001
From: Paul Tavares <56442535+paul-tavares@users.noreply.github.com>
Date: Tue, 28 Apr 2020 11:31:06 -0400
Subject: [PATCH 08/17] [Endpoint] Bug fixes to Policy List and Details views
 (#64568)

* Fix Datasource API calls to use correct object type in kuery
* Fix policy details showing toaster multiple times
* Fix taking last url param value (instead of first)
---
 .../endpoint/store/policy_list/index.test.ts  | 35 +++++++++++++++----
 .../endpoint/store/policy_list/selectors.ts   | 10 ++++--
 .../store/policy_list/services/ingest.test.ts |  5 +--
 .../store/policy_list/services/ingest.ts      |  3 +-
 .../endpoint/view/policy/policy_details.tsx   |  4 +--
 5 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/index.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/index.test.ts
index 69b11fb3c1f0ea..9912c9a81e6e14 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/index.test.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/index.test.ts
@@ -16,6 +16,7 @@ import { setPolicyListApiMockImplementation } from './test_mock_utils';
 import { INGEST_API_DATASOURCES } from './services/ingest';
 import { Immutable } from '../../../../../common/types';
 import { createSpyMiddleware, MiddlewareActionSpyHelper } from '../test_utils';
+import { DATASOURCE_SAVED_OBJECT_TYPE } from '../../../../../../ingest_manager/common';
 
 describe('policy list store concerns', () => {
   let fakeCoreStart: ReturnType<typeof coreMock.createStart>;
@@ -121,7 +122,11 @@ describe('policy list store concerns', () => {
     });
     await waitForAction('serverReturnedPolicyListData');
     expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_DATASOURCES, {
-      query: { kuery: 'datasources.package.name: endpoint', page: 1, perPage: 10 },
+      query: {
+        kuery: `${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+        page: 1,
+        perPage: 10,
+      },
     });
   });
 
@@ -140,7 +145,11 @@ describe('policy list store concerns', () => {
       dispatchUserChangedUrl('?page_size=50&page_index=0');
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_DATASOURCES, {
-        query: { kuery: 'datasources.package.name: endpoint', page: 1, perPage: 50 },
+        query: {
+          kuery: `${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          page: 1,
+          perPage: 50,
+        },
       });
     });
     it('uses defaults for params not in url', async () => {
@@ -159,21 +168,33 @@ describe('policy list store concerns', () => {
       dispatchUserChangedUrl('?page_size=-50&page_index=-99');
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_DATASOURCES, {
-        query: { kuery: 'datasources.package.name: endpoint', page: 1, perPage: 10 },
+        query: {
+          kuery: `${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          page: 1,
+          perPage: 10,
+        },
       });
     });
     it('it ignores non-numeric values for page_index and page_size', async () => {
       dispatchUserChangedUrl('?page_size=fifty&page_index=ten');
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_DATASOURCES, {
-        query: { kuery: 'datasources.package.name: endpoint', page: 1, perPage: 10 },
+        query: {
+          kuery: `${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          page: 1,
+          perPage: 10,
+        },
       });
     });
     it('accepts only known values for `page_size`', async () => {
       dispatchUserChangedUrl('?page_size=300&page_index=10');
       await waitForAction('serverReturnedPolicyListData');
       expect(fakeCoreStart.http.get).toHaveBeenCalledWith(INGEST_API_DATASOURCES, {
-        query: { kuery: 'datasources.package.name: endpoint', page: 11, perPage: 10 },
+        query: {
+          kuery: `${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
+          page: 11,
+          perPage: 10,
+        },
       });
     });
     it(`ignores unknown url search params`, async () => {
@@ -186,8 +207,8 @@ describe('policy list store concerns', () => {
     it(`uses last param value if param is defined multiple times`, async () => {
       dispatchUserChangedUrl('?page_size=20&page_size=50&page_index=20&page_index=40');
       expect(urlSearchParams(getState())).toEqual({
-        page_index: 20,
-        page_size: 20,
+        page_index: 40,
+        page_size: 50,
       });
     });
   });
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts
index 6d2e952fa07bba..4986a342cca19e 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/selectors.ts
@@ -46,12 +46,16 @@ export const urlSearchParams: (
   const query = parse(location.search);
 
   // Search params can appear multiple times in the URL, in which case the value for them,
-  // once parsed, would be an array. In these case, we take the first value defined
+  // once parsed, would be an array. In these case, we take the last value defined
   searchParams.page_index = Number(
-    (Array.isArray(query.page_index) ? query.page_index[0] : query.page_index) ?? 0
+    (Array.isArray(query.page_index)
+      ? query.page_index[query.page_index.length - 1]
+      : query.page_index) ?? 0
   );
   searchParams.page_size = Number(
-    (Array.isArray(query.page_size) ? query.page_size[0] : query.page_size) ?? 10
+    (Array.isArray(query.page_size)
+      ? query.page_size[query.page_size.length - 1]
+      : query.page_size) ?? 10
   );
 
   // If pageIndex is not a valid positive integer, set it to 0
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.test.ts
index c2865d36c95f2d..46f4c09e05a745 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.test.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.test.ts
@@ -6,6 +6,7 @@
 
 import { sendGetDatasource, sendGetEndpointSpecificDatasources } from './ingest';
 import { httpServiceMock } from '../../../../../../../../../src/core/public/mocks';
+import { DATASOURCE_SAVED_OBJECT_TYPE } from '../../../../../../../ingest_manager/common';
 
 describe('ingest service', () => {
   let http: ReturnType<typeof httpServiceMock.createStartContract>;
@@ -19,7 +20,7 @@ describe('ingest service', () => {
       await sendGetEndpointSpecificDatasources(http);
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/datasources', {
         query: {
-          kuery: 'datasources.package.name: endpoint',
+          kuery: `${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
         },
       });
     });
@@ -29,7 +30,7 @@ describe('ingest service', () => {
       });
       expect(http.get).toHaveBeenCalledWith('/api/ingest_manager/datasources', {
         query: {
-          kuery: 'someValueHere and datasources.package.name: endpoint',
+          kuery: `someValueHere and ${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
           perPage: 10,
           page: 1,
         },
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.ts
index 4356517e43c2cb..5c27680d6a35c7 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_list/services/ingest.ts
@@ -8,6 +8,7 @@ import { HttpFetchOptions, HttpStart } from 'kibana/public';
 import {
   GetDatasourcesRequest,
   GetAgentStatusResponse,
+  DATASOURCE_SAVED_OBJECT_TYPE,
 } from '../../../../../../../ingest_manager/common';
 import { GetPolicyListResponse, GetPolicyResponse, UpdatePolicyResponse } from '../../../types';
 import { NewPolicyData } from '../../../../../../common/types';
@@ -33,7 +34,7 @@ export const sendGetEndpointSpecificDatasources = (
       ...options.query,
       kuery: `${
         options?.query?.kuery ? options.query.kuery + ' and ' : ''
-      }datasources.package.name: endpoint`,
+      }${DATASOURCE_SAVED_OBJECT_TYPE}.package.name: endpoint`,
     },
   });
 };
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
index ea9eb292dba1a9..d9bb7eabcf7b02 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
@@ -52,7 +52,7 @@ export const PolicyDetails = React.memo(() => {
   const [showConfirm, setShowConfirm] = useState<boolean>(false);
   const policyName = policyItem?.name ?? '';
 
-  // Handle showing udpate statuses
+  // Handle showing update statuses
   useEffect(() => {
     if (policyUpdateStatus) {
       if (policyUpdateStatus.success) {
@@ -79,7 +79,7 @@ export const PolicyDetails = React.memo(() => {
         });
       }
     }
-  }, [notifications.toasts, policyItem, policyName, policyUpdateStatus]);
+  }, [notifications.toasts, policyName, policyUpdateStatus]);
 
   const handleBackToListOnClick = useNavigateByRouterEventHandler('/policy');
 

From 4a04adf8124b265f0407161391623bbcc7ee0e92 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Tue, 28 Apr 2020 08:33:32 -0700
Subject: [PATCH 09/17] [Metrics UI] Fixes for editing alerts in alert
 management (#64597)

* [Metrics UI] Fixes for editing alerts in alert management

* Change EuiFieldSearch to use onChange instead of onSearch

* Fixing groupBy

* Fixing the correct groupBy
---
 .../alerting/metrics/expression.tsx           | 103 ++++++++++--------
 1 file changed, 59 insertions(+), 44 deletions(-)

diff --git a/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx b/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
index cdefffeb35c156..d4d53b81109c61 100644
--- a/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
+++ b/x-pack/plugins/infra/public/components/alerting/metrics/expression.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { useCallback, useMemo, useEffect, useState } from 'react';
+import React, { ChangeEvent, useCallback, useMemo, useEffect, useState } from 'react';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -13,6 +13,7 @@ import {
   EuiText,
   EuiFormRow,
   EuiButtonEmpty,
+  EuiFieldSearch,
 } from '@elastic/eui';
 import { IFieldType } from 'src/plugins/data/public';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -147,7 +148,7 @@ export const Expressions: React.FC<Props> = props => {
 
   const onGroupByChange = useCallback(
     (group: string | null) => {
-      setAlertParams('groupBy', group || undefined);
+      setAlertParams('groupBy', group || '');
     },
     [setAlertParams]
   );
@@ -215,10 +216,20 @@ export const Expressions: React.FC<Props> = props => {
       }
       setAlertParams('sourceId', source?.id);
     } else {
-      setAlertParams('criteria', [defaultExpression]);
+      if (!alertParams.criteria) {
+        setAlertParams('criteria', [defaultExpression]);
+      }
+      if (!alertParams.sourceId) {
+        setAlertParams('sourceId', source?.id || 'default');
+      }
     }
   }, [alertsContext.metadata, defaultExpression, source]); // eslint-disable-line react-hooks/exhaustive-deps
 
+  const handleFieldSearchChange = useCallback(
+    (e: ChangeEvent<HTMLInputElement>) => onFilterQuerySubmit(e.target.value),
+    [onFilterQuerySubmit]
+  );
+
   return (
     <>
       <EuiSpacer size={'m'} />
@@ -273,48 +284,52 @@ export const Expressions: React.FC<Props> = props => {
 
       <EuiSpacer size={'m'} />
 
-      {alertsContext.metadata && (
-        <>
-          <EuiFormRow
-            label={i18n.translate('xpack.infra.metrics.alertFlyout.filterLabel', {
-              defaultMessage: 'Filter (optional)',
-            })}
-            helpText={i18n.translate('xpack.infra.metrics.alertFlyout.filterHelpText', {
-              defaultMessage: 'Use a KQL expression to limit the scope of your alert trigger.',
-            })}
-            fullWidth
-            compressed
-          >
-            <MetricsExplorerKueryBar
-              derivedIndexPattern={derivedIndexPattern}
-              onSubmit={onFilterQuerySubmit}
-              value={alertParams.filterQuery}
-            />
-          </EuiFormRow>
-
-          <EuiSpacer size={'m'} />
-          <EuiFormRow
-            label={i18n.translate('xpack.infra.metrics.alertFlyout.createAlertPerText', {
-              defaultMessage: 'Create alert per (optional)',
-            })}
-            helpText={i18n.translate('xpack.infra.metrics.alertFlyout.createAlertPerHelpText', {
-              defaultMessage:
-                'Create an alert for every unique value. For example: "host.id" or "cloud.region".',
-            })}
+      <EuiFormRow
+        label={i18n.translate('xpack.infra.metrics.alertFlyout.filterLabel', {
+          defaultMessage: 'Filter (optional)',
+        })}
+        helpText={i18n.translate('xpack.infra.metrics.alertFlyout.filterHelpText', {
+          defaultMessage: 'Use a KQL expression to limit the scope of your alert trigger.',
+        })}
+        fullWidth
+        compressed
+      >
+        {(alertsContext.metadata && (
+          <MetricsExplorerKueryBar
+            derivedIndexPattern={derivedIndexPattern}
+            onSubmit={onFilterQuerySubmit}
+            value={alertParams.filterQuery}
+          />
+        )) || (
+          <EuiFieldSearch
+            onChange={handleFieldSearchChange}
+            value={alertParams.filterQuery}
             fullWidth
-            compressed
-          >
-            <MetricsExplorerGroupBy
-              onChange={onGroupByChange}
-              fields={derivedIndexPattern.fields}
-              options={{
-                ...options,
-                groupBy: alertParams.groupBy || undefined,
-              }}
-            />
-          </EuiFormRow>
-        </>
-      )}
+          />
+        )}
+      </EuiFormRow>
+
+      <EuiSpacer size={'m'} />
+      <EuiFormRow
+        label={i18n.translate('xpack.infra.metrics.alertFlyout.createAlertPerText', {
+          defaultMessage: 'Create alert per (optional)',
+        })}
+        helpText={i18n.translate('xpack.infra.metrics.alertFlyout.createAlertPerHelpText', {
+          defaultMessage:
+            'Create an alert for every unique value. For example: "host.id" or "cloud.region".',
+        })}
+        fullWidth
+        compressed
+      >
+        <MetricsExplorerGroupBy
+          onChange={onGroupByChange}
+          fields={derivedIndexPattern.fields}
+          options={{
+            ...options,
+            groupBy: alertParams.groupBy || undefined,
+          }}
+        />
+      </EuiFormRow>
     </>
   );
 };

From 36b4864b66d110fc14d97dbde548d4e172f5bfc6 Mon Sep 17 00:00:00 2001
From: Aleh Zasypkin <aleh.zasypkin@gmail.com>
Date: Tue, 28 Apr 2020 18:00:31 +0200
Subject: [PATCH 10/17] Introduce Access Agreement UI. (#63563)

Co-authored-by: Ryan Keairns <contactryank@gmail.com>
---
 .../common/licensing/license_features.ts      |   5 +
 .../common/licensing/license_service.test.ts  |  14 +-
 .../common/licensing/license_service.ts       |   3 +
 .../security/{public => common}/types.ts      |  10 +-
 .../access_agreement_page.test.tsx.snap       |  30 +++
 .../_access_agreement_page.scss               |  21 ++
 .../access_agreement/_index.scss              |   1 +
 .../access_agreement_app.test.ts              |  62 +++++
 .../access_agreement/access_agreement_app.ts  |  38 +++
 .../access_agreement_page.test.tsx            | 160 +++++++++++++
 .../access_agreement_page.tsx                 | 133 +++++++++++
 .../authentication/access_agreement/index.ts  |   7 +
 .../authentication/authentication_service.ts  |   2 +
 .../authentication_state_page.test.tsx.snap   |   4 +-
 .../authentication_state_page.test.tsx        |  10 +
 .../authentication_state_page.tsx             |   5 +-
 .../overwritten_session_page.test.tsx.snap    |   6 +-
 x-pack/plugins/security/public/index.ts       |   1 -
 .../public/session/session_timeout.test.tsx   |   7 +
 .../public/session/session_timeout.tsx        |   4 +-
 .../server/audit/audit_logger.test.ts         |  20 +-
 .../security/server/audit/audit_logger.ts     |   9 +
 .../security/server/audit/index.mock.ts       |   1 +
 .../authentication/authenticator.test.ts      | 225 +++++++++++++++++-
 .../server/authentication/authenticator.ts    | 139 +++++++++--
 .../server/authentication/index.mock.ts       |   1 +
 .../server/authentication/index.test.ts       |   4 +
 .../security/server/authentication/index.ts   |   9 +-
 x-pack/plugins/security/server/config.test.ts |  45 +---
 x-pack/plugins/security/server/config.ts      |  19 +-
 x-pack/plugins/security/server/plugin.test.ts |   4 -
 x-pack/plugins/security/server/plugin.ts      |  25 +-
 .../routes/authentication/common.test.ts      |  60 +++++
 .../server/routes/authentication/common.ts    |  30 ++-
 .../server/routes/licensed_route_handler.ts   |  18 +-
 .../routes/users/change_password.test.ts      |   2 +-
 .../routes/views/access_agreement.test.ts     | 177 ++++++++++++++
 .../server/routes/views/access_agreement.ts   |  64 +++++
 .../server/routes/views/index.test.ts         |  15 +-
 .../security/server/routes/views/index.ts     |   2 +
 .../server/routes/views/logged_out.test.ts    |   2 +-
 .../server/routes/views/login.test.ts         |   1 +
 .../api_integration/apis/security/session.ts  |   2 +-
 43 files changed, 1297 insertions(+), 100 deletions(-)
 rename x-pack/plugins/security/{public => common}/types.ts (65%)
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/__snapshots__/access_agreement_page.test.tsx.snap
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/_access_agreement_page.scss
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/_index.scss
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
 create mode 100644 x-pack/plugins/security/public/authentication/access_agreement/index.ts
 create mode 100644 x-pack/plugins/security/server/routes/views/access_agreement.test.ts
 create mode 100644 x-pack/plugins/security/server/routes/views/access_agreement.ts

diff --git a/x-pack/plugins/security/common/licensing/license_features.ts b/x-pack/plugins/security/common/licensing/license_features.ts
index 5184ab0e962bd2..571d2630b2b177 100644
--- a/x-pack/plugins/security/common/licensing/license_features.ts
+++ b/x-pack/plugins/security/common/licensing/license_features.ts
@@ -33,6 +33,11 @@ export interface SecurityLicenseFeatures {
    */
   readonly showRoleMappingsManagement: boolean;
 
+  /**
+   * Indicates whether we allow users to access agreement UI and acknowledge it.
+   */
+  readonly allowAccessAgreement: boolean;
+
   /**
    * Indicates whether we allow users to define document level security in roles.
    */
diff --git a/x-pack/plugins/security/common/licensing/license_service.test.ts b/x-pack/plugins/security/common/licensing/license_service.test.ts
index 5bdfa7d4886aac..9dec665614635f 100644
--- a/x-pack/plugins/security/common/licensing/license_service.test.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.test.ts
@@ -18,6 +18,7 @@ describe('license features', function() {
       allowLogin: false,
       showLinks: false,
       showRoleMappingsManagement: false,
+      allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       layout: 'error-es-unavailable',
@@ -37,6 +38,7 @@ describe('license features', function() {
       allowLogin: false,
       showLinks: false,
       showRoleMappingsManagement: false,
+      allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       layout: 'error-xpack-unavailable',
@@ -60,6 +62,7 @@ describe('license features', function() {
       expect(subscriptionHandler.mock.calls[0]).toMatchInlineSnapshot(`
         Array [
           Object {
+            "allowAccessAgreement": false,
             "allowLogin": false,
             "allowRbac": false,
             "allowRoleDocumentLevelSecurity": false,
@@ -78,6 +81,7 @@ describe('license features', function() {
       expect(subscriptionHandler.mock.calls[1]).toMatchInlineSnapshot(`
         Array [
           Object {
+            "allowAccessAgreement": true,
             "allowLogin": true,
             "allowRbac": true,
             "allowRoleDocumentLevelSecurity": true,
@@ -94,7 +98,7 @@ describe('license features', function() {
     }
   });
 
-  it('should show login page and other security elements, allow RBAC but forbid role mappings, DLS, and sub-feature privileges if license is basic.', () => {
+  it('should show login page and other security elements, allow RBAC but forbid paid features if license is basic.', () => {
     const mockRawLicense = licensingMock.createLicense({
       features: { security: { isEnabled: true, isAvailable: true } },
     });
@@ -109,6 +113,7 @@ describe('license features', function() {
       allowLogin: true,
       showLinks: true,
       showRoleMappingsManagement: false,
+      allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: true,
@@ -131,6 +136,7 @@ describe('license features', function() {
       allowLogin: false,
       showLinks: false,
       showRoleMappingsManagement: false,
+      allowAccessAgreement: false,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: false,
@@ -138,7 +144,7 @@ describe('license features', function() {
     });
   });
 
-  it('should allow role mappings and sub-feature privileges, but not DLS/FLS if license = gold', () => {
+  it('should allow role mappings, access agreement and sub-feature privileges, but not DLS/FLS if license = gold', () => {
     const mockRawLicense = licensingMock.createLicense({
       license: { mode: 'gold', type: 'gold' },
       features: { security: { isEnabled: true, isAvailable: true } },
@@ -152,6 +158,7 @@ describe('license features', function() {
       allowLogin: true,
       showLinks: true,
       showRoleMappingsManagement: true,
+      allowAccessAgreement: true,
       allowRoleDocumentLevelSecurity: false,
       allowRoleFieldLevelSecurity: false,
       allowRbac: true,
@@ -159,7 +166,7 @@ describe('license features', function() {
     });
   });
 
-  it('should allow to login, allow RBAC, role mappings, sub-feature privileges, and DLS if license >= platinum', () => {
+  it('should allow to login, allow RBAC, role mappings, access agreement, sub-feature privileges, and DLS if license >= platinum', () => {
     const mockRawLicense = licensingMock.createLicense({
       license: { mode: 'platinum', type: 'platinum' },
       features: { security: { isEnabled: true, isAvailable: true } },
@@ -173,6 +180,7 @@ describe('license features', function() {
       allowLogin: true,
       showLinks: true,
       showRoleMappingsManagement: true,
+      allowAccessAgreement: true,
       allowRoleDocumentLevelSecurity: true,
       allowRoleFieldLevelSecurity: true,
       allowRbac: true,
diff --git a/x-pack/plugins/security/common/licensing/license_service.ts b/x-pack/plugins/security/common/licensing/license_service.ts
index 34bc44b88e40d9..7815798d6a9f3d 100644
--- a/x-pack/plugins/security/common/licensing/license_service.ts
+++ b/x-pack/plugins/security/common/licensing/license_service.ts
@@ -71,6 +71,7 @@ export class SecurityLicenseService {
         allowLogin: false,
         showLinks: false,
         showRoleMappingsManagement: false,
+        allowAccessAgreement: false,
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
         allowRbac: false,
@@ -88,6 +89,7 @@ export class SecurityLicenseService {
         allowLogin: false,
         showLinks: false,
         showRoleMappingsManagement: false,
+        allowAccessAgreement: false,
         allowRoleDocumentLevelSecurity: false,
         allowRoleFieldLevelSecurity: false,
         allowRbac: false,
@@ -102,6 +104,7 @@ export class SecurityLicenseService {
       allowLogin: true,
       showLinks: true,
       showRoleMappingsManagement: isLicenseGoldOrBetter,
+      allowAccessAgreement: isLicenseGoldOrBetter,
       allowSubFeaturePrivileges: isLicenseGoldOrBetter,
       // Only platinum and trial licenses are compliant with field- and document-level security.
       allowRoleDocumentLevelSecurity: isLicensePlatinumOrBetter,
diff --git a/x-pack/plugins/security/public/types.ts b/x-pack/plugins/security/common/types.ts
similarity index 65%
rename from x-pack/plugins/security/public/types.ts
rename to x-pack/plugins/security/common/types.ts
index e9c4b6e281cf3e..c668c6ccf71d16 100644
--- a/x-pack/plugins/security/public/types.ts
+++ b/x-pack/plugins/security/common/types.ts
@@ -4,9 +4,17 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+/**
+ * Type and name tuple to identify provider used to authenticate user.
+ */
+export interface AuthenticationProvider {
+  type: string;
+  name: string;
+}
+
 export interface SessionInfo {
   now: number;
   idleTimeoutExpiration: number | null;
   lifespanExpiration: number | null;
-  provider: string;
+  provider: AuthenticationProvider;
 }
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/__snapshots__/access_agreement_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/access_agreement/__snapshots__/access_agreement_page.test.tsx.snap
new file mode 100644
index 00000000000000..2227cbe8a495cf
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/__snapshots__/access_agreement_page.test.tsx.snap
@@ -0,0 +1,30 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccessAgreementPage renders as expected when state is available 1`] = `
+<ReactMarkdown
+  astPlugins={Array []}
+  escapeHtml={true}
+  plugins={Array []}
+  rawSourcePos={false}
+  renderers={Object {}}
+  skipHtml={false}
+  sourcePos={false}
+  transformLinkUri={[Function]}
+>
+  <div
+    key="root-1-1"
+  >
+    <p
+      key="paragraph-1-1"
+    >
+      This is 
+      <a
+        href="../link"
+        key="link-1-9"
+      >
+        link
+      </a>
+    </p>
+  </div>
+</ReactMarkdown>
+`;
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/_access_agreement_page.scss b/x-pack/plugins/security/public/authentication/access_agreement/_access_agreement_page.scss
new file mode 100644
index 00000000000000..08e7be248619f0
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/_access_agreement_page.scss
@@ -0,0 +1,21 @@
+.secAccessAgreementPage .secAuthenticationStatePage__content {
+  max-width: 600px;
+}
+
+.secAccessAgreementPage__textWrapper {
+  overflow-y: hidden;
+}
+
+.secAccessAgreementPage__text {
+  @include euiYScrollWithShadows;
+  max-height: 400px;
+  padding: $euiSize $euiSizeL 0;
+}
+
+.secAccessAgreementPage__footer {
+  padding: $euiSize $euiSizeL $euiSizeL;
+}
+
+.secAccessAgreementPage__footerInner {
+  text-align: left;
+}
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/_index.scss b/x-pack/plugins/security/public/authentication/access_agreement/_index.scss
new file mode 100644
index 00000000000000..dbab8347b096f1
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/_index.scss
@@ -0,0 +1 @@
+@import './access_agreement_page';
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.ts
new file mode 100644
index 00000000000000..add2db6a3c170d
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.test.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.
+ */
+
+jest.mock('./access_agreement_page');
+
+import { AppMount, ScopedHistory } from 'src/core/public';
+import { accessAgreementApp } from './access_agreement_app';
+
+import { coreMock, scopedHistoryMock } from '../../../../../../src/core/public/mocks';
+
+describe('accessAgreementApp', () => {
+  it('properly registers application', () => {
+    const coreSetupMock = coreMock.createSetup();
+
+    accessAgreementApp.create({
+      application: coreSetupMock.application,
+      getStartServices: coreSetupMock.getStartServices,
+    });
+
+    expect(coreSetupMock.application.register).toHaveBeenCalledTimes(1);
+
+    const [[appRegistration]] = coreSetupMock.application.register.mock.calls;
+    expect(appRegistration).toEqual({
+      id: 'security_access_agreement',
+      chromeless: true,
+      appRoute: '/security/access_agreement',
+      title: 'Access Agreement',
+      mount: expect.any(Function),
+    });
+  });
+
+  it('properly renders application', async () => {
+    const coreSetupMock = coreMock.createSetup();
+    const coreStartMock = coreMock.createStart();
+    coreSetupMock.getStartServices.mockResolvedValue([coreStartMock, {}, {}]);
+    const containerMock = document.createElement('div');
+
+    accessAgreementApp.create({
+      application: coreSetupMock.application,
+      getStartServices: coreSetupMock.getStartServices,
+    });
+
+    const [[{ mount }]] = coreSetupMock.application.register.mock.calls;
+    await (mount as AppMount)({
+      element: containerMock,
+      appBasePath: '',
+      onAppLeave: jest.fn(),
+      history: (scopedHistoryMock.create() as unknown) as ScopedHistory,
+    });
+
+    const mockRenderApp = jest.requireMock('./access_agreement_page').renderAccessAgreementPage;
+    expect(mockRenderApp).toHaveBeenCalledTimes(1);
+    expect(mockRenderApp).toHaveBeenCalledWith(coreStartMock.i18n, containerMock, {
+      http: coreStartMock.http,
+      notifications: coreStartMock.notifications,
+      fatalErrors: coreStartMock.fatalErrors,
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
new file mode 100644
index 00000000000000..156a76542a28fb
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_app.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { StartServicesAccessor, ApplicationSetup, AppMountParameters } from 'src/core/public';
+
+interface CreateDeps {
+  application: ApplicationSetup;
+  getStartServices: StartServicesAccessor;
+}
+
+export const accessAgreementApp = Object.freeze({
+  id: 'security_access_agreement',
+  create({ application, getStartServices }: CreateDeps) {
+    application.register({
+      id: this.id,
+      title: i18n.translate('xpack.security.accessAgreementAppTitle', {
+        defaultMessage: 'Access Agreement',
+      }),
+      chromeless: true,
+      appRoute: '/security/access_agreement',
+      async mount({ element }: AppMountParameters) {
+        const [[coreStart], { renderAccessAgreementPage }] = await Promise.all([
+          getStartServices(),
+          import('./access_agreement_page'),
+        ]);
+        return renderAccessAgreementPage(coreStart.i18n, element, {
+          http: coreStart.http,
+          notifications: coreStart.notifications,
+          fatalErrors: coreStart.fatalErrors,
+        });
+      },
+    });
+  },
+});
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
new file mode 100644
index 00000000000000..89b7489d45ebb2
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.test.tsx
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React from 'react';
+import ReactMarkdown from 'react-markdown';
+import { EuiLoadingContent } from '@elastic/eui';
+import { act } from '@testing-library/react';
+import { mountWithIntl, nextTick } from 'test_utils/enzyme_helpers';
+import { findTestSubject } from 'test_utils/find_test_subject';
+import { coreMock } from '../../../../../../src/core/public/mocks';
+import { AccessAgreementPage } from './access_agreement_page';
+
+describe('AccessAgreementPage', () => {
+  beforeAll(() => {
+    Object.defineProperty(window, 'location', {
+      value: { href: 'http://some-host/bar', protocol: 'http' },
+      writable: true,
+    });
+  });
+
+  afterAll(() => {
+    delete (window as any).location;
+  });
+
+  it('renders as expected when state is available', async () => {
+    const coreStartMock = coreMock.createStart();
+    coreStartMock.http.get.mockResolvedValue({ accessAgreement: 'This is [link](../link)' });
+
+    const wrapper = mountWithIntl(
+      <AccessAgreementPage
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        fatalErrors={coreStartMock.fatalErrors}
+      />
+    );
+
+    expect(wrapper.exists(EuiLoadingContent)).toBe(true);
+    expect(wrapper.exists(ReactMarkdown)).toBe(false);
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(wrapper.find(ReactMarkdown)).toMatchSnapshot();
+    expect(wrapper.exists(EuiLoadingContent)).toBe(false);
+
+    expect(coreStartMock.http.get).toHaveBeenCalledTimes(1);
+    expect(coreStartMock.http.get).toHaveBeenCalledWith(
+      '/internal/security/access_agreement/state'
+    );
+    expect(coreStartMock.fatalErrors.add).not.toHaveBeenCalled();
+  });
+
+  it('fails when state is not available', async () => {
+    const coreStartMock = coreMock.createStart();
+    const error = Symbol();
+    coreStartMock.http.get.mockRejectedValue(error);
+
+    const wrapper = mountWithIntl(
+      <AccessAgreementPage
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        fatalErrors={coreStartMock.fatalErrors}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    expect(coreStartMock.http.get).toHaveBeenCalledTimes(1);
+    expect(coreStartMock.http.get).toHaveBeenCalledWith(
+      '/internal/security/access_agreement/state'
+    );
+    expect(coreStartMock.fatalErrors.add).toHaveBeenCalledTimes(1);
+    expect(coreStartMock.fatalErrors.add).toHaveBeenCalledWith(error);
+  });
+
+  it('properly redirects after successful acknowledgement', async () => {
+    const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+    coreStartMock.http.get.mockResolvedValue({ accessAgreement: 'This is [link](../link)' });
+    coreStartMock.http.post.mockResolvedValue(undefined);
+
+    window.location.href = `https://some-host/security/access_agreement?next=${encodeURIComponent(
+      '/some-base-path/app/kibana#/home?_g=()'
+    )}`;
+    const wrapper = mountWithIntl(
+      <AccessAgreementPage
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        fatalErrors={coreStartMock.fatalErrors}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    findTestSubject(wrapper, 'accessAgreementAcknowledge').simulate('click');
+
+    await act(async () => {
+      await nextTick();
+    });
+
+    expect(coreStartMock.http.post).toHaveBeenCalledTimes(1);
+    expect(coreStartMock.http.post).toHaveBeenCalledWith(
+      '/internal/security/access_agreement/acknowledge'
+    );
+
+    expect(window.location.href).toBe('/some-base-path/app/kibana#/home?_g=()');
+    expect(coreStartMock.notifications.toasts.addError).not.toHaveBeenCalled();
+  });
+
+  it('shows error toast if acknowledgement fails', async () => {
+    const currentURL = `https://some-host/login?next=${encodeURIComponent(
+      '/some-base-path/app/kibana#/home?_g=()'
+    )}`;
+
+    const failureReason = new Error('Oh no!');
+    const coreStartMock = coreMock.createStart({ basePath: '/some-base-path' });
+    coreStartMock.http.get.mockResolvedValue({ accessAgreement: 'This is [link](../link)' });
+    coreStartMock.http.post.mockRejectedValue(failureReason);
+
+    window.location.href = currentURL;
+    const wrapper = mountWithIntl(
+      <AccessAgreementPage
+        http={coreStartMock.http}
+        notifications={coreStartMock.notifications}
+        fatalErrors={coreStartMock.fatalErrors}
+      />
+    );
+
+    await act(async () => {
+      await nextTick();
+      wrapper.update();
+    });
+
+    findTestSubject(wrapper, 'accessAgreementAcknowledge').simulate('click');
+
+    await act(async () => {
+      await nextTick();
+    });
+
+    expect(coreStartMock.http.post).toHaveBeenCalledTimes(1);
+    expect(coreStartMock.http.post).toHaveBeenCalledWith(
+      '/internal/security/access_agreement/acknowledge'
+    );
+
+    expect(window.location.href).toBe(currentURL);
+    expect(coreStartMock.notifications.toasts.addError).toHaveBeenCalledWith(failureReason, {
+      title: 'Could not acknowledge access agreement.',
+    });
+  });
+});
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
new file mode 100644
index 00000000000000..0315e229c678b9
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/access_agreement_page.tsx
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import './_index.scss';
+
+import React, { FormEvent, MouseEvent, useCallback, useEffect, useState } from 'react';
+import ReactDOM from 'react-dom';
+import ReactMarkdown from 'react-markdown';
+import {
+  EuiButton,
+  EuiPanel,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLoadingContent,
+  EuiSpacer,
+  EuiText,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { CoreStart, FatalErrorsStart, HttpStart, NotificationsStart } from 'src/core/public';
+
+import { parseNext } from '../../../common/parse_next';
+import { AuthenticationStatePage } from '../components';
+
+interface Props {
+  http: HttpStart;
+  notifications: NotificationsStart;
+  fatalErrors: FatalErrorsStart;
+}
+
+export function AccessAgreementPage({ http, fatalErrors, notifications }: Props) {
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  const [accessAgreement, setAccessAgreement] = useState<string | null>(null);
+  useEffect(() => {
+    http
+      .get<{ accessAgreement: string }>('/internal/security/access_agreement/state')
+      .then(response => setAccessAgreement(response.accessAgreement))
+      .catch(err => fatalErrors.add(err));
+  }, [http, fatalErrors]);
+
+  const onAcknowledge = useCallback(
+    async (e: MouseEvent<HTMLButtonElement> | FormEvent<HTMLFormElement>) => {
+      e.preventDefault();
+
+      try {
+        setIsLoading(true);
+        await http.post('/internal/security/access_agreement/acknowledge');
+        window.location.href = parseNext(window.location.href, http.basePath.serverBasePath);
+      } catch (err) {
+        notifications.toasts.addError(err, {
+          title: i18n.translate('xpack.security.accessAgreement.acknowledgeErrorMessage', {
+            defaultMessage: 'Could not acknowledge access agreement.',
+          }),
+        });
+
+        setIsLoading(false);
+      }
+    },
+    [http, notifications]
+  );
+
+  const content = accessAgreement ? (
+    <form onSubmit={onAcknowledge}>
+      <EuiPanel paddingSize="none">
+        <EuiFlexGroup gutterSize="none" direction="column">
+          <EuiFlexItem className="secAccessAgreementPage__textWrapper">
+            <div className="secAccessAgreementPage__text">
+              <EuiText textAlign="left">
+                <ReactMarkdown>{accessAgreement}</ReactMarkdown>
+              </EuiText>
+            </div>
+          </EuiFlexItem>
+          <EuiFlexItem className="secAccessAgreementPage__footer">
+            <div className="secAccessAgreementPage__footerInner">
+              <EuiButton
+                fill
+                type="submit"
+                color="primary"
+                onClick={onAcknowledge}
+                isDisabled={isLoading}
+                isLoading={isLoading}
+                data-test-subj="accessAgreementAcknowledge"
+              >
+                <FormattedMessage
+                  id="xpack.security.accessAgreement.acknowledgeButtonText"
+                  defaultMessage="Acknowledge and continue"
+                />
+              </EuiButton>
+            </div>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
+    </form>
+  ) : (
+    <EuiPanel paddingSize="l">
+      <EuiLoadingContent lines={10} />
+    </EuiPanel>
+  );
+
+  return (
+    <AuthenticationStatePage
+      className="secAccessAgreementPage"
+      title={
+        <FormattedMessage
+          id="xpack.security.accessAgreement.title"
+          defaultMessage="Access Agreement"
+        />
+      }
+    >
+      {content}
+      <EuiSpacer size="xxl" />
+    </AuthenticationStatePage>
+  );
+}
+
+export function renderAccessAgreementPage(
+  i18nStart: CoreStart['i18n'],
+  element: Element,
+  props: Props
+) {
+  ReactDOM.render(
+    <i18nStart.Context>
+      <AccessAgreementPage {...props} />
+    </i18nStart.Context>,
+    element
+  );
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+}
diff --git a/x-pack/plugins/security/public/authentication/access_agreement/index.ts b/x-pack/plugins/security/public/authentication/access_agreement/index.ts
new file mode 100644
index 00000000000000..8f7661a89a269d
--- /dev/null
+++ b/x-pack/plugins/security/public/authentication/access_agreement/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { accessAgreementApp } from './access_agreement_app';
diff --git a/x-pack/plugins/security/public/authentication/authentication_service.ts b/x-pack/plugins/security/public/authentication/authentication_service.ts
index 2e73b8cd044826..6657f5c0a900cf 100644
--- a/x-pack/plugins/security/public/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/public/authentication/authentication_service.ts
@@ -8,6 +8,7 @@ import { ApplicationSetup, StartServicesAccessor, HttpSetup } from 'src/core/pub
 import { AuthenticatedUser } from '../../common/model';
 import { ConfigType } from '../config';
 import { PluginStartDependencies } from '../plugin';
+import { accessAgreementApp } from './access_agreement';
 import { loginApp } from './login';
 import { logoutApp } from './logout';
 import { loggedOutApp } from './logged_out';
@@ -46,6 +47,7 @@ export class AuthenticationService {
       ((await http.get('/internal/security/api_key/_enabled')) as { apiKeysEnabled: boolean })
         .apiKeysEnabled;
 
+    accessAgreementApp.create({ application, getStartServices });
     loginApp.create({ application, config, getStartServices, http });
     logoutApp.create({ application, http });
     loggedOutApp.create({ application, getStartServices, http });
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/__snapshots__/authentication_state_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/components/authentication_state_page/__snapshots__/authentication_state_page.test.tsx.snap
index 3590fa460a4010..585dc368da7077 100644
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/__snapshots__/authentication_state_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/__snapshots__/authentication_state_page.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`AuthenticationStatePage renders 1`] = `
 <div
-  className="secAuthenticationStatePage"
+  className="secAuthenticationStatePage "
 >
   <header
     className="secAuthenticationStatePage__header"
@@ -18,7 +18,7 @@ exports[`AuthenticationStatePage renders 1`] = `
       >
         <EuiIcon
           size="xxl"
-          type="logoKibana"
+          type="logoElastic"
         />
       </span>
       <EuiTitle
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.test.tsx b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.test.tsx
index e1292c5b21536e..946c58a1c8e998 100644
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.test.tsx
+++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.test.tsx
@@ -18,4 +18,14 @@ describe('AuthenticationStatePage', () => {
       )
     ).toMatchSnapshot();
   });
+
+  it('renders with custom CSS class', () => {
+    expect(
+      shallowWithIntl(
+        <AuthenticationStatePage className="customClassName" title={'foo'}>
+          <span>hello world</span>
+        </AuthenticationStatePage>
+      ).exists('.secAuthenticationStatePage.customClassName')
+    ).toBe(true);
+  });
 });
diff --git a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
index 66176129407cd0..7567f455bcca67 100644
--- a/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
+++ b/x-pack/plugins/security/public/authentication/components/authentication_state_page/authentication_state_page.tsx
@@ -10,16 +10,17 @@ import { EuiIcon, EuiSpacer, EuiTitle } from '@elastic/eui';
 import React from 'react';
 
 interface Props {
+  className?: string;
   title: React.ReactNode;
 }
 
 export const AuthenticationStatePage: React.FC<Props> = props => (
-  <div className="secAuthenticationStatePage">
+  <div className={`secAuthenticationStatePage ${props.className || ''}`}>
     <header className="secAuthenticationStatePage__header">
       <div className="secAuthenticationStatePage__content eui-textCenter">
         <EuiSpacer size="xxl" />
         <span className="secAuthenticationStatePage__logo">
-          <EuiIcon type="logoKibana" size="xxl" />
+          <EuiIcon type="logoElastic" size="xxl" />
         </span>
         <EuiTitle size="l" className="secAuthenticationStatePage__title">
           <h1>{props.title}</h1>
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
index 2ff760891fa4e2..02b1a7d0d3fa03 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
@@ -11,7 +11,7 @@ exports[`OverwrittenSessionPage renders as expected 1`] = `
   }
 >
   <div
-    className="secAuthenticationStatePage"
+    className="secAuthenticationStatePage "
   >
     <header
       className="secAuthenticationStatePage__header"
@@ -31,10 +31,10 @@ exports[`OverwrittenSessionPage renders as expected 1`] = `
         >
           <EuiIcon
             size="xxl"
-            type="logoKibana"
+            type="logoElastic"
           >
             <div
-              data-euiicon-type="logoKibana"
+              data-euiicon-type="logoElastic"
               size="xxl"
             />
           </EuiIcon>
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
index 458f7ab801fdf9..fc4e158652a0ae 100644
--- a/x-pack/plugins/security/public/index.ts
+++ b/x-pack/plugins/security/public/index.ts
@@ -15,7 +15,6 @@ import {
 } from './plugin';
 
 export { SecurityPluginSetup, SecurityPluginStart };
-export { SessionInfo } from './types';
 export { AuthenticatedUser } from '../common/model';
 export { SecurityLicense, SecurityLicenseFeatures } from '../common/licensing';
 
diff --git a/x-pack/plugins/security/public/session/session_timeout.test.tsx b/x-pack/plugins/security/public/session/session_timeout.test.tsx
index eca3e7d6727df8..11aadcff377ef7 100644
--- a/x-pack/plugins/security/public/session/session_timeout.test.tsx
+++ b/x-pack/plugins/security/public/session/session_timeout.test.tsx
@@ -74,6 +74,7 @@ describe('Session Timeout', () => {
     now,
     idleTimeoutExpiration: now + 2 * 60 * 1000,
     lifespanExpiration: null,
+    provider: { type: 'basic', name: 'basic1' },
   };
   let notifications: ReturnType<typeof coreMock.createSetup>['notifications'];
   let http: ReturnType<typeof coreMock.createSetup>['http'];
@@ -192,6 +193,7 @@ describe('Session Timeout', () => {
         now,
         idleTimeoutExpiration: null,
         lifespanExpiration: now + 2 * 60 * 1000,
+        provider: { type: 'basic', name: 'basic1' },
       };
       http.fetch.mockResolvedValue(sessionInfo);
       await sessionTimeout.start();
@@ -225,6 +227,7 @@ describe('Session Timeout', () => {
         now,
         idleTimeoutExpiration: null,
         lifespanExpiration: now + 2 * 60 * 1000,
+        provider: { type: 'basic', name: 'basic1' },
       };
       http.fetch.mockResolvedValue(sessionInfo);
       await sessionTimeout.start();
@@ -251,6 +254,7 @@ describe('Session Timeout', () => {
         now: now + elapsed,
         idleTimeoutExpiration: now + elapsed + 2 * 60 * 1000,
         lifespanExpiration: null,
+        provider: { type: 'basic', name: 'basic1' },
       });
       await sessionTimeout.extend('/foo');
       expect(http.fetch).toHaveBeenCalledTimes(3);
@@ -303,6 +307,7 @@ describe('Session Timeout', () => {
         now,
         idleTimeoutExpiration: now + 64 * 1000,
         lifespanExpiration: null,
+        provider: { type: 'basic', name: 'basic1' },
       });
       await sessionTimeout.start();
       expect(http.fetch).toHaveBeenCalled();
@@ -336,6 +341,7 @@ describe('Session Timeout', () => {
         now: now + elapsed,
         idleTimeoutExpiration: now + elapsed + 2 * 60 * 1000,
         lifespanExpiration: null,
+        provider: { type: 'basic', name: 'basic1' },
       };
       http.fetch.mockResolvedValue(sessionInfo);
       await sessionTimeout.extend('/foo');
@@ -358,6 +364,7 @@ describe('Session Timeout', () => {
         now,
         idleTimeoutExpiration: now + 4 * 1000,
         lifespanExpiration: null,
+        provider: { type: 'basic', name: 'basic1' },
       });
       await sessionTimeout.start();
 
diff --git a/x-pack/plugins/security/public/session/session_timeout.tsx b/x-pack/plugins/security/public/session/session_timeout.tsx
index bd6dbad7dbf149..b06d8fffd4b629 100644
--- a/x-pack/plugins/security/public/session/session_timeout.tsx
+++ b/x-pack/plugins/security/public/session/session_timeout.tsx
@@ -6,10 +6,10 @@
 
 import { NotificationsSetup, Toast, HttpSetup, ToastInput } from 'src/core/public';
 import { BroadcastChannel } from 'broadcast-channel';
+import { SessionInfo } from '../../common/types';
 import { createToast as createIdleTimeoutToast } from './session_idle_timeout_warning';
 import { createToast as createLifespanToast } from './session_lifespan_warning';
 import { ISessionExpired } from './session_expired';
-import { SessionInfo } from '../types';
 
 /**
  * Client session timeout is decreased by this number so that Kibana server
@@ -127,7 +127,7 @@ export class SessionTimeout implements ISessionTimeout {
     this.sessionInfo = sessionInfo;
     // save the provider name in session storage, we will need it when we log out
     const key = `${this.tenant}/session_provider`;
-    sessionStorage.setItem(key, sessionInfo.provider);
+    sessionStorage.setItem(key, sessionInfo.provider.name);
 
     const { timeout, isLifespanTimeout } = this.getTimeout();
     if (timeout == null) {
diff --git a/x-pack/plugins/security/server/audit/audit_logger.test.ts b/x-pack/plugins/security/server/audit/audit_logger.test.ts
index f7ee210a21a741..4dfd69a2ccb1ff 100644
--- a/x-pack/plugins/security/server/audit/audit_logger.test.ts
+++ b/x-pack/plugins/security/server/audit/audit_logger.test.ts
@@ -62,7 +62,7 @@ describe(`#savedObjectsAuthorizationFailure`, () => {
 });
 
 describe(`#savedObjectsAuthorizationSuccess`, () => {
-  test('logs via auditLogger when xpack.security.audit.enabled is true', () => {
+  test('logs via auditLogger', () => {
     const auditLogger = createMockAuditLogger();
     const securityAuditLogger = new SecurityAuditLogger(() => auditLogger);
     const username = 'foo-user';
@@ -92,3 +92,21 @@ describe(`#savedObjectsAuthorizationSuccess`, () => {
     );
   });
 });
+
+describe(`#accessAgreementAcknowledged`, () => {
+  test('logs via auditLogger', () => {
+    const auditLogger = createMockAuditLogger();
+    const securityAuditLogger = new SecurityAuditLogger(() => auditLogger);
+    const username = 'foo-user';
+    const provider = { type: 'saml', name: 'saml1' };
+
+    securityAuditLogger.accessAgreementAcknowledged(username, provider);
+
+    expect(auditLogger.log).toHaveBeenCalledTimes(1);
+    expect(auditLogger.log).toHaveBeenCalledWith(
+      'access_agreement_acknowledged',
+      'foo-user acknowledged access agreement (saml/saml1).',
+      { username, provider }
+    );
+  });
+});
diff --git a/x-pack/plugins/security/server/audit/audit_logger.ts b/x-pack/plugins/security/server/audit/audit_logger.ts
index 40b525b5d21888..d7243ecbe13f87 100644
--- a/x-pack/plugins/security/server/audit/audit_logger.ts
+++ b/x-pack/plugins/security/server/audit/audit_logger.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { AuthenticationProvider } from '../../common/types';
 import { LegacyAPI } from '../plugin';
 
 export class SecurityAuditLogger {
@@ -57,4 +58,12 @@ export class SecurityAuditLogger {
       }
     );
   }
+
+  accessAgreementAcknowledged(username: string, provider: AuthenticationProvider) {
+    this.getAuditLogger().log(
+      'access_agreement_acknowledged',
+      `${username} acknowledged access agreement (${provider.type}/${provider.name}).`,
+      { username, provider }
+    );
+  }
 }
diff --git a/x-pack/plugins/security/server/audit/index.mock.ts b/x-pack/plugins/security/server/audit/index.mock.ts
index c14b98ed4781eb..888aa3361faf04 100644
--- a/x-pack/plugins/security/server/audit/index.mock.ts
+++ b/x-pack/plugins/security/server/audit/index.mock.ts
@@ -11,6 +11,7 @@ export const securityAuditLoggerMock = {
     return ({
       savedObjectsAuthorizationFailure: jest.fn(),
       savedObjectsAuthorizationSuccess: jest.fn(),
+      accessAgreementAcknowledged: jest.fn(),
     } as unknown) as jest.Mocked<SecurityAuditLogger>;
   },
 };
diff --git a/x-pack/plugins/security/server/authentication/authenticator.test.ts b/x-pack/plugins/security/server/authentication/authenticator.test.ts
index a595b63faaf9b3..49b7b40659cfc1 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.test.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.test.ts
@@ -20,7 +20,10 @@ import {
   elasticsearchServiceMock,
   sessionStorageMock,
 } from '../../../../../src/core/server/mocks';
+import { licenseMock } from '../../common/licensing/index.mock';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
+import { securityAuditLoggerMock } from '../audit/index.mock';
+import { SecurityLicenseFeatures } from '../../common/licensing';
 import { ConfigSchema, createConfig } from '../config';
 import { AuthenticationResult } from './authentication_result';
 import { Authenticator, AuthenticatorOptions, ProviderSession } from './authenticator';
@@ -39,8 +42,11 @@ function getMockOptions({
   selector?: AuthenticatorOptions['config']['authc']['selector'];
 } = {}) {
   return {
+    auditLogger: securityAuditLoggerMock.create(),
+    getCurrentUser: jest.fn(),
     clusterClient: elasticsearchServiceMock.createClusterClient(),
     basePath: httpServiceMock.createSetupContract().basePath,
+    license: licenseMock.create(),
     loggers: loggingServiceMock.create(),
     config: createConfig(
       ConfigSchema.validate({ session, authc: { selector, providers, http } }),
@@ -1108,6 +1114,141 @@ describe('Authenticator', () => {
         expect(mockBasicAuthenticationProvider.authenticate).not.toHaveBeenCalled();
       });
     });
+
+    describe('with Access Agreement', () => {
+      const mockUser = mockAuthenticatedUser();
+      beforeEach(() => {
+        mockOptions = getMockOptions({
+          providers: {
+            basic: { basic1: { order: 0, accessAgreement: { message: 'some notice' } } },
+          },
+        });
+        mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+        mockOptions.license.getFeatures.mockReturnValue({
+          allowAccessAgreement: true,
+        } as SecurityLicenseFeatures);
+
+        mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
+          AuthenticationResult.succeeded(mockUser)
+        );
+
+        authenticator = new Authenticator(mockOptions);
+      });
+
+      it('does not redirect to Access Agreement if there is no active session', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue(null);
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.succeeded(mockUser)
+        );
+      });
+
+      it('does not redirect AJAX requests to Access Agreement', async () => {
+        const request = httpServerMock.createKibanaRequest({ headers: { 'kbn-xsrf': 'xsrf' } });
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.succeeded(mockUser)
+        );
+      });
+
+      it('does not redirect to Access Agreement if request cannot be handled', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
+          AuthenticationResult.notHandled()
+        );
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.notHandled()
+        );
+      });
+
+      it('does not redirect to Access Agreement if authentication fails', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        const failureReason = new Error('something went wrong');
+        mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
+          AuthenticationResult.failed(failureReason)
+        );
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.failed(failureReason)
+        );
+      });
+
+      it('does not redirect to Access Agreement if redirect is required to complete authentication', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        mockBasicAuthenticationProvider.authenticate.mockResolvedValue(
+          AuthenticationResult.redirectTo('/some-url')
+        );
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.redirectTo('/some-url')
+        );
+      });
+
+      it('does not redirect to Access Agreement if user has already acknowledged it', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue({
+          ...mockSessVal,
+          accessAgreementAcknowledged: true,
+        });
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.succeeded(mockUser)
+        );
+      });
+
+      it('does not redirect to Access Agreement its own requests', async () => {
+        const request = httpServerMock.createKibanaRequest({ path: '/security/access_agreement' });
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.succeeded(mockUser)
+        );
+      });
+
+      it('does not redirect to Access Agreement if it is not configured', async () => {
+        mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
+        mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+        authenticator = new Authenticator(mockOptions);
+
+        const request = httpServerMock.createKibanaRequest();
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.succeeded(mockUser)
+        );
+      });
+
+      it('does not redirect to Access Agreement if license doesnt allow it.', async () => {
+        const request = httpServerMock.createKibanaRequest();
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+        mockOptions.license.getFeatures.mockReturnValue({
+          allowAccessAgreement: false,
+        } as SecurityLicenseFeatures);
+
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.succeeded(mockUser)
+        );
+      });
+
+      it('redirects to Access Agreement when needed.', async () => {
+        mockSessionStorage.get.mockResolvedValue(mockSessVal);
+
+        const request = httpServerMock.createKibanaRequest();
+        await expect(authenticator.authenticate(request)).resolves.toEqual(
+          AuthenticationResult.redirectTo(
+            '/mock-server-basepath/security/access_agreement?next=%2Fmock-server-basepath%2Fpath'
+          )
+        );
+      });
+    });
   });
 
   describe('`logout` method', () => {
@@ -1228,13 +1369,13 @@ describe('Authenticator', () => {
         now: currentDate,
         idleTimeoutExpiration: currentDate + 60000,
         lifespanExpiration: currentDate + 120000,
-        provider: 'basic1',
+        provider: { type: 'basic' as 'basic', name: 'basic1' },
       };
       mockSessionStorage.get.mockResolvedValue({
         idleTimeoutExpiration: mockInfo.idleTimeoutExpiration,
         lifespanExpiration: mockInfo.lifespanExpiration,
         state,
-        provider: { type: 'basic', name: mockInfo.provider },
+        provider: mockInfo.provider,
         path: mockOptions.basePath.serverBasePath,
       });
       jest.spyOn(Date, 'now').mockImplementation(() => currentDate);
@@ -1274,4 +1415,84 @@ describe('Authenticator', () => {
       expect(authenticator.isProviderTypeEnabled('saml')).toBe(true);
     });
   });
+
+  describe('`acknowledgeAccessAgreement` method', () => {
+    let authenticator: Authenticator;
+    let mockOptions: ReturnType<typeof getMockOptions>;
+    let mockSessionStorage: jest.Mocked<SessionStorage<ProviderSession>>;
+    let mockSessionValue: any;
+    beforeEach(() => {
+      mockOptions = getMockOptions({ providers: { basic: { basic1: { order: 0 } } } });
+      mockSessionStorage = sessionStorageMock.create();
+      mockOptions.sessionStorageFactory.asScoped.mockReturnValue(mockSessionStorage);
+      mockSessionValue = {
+        idleTimeoutExpiration: null,
+        lifespanExpiration: null,
+        state: { authorization: 'Basic xxx' },
+        provider: { type: 'basic', name: 'basic1' },
+        path: mockOptions.basePath.serverBasePath,
+      };
+      mockSessionStorage.get.mockResolvedValue(mockSessionValue);
+      mockOptions.getCurrentUser.mockReturnValue(mockAuthenticatedUser());
+      mockOptions.license.getFeatures.mockReturnValue({
+        allowAccessAgreement: true,
+      } as SecurityLicenseFeatures);
+
+      authenticator = new Authenticator(mockOptions);
+    });
+
+    it('fails if user is not authenticated', async () => {
+      mockOptions.getCurrentUser.mockReturnValue(null);
+
+      await expect(
+        authenticator.acknowledgeAccessAgreement(httpServerMock.createKibanaRequest())
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot acknowledge access agreement for unauthenticated user."`
+      );
+
+      expect(mockSessionStorage.set).not.toHaveBeenCalled();
+    });
+
+    it('fails if cannot retrieve user session', async () => {
+      mockSessionStorage.get.mockResolvedValue(null);
+
+      await expect(
+        authenticator.acknowledgeAccessAgreement(httpServerMock.createKibanaRequest())
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot acknowledge access agreement for unauthenticated user."`
+      );
+
+      expect(mockSessionStorage.set).not.toHaveBeenCalled();
+    });
+
+    it('fails if license doesn allow access agreement acknowledgement', async () => {
+      mockOptions.license.getFeatures.mockReturnValue({
+        allowAccessAgreement: false,
+      } as SecurityLicenseFeatures);
+
+      await expect(
+        authenticator.acknowledgeAccessAgreement(httpServerMock.createKibanaRequest())
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Current license does not allow access agreement acknowledgement."`
+      );
+
+      expect(mockSessionStorage.set).not.toHaveBeenCalled();
+    });
+
+    it('properly acknowledges access agreement for the authenticated user', async () => {
+      await authenticator.acknowledgeAccessAgreement(httpServerMock.createKibanaRequest());
+
+      expect(mockSessionStorage.set).toHaveBeenCalledTimes(1);
+      expect(mockSessionStorage.set).toHaveBeenCalledWith({
+        ...mockSessionValue,
+        accessAgreementAcknowledged: true,
+      });
+
+      expect(mockOptions.auditLogger.accessAgreementAcknowledged).toHaveBeenCalledTimes(1);
+      expect(mockOptions.auditLogger.accessAgreementAcknowledged).toHaveBeenCalledWith('user', {
+        type: 'basic',
+        name: 'basic1',
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security/server/authentication/authenticator.ts b/x-pack/plugins/security/server/authentication/authenticator.ts
index caf5b485d05e35..58dea2b23e5463 100644
--- a/x-pack/plugins/security/server/authentication/authenticator.ts
+++ b/x-pack/plugins/security/server/authentication/authenticator.ts
@@ -14,6 +14,10 @@ import {
   HttpServiceSetup,
   IClusterClient,
 } from '../../../../../src/core/server';
+import { SecurityLicense } from '../../common/licensing';
+import { AuthenticatedUser } from '../../common/model';
+import { AuthenticationProvider, SessionInfo } from '../../common/types';
+import { SecurityAuditLogger } from '../audit';
 import { ConfigType } from '../config';
 import { getErrorStatusCode } from '../errors';
 
@@ -32,7 +36,6 @@ import {
 import { AuthenticationResult } from './authentication_result';
 import { DeauthenticationResult } from './deauthentication_result';
 import { Tokens } from './tokens';
-import { SessionInfo } from '../../public';
 import { canRedirectRequest } from './can_redirect_request';
 import { HTTPAuthorizationHeader } from './http_authentication';
 
@@ -43,7 +46,7 @@ export interface ProviderSession {
   /**
    * Name and type of the provider this session belongs to.
    */
-  provider: { type: string; name: string };
+  provider: AuthenticationProvider;
 
   /**
    * The Unix time in ms when the session should be considered expired. If `null`, session will stay
@@ -67,6 +70,11 @@ export interface ProviderSession {
    * Cookie "Path" attribute that is validated against the current Kibana server configuration.
    */
   path: string;
+
+  /**
+   * Indicates whether user acknowledged access agreement or not.
+   */
+  accessAgreementAcknowledged?: boolean;
 }
 
 /**
@@ -76,7 +84,7 @@ export interface ProviderLoginAttempt {
   /**
    * Name or type of the provider this login attempt is targeted for.
    */
-  provider: { name: string } | { type: string };
+  provider: Pick<AuthenticationProvider, 'name'> | Pick<AuthenticationProvider, 'type'>;
 
   /**
    * Login attempt can have any form and defined by the specific provider.
@@ -85,8 +93,11 @@ export interface ProviderLoginAttempt {
 }
 
 export interface AuthenticatorOptions {
+  auditLogger: SecurityAuditLogger;
+  getCurrentUser: (request: KibanaRequest) => AuthenticatedUser | null;
   config: Pick<ConfigType, 'session' | 'authc'>;
   basePath: HttpServiceSetup['basePath'];
+  license: SecurityLicense;
   loggers: LoggerFactory;
   clusterClient: IClusterClient;
   sessionStorageFactory: SessionStorageFactory<ProviderSession>;
@@ -109,6 +120,11 @@ const providerMap = new Map<
   [PKIAuthenticationProvider.type, PKIAuthenticationProvider],
 ]);
 
+/**
+ * The route to the access agreement UI.
+ */
+const ACCESS_AGREEMENT_ROUTE = '/security/access_agreement';
+
 function assertRequest(request: KibanaRequest) {
   if (!(request instanceof KibanaRequest)) {
     throw new Error(`Request should be a valid "KibanaRequest" instance, was [${typeof request}].`);
@@ -135,7 +151,7 @@ function isLoginAttemptWithProviderName(
 
 function isLoginAttemptWithProviderType(
   attempt: unknown
-): attempt is { value: unknown; provider: { type: string } } {
+): attempt is { value: unknown; provider: Pick<AuthenticationProvider, 'type'> } {
   return (
     typeof attempt === 'object' &&
     (attempt as any)?.provider?.type &&
@@ -341,14 +357,7 @@ export class Authenticator {
     const sessionStorage = this.options.sessionStorageFactory.asScoped(request);
     const existingSession = await this.getSessionValue(sessionStorage);
 
-    // If request doesn't have any session information, isn't attributed with HTTP Authorization
-    // header and Login Selector is enabled, we must redirect user to the login selector.
-    const useLoginSelector =
-      !existingSession &&
-      this.options.config.authc.selector.enabled &&
-      canRedirectRequest(request) &&
-      HTTPAuthorizationHeader.parseFromRequest(request) == null;
-    if (useLoginSelector) {
+    if (this.shouldRedirectToLoginSelector(request, existingSession)) {
       this.logger.debug('Redirecting request to Login Selector.');
       return AuthenticationResult.redirectTo(
         `${this.options.basePath.serverBasePath}/login?next=${encodeURIComponent(
@@ -368,7 +377,7 @@ export class Authenticator {
         ownsSession ? existingSession!.state : null
       );
 
-      this.updateSessionValue(sessionStorage, {
+      const updatedSession = this.updateSessionValue(sessionStorage, {
         provider: { type: provider.type, name: providerName },
         isSystemRequest: request.isSystemRequest,
         authenticationResult,
@@ -376,6 +385,20 @@ export class Authenticator {
       });
 
       if (!authenticationResult.notHandled()) {
+        if (
+          authenticationResult.succeeded() &&
+          this.shouldRedirectToAccessAgreement(request, updatedSession)
+        ) {
+          this.logger.debug('Redirecting user to the access agreement screen.');
+          return AuthenticationResult.redirectTo(
+            `${
+              this.options.basePath.serverBasePath
+            }${ACCESS_AGREEMENT_ROUTE}?next=${encodeURIComponent(
+              `${this.options.basePath.get(request)}${request.url.path}`
+            )}`
+          );
+        }
+
         return authenticationResult;
       }
     }
@@ -441,7 +464,7 @@ export class Authenticator {
         now: Date.now(),
         idleTimeoutExpiration: sessionValue.idleTimeoutExpiration,
         lifespanExpiration: sessionValue.lifespanExpiration,
-        provider: sessionValue.provider.name,
+        provider: sessionValue.provider,
       };
     }
     return null;
@@ -455,6 +478,32 @@ export class Authenticator {
     return [...this.providers.values()].some(provider => provider.type === providerType);
   }
 
+  /**
+   * Acknowledges access agreement on behalf of the currently authenticated user.
+   * @param request Request instance.
+   */
+  async acknowledgeAccessAgreement(request: KibanaRequest) {
+    assertRequest(request);
+
+    const sessionStorage = this.options.sessionStorageFactory.asScoped(request);
+    const existingSession = await this.getSessionValue(sessionStorage);
+    const currentUser = this.options.getCurrentUser(request);
+    if (!existingSession || !currentUser) {
+      throw new Error('Cannot acknowledge access agreement for unauthenticated user.');
+    }
+
+    if (!this.options.license.getFeatures().allowAccessAgreement) {
+      throw new Error('Current license does not allow access agreement acknowledgement.');
+    }
+
+    sessionStorage.set({ ...existingSession, accessAgreementAcknowledged: true });
+
+    this.options.auditLogger.accessAgreementAcknowledged(
+      currentUser.username,
+      existingSession.provider
+    );
+  }
+
   /**
    * Initializes HTTP Authentication provider and appends it to the end of the list of enabled
    * authentication providers.
@@ -538,14 +587,14 @@ export class Authenticator {
       existingSession,
       isSystemRequest,
     }: {
-      provider: { type: string; name: string };
+      provider: AuthenticationProvider;
       authenticationResult: AuthenticationResult;
       existingSession: ProviderSession | null;
       isSystemRequest: boolean;
     }
   ) {
     if (!existingSession && !authenticationResult.shouldUpdateState()) {
-      return;
+      return null;
     }
 
     // If authentication succeeds or requires redirect we should automatically extend existing user session,
@@ -563,9 +612,12 @@ export class Authenticator {
       (authenticationResult.failed() && getErrorStatusCode(authenticationResult.error) === 401)
     ) {
       sessionStorage.clear();
-    } else if (sessionCanBeUpdated) {
+      return null;
+    }
+
+    if (sessionCanBeUpdated) {
       const { idleTimeoutExpiration, lifespanExpiration } = this.calculateExpiry(existingSession);
-      sessionStorage.set({
+      const updatedSession = {
         state: authenticationResult.shouldUpdateState()
           ? authenticationResult.state
           : existingSession!.state,
@@ -573,8 +625,13 @@ export class Authenticator {
         idleTimeoutExpiration,
         lifespanExpiration,
         path: this.serverBasePath,
-      });
+        accessAgreementAcknowledged: existingSession?.accessAgreementAcknowledged,
+      };
+      sessionStorage.set(updatedSession);
+      return updatedSession;
     }
+
+    return existingSession;
   }
 
   private getProviderName(query: any): string | null {
@@ -600,4 +657,48 @@ export class Authenticator {
 
     return { idleTimeoutExpiration, lifespanExpiration };
   }
+
+  /**
+   * Checks whether request should be redirected to the Login Selector UI.
+   * @param request Request instance.
+   * @param session Current session value if any.
+   */
+  private shouldRedirectToLoginSelector(request: KibanaRequest, session: ProviderSession | null) {
+    // Request should be redirected to Login Selector UI only if all following conditions are met:
+    //  1. Request can be redirected (not API call)
+    //  2. Request is not authenticated yet
+    //  3. Login Selector UI is enabled
+    //  4. Request isn't attributed with HTTP Authorization header
+    return (
+      canRedirectRequest(request) &&
+      !session &&
+      this.options.config.authc.selector.enabled &&
+      HTTPAuthorizationHeader.parseFromRequest(request) == null
+    );
+  }
+
+  /**
+   * Checks whether request should be redirected to the Access Agreement UI.
+   * @param request Request instance.
+   * @param session Current session value if any.
+   */
+  private shouldRedirectToAccessAgreement(request: KibanaRequest, session: ProviderSession | null) {
+    // Request should be redirected to Access Agreement UI only if all following conditions are met:
+    //  1. Request can be redirected (not API call)
+    //  2. Request is authenticated, but user hasn't acknowledged access agreement in the current
+    //     session yet (based on the flag we store in the session)
+    //  3. Request is authenticated by the provider that has `accessAgreement` configured
+    //  4. Current license allows access agreement
+    //  5. And it's not a request to the Access Agreement UI itself
+    return (
+      canRedirectRequest(request) &&
+      session != null &&
+      !session.accessAgreementAcknowledged &&
+      (this.options.config.authc.providers as Record<string, any>)[session.provider.type]?.[
+        session.provider.name
+      ]?.accessAgreement &&
+      this.options.license.getFeatures().allowAccessAgreement &&
+      request.url.pathname !== ACCESS_AGREEMENT_ROUTE
+    );
+  }
 }
diff --git a/x-pack/plugins/security/server/authentication/index.mock.ts b/x-pack/plugins/security/server/authentication/index.mock.ts
index 9397a7a42b3262..7cd3ac18634f78 100644
--- a/x-pack/plugins/security/server/authentication/index.mock.ts
+++ b/x-pack/plugins/security/server/authentication/index.mock.ts
@@ -19,5 +19,6 @@ export const authenticationMock = {
     invalidateAPIKeyAsInternalUser: jest.fn(),
     isAuthenticated: jest.fn(),
     getSessionInfo: jest.fn(),
+    acknowledgeAccessAgreement: jest.fn(),
   }),
 };
diff --git a/x-pack/plugins/security/server/authentication/index.test.ts b/x-pack/plugins/security/server/authentication/index.test.ts
index 6609f8707976b7..1c1e0ed781f18e 100644
--- a/x-pack/plugins/security/server/authentication/index.test.ts
+++ b/x-pack/plugins/security/server/authentication/index.test.ts
@@ -19,6 +19,7 @@ import {
   elasticsearchServiceMock,
 } from '../../../../../src/core/server/mocks';
 import { mockAuthenticatedUser } from '../../common/model/authenticated_user.mock';
+import { securityAuditLoggerMock } from '../audit/index.mock';
 
 import {
   AuthenticationHandler,
@@ -40,9 +41,11 @@ import {
   InvalidateAPIKeyParams,
 } from './api_keys';
 import { SecurityLicense } from '../../common/licensing';
+import { SecurityAuditLogger } from '../audit';
 
 describe('setupAuthentication()', () => {
   let mockSetupAuthenticationParams: {
+    auditLogger: jest.Mocked<SecurityAuditLogger>;
     config: ConfigType;
     loggers: LoggerFactory;
     http: jest.Mocked<CoreSetup['http']>;
@@ -52,6 +55,7 @@ describe('setupAuthentication()', () => {
   let mockScopedClusterClient: jest.Mocked<PublicMethodsOf<ScopedClusterClient>>;
   beforeEach(() => {
     mockSetupAuthenticationParams = {
+      auditLogger: securityAuditLoggerMock.create(),
       http: coreMock.createSetup().http,
       config: createConfig(
         ConfigSchema.validate({
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index d76a5a533d4983..779b852195b028 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -10,12 +10,13 @@ import {
   KibanaRequest,
   LoggerFactory,
 } from '../../../../../src/core/server';
+import { SecurityLicense } from '../../common/licensing';
 import { AuthenticatedUser } from '../../common/model';
+import { SecurityAuditLogger } from '../audit';
 import { ConfigType } from '../config';
 import { getErrorStatusCode } from '../errors';
 import { Authenticator, ProviderSession } from './authenticator';
 import { APIKeys, CreateAPIKeyParams, InvalidateAPIKeyParams } from './api_keys';
-import { SecurityLicense } from '../../common/licensing';
 
 export { canRedirectRequest } from './can_redirect_request';
 export { Authenticator, ProviderLoginAttempt } from './authenticator';
@@ -35,6 +36,7 @@ export {
 } from './http_authentication';
 
 interface SetupAuthenticationParams {
+  auditLogger: SecurityAuditLogger;
   http: CoreSetup['http'];
   clusterClient: IClusterClient;
   config: ConfigType;
@@ -45,6 +47,7 @@ interface SetupAuthenticationParams {
 export type Authentication = UnwrapPromise<ReturnType<typeof setupAuthentication>>;
 
 export async function setupAuthentication({
+  auditLogger,
   http,
   clusterClient,
   config,
@@ -82,9 +85,12 @@ export async function setupAuthentication({
   };
 
   const authenticator = new Authenticator({
+    auditLogger,
+    getCurrentUser,
     clusterClient,
     basePath: http.basePath,
     config: { session: config.session, authc: config.authc },
+    license,
     loggers,
     sessionStorageFactory: await http.createCookieSessionStorageFactory({
       encryptionKey: config.encryptionKey,
@@ -171,6 +177,7 @@ export async function setupAuthentication({
     logout: authenticator.logout.bind(authenticator),
     getSessionInfo: authenticator.getSessionInfo.bind(authenticator),
     isProviderTypeEnabled: authenticator.isProviderTypeEnabled.bind(authenticator),
+    acknowledgeAccessAgreement: authenticator.acknowledgeAccessAgreement.bind(authenticator),
     getCurrentUser,
     areAPIKeysEnabled: () => apiKeys.areAPIKeysEnabled(),
     createAPIKey: (request: KibanaRequest, params: CreateAPIKeyParams) =>
diff --git a/x-pack/plugins/security/server/config.test.ts b/x-pack/plugins/security/server/config.test.ts
index 9899cd688d6ddb..2c248646499774 100644
--- a/x-pack/plugins/security/server/config.test.ts
+++ b/x-pack/plugins/security/server/config.test.ts
@@ -27,6 +27,7 @@ describe('config schema', () => {
           "providers": Object {
             "basic": Object {
               "basic": Object {
+                "accessAgreement": undefined,
                 "description": undefined,
                 "enabled": true,
                 "hint": undefined,
@@ -71,6 +72,7 @@ describe('config schema', () => {
           "providers": Object {
             "basic": Object {
               "basic": Object {
+                "accessAgreement": undefined,
                 "description": undefined,
                 "enabled": true,
                 "hint": undefined,
@@ -115,6 +117,7 @@ describe('config schema', () => {
           "providers": Object {
             "basic": Object {
               "basic": Object {
+                "accessAgreement": undefined,
                 "description": undefined,
                 "enabled": true,
                 "hint": undefined,
@@ -897,20 +900,12 @@ describe('createConfig()', () => {
         "sortedProviders": Array [
           Object {
             "name": "saml",
-            "options": Object {
-              "description": undefined,
-              "order": 0,
-              "showInSelector": true,
-            },
+            "order": 0,
             "type": "saml",
           },
           Object {
             "name": "basic",
-            "options": Object {
-              "description": undefined,
-              "order": 1,
-              "showInSelector": true,
-            },
+            "order": 1,
             "type": "basic",
           },
         ],
@@ -1001,47 +996,27 @@ describe('createConfig()', () => {
       Array [
         Object {
           "name": "oidc1",
-          "options": Object {
-            "description": undefined,
-            "order": 0,
-            "showInSelector": true,
-          },
+          "order": 0,
           "type": "oidc",
         },
         Object {
           "name": "saml2",
-          "options": Object {
-            "description": undefined,
-            "order": 1,
-            "showInSelector": true,
-          },
+          "order": 1,
           "type": "saml",
         },
         Object {
           "name": "saml1",
-          "options": Object {
-            "description": undefined,
-            "order": 2,
-            "showInSelector": true,
-          },
+          "order": 2,
           "type": "saml",
         },
         Object {
           "name": "basic1",
-          "options": Object {
-            "description": "Log in with Elasticsearch",
-            "order": 3,
-            "showInSelector": true,
-          },
+          "order": 3,
           "type": "basic",
         },
         Object {
           "name": "oidc2",
-          "options": Object {
-            "description": undefined,
-            "order": 4,
-            "showInSelector": true,
-          },
+          "order": 4,
           "type": "oidc",
         },
       ]
diff --git a/x-pack/plugins/security/server/config.ts b/x-pack/plugins/security/server/config.ts
index 7fe38b05f72d60..8fe79a788ac51c 100644
--- a/x-pack/plugins/security/server/config.ts
+++ b/x-pack/plugins/security/server/config.ts
@@ -33,6 +33,7 @@ function getCommonProviderSchemaProperties(overrides: Partial<ProvidersCommonCon
     description: schema.maybe(schema.string()),
     hint: schema.maybe(schema.string()),
     icon: schema.maybe(schema.string()),
+    accessAgreement: schema.maybe(schema.object({ message: schema.string() })),
     ...overrides,
   };
 }
@@ -161,6 +162,7 @@ export const ConfigSchema = schema.object({
             description: undefined,
             hint: undefined,
             icon: undefined,
+            accessAgreement: undefined,
           },
         },
         token: undefined,
@@ -240,25 +242,19 @@ export function createConfig(
   const sortedProviders: Array<{
     type: keyof ProvidersConfigType;
     name: string;
-    options: { order: number; showInSelector: boolean; description?: string };
+    order: number;
   }> = [];
   for (const [type, providerGroup] of Object.entries(providers)) {
-    for (const [name, { enabled, showInSelector, order, description }] of Object.entries(
-      providerGroup ?? {}
-    )) {
+    for (const [name, { enabled, order }] of Object.entries(providerGroup ?? {})) {
       if (!enabled) {
         delete providerGroup![name];
       } else {
-        sortedProviders.push({
-          type: type as any,
-          name,
-          options: { order, showInSelector, description },
-        });
+        sortedProviders.push({ type: type as any, name, order });
       }
     }
   }
 
-  sortedProviders.sort(({ options: { order: orderA } }, { options: { order: orderB } }) =>
+  sortedProviders.sort(({ order: orderA }, { order: orderB }) =>
     orderA < orderB ? -1 : orderA > orderB ? 1 : 0
   );
 
@@ -268,7 +264,8 @@ export function createConfig(
     typeof config.authc.selector.enabled === 'boolean'
       ? config.authc.selector.enabled
       : !isUsingLegacyProvidersFormat &&
-        sortedProviders.filter(provider => provider.options.showInSelector).length > 1;
+        sortedProviders.filter(({ type, name }) => providers[type]?.[name].showInSelector).length >
+          1;
 
   return {
     ...config,
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 3ce0198273af97..22a30f03c646a1 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -72,14 +72,10 @@ describe('Security Plugin', () => {
                   "areAPIKeysEnabled": [Function],
                   "createAPIKey": [Function],
                   "getCurrentUser": [Function],
-                  "getSessionInfo": [Function],
                   "grantAPIKeyAsInternalUser": [Function],
                   "invalidateAPIKey": [Function],
                   "invalidateAPIKeyAsInternalUser": [Function],
                   "isAuthenticated": [Function],
-                  "isProviderTypeEnabled": [Function],
-                  "login": [Function],
-                  "logout": [Function],
                 },
                 "authz": Object {
                   "actions": Actions {
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 9dd4aaafa3494f..e30b0caf76ddc0 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -48,7 +48,16 @@ export interface LegacyAPI {
  * Describes public Security plugin contract returned at the `setup` stage.
  */
 export interface SecurityPluginSetup {
-  authc: Authentication;
+  authc: Pick<
+    Authentication,
+    | 'isAuthenticated'
+    | 'getCurrentUser'
+    | 'areAPIKeysEnabled'
+    | 'createAPIKey'
+    | 'invalidateAPIKey'
+    | 'grantAPIKeyAsInternalUser'
+    | 'invalidateAPIKeyAsInternalUser'
+  >;
   authz: Pick<Authorization, 'actions' | 'checkPrivilegesWithRequest' | 'mode'>;
 
   /**
@@ -126,7 +135,9 @@ export class Plugin {
       license$: licensing.license$,
     });
 
+    const auditLogger = new SecurityAuditLogger(() => this.getLegacyAPI().auditLogger);
     const authc = await setupAuthentication({
+      auditLogger,
       http: core.http,
       clusterClient: this.clusterClient,
       config,
@@ -146,7 +157,7 @@ export class Plugin {
     });
 
     setupSavedObjects({
-      auditLogger: new SecurityAuditLogger(() => this.getLegacyAPI().auditLogger),
+      auditLogger,
       authz,
       savedObjects: core.savedObjects,
       getSpacesService: this.getSpacesService,
@@ -167,7 +178,15 @@ export class Plugin {
     });
 
     return deepFreeze<SecurityPluginSetup>({
-      authc,
+      authc: {
+        isAuthenticated: authc.isAuthenticated,
+        getCurrentUser: authc.getCurrentUser,
+        areAPIKeysEnabled: authc.areAPIKeysEnabled,
+        createAPIKey: authc.createAPIKey,
+        invalidateAPIKey: authc.invalidateAPIKey,
+        grantAPIKeyAsInternalUser: authc.grantAPIKeyAsInternalUser,
+        invalidateAPIKeyAsInternalUser: authc.invalidateAPIKeyAsInternalUser,
+      },
 
       authz: {
         actions: authz.actions,
diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts
index 156c03e90210b7..5a0401e6320b46 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts
@@ -12,6 +12,7 @@ import {
   RequestHandlerContext,
   RouteConfig,
 } from '../../../../../../src/core/server';
+import { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
 import {
   Authentication,
   AuthenticationResult,
@@ -28,11 +29,13 @@ import { routeDefinitionParamsMock } from '../index.mock';
 describe('Common authentication routes', () => {
   let router: jest.Mocked<IRouter>;
   let authc: jest.Mocked<Authentication>;
+  let license: jest.Mocked<SecurityLicense>;
   let mockContext: RequestHandlerContext;
   beforeEach(() => {
     const routeParamsMock = routeDefinitionParamsMock.create();
     router = routeParamsMock.router;
     authc = routeParamsMock.authc;
+    license = routeParamsMock.license;
 
     mockContext = ({
       licensing: {
@@ -433,4 +436,61 @@ describe('Common authentication routes', () => {
       });
     });
   });
+
+  describe('acknowledge access agreement', () => {
+    let routeHandler: RequestHandler<any, any, any>;
+    let routeConfig: RouteConfig<any, any, any, any>;
+    beforeEach(() => {
+      const [acsRouteConfig, acsRouteHandler] = router.post.mock.calls.find(
+        ([{ path }]) => path === '/internal/security/access_agreement/acknowledge'
+      )!;
+
+      license.getFeatures.mockReturnValue({
+        allowAccessAgreement: true,
+      } as SecurityLicenseFeatures);
+
+      routeConfig = acsRouteConfig;
+      routeHandler = acsRouteHandler;
+    });
+
+    it('correctly defines route.', () => {
+      expect(routeConfig.options).toBeUndefined();
+      expect(routeConfig.validate).toBe(false);
+    });
+
+    it(`returns 403 if current license doesn't allow access agreement acknowledgement.`, async () => {
+      license.getFeatures.mockReturnValue({
+        allowAccessAgreement: false,
+      } as SecurityLicenseFeatures);
+
+      const request = httpServerMock.createKibanaRequest();
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 403,
+        payload: { message: `Current license doesn't support access agreement.` },
+        options: { body: { message: `Current license doesn't support access agreement.` } },
+      });
+    });
+
+    it('returns 500 if acknowledge throws unhandled exception.', async () => {
+      const unhandledException = new Error('Something went wrong.');
+      authc.acknowledgeAccessAgreement.mockRejectedValue(unhandledException);
+
+      const request = httpServerMock.createKibanaRequest();
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 500,
+        payload: 'Internal Error',
+        options: {},
+      });
+    });
+
+    it('returns 204 if successfully acknowledged.', async () => {
+      authc.acknowledgeAccessAgreement.mockResolvedValue(undefined);
+
+      const request = httpServerMock.createKibanaRequest();
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 204,
+        options: {},
+      });
+    });
+  });
 });
diff --git a/x-pack/plugins/security/server/routes/authentication/common.ts b/x-pack/plugins/security/server/routes/authentication/common.ts
index abab67c9cd1d28..91783140539a5b 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.ts
@@ -18,7 +18,13 @@ import { RouteDefinitionParams } from '..';
 /**
  * Defines routes that are common to various authentication mechanisms.
  */
-export function defineCommonRoutes({ router, authc, basePath, logger }: RouteDefinitionParams) {
+export function defineCommonRoutes({
+  router,
+  authc,
+  basePath,
+  license,
+  logger,
+}: RouteDefinitionParams) {
   // Generate two identical routes with new and deprecated URL and issue a warning if route with deprecated URL is ever used.
   for (const path of ['/api/security/logout', '/api/security/v1/logout']) {
     router.get(
@@ -135,4 +141,26 @@ export function defineCommonRoutes({ router, authc, basePath, logger }: RouteDef
       }
     })
   );
+
+  router.post(
+    { path: '/internal/security/access_agreement/acknowledge', validate: false },
+    createLicensedRouteHandler(async (context, request, response) => {
+      // If license doesn't allow access agreement we shouldn't handle request.
+      if (!license.getFeatures().allowAccessAgreement) {
+        logger.warn(`Attempted to acknowledge access agreement when license doesn't allow it.`);
+        return response.forbidden({
+          body: { message: `Current license doesn't support access agreement.` },
+        });
+      }
+
+      try {
+        await authc.acknowledgeAccessAgreement(request);
+      } catch (err) {
+        logger.error(err);
+        return response.internalError();
+      }
+
+      return response.noContent();
+    })
+  );
 }
diff --git a/x-pack/plugins/security/server/routes/licensed_route_handler.ts b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
index b113b2ca59e3ef..d8c212aa2d2174 100644
--- a/x-pack/plugins/security/server/routes/licensed_route_handler.ts
+++ b/x-pack/plugins/security/server/routes/licensed_route_handler.ts
@@ -4,10 +4,22 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestHandler } from 'kibana/server';
+import { KibanaResponseFactory, RequestHandler, RouteMethod } from 'kibana/server';
 
-export const createLicensedRouteHandler = <P, Q, B>(handler: RequestHandler<P, Q, B>) => {
-  const licensedRouteHandler: RequestHandler<P, Q, B> = (context, request, responseToolkit) => {
+export const createLicensedRouteHandler = <
+  P,
+  Q,
+  B,
+  M extends RouteMethod,
+  R extends KibanaResponseFactory
+>(
+  handler: RequestHandler<P, Q, B, M, R>
+) => {
+  const licensedRouteHandler: RequestHandler<P, Q, B, M, R> = (
+    context,
+    request,
+    responseToolkit
+  ) => {
     const { license } = context.licensing;
     const licenseCheck = license.check('security', 'basic');
     if (licenseCheck.state === 'unavailable' || licenseCheck.state === 'invalid') {
diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts
index fd05821f9d5206..c163ff4e256cd2 100644
--- a/x-pack/plugins/security/server/routes/users/change_password.test.ts
+++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts
@@ -53,7 +53,7 @@ describe('Change password', () => {
       now: Date.now(),
       idleTimeoutExpiration: null,
       lifespanExpiration: null,
-      provider: 'basic',
+      provider: { type: 'basic', name: 'basic' },
     });
 
     mockScopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.test.ts b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
new file mode 100644
index 00000000000000..3d616575b84131
--- /dev/null
+++ b/x-pack/plugins/security/server/routes/views/access_agreement.test.ts
@@ -0,0 +1,177 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import {
+  RequestHandler,
+  RouteConfig,
+  kibanaResponseFactory,
+  IRouter,
+  HttpResources,
+  HttpResourcesRequestHandler,
+  RequestHandlerContext,
+} from '../../../../../../src/core/server';
+import { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
+import { AuthenticationProvider } from '../../../common/types';
+import { ConfigType } from '../../config';
+import { defineAccessAgreementRoutes } from './access_agreement';
+
+import { httpResourcesMock, httpServerMock } from '../../../../../../src/core/server/mocks';
+import { routeDefinitionParamsMock } from '../index.mock';
+import { Authentication } from '../../authentication';
+
+describe('Access agreement view routes', () => {
+  let httpResources: jest.Mocked<HttpResources>;
+  let router: jest.Mocked<IRouter>;
+  let config: ConfigType;
+  let authc: jest.Mocked<Authentication>;
+  let license: jest.Mocked<SecurityLicense>;
+  let mockContext: RequestHandlerContext;
+  beforeEach(() => {
+    const routeParamsMock = routeDefinitionParamsMock.create();
+    router = routeParamsMock.router;
+    httpResources = routeParamsMock.httpResources;
+    authc = routeParamsMock.authc;
+    config = routeParamsMock.config;
+    license = routeParamsMock.license;
+
+    license.getFeatures.mockReturnValue({
+      allowAccessAgreement: true,
+    } as SecurityLicenseFeatures);
+
+    mockContext = ({
+      licensing: {
+        license: { check: jest.fn().mockReturnValue({ check: 'valid' }) },
+      },
+    } as unknown) as RequestHandlerContext;
+
+    defineAccessAgreementRoutes(routeParamsMock);
+  });
+
+  describe('View route', () => {
+    let routeHandler: HttpResourcesRequestHandler<any, any, any>;
+    let routeConfig: RouteConfig<any, any, any, 'get'>;
+    beforeEach(() => {
+      const [viewRouteConfig, viewRouteHandler] = httpResources.register.mock.calls.find(
+        ([{ path }]) => path === '/security/access_agreement'
+      )!;
+
+      routeConfig = viewRouteConfig;
+      routeHandler = viewRouteHandler;
+    });
+
+    it('correctly defines route.', () => {
+      expect(routeConfig.options).toBeUndefined();
+      expect(routeConfig.validate).toBe(false);
+    });
+
+    it('does not render view if current license does not allow access agreement.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+      const responseFactory = httpResourcesMock.createResponseFactory();
+
+      license.getFeatures.mockReturnValue({
+        allowAccessAgreement: false,
+      } as SecurityLicenseFeatures);
+
+      await routeHandler(mockContext, request, responseFactory);
+
+      expect(responseFactory.renderCoreApp).not.toHaveBeenCalledWith();
+      expect(responseFactory.forbidden).toHaveBeenCalledTimes(1);
+    });
+
+    it('renders view.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+      const responseFactory = httpResourcesMock.createResponseFactory();
+
+      await routeHandler(mockContext, request, responseFactory);
+
+      expect(responseFactory.renderCoreApp).toHaveBeenCalledWith();
+    });
+  });
+
+  describe('Access agreement state route', () => {
+    let routeHandler: RequestHandler<any, any, any, 'get'>;
+    let routeConfig: RouteConfig<any, any, any, 'get'>;
+    beforeEach(() => {
+      const [loginStateRouteConfig, loginStateRouteHandler] = router.get.mock.calls.find(
+        ([{ path }]) => path === '/internal/security/access_agreement/state'
+      )!;
+
+      routeConfig = loginStateRouteConfig;
+      routeHandler = loginStateRouteHandler;
+    });
+
+    it('correctly defines route.', () => {
+      expect(routeConfig.options).toBeUndefined();
+      expect(routeConfig.validate).toBe(false);
+    });
+
+    it('returns `403` if current license does not allow access agreement.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+
+      license.getFeatures.mockReturnValue({
+        allowAccessAgreement: false,
+      } as SecurityLicenseFeatures);
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        status: 403,
+        payload: { message: `Current license doesn't support access agreement.` },
+        options: { body: { message: `Current license doesn't support access agreement.` } },
+      });
+    });
+
+    it('returns empty `accessAgreement` if session info is not available.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+
+      authc.getSessionInfo.mockResolvedValue(null);
+
+      await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+        options: { body: { accessAgreement: '' } },
+        payload: { accessAgreement: '' },
+        status: 200,
+      });
+    });
+
+    it('returns non-empty `accessAgreement` only if it is configured.', async () => {
+      const request = httpServerMock.createKibanaRequest();
+
+      config.authc = routeDefinitionParamsMock.create({
+        authc: {
+          providers: {
+            basic: { basic1: { order: 0 } },
+            saml: {
+              saml1: {
+                order: 1,
+                realm: 'realm1',
+                accessAgreement: { message: 'Some access agreement' },
+              },
+            },
+          },
+        },
+      }).config.authc;
+
+      const cases: Array<[AuthenticationProvider, string]> = [
+        [{ type: 'basic', name: 'basic1' }, ''],
+        [{ type: 'saml', name: 'saml1' }, 'Some access agreement'],
+        [{ type: 'unknown-type', name: 'unknown-name' }, ''],
+      ];
+
+      for (const [sessionProvider, expectedAccessAgreement] of cases) {
+        authc.getSessionInfo.mockResolvedValue({
+          now: Date.now(),
+          idleTimeoutExpiration: null,
+          lifespanExpiration: null,
+          provider: sessionProvider,
+        });
+
+        await expect(routeHandler(mockContext, request, kibanaResponseFactory)).resolves.toEqual({
+          options: { body: { accessAgreement: expectedAccessAgreement } },
+          payload: { accessAgreement: expectedAccessAgreement },
+          status: 200,
+        });
+      }
+    });
+  });
+});
diff --git a/x-pack/plugins/security/server/routes/views/access_agreement.ts b/x-pack/plugins/security/server/routes/views/access_agreement.ts
new file mode 100644
index 00000000000000..49e1ff42a28a2a
--- /dev/null
+++ b/x-pack/plugins/security/server/routes/views/access_agreement.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { ConfigType } from '../../config';
+import { createLicensedRouteHandler } from '../licensed_route_handler';
+import { RouteDefinitionParams } from '..';
+
+/**
+ * Defines routes required for the Access Agreement view.
+ */
+export function defineAccessAgreementRoutes({
+  authc,
+  httpResources,
+  license,
+  config,
+  router,
+  logger,
+}: RouteDefinitionParams) {
+  // If license doesn't allow access agreement we shouldn't handle request.
+  const canHandleRequest = () => license.getFeatures().allowAccessAgreement;
+
+  httpResources.register(
+    { path: '/security/access_agreement', validate: false },
+    createLicensedRouteHandler(async (context, request, response) =>
+      canHandleRequest()
+        ? response.renderCoreApp()
+        : response.forbidden({
+            body: { message: `Current license doesn't support access agreement.` },
+          })
+    )
+  );
+
+  router.get(
+    { path: '/internal/security/access_agreement/state', validate: false },
+    createLicensedRouteHandler(async (context, request, response) => {
+      if (!canHandleRequest()) {
+        return response.forbidden({
+          body: { message: `Current license doesn't support access agreement.` },
+        });
+      }
+
+      // It's not guaranteed that we'll have session for the authenticated user (e.g. when user is
+      // authenticated with the help of HTTP authentication), that means we should safely check if
+      // we have it and can get a corresponding configuration.
+      try {
+        const session = await authc.getSessionInfo(request);
+        const accessAgreement =
+          (session &&
+            config.authc.providers[
+              session.provider.type as keyof ConfigType['authc']['providers']
+            ]?.[session.provider.name]?.accessAgreement?.message) ||
+          '';
+
+        return response.ok({ body: { accessAgreement } });
+      } catch (err) {
+        logger.error(err);
+        return response.internalError();
+      }
+    })
+  );
+}
diff --git a/x-pack/plugins/security/server/routes/views/index.test.ts b/x-pack/plugins/security/server/routes/views/index.test.ts
index a8e7e905b119af..7cddef9bf2b982 100644
--- a/x-pack/plugins/security/server/routes/views/index.test.ts
+++ b/x-pack/plugins/security/server/routes/views/index.test.ts
@@ -20,15 +20,18 @@ describe('View routes', () => {
     expect(routeParamsMock.httpResources.register.mock.calls.map(([{ path }]) => path))
       .toMatchInlineSnapshot(`
       Array [
+        "/security/access_agreement",
         "/security/account",
         "/security/logged_out",
         "/logout",
         "/security/overwritten_session",
       ]
     `);
-    expect(routeParamsMock.router.get.mock.calls.map(([{ path }]) => path)).toMatchInlineSnapshot(
-      `Array []`
-    );
+    expect(routeParamsMock.router.get.mock.calls.map(([{ path }]) => path)).toMatchInlineSnapshot(`
+      Array [
+        "/internal/security/access_agreement/state",
+      ]
+    `);
   });
 
   it('registers Login routes if `basic` provider is enabled', () => {
@@ -43,6 +46,7 @@ describe('View routes', () => {
       .toMatchInlineSnapshot(`
       Array [
         "/login",
+        "/security/access_agreement",
         "/security/account",
         "/security/logged_out",
         "/logout",
@@ -52,6 +56,7 @@ describe('View routes', () => {
     expect(routeParamsMock.router.get.mock.calls.map(([{ path }]) => path)).toMatchInlineSnapshot(`
       Array [
         "/internal/security/login_state",
+        "/internal/security/access_agreement/state",
       ]
     `);
   });
@@ -68,6 +73,7 @@ describe('View routes', () => {
       .toMatchInlineSnapshot(`
       Array [
         "/login",
+        "/security/access_agreement",
         "/security/account",
         "/security/logged_out",
         "/logout",
@@ -77,6 +83,7 @@ describe('View routes', () => {
     expect(routeParamsMock.router.get.mock.calls.map(([{ path }]) => path)).toMatchInlineSnapshot(`
       Array [
         "/internal/security/login_state",
+        "/internal/security/access_agreement/state",
       ]
     `);
   });
@@ -93,6 +100,7 @@ describe('View routes', () => {
       .toMatchInlineSnapshot(`
       Array [
         "/login",
+        "/security/access_agreement",
         "/security/account",
         "/security/logged_out",
         "/logout",
@@ -102,6 +110,7 @@ describe('View routes', () => {
     expect(routeParamsMock.router.get.mock.calls.map(([{ path }]) => path)).toMatchInlineSnapshot(`
       Array [
         "/internal/security/login_state",
+        "/internal/security/access_agreement/state",
       ]
     `);
   });
diff --git a/x-pack/plugins/security/server/routes/views/index.ts b/x-pack/plugins/security/server/routes/views/index.ts
index 255989dfeb90cd..b9de58d47fe407 100644
--- a/x-pack/plugins/security/server/routes/views/index.ts
+++ b/x-pack/plugins/security/server/routes/views/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { defineAccessAgreementRoutes } from './access_agreement';
 import { defineAccountManagementRoutes } from './account_management';
 import { defineLoggedOutRoutes } from './logged_out';
 import { defineLoginRoutes } from './login';
@@ -20,6 +21,7 @@ export function defineViewRoutes(params: RouteDefinitionParams) {
     defineLoginRoutes(params);
   }
 
+  defineAccessAgreementRoutes(params);
   defineAccountManagementRoutes(params);
   defineLoggedOutRoutes(params);
   defineLogoutRoutes(params);
diff --git a/x-pack/plugins/security/server/routes/views/logged_out.test.ts b/x-pack/plugins/security/server/routes/views/logged_out.test.ts
index 3ff05d242d9dde..7cb73c49f9cbc8 100644
--- a/x-pack/plugins/security/server/routes/views/logged_out.test.ts
+++ b/x-pack/plugins/security/server/routes/views/logged_out.test.ts
@@ -39,7 +39,7 @@ describe('LoggedOut view routes', () => {
 
   it('redirects user to the root page if they have a session already.', async () => {
     authc.getSessionInfo.mockResolvedValue({
-      provider: 'basic',
+      provider: { type: 'basic', name: 'basic' },
       now: 0,
       idleTimeoutExpiration: null,
       lifespanExpiration: null,
diff --git a/x-pack/plugins/security/server/routes/views/login.test.ts b/x-pack/plugins/security/server/routes/views/login.test.ts
index 8bc2bb32325fc0..014ad390a3d53b 100644
--- a/x-pack/plugins/security/server/routes/views/login.test.ts
+++ b/x-pack/plugins/security/server/routes/views/login.test.ts
@@ -163,6 +163,7 @@ describe('Login view routes', () => {
 
     it('returns only required license features.', async () => {
       license.getFeatures.mockReturnValue({
+        allowAccessAgreement: true,
         allowLogin: true,
         allowRbac: false,
         allowRoleDocumentLevelSecurity: true,
diff --git a/x-pack/test/api_integration/apis/security/session.ts b/x-pack/test/api_integration/apis/security/session.ts
index ef7e48388ff660..fcdf268ff27b0a 100644
--- a/x-pack/test/api_integration/apis/security/session.ts
+++ b/x-pack/test/api_integration/apis/security/session.ts
@@ -56,7 +56,7 @@ export default function({ getService }: FtrProviderContext) {
         expect(body.now).to.be.a('number');
         expect(body.idleTimeoutExpiration).to.be.a('number');
         expect(body.lifespanExpiration).to.be(null);
-        expect(body.provider).to.be('basic');
+        expect(body.provider).to.eql({ type: 'basic', name: 'basic' });
       });
 
       it('should not extend the session', async () => {

From 296855f8beae6cc9ef9e0624782fc2c3fb1073bf Mon Sep 17 00:00:00 2001
From: Robert Austin <robert.austin@elastic.co>
Date: Tue, 28 Apr 2020 12:22:13 -0400
Subject: [PATCH 11/17] [Endpoint] housekeeping (#64237)

Reorganizing, renaming, and generally cleaning up common code in Endpoint.

* Cleaning up `common/types`
* Renaming things
* Adding comments
* Removing `export` when it's not needed
---
 .../endpoint/common/alert_constants.ts        |  34 +++++
 .../plugins/endpoint/common/generate_data.ts  |  14 +-
 .../endpoint/common/schema/alert_index.ts     |   4 +-
 x-pack/plugins/endpoint/common/types.ts       | 138 +++++++++---------
 .../endpoint/store/alerts/middleware.ts       |   4 +-
 .../public/applications/endpoint/types.ts     |   3 +-
 .../policy/policy_forms/events/windows.tsx    |   6 +-
 .../policy_forms/protections/malware.tsx      |   6 +-
 .../plugins/endpoint/server/index_pattern.ts  |   4 +-
 .../server/routes/alerts/details/handlers.ts  |   5 +-
 .../routes/alerts/details/lib/pagination.ts   |  12 +-
 .../endpoint/server/routes/alerts/index.ts    |   4 +-
 .../server/routes/alerts/lib/index.ts         |   9 +-
 .../server/routes/alerts/list/lib/index.ts    |  10 +-
 .../endpoint/server/routes/alerts/types.ts    |   8 +-
 .../endpoint/server/routes/index_pattern.ts   |   5 +-
 .../server/routes/resolver/queries/base.ts    |   4 +-
 .../routes/resolver/queries/children.test.ts  |   6 +-
 .../queries/legacy_event_index_pattern.ts     |  10 ++
 .../routes/resolver/queries/lifecycle.test.ts |   9 +-
 .../resolver/queries/related_events.test.ts   |   6 +-
 21 files changed, 172 insertions(+), 129 deletions(-)
 create mode 100644 x-pack/plugins/endpoint/common/alert_constants.ts
 create mode 100644 x-pack/plugins/endpoint/server/routes/resolver/queries/legacy_event_index_pattern.ts

diff --git a/x-pack/plugins/endpoint/common/alert_constants.ts b/x-pack/plugins/endpoint/common/alert_constants.ts
new file mode 100644
index 00000000000000..85e1643d684f2c
--- /dev/null
+++ b/x-pack/plugins/endpoint/common/alert_constants.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export class AlertConstants {
+  /**
+   * The prefix for all Alert APIs
+   */
+  static BASE_API_URL = '/api/endpoint';
+  /**
+   * The path for the Alert's Index Pattern API.
+   */
+  static INDEX_PATTERN_ROUTE = `${AlertConstants.BASE_API_URL}/index_pattern`;
+  /**
+   * Alert's Index pattern
+   */
+  static ALERT_INDEX_NAME = 'events-endpoint-1';
+  /**
+   * A paramter passed to Alert's Index Pattern.
+   */
+  static EVENT_DATASET = 'events';
+  /**
+   * Alert's Search API default page size
+   */
+  static DEFAULT_TOTAL_HITS = 10000;
+  /**
+   * Alerts
+   **/
+  static ALERT_LIST_DEFAULT_PAGE_SIZE = 10;
+  static ALERT_LIST_DEFAULT_SORT = '@timestamp';
+  static MAX_LONG_INT = '9223372036854775807'; // 2^63-1
+}
diff --git a/x-pack/plugins/endpoint/common/generate_data.ts b/x-pack/plugins/endpoint/common/generate_data.ts
index 4f5a6eaeb0a5eb..61fbb779986dc9 100644
--- a/x-pack/plugins/endpoint/common/generate_data.ts
+++ b/x-pack/plugins/endpoint/common/generate_data.ts
@@ -9,9 +9,9 @@ import seedrandom from 'seedrandom';
 import {
   AlertEvent,
   EndpointEvent,
-  HostFields,
+  Host,
   HostMetadata,
-  OSFields,
+  HostOS,
   PolicyData,
   HostPolicyResponse,
   HostPolicyResponseActionStatus,
@@ -29,7 +29,7 @@ interface EventOptions {
   processName?: string;
 }
 
-const Windows: OSFields[] = [
+const Windows: HostOS[] = [
   {
     name: 'windows 10.0',
     full: 'Windows 10',
@@ -56,11 +56,11 @@ const Windows: OSFields[] = [
   },
 ];
 
-const Linux: OSFields[] = [];
+const Linux: HostOS[] = [];
 
-const Mac: OSFields[] = [];
+const Mac: HostOS[] = [];
 
-const OS: OSFields[] = [...Windows, ...Mac, ...Linux];
+const OS: HostOS[] = [...Windows, ...Mac, ...Linux];
 
 const POLICIES: Array<{ name: string; id: string }> = [
   {
@@ -102,7 +102,7 @@ interface HostInfo {
     version: string;
     id: string;
   };
-  host: HostFields;
+  host: Host;
   endpoint: {
     policy: {
       id: string;
diff --git a/x-pack/plugins/endpoint/common/schema/alert_index.ts b/x-pack/plugins/endpoint/common/schema/alert_index.ts
index 7b48780f2d86bb..cffc00661515f6 100644
--- a/x-pack/plugins/endpoint/common/schema/alert_index.ts
+++ b/x-pack/plugins/endpoint/common/schema/alert_index.ts
@@ -7,7 +7,7 @@
 import { schema, Type } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
 import { decode } from 'rison-node';
-import { EndpointAppConstants } from '../types';
+import { AlertConstants } from '../alert_constants';
 
 /**
  * Used to validate GET requests against the index of the alerting APIs.
@@ -18,7 +18,7 @@ export const alertingIndexGetQuerySchema = schema.object(
       schema.number({
         min: 1,
         max: 100,
-        defaultValue: EndpointAppConstants.ALERT_LIST_DEFAULT_PAGE_SIZE,
+        defaultValue: AlertConstants.ALERT_LIST_DEFAULT_PAGE_SIZE,
       })
     ),
     page_index: schema.maybe(
diff --git a/x-pack/plugins/endpoint/common/types.ts b/x-pack/plugins/endpoint/common/types.ts
index 4da4f9bc797ca6..8773c5441860a7 100644
--- a/x-pack/plugins/endpoint/common/types.ts
+++ b/x-pack/plugins/endpoint/common/types.ts
@@ -25,32 +25,19 @@ export type Immutable<T> = T extends undefined | null | boolean | string | numbe
   ? ImmutableSet<M>
   : ImmutableObject<T>;
 
-export type ImmutableArray<T> = ReadonlyArray<Immutable<T>>;
-export type ImmutableMap<K, V> = ReadonlyMap<Immutable<K>, Immutable<V>>;
-export type ImmutableSet<T> = ReadonlySet<Immutable<T>>;
-export type ImmutableObject<T> = { readonly [K in keyof T]: Immutable<T[K]> };
-
-export type Direction = 'asc' | 'desc';
-
-export class EndpointAppConstants {
-  static BASE_API_URL = '/api/endpoint';
-  static INDEX_PATTERN_ROUTE = `${EndpointAppConstants.BASE_API_URL}/index_pattern`;
-  static ALERT_INDEX_NAME = 'events-endpoint-1';
-  static EVENT_DATASET = 'events';
-  static DEFAULT_TOTAL_HITS = 10000;
-  /**
-   * Legacy events are stored in indices with endgame-* prefix
-   */
-  static LEGACY_EVENT_INDEX_NAME = 'endgame-*';
+type ImmutableArray<T> = ReadonlyArray<Immutable<T>>;
+type ImmutableMap<K, V> = ReadonlyMap<Immutable<K>, Immutable<V>>;
+type ImmutableSet<T> = ReadonlySet<Immutable<T>>;
+type ImmutableObject<T> = { readonly [K in keyof T]: Immutable<T[K]> };
 
-  /**
-   * Alerts
-   **/
-  static ALERT_LIST_DEFAULT_PAGE_SIZE = 10;
-  static ALERT_LIST_DEFAULT_SORT = '@timestamp';
-  static MAX_LONG_INT = '9223372036854775807'; // 2^63-1
-}
+/**
+ * Values for the Alert APIs 'order' and 'direction' parameters.
+ */
+export type AlertAPIOrdering = 'asc' | 'desc';
 
+/**
+ * Returned by 'api/endpoint/alerts'
+ */
 export interface AlertResultList {
   /**
    * The alerts restricted by page size.
@@ -88,6 +75,9 @@ export interface AlertResultList {
   prev: string | null;
 }
 
+/**
+ * Returned by the server via /api/endpoint/metadata
+ */
 export interface HostResultList {
   /* the hosts restricted by the page size */
   hosts: HostInfo[];
@@ -99,43 +89,61 @@ export interface HostResultList {
   request_page_index: number;
 }
 
-export interface OSFields {
+/**
+ * Operating System metadata for a host.
+ */
+export interface HostOS {
   full: string;
   name: string;
   version: string;
   variant: string;
 }
-export interface HostFields {
+
+/**
+ * Host metadata. Describes an endpoint host.
+ */
+export interface Host {
   id: string;
   hostname: string;
   ip: string[];
   mac: string[];
-  os: OSFields;
+  os: HostOS;
 }
-export interface HashFields {
+
+/**
+ * A record of hashes for something. Provides hashes in multiple formats. A favorite structure of the Elastic Endpoint.
+ */
+interface Hashes {
+  /**
+   * A hash in MD5 format.
+   */
   md5: string;
+  /**
+   * A hash in SHA-1 format.
+   */
   sha1: string;
+  /**
+   * A hash in SHA-256 format.
+   */
   sha256: string;
 }
-export interface MalwareClassificationFields {
+
+interface MalwareClassification {
   identifier: string;
   score: number;
   threshold: number;
   version: string;
 }
-export interface PrivilegesFields {
-  description: string;
-  name: string;
-  enabled: boolean;
-}
-export interface ThreadFields {
+
+interface ThreadFields {
   id: number;
   service_name: string;
   start: number;
   start_address: number;
   start_address_module: string;
 }
-export interface DllFields {
+
+interface DllFields {
   pe: {
     architecture: string;
     imphash: string;
@@ -145,8 +153,8 @@ export interface DllFields {
     trusted: boolean;
   };
   compile_time: number;
-  hash: HashFields;
-  malware_classification: MalwareClassificationFields;
+  hash: Hashes;
+  malware_classification: MalwareClassification;
   mapped_address: number;
   mapped_size: number;
   path: string;
@@ -154,7 +162,6 @@ export interface DllFields {
 
 /**
  * Describes an Alert Event.
- * Should be in line with ECS schema.
  */
 export type AlertEvent = Immutable<{
   '@timestamp': number;
@@ -191,14 +198,14 @@ export type AlertEvent = Immutable<{
       entity_id: string;
     };
     name: string;
-    hash: HashFields;
+    hash: Hashes;
     pe?: {
       imphash: string;
     };
     executable: string;
     sid?: string;
     start: number;
-    malware_classification?: MalwareClassificationFields;
+    malware_classification?: MalwareClassification;
     token: {
       domain: string;
       type: string;
@@ -206,7 +213,11 @@ export type AlertEvent = Immutable<{
       sid: string;
       integrity_level: number;
       integrity_level_name: string;
-      privileges?: PrivilegesFields[];
+      privileges?: Array<{
+        description: string;
+        name: string;
+        enabled: boolean;
+      }>;
     };
     thread?: ThreadFields[];
     uptime: number;
@@ -220,7 +231,7 @@ export type AlertEvent = Immutable<{
     mtime: number;
     created: number;
     size: number;
-    hash: HashFields;
+    hash: Hashes;
     pe?: {
       imphash: string;
     };
@@ -228,10 +239,10 @@ export type AlertEvent = Immutable<{
       trusted: boolean;
       subject_name: string;
     };
-    malware_classification: MalwareClassificationFields;
+    malware_classification: MalwareClassification;
     temp_file_path: string;
   };
-  host: HostFields;
+  host: Host;
   dll?: DllFields[];
 }>;
 
@@ -249,9 +260,6 @@ interface AlertState {
   };
 }
 
-/**
- * Union of alert data and metadata.
- */
 export type AlertData = AlertEvent & AlertMetadata;
 
 export type AlertDetails = AlertData & AlertState;
@@ -301,7 +309,7 @@ export type HostMetadata = Immutable<{
     id: string;
     version: string;
   };
-  host: HostFields;
+  host: Host;
 }>;
 
 /**
@@ -365,7 +373,7 @@ export interface EndpointEvent {
     hostname: string;
     ip: string[];
     mac: string[];
-    os: OSFields;
+    os: HostOS;
   };
   process: {
     entity_id: string;
@@ -500,28 +508,22 @@ export interface PolicyConfig {
   };
 }
 
-/**
- * Windows-specific policy configuration that is supported via the UI
- */
-type WindowsPolicyConfig = Pick<PolicyConfig['windows'], 'events' | 'malware'>;
-
-/**
- * Mac-specific policy configuration that is supported via the UI
- */
-type MacPolicyConfig = Pick<PolicyConfig['mac'], 'malware' | 'events'>;
-
-/**
- * Linux-specific policy configuration that is supported via the UI
- */
-type LinuxPolicyConfig = Pick<PolicyConfig['linux'], 'events'>;
-
 /**
  * The set of Policy configuration settings that are show/edited via the UI
  */
 export interface UIPolicyConfig {
-  windows: WindowsPolicyConfig;
-  mac: MacPolicyConfig;
-  linux: LinuxPolicyConfig;
+  /**
+   * Windows-specific policy configuration that is supported via the UI
+   */
+  windows: Pick<PolicyConfig['windows'], 'events' | 'malware'>;
+  /**
+   * Mac-specific policy configuration that is supported via the UI
+   */
+  mac: Pick<PolicyConfig['mac'], 'malware' | 'events'>;
+  /**
+   * Linux-specific policy configuration that is supported via the UI
+   */
+  linux: Pick<PolicyConfig['linux'], 'events'>;
 }
 
 interface PolicyConfigAdvancedOptions {
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/alerts/middleware.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/alerts/middleware.ts
index 90d6b8b82198af..6bc728db99819c 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/alerts/middleware.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/alerts/middleware.ts
@@ -9,7 +9,7 @@ import { AlertResultList, AlertDetails } from '../../../../../common/types';
 import { ImmutableMiddlewareFactory, AlertListState } from '../../types';
 import { isOnAlertPage, apiQueryParams, hasSelectedAlert, uiQueryParams } from './selectors';
 import { cloneHttpFetchQuery } from '../../../../common/clone_http_fetch_query';
-import { EndpointAppConstants } from '../../../../../common/types';
+import { AlertConstants } from '../../../../../common/alert_constants';
 
 export const alertMiddlewareFactory: ImmutableMiddlewareFactory<AlertListState> = (
   coreStart,
@@ -18,7 +18,7 @@ export const alertMiddlewareFactory: ImmutableMiddlewareFactory<AlertListState>
   async function fetchIndexPatterns(): Promise<IIndexPattern[]> {
     const { indexPatterns } = depsStart.data;
     const eventsPattern: { indexPattern: string } = await coreStart.http.get(
-      `${EndpointAppConstants.INDEX_PATTERN_ROUTE}/${EndpointAppConstants.EVENT_DATASET}`
+      `${AlertConstants.INDEX_PATTERN_ROUTE}/${AlertConstants.EVENT_DATASET}`
     );
     const fields = await indexPatterns.getFieldsForWildcard({
       pattern: eventsPattern.indexPattern,
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
index 82b812b79670f7..58e706f20ec8e0 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
@@ -17,7 +17,6 @@ import {
   AlertData,
   AlertResultList,
   Immutable,
-  ImmutableArray,
   AlertDetails,
   MalwareFields,
   UIPolicyConfig,
@@ -312,7 +311,7 @@ export type AlertListData = AlertResultList;
 
 export interface AlertListState {
   /** Array of alert items. */
-  readonly alerts: ImmutableArray<AlertData>;
+  readonly alerts: Immutable<AlertData[]>;
 
   /** The total number of alerts on the page. */
   readonly total: number;
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
index 7f946de9614ca7..9d73f12869058f 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
@@ -17,18 +17,18 @@ import {
 } from '../../../../store/policy_details/selectors';
 import { ConfigForm } from '../config_form';
 import { setIn, getIn } from '../../../../models/policy_details_config';
-import { UIPolicyConfig, ImmutableArray } from '../../../../../../../common/types';
+import { UIPolicyConfig, Immutable } from '../../../../../../../common/types';
 
 export const WindowsEvents = React.memo(() => {
   const selected = usePolicyDetailsSelector(selectedWindowsEvents);
   const total = usePolicyDetailsSelector(totalWindowsEvents);
 
   const checkboxes = useMemo(() => {
-    const items: ImmutableArray<{
+    const items: Immutable<Array<{
       name: string;
       os: 'windows';
       protectionField: keyof UIPolicyConfig['windows']['events'];
-    }> = [
+    }>> = [
       {
         name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.dllDriverLoad', {
           defaultMessage: 'DLL and Driver Load',
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/protections/malware.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/protections/malware.tsx
index 14871c71ec0386..4b2a6ece9f58fc 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/protections/malware.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/protections/malware.tsx
@@ -11,7 +11,7 @@ import { EuiRadio, EuiSwitch, EuiTitle, EuiSpacer } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { htmlIdGenerator } from '@elastic/eui';
-import { Immutable, ProtectionModes, ImmutableArray } from '../../../../../../../common/types';
+import { Immutable, ProtectionModes } from '../../../../../../../common/types';
 import { OS, MalwareProtectionOSes } from '../../../../types';
 import { ConfigForm } from '../config_form';
 import { policyConfig } from '../../../../store/policy_details/selectors';
@@ -73,11 +73,11 @@ export const MalwareProtections = React.memo(() => {
   // currently just taking windows.malware, but both windows.malware and mac.malware should be the same value
   const selected = policyDetailsConfig && policyDetailsConfig.windows.malware.mode;
 
-  const radios: ImmutableArray<{
+  const radios: Immutable<Array<{
     id: ProtectionModes;
     label: string;
     protection: 'malware';
-  }> = useMemo(() => {
+  }>> = useMemo(() => {
     return [
       {
         id: ProtectionModes.detect,
diff --git a/x-pack/plugins/endpoint/server/index_pattern.ts b/x-pack/plugins/endpoint/server/index_pattern.ts
index dcedd27fc5a3d4..903d48746bfb31 100644
--- a/x-pack/plugins/endpoint/server/index_pattern.ts
+++ b/x-pack/plugins/endpoint/server/index_pattern.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { Logger, LoggerFactory, RequestHandlerContext } from 'kibana/server';
-import { EndpointAppConstants } from '../common/types';
+import { AlertConstants } from '../common/alert_constants';
 import { ESIndexPatternService } from '../../ingest_manager/server';
 
 export interface IndexPatternRetriever {
@@ -33,7 +33,7 @@ export class IngestIndexPatternRetriever implements IndexPatternRetriever {
    * @returns a string representing the index pattern (e.g. `events-endpoint-*`)
    */
   async getEventIndexPattern(ctx: RequestHandlerContext) {
-    return await this.getIndexPattern(ctx, EndpointAppConstants.EVENT_DATASET);
+    return await this.getIndexPattern(ctx, AlertConstants.EVENT_DATASET);
   }
 
   /**
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/details/handlers.ts b/x-pack/plugins/endpoint/server/routes/alerts/details/handlers.ts
index e438ab853f3b52..92f8aacbf26a29 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/details/handlers.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/details/handlers.ts
@@ -5,7 +5,8 @@
  */
 import { GetResponse } from 'elasticsearch';
 import { KibanaRequest, RequestHandler } from 'kibana/server';
-import { AlertEvent, EndpointAppConstants } from '../../../../common/types';
+import { AlertEvent } from '../../../../common/types';
+import { AlertConstants } from '../../../../common/alert_constants';
 import { EndpointAppContext } from '../../../types';
 import { AlertDetailsRequestParams } from '../types';
 import { AlertDetailsPagination } from './lib';
@@ -22,7 +23,7 @@ export const alertDetailsHandlerWrapper = function(
     try {
       const alertId = req.params.id;
       const response = (await ctx.core.elasticsearch.dataClient.callAsCurrentUser('get', {
-        index: EndpointAppConstants.ALERT_INDEX_NAME,
+        index: AlertConstants.ALERT_INDEX_NAME,
         id: alertId,
       })) as GetResponse<AlertEvent>;
 
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/details/lib/pagination.ts b/x-pack/plugins/endpoint/server/routes/alerts/details/lib/pagination.ts
index d482da03872c62..0f69e1bb60c44e 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/details/lib/pagination.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/details/lib/pagination.ts
@@ -5,12 +5,8 @@
  */
 
 import { GetResponse, SearchResponse } from 'elasticsearch';
-import {
-  AlertEvent,
-  AlertHits,
-  Direction,
-  EndpointAppConstants,
-} from '../../../../../common/types';
+import { AlertEvent, AlertHits, AlertAPIOrdering } from '../../../../../common/types';
+import { AlertConstants } from '../../../../../common/alert_constants';
 import { EndpointConfigType } from '../../../../config';
 import { searchESForAlerts, Pagination } from '../../lib';
 import { AlertSearchQuery, SearchCursor, AlertDetailsRequestParams } from '../../types';
@@ -36,12 +32,12 @@ export class AlertDetailsPagination extends Pagination<
   }
 
   protected async doSearch(
-    direction: Direction,
+    direction: AlertAPIOrdering,
     cursor: SearchCursor
   ): Promise<SearchResponse<AlertEvent>> {
     const reqData: AlertSearchQuery = {
       pageSize: 1,
-      sort: EndpointAppConstants.ALERT_LIST_DEFAULT_SORT,
+      sort: AlertConstants.ALERT_LIST_DEFAULT_SORT,
       order: 'desc',
       query: { query: '', language: 'kuery' },
       filters: [] as Filter[],
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/index.ts b/x-pack/plugins/endpoint/server/routes/alerts/index.ts
index 09de11897813b5..b61f90b5b17f5a 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/index.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/index.ts
@@ -5,12 +5,12 @@
  */
 import { IRouter } from 'kibana/server';
 import { EndpointAppContext } from '../../types';
-import { EndpointAppConstants } from '../../../common/types';
+import { AlertConstants } from '../../../common/alert_constants';
 import { alertListHandlerWrapper } from './list';
 import { alertDetailsHandlerWrapper, alertDetailsReqSchema } from './details';
 import { alertingIndexGetQuerySchema } from '../../../common/schema/alert_index';
 
-export const BASE_ALERTS_ROUTE = `${EndpointAppConstants.BASE_API_URL}/alerts`;
+export const BASE_ALERTS_ROUTE = `${AlertConstants.BASE_API_URL}/alerts`;
 
 export function registerAlertRoutes(router: IRouter, endpointAppContext: EndpointAppContext) {
   router.get(
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/lib/index.ts b/x-pack/plugins/endpoint/server/routes/alerts/lib/index.ts
index 74db24c85eab5e..7bc1c0c306ae2b 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/lib/index.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/lib/index.ts
@@ -7,7 +7,8 @@ import { SearchResponse } from 'elasticsearch';
 import { IScopedClusterClient } from 'kibana/server';
 import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/public';
 import { esQuery } from '../../../../../../../src/plugins/data/server';
-import { AlertEvent, Direction, EndpointAppConstants } from '../../../../common/types';
+import { AlertEvent, AlertAPIOrdering } from '../../../../common/types';
+import { AlertConstants } from '../../../../common/alert_constants';
 import {
   AlertSearchQuery,
   AlertSearchRequest,
@@ -18,7 +19,7 @@ import {
 
 export { Pagination } from './pagination';
 
-function reverseSortDirection(order: Direction): Direction {
+function reverseSortDirection(order: AlertAPIOrdering): AlertAPIOrdering {
   if (order === 'asc') {
     return 'desc';
   }
@@ -100,13 +101,13 @@ const buildAlertSearchQuery = async (
   query: AlertSearchQuery,
   indexPattern: string
 ): Promise<AlertSearchRequestWrapper> => {
-  let totalHitsMin: number = EndpointAppConstants.DEFAULT_TOTAL_HITS;
+  let totalHitsMin: number = AlertConstants.DEFAULT_TOTAL_HITS;
 
   // Calculate minimum total hits set to indicate there's a next page
   if (query.fromIndex) {
     totalHitsMin = Math.max(
       query.fromIndex + query.pageSize * 2,
-      EndpointAppConstants.DEFAULT_TOTAL_HITS
+      AlertConstants.DEFAULT_TOTAL_HITS
     );
   }
 
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts b/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts
index 95c8e4662cfcea..92bd07a813d264 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/list/lib/index.ts
@@ -13,10 +13,10 @@ import {
   AlertData,
   AlertResultList,
   AlertHits,
-  EndpointAppConstants,
   ESTotal,
   AlertingIndexGetQueryResult,
 } from '../../../../../common/types';
+import { AlertConstants } from '../../../../../common/alert_constants';
 import { EndpointAppContext } from '../../../../types';
 import { AlertSearchQuery } from '../../types';
 import { AlertListPagination } from './pagination';
@@ -28,8 +28,8 @@ export const getRequestData = async (
   const config = await endpointAppContext.config();
   const reqData: AlertSearchQuery = {
     // Defaults not enforced by schema
-    pageSize: request.query.page_size || EndpointAppConstants.ALERT_LIST_DEFAULT_PAGE_SIZE,
-    sort: request.query.sort || EndpointAppConstants.ALERT_LIST_DEFAULT_SORT,
+    pageSize: request.query.page_size || AlertConstants.ALERT_LIST_DEFAULT_PAGE_SIZE,
+    sort: request.query.sort || AlertConstants.ALERT_LIST_DEFAULT_SORT,
     order: request.query.order || 'desc',
     dateRange: ((request.query.date_range !== undefined
       ? decode(request.query.date_range)
@@ -67,7 +67,7 @@ export const getRequestData = async (
     reqData.searchBefore[0] === '' &&
     reqData.emptyStringIsUndefined
   ) {
-    reqData.searchBefore[0] = EndpointAppConstants.MAX_LONG_INT;
+    reqData.searchBefore[0] = AlertConstants.MAX_LONG_INT;
   }
 
   if (
@@ -75,7 +75,7 @@ export const getRequestData = async (
     reqData.searchAfter[0] === '' &&
     reqData.emptyStringIsUndefined
   ) {
-    reqData.searchAfter[0] = EndpointAppConstants.MAX_LONG_INT;
+    reqData.searchAfter[0] = AlertConstants.MAX_LONG_INT;
   }
 
   return reqData;
diff --git a/x-pack/plugins/endpoint/server/routes/alerts/types.ts b/x-pack/plugins/endpoint/server/routes/alerts/types.ts
index cf4eac5d25f800..5aefc35b5758f1 100644
--- a/x-pack/plugins/endpoint/server/routes/alerts/types.ts
+++ b/x-pack/plugins/endpoint/server/routes/alerts/types.ts
@@ -5,14 +5,14 @@
  */
 import { Query, Filter, TimeRange } from '../../../../../../src/plugins/data/server';
 import { JsonObject } from '../../../../../../src/plugins/kibana_utils/public';
-import { Direction } from '../../../common/types';
+import { AlertAPIOrdering } from '../../../common/types';
 
 /**
  * Sort parameters for alerts in ES.
  */
 export interface AlertSortParam {
   [key: string]: {
-    order: Direction;
+    order: AlertAPIOrdering;
     missing?: UndefinedResultPosition;
   };
 }
@@ -38,7 +38,7 @@ export interface AlertSearchQuery {
   filters: Filter[];
   dateRange?: TimeRange;
   sort: string;
-  order: Direction;
+  order: AlertAPIOrdering;
   searchAfter?: SearchCursor;
   searchBefore?: SearchCursor;
   emptyStringIsUndefined?: boolean;
@@ -83,7 +83,7 @@ export interface AlertListRequestQuery {
   filters?: string;
   date_range: string;
   sort: string;
-  order: Direction;
+  order: AlertAPIOrdering;
   after?: SearchCursor;
   before?: SearchCursor;
   empty_string_is_undefined?: boolean;
diff --git a/x-pack/plugins/endpoint/server/routes/index_pattern.ts b/x-pack/plugins/endpoint/server/routes/index_pattern.ts
index 79083f5f05e149..7e78caaf178e46 100644
--- a/x-pack/plugins/endpoint/server/routes/index_pattern.ts
+++ b/x-pack/plugins/endpoint/server/routes/index_pattern.ts
@@ -6,7 +6,8 @@
 
 import { IRouter, Logger, RequestHandler } from 'kibana/server';
 import { EndpointAppContext } from '../types';
-import { IndexPatternGetParamsResult, EndpointAppConstants } from '../../common/types';
+import { IndexPatternGetParamsResult } from '../../common/types';
+import { AlertConstants } from '../../common/alert_constants';
 import { indexPatternGetParamsSchema } from '../../common/schema/index_pattern';
 
 function handleIndexPattern(
@@ -33,7 +34,7 @@ export function registerIndexPatternRoute(router: IRouter, endpointAppContext: E
 
   router.get(
     {
-      path: `${EndpointAppConstants.INDEX_PATTERN_ROUTE}/{datasetPath}`,
+      path: `${AlertConstants.INDEX_PATTERN_ROUTE}/{datasetPath}`,
       validate: { params: indexPatternGetParamsSchema },
       options: { authRequired: true },
     },
diff --git a/x-pack/plugins/endpoint/server/routes/resolver/queries/base.ts b/x-pack/plugins/endpoint/server/routes/resolver/queries/base.ts
index b049439207e508..3b3b4b0c9e8ac1 100644
--- a/x-pack/plugins/endpoint/server/routes/resolver/queries/base.ts
+++ b/x-pack/plugins/endpoint/server/routes/resolver/queries/base.ts
@@ -5,9 +5,9 @@
  */
 
 import { IScopedClusterClient } from 'kibana/server';
-import { EndpointAppConstants } from '../../../../common/types';
 import { paginate, paginatedResults, PaginationParams } from '../utils/pagination';
 import { JsonObject } from '../../../../../../../src/plugins/kibana_utils/public';
+import { legacyEventIndexPattern } from './legacy_event_index_pattern';
 
 export abstract class ResolverQuery {
   constructor(
@@ -25,7 +25,7 @@ export abstract class ResolverQuery {
 
   build(...ids: string[]) {
     if (this.endpointID) {
-      return this.legacyQuery(this.endpointID, ids, EndpointAppConstants.LEGACY_EVENT_INDEX_NAME);
+      return this.legacyQuery(this.endpointID, ids, legacyEventIndexPattern);
     }
     return this.query(ids, this.indexPattern);
   }
diff --git a/x-pack/plugins/endpoint/server/routes/resolver/queries/children.test.ts b/x-pack/plugins/endpoint/server/routes/resolver/queries/children.test.ts
index e73053d53dee08..d1d090579f0cd1 100644
--- a/x-pack/plugins/endpoint/server/routes/resolver/queries/children.test.ts
+++ b/x-pack/plugins/endpoint/server/routes/resolver/queries/children.test.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { ChildrenQuery } from './children';
-import { EndpointAppConstants } from '../../../../common/types';
+import { legacyEventIndexPattern } from './legacy_event_index_pattern';
 
 export const fakeEventIndexPattern = 'events-endpoint-*';
 
@@ -12,7 +12,7 @@ describe('children events query', () => {
   it('generates the correct legacy queries', () => {
     const timestamp = new Date().getTime();
     expect(
-      new ChildrenQuery(EndpointAppConstants.LEGACY_EVENT_INDEX_NAME, 'awesome-id', {
+      new ChildrenQuery(legacyEventIndexPattern, 'awesome-id', {
         size: 1,
         timestamp,
         eventID: 'foo',
@@ -48,7 +48,7 @@ describe('children events query', () => {
         size: 1,
         sort: [{ '@timestamp': 'asc' }, { 'endgame.serial_event_id': 'asc' }],
       },
-      index: EndpointAppConstants.LEGACY_EVENT_INDEX_NAME,
+      index: legacyEventIndexPattern,
     });
   });
 
diff --git a/x-pack/plugins/endpoint/server/routes/resolver/queries/legacy_event_index_pattern.ts b/x-pack/plugins/endpoint/server/routes/resolver/queries/legacy_event_index_pattern.ts
new file mode 100644
index 00000000000000..01e818c89b3efc
--- /dev/null
+++ b/x-pack/plugins/endpoint/server/routes/resolver/queries/legacy_event_index_pattern.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+/**
+ * Legacy events are stored in indices with endgame-* prefix
+ */
+export const legacyEventIndexPattern = 'endgame-*';
diff --git a/x-pack/plugins/endpoint/server/routes/resolver/queries/lifecycle.test.ts b/x-pack/plugins/endpoint/server/routes/resolver/queries/lifecycle.test.ts
index 8a3955706b2781..9d3c675ecc54cf 100644
--- a/x-pack/plugins/endpoint/server/routes/resolver/queries/lifecycle.test.ts
+++ b/x-pack/plugins/endpoint/server/routes/resolver/queries/lifecycle.test.ts
@@ -3,15 +3,14 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import { EndpointAppConstants } from '../../../../common/types';
+
 import { LifecycleQuery } from './lifecycle';
 import { fakeEventIndexPattern } from './children.test';
+import { legacyEventIndexPattern } from './legacy_event_index_pattern';
 
 describe('lifecycle query', () => {
   it('generates the correct legacy queries', () => {
-    expect(
-      new LifecycleQuery(EndpointAppConstants.LEGACY_EVENT_INDEX_NAME, 'awesome-id').build('5')
-    ).toStrictEqual({
+    expect(new LifecycleQuery(legacyEventIndexPattern, 'awesome-id').build('5')).toStrictEqual({
       body: {
         query: {
           bool: {
@@ -30,7 +29,7 @@ describe('lifecycle query', () => {
         },
         sort: [{ '@timestamp': 'asc' }],
       },
-      index: EndpointAppConstants.LEGACY_EVENT_INDEX_NAME,
+      index: legacyEventIndexPattern,
     });
   });
 
diff --git a/x-pack/plugins/endpoint/server/routes/resolver/queries/related_events.test.ts b/x-pack/plugins/endpoint/server/routes/resolver/queries/related_events.test.ts
index 5caef935ce6214..26205e9db6e45e 100644
--- a/x-pack/plugins/endpoint/server/routes/resolver/queries/related_events.test.ts
+++ b/x-pack/plugins/endpoint/server/routes/resolver/queries/related_events.test.ts
@@ -4,14 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { RelatedEventsQuery } from './related_events';
-import { EndpointAppConstants } from '../../../../common/types';
 import { fakeEventIndexPattern } from './children.test';
+import { legacyEventIndexPattern } from './legacy_event_index_pattern';
 
 describe('related events query', () => {
   it('generates the correct legacy queries', () => {
     const timestamp = new Date().getTime();
     expect(
-      new RelatedEventsQuery(EndpointAppConstants.LEGACY_EVENT_INDEX_NAME, 'awesome-id', {
+      new RelatedEventsQuery(legacyEventIndexPattern, 'awesome-id', {
         size: 1,
         timestamp,
         eventID: 'foo',
@@ -48,7 +48,7 @@ describe('related events query', () => {
         size: 1,
         sort: [{ '@timestamp': 'asc' }, { 'endgame.serial_event_id': 'asc' }],
       },
-      index: EndpointAppConstants.LEGACY_EVENT_INDEX_NAME,
+      index: legacyEventIndexPattern,
     });
   });
 

From 4e0c11ea406c1b100b403a01a9f24d63ee31b725 Mon Sep 17 00:00:00 2001
From: Patrick Mueller <pmuellr@gmail.com>
Date: Tue, 28 Apr 2020 12:37:25 -0400
Subject: [PATCH 12/17] [Event Log] use @timestamp field for queries (#64391)

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

Changes the fields used to query the event log by time range to use the
`@timestamp` field.

Also allow `@timestamp` as a sort option, and make it the default sort option.
---
 .../server/es/cluster_client_adapter.test.ts  |  8 +--
 .../server/es/cluster_client_adapter.ts       |  4 +-
 .../event_log/server/event_log_client.test.ts |  4 +-
 .../event_log/server/event_log_client.ts      |  3 +-
 .../event_log/public_api_integration.ts       | 51 ++++++-------------
 .../event_log/service_api_integration.ts      |  3 +-
 6 files changed, 28 insertions(+), 45 deletions(-)

diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
index 470123ada48ea4..f79962a3241317 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.test.ts
@@ -226,7 +226,7 @@ describe('queryEventsBySavedObject', () => {
       body: {
         from: 0,
         size: 10,
-        sort: { 'event.start': { order: 'asc' } },
+        sort: { '@timestamp': { order: 'asc' } },
         query: {
           bool: {
             must: [
@@ -340,7 +340,7 @@ describe('queryEventsBySavedObject', () => {
               },
               {
                 range: {
-                  'event.start': {
+                  '@timestamp': {
                     gte: start,
                   },
                 },
@@ -409,14 +409,14 @@ describe('queryEventsBySavedObject', () => {
               },
               {
                 range: {
-                  'event.start': {
+                  '@timestamp': {
                     gte: start,
                   },
                 },
               },
               {
                 range: {
-                  'event.end': {
+                  '@timestamp': {
                     lte: end,
                   },
                 },
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 6d5c6b31a637c3..47d273b9981e32 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -176,14 +176,14 @@ export class ClusterClientAdapter {
                   },
                   start && {
                     range: {
-                      'event.start': {
+                      '@timestamp': {
                         gte: start,
                       },
                     },
                   },
                   end && {
                     range: {
-                      'event.end': {
+                      '@timestamp': {
                         lte: end,
                       },
                     },
diff --git a/x-pack/plugins/event_log/server/event_log_client.test.ts b/x-pack/plugins/event_log/server/event_log_client.test.ts
index 6d4c9b67abc1ba..17c073c4b27f9b 100644
--- a/x-pack/plugins/event_log/server/event_log_client.test.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.test.ts
@@ -112,7 +112,7 @@ describe('EventLogStart', () => {
         {
           page: 1,
           per_page: 10,
-          sort_field: 'event.start',
+          sort_field: '@timestamp',
           sort_order: 'asc',
         }
       );
@@ -193,7 +193,7 @@ describe('EventLogStart', () => {
         {
           page: 1,
           per_page: 10,
-          sort_field: 'event.start',
+          sort_field: '@timestamp',
           sort_order: 'asc',
           start,
           end,
diff --git a/x-pack/plugins/event_log/server/event_log_client.ts b/x-pack/plugins/event_log/server/event_log_client.ts
index 765f0895f8e0d1..8ef245e60aadc4 100644
--- a/x-pack/plugins/event_log/server/event_log_client.ts
+++ b/x-pack/plugins/event_log/server/event_log_client.ts
@@ -36,6 +36,7 @@ export const findOptionsSchema = schema.object({
   end: optionalDateFieldSchema,
   sort_field: schema.oneOf(
     [
+      schema.literal('@timestamp'),
       schema.literal('event.start'),
       schema.literal('event.end'),
       schema.literal('event.provider'),
@@ -44,7 +45,7 @@ export const findOptionsSchema = schema.object({
       schema.literal('message'),
     ],
     {
-      defaultValue: 'event.start',
+      defaultValue: '@timestamp',
     }
   ),
   sort_order: schema.oneOf([schema.literal('asc'), schema.literal('desc')], {
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
index d664357c3ba126..e5b840b335846f 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts
@@ -7,7 +7,7 @@
 import { merge, omit, times, chunk, isEmpty } from 'lodash';
 import uuid from 'uuid';
 import expect from '@kbn/expect/expect.js';
-import moment, { Moment } from 'moment';
+import moment from 'moment';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { IEvent } from '../../../../plugins/event_log/server';
 import { IValidatedEvent } from '../../../../plugins/event_log/server/types';
@@ -43,10 +43,8 @@ export default function({ getService }: FtrProviderContext) {
     it('should support pagination for events', async () => {
       const id = uuid.v4();
 
-      const timestamp = moment();
-      const [firstExpectedEvent, ...expectedEvents] = times(6, () =>
-        fakeEvent(id, fakeEventTiming(timestamp.add(1, 's')))
-      );
+      const [firstExpectedEvent, ...expectedEvents] = times(6, () => fakeEvent(id));
+
       // run one first to create the SO and avoid clashes
       await logTestEvent(id, firstExpectedEvent);
       await Promise.all(expectedEvents.map(event => logTestEvent(id, event)));
@@ -82,10 +80,7 @@ export default function({ getService }: FtrProviderContext) {
     it('should support sorting by event end', async () => {
       const id = uuid.v4();
 
-      const timestamp = moment();
-      const [firstExpectedEvent, ...expectedEvents] = times(6, () =>
-        fakeEvent(id, fakeEventTiming(timestamp.add(1, 's')))
-      );
+      const [firstExpectedEvent, ...expectedEvents] = times(6, () => fakeEvent(id));
       // run one first to create the SO and avoid clashes
       await logTestEvent(id, firstExpectedEvent);
       await Promise.all(expectedEvents.map(event => logTestEvent(id, event)));
@@ -106,21 +101,24 @@ export default function({ getService }: FtrProviderContext) {
     it('should support date ranges for events', async () => {
       const id = uuid.v4();
 
-      const timestamp = moment();
-
-      const firstEvent = fakeEvent(id, fakeEventTiming(timestamp));
+      // write a document that shouldn't be found in the inclusive date range search
+      const firstEvent = fakeEvent(id);
       await logTestEvent(id, firstEvent);
-      await delay(100);
 
-      const start = timestamp.add(1, 's').toISOString();
+      // wait a second, get the start time for the date range search
+      await delay(1000);
+      const start = new Date().toISOString();
 
-      const expectedEvents = times(6, () => fakeEvent(id, fakeEventTiming(timestamp.add(1, 's'))));
+      // write the documents that we should be found in the date range searches
+      const expectedEvents = times(6, () => fakeEvent(id));
       await Promise.all(expectedEvents.map(event => logTestEvent(id, event)));
 
-      const end = timestamp.add(1, 's').toISOString();
+      // get the end time for the date range search
+      const end = new Date().toISOString();
 
-      await delay(100);
-      const lastEvent = fakeEvent(id, fakeEventTiming(timestamp.add(1, 's')));
+      // write a document that shouldn't be found in the inclusive date range search
+      await delay(1000);
+      const lastEvent = fakeEvent(id);
       await logTestEvent(id, lastEvent);
 
       await retry.try(async () => {
@@ -195,29 +193,12 @@ export default function({ getService }: FtrProviderContext) {
       .expect(200);
   }
 
-  function fakeEventTiming(start: Moment): Partial<IEvent> {
-    return {
-      event: {
-        start: start.toISOString(),
-        end: start
-          .clone()
-          .add(500, 'milliseconds')
-          .toISOString(),
-      },
-    };
-  }
-
   function fakeEvent(id: string, overrides: Partial<IEvent> = {}): IEvent {
-    const start = moment().toISOString();
-    const end = moment().toISOString();
     return merge(
       {
         event: {
           provider: 'event_log_fixture',
           action: 'test',
-          start,
-          end,
-          duration: 1000000,
         },
         kibana: {
           saved_objects: [
diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
index 2de395308ce74c..31668e8345275e 100644
--- a/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/event_log/service_api_integration.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import uuid from 'uuid';
 import expect from '@kbn/expect/expect.js';
 import { IEvent } from '../../../../plugins/event_log/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
@@ -97,7 +98,7 @@ export default function({ getService }: FtrProviderContext) {
         await registerProviderActions('provider4', ['action1', 'action2']);
       }
 
-      const eventId = '1';
+      const eventId = uuid.v4();
       const event: IEvent = {
         event: { action: 'action1', provider: 'provider4' },
         kibana: { saved_objects: [{ type: 'event_log_test', id: eventId }] },

From 3b753ec514a27ac26c1d13e662f3c9f032f53438 Mon Sep 17 00:00:00 2001
From: CJ Cenizal <cj@cenizal.com>
Date: Tue, 28 Apr 2020 09:41:02 -0700
Subject: [PATCH 13/17] ES UI new platform cleanup (#64332)

---
 ...ore-server.savedobjectscorefieldmapping.md |  1 +
 ...savedobjectscorefieldmapping.null_value.md | 11 +++
 .../server/saved_objects/mappings/types.ts    |  1 +
 src/core/server/server.api.md                 |  2 +
 x-pack/index.js                               |  6 --
 .../legacy/plugins/index_management/index.ts  | 13 ----
 .../legacy/plugins/remote_clusters/index.ts   | 40 -----------
 .../legacy/plugins/upgrade_assistant/index.ts | 28 --------
 .../plugins/upgrade_assistant/mappings.json   | 65 ------------------
 .../public/application/_hacks.scss}           |  5 +-
 .../public/application/index.js               |  2 +
 .../upgrade_assistant/server/plugin.ts        | 15 ++++-
 .../server/saved_object_types}/index.ts       |  5 +-
 .../reindex_operation_saved_object_type.ts    | 63 +++++++++++++++++
 .../telemetry_saved_object_type.ts            | 67 +++++++++++++++++++
 15 files changed, 162 insertions(+), 162 deletions(-)
 create mode 100644 docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
 delete mode 100644 x-pack/legacy/plugins/index_management/index.ts
 delete mode 100644 x-pack/legacy/plugins/remote_clusters/index.ts
 delete mode 100644 x-pack/legacy/plugins/upgrade_assistant/index.ts
 delete mode 100644 x-pack/legacy/plugins/upgrade_assistant/mappings.json
 rename x-pack/{legacy/plugins/remote_clusters/public/index.scss => plugins/remote_clusters/public/application/_hacks.scss} (82%)
 rename x-pack/{legacy/plugins/remote_clusters/common => plugins/upgrade_assistant/server/saved_object_types}/index.ts (59%)
 create mode 100644 x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
 create mode 100644 x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts

diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
index 96f11436308569..dbc7d0ca431cec 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
@@ -19,5 +19,6 @@ export interface SavedObjectsCoreFieldMapping
 |  [enabled](./kibana-plugin-core-server.savedobjectscorefieldmapping.enabled.md) | <code>boolean</code> |  |
 |  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>        };</code><br/><code>    }</code> |  |
 |  [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> |  |
+|  [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> |  |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
new file mode 100644
index 00000000000000..627ea3695383a0
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md)
+
+## SavedObjectsCoreFieldMapping.null\_value property
+
+<b>Signature:</b>
+
+```typescript
+null_value?: number | boolean | string;
+```
diff --git a/src/core/server/saved_objects/mappings/types.ts b/src/core/server/saved_objects/mappings/types.ts
index 47fc29f8cf7d29..c1b65763949bbe 100644
--- a/src/core/server/saved_objects/mappings/types.ts
+++ b/src/core/server/saved_objects/mappings/types.ts
@@ -131,6 +131,7 @@ export interface IndexMappingMeta {
  */
 export interface SavedObjectsCoreFieldMapping {
   type: string;
+  null_value?: number | boolean | string;
   index?: boolean;
   enabled?: boolean;
   fields?: {
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index a36e746f6d9405..dc1c9d379d508a 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -1840,6 +1840,8 @@ export interface SavedObjectsCoreFieldMapping {
     // (undocumented)
     index?: boolean;
     // (undocumented)
+    null_value?: number | boolean | string;
+    // (undocumented)
     type: string;
 }
 
diff --git a/x-pack/index.js b/x-pack/index.js
index 3761af5c1ca7a8..fe4c3254059337 100644
--- a/x-pack/index.js
+++ b/x-pack/index.js
@@ -12,13 +12,10 @@ import { dashboardMode } from './legacy/plugins/dashboard_mode';
 import { beats } from './legacy/plugins/beats_management';
 import { apm } from './legacy/plugins/apm';
 import { maps } from './legacy/plugins/maps';
-import { indexManagement } from './legacy/plugins/index_management';
 import { spaces } from './legacy/plugins/spaces';
 import { canvas } from './legacy/plugins/canvas';
 import { infra } from './legacy/plugins/infra';
 import { taskManager } from './legacy/plugins/task_manager';
-import { remoteClusters } from './legacy/plugins/remote_clusters';
-import { upgradeAssistant } from './legacy/plugins/upgrade_assistant';
 import { uptime } from './legacy/plugins/uptime';
 import { encryptedSavedObjects } from './legacy/plugins/encrypted_saved_objects';
 import { actions } from './legacy/plugins/actions';
@@ -38,11 +35,8 @@ module.exports = function(kibana) {
     apm(kibana),
     maps(kibana),
     canvas(kibana),
-    indexManagement(kibana),
     infra(kibana),
     taskManager(kibana),
-    remoteClusters(kibana),
-    upgradeAssistant(kibana),
     uptime(kibana),
     encryptedSavedObjects(kibana),
     actions(kibana),
diff --git a/x-pack/legacy/plugins/index_management/index.ts b/x-pack/legacy/plugins/index_management/index.ts
deleted file mode 100644
index afca15203b9702..00000000000000
--- a/x-pack/legacy/plugins/index_management/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-// TODO: Remove this once CCR is migrated to the plugins directory.
-export function indexManagement(kibana: any) {
-  return new kibana.Plugin({
-    id: 'index_management',
-    configPrefix: 'xpack.index_management',
-  });
-}
diff --git a/x-pack/legacy/plugins/remote_clusters/index.ts b/x-pack/legacy/plugins/remote_clusters/index.ts
deleted file mode 100644
index 439cb818d8a562..00000000000000
--- a/x-pack/legacy/plugins/remote_clusters/index.ts
+++ /dev/null
@@ -1,40 +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 { resolve } from 'path';
-import { Legacy } from 'kibana';
-
-import { PLUGIN } from './common';
-
-export function remoteClusters(kibana: any) {
-  return new kibana.Plugin({
-    id: PLUGIN.ID,
-    configPrefix: 'xpack.remote_clusters',
-    publicDir: resolve(__dirname, 'public'),
-    require: ['kibana'],
-    uiExports: {
-      styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-    },
-    // TODO: Remove once CCR has migrated to NP
-    config(Joi: any) {
-      return Joi.object({
-        // display menu item
-        ui: Joi.object({
-          enabled: Joi.boolean().default(true),
-        }).default(),
-
-        // enable plugin
-        enabled: Joi.boolean().default(true),
-      }).default();
-    },
-    isEnabled(config: Legacy.KibanaConfig) {
-      return (
-        config.get('xpack.remote_clusters.enabled') && config.get('xpack.index_management.enabled')
-      );
-    },
-    init() {},
-  });
-}
diff --git a/x-pack/legacy/plugins/upgrade_assistant/index.ts b/x-pack/legacy/plugins/upgrade_assistant/index.ts
deleted file mode 100644
index b5e8ce47502155..00000000000000
--- a/x-pack/legacy/plugins/upgrade_assistant/index.ts
+++ /dev/null
@@ -1,28 +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 { Legacy } from 'kibana';
-import mappings from './mappings.json';
-
-export function upgradeAssistant(kibana: any) {
-  const config: Legacy.PluginSpecOptions = {
-    id: 'upgrade_assistant',
-    uiExports: {
-      // @ts-ignore
-      savedObjectSchemas: {
-        'upgrade-assistant-reindex-operation': {
-          isNamespaceAgnostic: true,
-        },
-        'upgrade-assistant-telemetry': {
-          isNamespaceAgnostic: true,
-        },
-      },
-      mappings,
-    },
-
-    init() {},
-  };
-  return new kibana.Plugin(config);
-}
diff --git a/x-pack/legacy/plugins/upgrade_assistant/mappings.json b/x-pack/legacy/plugins/upgrade_assistant/mappings.json
deleted file mode 100644
index 885ac4d5a9b44f..00000000000000
--- a/x-pack/legacy/plugins/upgrade_assistant/mappings.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "upgrade-assistant-reindex-operation": {
-    "dynamic": true,
-    "properties": {
-      "indexName": {
-        "type": "keyword"
-      },
-      "status": {
-        "type": "integer"
-      }
-    }
-  },
-  "upgrade-assistant-telemetry": {
-    "properties": {
-      "ui_open": {
-        "properties": {
-          "overview": {
-            "type": "long",
-            "null_value": 0
-          },
-          "cluster": {
-            "type": "long",
-            "null_value": 0
-          },
-          "indices": {
-            "type": "long",
-            "null_value": 0
-          }
-        }
-      },
-      "ui_reindex": {
-        "properties": {
-          "close": {
-            "type": "long",
-            "null_value": 0
-          },
-          "open": {
-            "type": "long",
-            "null_value": 0
-          },
-          "start": {
-            "type": "long",
-            "null_value": 0
-          },
-          "stop": {
-            "type": "long",
-            "null_value": 0
-          }
-        }
-      },
-      "features": {
-        "properties": {
-          "deprecation_logging": {
-            "properties": {
-              "enabled": {
-                "type": "boolean",
-                "null_value": true
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/x-pack/legacy/plugins/remote_clusters/public/index.scss b/x-pack/plugins/remote_clusters/public/application/_hacks.scss
similarity index 82%
rename from x-pack/legacy/plugins/remote_clusters/public/index.scss
rename to x-pack/plugins/remote_clusters/public/application/_hacks.scss
index 4ae11323642d8a..b7d81885e716d0 100644
--- a/x-pack/legacy/plugins/remote_clusters/public/index.scss
+++ b/x-pack/plugins/remote_clusters/public/application/_hacks.scss
@@ -1,7 +1,4 @@
-// Import the EUI global scope so we can use EUI constants
-@import 'src/legacy/ui/public/styles/_styling_constants';
-
-// Remote clusters plugin styles
+// Remote clusters plugin hacks
 
 // Prefix all styles with "remoteClusters" to avoid conflicts.
 // Examples
diff --git a/x-pack/plugins/remote_clusters/public/application/index.js b/x-pack/plugins/remote_clusters/public/application/index.js
index f2d788c7413428..cf6e855ba58dfa 100644
--- a/x-pack/plugins/remote_clusters/public/application/index.js
+++ b/x-pack/plugins/remote_clusters/public/application/index.js
@@ -13,6 +13,8 @@ import { App } from './app';
 import { remoteClustersStore } from './store';
 import { AppContextProvider } from './app_context';
 
+import './_hacks.scss';
+
 export const renderApp = (elem, I18nContext, appDependencies) => {
   render(
     <I18nContext>
diff --git a/x-pack/plugins/upgrade_assistant/server/plugin.ts b/x-pack/plugins/upgrade_assistant/server/plugin.ts
index bdca506cc73385..0cdf1ca05feac2 100644
--- a/x-pack/plugins/upgrade_assistant/server/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/server/plugin.ts
@@ -25,6 +25,8 @@ import { registerClusterCheckupRoutes } from './routes/cluster_checkup';
 import { registerDeprecationLoggingRoutes } from './routes/deprecation_logging';
 import { registerReindexIndicesRoutes, createReindexWorker } from './routes/reindex_indices';
 import { registerTelemetryRoutes } from './routes/telemetry';
+import { telemetrySavedObjectType, reindexOperationSavedObjectType } from './saved_object_types';
+
 import { RouteDependencies } from './types';
 
 interface PluginsSetup {
@@ -57,11 +59,14 @@ export class UpgradeAssistantServerPlugin implements Plugin {
   }
 
   setup(
-    { http, getStartServices, capabilities }: CoreSetup,
+    { http, getStartServices, capabilities, savedObjects }: CoreSetup,
     { usageCollection, cloud, licensing }: PluginsSetup
   ) {
     this.licensing = licensing;
 
+    savedObjects.registerType(reindexOperationSavedObjectType);
+    savedObjects.registerType(telemetrySavedObjectType);
+
     const router = http.createRouter();
 
     const dependencies: RouteDependencies = {
@@ -85,8 +90,12 @@ export class UpgradeAssistantServerPlugin implements Plugin {
     registerTelemetryRoutes(dependencies);
 
     if (usageCollection) {
-      getStartServices().then(([{ savedObjects, elasticsearch }]) => {
-        registerUpgradeAssistantUsageCollector({ elasticsearch, usageCollection, savedObjects });
+      getStartServices().then(([{ savedObjects: savedObjectsService, elasticsearch }]) => {
+        registerUpgradeAssistantUsageCollector({
+          elasticsearch,
+          usageCollection,
+          savedObjects: savedObjectsService,
+        });
       });
     }
   }
diff --git a/x-pack/legacy/plugins/remote_clusters/common/index.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
similarity index 59%
rename from x-pack/legacy/plugins/remote_clusters/common/index.ts
rename to x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
index baad348d7a1365..dee0a74d8994bb 100644
--- a/x-pack/legacy/plugins/remote_clusters/common/index.ts
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/index.ts
@@ -4,6 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export const PLUGIN = {
-  ID: 'remoteClusters',
-};
+export { reindexOperationSavedObjectType } from './reindex_operation_saved_object_type';
+export { telemetrySavedObjectType } from './telemetry_saved_object_type';
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.ts
new file mode 100644
index 00000000000000..ba661fbeceb267
--- /dev/null
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/reindex_operation_saved_object_type.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 { SavedObjectsType } from 'src/core/server';
+
+import { REINDEX_OP_TYPE } from '../../common/types';
+
+export const reindexOperationSavedObjectType: SavedObjectsType = {
+  name: REINDEX_OP_TYPE,
+  hidden: false,
+  namespaceType: 'agnostic',
+  mappings: {
+    properties: {
+      reindexTaskId: {
+        type: 'keyword',
+      },
+      indexName: {
+        type: 'keyword',
+      },
+      newIndexName: {
+        type: 'keyword',
+      },
+      status: {
+        type: 'integer',
+      },
+      locked: {
+        type: 'date',
+      },
+      lastCompletedStep: {
+        type: 'integer',
+      },
+      errorMessage: {
+        type: 'keyword',
+      },
+      reindexTaskPercComplete: {
+        type: 'float',
+      },
+      runningReindexCount: {
+        type: 'integer',
+      },
+      reindexOptions: {
+        properties: {
+          openAndClose: {
+            type: 'boolean',
+          },
+          queueSettings: {
+            properties: {
+              queuedAt: {
+                type: 'long',
+              },
+              startedAt: {
+                type: 'long',
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
new file mode 100644
index 00000000000000..b1321e634c0f1c
--- /dev/null
+++ b/x-pack/plugins/upgrade_assistant/server/saved_object_types/telemetry_saved_object_type.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { SavedObjectsType } from 'src/core/server';
+
+import { UPGRADE_ASSISTANT_TYPE } from '../../common/types';
+
+export const telemetrySavedObjectType: SavedObjectsType = {
+  name: UPGRADE_ASSISTANT_TYPE,
+  hidden: false,
+  namespaceType: 'agnostic',
+  mappings: {
+    properties: {
+      ui_open: {
+        properties: {
+          overview: {
+            type: 'long',
+            null_value: 0,
+          },
+          cluster: {
+            type: 'long',
+            null_value: 0,
+          },
+          indices: {
+            type: 'long',
+            null_value: 0,
+          },
+        },
+      },
+      ui_reindex: {
+        properties: {
+          close: {
+            type: 'long',
+            null_value: 0,
+          },
+          open: {
+            type: 'long',
+            null_value: 0,
+          },
+          start: {
+            type: 'long',
+            null_value: 0,
+          },
+          stop: {
+            type: 'long',
+            null_value: 0,
+          },
+        },
+      },
+      features: {
+        properties: {
+          deprecation_logging: {
+            properties: {
+              enabled: {
+                type: 'boolean',
+                null_value: true,
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};

From 02cbd9c374c2b7549427f74dded6b02823db538e Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Tue, 28 Apr 2020 10:41:36 -0600
Subject: [PATCH 14/17] Consolidate cross-cutting concerns between region &
 coordinate maps in new maps_legacy plugin (#64123)

---
 .../vis_type_vega/vega_visualization.js       | 14 +++++
 .../__tests__/region_map_visualization.js     | 20 ++++--
 .../public/components/region_map_options.tsx  |  3 +-
 .../core_plugins/region_map/public/legacy.ts  |  5 --
 .../core_plugins/region_map/public/plugin.ts  | 19 +++---
 .../region_map/public/region_map_type.js      |  4 +-
 .../public/region_map_visualization.js        | 21 ++-----
 .../region_map/public/tooltip.html            |  8 ---
 .../region_map/public/tooltip_formatter.js    | 57 +++++++----------
 .../core_plugins/region_map/public/util.ts    |  3 +-
 .../core_plugins/tile_map/common/origin.ts    | 23 -------
 .../coordinate_maps_visualization.js          | 20 ++++--
 .../public/__tests__/geohash_layer.js         |  3 +-
 .../public/components/tile_map_options.tsx    |  4 +-
 .../tile_map/public/editors/_tooltip.html     |  8 ---
 .../public/editors/_tooltip_formatter.js      | 62 -------------------
 .../tile_map/public/geohash_layer.js          |  3 +-
 .../core_plugins/tile_map/public/legacy.ts    |  5 --
 .../core_plugins/tile_map/public/plugin.ts    | 20 +++---
 .../tile_map/public/shim/index.ts             | 20 ------
 .../tile_map/public/tile_map_type.js          |  3 +-
 .../tile_map/public/tile_map_visualization.js | 35 ++++-------
 ...dencies_plugin.ts => tooltip_formatter.js} | 42 +++++++------
 .../public/__tests__/map/service_settings.js  |  2 +-
 .../public/common/{ => constants}/origin.ts   |  0
 .../common/types/external_basemap_types.ts}   |  2 +-
 .../maps_legacy/public/common/types}/index.ts |  8 ++-
 .../public/common/types}/map_types.ts         |  0
 .../public/common/types/region_map_types.ts}  |  4 +-
 .../components/wms_internal_options.tsx       | 43 ++++++++-----
 .../public/components/wms_options.tsx         | 18 +++---
 src/plugins/maps_legacy/public/index.ts       | 27 +++++++-
 .../public/map}/base_maps_visualization.js    | 24 ++++---
 .../maps_legacy/public/map/kibana_map.js      | 30 +++++----
 .../public/map/service_settings.js            |  2 +-
 src/plugins/maps_legacy/public/plugin.ts      | 12 ++--
 .../maps_legacy/public/tooltip_provider.js}   | 39 ++++++------
 src/plugins/vis_type_vega/public/plugin.ts    |  7 ++-
 src/plugins/vis_type_vega/public/services.ts  |  3 +
 .../public/vega_view/vega_map_view.js         | 26 +++-----
 .../translations/translations/ja-JP.json      | 20 ------
 .../translations/translations/zh-CN.json      | 20 ------
 42 files changed, 274 insertions(+), 415 deletions(-)
 delete mode 100644 src/legacy/core_plugins/region_map/public/tooltip.html
 delete mode 100644 src/legacy/core_plugins/tile_map/common/origin.ts
 delete mode 100644 src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
 delete mode 100644 src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
 delete mode 100644 src/legacy/core_plugins/tile_map/public/shim/index.ts
 rename src/legacy/core_plugins/tile_map/public/{shim/legacy_dependencies_plugin.ts => tooltip_formatter.js} (57%)
 rename src/plugins/maps_legacy/public/common/{ => constants}/origin.ts (100%)
 rename src/{legacy/core_plugins/tile_map/public/types.ts => plugins/maps_legacy/public/common/types/external_basemap_types.ts} (95%)
 rename src/{legacy/core_plugins/region_map/public/shim => plugins/maps_legacy/public/common/types}/index.ts (79%)
 rename src/{legacy/core_plugins/tile_map/public => plugins/maps_legacy/public/common/types}/map_types.ts (100%)
 rename src/{legacy/core_plugins/region_map/public/types.ts => plugins/maps_legacy/public/common/types/region_map_types.ts} (89%)
 rename src/{legacy/core_plugins/tile_map => plugins/maps_legacy}/public/components/wms_internal_options.tsx (77%)
 rename src/{legacy/core_plugins/tile_map => plugins/maps_legacy}/public/components/wms_options.tsx (82%)
 rename src/{legacy/core_plugins/tile_map/public => plugins/maps_legacy/public/map}/base_maps_visualization.js (89%)
 rename src/{legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts => plugins/maps_legacy/public/tooltip_provider.js} (56%)

diff --git a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js
index 21b7ea7dbf4c3b..9f5f4b764f9b05 100644
--- a/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js
+++ b/src/legacy/core_plugins/kibana/public/__tests__/vis_type_vega/vega_visualization.js
@@ -59,12 +59,14 @@ import {
   setData,
   setSavedObjects,
   setNotifications,
+  setKibanaMapFactory,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../../plugins/vis_type_vega/public/services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setInjectedVarFunc } from '../../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ServiceSettings } from '../../../../../../plugins/maps_legacy/public/map/service_settings';
+import { getKibanaMapFactoryProvider } from '../../../../../../plugins/maps_legacy/public';
 
 const THRESHOLD = 0.1;
 const PIXEL_DIFF = 30;
@@ -77,6 +79,18 @@ describe('VegaVisualizations', () => {
   let vegaVisualizationDependencies;
   let vegaVisType;
 
+  const coreSetupMock = {
+    notifications: {
+      toasts: {},
+    },
+    uiSettings: {
+      get: () => {},
+    },
+    injectedMetadata: {
+      getInjectedVar: () => {},
+    },
+  };
+  setKibanaMapFactory(getKibanaMapFactoryProvider(coreSetupMock));
   setInjectedVars({
     emsTileLayerId: {},
     enableExternalUrls: true,
diff --git a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
index 6e1b0b71609417..87592cf4e750e4 100644
--- a/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
+++ b/src/legacy/core_plugins/region_map/public/__tests__/region_map_visualization.js
@@ -54,6 +54,7 @@ import { BaseVisType } from '../../../../../plugins/visualizations/public/vis_ty
 import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
+import { getBaseMapsVis } from '../../../../../plugins/maps_legacy/public';
 
 const THRESHOLD = 0.45;
 const PIXEL_DIFF = 96;
@@ -101,7 +102,7 @@ describe('RegionMapsVisualizationTests', function() {
 
   let getManifestStub;
   beforeEach(
-    ngMock.inject((Private, $injector) => {
+    ngMock.inject(() => {
       setInjectedVarFunc(injectedVar => {
         switch (injectedVar) {
           case 'mapConfig':
@@ -127,17 +128,28 @@ describe('RegionMapsVisualizationTests', function() {
         }
       });
       const serviceSettings = new ServiceSettings();
-      const uiSettings = $injector.get('config');
       const regionmapsConfig = {
         includeElasticMapsService: true,
         layers: [],
       };
+      const coreSetupMock = {
+        notifications: {
+          toasts: {},
+        },
+        uiSettings: {
+          get: () => {},
+        },
+        injectedMetadata: {
+          getInjectedVar: () => {},
+        },
+      };
+      const BaseMapsVisualization = getBaseMapsVis(coreSetupMock, serviceSettings);
 
       dependencies = {
         serviceSettings,
-        $injector,
         regionmapsConfig,
-        uiSettings,
+        uiSettings: coreSetupMock.uiSettings,
+        BaseMapsVisualization,
       };
 
       regionMapVisType = new BaseVisType(createRegionMapTypeDefinition(dependencies));
diff --git a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
index 31a27c4da7fcfe..5604067433f136 100644
--- a/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
+++ b/src/legacy/core_plugins/region_map/public/components/region_map_options.tsx
@@ -32,8 +32,7 @@ import {
   SelectOption,
   SwitchOption,
 } from '../../../../../plugins/charts/public';
-import { WmsOptions } from '../../../tile_map/public/components/wms_options';
-import { RegionMapVisParams } from '../types';
+import { RegionMapVisParams, WmsOptions } from '../../../../../plugins/maps_legacy/public';
 
 const mapLayerForOption = ({ layerId, name }: VectorLayer) => ({
   text: name,
diff --git a/src/legacy/core_plugins/region_map/public/legacy.ts b/src/legacy/core_plugins/region_map/public/legacy.ts
index b0cc767a044e88..4bbd839331e56b 100644
--- a/src/legacy/core_plugins/region_map/public/legacy.ts
+++ b/src/legacy/core_plugins/region_map/public/legacy.ts
@@ -21,17 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { RegionMapPluginSetupDependencies } from './plugin';
-import { LegacyDependenciesPlugin } from './shim';
 import { plugin } from '.';
 
 const plugins: Readonly<RegionMapPluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: npSetup.plugins.visualizations,
   mapsLegacy: npSetup.plugins.mapsLegacy,
-
-  // Temporary solution
-  // It will be removed when all dependent services are migrated to the new platform.
-  __LEGACY: new LegacyDependenciesPlugin(),
 };
 
 const pluginInstance = plugin({} as PluginInitializerContext);
diff --git a/src/legacy/core_plugins/region_map/public/plugin.ts b/src/legacy/core_plugins/region_map/public/plugin.ts
index 1453c2155e2d6f..08a73517dc13b3 100644
--- a/src/legacy/core_plugins/region_map/public/plugin.ts
+++ b/src/legacy/core_plugins/region_map/public/plugin.ts
@@ -25,28 +25,28 @@ import {
 } from '../../../../core/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
 import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-
-import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
-
 // @ts-ignore
 import { createRegionMapFn } from './region_map_fn';
 // @ts-ignore
 import { createRegionMapTypeDefinition } from './region_map_type';
-import { IServiceSettings, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
+import {
+  getBaseMapsVis,
+  IServiceSettings,
+  MapsLegacyPluginSetup,
+} from '../../../../plugins/maps_legacy/public';
 
 /** @private */
-interface RegionMapVisualizationDependencies extends LegacyDependenciesPluginSetup {
+interface RegionMapVisualizationDependencies {
   uiSettings: IUiSettingsClient;
   regionmapsConfig: RegionMapsConfig;
   serviceSettings: IServiceSettings;
-  notificationService: any;
+  BaseMapsVisualization: any;
 }
 
 /** @internal */
 export interface RegionMapPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
-  __LEGACY: LegacyDependenciesPlugin;
   mapsLegacy: MapsLegacyPluginSetup;
 }
 
@@ -66,14 +66,13 @@ export class RegionMapPlugin implements Plugin<Promise<void>, void> {
 
   public async setup(
     core: CoreSetup,
-    { expressions, visualizations, mapsLegacy, __LEGACY }: RegionMapPluginSetupDependencies
+    { expressions, visualizations, mapsLegacy }: RegionMapPluginSetupDependencies
   ) {
     const visualizationDependencies: Readonly<RegionMapVisualizationDependencies> = {
       uiSettings: core.uiSettings,
       regionmapsConfig: core.injectedMetadata.getInjectedVar('regionmap') as RegionMapsConfig,
       serviceSettings: mapsLegacy.serviceSettings,
-      notificationService: core.notifications.toasts,
-      ...(await __LEGACY.setup()),
+      BaseMapsVisualization: getBaseMapsVis(core, mapsLegacy.serviceSettings),
     };
 
     expressions.registerFunction(createRegionMapFn);
diff --git a/src/legacy/core_plugins/region_map/public/region_map_type.js b/src/legacy/core_plugins/region_map/public/region_map_type.js
index 9174b03cf843cf..b7ed14ed3706eb 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_type.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_type.js
@@ -23,9 +23,7 @@ import { createRegionMapVisualization } from './region_map_visualization';
 import { RegionMapOptions } from './components/region_map_options';
 import { truncatedColorSchemas } from '../../../../plugins/charts/public';
 import { Schemas } from '../../../../plugins/vis_default_editor/public';
-
-// TODO: reference to TILE_MAP plugin should be removed
-import { ORIGIN } from '../../tile_map/common/origin';
+import { ORIGIN } from '../../../../plugins/maps_legacy/public';
 
 export function createRegionMapTypeDefinition(dependencies) {
   const { uiSettings, regionmapsConfig, serviceSettings } = dependencies;
diff --git a/src/legacy/core_plugins/region_map/public/region_map_visualization.js b/src/legacy/core_plugins/region_map/public/region_map_visualization.js
index f08d53ee35c8d3..5dbc1ecad277f1 100644
--- a/src/legacy/core_plugins/region_map/public/region_map_visualization.js
+++ b/src/legacy/core_plugins/region_map/public/region_map_visualization.js
@@ -21,30 +21,21 @@ import { i18n } from '@kbn/i18n';
 import ChoroplethLayer from './choropleth_layer';
 import { getFormat } from 'ui/visualize/loader/pipeline_helpers/utilities';
 import { toastNotifications } from 'ui/notify';
-
-import { TileMapTooltipFormatter } from './tooltip_formatter';
 import { truncatedColorMaps } from '../../../../plugins/charts/public';
-
-// TODO: reference to TILE_MAP plugin should be removed
-import { BaseMapsVisualizationProvider } from '../../tile_map/public/base_maps_visualization';
+import { tooltipFormatter } from './tooltip_formatter';
+import { mapTooltipProvider } from '../../../../plugins/maps_legacy/public';
 
 export function createRegionMapVisualization({
   serviceSettings,
-  $injector,
   uiSettings,
-  notificationService,
+  BaseMapsVisualization,
 }) {
-  const BaseMapsVisualization = new BaseMapsVisualizationProvider(
-    serviceSettings,
-    notificationService
-  );
-  const tooltipFormatter = new TileMapTooltipFormatter($injector);
-
   return class RegionMapsVisualization extends BaseMapsVisualization {
     constructor(container, vis) {
       super(container, vis);
       this._vis = this.vis;
       this._choroplethLayer = null;
+      this._tooltipFormatter = mapTooltipProvider(container, tooltipFormatter);
     }
 
     async render(esResponse, visParams) {
@@ -89,7 +80,7 @@ export function createRegionMapVisualization({
       this._choroplethLayer.setMetrics(results, metricFieldFormatter, valueColumn.name);
       if (termColumn && valueColumn) {
         this._choroplethLayer.setTooltipFormatter(
-          tooltipFormatter,
+          this._tooltipFormatter,
           metricFieldFormatter,
           termColumn.name,
           valueColumn.name
@@ -123,7 +114,7 @@ export function createRegionMapVisualization({
       this._choroplethLayer.setColorRamp(truncatedColorMaps[visParams.colorSchema].value);
       this._choroplethLayer.setLineWeight(visParams.outlineWeight);
       this._choroplethLayer.setTooltipFormatter(
-        tooltipFormatter,
+        this._tooltipFormatter,
         metricFieldFormatter,
         this._metricLabel
       );
diff --git a/src/legacy/core_plugins/region_map/public/tooltip.html b/src/legacy/core_plugins/region_map/public/tooltip.html
deleted file mode 100644
index 0d57120c80a983..00000000000000
--- a/src/legacy/core_plugins/region_map/public/tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table>
-  <tbody>
-    <tr ng-repeat="detail in details" >
-      <td class="visTooltip__label"><b>{{detail.label}}</b></td>
-      <td class="visTooltip__value">{{detail.value}}</td>
-    </tr>
-  </tbody>
-</table>
diff --git a/src/legacy/core_plugins/region_map/public/tooltip_formatter.js b/src/legacy/core_plugins/region_map/public/tooltip_formatter.js
index 6df08aea0baa69..8d38095ac25e07 100644
--- a/src/legacy/core_plugins/region_map/public/tooltip_formatter.js
+++ b/src/legacy/core_plugins/region_map/public/tooltip_formatter.js
@@ -17,39 +17,24 @@
  * under the License.
  */
 
-import $ from 'jquery';
-import template from './tooltip.html';
-
-export const TileMapTooltipFormatter = $injector => {
-  const $rootScope = $injector.get('$rootScope');
-  const $compile = $injector.get('$compile');
-
-  const $tooltipScope = $rootScope.$new();
-  const $el = $('<div>').html(template);
-
-  $compile($el)($tooltipScope);
-
-  return function tooltipFormatter(metric, fieldFormatter, fieldName, metricName) {
-    if (!metric) {
-      return '';
-    }
-
-    $tooltipScope.details = [];
-    if (fieldName && metric) {
-      $tooltipScope.details.push({
-        label: fieldName,
-        value: metric.term,
-      });
-    }
-
-    if (metric) {
-      $tooltipScope.details.push({
-        label: metricName,
-        value: fieldFormatter ? fieldFormatter.convert(metric.value, 'text') : metric.value,
-      });
-    }
-
-    $tooltipScope.$apply();
-    return $el.html();
-  };
-};
+export function tooltipFormatter(metric, fieldFormatter, fieldName, metricName) {
+  if (!metric) {
+    return '';
+  }
+
+  const details = [];
+  if (fieldName && metric) {
+    details.push({
+      label: fieldName,
+      value: metric.term,
+    });
+  }
+
+  if (metric) {
+    details.push({
+      label: metricName,
+      value: fieldFormatter ? fieldFormatter.convert(metric.value, 'text') : metric.value,
+    });
+  }
+  return details;
+}
diff --git a/src/legacy/core_plugins/region_map/public/util.ts b/src/legacy/core_plugins/region_map/public/util.ts
index 24c721da1f31ac..b4e0dcd5f35102 100644
--- a/src/legacy/core_plugins/region_map/public/util.ts
+++ b/src/legacy/core_plugins/region_map/public/util.ts
@@ -18,8 +18,7 @@
  */
 
 import { FileLayer, VectorLayer } from '../../../../plugins/maps_legacy/public';
-// TODO: reference to TILE_MAP plugin should be removed
-import { ORIGIN } from '../../../../legacy/core_plugins/tile_map/common/origin';
+import { ORIGIN } from '../../../../plugins/maps_legacy/public';
 
 export const mapToLayerWithId = (prefix: string, layer: FileLayer): VectorLayer => ({
   ...layer,
diff --git a/src/legacy/core_plugins/tile_map/common/origin.ts b/src/legacy/core_plugins/tile_map/common/origin.ts
deleted file mode 100644
index 7fcf1c659bdf3c..00000000000000
--- a/src/legacy/core_plugins/tile_map/common/origin.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export enum ORIGIN {
-  EMS = 'elastic_maps_service',
-  KIBANA_YML = 'self_hosted',
-}
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
index 3904c43707906b..bce2e157ebbc8d 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/coordinate_maps_visualization.js
@@ -53,6 +53,7 @@ import {
 import { ServiceSettings } from '../../../../../plugins/maps_legacy/public/map/service_settings';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setInjectedVarFunc } from '../../../../../plugins/maps_legacy/public/kibana_services';
+import { getBaseMapsVis } from '../../../../../plugins/maps_legacy/public';
 
 function mockRawData() {
   const stack = [dummyESResponse];
@@ -114,15 +115,26 @@ describe('CoordinateMapsVisualizationTest', function() {
             return 'not found';
         }
       });
+
+      const coreSetupMock = {
+        notifications: {
+          toasts: {},
+        },
+        uiSettings: {},
+        injectedMetadata: {
+          getInjectedVar: () => {},
+        },
+      };
       const serviceSettings = new ServiceSettings();
+      const BaseMapsVisualization = getBaseMapsVis(coreSetupMock, serviceSettings);
       const uiSettings = $injector.get('config');
 
       dependencies = {
-        serviceSettings,
-        uiSettings,
-        $injector,
-        getPrecision,
         getZoomPrecision,
+        getPrecision,
+        BaseMapsVisualization,
+        uiSettings,
+        serviceSettings,
       };
 
       visType = new BaseVisType(createTileMapTypeDefinition(dependencies));
diff --git a/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js b/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
index fc029d6bccb6e6..bdf9cd806eb8b5 100644
--- a/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
+++ b/src/legacy/core_plugins/tile_map/public/__tests__/geohash_layer.js
@@ -24,7 +24,8 @@ import scaledCircleMarkersPng from './scaledCircleMarkers.png';
 // import shadedCircleMarkersPng from './shadedCircleMarkers.png';
 import { ImageComparator } from 'test_utils/image_comparator';
 import GeoHashSampleData from './dummy_es_response.json';
-import { KibanaMap } from '../../../../../plugins/maps_legacy/public';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { KibanaMap } from '../../../../../plugins/maps_legacy/public/map/kibana_map';
 
 describe('geohash_layer', function() {
   let domNode;
diff --git a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
index 9ca42fe3e4074c..1efb0b2f884f85 100644
--- a/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
+++ b/src/legacy/core_plugins/tile_map/public/components/tile_map_options.tsx
@@ -28,9 +28,7 @@ import {
   SelectOption,
   SwitchOption,
 } from '../../../../../plugins/charts/public';
-import { WmsOptions } from './wms_options';
-import { TileMapVisParams } from '../types';
-import { MapTypes } from '../map_types';
+import { WmsOptions, TileMapVisParams, MapTypes } from '../../../../../plugins/maps_legacy/public';
 
 export type TileMapOptionsProps = VisOptionsProps<TileMapVisParams>;
 
diff --git a/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html b/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
deleted file mode 100644
index 9df5b94a21edad..00000000000000
--- a/src/legacy/core_plugins/tile_map/public/editors/_tooltip.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<table>
-  <tbody>
-    <tr ng-repeat="detail in details" >
-      <td class="visTooltip__label">{{detail.label}}</td>
-      <td class="visTooltip__value">{{detail.value}}</td>
-    </tr>
-  </tbody>
-</table>
diff --git a/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js b/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
deleted file mode 100644
index eec90e512b4623..00000000000000
--- a/src/legacy/core_plugins/tile_map/public/editors/_tooltip_formatter.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import $ from 'jquery';
-import { i18n } from '@kbn/i18n';
-
-import template from './_tooltip.html';
-
-export function TileMapTooltipFormatterProvider($injector) {
-  const $rootScope = $injector.get('$rootScope');
-  const $compile = $injector.get('$compile');
-
-  const $tooltipScope = $rootScope.$new();
-  const $el = $('<div>').html(template);
-
-  $compile($el)($tooltipScope);
-
-  return function tooltipFormatter(metricTitle, metricFormat, feature) {
-    if (!feature) {
-      return '';
-    }
-
-    $tooltipScope.details = [
-      {
-        label: metricTitle,
-        value: metricFormat(feature.properties.value),
-      },
-      {
-        label: i18n.translate('tileMap.tooltipFormatter.latitudeLabel', {
-          defaultMessage: 'Latitude',
-        }),
-        value: feature.geometry.coordinates[1],
-      },
-      {
-        label: i18n.translate('tileMap.tooltipFormatter.longitudeLabel', {
-          defaultMessage: 'Longitude',
-        }),
-        value: feature.geometry.coordinates[0],
-      },
-    ];
-
-    $tooltipScope.$apply();
-
-    return $el.html();
-  };
-}
diff --git a/src/legacy/core_plugins/tile_map/public/geohash_layer.js b/src/legacy/core_plugins/tile_map/public/geohash_layer.js
index b9acf1a15208f7..f0261483d302d2 100644
--- a/src/legacy/core_plugins/tile_map/public/geohash_layer.js
+++ b/src/legacy/core_plugins/tile_map/public/geohash_layer.js
@@ -20,12 +20,11 @@
 import L from 'leaflet';
 import { min, isEqual } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaMapLayer } from '../../../../plugins/maps_legacy/public';
+import { KibanaMapLayer, MapTypes } from '../../../../plugins/maps_legacy/public';
 import { HeatmapMarkers } from './markers/heatmap';
 import { ScaledCirclesMarkers } from './markers/scaled_circles';
 import { ShadedCirclesMarkers } from './markers/shaded_circles';
 import { GeohashGridMarkers } from './markers/geohash_grid';
-import { MapTypes } from './map_types';
 
 export class GeohashLayer extends KibanaMapLayer {
   constructor(featureCollection, featureCollectionMetaData, options, zoom, kibanaMap) {
diff --git a/src/legacy/core_plugins/tile_map/public/legacy.ts b/src/legacy/core_plugins/tile_map/public/legacy.ts
index 741e118750f320..dd8d4c6e9311e6 100644
--- a/src/legacy/core_plugins/tile_map/public/legacy.ts
+++ b/src/legacy/core_plugins/tile_map/public/legacy.ts
@@ -21,17 +21,12 @@ import { PluginInitializerContext } from 'kibana/public';
 import { npSetup, npStart } from 'ui/new_platform';
 
 import { TileMapPluginSetupDependencies } from './plugin';
-import { LegacyDependenciesPlugin } from './shim';
 import { plugin } from '.';
 
 const plugins: Readonly<TileMapPluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: npSetup.plugins.visualizations,
   mapsLegacy: npSetup.plugins.mapsLegacy,
-
-  // Temporary solution
-  // It will be removed when all dependent services are migrated to the new platform.
-  __LEGACY: new LegacyDependenciesPlugin(),
 };
 
 const pluginInstance = plugin({} as PluginInitializerContext);
diff --git a/src/legacy/core_plugins/tile_map/public/plugin.ts b/src/legacy/core_plugins/tile_map/public/plugin.ts
index 2b97407b17b38c..aa1460a7e2890a 100644
--- a/src/legacy/core_plugins/tile_map/public/plugin.ts
+++ b/src/legacy/core_plugins/tile_map/public/plugin.ts
@@ -25,22 +25,21 @@ import {
 } from '../../../../core/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
 import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
-
-import { LegacyDependenciesPlugin, LegacyDependenciesPluginSetup } from './shim';
+// TODO: Determine why visualizations don't populate without this
+import 'angular-sanitize';
 
 // @ts-ignore
 import { createTileMapFn } from './tile_map_fn';
 // @ts-ignore
 import { createTileMapTypeDefinition } from './tile_map_type';
-import { IServiceSettings, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
+import { getBaseMapsVis, MapsLegacyPluginSetup } from '../../../../plugins/maps_legacy/public';
 
 /** @private */
-interface TileMapVisualizationDependencies extends LegacyDependenciesPluginSetup {
-  serviceSettings: IServiceSettings;
+interface TileMapVisualizationDependencies {
   uiSettings: IUiSettingsClient;
   getZoomPrecision: any;
   getPrecision: any;
-  notificationService: any;
+  BaseMapsVisualization: any;
 }
 
 /** @internal */
@@ -48,7 +47,6 @@ export interface TileMapPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
   mapsLegacy: MapsLegacyPluginSetup;
-  __LEGACY: LegacyDependenciesPlugin;
 }
 
 /** @internal */
@@ -61,16 +59,14 @@ export class TileMapPlugin implements Plugin<Promise<void>, void> {
 
   public async setup(
     core: CoreSetup,
-    { expressions, visualizations, mapsLegacy, __LEGACY }: TileMapPluginSetupDependencies
+    { expressions, visualizations, mapsLegacy }: TileMapPluginSetupDependencies
   ) {
-    const { getZoomPrecision, getPrecision, serviceSettings } = mapsLegacy;
+    const { getZoomPrecision, getPrecision } = mapsLegacy;
     const visualizationDependencies: Readonly<TileMapVisualizationDependencies> = {
-      serviceSettings,
       getZoomPrecision,
       getPrecision,
-      notificationService: core.notifications.toasts,
+      BaseMapsVisualization: getBaseMapsVis(core, mapsLegacy.serviceSettings),
       uiSettings: core.uiSettings,
-      ...(await __LEGACY.setup()),
     };
 
     expressions.registerFunction(() => createTileMapFn(visualizationDependencies));
diff --git a/src/legacy/core_plugins/tile_map/public/shim/index.ts b/src/legacy/core_plugins/tile_map/public/shim/index.ts
deleted file mode 100644
index cfc7b62ff4f86d..00000000000000
--- a/src/legacy/core_plugins/tile_map/public/shim/index.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to Elasticsearch B.V. under one or more contributor
- * license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright
- * ownership. Elasticsearch B.V. licenses this file to you under
- * the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-export * from './legacy_dependencies_plugin';
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_type.js b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
index ae3a839b600e94..ca6a586d220080 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_type.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_type.js
@@ -19,11 +19,10 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { convertToGeoJson } from '../../../../plugins/maps_legacy/public';
+import { convertToGeoJson, MapTypes } from '../../../../plugins/maps_legacy/public';
 import { Schemas } from '../../../../plugins/vis_default_editor/public';
 import { createTileMapVisualization } from './tile_map_visualization';
 import { TileMapOptions } from './components/tile_map_options';
-import { MapTypes } from './map_types';
 import { supportsCssFilters } from './css_filters';
 import { truncatedColorSchemas } from '../../../../plugins/charts/public';
 
diff --git a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
index fdce8bc51fe869..6a7bda5e188831 100644
--- a/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
+++ b/src/legacy/core_plugins/tile_map/public/tile_map_visualization.js
@@ -19,30 +19,24 @@
 
 import { get } from 'lodash';
 import { GeohashLayer } from './geohash_layer';
-import { BaseMapsVisualizationProvider } from './base_maps_visualization';
-import { TileMapTooltipFormatterProvider } from './editors/_tooltip_formatter';
 import { npStart } from 'ui/new_platform';
 import { getFormat } from '../../../ui/public/visualize/loader/pipeline_helpers/utilities';
-import { scaleBounds, geoContains } from '../../../../plugins/maps_legacy/public';
-
-export const createTileMapVisualization = ({
-  serviceSettings,
-  $injector,
-  getZoomPrecision,
-  getPrecision,
-  notificationService,
-}) => {
-  const BaseMapsVisualization = new BaseMapsVisualizationProvider(
-    serviceSettings,
-    notificationService
-  );
-  const tooltipFormatter = new TileMapTooltipFormatterProvider($injector);
+import {
+  scaleBounds,
+  geoContains,
+  mapTooltipProvider,
+} from '../../../../plugins/maps_legacy/public';
+import { tooltipFormatter } from './tooltip_formatter';
+
+export const createTileMapVisualization = dependencies => {
+  const { getZoomPrecision, getPrecision, BaseMapsVisualization } = dependencies;
 
   return class CoordinateMapsVisualization extends BaseMapsVisualization {
     constructor(element, vis) {
       super(element, vis);
 
       this._geohashLayer = null;
+      this._tooltipFormatter = mapTooltipProvider(element, tooltipFormatter);
     }
 
     updateGeohashAgg = () => {
@@ -190,18 +184,15 @@ export const createTileMapVisualization = ({
       const metricDimension = this._params.dimensions.metric;
       const metricLabel = metricDimension ? metricDimension.label : '';
       const metricFormat = getFormat(metricDimension && metricDimension.format);
-      const boundTooltipFormatter = tooltipFormatter.bind(
-        null,
-        metricLabel,
-        metricFormat.getConverterFor('text')
-      );
 
       return {
         label: metricLabel,
         valueFormatter: this._geoJsonFeatureCollectionAndMeta
           ? metricFormat.getConverterFor('text')
           : null,
-        tooltipFormatter: this._geoJsonFeatureCollectionAndMeta ? boundTooltipFormatter : null,
+        tooltipFormatter: this._geoJsonFeatureCollectionAndMeta
+          ? this._tooltipFormatter.bind(null, metricLabel, metricFormat.getConverterFor('text'))
+          : null,
         mapType: newParams.mapType,
         isFilteredByCollar: this._isFilteredByCollar(),
         colorRamp: newParams.colorSchema,
diff --git a/src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts b/src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
similarity index 57%
rename from src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts
rename to src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
index 5296e98b09efe8..1c87d4dcca2b57 100644
--- a/src/legacy/core_plugins/tile_map/public/shim/legacy_dependencies_plugin.ts
+++ b/src/legacy/core_plugins/tile_map/public/tooltip_formatter.js
@@ -17,27 +17,29 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { CoreStart, Plugin } from 'kibana/public';
-// TODO: Determine why visualizations don't populate without this
-import 'angular-sanitize';
+import { i18n } from '@kbn/i18n';
 
-/** @internal */
-export interface LegacyDependenciesPluginSetup {
-  $injector: any;
-}
-
-export class LegacyDependenciesPlugin
-  implements Plugin<Promise<LegacyDependenciesPluginSetup>, void> {
-  public async setup() {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-
-    return {
-      $injector,
-    } as LegacyDependenciesPluginSetup;
+export function tooltipFormatter(metricTitle, metricFormat, feature) {
+  if (!feature) {
+    return '';
   }
 
-  public start(core: CoreStart) {
-    // nothing to do here yet
-  }
+  return [
+    {
+      label: metricTitle,
+      value: metricFormat(feature.properties.value),
+    },
+    {
+      label: i18n.translate('tileMap.tooltipFormatter.latitudeLabel', {
+        defaultMessage: 'Latitude',
+      }),
+      value: feature.geometry.coordinates[1],
+    },
+    {
+      label: i18n.translate('tileMap.tooltipFormatter.longitudeLabel', {
+        defaultMessage: 'Longitude',
+      }),
+      value: feature.geometry.coordinates[0],
+    },
+  ];
 }
diff --git a/src/plugins/maps_legacy/public/__tests__/map/service_settings.js b/src/plugins/maps_legacy/public/__tests__/map/service_settings.js
index 4cbe098501c675..822378163a7ebc 100644
--- a/src/plugins/maps_legacy/public/__tests__/map/service_settings.js
+++ b/src/plugins/maps_legacy/public/__tests__/map/service_settings.js
@@ -26,7 +26,7 @@ import EMS_TILES from './ems_mocks/sample_tiles.json';
 import EMS_STYLE_ROAD_MAP_BRIGHT from './ems_mocks/sample_style_bright';
 import EMS_STYLE_ROAD_MAP_DESATURATED from './ems_mocks/sample_style_desaturated';
 import EMS_STYLE_DARK_MAP from './ems_mocks/sample_style_dark';
-import { ORIGIN } from '../../common/origin';
+import { ORIGIN } from '../../common/constants/origin';
 
 describe('service_settings (FKA tilemaptest)', function() {
   let serviceSettings;
diff --git a/src/plugins/maps_legacy/public/common/origin.ts b/src/plugins/maps_legacy/public/common/constants/origin.ts
similarity index 100%
rename from src/plugins/maps_legacy/public/common/origin.ts
rename to src/plugins/maps_legacy/public/common/constants/origin.ts
diff --git a/src/legacy/core_plugins/tile_map/public/types.ts b/src/plugins/maps_legacy/public/common/types/external_basemap_types.ts
similarity index 95%
rename from src/legacy/core_plugins/tile_map/public/types.ts
rename to src/plugins/maps_legacy/public/common/types/external_basemap_types.ts
index e1b4c27319123a..be9c4d0d9c37bb 100644
--- a/src/legacy/core_plugins/tile_map/public/types.ts
+++ b/src/plugins/maps_legacy/public/common/types/external_basemap_types.ts
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { TmsLayer } from '../../../../plugins/maps_legacy/public';
+import { TmsLayer } from '../../index';
 import { MapTypes } from './map_types';
 
 export interface WMSOptions {
diff --git a/src/legacy/core_plugins/region_map/public/shim/index.ts b/src/plugins/maps_legacy/public/common/types/index.ts
similarity index 79%
rename from src/legacy/core_plugins/region_map/public/shim/index.ts
rename to src/plugins/maps_legacy/public/common/types/index.ts
index cfc7b62ff4f86d..e6cabdde82cd9a 100644
--- a/src/legacy/core_plugins/region_map/public/shim/index.ts
+++ b/src/plugins/maps_legacy/public/common/types/index.ts
@@ -17,4 +17,10 @@
  * under the License.
  */
 
-export * from './legacy_dependencies_plugin';
+/**
+ * Use * syntax so that these exports do not break when internal
+ * types are stripped.
+ */
+export * from './external_basemap_types';
+export * from './map_types';
+export * from './region_map_types';
diff --git a/src/legacy/core_plugins/tile_map/public/map_types.ts b/src/plugins/maps_legacy/public/common/types/map_types.ts
similarity index 100%
rename from src/legacy/core_plugins/tile_map/public/map_types.ts
rename to src/plugins/maps_legacy/public/common/types/map_types.ts
diff --git a/src/legacy/core_plugins/region_map/public/types.ts b/src/plugins/maps_legacy/public/common/types/region_map_types.ts
similarity index 89%
rename from src/legacy/core_plugins/region_map/public/types.ts
rename to src/plugins/maps_legacy/public/common/types/region_map_types.ts
index 8585bf720e0cf7..0da597068f11e0 100644
--- a/src/legacy/core_plugins/region_map/public/types.ts
+++ b/src/plugins/maps_legacy/public/common/types/region_map_types.ts
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-import { VectorLayer, FileLayerField } from '../../../../plugins/maps_legacy/public';
-import { WMSOptions } from '../../tile_map/public/types';
+import { VectorLayer, FileLayerField } from '../../index';
+import { WMSOptions } from './external_basemap_types';
 
 export interface RegionMapVisParams {
   readonly addTooltip: true;
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx b/src/plugins/maps_legacy/public/components/wms_internal_options.tsx
similarity index 77%
rename from src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
rename to src/plugins/maps_legacy/public/components/wms_internal_options.tsx
index 47f5b8f31e62be..d1def8153d1a84 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_internal_options.tsx
+++ b/src/plugins/maps_legacy/public/components/wms_internal_options.tsx
@@ -21,8 +21,8 @@ import React from 'react';
 import { EuiLink, EuiSpacer, EuiText, EuiScreenReaderOnly } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { TextInputOption } from '../../../../../plugins/charts/public';
-import { WMSOptions } from '../types';
+import { TextInputOption } from '../../../charts/public';
+import { WMSOptions } from '../common/types/external_basemap_types';
 
 interface WmsInternalOptions {
   wms: WMSOptions;
@@ -32,14 +32,14 @@ interface WmsInternalOptions {
 function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
   const wmsLink = (
     <EuiLink href="http://www.opengeospatial.org/standards/wms" target="_blank">
-      <FormattedMessage id="tileMap.wmsOptions.wmsLinkText" defaultMessage="OGC standard" />
+      <FormattedMessage id="maps_legacy.wmsOptions.wmsLinkText" defaultMessage="OGC standard" />
     </EuiLink>
   );
   const footnoteText = (
     <>
       <span aria-hidden="true">*</span>
       <FormattedMessage
-        id="tileMap.wmsOptions.mapLoadFailDescription"
+        id="maps_legacy.wmsOptions.mapLoadFailDescription"
         defaultMessage="If this parameter is incorrect, maps will fail to load."
       />
     </>
@@ -64,7 +64,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <EuiSpacer size="xs" />
       <EuiText size="xs">
         <FormattedMessage
-          id="tileMap.wmsOptions.wmsDescription"
+          id="maps_legacy.wmsOptions.wmsDescription"
           defaultMessage="WMS is an {wmsLink} for map image services."
           values={{ wmsLink }}
         />
@@ -74,14 +74,14 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsUrlLabel" defaultMessage="WMS url" />
+            <FormattedMessage id="maps_legacy.wmsOptions.wmsUrlLabel" defaultMessage="WMS url" />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.urlOfWMSWebServiceTip"
+              id="maps_legacy.wmsOptions.urlOfWMSWebServiceTip"
               defaultMessage="The URL of the WMS web service."
             />
             {footnote}
@@ -95,14 +95,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsLayersLabel" defaultMessage="WMS layers" />
+            <FormattedMessage
+              id="maps_legacy.wmsOptions.wmsLayersLabel"
+              defaultMessage="WMS layers"
+            />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.listOfLayersToUseTip"
+              id="maps_legacy.wmsOptions.listOfLayersToUseTip"
               defaultMessage="A comma separated list of layers to use."
             />
             {footnote}
@@ -117,7 +120,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
         label={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.wmsVersionLabel"
+              id="maps_legacy.wmsOptions.wmsVersionLabel"
               defaultMessage="WMS version"
             />
             <span aria-hidden="true">*</span>
@@ -126,7 +129,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.versionOfWMSserverSupportsTip"
+              id="maps_legacy.wmsOptions.versionOfWMSserverSupportsTip"
               defaultMessage="The version of WMS the server supports."
             />
             {footnote}
@@ -140,14 +143,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsFormatLabel" defaultMessage="WMS format" />
+            <FormattedMessage
+              id="maps_legacy.wmsOptions.wmsFormatLabel"
+              defaultMessage="WMS format"
+            />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.imageFormatToUseTip"
+              id="maps_legacy.wmsOptions.imageFormatToUseTip"
               defaultMessage="Usually image/png or image/jpeg. Use png if the server will return transparent layers."
             />
             {footnote}
@@ -161,13 +167,13 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <FormattedMessage
-            id="tileMap.wmsOptions.wmsAttributionLabel"
+            id="maps_legacy.wmsOptions.wmsAttributionLabel"
             defaultMessage="WMS attribution"
           />
         }
         helpText={
           <FormattedMessage
-            id="tileMap.wmsOptions.attributionStringTip"
+            id="maps_legacy.wmsOptions.attributionStringTip"
             defaultMessage="Attribution string for the lower right corner."
           />
         }
@@ -179,14 +185,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
       <TextInputOption
         label={
           <>
-            <FormattedMessage id="tileMap.wmsOptions.wmsStylesLabel" defaultMessage="WMS styles" />
+            <FormattedMessage
+              id="maps_legacy.wmsOptions.wmsStylesLabel"
+              defaultMessage="WMS styles"
+            />
             <span aria-hidden="true">*</span>
           </>
         }
         helpText={
           <>
             <FormattedMessage
-              id="tileMap.wmsOptions.wmsServerSupportedStylesListTip"
+              id="maps_legacy.wmsOptions.wmsServerSupportedStylesListTip"
               defaultMessage="A comma separated list of WMS server supported styles to use. Blank in most cases."
             />
             {footnote}
diff --git a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx b/src/plugins/maps_legacy/public/components/wms_options.tsx
similarity index 82%
rename from src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
rename to src/plugins/maps_legacy/public/components/wms_options.tsx
index e74c260d3b8e5c..4892463bb9f856 100644
--- a/src/legacy/core_plugins/tile_map/public/components/wms_options.tsx
+++ b/src/plugins/maps_legacy/public/components/wms_options.tsx
@@ -21,12 +21,12 @@ import React, { useMemo } from 'react';
 import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { TmsLayer } from '../../../../../plugins/maps_legacy/public';
-import { Vis } from '../../../../../plugins/visualizations/public';
-import { RegionMapVisParams } from '../../../region_map/public/types';
-import { SelectOption, SwitchOption } from '../../../../../plugins/charts/public';
+import { TmsLayer } from '../index';
+import { Vis } from '../../../visualizations/public';
+import { RegionMapVisParams } from '../common/types/region_map_types';
+import { SelectOption, SwitchOption } from '../../../charts/public';
 import { WmsInternalOptions } from './wms_internal_options';
-import { WMSOptions, TileMapVisParams } from '../types';
+import { WMSOptions, TileMapVisParams } from '../common/types/external_basemap_types';
 
 interface Props {
   stateParams: TileMapVisParams | RegionMapVisParams;
@@ -59,7 +59,7 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
       <EuiTitle size="xs">
         <h2>
           <FormattedMessage
-            id="tileMap.wmsOptions.baseLayerSettingsTitle"
+            id="maps_legacy.wmsOptions.baseLayerSettingsTitle"
             defaultMessage="Base layer settings"
           />
         </h2>
@@ -67,10 +67,10 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
       <EuiSpacer size="s" />
 
       <SwitchOption
-        label={i18n.translate('tileMap.wmsOptions.wmsMapServerLabel', {
+        label={i18n.translate('maps_legacy.wmsOptions.wmsMapServerLabel', {
           defaultMessage: 'WMS map server',
         })}
-        tooltip={i18n.translate('tileMap.wmsOptions.useWMSCompliantMapTileServerTip', {
+        tooltip={i18n.translate('maps_legacy.wmsOptions.useWMSCompliantMapTileServerTip', {
           defaultMessage: 'Use WMS compliant map tile server. For advanced users only.',
         })}
         paramName="enabled"
@@ -83,7 +83,7 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
           <EuiSpacer size="s" />
           <SelectOption
             id="wmsOptionsSelectTmsLayer"
-            label={i18n.translate('tileMap.wmsOptions.layersLabel', {
+            label={i18n.translate('maps_legacy.wmsOptions.layersLabel', {
               defaultMessage: 'Layers',
             })}
             options={tmsLayerOptions}
diff --git a/src/plugins/maps_legacy/public/index.ts b/src/plugins/maps_legacy/public/index.ts
index 861f67006ad838..17cecab9f74596 100644
--- a/src/plugins/maps_legacy/public/index.ts
+++ b/src/plugins/maps_legacy/public/index.ts
@@ -17,7 +17,8 @@
  * under the License.
  */
 
-import { MapsLegacyPlugin } from './plugin';
+import { CoreSetup } from 'kibana/public';
+import { bindSetupCoreAndPlugins, MapsLegacyPlugin } from './plugin';
 // @ts-ignore
 import * as colorUtil from './map/color_util';
 // @ts-ignore
@@ -29,6 +30,7 @@ import { convertToGeoJson } from './map/convert_to_geojson';
 // @ts-ignore
 import { scaleBounds, getPrecision, geoContains } from './map/decode_geo_hash';
 // @ts-ignore
+import { BaseMapsVisualizationProvider } from './map/base_maps_visualization';
 import {
   VectorLayer,
   FileLayerField,
@@ -36,6 +38,8 @@ import {
   TmsLayer,
   IServiceSettings,
 } from './map/service_settings';
+// @ts-ignore
+import { mapTooltipProvider } from './tooltip_provider';
 
 export function plugin() {
   return new MapsLegacyPlugin();
@@ -49,13 +53,32 @@ export {
   colorUtil,
   convertToGeoJson,
   IServiceSettings,
-  KibanaMap,
   KibanaMapLayer,
   VectorLayer,
   FileLayerField,
   FileLayer,
   TmsLayer,
+  mapTooltipProvider,
 };
 
+// Due to a leaflet/leaflet-draw bug, it's not possible to consume leaflet maps w/ draw control
+// through a pipeline leveraging angular. For this reason, client plugins need to
+// init kibana map and the basemaps visualization directly rather than consume through
+// the usual plugin interface
+export function getKibanaMapFactoryProvider(core: CoreSetup) {
+  bindSetupCoreAndPlugins(core);
+  return (...args: any) => new KibanaMap(...args);
+}
+
+export function getBaseMapsVis(core: CoreSetup, serviceSettings: IServiceSettings) {
+  const getKibanaMap = getKibanaMapFactoryProvider(core);
+  return new BaseMapsVisualizationProvider(getKibanaMap, serviceSettings);
+}
+
+export * from './common/types';
+export { ORIGIN } from './common/constants/origin';
+
+export { WmsOptions } from './components/wms_options';
+
 export type MapsLegacyPluginSetup = ReturnType<MapsLegacyPlugin['setup']>;
 export type MapsLegacyPluginStart = ReturnType<MapsLegacyPlugin['start']>;
diff --git a/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js b/src/plugins/maps_legacy/public/map/base_maps_visualization.js
similarity index 89%
rename from src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
rename to src/plugins/maps_legacy/public/map/base_maps_visualization.js
index 1dac4607280cc7..c4ac671a5187c6 100644
--- a/src/legacy/core_plugins/tile_map/public/base_maps_visualization.js
+++ b/src/plugins/maps_legacy/public/map/base_maps_visualization.js
@@ -19,16 +19,14 @@
 
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { KibanaMap } from '../../../../plugins/maps_legacy/public';
 import * as Rx from 'rxjs';
 import { filter, first } from 'rxjs/operators';
-import { toastNotifications } from 'ui/notify';
-import chrome from 'ui/chrome';
+import { getInjectedVarFunc, getUiSettings, getToasts } from '../kibana_services';
 
 const WMS_MINZOOM = 0;
 const WMS_MAXZOOM = 22; //increase this to 22. Better for WMS
 
-export function BaseMapsVisualizationProvider(mapServiceSettings, notificationService) {
+export function BaseMapsVisualizationProvider(getKibanaMap, mapServiceSettings) {
   /**
    * Abstract base class for a visualization consisting of a map with a single baselayer.
    * @class BaseMapsVisualization
@@ -36,7 +34,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
    */
 
   const serviceSettings = mapServiceSettings;
-  const toastService = notificationService;
+  const toastService = getToasts();
 
   return class BaseMapsVisualization {
     constructor(element, vis) {
@@ -99,7 +97,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
       options.center = centerFromUIState ? centerFromUIState : this.vis.params.mapCenter;
       const services = { toastService };
 
-      this._kibanaMap = new KibanaMap(this._container, options, services);
+      this._kibanaMap = getKibanaMap(this._container, options, services);
       this._kibanaMap.setMinZoom(WMS_MINZOOM); //use a default
       this._kibanaMap.setMaxZoom(WMS_MAXZOOM); //use a default
 
@@ -118,20 +116,20 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
 
     _tmsConfigured() {
       const { wms } = this._getMapsParams();
-      const hasTmsBaseLayer = !!wms.selectedTmsLayer;
+      const hasTmsBaseLayer = wms && !!wms.selectedTmsLayer;
 
       return hasTmsBaseLayer;
     }
 
     _wmsConfigured() {
       const { wms } = this._getMapsParams();
-      const hasWmsBaseLayer = !!wms.enabled;
+      const hasWmsBaseLayer = wms && !!wms.enabled;
 
       return hasWmsBaseLayer;
     }
 
     async _updateBaseLayer() {
-      const emsTileLayerId = chrome.getInjected('emsTileLayerId', true);
+      const emsTileLayerId = getInjectedVarFunc()('emsTileLayerId', true);
 
       if (!this._kibanaMap) {
         return;
@@ -149,7 +147,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
             this._setTmsLayer(initBasemapLayer);
           }
         } catch (e) {
-          toastNotifications.addWarning(e.message);
+          toastService.addWarning(e.message);
           return;
         }
         return;
@@ -176,7 +174,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
           this._setTmsLayer(selectedTmsLayer);
         }
       } catch (tmsLoadingError) {
-        toastNotifications.addWarning(tmsLoadingError.message);
+        toastService.addWarning(tmsLoadingError.message);
       }
     }
 
@@ -190,7 +188,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
       if (typeof isDesaturated !== 'boolean') {
         isDesaturated = true;
       }
-      const isDarkMode = chrome.getUiSettingsClient().get('theme:darkMode');
+      const isDarkMode = getUiSettings().get('theme:darkMode');
       const meta = await serviceSettings.getAttributesForTMSLayer(
         tmsLayer,
         isDesaturated,
@@ -208,7 +206,7 @@ export function BaseMapsVisualizationProvider(mapServiceSettings, notificationSe
 
     async _updateData() {
       throw new Error(
-        i18n.translate('tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage', {
+        i18n.translate('maps_legacy.baseMapsVisualization.childShouldImplementMethodErrorMessage', {
           defaultMessage: 'Child should implement this method to respond to data-update',
         })
       );
diff --git a/src/plugins/maps_legacy/public/map/kibana_map.js b/src/plugins/maps_legacy/public/map/kibana_map.js
index 1c4d0882cb7da4..c7cec1b14159aa 100644
--- a/src/plugins/maps_legacy/public/map/kibana_map.js
+++ b/src/plugins/maps_legacy/public/map/kibana_map.js
@@ -24,7 +24,8 @@ import $ from 'jquery';
 import _ from 'lodash';
 import { zoomToPrecision } from './zoom_to_precision';
 import { i18n } from '@kbn/i18n';
-import { ORIGIN } from '../common/origin';
+import { ORIGIN } from '../common/constants/origin';
+import { getToasts } from '../kibana_services';
 
 function makeFitControl(fitContainer, kibanaMap) {
   const FitControl = L.Control.extend({
@@ -101,7 +102,7 @@ function makeLegendControl(container, kibanaMap, position) {
  * Serves as simple abstraction for leaflet as well.
  */
 export class KibanaMap extends EventEmitter {
-  constructor(containerNode, options, services) {
+  constructor(containerNode, options) {
     super();
     this._containerNode = containerNode;
     this._leafletBaseLayer = null;
@@ -116,7 +117,6 @@ export class KibanaMap extends EventEmitter {
     this._layers = [];
     this._listeners = [];
     this._showTooltip = false;
-    this.toastService = services ? services.toastService : null;
 
     const leafletOptions = {
       minZoom: options.minZoom,
@@ -483,21 +483,19 @@ export class KibanaMap extends EventEmitter {
   }
 
   _addMaxZoomMessage = layer => {
-    if (this.toastService) {
-      const zoomWarningMsg = createZoomWarningMsg(
-        this.toastService,
-        this.getZoomLevel,
-        this.getMaxZoomLevel
-      );
+    const zoomWarningMsg = createZoomWarningMsg(
+      getToasts(),
+      this.getZoomLevel,
+      this.getMaxZoomLevel
+    );
 
-      this._leafletMap.on('zoomend', zoomWarningMsg);
-      this._containerNode.setAttribute('data-test-subj', 'zoomWarningEnabled');
+    this._leafletMap.on('zoomend', zoomWarningMsg);
+    this._containerNode.setAttribute('data-test-subj', 'zoomWarningEnabled');
 
-      layer.on('remove', () => {
-        this._leafletMap.off('zoomend', zoomWarningMsg);
-        this._containerNode.removeAttribute('data-test-subj');
-      });
-    }
+    layer.on('remove', () => {
+      this._leafletMap.off('zoomend', zoomWarningMsg);
+      this._containerNode.removeAttribute('data-test-subj');
+    });
   };
 
   setLegendPosition(position) {
diff --git a/src/plugins/maps_legacy/public/map/service_settings.js b/src/plugins/maps_legacy/public/map/service_settings.js
index f4f0d66ee20ded..8e3a0648e99d4b 100644
--- a/src/plugins/maps_legacy/public/map/service_settings.js
+++ b/src/plugins/maps_legacy/public/map/service_settings.js
@@ -22,7 +22,7 @@ import MarkdownIt from 'markdown-it';
 import { EMSClient } from '@elastic/ems-client';
 import { i18n } from '@kbn/i18n';
 import { getInjectedVarFunc } from '../kibana_services';
-import { ORIGIN } from '../common/origin';
+import { ORIGIN } from '../common/constants/origin';
 
 const TMS_IN_YML_ID = 'TMS in config/kibana.yml';
 
diff --git a/src/plugins/maps_legacy/public/plugin.ts b/src/plugins/maps_legacy/public/plugin.ts
index 751be65e1dbf6e..acc7655a5e2636 100644
--- a/src/plugins/maps_legacy/public/plugin.ts
+++ b/src/plugins/maps_legacy/public/plugin.ts
@@ -33,18 +33,20 @@ import { MapsLegacyPluginSetup, MapsLegacyPluginStart } from './index';
  * @public
  */
 
+export const bindSetupCoreAndPlugins = (core: CoreSetup) => {
+  setToasts(core.notifications.toasts);
+  setUiSettings(core.uiSettings);
+  setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+};
+
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MapsLegacySetupDependencies {}
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface MapsLegacyStartDependencies {}
 
 export class MapsLegacyPlugin implements Plugin<MapsLegacyPluginSetup, MapsLegacyPluginStart> {
-  constructor() {}
-
   public setup(core: CoreSetup, plugins: MapsLegacySetupDependencies) {
-    setToasts(core.notifications.toasts);
-    setUiSettings(core.uiSettings);
-    setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+    bindSetupCoreAndPlugins(core);
 
     return {
       serviceSettings: new ServiceSettings(),
diff --git a/src/legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts b/src/plugins/maps_legacy/public/tooltip_provider.js
similarity index 56%
rename from src/legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts
rename to src/plugins/maps_legacy/public/tooltip_provider.js
index 3a7615e83f2817..85631408169971 100644
--- a/src/legacy/core_plugins/region_map/public/shim/legacy_dependencies_plugin.ts
+++ b/src/plugins/maps_legacy/public/tooltip_provider.js
@@ -17,26 +17,27 @@
  * under the License.
  */
 
-import chrome from 'ui/chrome';
-import { CoreStart, Plugin } from 'kibana/public';
+import React from 'react';
+import ReactDOMServer from 'react-dom/server';
 
-/** @internal */
-export interface LegacyDependenciesPluginSetup {
-  $injector: any;
-  serviceSettings: any;
+function getToolTipContent(details) {
+  return ReactDOMServer.renderToStaticMarkup(
+    <table>
+      <tbody>
+        {details.map((detail, i) => (
+          <tr key={i}>
+            <td className="visTooltip__label">{detail.label}</td>
+            <td className="visTooltip__value">{detail.value}</td>
+          </tr>
+        ))}
+      </tbody>
+    </table>
+  );
 }
 
-export class LegacyDependenciesPlugin
-  implements Plugin<Promise<LegacyDependenciesPluginSetup>, void> {
-  public async setup() {
-    const $injector = await chrome.dangerouslyGetActiveInjector();
-
-    return {
-      $injector,
-    } as LegacyDependenciesPluginSetup;
-  }
-
-  public start(core: CoreStart) {
-    // nothing to do here yet
-  }
+export function mapTooltipProvider(element, formatter) {
+  return (...args) => {
+    const details = formatter(...args);
+    return details && getToolTipContent(details);
+  };
 }
diff --git a/src/plugins/vis_type_vega/public/plugin.ts b/src/plugins/vis_type_vega/public/plugin.ts
index c312705194cde2..b52dcfbd914f9a 100644
--- a/src/plugins/vis_type_vega/public/plugin.ts
+++ b/src/plugins/vis_type_vega/public/plugin.ts
@@ -26,14 +26,14 @@ import {
   setSavedObjects,
   setInjectedVars,
   setUISettings,
+  setKibanaMapFactory,
 } from './services';
 
 import { createVegaFn } from './vega_fn';
 import { createVegaTypeDefinition } from './vega_type';
-import { IServiceSettings } from '../../maps_legacy/public';
-import { ConfigSchema } from '../config';
-
+import { getKibanaMapFactoryProvider, IServiceSettings } from '../../maps_legacy/public';
 import './index.scss';
+import { ConfigSchema } from '../config';
 
 /** @internal */
 export interface VegaVisualizationDependencies {
@@ -75,6 +75,7 @@ export class VegaPlugin implements Plugin<Promise<void>, void> {
       emsTileLayerId: core.injectedMetadata.getInjectedVar('emsTileLayerId', true),
     });
     setUISettings(core.uiSettings);
+    setKibanaMapFactory(getKibanaMapFactoryProvider(core));
 
     const visualizationDependencies: Readonly<VegaVisualizationDependencies> = {
       core,
diff --git a/src/plugins/vis_type_vega/public/services.ts b/src/plugins/vis_type_vega/public/services.ts
index e349cfbdc0024d..f81f87d7ad2e17 100644
--- a/src/plugins/vis_type_vega/public/services.ts
+++ b/src/plugins/vis_type_vega/public/services.ts
@@ -27,6 +27,9 @@ export const [getData, setData] = createGetterSetter<DataPublicPluginStart>('Dat
 export const [getNotifications, setNotifications] = createGetterSetter<NotificationsStart>(
   'Notifications'
 );
+export const [getKibanaMapFactory, setKibanaMapFactory] = createGetterSetter<any>(
+  'KibanaMapFactory'
+);
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
diff --git a/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js b/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
index bd6652a597203b..895d496a896aa3 100644
--- a/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
+++ b/src/plugins/vis_type_vega/public/vega_view/vega_map_view.js
@@ -21,13 +21,11 @@ import * as vega from 'vega-lib';
 import { i18n } from '@kbn/i18n';
 import { VegaBaseView } from './vega_base_view';
 import { VegaMapLayer } from './vega_map_layer';
-import { KibanaMap } from '../../../maps_legacy/public';
-import { getEmsTileLayerId, getUISettings } from '../services';
+import { getEmsTileLayerId, getUISettings, getKibanaMapFactory } from '../services';
 
 export class VegaMapView extends VegaBaseView {
-  constructor(opts, services) {
+  constructor(opts) {
     super(opts);
-    this.services = services;
   }
 
   async _initViewCustomizations() {
@@ -107,18 +105,14 @@ export class VegaMapView extends VegaBaseView {
     //   maxBounds = L.latLngBounds(L.latLng(b[1], b[0]), L.latLng(b[3], b[2]));
     // }
 
-    this._kibanaMap = new KibanaMap(
-      this._$container.get(0),
-      {
-        zoom,
-        minZoom,
-        maxZoom,
-        center: [mapConfig.latitude, mapConfig.longitude],
-        zoomControl: mapConfig.zoomControl,
-        scrollWheelZoom: mapConfig.scrollWheelZoom,
-      },
-      this.services
-    );
+    this._kibanaMap = getKibanaMapFactory()(this._$container.get(0), {
+      zoom,
+      minZoom,
+      maxZoom,
+      center: [mapConfig.latitude, mapConfig.longitude],
+      zoomControl: mapConfig.zoomControl,
+      scrollWheelZoom: mapConfig.scrollWheelZoom,
+    });
 
     if (baseMapOpts) {
       this._kibanaMap.setBaseLayer({
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index ac074d99e9ff50..d48e65fabb8d35 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2579,7 +2579,6 @@
     "telemetry.welcomeBanner.enableButtonLabel": "有効にする",
     "telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遠隔測定に関するプライバシーステートメント",
     "telemetry.welcomeBanner.title": "Elastic Stack の改善にご協力ください",
-    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子は data-update に対応できるようこのメソドを導入する必要があります",
     "tileMap.function.help": "タイルマップのビジュアライゼーションです",
     "tileMap.geohashLayer.mapTitle": "{mapType} マップタイプが認識されません",
     "tileMap.tooltipFormatter.latitudeLabel": "緯度",
@@ -2601,25 +2600,6 @@
     "tileMap.visParams.desaturateTilesLabel": "タイルを不飽和化",
     "tileMap.visParams.mapTypeLabel": "マップタイプ",
     "tileMap.visParams.reduceVibrancyOfTileColorsTip": "色の鮮明度を下げます。この機能は Internet Explorer ではバージョンにかかわらず利用できません。",
-    "tileMap.wmsOptions.attributionStringTip": "右下角の属性文字列",
-    "tileMap.wmsOptions.baseLayerSettingsTitle": "ベースレイヤー設定",
-    "tileMap.wmsOptions.imageFormatToUseTip": "通常画像/png または画像/jpeg です。サーバーが透明レイヤーを返す場合は png を使用します。",
-    "tileMap.wmsOptions.layersLabel": "レイヤー",
-    "tileMap.wmsOptions.listOfLayersToUseTip": "使用するレイヤーのコンマ区切りのリストです。",
-    "tileMap.wmsOptions.mapLoadFailDescription": "このパラメーターが正しくないと、マップが正常に読み込まれません。",
-    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS web サービスの URL です。",
-    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "WMS 対応のマップタイルサーバーを使用します。上級者向けです。",
-    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "サーバーがサポートしている WMS のバージョンです。",
-    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
-    "tileMap.wmsOptions.wmsDescription": "WMS は、マップイメージサービスの {wmsLink} です。",
-    "tileMap.wmsOptions.wmsFormatLabel": "WMS フォーマット",
-    "tileMap.wmsOptions.wmsLayersLabel": "WMS レイヤー",
-    "tileMap.wmsOptions.wmsLinkText": "OGC スタンダード",
-    "tileMap.wmsOptions.wmsMapServerLabel": "WMS マップサーバー",
-    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "WMS サーバーがサポートしている使用スタイルのコンマ区切りのリストです。大抵は空白のままです。",
-    "tileMap.wmsOptions.wmsStylesLabel": "WMS スタイル",
-    "tileMap.wmsOptions.wmsUrlLabel": "WMS URL",
-    "tileMap.wmsOptions.wmsVersionLabel": "WMS バージョン",
     "timelion.badge.readOnly.text": "読み込み専用",
     "timelion.badge.readOnly.tooltip": "Timelion シートを保存できません",
     "timelion.breadcrumbs.create": "作成",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 60b958623bdc76..196c8183e0cc11 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2580,7 +2580,6 @@
     "telemetry.welcomeBanner.enableButtonLabel": "启用",
     "telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遥测隐私声明",
     "telemetry.welcomeBanner.title": "帮助我们改进 Elastic Stack",
-    "tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子函数应实现此方法以响应数据更新",
     "tileMap.function.help": "磁贴地图可视化",
     "tileMap.geohashLayer.mapTitle": "{mapType} 地图类型无法识别",
     "tileMap.tooltipFormatter.latitudeLabel": "纬度",
@@ -2602,25 +2601,6 @@
     "tileMap.visParams.desaturateTilesLabel": "降低平铺地图饱和度",
     "tileMap.visParams.mapTypeLabel": "地图类型",
     "tileMap.visParams.reduceVibrancyOfTileColorsTip": "降低平铺地图颜色的亮度。此设置在任何版本的 IE 浏览器中均不起作用。",
-    "tileMap.wmsOptions.attributionStringTip": "右下角的属性字符串。",
-    "tileMap.wmsOptions.baseLayerSettingsTitle": "基础图层设置",
-    "tileMap.wmsOptions.imageFormatToUseTip": "通常为 image/png 或 image/jpeg。如果服务器返回透明图层，则使用 png。",
-    "tileMap.wmsOptions.layersLabel": "图层",
-    "tileMap.wmsOptions.listOfLayersToUseTip": "要使用的图层逗号分隔列表。",
-    "tileMap.wmsOptions.mapLoadFailDescription": "如果此参数不正确，将无法加载地图。",
-    "tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS Web 服务的 URL。",
-    "tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "使用符合 WMS 规范的平铺地图服务器。仅适用于高级用户。",
-    "tileMap.wmsOptions.versionOfWMSserverSupportsTip": "服务器支持的 WMS 版本。",
-    "tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
-    "tileMap.wmsOptions.wmsDescription": "WMS 是用于地图图像服务的 {wmsLink}。",
-    "tileMap.wmsOptions.wmsFormatLabel": "WMS 格式",
-    "tileMap.wmsOptions.wmsLayersLabel": "WMS 图层",
-    "tileMap.wmsOptions.wmsLinkText": "OGC 标准",
-    "tileMap.wmsOptions.wmsMapServerLabel": "WMS 地图服务器",
-    "tileMap.wmsOptions.wmsServerSupportedStylesListTip": "要使用的以逗号分隔的 WMS 服务器支持的样式列表。在大部分情况下为空。",
-    "tileMap.wmsOptions.wmsStylesLabel": "WMS 样式",
-    "tileMap.wmsOptions.wmsUrlLabel": "WMS url",
-    "tileMap.wmsOptions.wmsVersionLabel": "WMS 版本",
     "timelion.badge.readOnly.text": "只读",
     "timelion.badge.readOnly.tooltip": "无法保存 Timelion 工作表",
     "timelion.breadcrumbs.create": "创建",

From cd4980a72ba9f4804f0968f8cf1d0172885edc18 Mon Sep 17 00:00:00 2001
From: Nicolas Chaulet <nicolas.chaulet@elastic.co>
Date: Tue, 28 Apr 2020 13:42:46 -0400
Subject: [PATCH 15/17] [Ingest] Fix GET /enrollment-api-keys/null error
 (#64595)

---
 .../hooks/use_request/agent_config.ts         |  16 +-
 .../hooks/use_request/enrollment_api_keys.ts  |  18 ++-
 .../hooks/use_request/use_request.ts          |  66 ++++++++
 .../details_page/components/yaml/index.tsx    |   2 +-
 .../components/details_section.tsx            |   2 +-
 .../agent_enrollment_flyout/index.tsx         |   2 +-
 .../agent_enrollment_flyout/instructions.tsx  |   7 +-
 .../agent_enrollment_flyout/key_selection.tsx |  26 ++-
 .../confirm_delete_modal.tsx                  |  46 ------
 .../create_api_key_form.tsx                   |  94 -----------
 .../components/enrollment_api_keys/hooks.tsx  |  43 -----
 .../components/enrollment_api_keys/index.tsx  | 152 ------------------
 .../agent_reassign_config_flyout/index.tsx    |   2 +-
 .../translations/translations/ja-JP.json      |  11 --
 .../translations/translations/zh-CN.json      |  11 --
 15 files changed, 108 insertions(+), 390 deletions(-)
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/confirm_delete_modal.tsx
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/create_api_key_form.tsx
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/hooks.tsx
 delete mode 100644 x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/index.tsx

diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
index d16d835f8c701c..bed3f994005ad2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/agent_config.ts
@@ -4,7 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { HttpFetchQuery } from 'src/core/public';
-import { useRequest, sendRequest } from './use_request';
+import {
+  useRequest,
+  sendRequest,
+  useConditionalRequest,
+  SendConditionalRequestConfig,
+} from './use_request';
 import { agentConfigRouteService } from '../../services';
 import {
   GetAgentConfigsResponse,
@@ -25,11 +30,12 @@ export const useGetAgentConfigs = (query: HttpFetchQuery = {}) => {
   });
 };
 
-export const useGetOneAgentConfig = (agentConfigId: string) => {
-  return useRequest<GetOneAgentConfigResponse>({
-    path: agentConfigRouteService.getInfoPath(agentConfigId),
+export const useGetOneAgentConfig = (agentConfigId: string | undefined) => {
+  return useConditionalRequest<GetOneAgentConfigResponse>({
+    path: agentConfigId ? agentConfigRouteService.getInfoPath(agentConfigId) : undefined,
     method: 'get',
-  });
+    shouldSendRequest: !!agentConfigId,
+  } as SendConditionalRequestConfig);
 };
 
 export const useGetOneAgentConfigFull = (agentConfigId: string) => {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/enrollment_api_keys.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/enrollment_api_keys.ts
index e4abb4ccd22cb5..10d9e03e986e10 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/enrollment_api_keys.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/enrollment_api_keys.ts
@@ -4,7 +4,13 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { useRequest, UseRequestConfig, sendRequest } from './use_request';
+import {
+  useRequest,
+  UseRequestConfig,
+  sendRequest,
+  useConditionalRequest,
+  SendConditionalRequestConfig,
+} from './use_request';
 import { enrollmentAPIKeyRouteService } from '../../services';
 import {
   GetOneEnrollmentAPIKeyResponse,
@@ -14,12 +20,12 @@ import {
 
 type RequestOptions = Pick<Partial<UseRequestConfig>, 'pollIntervalMs'>;
 
-export function useGetOneEnrollmentAPIKey(keyId: string, options?: RequestOptions) {
-  return useRequest<GetOneEnrollmentAPIKeyResponse>({
+export function useGetOneEnrollmentAPIKey(keyId: string | undefined) {
+  return useConditionalRequest<GetOneEnrollmentAPIKeyResponse>({
     method: 'get',
-    path: enrollmentAPIKeyRouteService.getInfoPath(keyId),
-    ...options,
-  });
+    path: keyId ? enrollmentAPIKeyRouteService.getInfoPath(keyId) : undefined,
+    shouldSendRequest: !!keyId,
+  } as SendConditionalRequestConfig);
 }
 
 export function sendGetOneEnrollmentAPIKey(keyId: string, options?: RequestOptions) {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/use_request.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/use_request.ts
index c63383637e792f..fbbc482fb96af2 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/use_request.ts
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/hooks/use_request/use_request.ts
@@ -3,6 +3,7 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
+import { useState, useEffect } from 'react';
 import { HttpSetup } from 'src/core/public';
 import {
   SendRequestConfig,
@@ -35,3 +36,68 @@ export const useRequest = <D = any>(config: UseRequestConfig) => {
   }
   return _useRequest<D>(httpClient, config);
 };
+
+export type SendConditionalRequestConfig =
+  | (SendRequestConfig & { shouldSendRequest: true })
+  | (Partial<SendRequestConfig> & { shouldSendRequest: false });
+
+export const useConditionalRequest = <D = any>(config: SendConditionalRequestConfig) => {
+  const [state, setState] = useState<{
+    error: Error | null;
+    data: D | null;
+    isLoading: boolean;
+  }>({
+    error: null,
+    data: null,
+    isLoading: false,
+  });
+
+  const { path, method, shouldSendRequest, query, body } = config;
+
+  async function sendGetOneEnrollmentAPIKeyRequest() {
+    if (!config.shouldSendRequest) {
+      setState({
+        data: null,
+        isLoading: false,
+        error: null,
+      });
+      return;
+    }
+
+    try {
+      setState({
+        data: null,
+        isLoading: true,
+        error: null,
+      });
+      const res = await sendRequest<D>({
+        method: config.method,
+        path: config.path,
+        query: config.query,
+        body: config.body,
+      });
+      if (res.error) {
+        throw res.error;
+      }
+      setState({
+        data: res.data,
+        isLoading: false,
+        error: null,
+      });
+      return res;
+    } catch (error) {
+      setState({
+        data: null,
+        isLoading: false,
+        error,
+      });
+    }
+  }
+
+  useEffect(() => {
+    sendGetOneEnrollmentAPIKeyRequest();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [path, method, shouldSendRequest, JSON.stringify(query), JSON.stringify(body)]);
+
+  return { ...state, sendRequest: sendGetOneEnrollmentAPIKeyRequest };
+};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
index ad27c590d5eaae..f1d7bd5dbc0396 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/agent_config/details_page/components/yaml/index.tsx
@@ -45,7 +45,7 @@ export const ConfigYamlView = memo<{ config: AgentConfig }>(({ config }) => {
     page: 1,
     perPage: 1000,
   });
-  const apiKeyRequest = useGetOneEnrollmentAPIKey(apiKeysRequest.data?.list?.[0]?.id as string);
+  const apiKeyRequest = useGetOneEnrollmentAPIKey(apiKeysRequest.data?.list?.[0]?.id);
 
   if (fullConfigRequest.isLoading && !fullConfigRequest.data) {
     return <Loading />;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/details_section.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/details_section.tsx
index 653e2eb9a3a3bb..b69dd6bcf84319 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/details_section.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_details_page/components/details_section.tsx
@@ -71,7 +71,7 @@ export const AgentDetailSection: React.FunctionComponent<Props> = ({ agent }) =>
 
   // Fetch AgentConfig information
   const { isLoading: isAgentConfigLoading, data: agentConfigData } = useGetOneAgentConfig(
-    agent.config_id as string
+    agent.config_id
   );
 
   const items = [
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/index.tsx
index 9c14a2e9dfed13..dd34e7260b27b4 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/index.tsx
@@ -30,7 +30,7 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<Props> = ({
   onClose,
   agentConfigs = [],
 }) => {
-  const [selectedAPIKeyId, setSelectedAPIKeyId] = useState<string | null>(null);
+  const [selectedAPIKeyId, setSelectedAPIKeyId] = useState<string | undefined>();
 
   return (
     <EuiFlyout onClose={onClose} size="l" maxWidth={640}>
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
index a0244c601cd963..1d2f3bd155622f 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/instructions.tsx
@@ -7,16 +7,15 @@ import React, { useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSpacer, EuiText, EuiButtonGroup, EuiSteps } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { useEnrollmentApiKey } from '../enrollment_api_keys';
 import {
   ShellEnrollmentInstructions,
   ManualInstructions,
 } from '../../../../../components/enrollment_instructions';
-import { useCore, useGetAgents } from '../../../../../hooks';
+import { useCore, useGetAgents, useGetOneEnrollmentAPIKey } from '../../../../../hooks';
 import { Loading } from '../../../components';
 
 interface Props {
-  selectedAPIKeyId: string | null;
+  selectedAPIKeyId: string | undefined;
 }
 function useNewEnrolledAgents() {
   // New enrolled agents
@@ -44,7 +43,7 @@ export const EnrollmentInstructions: React.FunctionComponent<Props> = ({ selecte
   const core = useCore();
   const [installType, setInstallType] = useState<'quickInstall' | 'manual'>('quickInstall');
 
-  const apiKey = useEnrollmentApiKey(selectedAPIKeyId);
+  const apiKey = useGetOneEnrollmentAPIKey(selectedAPIKeyId);
 
   const newAgents = useNewEnrolledAgents();
   if (!apiKey.data) {
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/key_selection.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/key_selection.tsx
index 89801bc6bee1ed..67930e51418b0c 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/key_selection.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/agent_enrollment_flyout/key_selection.tsx
@@ -16,17 +16,16 @@ import {
   EuiFieldText,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { useEnrollmentApiKeys } from '../enrollment_api_keys';
 import { AgentConfig } from '../../../../../types';
-import { useInput, useCore, sendRequest } from '../../../../../hooks';
+import { useInput, useCore, sendRequest, useGetEnrollmentAPIKeys } from '../../../../../hooks';
 import { enrollmentAPIKeyRouteService } from '../../../../../services';
 
 interface Props {
-  onKeyChange: (keyId: string | null) => void;
+  onKeyChange: (keyId: string | undefined) => void;
   agentConfigs: AgentConfig[];
 }
 
-function useCreateApiKeyForm(configId: string | null, onSuccess: (keyId: string) => void) {
+function useCreateApiKeyForm(configId: string | undefined, onSuccess: (keyId: string) => void) {
   const { notifications } = useCore();
   const [isLoading, setIsLoading] = useState(false);
   const apiKeyNameInput = useInput('');
@@ -62,17 +61,16 @@ function useCreateApiKeyForm(configId: string | null, onSuccess: (keyId: string)
 }
 
 export const APIKeySelection: React.FunctionComponent<Props> = ({ onKeyChange, agentConfigs }) => {
-  const enrollmentAPIKeysRequest = useEnrollmentApiKeys({
-    currentPage: 1,
-    pageSize: 1000,
+  const enrollmentAPIKeysRequest = useGetEnrollmentAPIKeys({
+    page: 1,
+    perPage: 1000,
   });
 
   const [selectedState, setSelectedState] = useState<{
-    agentConfigId: string | null;
-    enrollmentAPIKeyId: string | null;
+    agentConfigId?: string;
+    enrollmentAPIKeyId?: string;
   }>({
-    agentConfigId: agentConfigs.length ? agentConfigs[0].id : null,
-    enrollmentAPIKeyId: null,
+    agentConfigId: agentConfigs.length ? agentConfigs[0].id : undefined,
   });
   const filteredEnrollmentAPIKeys = React.useMemo(() => {
     if (!selectedState.agentConfigId || !enrollmentAPIKeysRequest.data) {
@@ -99,10 +97,10 @@ export const APIKeySelection: React.FunctionComponent<Props> = ({ onKeyChange, a
 
   const [showAPIKeyForm, setShowAPIKeyForm] = useState(false);
   const apiKeyForm = useCreateApiKeyForm(selectedState.agentConfigId, async (keyId: string) => {
-    const res = await enrollmentAPIKeysRequest.refresh();
+    const res = await enrollmentAPIKeysRequest.sendRequest();
     setSelectedState({
       ...selectedState,
-      enrollmentAPIKeyId: res.data?.list.find(key => key.id === keyId)?.id ?? null,
+      enrollmentAPIKeyId: res.data?.list.find(key => key.id === keyId)?.id,
     });
     setShowAPIKeyForm(false);
   });
@@ -135,7 +133,7 @@ export const APIKeySelection: React.FunctionComponent<Props> = ({ onKeyChange, a
               onChange={e =>
                 setSelectedState({
                   agentConfigId: e.target.value,
-                  enrollmentAPIKeyId: null,
+                  enrollmentAPIKeyId: undefined,
                 })
               }
             />
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/confirm_delete_modal.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/confirm_delete_modal.tsx
deleted file mode 100644
index 8ce20a85e14b82..00000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/confirm_delete_modal.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import { EuiOverlayMask, EuiConfirmModal } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export const ConfirmDeleteModal: React.FunctionComponent<{
-  onConfirm: () => void;
-  onCancel: () => void;
-  apiKeyId: string;
-}> = ({ onConfirm, onCancel, apiKeyId }) => {
-  return (
-    <EuiOverlayMask>
-      <EuiConfirmModal
-        title={
-          <FormattedMessage
-            id="xpack.ingestManager.deleteApiKeys.confirmModal.title"
-            defaultMessage="Delete api key: {apiKeyId}"
-            values={{
-              apiKeyId,
-            }}
-          />
-        }
-        onCancel={onCancel}
-        onConfirm={onConfirm}
-        cancelButtonText={
-          <FormattedMessage
-            id="xpack.ingestManager.deleteApiKeys.confirmModal.cancelButtonLabel"
-            defaultMessage="Cancel"
-          />
-        }
-        confirmButtonText={
-          <FormattedMessage
-            id="xpack.ingestManager.deleteApiKeys.confirmModal.confirmButtonLabel"
-            defaultMessage="Delete"
-          />
-        }
-        buttonColor="danger"
-      />
-    </EuiOverlayMask>
-  );
-};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/create_api_key_form.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/create_api_key_form.tsx
deleted file mode 100644
index 009080a4da1860..00000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/create_api_key_form.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import React from 'react';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiFieldText,
-  EuiButton,
-  EuiSelect,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { useInput, sendRequest } from '../../../../../hooks';
-import { useConfigs } from './hooks';
-import { enrollmentAPIKeyRouteService } from '../../../../../services';
-
-export const CreateApiKeyForm: React.FunctionComponent<{ onChange: () => void }> = ({
-  onChange,
-}) => {
-  const { data: configs } = useConfigs();
-  const { inputs, onSubmit, submitted } = useCreateApiKey(() => onChange());
-
-  return (
-    <EuiFlexGroup style={{ maxWidth: 600 }}>
-      <EuiFlexItem>
-        <EuiFormRow
-          label={i18n.translate('xpack.ingestManager.apiKeysForm.nameLabel', {
-            defaultMessage: 'Key Name',
-          })}
-        >
-          <EuiFieldText autoComplete={'false'} {...inputs.nameInput.props} />
-        </EuiFormRow>
-      </EuiFlexItem>
-      <EuiFlexItem>
-        <EuiFormRow
-          label={i18n.translate('xpack.ingestManager.apiKeysForm.configLabel', {
-            defaultMessage: 'Config',
-          })}
-        >
-          <EuiSelect
-            {...inputs.configIdInput.props}
-            options={configs.map(config => ({
-              value: config.id,
-              text: config.name,
-            }))}
-          />
-        </EuiFormRow>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiFormRow hasEmptyLabelSpace>
-          <EuiButton disabled={submitted} onClick={() => onSubmit()}>
-            <FormattedMessage
-              id="xpack.ingestManager.apiKeysForm.saveButton"
-              defaultMessage="Save"
-            />
-          </EuiButton>
-        </EuiFormRow>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
-
-function useCreateApiKey(onSuccess: () => void) {
-  const [submitted, setSubmitted] = React.useState(false);
-  const inputs = {
-    nameInput: useInput(),
-    configIdInput: useInput('default'),
-  };
-
-  const onSubmit = async () => {
-    setSubmitted(true);
-    await sendRequest({
-      method: 'post',
-      path: enrollmentAPIKeyRouteService.getCreatePath(),
-      body: JSON.stringify({
-        name: inputs.nameInput.value,
-        config_id: inputs.configIdInput.value,
-      }),
-    });
-    setSubmitted(false);
-    onSuccess();
-  };
-
-  return {
-    inputs,
-    onSubmit,
-    submitted,
-  };
-}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/hooks.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/hooks.tsx
deleted file mode 100644
index 41c6b5912cd319..00000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/hooks.tsx
+++ /dev/null
@@ -1,43 +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 {
-  Pagination,
-  useGetAgentConfigs,
-  useGetEnrollmentAPIKeys,
-  useGetOneEnrollmentAPIKey,
-} from '../../../../../hooks';
-
-export function useEnrollmentApiKeys(pagination: Pagination) {
-  const request = useGetEnrollmentAPIKeys({
-    page: pagination.currentPage,
-    perPage: pagination.pageSize,
-  });
-
-  return {
-    data: request.data,
-    isLoading: request.isLoading,
-    refresh: () => request.sendRequest(),
-  };
-}
-
-export function useConfigs() {
-  const request = useGetAgentConfigs();
-
-  return {
-    data: request.data ? request.data.items : [],
-    isLoading: request.isLoading,
-  };
-}
-
-export function useEnrollmentApiKey(apiKeyId: string | null) {
-  const request = useGetOneEnrollmentAPIKey(apiKeyId as string);
-
-  return {
-    data: request.data,
-    isLoading: request.isLoading,
-  };
-}
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/index.tsx
deleted file mode 100644
index 19957e7827680b..00000000000000
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/agent_list_page/components/enrollment_api_keys/index.tsx
+++ /dev/null
@@ -1,152 +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, { useState } from 'react';
-import { EuiBasicTable, EuiButtonEmpty, EuiSpacer, EuiPopover, EuiLink } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import { usePagination, sendRequest } from '../../../../../hooks';
-import { useEnrollmentApiKeys, useEnrollmentApiKey } from './hooks';
-import { ConfirmDeleteModal } from './confirm_delete_modal';
-import { CreateApiKeyForm } from './create_api_key_form';
-import { EnrollmentAPIKey } from '../../../../../types';
-import { useCapabilities } from '../../../../../hooks';
-import { enrollmentAPIKeyRouteService } from '../../../../../services';
-export { useEnrollmentApiKeys, useEnrollmentApiKey } from './hooks';
-
-export const EnrollmentApiKeysTable: React.FunctionComponent<{
-  onChange: () => void;
-}> = ({ onChange }) => {
-  const [confirmDeleteApiKeyId, setConfirmDeleteApiKeyId] = useState<string | null>(null);
-  const { pagination } = usePagination();
-  const { data, isLoading, refresh } = useEnrollmentApiKeys(pagination);
-
-  const columns: any[] = [
-    {
-      field: 'name',
-      name: i18n.translate('xpack.ingestManager.apiKeysList.nameColumnTitle', {
-        defaultMessage: 'Name',
-      }),
-      width: '300px',
-    },
-    {
-      field: 'config_id',
-      name: i18n.translate('xpack.ingestManager.apiKeysList.configColumnTitle', {
-        defaultMessage: 'Config',
-      }),
-      width: '100px',
-    },
-    {
-      field: null,
-      name: i18n.translate('xpack.ingestManager.apiKeysList.apiKeyColumnTitle', {
-        defaultMessage: 'API Key',
-      }),
-      render: (key: EnrollmentAPIKey) => <ApiKeyField apiKeyId={key.id} />,
-    },
-    {
-      field: null,
-      width: '50px',
-      render: (key: EnrollmentAPIKey) => {
-        return (
-          <EuiButtonEmpty onClick={() => setConfirmDeleteApiKeyId(key.id)} iconType={'trash'} />
-        );
-      },
-    },
-  ];
-
-  return (
-    <>
-      {confirmDeleteApiKeyId && (
-        <ConfirmDeleteModal
-          apiKeyId={confirmDeleteApiKeyId}
-          onCancel={() => setConfirmDeleteApiKeyId(null)}
-          onConfirm={async () => {
-            await sendRequest({
-              method: 'delete',
-              path: enrollmentAPIKeyRouteService.getDeletePath(confirmDeleteApiKeyId),
-            });
-            setConfirmDeleteApiKeyId(null);
-            refresh();
-          }}
-        />
-      )}
-      <EuiBasicTable
-        compressed={true}
-        loading={isLoading}
-        noItemsMessage={
-          <FormattedMessage
-            id="xpack.ingestManager.apiKeysList.emptyEnrollmentKeysMessage"
-            defaultMessage="No api keys"
-          />
-        }
-        items={data ? data.list : []}
-        itemId="id"
-        columns={columns}
-      />
-      <EuiSpacer size={'s'} />
-      <CreateApiKeyButton
-        onChange={() => {
-          refresh();
-          onChange();
-        }}
-      />
-    </>
-  );
-};
-
-export const CreateApiKeyButton: React.FunctionComponent<{ onChange: () => void }> = ({
-  onChange,
-}) => {
-  const hasWriteCapabilites = useCapabilities().write;
-  const [isOpen, setIsOpen] = React.useState(false);
-
-  return (
-    <EuiPopover
-      ownFocus
-      button={
-        <EuiLink disabled={!hasWriteCapabilites} onClick={() => setIsOpen(true)} color="primary">
-          <FormattedMessage
-            id="xpack.ingestManager.enrollmentApiKeyList.createNewButton"
-            defaultMessage="Create a new key"
-          />
-        </EuiLink>
-      }
-      isOpen={isOpen}
-      closePopover={() => setIsOpen(false)}
-    >
-      <CreateApiKeyForm
-        onChange={() => {
-          setIsOpen(false);
-          onChange();
-        }}
-      />
-    </EuiPopover>
-  );
-  return <></>;
-};
-
-const ApiKeyField: React.FunctionComponent<{ apiKeyId: string }> = ({ apiKeyId }) => {
-  const [visible, setVisible] = useState(false);
-  const { data } = useEnrollmentApiKey(apiKeyId);
-
-  return (
-    <>
-      {visible && data ? data.item.api_key : '••••••••••••••••••••••••••••'}
-      <EuiButtonEmpty size="xs" color={'text'} onClick={() => setVisible(!visible)}>
-        {visible ? (
-          <FormattedMessage
-            id="xpack.ingestManager.enrollmentApiKeyList.hideTableButton"
-            defaultMessage="Hide"
-          />
-        ) : (
-          <FormattedMessage
-            id="xpack.ingestManager.enrollmentApiKeyList.viewTableButton"
-            defaultMessage="View"
-          />
-        )}
-      </EuiButtonEmpty>{' '}
-    </>
-  );
-};
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
index 11a049047b7877..692c60cdce38c1 100644
--- a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
+++ b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/sections/fleet/components/agent_reassign_config_flyout/index.tsx
@@ -45,7 +45,7 @@ export const AgentReassignConfigFlyout: React.FunctionComponent<Props> = ({ onCl
   const agentConfigsRequest = useGetAgentConfigs();
   const agentConfigs = agentConfigsRequest.data ? agentConfigsRequest.data.items : [];
 
-  const agentConfigRequest = useGetOneAgentConfig(selectedAgentConfigId as string);
+  const agentConfigRequest = useGetOneAgentConfig(selectedAgentConfigId);
   const agentConfig = agentConfigRequest.data ? agentConfigRequest.data.item : null;
 
   const [isSubmitting, setIsSubmitting] = useState(false);
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index d48e65fabb8d35..cdff34ec3a6039 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8305,13 +8305,6 @@
     "xpack.ingestManager.agentListStatus.offlineLabel": "オフライン",
     "xpack.ingestManager.agentListStatus.onlineLabel": "オンライン",
     "xpack.ingestManager.agentListStatus.totalLabel": "エージェント",
-    "xpack.ingestManager.apiKeysForm.configLabel": "構成",
-    "xpack.ingestManager.apiKeysForm.nameLabel": "キー名",
-    "xpack.ingestManager.apiKeysForm.saveButton": "保存",
-    "xpack.ingestManager.apiKeysList.apiKeyColumnTitle": "API キー",
-    "xpack.ingestManager.apiKeysList.configColumnTitle": "構成",
-    "xpack.ingestManager.apiKeysList.emptyEnrollmentKeysMessage": "API キーがありません",
-    "xpack.ingestManager.apiKeysList.nameColumnTitle": "名前",
     "xpack.ingestManager.appNavigation.configurationsLinkText": "構成",
     "xpack.ingestManager.appNavigation.fleetLinkText": "フリート",
     "xpack.ingestManager.appNavigation.overviewLinkText": "概要",
@@ -8390,8 +8383,6 @@
     "xpack.ingestManager.deleteAgentConfigs.successMultipleNotificationTitle": "{count} 件のエージェント構成を削除しました",
     "xpack.ingestManager.deleteAgentConfigs.successSingleNotificationTitle": "エージェント構成「{id}」を削除しました",
     "xpack.ingestManager.deleteApiKeys.confirmModal.cancelButtonLabel": "キャンセル",
-    "xpack.ingestManager.deleteApiKeys.confirmModal.confirmButtonLabel": "削除",
-    "xpack.ingestManager.deleteApiKeys.confirmModal.title": "API キーを削除: {apiKeyId}",
     "xpack.ingestManager.deleteDatasource.confirmModal.affectedAgentsMessage": "{agentConfigName} が一部のエージェントで既に使用されていることをフリートが検出しました。",
     "xpack.ingestManager.deleteDatasource.confirmModal.affectedAgentsTitle": "このアクションは {agentsCount} {agentsCount, plural, one {# エージェント} other {# エージェント}}に影響します",
     "xpack.ingestManager.deleteDatasource.confirmModal.cancelButtonLabel": "キャンセル",
@@ -8414,9 +8405,7 @@
     "xpack.ingestManager.editConfig.successNotificationTitle": "エージェント構成「{name}」を更新しました",
     "xpack.ingestManager.enrollmentApiKeyForm.namePlaceholder": "名前を選択",
     "xpack.ingestManager.enrollmentApiKeyList.createNewButton": "新規キーを作成",
-    "xpack.ingestManager.enrollmentApiKeyList.hideTableButton": "を非表示",
     "xpack.ingestManager.enrollmentApiKeyList.useExistingsButton": "既存のキーを使用",
-    "xpack.ingestManager.enrollmentApiKeyList.viewTableButton": "表示",
     "xpack.ingestManager.epm.addDatasourceButtonText": "データソースを作成",
     "xpack.ingestManager.epm.pageSubtitle": "人気のアプリやサービスのパッケージを参照する",
     "xpack.ingestManager.epm.pageTitle": "Elastic Package Manager",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 196c8183e0cc11..819112feb9f572 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8308,13 +8308,6 @@
     "xpack.ingestManager.agentListStatus.offlineLabel": "脱机",
     "xpack.ingestManager.agentListStatus.onlineLabel": "联机",
     "xpack.ingestManager.agentListStatus.totalLabel": "代理",
-    "xpack.ingestManager.apiKeysForm.configLabel": "配置",
-    "xpack.ingestManager.apiKeysForm.nameLabel": "密钥名称",
-    "xpack.ingestManager.apiKeysForm.saveButton": "保存",
-    "xpack.ingestManager.apiKeysList.apiKeyColumnTitle": "API 密钥",
-    "xpack.ingestManager.apiKeysList.configColumnTitle": "配置",
-    "xpack.ingestManager.apiKeysList.emptyEnrollmentKeysMessage": "无 API 密钥",
-    "xpack.ingestManager.apiKeysList.nameColumnTitle": "名称",
     "xpack.ingestManager.appNavigation.configurationsLinkText": "配置",
     "xpack.ingestManager.appNavigation.fleetLinkText": "Fleet",
     "xpack.ingestManager.appNavigation.overviewLinkText": "概览",
@@ -8393,8 +8386,6 @@
     "xpack.ingestManager.deleteAgentConfigs.successMultipleNotificationTitle": "已删除 {count} 个代理配置",
     "xpack.ingestManager.deleteAgentConfigs.successSingleNotificationTitle": "已删除代理配置“{id}”",
     "xpack.ingestManager.deleteApiKeys.confirmModal.cancelButtonLabel": "取消",
-    "xpack.ingestManager.deleteApiKeys.confirmModal.confirmButtonLabel": "删除",
-    "xpack.ingestManager.deleteApiKeys.confirmModal.title": "删除 api 密钥：{apiKeyId}",
     "xpack.ingestManager.deleteDatasource.confirmModal.affectedAgentsMessage": "Fleet 已检测到 {agentConfigName} 已由您的部分代理使用。",
     "xpack.ingestManager.deleteDatasource.confirmModal.affectedAgentsTitle": "此操作将影响 {agentsCount} 个 {agentsCount, plural, one {代理} other {代理}}。",
     "xpack.ingestManager.deleteDatasource.confirmModal.cancelButtonLabel": "取消",
@@ -8417,9 +8408,7 @@
     "xpack.ingestManager.editConfig.successNotificationTitle": "代理配置“{name}”已更新",
     "xpack.ingestManager.enrollmentApiKeyForm.namePlaceholder": "选择名称",
     "xpack.ingestManager.enrollmentApiKeyList.createNewButton": "创建新密钥",
-    "xpack.ingestManager.enrollmentApiKeyList.hideTableButton": "隐藏",
     "xpack.ingestManager.enrollmentApiKeyList.useExistingsButton": "使用现有密钥",
-    "xpack.ingestManager.enrollmentApiKeyList.viewTableButton": "查看",
     "xpack.ingestManager.epm.addDatasourceButtonText": "创建数据源",
     "xpack.ingestManager.epm.pageSubtitle": "浏览热门应用和服务的软件。",
     "xpack.ingestManager.epm.pageTitle": "Elastic Package Manager",

From d5c1812d006d0a530f6ca5fd0a4b7129530e112f Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Tue, 28 Apr 2020 19:48:34 +0200
Subject: [PATCH 16/17] [Uptime] Update uptime ml job id to limit to 64 char
 (#64394)

---
 .../state/api/__tests__/ml_anomaly.test.ts    | 34 +++++++++++++++++++
 .../uptime/public/state/api/ml_anomaly.ts     | 27 +++++++++++----
 2 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts

diff --git a/x-pack/legacy/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts b/x-pack/legacy/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts
new file mode 100644
index 00000000000000..838e5b8246b4b5
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/__tests__/ml_anomaly.test.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { getMLJobId } from '../ml_anomaly';
+
+describe('ML Anomaly API', () => {
+  it('it generates a lowercase job id', async () => {
+    const monitorId = 'ABC1334haa';
+
+    const jobId = getMLJobId(monitorId);
+
+    expect(jobId).toEqual(jobId.toLowerCase());
+  });
+
+  it('should truncate long monitor IDs', () => {
+    const longAndWeirdMonitorId =
+      'https://auto-mmmmxhhhhhccclongAndWeirdMonitorId123yyyyyrereauto-xcmpa-1345555454646';
+
+    expect(getMLJobId(longAndWeirdMonitorId)).toHaveLength(64);
+  });
+
+  it('should remove special characters and replace them with underscore', () => {
+    const monIdSpecialChars = '/ ? , " < > | *   a';
+
+    const jobId = getMLJobId(monIdSpecialChars);
+
+    const format = /[/?,"<>|*]+/;
+
+    expect(format.test(jobId)).toBe(false);
+  });
+});
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts b/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
index 16b90e99214284..ca324895c26dbd 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/ml_anomaly.ts
@@ -18,7 +18,25 @@ import {
 import { DataRecognizerConfigResponse } from '../../../../../../plugins/ml/common/types/modules';
 import { JobExistResult } from '../../../../../../plugins/ml/common/types/data_recognizer';
 
-export const getMLJobId = (monitorId: string) => `${monitorId}_${ML_JOB_ID}`.toLowerCase();
+const getJobPrefix = (monitorId: string) => {
+  // ML App doesn't support upper case characters in job name
+  // Also Spaces and the characters / ? , " < > | * are not allowed
+  // so we will replace all special chars with _
+
+  const prefix = monitorId.replace(/[^A-Z0-9]+/gi, '_').toLowerCase();
+
+  // ML Job ID can't be greater than 64 length, so will be substring it, and hope
+  // At such big length, there is minimum chance of having duplicate monitor id
+  // Subtracting ML_JOB_ID constant as well
+  const postfix = '_' + ML_JOB_ID;
+
+  if ((prefix + postfix).length > 64) {
+    return prefix.substring(0, 64 - postfix.length) + '_';
+  }
+  return prefix + '_';
+};
+
+export const getMLJobId = (monitorId: string) => `${getJobPrefix(monitorId)}${ML_JOB_ID}`;
 
 export const getMLCapabilities = async (): Promise<MlCapabilitiesResponse> => {
   return await apiService.get(API_URLS.ML_CAPABILITIES);
@@ -34,11 +52,8 @@ export const createMLJob = async ({
 }: MonitorIdParam & HeartbeatIndicesParam): Promise<CreateMLJobSuccess | null> => {
   const url = API_URLS.ML_SETUP_MODULE + ML_MODULE_ID;
 
-  // ML App doesn't support upper case characters in job name
-  const lowerCaseMonitorId = monitorId.toLowerCase();
-
   const data = {
-    prefix: `${lowerCaseMonitorId}_`,
+    prefix: `${getJobPrefix(monitorId)}`,
     useDedicatedIndex: false,
     startDatafeed: true,
     start: moment()
@@ -48,7 +63,7 @@ export const createMLJob = async ({
     query: {
       bool: {
         filter: [
-          { term: { 'monitor.id': lowerCaseMonitorId } },
+          { term: { 'monitor.id': monitorId } },
           { range: { 'monitor.duration.us': { gt: 0 } } },
         ],
       },

From dfb4c331a0242c80a10572f3db69ed06f982de46 Mon Sep 17 00:00:00 2001
From: Josh Dover <me@joshdover.com>
Date: Tue, 28 Apr 2020 11:54:25 -0600
Subject: [PATCH 17/17] Use short URLs for legacy plugin deprecation warning
 (#64540)

---
 .../legacy/plugins/log_legacy_plugins_warning.test.ts      | 4 ++--
 .../server/legacy/plugins/log_legacy_plugins_warning.ts    | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts b/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts
index 1790b096a71aea..dfa2396d5904bc 100644
--- a/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts
+++ b/src/core/server/legacy/plugins/log_legacy_plugins_warning.test.ts
@@ -48,7 +48,7 @@ describe('logLegacyThirdPartyPluginDeprecationWarning', () => {
     expect(log.warn).toHaveBeenCalledTimes(1);
     expect(log.warn.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
-        "Some installed third party plugin(s) [plugin] are using the legacy plugin format and will no longer work in a future Kibana release. Please refer to https://www.elastic.co/guide/en/kibana/master/breaking-changes-8.0.html for a list of breaking changes and https://github.com/elastic/kibana/blob/master/src/core/MIGRATION.md for documentation on how to migrate legacy plugins.",
+        "Some installed third party plugin(s) [plugin] are using the legacy plugin format and will no longer work in a future Kibana release. Please refer to https://ela.st/kibana-breaking-changes-8-0 for a list of breaking changes and https://ela.st/kibana-platform-migration for documentation on how to migrate legacy plugins.",
       ]
     `);
   });
@@ -65,7 +65,7 @@ describe('logLegacyThirdPartyPluginDeprecationWarning', () => {
     expect(log.warn).toHaveBeenCalledTimes(1);
     expect(log.warn.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
-        "Some installed third party plugin(s) [pluginA, pluginB, pluginC] are using the legacy plugin format and will no longer work in a future Kibana release. Please refer to https://www.elastic.co/guide/en/kibana/master/breaking-changes-8.0.html for a list of breaking changes and https://github.com/elastic/kibana/blob/master/src/core/MIGRATION.md for documentation on how to migrate legacy plugins.",
+        "Some installed third party plugin(s) [pluginA, pluginB, pluginC] are using the legacy plugin format and will no longer work in a future Kibana release. Please refer to https://ela.st/kibana-breaking-changes-8-0 for a list of breaking changes and https://ela.st/kibana-platform-migration for documentation on how to migrate legacy plugins.",
       ]
     `);
   });
diff --git a/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts b/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts
index f9c3dcbf554cb8..df86f5a2b40317 100644
--- a/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts
+++ b/src/core/server/legacy/plugins/log_legacy_plugins_warning.ts
@@ -22,9 +22,10 @@ import { LegacyPluginSpec } from '../types';
 
 const internalPaths = ['/src/legacy/core_plugins', '/x-pack'];
 
-const breakingChangesUrl =
-  'https://www.elastic.co/guide/en/kibana/master/breaking-changes-8.0.html';
-const migrationGuideUrl = 'https://github.com/elastic/kibana/blob/master/src/core/MIGRATION.md';
+// Use shortened URLs so destinations can be updated if/when documentation moves
+// All platform team members have access to edit these
+const breakingChangesUrl = 'https://ela.st/kibana-breaking-changes-8-0';
+const migrationGuideUrl = 'https://ela.st/kibana-platform-migration';
 
 export const logLegacyThirdPartyPluginDeprecationWarning = ({
   specs,