From 168239ca07d4a0d90e8fea04a7c4d63fa455cd45 Mon Sep 17 00:00:00 2001
From: Shahzad <shahzad.muhammad@elastic.co>
Date: Mon, 16 Mar 2020 12:39:27 +0100
Subject: [PATCH 1/4] [Uptime] Index Status API to Rest (#59657)

* gql to rest

* update snap

* fix api

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../plugins/uptime/common/constants/index.ts  |  1 +
 .../uptime/common/constants/rest_api.ts       |  9 ++++
 .../plugins/uptime/common/graphql/types.ts    | 12 +----
 .../uptime/common/runtime_types/common.ts     |  6 +++
 .../connected/empty_state/empty_state.tsx     | 30 ++++++++++++
 .../public/components/connected/index.ts      |  1 +
 .../kuerybar/kuery_bar_container.tsx          |  2 +-
 .../connected/pages/overview_container.tsx    |  2 +-
 .../__snapshots__/empty_state.test.tsx.snap   | 37 +++++++--------
 .../__tests__/empty_state.test.tsx            | 24 ++++------
 .../functional/empty_state/empty_state.tsx    | 33 ++++++-------
 .../empty_state/empty_state_error.tsx         |  7 ++-
 .../public/components/functional/index.ts     |  1 -
 .../functional/kuery_bar/kuery_bar.tsx        | 16 +++----
 .../__tests__/monitor_list.test.tsx           |  4 +-
 .../monitor_list_pagination.test.tsx          |  4 +-
 .../monitor_list_drawer/__tests__/data.json   |  2 +-
 .../public/hooks/update_kuery_string.ts       |  2 +-
 .../plugins/uptime/public/pages/overview.tsx  |  7 ++-
 .../uptime/public/queries/doc_count_query.ts  | 22 ---------
 .../plugins/uptime/public/queries/index.ts    |  1 -
 .../public/queries/monitor_states_query.ts    |  4 +-
 .../uptime/public/state/actions/index.ts      |  1 +
 .../public/state/actions/index_status.ts      | 10 ++++
 .../uptime/public/state/actions/types.ts      |  8 ++++
 .../uptime/public/state/actions/utils.ts      | 16 +++++++
 .../plugins/uptime/public/state/api/index.ts  |  1 +
 .../uptime/public/state/api/index_status.ts   | 31 +++++++++++++
 .../public/state/effects/fetch_effect.ts      |  4 --
 .../uptime/public/state/effects/index.ts      |  2 +
 .../public/state/effects/index_status.ts      | 17 +++++++
 .../uptime/public/state/reducers/index.ts     |  2 +
 .../public/state/reducers/index_pattern.ts    |  3 +-
 .../public/state/reducers/index_status.ts     | 30 ++++++++++++
 .../index.ts => state/reducers/types.ts}      |  5 +-
 .../uptime/public/state/reducers/utils.ts     | 33 +++++++++++++
 .../state/selectors/__tests__/index.test.ts   |  5 ++
 .../uptime/public/state/selectors/index.ts    |  6 ++-
 .../graphql/monitor_states/resolvers.ts       | 16 +------
 .../graphql/monitor_states/schema.gql.ts      | 13 +-----
 .../server/lib/requests/get_index_status.ts   |  6 +--
 .../server/lib/requests/uptime_requests.ts    |  7 +--
 .../plugins/uptime/server/rest_api/index.ts   |  3 +-
 .../get_index_pattern.ts                      |  0
 .../rest_api/index_state/get_index_status.ts  | 29 ++++++++++++
 .../{index_pattern => index_state}/index.ts   |  1 +
 .../apis/uptime/feature_controls.ts           | 25 ++++------
 .../apis/uptime/graphql/doc_count.js          | 36 ---------------
 .../uptime/graphql/fixtures/doc_count.json    |  8 ----
 .../graphql/fixtures/monitor_states.json      | 46 +++++--------------
 .../fixtures/monitor_states_id_filtered.json  | 10 ++--
 .../fixtures/monitor_states_page_1.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_10.json      | 46 +++++--------------
 .../monitor_states_page_10_previous.json      | 46 +++++--------------
 .../fixtures/monitor_states_page_2.json       | 46 +++++--------------
 .../monitor_states_page_2_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_3.json       | 46 +++++--------------
 .../monitor_states_page_3_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_4.json       | 46 +++++--------------
 .../monitor_states_page_4_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_5.json       | 46 +++++--------------
 .../monitor_states_page_5_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_6.json       | 46 +++++--------------
 .../monitor_states_page_6_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_7.json       | 46 +++++--------------
 .../monitor_states_page_7_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_8.json       | 46 +++++--------------
 .../monitor_states_page_8_previous.json       | 46 +++++--------------
 .../fixtures/monitor_states_page_9.json       | 46 +++++--------------
 .../monitor_states_page_9_previous.json       | 46 +++++--------------
 .../apis/uptime/graphql/index.js              |  1 -
 .../apis/uptime/rest/doc_count.ts             | 20 ++++++++
 .../apis/uptime/rest/fixtures/doc_count.json  |  4 ++
 .../api_integration/apis/uptime/rest/index.ts |  1 +
 74 files changed, 590 insertions(+), 911 deletions(-)
 create mode 100644 x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
 delete mode 100644 x-pack/legacy/plugins/uptime/public/queries/doc_count_query.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/api/index_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/effects/index_status.ts
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts
 rename x-pack/legacy/plugins/uptime/public/{components/functional/empty_state/index.ts => state/reducers/types.ts} (76%)
 create mode 100644 x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
 rename x-pack/plugins/uptime/server/rest_api/{index_pattern => index_state}/get_index_pattern.ts (100%)
 create mode 100644 x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
 rename x-pack/plugins/uptime/server/rest_api/{index_pattern => index_state}/index.ts (82%)
 delete mode 100644 x-pack/test/api_integration/apis/uptime/graphql/doc_count.js
 delete mode 100644 x-pack/test/api_integration/apis/uptime/graphql/fixtures/doc_count.json
 create mode 100644 x-pack/test/api_integration/apis/uptime/rest/doc_count.ts
 create mode 100644 x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json

diff --git a/x-pack/legacy/plugins/uptime/common/constants/index.ts b/x-pack/legacy/plugins/uptime/common/constants/index.ts
index 9d5ad4607491c3..0425fc19a7b455 100644
--- a/x-pack/legacy/plugins/uptime/common/constants/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/constants/index.ts
@@ -12,3 +12,4 @@ export * from './capabilities';
 export { PLUGIN } from './plugin';
 export { QUERY, STATES } from './query';
 export * from './ui';
+export * from './rest_api';
diff --git a/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
new file mode 100644
index 00000000000000..f09c7959778312
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/common/constants/rest_api.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under 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 enum REST_API_URLS {
+  INDEX_STATUS = '/api/uptime/index_status',
+}
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
index a33a69c2298730..1a37ce0b18c738 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
@@ -21,8 +21,6 @@ export interface Query {
 
   /** Fetches the current state of Uptime monitors for the given parameters. */
   getMonitorStates?: MonitorSummaryResult | null;
-  /** Fetches details about the uptime index. */
-  getStatesIndexStatus: StatesIndexStatus;
 }
 
 export interface PingResults {
@@ -392,7 +390,7 @@ export interface MonitorSummaryResult {
   /** The objects representing the state of a series of heartbeat monitors. */
   summaries?: MonitorSummary[] | null;
   /** The number of summaries. */
-  totalSummaryCount: DocCount;
+  totalSummaryCount: number;
 }
 /** Represents the current state and associated data for an Uptime monitor. */
 export interface MonitorSummary {
@@ -525,13 +523,7 @@ export interface SummaryHistogramPoint {
   /** The number of _down_ documents. */
   down: number;
 }
-/** Represents the current status of the uptime index. */
-export interface StatesIndexStatus {
-  /** Flag denoting whether the index exists. */
-  indexExists: boolean;
-  /** The number of documents in the index. */
-  docCount?: DocCount | null;
-}
+
 
 export interface AllPingsQueryArgs {
   /** Optional: the direction to sort by. Accepts 'asc' and 'desc'. Defaults to 'desc'. */
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts
index 84e3ae33294f06..37101b5b46fd2b 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts
@@ -22,6 +22,12 @@ export const SummaryType = t.partial({
   geo: CheckGeoType,
 });
 
+export const StatesIndexStatusType = t.type({
+  indexExists: t.boolean,
+  docCount: t.number,
+});
+
 export type Summary = t.TypeOf<typeof SummaryType>;
 export type CheckGeo = t.TypeOf<typeof CheckGeoType>;
 export type Location = t.TypeOf<typeof LocationType>;
+export type StatesIndexStatus = t.TypeOf<typeof StatesIndexStatusType>;
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
new file mode 100644
index 00000000000000..cac7042ca5b5c6
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/empty_state/empty_state.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useEffect } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { indexStatusAction } from '../../../state/actions';
+import { indexStatusSelector } from '../../../state/selectors';
+import { EmptyStateComponent } from '../../functional/empty_state/empty_state';
+
+export const EmptyState: React.FC = ({ children }) => {
+  const { data, loading, errors } = useSelector(indexStatusSelector);
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(indexStatusAction.get());
+  }, [dispatch]);
+
+  return (
+    <EmptyStateComponent
+      statesIndexStatus={data}
+      loading={loading}
+      errors={errors}
+      children={children as React.ReactElement}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
index 2e30e5c3cb24f1..baa961ddc87d25 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
@@ -13,3 +13,4 @@ export { MonitorStatusBar } from './monitor/status_bar_container';
 export { MonitorListDrawer } from './monitor/list_drawer_container';
 export { MonitorListActionsPopover } from './monitor/drawer_popover_container';
 export { DurationChart } from './charts/monitor_duration';
+export { EmptyState } from './empty_state/empty_state';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx
index d0f160b2c55403..a42f96962b95e4 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/kuerybar/kuery_bar_container.tsx
@@ -10,7 +10,7 @@ import { selectIndexPattern } from '../../../state/selectors';
 import { getIndexPattern } from '../../../state/actions';
 import { KueryBarComponent } from '../../functional';
 
-const mapStateToProps = (state: AppState) => ({ indexPattern: selectIndexPattern(state) });
+const mapStateToProps = (state: AppState) => ({ ...selectIndexPattern(state) });
 
 const mapDispatchToProps = (dispatch: any) => ({
   loadIndexPattern: () => {
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.tsx
index cbd1fae77c5183..79aaa071507e18 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/pages/overview_container.tsx
@@ -18,6 +18,6 @@ const mapDispatchToProps = (dispatch: any): DispatchProps => ({
   setEsKueryFilters: (esFilters: string) => dispatch(setEsKueryString(esFilters)),
 });
 
-const mapStateToProps = (state: AppState) => ({ indexPattern: selectIndexPattern(state) });
+const mapStateToProps = (state: AppState) => ({ ...selectIndexPattern(state) });
 
 export const OverviewPage = connect(mapStateToProps, mapDispatchToProps)(OverviewPageComponent);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index 472d9c2be59e4c..a885cfe22ccd25 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -2,16 +2,6 @@
 
 exports[`EmptyState component does not render empty state with appropriate base path and no docs 1`] = `
 <EmptyStateComponent
-  data={
-    Object {
-      "statesIndexStatus": Object {
-        "docCount": Object {
-          "count": 0,
-        },
-        "indexExists": true,
-      },
-    }
-  }
   intl={
     Object {
       "defaultFormats": Object {},
@@ -115,6 +105,12 @@ exports[`EmptyState component does not render empty state with appropriate base
     }
   }
   loading={false}
+  statesIndexStatus={
+    Object {
+      "docCount": 0,
+      "indexExists": true,
+    }
+  }
 >
   <DataMissing
     headingMessage="No uptime data found"
@@ -283,7 +279,7 @@ exports[`EmptyState component does not render empty state with appropriate base
 </EmptyStateComponent>
 `;
 
-exports[`EmptyState component doesn't render child components when count is falsey 1`] = `
+exports[`EmptyState component doesn't render child components when count is falsy 1`] = `
 <EmptyStateComponent
   intl={
     Object {
@@ -388,6 +384,7 @@ exports[`EmptyState component doesn't render child components when count is fals
     }
   }
   loading={false}
+  statesIndexStatus={null}
 >
   <EmptyStateLoading>
     <EuiEmptyPrompt
@@ -453,16 +450,6 @@ exports[`EmptyState component doesn't render child components when count is fals
 
 exports[`EmptyState component notifies when index does not exist 1`] = `
 <EmptyStateComponent
-  data={
-    Object {
-      "statesIndexStatus": Object {
-        "docCount": Object {
-          "count": 1,
-        },
-        "indexExists": false,
-      },
-    }
-  }
   intl={
     Object {
       "defaultFormats": Object {},
@@ -566,6 +553,12 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
     }
   }
   loading={false}
+  statesIndexStatus={
+    Object {
+      "docCount": 1,
+      "indexExists": false,
+    }
+  }
 >
   <DataMissing
     headingMessage="Uptime index not found"
@@ -868,6 +861,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
     }
   }
   loading={false}
+  statesIndexStatus={null}
 >
   <EmptyStateError
     errors={
@@ -1098,6 +1092,7 @@ exports[`EmptyState component renders loading state if no errors or doc count 1`
     }
   }
   loading={true}
+  statesIndexStatus={null}
 >
   <EmptyStateLoading>
     <EuiEmptyPrompt
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
index 32d55519acf276..20113df3010f84 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/__tests__/empty_state.test.tsx
@@ -8,7 +8,7 @@ import React from 'react';
 import { mountWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import { EmptyStateComponent } from '../empty_state';
 import { GraphQLError } from 'graphql';
-import { StatesIndexStatus } from '../../../../../common/graphql/types';
+import { StatesIndexStatus } from '../../../../../common/runtime_types';
 
 describe('EmptyState component', () => {
   let statesIndexStatus: StatesIndexStatus;
@@ -16,15 +16,13 @@ describe('EmptyState component', () => {
   beforeEach(() => {
     statesIndexStatus = {
       indexExists: true,
-      docCount: {
-        count: 1,
-      },
+      docCount: 1,
     };
   });
 
   it('renders child components when count is truthy', () => {
     const component = shallowWithIntl(
-      <EmptyStateComponent data={{ statesIndexStatus }} loading={false}>
+      <EmptyStateComponent statesIndexStatus={statesIndexStatus} loading={false}>
         <div>Foo</div>
         <div>Bar</div>
         <div>Baz</div>
@@ -33,9 +31,9 @@ describe('EmptyState component', () => {
     expect(component).toMatchSnapshot();
   });
 
-  it(`doesn't render child components when count is falsey`, () => {
+  it(`doesn't render child components when count is falsy`, () => {
     const component = mountWithIntl(
-      <EmptyStateComponent data={undefined} loading={false}>
+      <EmptyStateComponent statesIndexStatus={null} loading={false}>
         <div>Shouldn&apos;t be rendered</div>
       </EmptyStateComponent>
     );
@@ -57,7 +55,7 @@ describe('EmptyState component', () => {
       },
     ];
     const component = mountWithIntl(
-      <EmptyStateComponent data={undefined} errors={errors} loading={false}>
+      <EmptyStateComponent statesIndexStatus={null} errors={errors} loading={false}>
         <div>Shouldn&apos;t appear...</div>
       </EmptyStateComponent>
     );
@@ -66,7 +64,7 @@ describe('EmptyState component', () => {
 
   it('renders loading state if no errors or doc count', () => {
     const component = mountWithIntl(
-      <EmptyStateComponent loading={true}>
+      <EmptyStateComponent loading={true} statesIndexStatus={null}>
         <div>Should appear even while loading...</div>
       </EmptyStateComponent>
     );
@@ -75,13 +73,11 @@ describe('EmptyState component', () => {
 
   it('does not render empty state with appropriate base path and no docs', () => {
     statesIndexStatus = {
-      docCount: {
-        count: 0,
-      },
+      docCount: 0,
       indexExists: true,
     };
     const component = mountWithIntl(
-      <EmptyStateComponent data={{ statesIndexStatus }} loading={false}>
+      <EmptyStateComponent statesIndexStatus={statesIndexStatus} loading={false}>
         <div>If this is in the snapshot the test should fail</div>
       </EmptyStateComponent>
     );
@@ -91,7 +87,7 @@ describe('EmptyState component', () => {
   it('notifies when index does not exist', () => {
     statesIndexStatus.indexExists = false;
     const component = mountWithIntl(
-      <EmptyStateComponent data={{ statesIndexStatus }} loading={false}>
+      <EmptyStateComponent statesIndexStatus={statesIndexStatus} loading={false}>
         <div>This text should not render</div>
       </EmptyStateComponent>
     );
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
index d2d46dff3b9f52..80afc2894ea441 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
@@ -6,29 +6,29 @@
 
 import React, { Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
-import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../../higher_order';
-import { docCountQuery } from '../../../queries';
 import { EmptyStateError } from './empty_state_error';
 import { EmptyStateLoading } from './empty_state_loading';
-import { StatesIndexStatus } from '../../../../common/graphql/types';
 import { DataMissing } from './data_missing';
-
-interface EmptyStateQueryResult {
-  statesIndexStatus?: StatesIndexStatus;
-}
+import { StatesIndexStatus } from '../../../../common/runtime_types';
 
 interface EmptyStateProps {
   children: JSX.Element[] | JSX.Element;
+  statesIndexStatus: StatesIndexStatus | null;
+  loading: boolean;
+  errors?: Error[];
 }
 
-type Props = UptimeGraphQLQueryProps<EmptyStateQueryResult> & EmptyStateProps;
-
-export const EmptyStateComponent = ({ children, data, errors }: Props) => {
-  if (errors) {
+export const EmptyStateComponent = ({
+  children,
+  statesIndexStatus,
+  loading,
+  errors,
+}: EmptyStateProps) => {
+  if (errors?.length) {
     return <EmptyStateError errors={errors} />;
   }
-  if (data && data.statesIndexStatus) {
-    const { indexExists, docCount } = data.statesIndexStatus;
+  if (!loading && statesIndexStatus) {
+    const { indexExists, docCount } = statesIndexStatus;
     if (!indexExists) {
       return (
         <DataMissing
@@ -37,7 +37,7 @@ export const EmptyStateComponent = ({ children, data, errors }: Props) => {
           })}
         />
       );
-    } else if (indexExists && docCount && docCount.count === 0) {
+    } else if (indexExists && docCount === 0) {
       return (
         <DataMissing
           headingMessage={i18n.translate('xpack.uptime.emptyState.noDataMessage', {
@@ -57,8 +57,3 @@ export const EmptyStateComponent = ({ children, data, errors }: Props) => {
   }
   return <EmptyStateLoading />;
 };
-
-export const EmptyState = withUptimeGraphQL<EmptyStateQueryResult, EmptyStateProps>(
-  EmptyStateComponent,
-  docCountQuery
-);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx
index 745b185b57facb..c8e2bece1cb7fa 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state_error.tsx
@@ -7,15 +7,14 @@
 import { EuiEmptyPrompt, EuiPanel, EuiTitle, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { Fragment } from 'react';
-import { GraphQLError } from 'graphql';
 
 interface EmptyStateErrorProps {
-  errors: GraphQLError[];
+  errors: Error[];
 }
 
 export const EmptyStateError = ({ errors }: EmptyStateErrorProps) => {
   const unauthorized = errors.find(
-    (error: GraphQLError) => error.message && error.message.includes('unauthorized')
+    (error: Error) => error.message && error.message.includes('unauthorized')
   );
 
   return (
@@ -46,7 +45,7 @@ export const EmptyStateError = ({ errors }: EmptyStateErrorProps) => {
             body={
               <Fragment>
                 {!unauthorized &&
-                  errors.map((error: GraphQLError) => <p key={error.message}>{error.message}</p>)}
+                  errors.map((error: Error) => <p key={error.message}>{error.message}</p>)}
               </Fragment>
             }
           />
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
index e86ba548fb5d96..daba13d8df6418 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
@@ -5,7 +5,6 @@
  */
 
 export { DonutChart } from './charts/donut_chart';
-export { EmptyState } from './empty_state';
 export { KueryBarComponent } from './kuery_bar/kuery_bar';
 export { MonitorCharts } from './monitor_charts';
 export { MonitorList } from './monitor_list';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx
index 496e8d898df3c8..2f5ccc2adf313a 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/kuery_bar/kuery_bar.tsx
@@ -34,14 +34,16 @@ function convertKueryToEsQuery(kuery: string, indexPattern: IIndexPattern) {
 
 interface Props {
   autocomplete: DataPublicPluginSetup['autocomplete'];
-  loadIndexPattern: any;
-  indexPattern: any;
+  loadIndexPattern: () => void;
+  indexPattern: IIndexPattern | null;
+  loading: boolean;
 }
 
 export function KueryBarComponent({
   autocomplete: autocompleteService,
   loadIndexPattern,
   indexPattern,
+  loading,
 }: Props) {
   useEffect(() => {
     if (!indexPattern) {
@@ -53,19 +55,13 @@ export function KueryBarComponent({
     suggestions: [],
     isLoadingIndexPattern: true,
   });
-  const [isLoadingIndexPattern, setIsLoadingIndexPattern] = useState<boolean>(true);
   const [isLoadingSuggestions, setIsLoadingSuggestions] = useState<boolean>(false);
   let currentRequestCheck: string;
 
-  useEffect(() => {
-    if (indexPattern !== undefined) {
-      setIsLoadingIndexPattern(false);
-    }
-  }, [indexPattern]);
   const [getUrlParams, updateUrlParams] = useUrlParams();
   const { search: kuery } = getUrlParams();
 
-  const indexPatternMissing = !isLoadingIndexPattern && !indexPattern;
+  const indexPatternMissing = loading && !indexPattern;
 
   async function onChange(inputValue: string, selectionStart: number) {
     if (!indexPattern) {
@@ -124,7 +120,7 @@ export function KueryBarComponent({
     <Container>
       <Typeahead
         disabled={indexPatternMissing}
-        isLoading={isLoadingSuggestions}
+        isLoading={isLoadingSuggestions || loading}
         initialValue={kuery}
         onChange={onChange}
         onSubmit={onSubmit}
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
index 14e91b9db920e7..5cdd1772a7f24d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list.test.tsx
@@ -76,9 +76,7 @@ describe('MonitorList component', () => {
           },
         },
       ],
-      totalSummaryCount: {
-        count: 2,
-      },
+      totalSummaryCount: 2,
     };
   });
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
index ff54e61006156b..1aef9281a3066e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/__tests__/monitor_list_pagination.test.tsx
@@ -89,9 +89,7 @@ describe('MonitorListPagination component', () => {
           },
         },
       ],
-      totalSummaryCount: {
-        count: 2,
-      },
+      totalSummaryCount: 2,
     };
   });
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json
index a45e974685b9c9..e8142f0480c4ab 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_list/monitor_list_drawer/__tests__/data.json
@@ -3,7 +3,7 @@
     "monitorStates": {
       "prevPagePagination": null,
       "nextPagePagination": null,
-      "totalSummaryCount": { "count": 147428, "__typename": "DocCount" },
+      "totalSummaryCount": 147428,
       "summaries": [
         {
           "monitor_id": "andrewvc-com",
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts b/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
index 5fcacf84246603..ab4d6f75849e88 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
@@ -24,7 +24,7 @@ const getKueryString = (urlFilters: string): string => {
 };
 
 export const useUpdateKueryString = (
-  indexPattern: IIndexPattern,
+  indexPattern: IIndexPattern | null,
   filterQueryString = '',
   urlFilters: string
 ): [string?, Error?] => {
diff --git a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
index 15e31d5e446291..af9b8bf0464169 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/overview.tsx
@@ -9,7 +9,6 @@ import React, { useContext, useEffect } from 'react';
 import styled from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import {
-  EmptyState,
   MonitorList,
   OverviewPageParsingErrorCallout,
   StatusPanel,
@@ -19,13 +18,13 @@ import { stringifyUrlParams } from '../lib/helper/stringify_url_params';
 import { useTrackPageview } from '../../../../../plugins/observability/public';
 import { DataPublicPluginSetup, IIndexPattern } from '../../../../../../src/plugins/data/public';
 import { UptimeThemeContext } from '../contexts';
-import { FilterGroup, KueryBar } from '../components/connected';
+import { EmptyState, FilterGroup, KueryBar } from '../components/connected';
 import { useUpdateKueryString } from '../hooks';
 import { PageHeader } from './page_header';
 
 interface OverviewPageProps {
   autocomplete: DataPublicPluginSetup['autocomplete'];
-  indexPattern: IIndexPattern;
+  indexPattern: IIndexPattern | null;
   setEsKueryFilters: (esFilters: string) => void;
 }
 
@@ -81,7 +80,7 @@ export const OverviewPageComponent = ({ autocomplete, indexPattern, setEsKueryFi
   return (
     <>
       <PageHeader headingText={heading} breadcrumbs={[]} datePicker={true} />
-      <EmptyState implementsCustomErrorState={true} variables={{}}>
+      <EmptyState>
         <EuiFlexGroup gutterSize="xs" wrap responsive>
           <EuiFlexItem grow={1} style={{ flexBasis: 500 }}>
             <KueryBar autocomplete={autocomplete} />
diff --git a/x-pack/legacy/plugins/uptime/public/queries/doc_count_query.ts b/x-pack/legacy/plugins/uptime/public/queries/doc_count_query.ts
deleted file mode 100644
index 3067a9d16f050c..00000000000000
--- a/x-pack/legacy/plugins/uptime/public/queries/doc_count_query.ts
+++ /dev/null
@@ -1,22 +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 gql from 'graphql-tag';
-
-export const docCountQueryString = `
-query GetStateIndexStatus {
-  statesIndexStatus: getStatesIndexStatus {
-    docCount {
-      count
-    }
-    indexExists
-  }
-}
-`;
-
-export const docCountQuery = gql`
-  ${docCountQueryString}
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/queries/index.ts b/x-pack/legacy/plugins/uptime/public/queries/index.ts
index f2fff9bc506d00..283382ec1b7baa 100644
--- a/x-pack/legacy/plugins/uptime/public/queries/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/queries/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { docCountQuery, docCountQueryString } from './doc_count_query';
 export { pingsQuery, pingsQueryString } from './pings_query';
diff --git a/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts b/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
index 76f62ad453bd91..9e609786094d59 100644
--- a/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
+++ b/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
@@ -17,9 +17,7 @@ query MonitorStates($dateRangeStart: String!, $dateRangeEnd: String!, $paginatio
   ) {
     prevPagePagination
     nextPagePagination
-    totalSummaryCount {
-      count
-    }
+    totalSummaryCount
     summaries {
       monitor_id
       histogram {
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
index dfcea64bf9c088..b2ab73879a4a75 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
@@ -11,3 +11,4 @@ export * from './monitor_status';
 export * from './index_patternts';
 export * from './ping';
 export * from './monitor_duration';
+export * from './index_status';
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
new file mode 100644
index 00000000000000..336758a71ce60e
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/index_status.ts
@@ -0,0 +1,10 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createAsyncAction } from './utils';
+import { StatesIndexStatus } from '../../../common/runtime_types';
+
+export const indexStatusAction = createAsyncAction<StatesIndexStatus & Error>('GET INDEX STATUS');
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
index dba70ed839ac57..e9bf11256b0b8b 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/types.ts
@@ -4,6 +4,14 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import { Action } from 'redux-actions';
+
+export interface AsyncAction {
+  get: (payload?: any) => Action<any>;
+  success: (payload?: any) => Action<any>;
+  fail: (payload?: any) => Action<any>;
+}
+
 export interface QueryParams {
   monitorId: string;
   dateStart: string;
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts b/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
new file mode 100644
index 00000000000000..337c4bfb2fa470
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/utils.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { createAction } from 'redux-actions';
+import { AsyncAction } from './types';
+
+export function createAsyncAction<Payload>(actionStr: string): AsyncAction {
+  return {
+    get: createAction<Payload>(actionStr),
+    success: createAction<Payload>(`${actionStr}_SUCCESS`),
+    fail: createAction<Payload>(`${actionStr}_FAIL`),
+  };
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index.ts b/x-pack/legacy/plugins/uptime/public/state/api/index.ts
index 7d42c6ee46bdc9..518091cb36dded 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/index.ts
@@ -9,5 +9,6 @@ export * from './overview_filters';
 export * from './snapshot';
 export * from './monitor_status';
 export * from './index_pattern';
+export * from './index_status';
 export * from './ping';
 export * from './monitor_duration';
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/index_status.ts b/x-pack/legacy/plugins/uptime/public/state/api/index_status.ts
new file mode 100644
index 00000000000000..9c531b3406a7c8
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/api/index_status.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { PathReporter } from 'io-ts/lib/PathReporter';
+import { isRight } from 'fp-ts/lib/Either';
+import { getApiPath } from '../../lib/helper';
+import { REST_API_URLS } from '../../../common/constants/rest_api';
+import { StatesIndexStatus, StatesIndexStatusType } from '../../../common/runtime_types';
+
+interface ApiRequest {
+  basePath: string;
+}
+
+export const fetchIndexStatus = async ({ basePath }: ApiRequest): Promise<StatesIndexStatus> => {
+  const url = getApiPath(REST_API_URLS.INDEX_STATUS, basePath);
+
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(response.statusText);
+  }
+  const responseData = await response.json();
+  const decoded = StatesIndexStatusType.decode(responseData);
+  PathReporter.report(decoded);
+  if (isRight(decoded)) {
+    return decoded.right;
+  }
+  throw PathReporter.report(decoded);
+};
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts b/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
index d293cdbe451b54..ea389ff0a67458 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/fetch_effect.ts
@@ -26,10 +26,6 @@ export function fetchEffectFactory<T, R, S, F>(
 ) {
   return function*(action: Action<T>) {
     try {
-      if (!action.payload) {
-        yield put(fail(new Error('Cannot fetch snapshot for undefined parameters.')));
-        return;
-      }
       const {
         payload: { ...params },
       } = action;
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
index 43af88f4cc291b..7c45aa142ecfda 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
@@ -12,6 +12,7 @@ import { fetchMonitorStatusEffect } from './monitor_status';
 import { fetchIndexPatternEffect } from './index_pattern';
 import { fetchPingHistogramEffect } from './ping';
 import { fetchMonitorDurationEffect } from './monitor_duration';
+import { fetchIndexStatusEffect } from './index_status';
 
 export function* rootEffect() {
   yield fork(fetchMonitorDetailsEffect);
@@ -21,4 +22,5 @@ export function* rootEffect() {
   yield fork(fetchIndexPatternEffect);
   yield fork(fetchPingHistogramEffect);
   yield fork(fetchMonitorDurationEffect);
+  yield fork(fetchIndexStatusEffect);
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/index_status.ts b/x-pack/legacy/plugins/uptime/public/state/effects/index_status.ts
new file mode 100644
index 00000000000000..793a671f5fed8b
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index_status.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { takeLatest } from 'redux-saga/effects';
+import { indexStatusAction } from '../actions';
+import { fetchIndexStatus } from '../api';
+import { fetchEffectFactory } from './fetch_effect';
+
+export function* fetchIndexStatusEffect() {
+  yield takeLatest(
+    indexStatusAction.get,
+    fetchEffectFactory(fetchIndexStatus, indexStatusAction.success, indexStatusAction.fail)
+  );
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
index 32362afae42bc6..4a83b54504ca87 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index.ts
@@ -13,6 +13,7 @@ import { monitorStatusReducer } from './monitor_status';
 import { indexPatternReducer } from './index_pattern';
 import { pingReducer } from './ping';
 import { monitorDurationReducer } from './monitor_duration';
+import { indexStatusReducer } from './index_status';
 
 export const rootReducer = combineReducers({
   monitor: monitorReducer,
@@ -23,4 +24,5 @@ export const rootReducer = combineReducers({
   indexPattern: indexPatternReducer,
   ping: pingReducer,
   monitorDuration: monitorDurationReducer,
+  indexStatus: indexStatusReducer,
 });
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
index dff043f81b95c2..bc482e2f35c451 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index_pattern.ts
@@ -5,9 +5,10 @@
  */
 import { handleActions, Action } from 'redux-actions';
 import { getIndexPattern, getIndexPatternSuccess, getIndexPatternFail } from '../actions';
+import { IIndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns';
 
 export interface IndexPatternState {
-  index_pattern: any;
+  index_pattern: IIndexPattern | null;
   errors: any[];
   loading: boolean;
 }
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.ts
new file mode 100644
index 00000000000000..50a02210fb5d3c
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/index_status.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 { handleActions } from 'redux-actions';
+import { indexStatusAction } from '../actions';
+import { handleAsyncAction } from './utils';
+import { IReducerState } from './types';
+import { StatesIndexStatus } from '../../../common/runtime_types';
+
+export interface IndexStatusState extends IReducerState {
+  data: StatesIndexStatus | null;
+}
+
+const initialState: IndexStatusState = {
+  data: null,
+  loading: false,
+  errors: [],
+};
+
+type PayLoad = StatesIndexStatus & Error;
+
+export const indexStatusReducer = handleActions<IndexStatusState, PayLoad>(
+  {
+    ...handleAsyncAction('data', indexStatusAction),
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/index.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
similarity index 76%
rename from x-pack/legacy/plugins/uptime/public/components/functional/empty_state/index.ts
rename to x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
index 8ee70bf51f0060..40fe4bddbf1723 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/types.ts
@@ -4,4 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { EmptyState } from './empty_state';
+export interface IReducerState {
+  errors: Error[];
+  loading: boolean;
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
new file mode 100644
index 00000000000000..773ec10686943f
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/utils.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { Action } from 'redux-actions';
+import { AsyncAction } from '../actions/types';
+import { IReducerState } from './types';
+
+export function handleAsyncAction<ReducerState extends IReducerState, Payload>(
+  storeKey: string,
+  asyncAction: AsyncAction
+) {
+  return {
+    [String(asyncAction.get)]: (state: ReducerState) => ({
+      ...state,
+      loading: true,
+    }),
+
+    [String(asyncAction.success)]: (state: ReducerState, action: Action<any>) => ({
+      ...state,
+      loading: false,
+      [storeKey]: action.payload === null ? action.payload : { ...action.payload },
+    }),
+
+    [String(asyncAction.fail)]: (state: ReducerState, action: Action<any>) => ({
+      ...state,
+      errors: [...state.errors, action.payload],
+      loading: false,
+    }),
+  };
+}
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 24d34b4d067cc0..de446418632b8d 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
@@ -60,6 +60,11 @@ describe('state selectors', () => {
       loading: false,
       errors: [],
     },
+    indexStatus: {
+      loading: false,
+      data: null,
+      errors: [],
+    },
   };
 
   it('selects base path from state', () => {
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 0a914a14c372be..adba288b8b145a 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -30,7 +30,7 @@ export const selectMonitorStatus = (state: AppState) => {
 };
 
 export const selectIndexPattern = ({ indexPattern }: AppState) => {
-  return indexPattern.index_pattern;
+  return { indexPattern: indexPattern.index_pattern, loading: indexPattern.loading };
 };
 
 export const selectPingHistogram = ({ ping, ui }: AppState) => {
@@ -45,3 +45,7 @@ export const selectPingHistogram = ({ ping, ui }: AppState) => {
 export const selectDurationLines = ({ monitorDuration }: AppState) => {
   return monitorDuration;
 };
+
+export const indexStatusSelector = ({ indexStatus }: AppState) => {
+  return indexStatus;
+};
diff --git a/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts b/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
index 6ac42f77172599..1560b78b3c0501 100644
--- a/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
+++ b/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
@@ -10,9 +10,8 @@ import { UMResolver } from '../../../../../legacy/plugins/uptime/common/graphql/
 import {
   GetMonitorStatesQueryArgs,
   MonitorSummaryResult,
-  StatesIndexStatus,
 } from '../../../../../legacy/plugins/uptime/common/graphql/types';
-import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants/context_defaults';
+import { CONTEXT_DEFAULTS } from '../../../../../legacy/plugins/uptime/common/constants';
 
 export type UMGetMonitorStatesResolver = UMResolver<
   MonitorSummaryResult | Promise<MonitorSummaryResult>,
@@ -21,19 +20,11 @@ export type UMGetMonitorStatesResolver = UMResolver<
   UMContext
 >;
 
-export type UMStatesIndexExistsResolver = UMResolver<
-  StatesIndexStatus | Promise<StatesIndexStatus>,
-  any,
-  {},
-  UMContext
->;
-
 export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
   libs: UMServerLibs
 ): {
   Query: {
     getMonitorStates: UMGetMonitorStatesResolver;
-    getStatesIndexStatus: UMStatesIndexExistsResolver;
   };
 } => {
   return {
@@ -64,7 +55,7 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           }),
         ]);
 
-        const totalSummaryCount = indexStatus?.docCount ?? { count: undefined };
+        const totalSummaryCount = indexStatus?.docCount ?? 0;
 
         return {
           summaries,
@@ -73,9 +64,6 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           totalSummaryCount,
         };
       },
-      async getStatesIndexStatus(_resolver, {}, { APICaller }): Promise<StatesIndexStatus> {
-        return await libs.requests.getIndexStatus({ callES: APICaller });
-      },
     },
   };
 };
diff --git a/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts b/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts
index 198f97eab96524..d088aed951204e 100644
--- a/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts
+++ b/x-pack/plugins/uptime/server/graphql/monitor_states/schema.gql.ts
@@ -156,15 +156,7 @@ export const monitorStatesSchema = gql`
     "The objects representing the state of a series of heartbeat monitors."
     summaries: [MonitorSummary!]
     "The number of summaries."
-    totalSummaryCount: DocCount!
-  }
-
-  "Represents the current status of the uptime index."
-  type StatesIndexStatus {
-    "Flag denoting whether the index exists."
-    indexExists: Boolean!
-    "The number of documents in the index."
-    docCount: DocCount
+    totalSummaryCount: Int!
   }
 
   enum CursorDirection {
@@ -186,8 +178,5 @@ export const monitorStatesSchema = gql`
       filters: String
       statusFilter: String
     ): MonitorSummaryResult
-
-    "Fetches details about the uptime index."
-    getStatesIndexStatus: StatesIndexStatus!
   }
 `;
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
index 95aa7eeef88e19..d8a05c08b14173 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
@@ -5,8 +5,8 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { StatesIndexStatus } from '../../../../../legacy/plugins/uptime/common/graphql/types';
 import { INDEX_NAMES } from '../../../../../legacy/plugins/uptime/common/constants';
+import { StatesIndexStatus } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
 export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({ callES }) => {
   const {
@@ -15,8 +15,6 @@ export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = asy
   } = await callES('count', { index: INDEX_NAMES.HEARTBEAT });
   return {
     indexExists: total > 0,
-    docCount: {
-      count,
-    },
+    docCount: count,
   };
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts b/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
index 6fd77afe711d4d..7f192994bd075a 100644
--- a/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
@@ -5,11 +5,7 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import {
-  Ping,
-  PingResults,
-  StatesIndexStatus,
-} from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import { Ping, PingResults } from '../../../../../legacy/plugins/uptime/common/graphql/types';
 import {
   GetFilterBarParams,
   GetLatestMonitorParams,
@@ -26,6 +22,7 @@ import {
   MonitorDetails,
   MonitorLocations,
   Snapshot,
+  StatesIndexStatus,
 } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 import { GetMonitorStatesResult } from './get_monitor_states';
 import { GetSnapshotCountParams } from './get_snapshot_counts';
diff --git a/x-pack/plugins/uptime/server/rest_api/index.ts b/x-pack/plugins/uptime/server/rest_api/index.ts
index 69981b7860d596..b0cc38ebfb4b6b 100644
--- a/x-pack/plugins/uptime/server/rest_api/index.ts
+++ b/x-pack/plugins/uptime/server/rest_api/index.ts
@@ -6,7 +6,6 @@
 
 import { createGetOverviewFilters } from './overview_filters';
 import { createGetPingsRoute } from './pings';
-import { createGetIndexPatternRoute } from './index_pattern';
 import { createLogMonitorPageRoute, createLogOverviewPageRoute } from './telemetry';
 import { createGetSnapshotCount } from './snapshot';
 import { UMRestApiRouteFactory } from './types';
@@ -18,6 +17,7 @@ import {
 } from './monitors';
 import { createGetPingHistogramRoute } from './pings/get_ping_histogram';
 import { createGetMonitorDurationRoute } from './monitors/monitors_durations';
+import { createGetIndexPatternRoute, createGetIndexStatusRoute } from './index_state';
 
 export * from './types';
 export { createRouteWithAuth } from './create_route_with_auth';
@@ -27,6 +27,7 @@ export const restApiRoutes: UMRestApiRouteFactory[] = [
   createGetOverviewFilters,
   createGetPingsRoute,
   createGetIndexPatternRoute,
+  createGetIndexStatusRoute,
   createGetMonitorRoute,
   createGetMonitorDetailsRoute,
   createGetMonitorLocationsRoute,
diff --git a/x-pack/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_pattern.ts
similarity index 100%
rename from x-pack/plugins/uptime/server/rest_api/index_pattern/get_index_pattern.ts
rename to x-pack/plugins/uptime/server/rest_api/index_state/get_index_pattern.ts
diff --git a/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
new file mode 100644
index 00000000000000..44799aa19c140e
--- /dev/null
+++ b/x-pack/plugins/uptime/server/rest_api/index_state/get_index_status.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { UMServerLibs } from '../../lib/lib';
+import { UMRestApiRouteFactory } from '../types';
+import { REST_API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+
+export const createGetIndexStatusRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
+  method: 'GET',
+  path: REST_API_URLS.INDEX_STATUS,
+  validate: false,
+  options: {
+    tags: ['access:uptime'],
+  },
+  handler: async ({ callES }, _context, _request, response): Promise<any> => {
+    try {
+      return response.ok({
+        body: {
+          ...(await libs.requests.getIndexStatus({ callES })),
+        },
+      });
+    } catch (e) {
+      return response.internalError({ body: { message: e.message } });
+    }
+  },
+});
diff --git a/x-pack/plugins/uptime/server/rest_api/index_pattern/index.ts b/x-pack/plugins/uptime/server/rest_api/index_state/index.ts
similarity index 82%
rename from x-pack/plugins/uptime/server/rest_api/index_pattern/index.ts
rename to x-pack/plugins/uptime/server/rest_api/index_state/index.ts
index b35e2e7b65a294..ff44794bfe7d1e 100644
--- a/x-pack/plugins/uptime/server/rest_api/index_pattern/index.ts
+++ b/x-pack/plugins/uptime/server/rest_api/index_state/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { createGetIndexPatternRoute } from './get_index_pattern';
+export { createGetIndexStatusRoute } from './get_index_status';
diff --git a/x-pack/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
index adbfacb014e9f9..15666acab2335d 100644
--- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
@@ -5,9 +5,9 @@
  */
 
 import expect from '@kbn/expect';
-import { docCountQueryString } from '../../../../legacy/plugins/uptime/public/queries';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { PINGS_DATE_RANGE_END, PINGS_DATE_RANGE_START } from './constants';
+import { REST_API_URLS } from '../../../../legacy/plugins/uptime/common/constants';
 
 export default function featureControlsTests({ getService }: FtrProviderContext) {
   const supertest = getService('supertestWithoutAuth');
@@ -26,22 +26,13 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
     expect(result.response).to.have.property('statusCode', 200);
   };
 
-  const executeGraphQLQuery = async (username: string, password: string, spaceId?: string) => {
+  const executeRESTAPIQuery = async (username: string, password: string, spaceId?: string) => {
     const basePath = spaceId ? `/s/${spaceId}` : '';
-    const getDocCountQuery = {
-      operationName: null,
-      query: docCountQueryString,
-      variables: {
-        dateRangeStart: '2019-01-28T17:40:08.078Z',
-        dateRangeEnd: '2019-01-28T19:00:16.078Z',
-      },
-    };
 
     return await supertest
-      .post(`${basePath}/api/uptime/graphql`)
+      .get(basePath + REST_API_URLS.INDEX_STATUS)
       .auth(username, password)
       .set('kbn-xsrf', 'foo')
-      .send({ ...getDocCountQuery })
       .then((response: any) => ({ error: undefined, response }))
       .catch((error: any) => ({ error, response: undefined }));
   };
@@ -82,7 +73,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
           full_name: 'a kibana user',
         });
 
-        const graphQLResult = await executeGraphQLQuery(username, password);
+        const graphQLResult = await executeRESTAPIQuery(username, password);
         expect404(graphQLResult);
 
         const pingsResult = await executePingsRequest(username, password);
@@ -121,7 +112,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
           full_name: 'a kibana user',
         });
 
-        const graphQLResult = await executeGraphQLQuery(username, password);
+        const graphQLResult = await executeRESTAPIQuery(username, password);
         expectResponse(graphQLResult);
 
         const pingsResult = await executePingsRequest(username, password);
@@ -163,7 +154,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
           full_name: 'a kibana user',
         });
 
-        const graphQLResult = await executeGraphQLQuery(username, password);
+        const graphQLResult = await executeRESTAPIQuery(username, password);
         expect404(graphQLResult);
 
         const pingsResult = await executePingsRequest(username, password);
@@ -232,7 +223,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
       });
 
       it('user_1 can access APIs in space_1', async () => {
-        const graphQLResult = await executeGraphQLQuery(username, password, space1Id);
+        const graphQLResult = await executeRESTAPIQuery(username, password, space1Id);
         expectResponse(graphQLResult);
 
         const pingsResult = await executePingsRequest(username, password, space1Id);
@@ -240,7 +231,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
       });
 
       it(`user_1 can't access APIs in space_2`, async () => {
-        const graphQLResult = await executeGraphQLQuery(username, password);
+        const graphQLResult = await executeRESTAPIQuery(username, password);
         expect404(graphQLResult);
 
         const pingsResult = await executePingsRequest(username, password);
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/doc_count.js b/x-pack/test/api_integration/apis/uptime/graphql/doc_count.js
deleted file mode 100644
index 1aa69faaab736e..00000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/doc_count.js
+++ /dev/null
@@ -1,36 +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 { docCountQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
-import { expectFixtureEql } from './helpers/expect_fixture_eql';
-
-export default function({ getService }) {
-  describe('docCount query', () => {
-    before('load heartbeat data', () => getService('esArchiver').load('uptime/full_heartbeat'));
-    after('unload heartbeat index', () => getService('esArchiver').unload('uptime/full_heartbeat'));
-
-    const supertest = getService('supertest');
-
-    it(`will fetch the index's count`, async () => {
-      const getDocCountQuery = {
-        operationName: null,
-        query: docCountQueryString,
-        variables: {
-          dateRangeStart: '2019-01-28T17:40:08.078Z',
-          dateRangeEnd: '2025-01-28T19:00:16.078Z',
-        },
-      };
-      const {
-        body: { data },
-      } = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getDocCountQuery });
-
-      expectFixtureEql(data, 'doc_count');
-    });
-  });
-}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/doc_count.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/doc_count.json
deleted file mode 100644
index 4daf223a79a697..00000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/doc_count.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "statesIndexStatus": {
-    "docCount": {
-      "count": 2000
-    },
-    "indexExists": true
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json
index 59f5f95e7d8400..05724f0716e8d3 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": null,
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0009-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0000-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json
index 9a1363f00578a6..6e62787069f40d 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": null,
     "nextPagePagination": null,
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0002-up",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -198,4 +194,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json
index 59f5f95e7d8400..05724f0716e8d3 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": null,
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0009-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0000-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json
index 5c07b4daaf543b..6cbe4ee3659a86 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0090-intermittent\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": null,
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0090-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json
index 71184093f4318a..9a3f781735cb72 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0080-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0089-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0080-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json
index 3b15ea3c24eeb4..4f4af9c2c60129 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0010-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0019-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0010-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json
index eb6512d2f75b37..fe48ad49d13ba7 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": null,
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0009-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0000-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json
index aee4fa6946fc0d..70ca665704a791 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0020-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0029-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0020-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json
index 03164f794a4d5d..3f09c951ec2fa4 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0010-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0019-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0010-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json
index 488fdab14f1e2a..cdc0f32c9765ec 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0030-intermittent\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0039-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0030-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json
index 79ce05d86f533a..9f6d004380c162 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0020-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0029-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0020-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json
index ef62cdd86c2a9e..dedddb2a78ade8 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0040-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0049-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0040-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json
index 34e8269cb95d91..fabcf704049520 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0030-intermittent\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0039-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0030-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json
index d733467c3f9b60..943cc68249dc13 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0050-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0059-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0050-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json
index 12e27106bd533d..564f58f59f373d 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0040-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0049-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0040-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json
index d0f2b820f8327c..cb94273e91fd84 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0060-intermittent\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0069-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0060-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json
index cf0c8641cc87b3..7aac62bba84f78 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0050-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0059-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0050-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json
index 2801e94e034c73..08cbd0d878b440 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0070-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0079-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0070-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json
index 7fcbd4dd596590..8de639b705ee9a 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0060-intermittent\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0069-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0060-intermittent",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json
index 0adb7ad0b0dba4..c38f5c801a267a 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0080-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorDirection\":\"AFTER\",\"sortOrder\":\"ASC\",\"cursorKey\":{\"monitor_id\":\"0089-up\"}}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0080-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json
index a796be38bd0d9b..5c2ec8512e320a 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json
@@ -2,9 +2,7 @@
   "monitorStates": {
     "prevPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0070-down\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"BEFORE\"}",
     "nextPagePagination": "{\"cursorKey\":{\"monitor_id\":\"0079-up\"},\"sortOrder\":\"ASC\",\"cursorDirection\":\"AFTER\"}",
-    "totalSummaryCount": {
-      "count": 2000
-    },
+    "totalSummaryCount": 2000,
     "summaries": [
       {
         "monitor_id": "0070-down",
@@ -172,9 +170,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -362,9 +358,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -552,9 +546,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -742,9 +734,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -932,9 +922,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1122,9 +1110,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1312,9 +1298,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1502,9 +1486,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1692,9 +1674,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1882,9 +1862,7 @@
           "geo": null,
           "observer": {
             "geo": {
-              "name": [
-                "mpls"
-              ],
+              "name": ["mpls"],
               "location": null
             }
           },
@@ -1908,4 +1886,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/index.js b/x-pack/test/api_integration/apis/uptime/graphql/index.js
index c2fdc57edede37..ee22974d471701 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/index.js
+++ b/x-pack/test/api_integration/apis/uptime/graphql/index.js
@@ -10,7 +10,6 @@ export default function({ loadTestFile }) {
     // the uptime app and runs it against the live HTTP server,
     // verifying the pre-loaded documents are returned in a way that
     // matches the snapshots contained in './fixtures'
-    loadTestFile(require.resolve('./doc_count'));
     loadTestFile(require.resolve('./monitor_states'));
     loadTestFile(require.resolve('./ping_list'));
   });
diff --git a/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts b/x-pack/test/api_integration/apis/uptime/rest/doc_count.ts
new file mode 100644
index 00000000000000..1f5322f581b39d
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/doc_count.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 { FtrProviderContext } from '../../../ftr_provider_context';
+import { expectFixtureEql } from '../graphql/helpers/expect_fixture_eql';
+import { REST_API_URLS } from '../../../../../legacy/plugins/uptime/common/constants';
+
+export default function({ getService }: FtrProviderContext) {
+  describe('docCount query', () => {
+    const supertest = getService('supertest');
+
+    it(`will fetch the index's count`, async () => {
+      const apiResponse = await supertest.get(REST_API_URLS.INDEX_STATUS);
+      const data = apiResponse.body;
+      expectFixtureEql(data, 'doc_count');
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json
new file mode 100644
index 00000000000000..41b9af392ddede
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json
@@ -0,0 +1,4 @@
+{
+    "docCount": 2000,
+    "indexExists": true
+}
diff --git a/x-pack/test/api_integration/apis/uptime/rest/index.ts b/x-pack/test/api_integration/apis/uptime/rest/index.ts
index 5e26cb9216f458..67b94f19c638ff 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -21,6 +21,7 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./selected_monitor'));
       loadTestFile(require.resolve('./ping_histogram'));
       loadTestFile(require.resolve('./monitor_duration'));
+      loadTestFile(require.resolve('./doc_count'));
     });
   });
 }

From a946adbf10b0148bf510b0588713dd7a2a04579f Mon Sep 17 00:00:00 2001
From: MadameSheema <snootchie.boochies@gmail.com>
Date: Mon, 16 Mar 2020 13:01:48 +0100
Subject: [PATCH 2/4] adds new test (#60064)

---
 .../cypress/integration/detections.spec.ts    | 43 ++++++++++++++++++-
 .../siem/cypress/screens/detections.ts        |  4 +-
 .../plugins/siem/cypress/tasks/detections.ts  |  7 +++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
index 1624586d4ca145..c048510c50c365 100644
--- a/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
+++ b/x-pack/legacy/plugins/siem/cypress/integration/detections.spec.ts
@@ -5,12 +5,14 @@
  */
 import {
   NUMBER_OF_SIGNALS,
+  OPEN_CLOSE_SIGNALS_BTN,
   SELECTED_SIGNALS,
   SHOWING_SIGNALS,
   SIGNALS,
 } from '../screens/detections';
 
 import {
+  closeFirstSignal,
   closeSignals,
   goToClosedSignals,
   goToOpenedSignals,
@@ -26,7 +28,7 @@ import { loginAndWaitForPage } from '../tasks/login';
 import { DETECTIONS } from '../urls/navigation';
 
 describe('Detections', () => {
-  before(() => {
+  beforeEach(() => {
     esArchiverLoad('signals');
     loginAndWaitForPage(DETECTIONS);
   });
@@ -111,4 +113,43 @@ describe('Detections', () => {
           .should('eql', expectedNumberOfOpenedSignals.toString());
       });
   });
+
+  it('Closes one signal when more than one opened signals are selected', () => {
+    waitForSignalsToBeLoaded();
+
+    cy.get(NUMBER_OF_SIGNALS)
+      .invoke('text')
+      .then(numberOfSignals => {
+        const numberOfSignalsToBeClosed = 1;
+        const numberOfSignalsToBeSelected = 3;
+
+        cy.get(OPEN_CLOSE_SIGNALS_BTN).should('have.attr', 'disabled');
+        selectNumberOfSignals(numberOfSignalsToBeSelected);
+        cy.get(OPEN_CLOSE_SIGNALS_BTN).should('not.have.attr', 'disabled');
+
+        closeFirstSignal();
+        cy.reload();
+        waitForSignalsToBeLoaded();
+        waitForSignals();
+
+        const expectedNumberOfSignals = +numberOfSignals - numberOfSignalsToBeClosed;
+        cy.get(NUMBER_OF_SIGNALS)
+          .invoke('text')
+          .should('eq', expectedNumberOfSignals.toString());
+        cy.get(SHOWING_SIGNALS)
+          .invoke('text')
+          .should('eql', `Showing ${expectedNumberOfSignals.toString()} signals`);
+
+        goToClosedSignals();
+        waitForSignals();
+
+        cy.get(NUMBER_OF_SIGNALS)
+          .invoke('text')
+          .should('eql', numberOfSignalsToBeClosed.toString());
+        cy.get(SHOWING_SIGNALS)
+          .invoke('text')
+          .should('eql', `Showing ${numberOfSignalsToBeClosed.toString()} signal`);
+        cy.get(SIGNALS).should('have.length', numberOfSignalsToBeClosed);
+      });
+  });
 });
diff --git a/x-pack/legacy/plugins/siem/cypress/screens/detections.ts b/x-pack/legacy/plugins/siem/cypress/screens/detections.ts
index 8b5ba235788072..f388ac1215d01f 100644
--- a/x-pack/legacy/plugins/siem/cypress/screens/detections.ts
+++ b/x-pack/legacy/plugins/siem/cypress/screens/detections.ts
@@ -12,7 +12,9 @@ export const MANAGE_SIGNAL_DETECTION_RULES_BTN = '[data-test-subj="manage-signal
 
 export const NUMBER_OF_SIGNALS = '[data-test-subj="server-side-event-count"]';
 
-export const OPEN_CLOSE_SIGNALS_BTN = '[data-test-subj="openCloseSignal"] .siemLinkIcon__label';
+export const OPEN_CLOSE_SIGNAL_BTN = '[data-test-subj="update-signal-status-button"]';
+
+export const OPEN_CLOSE_SIGNALS_BTN = '[data-test-subj="openCloseSignal"] button';
 
 export const OPENED_SIGNALS_BTN = '[data-test-subj="openSignals"]';
 
diff --git a/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts b/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts
index 21a0c136b90df8..3416e3eb81de33 100644
--- a/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts
+++ b/x-pack/legacy/plugins/siem/cypress/tasks/detections.ts
@@ -8,6 +8,7 @@ import {
   CLOSED_SIGNALS_BTN,
   LOADING_SIGNALS_PANEL,
   MANAGE_SIGNAL_DETECTION_RULES_BTN,
+  OPEN_CLOSE_SIGNAL_BTN,
   OPEN_CLOSE_SIGNALS_BTN,
   OPENED_SIGNALS_BTN,
   SIGNALS,
@@ -15,6 +16,12 @@ import {
 } from '../screens/detections';
 import { REFRESH_BUTTON } from '../screens/siem_header';
 
+export const closeFirstSignal = () => {
+  cy.get(OPEN_CLOSE_SIGNAL_BTN)
+    .first()
+    .click({ force: true });
+};
+
 export const closeSignals = () => {
   cy.get(OPEN_CLOSE_SIGNALS_BTN).click({ force: true });
 };

From 4be60e54261be05eda4c5b4530c93d9450398d8d Mon Sep 17 00:00:00 2001
From: Alexey Antonov <alexwizp@gmail.com>
Date: Mon, 16 Mar 2020 15:05:41 +0300
Subject: [PATCH 3/4] [Step 1][App Arch] Saved object migrations from kibana
 plugin to new platform  (#59044)

* [App Arch] Saved object migrations from kibana plugin to new platform

Part of #55946

* search type -> data plugin

* remove migrations folder

* visualization type -> visualizations plugin

* src/legacy/core_plugins/data/mappings-> np

* savedObjectsManagement -> management section

* move code into save_objects folder

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
---
 .../saved_objects/serialization/types.ts      |    2 +-
 src/legacy/core_plugins/data/index.ts         |   19 -
 src/legacy/core_plugins/kibana/index.js       |   51 -
 src/legacy/core_plugins/kibana/mappings.json  |   89 -
 .../kibana/migrations/migrations.js           |  564 +-----
 .../kibana/migrations/migrations.test.js      | 1574 -----------------
 .../index_patterns/index_patterns_service.ts  |    7 +-
 src/plugins/data/server/plugin.ts             |    3 +
 .../data/server/query/index.ts}               |   32 +-
 .../data/server/query/query_service.ts        |   29 +
 .../data/server/saved_objects/index.ts        |   22 +
 .../index_pattern_migrations.test.ts          |   97 +
 .../saved_objects/index_pattern_migrations.ts |   60 +
 .../server/saved_objects/index_patterns.ts    |   58 +
 .../data/server/saved_objects/query.ts        |   52 +
 .../data/server/saved_objects/search.ts       |   60 +
 .../saved_objects/search_migrations.test.ts   |  299 ++++
 .../server/saved_objects/search_migrations.ts |   92 +
 .../data/server/search/search_service.ts      |    4 +
 src/plugins/data/server/server.api.md         |    2 +-
 src/plugins/visualizations/kibana.json        |    2 +-
 src/plugins/visualizations/server/index.ts    |   30 +
 src/plugins/visualizations/server/plugin.ts   |   54 +
 .../server/saved_objects/index.ts             |   20 +
 .../server/saved_objects/visualization.ts     |   56 +
 .../visualization_migrations.test.ts          | 1356 ++++++++++++++
 .../saved_objects/visualization_migrations.ts |  574 ++++++
 src/plugins/visualizations/server/types.ts    |   23 +
 28 files changed, 2899 insertions(+), 2332 deletions(-)
 rename src/{legacy/core_plugins/data/mappings.ts => plugins/data/server/query/index.ts} (60%)
 create mode 100644 src/plugins/data/server/query/query_service.ts
 create mode 100644 src/plugins/data/server/saved_objects/index.ts
 create mode 100644 src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts
 create mode 100644 src/plugins/data/server/saved_objects/index_pattern_migrations.ts
 create mode 100644 src/plugins/data/server/saved_objects/index_patterns.ts
 create mode 100644 src/plugins/data/server/saved_objects/query.ts
 create mode 100644 src/plugins/data/server/saved_objects/search.ts
 create mode 100644 src/plugins/data/server/saved_objects/search_migrations.test.ts
 create mode 100644 src/plugins/data/server/saved_objects/search_migrations.ts
 create mode 100644 src/plugins/visualizations/server/index.ts
 create mode 100644 src/plugins/visualizations/server/plugin.ts
 create mode 100644 src/plugins/visualizations/server/saved_objects/index.ts
 create mode 100644 src/plugins/visualizations/server/saved_objects/visualization.ts
 create mode 100644 src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
 create mode 100644 src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
 create mode 100644 src/plugins/visualizations/server/types.ts

diff --git a/src/core/server/saved_objects/serialization/types.ts b/src/core/server/saved_objects/serialization/types.ts
index 524c2c8ffae7ae..dfaec127ba1593 100644
--- a/src/core/server/saved_objects/serialization/types.ts
+++ b/src/core/server/saved_objects/serialization/types.ts
@@ -50,7 +50,7 @@ export interface SavedObjectsRawDocSource {
  * scenario out of the box.
  */
 interface SavedObjectDoc {
-  attributes: unknown;
+  attributes: any;
   id?: string; // NOTE: SavedObjectDoc is used for uncreated objects where `id` is optional
   type: string;
   namespace?: string;
diff --git a/src/legacy/core_plugins/data/index.ts b/src/legacy/core_plugins/data/index.ts
index 813eab00f72582..10c8cf464b82de 100644
--- a/src/legacy/core_plugins/data/index.ts
+++ b/src/legacy/core_plugins/data/index.ts
@@ -19,8 +19,6 @@
 
 import { resolve } from 'path';
 import { Legacy } from '../../../../kibana';
-import { mappings } from './mappings';
-import { SavedQuery } from '../../../plugins/data/public';
 
 // eslint-disable-next-line import/no-default-export
 export default function DataPlugin(kibana: any) {
@@ -36,23 +34,6 @@ export default function DataPlugin(kibana: any) {
     init: (server: Legacy.Server) => ({}),
     uiExports: {
       injectDefaultVars: () => ({}),
-      mappings,
-      savedObjectsManagement: {
-        query: {
-          icon: 'search',
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle(obj: SavedQuery) {
-            return obj.attributes.title;
-          },
-          getInAppUrl(obj: SavedQuery) {
-            return {
-              path: `/app/kibana#/discover?_a=(savedQuery:'${encodeURIComponent(obj.id)}')`,
-              uiCapabilitiesPath: 'discover.show',
-            };
-          },
-        },
-      },
     },
   };
 
diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js
index 092eed924f3306..1d772536fa1ea2 100644
--- a/src/legacy/core_plugins/kibana/index.js
+++ b/src/legacy/core_plugins/kibana/index.js
@@ -126,57 +126,6 @@ export default function(kibana) {
       ],
 
       savedObjectsManagement: {
-        'index-pattern': {
-          icon: 'indexPatternApp',
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle(obj) {
-            return obj.attributes.title;
-          },
-          getEditUrl(obj) {
-            return `/management/kibana/index_patterns/${encodeURIComponent(obj.id)}`;
-          },
-          getInAppUrl(obj) {
-            return {
-              path: `/app/kibana#/management/kibana/index_patterns/${encodeURIComponent(obj.id)}`,
-              uiCapabilitiesPath: 'management.kibana.index_patterns',
-            };
-          },
-        },
-        visualization: {
-          icon: 'visualizeApp',
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle(obj) {
-            return obj.attributes.title;
-          },
-          getEditUrl(obj) {
-            return `/management/kibana/objects/savedVisualizations/${encodeURIComponent(obj.id)}`;
-          },
-          getInAppUrl(obj) {
-            return {
-              path: `/app/kibana#/visualize/edit/${encodeURIComponent(obj.id)}`,
-              uiCapabilitiesPath: 'visualize.show',
-            };
-          },
-        },
-        search: {
-          icon: 'discoverApp',
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle(obj) {
-            return obj.attributes.title;
-          },
-          getEditUrl(obj) {
-            return `/management/kibana/objects/savedSearches/${encodeURIComponent(obj.id)}`;
-          },
-          getInAppUrl(obj) {
-            return {
-              path: `/app/kibana#/discover/${encodeURIComponent(obj.id)}`,
-              uiCapabilitiesPath: 'discover.show',
-            };
-          },
-        },
         dashboard: {
           icon: 'dashboardApp',
           defaultSearchField: 'title',
diff --git a/src/legacy/core_plugins/kibana/mappings.json b/src/legacy/core_plugins/kibana/mappings.json
index 4cf9ea1d301c09..af3f79588552b6 100644
--- a/src/legacy/core_plugins/kibana/mappings.json
+++ b/src/legacy/core_plugins/kibana/mappings.json
@@ -1,93 +1,4 @@
 {
-  "index-pattern": {
-    "properties": {
-      "fieldFormatMap": {
-        "type": "text"
-      },
-      "fields": {
-        "type": "text"
-      },
-      "intervalName": {
-        "type": "keyword"
-      },
-      "notExpandable": {
-        "type": "boolean"
-      },
-      "sourceFilters": {
-        "type": "text"
-      },
-      "timeFieldName": {
-        "type": "keyword"
-      },
-      "title": {
-        "type": "text"
-      },
-      "type": {
-        "type": "keyword"
-      },
-      "typeMeta": {
-        "type": "keyword"
-      }
-    }
-  },
-  "visualization": {
-    "properties": {
-      "description": {
-        "type": "text"
-      },
-      "kibanaSavedObjectMeta": {
-        "properties": {
-          "searchSourceJSON": {
-            "type": "text"
-          }
-        }
-      },
-      "savedSearchRefName": {
-        "type": "keyword"
-      },
-      "title": {
-        "type": "text"
-      },
-      "uiStateJSON": {
-        "type": "text"
-      },
-      "version": {
-        "type": "integer"
-      },
-      "visState": {
-        "type": "text"
-      }
-    }
-  },
-  "search": {
-    "properties": {
-      "columns": {
-        "type": "keyword"
-      },
-      "description": {
-        "type": "text"
-      },
-      "hits": {
-        "type": "integer"
-      },
-      "kibanaSavedObjectMeta": {
-        "properties": {
-          "searchSourceJSON": {
-            "type": "text"
-          }
-        }
-      },
-      "sort": {
-        "type": "keyword"
-      },
-      "title": {
-        "type": "text"
-      },
-      "version": {
-        "type": "integer"
-      }
-    }
-  },
   "dashboard": {
     "properties": {
       "description": {
diff --git a/src/legacy/core_plugins/kibana/migrations/migrations.js b/src/legacy/core_plugins/kibana/migrations/migrations.js
index 29b6e632d19fd1..d37887c640b90b 100644
--- a/src/legacy/core_plugins/kibana/migrations/migrations.js
+++ b/src/legacy/core_plugins/kibana/migrations/migrations.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { cloneDeep, get, omit, has, flow } from 'lodash';
+import { get } from 'lodash';
 import { migrations730 as dashboardMigrations730 } from '../public/dashboard/migrations';
 
 function migrateIndexPattern(doc) {
@@ -58,559 +58,7 @@ function migrateIndexPattern(doc) {
   doc.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.stringify(searchSource);
 }
 
-// [TSVB] Migrate percentile-rank aggregation (value -> values)
-const migratePercentileRankAggregation = doc => {
-  const visStateJSON = get(doc, 'attributes.visState');
-  let visState;
-
-  if (visStateJSON) {
-    try {
-      visState = JSON.parse(visStateJSON);
-    } catch (e) {
-      // Let it go, the data is invalid and we'll leave it as is
-    }
-    if (visState && visState.type === 'metrics') {
-      const series = get(visState, 'params.series') || [];
-
-      series.forEach(part => {
-        (part.metrics || []).forEach(metric => {
-          if (metric.type === 'percentile_rank' && has(metric, 'value')) {
-            metric.values = [metric.value];
-
-            delete metric.value;
-          }
-        });
-      });
-      return {
-        ...doc,
-        attributes: {
-          ...doc.attributes,
-          visState: JSON.stringify(visState),
-        },
-      };
-    }
-  }
-  return doc;
-};
-
-// Migrate date histogram aggregation (remove customInterval)
-const migrateDateHistogramAggregation = doc => {
-  const visStateJSON = get(doc, 'attributes.visState');
-  let visState;
-
-  if (visStateJSON) {
-    try {
-      visState = JSON.parse(visStateJSON);
-    } catch (e) {
-      // Let it go, the data is invalid and we'll leave it as is
-    }
-
-    if (visState && visState.aggs) {
-      visState.aggs.forEach(agg => {
-        if (agg.type === 'date_histogram' && agg.params) {
-          if (agg.params.interval === 'custom') {
-            agg.params.interval = agg.params.customInterval;
-          }
-          delete agg.params.customInterval;
-        }
-
-        if (
-          get(agg, 'params.customBucket.type', null) === 'date_histogram' &&
-          agg.params.customBucket.params
-        ) {
-          if (agg.params.customBucket.params.interval === 'custom') {
-            agg.params.customBucket.params.interval = agg.params.customBucket.params.customInterval;
-          }
-          delete agg.params.customBucket.params.customInterval;
-        }
-      });
-      return {
-        ...doc,
-        attributes: {
-          ...doc.attributes,
-          visState: JSON.stringify(visState),
-        },
-      };
-    }
-  }
-  return doc;
-};
-
-function removeDateHistogramTimeZones(doc) {
-  const visStateJSON = get(doc, 'attributes.visState');
-  if (visStateJSON) {
-    let visState;
-    try {
-      visState = JSON.parse(visStateJSON);
-    } catch (e) {
-      // Let it go, the data is invalid and we'll leave it as is
-    }
-    if (visState && visState.aggs) {
-      visState.aggs.forEach(agg => {
-        // We're checking always for the existance of agg.params here. This should always exist, but better
-        // be safe then sorry during migrations.
-        if (agg.type === 'date_histogram' && agg.params) {
-          delete agg.params.time_zone;
-        }
-
-        if (
-          get(agg, 'params.customBucket.type', null) === 'date_histogram' &&
-          agg.params.customBucket.params
-        ) {
-          delete agg.params.customBucket.params.time_zone;
-        }
-      });
-      doc.attributes.visState = JSON.stringify(visState);
-    }
-  }
-  return doc;
-}
-
-// migrate gauge verticalSplit to alignment
-// https://github.com/elastic/kibana/issues/34636
-function migrateGaugeVerticalSplitToAlignment(doc, logger) {
-  const visStateJSON = get(doc, 'attributes.visState');
-
-  if (visStateJSON) {
-    try {
-      const visState = JSON.parse(visStateJSON);
-      if (visState && visState.type === 'gauge' && !visState.params.gauge.alignment) {
-        visState.params.gauge.alignment = visState.params.gauge.verticalSplit
-          ? 'vertical'
-          : 'horizontal';
-        delete visState.params.gauge.verticalSplit;
-        return {
-          ...doc,
-          attributes: {
-            ...doc.attributes,
-            visState: JSON.stringify(visState),
-          },
-        };
-      }
-    } catch (e) {
-      logger.warning(`Exception @ migrateGaugeVerticalSplitToAlignment! ${e}`);
-      logger.warning(`Exception @ migrateGaugeVerticalSplitToAlignment! Payload: ${visStateJSON}`);
-    }
-  }
-  return doc;
-}
-// Migrate filters (string -> { query: string, language: lucene })
-/*
-  Enabling KQL in TSVB causes problems with savedObject visualizations when these are saved with filters.
-  In a visualisation type of saved object, if the visState param is of type metric, the filter is saved as a string that is not interpretted correctly as a lucene query in the visualization itself.
-  We need to transform the filter string into an object containing the original string as a query and specify the query language as lucene.
-  For Metrics visualizations (param.type === "metric"), filters can be applied to each series object in the series array within the SavedObject.visState.params object.
-  Path to the series array is thus:
-  attributes.visState.
-*/
-function transformFilterStringToQueryObject(doc) {
-  // Migrate filters
-  // If any filters exist and they are a string, we assume it to be lucene and transform the filter into an object accordingly
-  const newDoc = cloneDeep(doc);
-  const visStateJSON = get(doc, 'attributes.visState');
-  if (visStateJSON) {
-    let visState;
-    try {
-      visState = JSON.parse(visStateJSON);
-    } catch (e) {
-      // let it go, the data is invalid and we'll leave it as is
-    }
-    if (visState) {
-      const visType = get(visState, 'params.type');
-      const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
-      if (tsvbTypes.indexOf(visType) === -1) {
-        // skip
-        return doc;
-      }
-      // migrate the params fitler
-      const params = get(visState, 'params');
-      if (params.filter && typeof params.filter === 'string') {
-        const paramsFilterObject = {
-          query: params.filter,
-          language: 'lucene',
-        };
-        params.filter = paramsFilterObject;
-      }
-
-      // migrate the annotations query string:
-      const annotations = get(visState, 'params.annotations') || [];
-      annotations.forEach(item => {
-        if (!item.query_string) {
-          // we don't need to transform anything if there isn't a filter at all
-          return;
-        }
-        if (typeof item.query_string === 'string') {
-          const itemQueryStringObject = {
-            query: item.query_string,
-            language: 'lucene',
-          };
-          item.query_string = itemQueryStringObject;
-        }
-      });
-      // migrate the series filters
-      const series = get(visState, 'params.series') || [];
-      series.forEach(item => {
-        if (!item.filter) {
-          // we don't need to transform anything if there isn't a filter at all
-          return;
-        }
-        // series item filter
-        if (typeof item.filter === 'string') {
-          const itemfilterObject = {
-            query: item.filter,
-            language: 'lucene',
-          };
-          item.filter = itemfilterObject;
-        }
-        // series item split filters filter
-        if (item.split_filters) {
-          const splitFilters = get(item, 'split_filters') || [];
-          splitFilters.forEach(filter => {
-            if (!filter.filter) {
-              // we don't need to transform anything if there isn't a filter at all
-              return;
-            }
-            if (typeof filter.filter === 'string') {
-              const filterfilterObject = {
-                query: filter.filter,
-                language: 'lucene',
-              };
-              filter.filter = filterfilterObject;
-            }
-          });
-        }
-      });
-      newDoc.attributes.visState = JSON.stringify(visState);
-    }
-  }
-  return newDoc;
-}
-function transformSplitFiltersStringToQueryObject(doc) {
-  // Migrate split_filters in TSVB objects that weren't migrated in 7.3
-  // If any filters exist and they are a string, we assume them to be lucene syntax and transform the filter into an object accordingly
-  const newDoc = cloneDeep(doc);
-  const visStateJSON = get(doc, 'attributes.visState');
-  if (visStateJSON) {
-    let visState;
-    try {
-      visState = JSON.parse(visStateJSON);
-    } catch (e) {
-      // let it go, the data is invalid and we'll leave it as is
-    }
-    if (visState) {
-      const visType = get(visState, 'params.type');
-      const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
-      if (tsvbTypes.indexOf(visType) === -1) {
-        // skip
-        return doc;
-      }
-      // migrate the series split_filter filters
-      const series = get(visState, 'params.series') || [];
-      series.forEach(item => {
-        // series item split filters filter
-        if (item.split_filters) {
-          const splitFilters = get(item, 'split_filters') || [];
-          if (splitFilters.length > 0) {
-            // only transform split_filter filters if we have filters
-            splitFilters.forEach(filter => {
-              if (typeof filter.filter === 'string') {
-                const filterfilterObject = {
-                  query: filter.filter,
-                  language: 'lucene',
-                };
-                filter.filter = filterfilterObject;
-              }
-            });
-          }
-        }
-      });
-      newDoc.attributes.visState = JSON.stringify(visState);
-    }
-  }
-  return newDoc;
-}
-
-function migrateFiltersAggQuery(doc) {
-  const visStateJSON = get(doc, 'attributes.visState');
-
-  if (visStateJSON) {
-    try {
-      const visState = JSON.parse(visStateJSON);
-      if (visState && visState.aggs) {
-        visState.aggs.forEach(agg => {
-          if (agg.type !== 'filters') return;
-
-          agg.params.filters.forEach(filter => {
-            if (filter.input.language) return filter;
-            filter.input.language = 'lucene';
-          });
-        });
-
-        return {
-          ...doc,
-          attributes: {
-            ...doc.attributes,
-            visState: JSON.stringify(visState),
-          },
-        };
-      }
-    } catch (e) {
-      // Let it go, the data is invalid and we'll leave it as is
-    }
-  }
-  return doc;
-}
-
-function replaceMovAvgToMovFn(doc, logger) {
-  const visStateJSON = get(doc, 'attributes.visState');
-  let visState;
-
-  if (visStateJSON) {
-    try {
-      visState = JSON.parse(visStateJSON);
-
-      if (visState && visState.type === 'metrics') {
-        const series = get(visState, 'params.series', []);
-
-        series.forEach(part => {
-          if (part.metrics && Array.isArray(part.metrics)) {
-            part.metrics.forEach(metric => {
-              if (metric.type === 'moving_average') {
-                metric.model_type = metric.model;
-                metric.alpha = get(metric, 'settings.alpha', 0.3);
-                metric.beta = get(metric, 'settings.beta', 0.1);
-                metric.gamma = get(metric, 'settings.gamma', 0.3);
-                metric.period = get(metric, 'settings.period', 1);
-                metric.multiplicative = get(metric, 'settings.type') === 'mult';
-
-                delete metric.minimize;
-                delete metric.model;
-                delete metric.settings;
-                delete metric.predict;
-              }
-            });
-          }
-        });
-
-        return {
-          ...doc,
-          attributes: {
-            ...doc.attributes,
-            visState: JSON.stringify(visState),
-          },
-        };
-      }
-    } catch (e) {
-      logger.warning(`Exception @ replaceMovAvgToMovFn! ${e}`);
-      logger.warning(`Exception @ replaceMovAvgToMovFn! Payload: ${visStateJSON}`);
-    }
-  }
-
-  return doc;
-}
-
-function migrateSearchSortToNestedArray(doc) {
-  const sort = get(doc, 'attributes.sort');
-  if (!sort) return doc;
-
-  // Don't do anything if we already have a two dimensional array
-  if (Array.isArray(sort) && sort.length > 0 && Array.isArray(sort[0])) {
-    return doc;
-  }
-
-  return {
-    ...doc,
-    attributes: {
-      ...doc.attributes,
-      sort: [doc.attributes.sort],
-    },
-  };
-}
-
-function migrateFiltersAggQueryStringQueries(doc) {
-  const visStateJSON = get(doc, 'attributes.visState');
-
-  if (visStateJSON) {
-    try {
-      const visState = JSON.parse(visStateJSON);
-      if (visState && visState.aggs) {
-        visState.aggs.forEach(agg => {
-          if (agg.type !== 'filters') return doc;
-
-          agg.params.filters.forEach(filter => {
-            if (filter.input.query.query_string) {
-              filter.input.query = filter.input.query.query_string.query;
-            }
-          });
-        });
-
-        return {
-          ...doc,
-          attributes: {
-            ...doc.attributes,
-            visState: JSON.stringify(visState),
-          },
-        };
-      }
-    } catch (e) {
-      // Let it go, the data is invalid and we'll leave it as is
-    }
-  }
-  return doc;
-}
-
-function migrateSubTypeAndParentFieldProperties(doc) {
-  if (!doc.attributes.fields) return doc;
-
-  const fieldsString = doc.attributes.fields;
-  const fields = JSON.parse(fieldsString);
-  const migratedFields = fields.map(field => {
-    if (field.subType === 'multi') {
-      return {
-        ...omit(field, 'parent'),
-        subType: { multi: { parent: field.parent } },
-      };
-    }
-
-    return field;
-  });
-
-  return {
-    ...doc,
-    attributes: {
-      ...doc.attributes,
-      fields: JSON.stringify(migratedFields),
-    },
-  };
-}
-
-const executeMigrations720 = flow(
-  migratePercentileRankAggregation,
-  migrateDateHistogramAggregation
-);
-const executeMigrations730 = flow(
-  migrateGaugeVerticalSplitToAlignment,
-  transformFilterStringToQueryObject,
-  migrateFiltersAggQuery,
-  replaceMovAvgToMovFn
-);
-
-const executeVisualizationMigrations731 = flow(migrateFiltersAggQueryStringQueries);
-
-const executeSearchMigrations740 = flow(migrateSearchSortToNestedArray);
-
-const executeMigrations742 = flow(transformSplitFiltersStringToQueryObject);
-
 export const migrations = {
-  'index-pattern': {
-    '6.5.0': doc => {
-      doc.attributes.type = doc.attributes.type || undefined;
-      doc.attributes.typeMeta = doc.attributes.typeMeta || undefined;
-      return doc;
-    },
-    '7.6.0': flow(migrateSubTypeAndParentFieldProperties),
-  },
-  visualization: {
-    /**
-     * We need to have this migration twice, once with a version prior to 7.0.0 once with a version
-     * after it. The reason for that is, that this migration has been introduced once 7.0.0 was already
-     * released. Thus a user who already had 7.0.0 installed already got the 7.0.0 migrations below running,
-     * so we need a version higher than that. But this fix was backported to the 6.7 release, meaning if we
-     * would only have the 7.0.1 migration in here a user on the 6.7 release will migrate their saved objects
-     * to the 7.0.1 state, and thus when updating their Kibana to 7.0, will never run the 7.0.0 migrations introduced
-     * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7
-     * only contained the 6.7.2 migration and not the 7.0.1 migration.
-     */
-    '6.7.2': removeDateHistogramTimeZones,
-    '7.0.0': doc => {
-      // Set new "references" attribute
-      doc.references = doc.references || [];
-
-      // Migrate index pattern
-      migrateIndexPattern(doc);
-
-      // Migrate saved search
-      const savedSearchId = get(doc, 'attributes.savedSearchId');
-      if (savedSearchId) {
-        doc.references.push({
-          type: 'search',
-          name: 'search_0',
-          id: savedSearchId,
-        });
-        doc.attributes.savedSearchRefName = 'search_0';
-      }
-      delete doc.attributes.savedSearchId;
-
-      // Migrate controls
-      const visStateJSON = get(doc, 'attributes.visState');
-      if (visStateJSON) {
-        let visState;
-        try {
-          visState = JSON.parse(visStateJSON);
-        } catch (e) {
-          // Let it go, the data is invalid and we'll leave it as is
-        }
-        if (visState) {
-          const controls = get(visState, 'params.controls') || [];
-          controls.forEach((control, i) => {
-            if (!control.indexPattern) {
-              return;
-            }
-            control.indexPatternRefName = `control_${i}_index_pattern`;
-            doc.references.push({
-              name: control.indexPatternRefName,
-              type: 'index-pattern',
-              id: control.indexPattern,
-            });
-            delete control.indexPattern;
-          });
-          doc.attributes.visState = JSON.stringify(visState);
-        }
-      }
-
-      // Migrate table splits
-      try {
-        const visState = JSON.parse(doc.attributes.visState);
-        if (get(visState, 'type') !== 'table') {
-          return doc; // do nothing; we only want to touch tables
-        }
-
-        let splitCount = 0;
-        visState.aggs = visState.aggs.map(agg => {
-          if (agg.schema !== 'split') {
-            return agg;
-          }
-
-          splitCount++;
-          if (splitCount === 1) {
-            return agg; // leave the first split agg unchanged
-          }
-          agg.schema = 'bucket';
-          // the `row` param is exclusively used by split aggs, so we remove it
-          agg.params = omit(agg.params, ['row']);
-          return agg;
-        });
-
-        if (splitCount <= 1) {
-          return doc; // do nothing; we only want to touch tables with multiple split aggs
-        }
-
-        const newDoc = cloneDeep(doc);
-        newDoc.attributes.visState = JSON.stringify(visState);
-        return newDoc;
-      } catch (e) {
-        throw new Error(
-          `Failure attempting to migrate saved object '${doc.attributes.title}' - ${e}`
-        );
-      }
-    },
-    '7.0.1': removeDateHistogramTimeZones,
-    '7.2.0': doc => executeMigrations720(doc),
-    '7.3.0': executeMigrations730,
-    '7.3.1': executeVisualizationMigrations731,
-    // migrate split_filters that were not migrated in 7.3.0 (transformFilterStringToQueryObject).
-    '7.4.2': executeMigrations742,
-  },
   dashboard: {
     '7.0.0': doc => {
       // Set new "references" attribute
@@ -651,14 +99,4 @@ export const migrations = {
     },
     '7.3.0': dashboardMigrations730,
   },
-  search: {
-    '7.0.0': doc => {
-      // Set new "references" attribute
-      doc.references = doc.references || [];
-      // Migrate index pattern
-      migrateIndexPattern(doc);
-      return doc;
-    },
-    '7.4.0': executeSearchMigrations740,
-  },
 };
diff --git a/src/legacy/core_plugins/kibana/migrations/migrations.test.js b/src/legacy/core_plugins/kibana/migrations/migrations.test.js
index e39bc59201e7fd..b02081128c8585 100644
--- a/src/legacy/core_plugins/kibana/migrations/migrations.test.js
+++ b/src/legacy/core_plugins/kibana/migrations/migrations.test.js
@@ -19,1312 +19,6 @@
 
 import { migrations } from './migrations';
 
-describe('index-pattern', () => {
-  describe('6.5.0', () => {
-    const migrate = doc => migrations['index-pattern']['6.5.0'](doc);
-
-    it('adds "type" and "typeMeta" properties to object when not declared', () => {
-      expect(
-        migrate({
-          attributes: {},
-        })
-      ).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "type": undefined,
-    "typeMeta": undefined,
-  },
-}
-`);
-    });
-
-    it('keeps "type" and "typeMeta" properties as is when declared', () => {
-      expect(
-        migrate({
-          attributes: {
-            type: '123',
-            typeMeta: '123',
-          },
-        })
-      ).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "type": "123",
-    "typeMeta": "123",
-  },
-}
-`);
-    });
-  });
-
-  describe('7.6.0', function() {
-    const migrate = doc => migrations['index-pattern']['7.6.0'](doc);
-
-    it('should remove the parent property and update the subType prop on every field that has them', () => {
-      const input = {
-        attributes: {
-          title: 'test',
-          fields:
-            '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":"multi","parent":"customer_name"}]',
-        },
-      };
-      const expected = {
-        attributes: {
-          title: 'test',
-          fields:
-            '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_name"}}}]',
-        },
-      };
-
-      expect(migrate(input)).toEqual(expected);
-    });
-  });
-});
-
-describe('visualization', () => {
-  describe('date histogram time zone removal', () => {
-    const migrate = doc => migrations.visualization['6.7.2'](doc);
-    let doc;
-    beforeEach(() => {
-      doc = {
-        attributes: {
-          visState: JSON.stringify({
-            aggs: [
-              {
-                enabled: true,
-                id: '1',
-                params: {
-                  // Doesn't make much sense but we want to test it's not removing it from anything else
-                  time_zone: 'Europe/Berlin',
-                },
-                schema: 'metric',
-                type: 'count',
-              },
-              {
-                enabled: true,
-                id: '2',
-                params: {
-                  customInterval: '2h',
-                  drop_partials: false,
-                  extended_bounds: {},
-                  field: 'timestamp',
-                  time_zone: 'Europe/Berlin',
-                  interval: 'auto',
-                  min_doc_count: 1,
-                  useNormalizedEsInterval: true,
-                },
-                schema: 'segment',
-                type: 'date_histogram',
-              },
-              {
-                enabled: true,
-                id: '4',
-                params: {
-                  customInterval: '2h',
-                  drop_partials: false,
-                  extended_bounds: {},
-                  field: 'timestamp',
-                  interval: 'auto',
-                  min_doc_count: 1,
-                  useNormalizedEsInterval: true,
-                },
-                schema: 'segment',
-                type: 'date_histogram',
-              },
-              {
-                enabled: true,
-                id: '3',
-                params: {
-                  customBucket: {
-                    enabled: true,
-                    id: '1-bucket',
-                    params: {
-                      customInterval: '2h',
-                      drop_partials: false,
-                      extended_bounds: {},
-                      field: 'timestamp',
-                      interval: 'auto',
-                      min_doc_count: 1,
-                      time_zone: 'Europe/Berlin',
-                      useNormalizedEsInterval: true,
-                    },
-                    type: 'date_histogram',
-                  },
-                  customMetric: {
-                    enabled: true,
-                    id: '1-metric',
-                    params: {},
-                    type: 'count',
-                  },
-                },
-                schema: 'metric',
-                type: 'max_bucket',
-              },
-            ],
-          }),
-        },
-      };
-    });
-
-    it('should remove time_zone from date_histogram aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[1]).not.toHaveProperty('params.time_zone');
-    });
-
-    it('should not remove time_zone from non date_histogram aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[0]).toHaveProperty('params.time_zone');
-    });
-
-    it('should remove time_zone from nested aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[3]).not.toHaveProperty('params.customBucket.params.time_zone');
-    });
-
-    it('should not fail on date histograms without a time_zone', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[2]).not.toHaveProperty('params.time_zone');
-    });
-
-    it('should be able to apply the migration twice, since we need it for 6.7.2 and 7.0.1', () => {
-      const migratedDoc = migrate(migrate(doc));
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[1]).not.toHaveProperty('params.time_zone');
-      expect(aggs[0]).toHaveProperty('params.time_zone');
-      expect(aggs[3]).not.toHaveProperty('params.customBucket.params.time_zone');
-      expect(aggs[2]).not.toHaveProperty('params.time_zone');
-    });
-  });
-
-  describe('7.0.0', () => {
-    const migrate = doc => migrations.visualization['7.0.0'](doc);
-    const generateDoc = ({ type, aggs }) => ({
-      attributes: {
-        title: 'My Vis',
-        description: 'This is my super cool vis.',
-        visState: JSON.stringify({ type, aggs }),
-        uiStateJSON: '{}',
-        version: 1,
-        kibanaSavedObjectMeta: {
-          searchSourceJSON: '{}',
-        },
-      },
-    });
-
-    it('does not throw error on empty object', () => {
-      const migratedDoc = migrate({
-        attributes: {
-          visState: '{}',
-        },
-      });
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "visState": "{}",
-  },
-  "references": Array [],
-}
-`);
-    });
-
-    it('skips errors when searchSourceJSON is null', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: null,
-          },
-          savedSearchId: '123',
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": null,
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('skips errors when searchSourceJSON is undefined', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: undefined,
-          },
-          savedSearchId: '123',
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": undefined,
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('skips error when searchSourceJSON is not a string', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: 123,
-          },
-          savedSearchId: '123',
-        },
-      };
-      expect(migrate(doc)).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": 123,
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('skips error when searchSourceJSON is invalid json', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '{abc123}',
-          },
-          savedSearchId: '123',
-        },
-      };
-      expect(migrate(doc)).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{abc123}",
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('skips error when "index" and "filter" is missing from searchSourceJSON', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: JSON.stringify({ bar: true }),
-          },
-          savedSearchId: '123',
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{\\"bar\\":true}",
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('extracts "index" attribute from doc', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: JSON.stringify({ bar: true, index: 'pattern*' }),
-          },
-          savedSearchId: '123',
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{\\"bar\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.index\\"}",
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "pattern*",
-      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-      "type": "index-pattern",
-    },
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('extracts index patterns from the filter', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: JSON.stringify({
-              bar: true,
-              filter: [
-                {
-                  meta: { index: 'my-index', foo: true },
-                },
-              ],
-            }),
-          },
-          savedSearchId: '123',
-        },
-      };
-      const migratedDoc = migrate(doc);
-
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{\\"bar\\":true,\\"filter\\":[{\\"meta\\":{\\"foo\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\\"}}]}",
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "my-index",
-      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
-      "type": "index-pattern",
-    },
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('extracts index patterns from controls', () => {
-      const doc = {
-        id: '1',
-        type: 'visualization',
-        attributes: {
-          foo: true,
-          visState: JSON.stringify({
-            bar: false,
-            params: {
-              controls: [
-                {
-                  bar: true,
-                  indexPattern: 'pattern*',
-                },
-                {
-                  foo: true,
-                },
-              ],
-            },
-          }),
-        },
-      };
-      const migratedDoc = migrate(doc);
-
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "visState": "{\\"bar\\":false,\\"params\\":{\\"controls\\":[{\\"bar\\":true,\\"indexPatternRefName\\":\\"control_0_index_pattern\\"},{\\"foo\\":true}]}}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "pattern*",
-      "name": "control_0_index_pattern",
-      "type": "index-pattern",
-    },
-  ],
-  "type": "visualization",
-}
-`);
-    });
-
-    it('skips extracting savedSearchId when missing', () => {
-      const doc = {
-        id: '1',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '{}',
-          },
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{}",
-    },
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [],
-}
-`);
-    });
-
-    it('extract savedSearchId from doc', () => {
-      const doc = {
-        id: '1',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '{}',
-          },
-          savedSearchId: '123',
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{}",
-    },
-    "savedSearchRefName": "search_0",
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [
-    Object {
-      "id": "123",
-      "name": "search_0",
-      "type": "search",
-    },
-  ],
-}
-`);
-    });
-
-    it('delete savedSearchId when empty string in doc', () => {
-      const doc = {
-        id: '1',
-        attributes: {
-          visState: '{}',
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '{}',
-          },
-          savedSearchId: '',
-        },
-      };
-      const migratedDoc = migrate(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{}",
-    },
-    "visState": "{}",
-  },
-  "id": "1",
-  "references": Array [],
-}
-`);
-    });
-
-    it('should return a new object if vis is table and has multiple split aggs', () => {
-      const aggs = [
-        {
-          id: '1',
-          schema: 'metric',
-          params: {},
-        },
-        {
-          id: '2',
-          schema: 'split',
-          params: { foo: 'bar', row: true },
-        },
-        {
-          id: '3',
-          schema: 'split',
-          params: { hey: 'ya', row: false },
-        },
-      ];
-      const tableDoc = generateDoc({ type: 'table', aggs });
-      const expected = tableDoc;
-      const actual = migrate(tableDoc);
-      expect(actual).not.toBe(expected);
-    });
-
-    it('should not touch any vis that is not table', () => {
-      const aggs = [];
-      const pieDoc = generateDoc({ type: 'pie', aggs });
-      const expected = pieDoc;
-      const actual = migrate(pieDoc);
-      expect(actual).toBe(expected);
-    });
-
-    it('should not change values in any vis that is not table', () => {
-      const aggs = [
-        {
-          id: '1',
-          schema: 'metric',
-          params: {},
-        },
-        {
-          id: '2',
-          schema: 'split',
-          params: { foo: 'bar', row: true },
-        },
-        {
-          id: '3',
-          schema: 'segment',
-          params: { hey: 'ya' },
-        },
-      ];
-      const pieDoc = generateDoc({ type: 'pie', aggs });
-      const expected = pieDoc;
-      const actual = migrate(pieDoc);
-      expect(actual).toEqual(expected);
-    });
-
-    it('should not touch table vis if there are not multiple split aggs', () => {
-      const aggs = [
-        {
-          id: '1',
-          schema: 'metric',
-          params: {},
-        },
-        {
-          id: '2',
-          schema: 'split',
-          params: { foo: 'bar', row: true },
-        },
-      ];
-      const tableDoc = generateDoc({ type: 'table', aggs });
-      const expected = tableDoc;
-      const actual = migrate(tableDoc);
-      expect(actual).toBe(expected);
-    });
-
-    it('should change all split aggs to `bucket` except the first', () => {
-      const aggs = [
-        {
-          id: '1',
-          schema: 'metric',
-          params: {},
-        },
-        {
-          id: '2',
-          schema: 'split',
-          params: { foo: 'bar', row: true },
-        },
-        {
-          id: '3',
-          schema: 'split',
-          params: { hey: 'ya', row: false },
-        },
-        {
-          id: '4',
-          schema: 'bucket',
-          params: { heyyy: 'yaaa' },
-        },
-      ];
-      const expected = ['metric', 'split', 'bucket', 'bucket'];
-      const migrated = migrate(generateDoc({ type: 'table', aggs }));
-      const actual = JSON.parse(migrated.attributes.visState);
-      expect(actual.aggs.map(agg => agg.schema)).toEqual(expected);
-    });
-
-    it('should remove `rows` param from any aggs that are not `split`', () => {
-      const aggs = [
-        {
-          id: '1',
-          schema: 'metric',
-          params: {},
-        },
-        {
-          id: '2',
-          schema: 'split',
-          params: { foo: 'bar', row: true },
-        },
-        {
-          id: '3',
-          schema: 'split',
-          params: { hey: 'ya', row: false },
-        },
-      ];
-      const expected = [{}, { foo: 'bar', row: true }, { hey: 'ya' }];
-      const migrated = migrate(generateDoc({ type: 'table', aggs }));
-      const actual = JSON.parse(migrated.attributes.visState);
-      expect(actual.aggs.map(agg => agg.params)).toEqual(expected);
-    });
-
-    it('should throw with a reference to the doc name if something goes wrong', () => {
-      const doc = {
-        attributes: {
-          title: 'My Vis',
-          description: 'This is my super cool vis.',
-          visState: '!/// Intentionally malformed JSON ///!',
-          uiStateJSON: '{}',
-          version: 1,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '{}',
-          },
-        },
-      };
-      expect(() => migrate(doc)).toThrowError(/My Vis/);
-    });
-  });
-
-  describe('date histogram custom interval removal', () => {
-    const migrate = doc => migrations.visualization['7.2.0'](doc);
-    let doc;
-    beforeEach(() => {
-      doc = {
-        attributes: {
-          visState: JSON.stringify({
-            aggs: [
-              {
-                enabled: true,
-                id: '1',
-                params: {
-                  customInterval: '1h',
-                },
-                schema: 'metric',
-                type: 'count',
-              },
-              {
-                enabled: true,
-                id: '2',
-                params: {
-                  customInterval: '2h',
-                  drop_partials: false,
-                  extended_bounds: {},
-                  field: 'timestamp',
-                  interval: 'auto',
-                  min_doc_count: 1,
-                  useNormalizedEsInterval: true,
-                },
-                schema: 'segment',
-                type: 'date_histogram',
-              },
-              {
-                enabled: true,
-                id: '4',
-                params: {
-                  customInterval: '2h',
-                  drop_partials: false,
-                  extended_bounds: {},
-                  field: 'timestamp',
-                  interval: 'custom',
-                  min_doc_count: 1,
-                  useNormalizedEsInterval: true,
-                },
-                schema: 'segment',
-                type: 'date_histogram',
-              },
-              {
-                enabled: true,
-                id: '3',
-                params: {
-                  customBucket: {
-                    enabled: true,
-                    id: '1-bucket',
-                    params: {
-                      customInterval: '2h',
-                      drop_partials: false,
-                      extended_bounds: {},
-                      field: 'timestamp',
-                      interval: 'custom',
-                      min_doc_count: 1,
-                      useNormalizedEsInterval: true,
-                    },
-                    type: 'date_histogram',
-                  },
-                  customMetric: {
-                    enabled: true,
-                    id: '1-metric',
-                    params: {},
-                    type: 'count',
-                  },
-                },
-                schema: 'metric',
-                type: 'max_bucket',
-              },
-            ],
-          }),
-        },
-      };
-    });
-
-    it('should remove customInterval from date_histogram aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[1]).not.toHaveProperty('params.customInterval');
-    });
-
-    it('should not change interval from date_histogram aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[1].params.interval).toBe(
-        JSON.parse(doc.attributes.visState).aggs[1].params.interval
-      );
-    });
-
-    it('should not remove customInterval from non date_histogram aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[0]).toHaveProperty('params.customInterval');
-    });
-
-    it('should set interval with customInterval value and remove customInterval when interval equals "custom"', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[2].params.interval).toBe(
-        JSON.parse(doc.attributes.visState).aggs[2].params.customInterval
-      );
-      expect(aggs[2]).not.toHaveProperty('params.customInterval');
-    });
-
-    it('should remove customInterval from nested aggregations', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[3]).not.toHaveProperty('params.customBucket.params.customInterval');
-    });
-
-    it('should remove customInterval from nested aggregations and set interval with customInterval value', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[3].params.customBucket.params.interval).toBe(
-        JSON.parse(doc.attributes.visState).aggs[3].params.customBucket.params.customInterval
-      );
-      expect(aggs[3]).not.toHaveProperty('params.customBucket.params.customInterval');
-    });
-
-    it('should not fail on date histograms without a customInterval', () => {
-      const migratedDoc = migrate(doc);
-      const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
-      expect(aggs[3]).not.toHaveProperty('params.customInterval');
-    });
-  });
-  describe('7.3.0', () => {
-    const logMsgArr = [];
-    const logger = {
-      warning: msg => logMsgArr.push(msg),
-    };
-    const migrate = doc => migrations.visualization['7.3.0'](doc, logger);
-
-    it('migrates type = gauge verticalSplit: false to alignment: vertical', () => {
-      const migratedDoc = migrate({
-        attributes: {
-          visState: JSON.stringify({ type: 'gauge', params: { gauge: { verticalSplit: false } } }),
-        },
-      });
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "visState": "{\\"type\\":\\"gauge\\",\\"params\\":{\\"gauge\\":{\\"alignment\\":\\"horizontal\\"}}}",
-  },
-}
-`);
-    });
-
-    it('migrates type = gauge verticalSplit: false to alignment: horizontal', () => {
-      const migratedDoc = migrate({
-        attributes: {
-          visState: JSON.stringify({ type: 'gauge', params: { gauge: { verticalSplit: true } } }),
-        },
-      });
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "visState": "{\\"type\\":\\"gauge\\",\\"params\\":{\\"gauge\\":{\\"alignment\\":\\"vertical\\"}}}",
-  },
-}
-`);
-    });
-
-    it('doesnt migrate type = gauge containing invalid visState object, adds message to log', () => {
-      const migratedDoc = migrate({
-        attributes: {
-          visState: JSON.stringify({ type: 'gauge' }),
-        },
-      });
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "visState": "{\\"type\\":\\"gauge\\"}",
-  },
-}
-`);
-      expect(logMsgArr).toMatchInlineSnapshot(`
-Array [
-  "Exception @ migrateGaugeVerticalSplitToAlignment! TypeError: Cannot read property 'gauge' of undefined",
-  "Exception @ migrateGaugeVerticalSplitToAlignment! Payload: {\\"type\\":\\"gauge\\"}",
-]
-`);
-    });
-
-    describe('filters agg query migration', () => {
-      const doc = {
-        attributes: {
-          visState: JSON.stringify({
-            aggs: [
-              {
-                type: 'filters',
-                params: {
-                  filters: [
-                    {
-                      input: {
-                        query: 'response:200',
-                      },
-                      label: '',
-                    },
-                    {
-                      input: {
-                        query: 'response:404',
-                      },
-                      label: 'bad response',
-                    },
-                    {
-                      input: {
-                        query: {
-                          exists: {
-                            field: 'phpmemory',
-                          },
-                        },
-                      },
-                      label: '',
-                    },
-                  ],
-                },
-              },
-            ],
-          }),
-        },
-      };
-
-      it('should add language property to filters without one, assuming lucene', () => {
-        const migrationResult = migrate(doc);
-        expect(migrationResult).toEqual({
-          attributes: {
-            visState: JSON.stringify({
-              aggs: [
-                {
-                  type: 'filters',
-                  params: {
-                    filters: [
-                      {
-                        input: {
-                          query: 'response:200',
-                          language: 'lucene',
-                        },
-                        label: '',
-                      },
-                      {
-                        input: {
-                          query: 'response:404',
-                          language: 'lucene',
-                        },
-                        label: 'bad response',
-                      },
-                      {
-                        input: {
-                          query: {
-                            exists: {
-                              field: 'phpmemory',
-                            },
-                          },
-                          language: 'lucene',
-                        },
-                        label: '',
-                      },
-                    ],
-                  },
-                },
-              ],
-            }),
-          },
-        });
-      });
-    });
-
-    describe('replaceMovAvgToMovFn()', () => {
-      let doc;
-
-      beforeEach(() => {
-        doc = {
-          attributes: {
-            title: 'VIS',
-            visState: `{"title":"VIS","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417",
-            "type":"timeseries","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(0,156,224,1)",
-            "split_mode":"terms","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"count",
-            "numerator":"FlightDelay:true"},{"settings":"","minimize":0,"window":5,"model":
-            "holt_winters","id":"23054fe0-8915-11e9-9b86-d3f94982620f","type":"moving_average","field":
-            "61ca57f2-469d-11e7-af02-69e470af7417","predict":1}],"separate_axis":0,"axis_position":"right",
-            "formatter":"number","chart_type":"line","line_width":"2","point_size":"0","fill":0.5,"stacked":"none",
-            "label":"Percent Delays","terms_size":"2","terms_field":"OriginCityName"}],"time_field":"timestamp",
-            "index_pattern":"kibana_sample_data_flights","interval":">=12h","axis_position":"left","axis_formatter":
-            "number","show_legend":1,"show_grid":1,"annotations":[{"fields":"FlightDelay,Cancelled,Carrier",
-            "template":"{{Carrier}}: Flight Delayed and Cancelled!","index_pattern":"kibana_sample_data_flights",
-            "query_string":"FlightDelay:true AND Cancelled:true","id":"53b7dff0-4c89-11e8-a66a-6989ad5a0a39",
-            "color":"rgba(0,98,177,1)","time_field":"timestamp","icon":"fa-exclamation-triangle",
-            "ignore_global_filters":1,"ignore_panel_filters":1,"hidden":true}],"legend_position":"bottom",
-            "axis_scale":"normal","default_index_pattern":"kibana_sample_data_flights","default_timefield":"timestamp"},
-            "aggs":[]}`,
-          },
-          migrationVersion: {
-            visualization: '7.2.0',
-          },
-          type: 'visualization',
-        };
-      });
-
-      test('should add some necessary moving_fn fields', () => {
-        const migratedDoc = migrate(doc);
-        const visState = JSON.parse(migratedDoc.attributes.visState);
-        const metric = visState.params.series[0].metrics[1];
-
-        expect(metric).toHaveProperty('model_type');
-        expect(metric).toHaveProperty('alpha');
-        expect(metric).toHaveProperty('beta');
-        expect(metric).toHaveProperty('gamma');
-        expect(metric).toHaveProperty('period');
-        expect(metric).toHaveProperty('multiplicative');
-      });
-    });
-  });
-  describe('7.3.0 tsvb', () => {
-    const migrate = doc => migrations.visualization['7.3.0'](doc);
-    const generateDoc = ({ params }) => ({
-      attributes: {
-        title: 'My Vis',
-        description: 'This is my super cool vis.',
-        visState: JSON.stringify({ params }),
-        uiStateJSON: '{}',
-        version: 1,
-        kibanaSavedObjectMeta: {
-          searchSourceJSON: '{}',
-        },
-      },
-    });
-    it('should change series item filters from a string into an object', () => {
-      const params = { type: 'metric', series: [{ filter: 'Filter Bytes Test:>1000' }] };
-      const testDoc1 = generateDoc({ params });
-      const migratedTestDoc1 = migrate(testDoc1);
-      const series = JSON.parse(migratedTestDoc1.attributes.visState).params.series;
-      expect(series[0].filter).toHaveProperty('query');
-      expect(series[0].filter).toHaveProperty('language');
-    });
-    it('should not change a series item filter string in the object after migration', () => {
-      const markdownParams = {
-        type: 'markdown',
-        series: [
-          {
-            filter: 'Filter Bytes Test:>1000',
-            split_filters: [{ filter: 'bytes:>1000' }],
-          },
-        ],
-      };
-      const markdownDoc = generateDoc({ params: markdownParams });
-      const migratedMarkdownDoc = migrate(markdownDoc);
-      const markdownSeries = JSON.parse(migratedMarkdownDoc.attributes.visState).params.series;
-      expect(markdownSeries[0].filter.query).toBe(
-        JSON.parse(markdownDoc.attributes.visState).params.series[0].filter
-      );
-      expect(markdownSeries[0].split_filters[0].filter.query).toBe(
-        JSON.parse(markdownDoc.attributes.visState).params.series[0].split_filters[0].filter
-      );
-    });
-    it('should change series item filters from a string into an object for all filters', () => {
-      const params = {
-        type: 'timeseries',
-        filter: 'bytes:>1000',
-        series: [
-          {
-            filter: 'Filter Bytes Test:>1000',
-            split_filters: [{ filter: 'bytes:>1000' }],
-          },
-        ],
-        annotations: [{ query_string: 'bytes:>1000' }],
-      };
-      const timeSeriesDoc = generateDoc({ params: params });
-      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
-      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
-      expect(Object.keys(timeSeriesParams.series[0].filter)).toEqual(
-        expect.arrayContaining(['query', 'language'])
-      );
-      expect(Object.keys(timeSeriesParams.series[0].split_filters[0].filter)).toEqual(
-        expect.arrayContaining(['query', 'language'])
-      );
-      expect(Object.keys(timeSeriesParams.annotations[0].query_string)).toEqual(
-        expect.arrayContaining(['query', 'language'])
-      );
-    });
-    it('should not fail on a metric visualization without a filter in a series item', () => {
-      const params = { type: 'metric', series: [{}, {}, {}] };
-      const testDoc1 = generateDoc({ params });
-      const migratedTestDoc1 = migrate(testDoc1);
-      const series = JSON.parse(migratedTestDoc1.attributes.visState).params.series;
-      expect(series[2]).not.toHaveProperty('filter.query');
-    });
-    it('should not migrate a visualization of unknown type', () => {
-      const params = { type: 'unknown', series: [{ filter: 'foo:bar' }] };
-      const doc = generateDoc({ params });
-      const migratedDoc = migrate(doc);
-      const series = JSON.parse(migratedDoc.attributes.visState).params.series;
-      expect(series[0].filter).toEqual(params.series[0].filter);
-    });
-  });
-
-  describe('7.3.1', () => {
-    const migrate = migrations.visualization['7.3.1'];
-
-    it('should migrate filters agg query string queries', () => {
-      const state = {
-        aggs: [
-          { type: 'count', params: {} },
-          {
-            type: 'filters',
-            params: {
-              filters: [
-                {
-                  input: {
-                    query: {
-                      query_string: { query: 'machine.os.keyword:"win 8"' },
-                    },
-                  },
-                },
-              ],
-            },
-          },
-        ],
-      };
-      const expected = {
-        aggs: [
-          { type: 'count', params: {} },
-          {
-            type: 'filters',
-            params: {
-              filters: [{ input: { query: 'machine.os.keyword:"win 8"' } }],
-            },
-          },
-        ],
-      };
-      const migratedDoc = migrate({ attributes: { visState: JSON.stringify(state) } });
-      expect(migratedDoc).toEqual({ attributes: { visState: JSON.stringify(expected) } });
-    });
-  });
-  describe('7.4.2 tsvb split_filters migration', () => {
-    const migrate = doc => migrations.visualization['7.4.2'](doc);
-    const generateDoc = ({ params }) => ({
-      attributes: {
-        title: 'My Vis',
-        description: 'This is my super cool vis.',
-        visState: JSON.stringify({ params }),
-        uiStateJSON: '{}',
-        version: 1,
-        kibanaSavedObjectMeta: {
-          searchSourceJSON: '{}',
-        },
-      },
-    });
-    it('should change series item filters from a string into an object for all filters', () => {
-      const params = {
-        type: 'timeseries',
-        filter: {
-          query: 'bytes:>1000',
-          language: 'lucene',
-        },
-        series: [
-          {
-            split_filters: [{ filter: 'bytes:>1000' }],
-          },
-        ],
-      };
-      const timeSeriesDoc = generateDoc({ params: params });
-      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
-      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
-      expect(Object.keys(timeSeriesParams.filter)).toEqual(
-        expect.arrayContaining(['query', 'language'])
-      );
-      expect(timeSeriesParams.series[0].split_filters[0].filter).toEqual({
-        query: 'bytes:>1000',
-        language: 'lucene',
-      });
-    });
-    it('should change series item split filters when there is no filter item', () => {
-      const params = {
-        type: 'timeseries',
-        filter: {
-          query: 'bytes:>1000',
-          language: 'lucene',
-        },
-        series: [
-          {
-            split_filters: [{ filter: 'bytes:>1000' }],
-          },
-        ],
-        annotations: [
-          {
-            query_string: {
-              query: 'bytes:>1000',
-              language: 'lucene',
-            },
-          },
-        ],
-      };
-      const timeSeriesDoc = generateDoc({ params: params });
-      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
-      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
-      expect(timeSeriesParams.series[0].split_filters[0].filter).toEqual({
-        query: 'bytes:>1000',
-        language: 'lucene',
-      });
-    });
-    it('should not convert split_filters to objects if there are no split filter filters', () => {
-      const params = {
-        type: 'timeseries',
-        filter: {
-          query: 'bytes:>1000',
-          language: 'lucene',
-        },
-        series: [
-          {
-            split_filters: [],
-          },
-        ],
-      };
-      const timeSeriesDoc = generateDoc({ params: params });
-      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
-      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
-      expect(timeSeriesParams.series[0].split_filters).not.toHaveProperty('query');
-    });
-    it('should do nothing if a split_filter is already a query:language object', () => {
-      const params = {
-        type: 'timeseries',
-        filter: {
-          query: 'bytes:>1000',
-          language: 'lucene',
-        },
-        series: [
-          {
-            split_filters: [
-              {
-                filter: {
-                  query: 'bytes:>1000',
-                  language: 'lucene',
-                },
-              },
-            ],
-          },
-        ],
-        annotations: [
-          {
-            query_string: {
-              query: 'bytes:>1000',
-              language: 'lucene',
-            },
-          },
-        ],
-      };
-      const timeSeriesDoc = generateDoc({ params: params });
-      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
-      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
-      expect(timeSeriesParams.series[0].split_filters[0].filter.query).toEqual('bytes:>1000');
-      expect(timeSeriesParams.series[0].split_filters[0].filter.language).toEqual('lucene');
-    });
-  });
-});
-
 describe('dashboard', () => {
   describe('7.0.0', () => {
     const migration = migrations.dashboard['7.0.0'];
@@ -1751,271 +445,3 @@ Object {
     });
   });
 });
-
-describe('search', () => {
-  describe('7.0.0', () => {
-    const migration = migrations.search['7.0.0'];
-
-    test('skips errors when searchSourceJSON is null', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: null,
-          },
-        },
-      };
-      const migratedDoc = migration(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": null,
-    },
-  },
-  "id": "123",
-  "references": Array [],
-  "type": "search",
-}
-`);
-    });
-
-    test('skips errors when searchSourceJSON is undefined', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: undefined,
-          },
-        },
-      };
-      const migratedDoc = migration(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": undefined,
-    },
-  },
-  "id": "123",
-  "references": Array [],
-  "type": "search",
-}
-`);
-    });
-
-    test('skips error when searchSourceJSON is not a string', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: 123,
-          },
-        },
-      };
-      expect(migration(doc)).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": 123,
-    },
-  },
-  "id": "123",
-  "references": Array [],
-  "type": "search",
-}
-`);
-    });
-
-    test('skips error when searchSourceJSON is invalid json', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: '{abc123}',
-          },
-        },
-      };
-      expect(migration(doc)).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{abc123}",
-    },
-  },
-  "id": "123",
-  "references": Array [],
-  "type": "search",
-}
-`);
-    });
-
-    test('skips error when "index" and "filter" is missing from searchSourceJSON', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: JSON.stringify({ bar: true }),
-          },
-        },
-      };
-      const migratedDoc = migration(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{\\"bar\\":true}",
-    },
-  },
-  "id": "123",
-  "references": Array [],
-  "type": "search",
-}
-`);
-    });
-
-    test('extracts "index" attribute from doc', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: JSON.stringify({ bar: true, index: 'pattern*' }),
-          },
-        },
-      };
-      const migratedDoc = migration(doc);
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{\\"bar\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.index\\"}",
-    },
-  },
-  "id": "123",
-  "references": Array [
-    Object {
-      "id": "pattern*",
-      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-      "type": "index-pattern",
-    },
-  ],
-  "type": "search",
-}
-`);
-    });
-
-    test('extracts index patterns from filter', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          foo: true,
-          kibanaSavedObjectMeta: {
-            searchSourceJSON: JSON.stringify({
-              bar: true,
-              filter: [
-                {
-                  meta: {
-                    foo: true,
-                    index: 'my-index',
-                  },
-                },
-              ],
-            }),
-          },
-        },
-      };
-      const migratedDoc = migration(doc);
-
-      expect(migratedDoc).toMatchInlineSnapshot(`
-Object {
-  "attributes": Object {
-    "foo": true,
-    "kibanaSavedObjectMeta": Object {
-      "searchSourceJSON": "{\\"bar\\":true,\\"filter\\":[{\\"meta\\":{\\"foo\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\\"}}]}",
-    },
-  },
-  "id": "123",
-  "references": Array [
-    Object {
-      "id": "my-index",
-      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
-      "type": "index-pattern",
-    },
-  ],
-  "type": "search",
-}
-`);
-    });
-  });
-
-  describe('7.4.0', function() {
-    const migration = migrations.search['7.4.0'];
-
-    test('transforms one dimensional sort arrays into two dimensional arrays', () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          sort: ['bytes', 'desc'],
-        },
-      };
-
-      const expected = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          sort: [['bytes', 'desc']],
-        },
-      };
-
-      const migratedDoc = migration(doc);
-
-      expect(migratedDoc).toEqual(expected);
-    });
-
-    test("doesn't modify search docs that already have two dimensional sort arrays", () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {
-          sort: [['bytes', 'desc']],
-        },
-      };
-
-      const migratedDoc = migration(doc);
-
-      expect(migratedDoc).toEqual(doc);
-    });
-
-    test("doesn't modify search docs that have no sort array", () => {
-      const doc = {
-        id: '123',
-        type: 'search',
-        attributes: {},
-      };
-
-      const migratedDoc = migration(doc);
-
-      expect(migratedDoc).toEqual(doc);
-    });
-  });
-});
diff --git a/src/plugins/data/server/index_patterns/index_patterns_service.ts b/src/plugins/data/server/index_patterns/index_patterns_service.ts
index 78f34e21b9e416..58e8fbae9f9e24 100644
--- a/src/plugins/data/server/index_patterns/index_patterns_service.ts
+++ b/src/plugins/data/server/index_patterns/index_patterns_service.ts
@@ -19,10 +19,13 @@
 
 import { CoreSetup, Plugin } from 'kibana/server';
 import { registerRoutes } from './routes';
+import { indexPatternSavedObjectType } from '../saved_objects';
 
 export class IndexPatternsService implements Plugin<void> {
-  public setup({ http }: CoreSetup) {
-    registerRoutes(http);
+  public setup(core: CoreSetup) {
+    core.savedObjects.registerType(indexPatternSavedObjectType);
+
+    registerRoutes(core.http);
   }
 
   public start() {}
diff --git a/src/plugins/data/server/plugin.ts b/src/plugins/data/server/plugin.ts
index 616e65ad872ab7..efb8759e7beade 100644
--- a/src/plugins/data/server/plugin.ts
+++ b/src/plugins/data/server/plugin.ts
@@ -21,6 +21,7 @@ import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from '../../..
 import { IndexPatternsService } from './index_patterns';
 import { ISearchSetup } from './search';
 import { SearchService } from './search/search_service';
+import { QueryService } from './query/query_service';
 import { ScriptsService } from './scripts';
 import { KqlTelemetryService } from './kql_telemetry';
 import { UsageCollectionSetup } from '../../usage_collection/server';
@@ -47,6 +48,7 @@ export class DataServerPlugin implements Plugin<DataPluginSetup, DataPluginStart
   private readonly autocompleteService: AutocompleteService;
   private readonly indexPatterns = new IndexPatternsService();
   private readonly fieldFormats = new FieldFormatsService();
+  private readonly queryService = new QueryService();
 
   constructor(initializerContext: PluginInitializerContext) {
     this.searchService = new SearchService(initializerContext);
@@ -58,6 +60,7 @@ export class DataServerPlugin implements Plugin<DataPluginSetup, DataPluginStart
   public setup(core: CoreSetup, { usageCollection }: DataPluginSetupDependencies) {
     this.indexPatterns.setup(core);
     this.scriptsService.setup(core);
+    this.queryService.setup(core);
     this.autocompleteService.setup(core);
     this.kqlTelemetryService.setup(core, { usageCollection });
 
diff --git a/src/legacy/core_plugins/data/mappings.ts b/src/plugins/data/server/query/index.ts
similarity index 60%
rename from src/legacy/core_plugins/data/mappings.ts
rename to src/plugins/data/server/query/index.ts
index 90777ec8e36512..294effdc38cfcb 100644
--- a/src/legacy/core_plugins/data/mappings.ts
+++ b/src/plugins/data/server/query/index.ts
@@ -17,34 +17,4 @@
  * under the License.
  */
 
-export const mappings = {
-  query: {
-    properties: {
-      title: {
-        type: 'text',
-      },
-      description: {
-        type: 'text',
-      },
-      query: {
-        properties: {
-          language: {
-            type: 'keyword',
-          },
-          query: {
-            type: 'keyword',
-            index: false,
-          },
-        },
-      },
-      filters: {
-        type: 'object',
-        enabled: false,
-      },
-      timefilter: {
-        type: 'object',
-        enabled: false,
-      },
-    },
-  },
-};
+export { QueryService } from './query_service';
diff --git a/src/plugins/data/server/query/query_service.ts b/src/plugins/data/server/query/query_service.ts
new file mode 100644
index 00000000000000..13d735a495d42d
--- /dev/null
+++ b/src/plugins/data/server/query/query_service.ts
@@ -0,0 +1,29 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { CoreSetup, Plugin } from 'kibana/server';
+import { querySavedObjectType } from '../saved_objects';
+
+export class QueryService implements Plugin<void> {
+  public setup(core: CoreSetup) {
+    core.savedObjects.registerType(querySavedObjectType);
+  }
+
+  public start() {}
+}
diff --git a/src/plugins/data/server/saved_objects/index.ts b/src/plugins/data/server/saved_objects/index.ts
new file mode 100644
index 00000000000000..5d980974474de8
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { searchSavedObjectType } from './search';
+export { querySavedObjectType } from './query';
+export { indexPatternSavedObjectType } from './index_patterns';
diff --git a/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts b/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts
new file mode 100644
index 00000000000000..b1410e24986676
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/index_pattern_migrations.test.ts
@@ -0,0 +1,97 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectMigrationContext } from 'kibana/server';
+import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations';
+
+const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;
+
+describe('migration index-pattern', () => {
+  describe('6.5.0', () => {
+    const migrationFn = indexPatternSavedObjectTypeMigrations['6.5.0'];
+
+    test('adds "type" and "typeMeta" properties to object when not declared', () => {
+      expect(
+        migrationFn(
+          {
+            type: 'index-pattern',
+            attributes: {},
+          },
+          savedObjectMigrationContext
+        )
+      ).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "type": undefined,
+    "typeMeta": undefined,
+  },
+  "type": "index-pattern",
+}
+`);
+    });
+
+    test('keeps "type" and "typeMeta" properties as is when declared', () => {
+      expect(
+        migrationFn(
+          {
+            type: 'index-pattern',
+            attributes: {
+              type: '123',
+              typeMeta: '123',
+            },
+          },
+          savedObjectMigrationContext
+        )
+      ).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "type": "123",
+    "typeMeta": "123",
+  },
+  "type": "index-pattern",
+}
+`);
+    });
+  });
+
+  describe('7.6.0', () => {
+    const migrationFn = indexPatternSavedObjectTypeMigrations['7.6.0'];
+
+    test('should remove the parent property and update the subType prop on every field that has them', () => {
+      const input = {
+        type: 'index-pattern',
+        attributes: {
+          title: 'test',
+          fields:
+            '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":"multi","parent":"customer_name"}]',
+        },
+      };
+      const expected = {
+        type: 'index-pattern',
+        attributes: {
+          title: 'test',
+          fields:
+            '[{"name":"customer_name","type":"string","esTypes":["text"],"count":0,"scripted":false,"searchable":true,"aggregatable":false,"readFromDocValues":false},{"name":"customer_name.keyword","type":"string","esTypes":["keyword"],"count":0,"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true,"subType":{"multi":{"parent":"customer_name"}}}]',
+        },
+      };
+
+      expect(migrationFn(input, savedObjectMigrationContext)).toEqual(expected);
+    });
+  });
+});
diff --git a/src/plugins/data/server/saved_objects/index_pattern_migrations.ts b/src/plugins/data/server/saved_objects/index_pattern_migrations.ts
new file mode 100644
index 00000000000000..7a16386ea484c8
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/index_pattern_migrations.ts
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { flow, omit } from 'lodash';
+import { SavedObjectMigrationFn } from 'kibana/server';
+
+const migrateAttributeTypeAndAttributeTypeMeta: SavedObjectMigrationFn = doc => ({
+  ...doc,
+  attributes: {
+    ...doc.attributes,
+    type: doc.attributes.type || undefined,
+    typeMeta: doc.attributes.typeMeta || undefined,
+  },
+});
+
+const migrateSubTypeAndParentFieldProperties: SavedObjectMigrationFn = doc => {
+  if (!doc.attributes.fields) return doc;
+
+  const fieldsString = doc.attributes.fields;
+  const fields = JSON.parse(fieldsString) as any[];
+  const migratedFields = fields.map(field => {
+    if (field.subType === 'multi') {
+      return {
+        ...omit(field, 'parent'),
+        subType: { multi: { parent: field.parent } },
+      };
+    }
+
+    return field;
+  });
+
+  return {
+    ...doc,
+    attributes: {
+      ...doc.attributes,
+      fields: JSON.stringify(migratedFields),
+    },
+  };
+};
+
+export const indexPatternSavedObjectTypeMigrations = {
+  '6.5.0': flow<SavedObjectMigrationFn>(migrateAttributeTypeAndAttributeTypeMeta),
+  '7.6.0': flow<SavedObjectMigrationFn>(migrateSubTypeAndParentFieldProperties),
+};
diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts
new file mode 100644
index 00000000000000..9838071eee5a4e
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/index_patterns.ts
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsType } from 'kibana/server';
+import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations';
+
+export const indexPatternSavedObjectType: SavedObjectsType = {
+  name: 'index-pattern',
+  hidden: false,
+  namespaceAgnostic: false,
+  management: {
+    icon: 'indexPatternApp',
+    defaultSearchField: 'title',
+    importableAndExportable: true,
+    getTitle(obj) {
+      return obj.attributes.title;
+    },
+    getEditUrl(obj) {
+      return `/management/kibana/index_patterns/${encodeURIComponent(obj.id)}`;
+    },
+    getInAppUrl(obj) {
+      return {
+        path: `/app/kibana#/management/kibana/index_patterns/${encodeURIComponent(obj.id)}`,
+        uiCapabilitiesPath: 'management.kibana.index_patterns',
+      };
+    },
+  },
+  mappings: {
+    properties: {
+      fieldFormatMap: { type: 'text' },
+      fields: { type: 'text' },
+      intervalName: { type: 'keyword' },
+      notExpandable: { type: 'boolean' },
+      sourceFilters: { type: 'text' },
+      timeFieldName: { type: 'keyword' },
+      title: { type: 'text' },
+      type: { type: 'keyword' },
+      typeMeta: { type: 'keyword' },
+    },
+  },
+  migrations: indexPatternSavedObjectTypeMigrations,
+};
diff --git a/src/plugins/data/server/saved_objects/query.ts b/src/plugins/data/server/saved_objects/query.ts
new file mode 100644
index 00000000000000..ff0a6cfde8113d
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/query.ts
@@ -0,0 +1,52 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsType } from 'kibana/server';
+
+export const querySavedObjectType: SavedObjectsType = {
+  name: 'query',
+  hidden: false,
+  namespaceAgnostic: false,
+  management: {
+    icon: 'search',
+    defaultSearchField: 'title',
+    importableAndExportable: true,
+    getTitle(obj) {
+      return obj.attributes.title;
+    },
+    getInAppUrl(obj) {
+      return {
+        path: `/app/kibana#/discover?_a=(savedQuery:'${encodeURIComponent(obj.id)}')`,
+        uiCapabilitiesPath: 'discover.show',
+      };
+    },
+  },
+  mappings: {
+    properties: {
+      title: { type: 'text' },
+      description: { type: 'text' },
+      query: {
+        properties: { language: { type: 'keyword' }, query: { type: 'keyword', index: false } },
+      },
+      filters: { type: 'object', enabled: false },
+      timefilter: { type: 'object', enabled: false },
+    },
+  },
+  migrations: {},
+};
diff --git a/src/plugins/data/server/saved_objects/search.ts b/src/plugins/data/server/saved_objects/search.ts
new file mode 100644
index 00000000000000..8b30ff7d08201d
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/search.ts
@@ -0,0 +1,60 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsType } from 'kibana/server';
+import { searchSavedObjectTypeMigrations } from './search_migrations';
+
+export const searchSavedObjectType: SavedObjectsType = {
+  name: 'search',
+  hidden: false,
+  namespaceAgnostic: false,
+  management: {
+    icon: 'discoverApp',
+    defaultSearchField: 'title',
+    importableAndExportable: true,
+    getTitle(obj) {
+      return obj.attributes.title;
+    },
+    getEditUrl(obj) {
+      return `/management/kibana/objects/savedSearches/${encodeURIComponent(obj.id)}`;
+    },
+    getInAppUrl(obj) {
+      return {
+        path: `/app/kibana#/discover/${encodeURIComponent(obj.id)}`,
+        uiCapabilitiesPath: 'discover.show',
+      };
+    },
+  },
+  mappings: {
+    properties: {
+      columns: { type: 'keyword' },
+      description: { type: 'text' },
+      hits: { type: 'integer' },
+      kibanaSavedObjectMeta: {
+        properties: {
+          searchSourceJSON: { type: 'text' },
+        },
+      },
+      sort: { type: 'keyword' },
+      title: { type: 'text' },
+      version: { type: 'integer' },
+    },
+  },
+  migrations: searchSavedObjectTypeMigrations,
+};
diff --git a/src/plugins/data/server/saved_objects/search_migrations.test.ts b/src/plugins/data/server/saved_objects/search_migrations.test.ts
new file mode 100644
index 00000000000000..7fdf2e14aefedf
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/search_migrations.test.ts
@@ -0,0 +1,299 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectMigrationContext } from 'kibana/server';
+import { searchSavedObjectTypeMigrations } from './search_migrations';
+
+const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;
+
+describe('migration search', () => {
+  describe('7.0.0', () => {
+    const migrationFn = searchSavedObjectTypeMigrations['7.0.0'];
+
+    test('skips errors when searchSourceJSON is null', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: null,
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": null,
+    },
+  },
+  "id": "123",
+  "references": Array [],
+  "type": "search",
+}
+`);
+    });
+
+    test('skips errors when searchSourceJSON is undefined', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: undefined,
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": undefined,
+    },
+  },
+  "id": "123",
+  "references": Array [],
+  "type": "search",
+}
+`);
+    });
+
+    test('skips error when searchSourceJSON is not a string', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: 123,
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": 123,
+    },
+  },
+  "id": "123",
+  "references": Array [],
+  "type": "search",
+}
+`);
+    });
+
+    test('skips error when searchSourceJSON is invalid json', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: '{abc123}',
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{abc123}",
+    },
+  },
+  "id": "123",
+  "references": Array [],
+  "type": "search",
+}
+`);
+    });
+
+    test('skips error when "index" and "filter" is missing from searchSourceJSON', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: JSON.stringify({ bar: true }),
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{\\"bar\\":true}",
+    },
+  },
+  "id": "123",
+  "references": Array [],
+  "type": "search",
+}
+`);
+    });
+
+    test('extracts "index" attribute from doc', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: JSON.stringify({ bar: true, index: 'pattern*' }),
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{\\"bar\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.index\\"}",
+    },
+  },
+  "id": "123",
+  "references": Array [
+    Object {
+      "id": "pattern*",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern",
+    },
+  ],
+  "type": "search",
+}
+`);
+    });
+
+    test('extracts index patterns from filter', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          foo: true,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: JSON.stringify({
+              bar: true,
+              filter: [
+                {
+                  meta: {
+                    foo: true,
+                    index: 'my-index',
+                  },
+                },
+              ],
+            }),
+          },
+        },
+      };
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{\\"bar\\":true,\\"filter\\":[{\\"meta\\":{\\"foo\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\\"}}]}",
+    },
+  },
+  "id": "123",
+  "references": Array [
+    Object {
+      "id": "my-index",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+      "type": "index-pattern",
+    },
+  ],
+  "type": "search",
+}
+`);
+    });
+  });
+
+  describe('7.4.0', function() {
+    const migrationFn = searchSavedObjectTypeMigrations['7.4.0'];
+
+    test('transforms one dimensional sort arrays into two dimensional arrays', () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          sort: ['bytes', 'desc'],
+        },
+      };
+
+      const expected = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          sort: [['bytes', 'desc']],
+        },
+      };
+
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toEqual(expected);
+    });
+
+    test("doesn't modify search docs that already have two dimensional sort arrays", () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {
+          sort: [['bytes', 'desc']],
+        },
+      };
+
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toEqual(doc);
+    });
+
+    test("doesn't modify search docs that have no sort array", () => {
+      const doc = {
+        id: '123',
+        type: 'search',
+        attributes: {},
+      };
+
+      const migratedDoc = migrationFn(doc, savedObjectMigrationContext);
+
+      expect(migratedDoc).toEqual(doc);
+    });
+  });
+});
diff --git a/src/plugins/data/server/saved_objects/search_migrations.ts b/src/plugins/data/server/saved_objects/search_migrations.ts
new file mode 100644
index 00000000000000..db545e52ce170e
--- /dev/null
+++ b/src/plugins/data/server/saved_objects/search_migrations.ts
@@ -0,0 +1,92 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { flow, get } from 'lodash';
+import { SavedObjectMigrationFn } from 'kibana/server';
+
+const migrateIndexPattern: SavedObjectMigrationFn = doc => {
+  const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
+  if (typeof searchSourceJSON !== 'string') {
+    return doc;
+  }
+  let searchSource;
+  try {
+    searchSource = JSON.parse(searchSourceJSON);
+  } catch (e) {
+    // Let it go, the data is invalid and we'll leave it as is
+    return doc;
+  }
+
+  if (searchSource.index && Array.isArray(doc.references)) {
+    searchSource.indexRefName = 'kibanaSavedObjectMeta.searchSourceJSON.index';
+    doc.references.push({
+      name: searchSource.indexRefName,
+      type: 'index-pattern',
+      id: searchSource.index,
+    });
+    delete searchSource.index;
+  }
+  if (searchSource.filter) {
+    searchSource.filter.forEach((filterRow: any, i: number) => {
+      if (!filterRow.meta || !filterRow.meta.index || !Array.isArray(doc.references)) {
+        return;
+      }
+      filterRow.meta.indexRefName = `kibanaSavedObjectMeta.searchSourceJSON.filter[${i}].meta.index`;
+      doc.references.push({
+        name: filterRow.meta.indexRefName,
+        type: 'index-pattern',
+        id: filterRow.meta.index,
+      });
+      delete filterRow.meta.index;
+    });
+  }
+
+  doc.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.stringify(searchSource);
+
+  return doc;
+};
+
+const setNewReferences: SavedObjectMigrationFn = (doc, context) => {
+  doc.references = doc.references || [];
+  // Migrate index pattern
+  return migrateIndexPattern(doc, context);
+};
+
+const migrateSearchSortToNestedArray: SavedObjectMigrationFn = doc => {
+  const sort = get(doc, 'attributes.sort');
+  if (!sort) return doc;
+
+  // Don't do anything if we already have a two dimensional array
+  if (Array.isArray(sort) && sort.length > 0 && Array.isArray(sort[0])) {
+    return doc;
+  }
+
+  return {
+    ...doc,
+    attributes: {
+      ...doc.attributes,
+      sort: [doc.attributes.sort],
+    },
+  };
+};
+
+export const searchSavedObjectTypeMigrations = {
+  '7.0.0': flow<SavedObjectMigrationFn>(setNewReferences),
+  '7.4.0': flow<SavedObjectMigrationFn>(migrateSearchSortToNestedArray),
+};
diff --git a/src/plugins/data/server/search/search_service.ts b/src/plugins/data/server/search/search_service.ts
index 46f90e3c6fc627..5ee19cd3df19f3 100644
--- a/src/plugins/data/server/search/search_service.ts
+++ b/src/plugins/data/server/search/search_service.ts
@@ -34,6 +34,8 @@ import {
 import { IRouteHandlerSearchContext } from './i_route_handler_search_context';
 import { ES_SEARCH_STRATEGY, esSearchStrategyProvider } from './es_search';
 
+import { searchSavedObjectType } from '../saved_objects';
+
 declare module 'kibana/server' {
   interface RequestHandlerContext {
     search?: IRouteHandlerSearchContext;
@@ -53,6 +55,8 @@ export class SearchService implements Plugin<ISearchSetup, void> {
 
     this.contextContainer = core.context.createContextContainer();
 
+    core.savedObjects.registerType(searchSavedObjectType);
+
     core.http.registerRouteHandlerContext<'search'>('search', context => {
       return createApi({
         caller: context.core.elasticsearch.dataClient.callAsCurrentUser,
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 666df2900c2c39..2a2d9bb414c14f 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -733,7 +733,7 @@ export type TSearchStrategyProvider<T extends TStrategyTypes> = (context: ISearc
 // src/plugins/data/server/index.ts:184:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:185:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:188:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/plugin.ts:62:14 - (ae-forgotten-export) The symbol "ISearchSetup" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/plugin.ts:64:14 - (ae-forgotten-export) The symbol "ISearchSetup" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json
index cf79ce17293d61..8e63ea78333270 100644
--- a/src/plugins/visualizations/kibana.json
+++ b/src/plugins/visualizations/kibana.json
@@ -1,7 +1,7 @@
 {
   "id": "visualizations",
   "version": "kibana",
-  "server": false,
+  "server": true,
   "ui": true,
   "requiredPlugins": [
     "expressions"
diff --git a/src/plugins/visualizations/server/index.ts b/src/plugins/visualizations/server/index.ts
new file mode 100644
index 00000000000000..80c10c3945d4c7
--- /dev/null
+++ b/src/plugins/visualizations/server/index.ts
@@ -0,0 +1,30 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from '../../../core/server';
+import { VisualizationsPlugin } from './plugin';
+
+//  This exports static code and TypeScript types,
+//  as well as, Kibana Platform `plugin()` initializer.
+
+export function plugin(initializerContext: PluginInitializerContext) {
+  return new VisualizationsPlugin(initializerContext);
+}
+
+export { VisualizationsPluginSetup, VisualizationsPluginStart } from './types';
diff --git a/src/plugins/visualizations/server/plugin.ts b/src/plugins/visualizations/server/plugin.ts
new file mode 100644
index 00000000000000..79cce6b5867a1a
--- /dev/null
+++ b/src/plugins/visualizations/server/plugin.ts
@@ -0,0 +1,54 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import {
+  PluginInitializerContext,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  Logger,
+} from '../../../core/server';
+
+import { visualizationSavedObjectType } from './saved_objects';
+
+import { VisualizationsPluginSetup, VisualizationsPluginStart } from './types';
+
+export class VisualizationsPlugin
+  implements Plugin<VisualizationsPluginSetup, VisualizationsPluginStart> {
+  private readonly logger: Logger;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.logger = initializerContext.logger.get();
+  }
+
+  public setup(core: CoreSetup) {
+    this.logger.debug('visualizations: Setup');
+
+    core.savedObjects.registerType(visualizationSavedObjectType);
+
+    return {};
+  }
+
+  public start(core: CoreStart) {
+    this.logger.debug('visualizations: Started');
+    return {};
+  }
+
+  public stop() {}
+}
diff --git a/src/plugins/visualizations/server/saved_objects/index.ts b/src/plugins/visualizations/server/saved_objects/index.ts
new file mode 100644
index 00000000000000..be75f635824500
--- /dev/null
+++ b/src/plugins/visualizations/server/saved_objects/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+export { visualizationSavedObjectType } from './visualization';
diff --git a/src/plugins/visualizations/server/saved_objects/visualization.ts b/src/plugins/visualizations/server/saved_objects/visualization.ts
new file mode 100644
index 00000000000000..9f4782f3ec7308
--- /dev/null
+++ b/src/plugins/visualizations/server/saved_objects/visualization.ts
@@ -0,0 +1,56 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectsType } from 'kibana/server';
+import { visualizationSavedObjectTypeMigrations } from './visualization_migrations';
+
+export const visualizationSavedObjectType: SavedObjectsType = {
+  name: 'visualization',
+  hidden: false,
+  namespaceAgnostic: false,
+  management: {
+    icon: 'visualizeApp',
+    defaultSearchField: 'title',
+    importableAndExportable: true,
+    getTitle(obj) {
+      return obj.attributes.title;
+    },
+    getEditUrl(obj) {
+      return `/management/kibana/objects/savedVisualizations/${encodeURIComponent(obj.id)}`;
+    },
+    getInAppUrl(obj) {
+      return {
+        path: `/app/kibana#/visualize/edit/${encodeURIComponent(obj.id)}`,
+        uiCapabilitiesPath: 'visualize.show',
+      };
+    },
+  },
+  mappings: {
+    properties: {
+      description: { type: 'text' },
+      kibanaSavedObjectMeta: { properties: { searchSourceJSON: { type: 'text' } } },
+      savedSearchRefName: { type: 'keyword' },
+      title: { type: 'text' },
+      uiStateJSON: { type: 'text' },
+      version: { type: 'integer' },
+      visState: { type: 'text' },
+    },
+  },
+  migrations: visualizationSavedObjectTypeMigrations,
+};
diff --git a/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts b/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
new file mode 100644
index 00000000000000..02c114bad4e725
--- /dev/null
+++ b/src/plugins/visualizations/server/saved_objects/visualization_migrations.test.ts
@@ -0,0 +1,1356 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { visualizationSavedObjectTypeMigrations } from './visualization_migrations';
+import { SavedObjectMigrationContext, SavedObjectMigrationFn } from 'kibana/server';
+
+const savedObjectMigrationContext = (null as unknown) as SavedObjectMigrationContext;
+
+describe('migration visualization', () => {
+  describe('6.7.2', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['6.7.2'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+    let doc: any;
+
+    describe('date histogram time zone removal', () => {
+      beforeEach(() => {
+        doc = {
+          attributes: {
+            visState: JSON.stringify({
+              aggs: [
+                {
+                  enabled: true,
+                  id: '1',
+                  params: {
+                    // Doesn't make much sense but we want to test it's not removing it from anything else
+                    time_zone: 'Europe/Berlin',
+                  },
+                  schema: 'metric',
+                  type: 'count',
+                },
+                {
+                  enabled: true,
+                  id: '2',
+                  params: {
+                    customInterval: '2h',
+                    drop_partials: false,
+                    extended_bounds: {},
+                    field: 'timestamp',
+                    time_zone: 'Europe/Berlin',
+                    interval: 'auto',
+                    min_doc_count: 1,
+                    useNormalizedEsInterval: true,
+                  },
+                  schema: 'segment',
+                  type: 'date_histogram',
+                },
+                {
+                  enabled: true,
+                  id: '4',
+                  params: {
+                    customInterval: '2h',
+                    drop_partials: false,
+                    extended_bounds: {},
+                    field: 'timestamp',
+                    interval: 'auto',
+                    min_doc_count: 1,
+                    useNormalizedEsInterval: true,
+                  },
+                  schema: 'segment',
+                  type: 'date_histogram',
+                },
+                {
+                  enabled: true,
+                  id: '3',
+                  params: {
+                    customBucket: {
+                      enabled: true,
+                      id: '1-bucket',
+                      params: {
+                        customInterval: '2h',
+                        drop_partials: false,
+                        extended_bounds: {},
+                        field: 'timestamp',
+                        interval: 'auto',
+                        min_doc_count: 1,
+                        time_zone: 'Europe/Berlin',
+                        useNormalizedEsInterval: true,
+                      },
+                      type: 'date_histogram',
+                    },
+                    customMetric: {
+                      enabled: true,
+                      id: '1-metric',
+                      params: {},
+                      type: 'count',
+                    },
+                  },
+                  schema: 'metric',
+                  type: 'max_bucket',
+                },
+              ],
+            }),
+          },
+        } as Parameters<SavedObjectMigrationFn>[0];
+      });
+
+      it('should remove time_zone from date_histogram aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
+
+        expect(aggs[1]).not.toHaveProperty('params.time_zone');
+      });
+
+      it('should not remove time_zone from non date_histogram aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
+
+        expect(aggs[0]).toHaveProperty('params.time_zone');
+      });
+
+      it('should remove time_zone from nested aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
+
+        expect(aggs[3]).not.toHaveProperty('params.customBucket.params.time_zone');
+      });
+
+      it('should not fail on date histograms without a time_zone', () => {
+        const migratedDoc = migrate(doc);
+        const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
+
+        expect(aggs[2]).not.toHaveProperty('params.time_zone');
+      });
+
+      it('should be able to apply the migration twice, since we need it for 6.7.2 and 7.0.1', () => {
+        const migratedDoc = migrate(doc);
+        const aggs = JSON.parse(migratedDoc.attributes.visState).aggs;
+
+        expect(aggs[1]).not.toHaveProperty('params.time_zone');
+        expect(aggs[0]).toHaveProperty('params.time_zone');
+        expect(aggs[3]).not.toHaveProperty('params.customBucket.params.time_zone');
+        expect(aggs[2]).not.toHaveProperty('params.time_zone');
+      });
+    });
+  });
+
+  describe('7.0.0', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.0.0'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+
+    const generateDoc = (type: any, aggs: any) => ({
+      attributes: {
+        title: 'My Vis',
+        description: 'This is my super cool vis.',
+        visState: JSON.stringify({ type, aggs }),
+        uiStateJSON: '{}',
+        version: 1,
+        kibanaSavedObjectMeta: {
+          searchSourceJSON: '{}',
+        },
+      },
+      references: [],
+    });
+
+    it('does not throw error on empty object', () => {
+      const migratedDoc = migrate({
+        attributes: {
+          visState: '{}',
+        },
+      });
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "visState": "{}",
+  },
+  "references": Array [],
+}
+`);
+    });
+
+    it('skips errors when searchSourceJSON is null', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: null,
+          },
+          savedSearchId: '123',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": null,
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('skips errors when searchSourceJSON is undefined', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: undefined,
+          },
+          savedSearchId: '123',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": undefined,
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('skips error when searchSourceJSON is not a string', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: 123,
+          },
+          savedSearchId: '123',
+        },
+      };
+
+      expect(migrate(doc)).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": 123,
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('skips error when searchSourceJSON is invalid json', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: '{abc123}',
+          },
+          savedSearchId: '123',
+        },
+      };
+
+      expect(migrate(doc)).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{abc123}",
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('skips error when "index" and "filter" is missing from searchSourceJSON', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: JSON.stringify({ bar: true }),
+          },
+          savedSearchId: '123',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{\\"bar\\":true}",
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('extracts "index" attribute from doc', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: JSON.stringify({ bar: true, index: 'pattern*' }),
+          },
+          savedSearchId: '123',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{\\"bar\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.index\\"}",
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "pattern*",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern",
+    },
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('extracts index patterns from the filter', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: JSON.stringify({
+              bar: true,
+              filter: [
+                {
+                  meta: { index: 'my-index', foo: true },
+                },
+              ],
+            }),
+          },
+          savedSearchId: '123',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{\\"bar\\":true,\\"filter\\":[{\\"meta\\":{\\"foo\\":true,\\"indexRefName\\":\\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\\"}}]}",
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "my-index",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+      "type": "index-pattern",
+    },
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('extracts index patterns from controls', () => {
+      const doc = {
+        id: '1',
+        type: 'visualization',
+        attributes: {
+          foo: true,
+          visState: JSON.stringify({
+            bar: false,
+            params: {
+              controls: [
+                {
+                  bar: true,
+                  indexPattern: 'pattern*',
+                },
+                {
+                  foo: true,
+                },
+              ],
+            },
+          }),
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "foo": true,
+    "visState": "{\\"bar\\":false,\\"params\\":{\\"controls\\":[{\\"bar\\":true,\\"indexPatternRefName\\":\\"control_0_index_pattern\\"},{\\"foo\\":true}]}}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "pattern*",
+      "name": "control_0_index_pattern",
+      "type": "index-pattern",
+    },
+  ],
+  "type": "visualization",
+}
+`);
+    });
+
+    it('skips extracting savedSearchId when missing', () => {
+      const doc = {
+        id: '1',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: '{}',
+          },
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{}",
+    },
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [],
+}
+`);
+    });
+
+    it('extract savedSearchId from doc', () => {
+      const doc = {
+        id: '1',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: '{}',
+          },
+          savedSearchId: '123',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{}",
+    },
+    "savedSearchRefName": "search_0",
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [
+    Object {
+      "id": "123",
+      "name": "search_0",
+      "type": "search",
+    },
+  ],
+}
+`);
+    });
+
+    it('delete savedSearchId when empty string in doc', () => {
+      const doc = {
+        id: '1',
+        attributes: {
+          visState: '{}',
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: '{}',
+          },
+          savedSearchId: '',
+        },
+      };
+      const migratedDoc = migrate(doc);
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "kibanaSavedObjectMeta": Object {
+      "searchSourceJSON": "{}",
+    },
+    "visState": "{}",
+  },
+  "id": "1",
+  "references": Array [],
+}
+`);
+    });
+
+    it('should return a new object if vis is table and has multiple split aggs', () => {
+      const aggs = [
+        {
+          id: '1',
+          schema: 'metric',
+          params: {},
+        },
+        {
+          id: '2',
+          schema: 'split',
+          params: { foo: 'bar', row: true },
+        },
+        {
+          id: '3',
+          schema: 'split',
+          params: { hey: 'ya', row: false },
+        },
+      ];
+      const tableDoc = generateDoc('table', aggs);
+      const expected = tableDoc;
+      const actual = migrate(tableDoc);
+
+      expect(actual).not.toEqual(expected);
+    });
+
+    it('should not touch any vis that is not table', () => {
+      const pieDoc = generateDoc('pie', []);
+      const expected = pieDoc;
+      const actual = migrate(pieDoc);
+
+      expect(actual).toEqual(expected);
+    });
+
+    it('should not change values in any vis that is not table', () => {
+      const aggs = [
+        {
+          id: '1',
+          schema: 'metric',
+          params: {},
+        },
+        {
+          id: '2',
+          schema: 'split',
+          params: { foo: 'bar', row: true },
+        },
+        {
+          id: '3',
+          schema: 'segment',
+          params: { hey: 'ya' },
+        },
+      ];
+      const pieDoc = generateDoc('pie', aggs);
+      const expected = pieDoc;
+      const actual = migrate(pieDoc);
+
+      expect(actual).toEqual(expected);
+    });
+
+    it('should not touch table vis if there are not multiple split aggs', () => {
+      const aggs = [
+        {
+          id: '1',
+          schema: 'metric',
+          params: {},
+        },
+        {
+          id: '2',
+          schema: 'split',
+          params: { foo: 'bar', row: true },
+        },
+      ];
+      const tableDoc = generateDoc('table', aggs);
+      const expected = tableDoc;
+      const actual = migrate(tableDoc);
+
+      expect(actual).toEqual(expected);
+    });
+
+    it('should change all split aggs to `bucket` except the first', () => {
+      const aggs = [
+        {
+          id: '1',
+          schema: 'metric',
+          params: {},
+        },
+        {
+          id: '2',
+          schema: 'split',
+          params: { foo: 'bar', row: true },
+        },
+        {
+          id: '3',
+          schema: 'split',
+          params: { hey: 'ya', row: false },
+        },
+        {
+          id: '4',
+          schema: 'bucket',
+          params: { heyyy: 'yaaa' },
+        },
+      ];
+      const expected = ['metric', 'split', 'bucket', 'bucket'];
+      const migrated = migrate(generateDoc('table', aggs));
+      const actual = JSON.parse(migrated.attributes.visState);
+
+      expect(actual.aggs.map((agg: any) => agg.schema)).toEqual(expected);
+    });
+
+    it('should remove `rows` param from any aggs that are not `split`', () => {
+      const aggs = [
+        {
+          id: '1',
+          schema: 'metric',
+          params: {},
+        },
+        {
+          id: '2',
+          schema: 'split',
+          params: { foo: 'bar', row: true },
+        },
+        {
+          id: '3',
+          schema: 'split',
+          params: { hey: 'ya', row: false },
+        },
+      ];
+      const expected = [{}, { foo: 'bar', row: true }, { hey: 'ya' }];
+      const migrated = migrate(generateDoc('table', aggs));
+      const actual = JSON.parse(migrated.attributes.visState);
+
+      expect(actual.aggs.map((agg: any) => agg.params)).toEqual(expected);
+    });
+
+    it('should throw with a reference to the doc name if something goes wrong', () => {
+      const doc = {
+        attributes: {
+          title: 'My Vis',
+          description: 'This is my super cool vis.',
+          visState: '!/// Intentionally malformed JSON ///!',
+          uiStateJSON: '{}',
+          version: 1,
+          kibanaSavedObjectMeta: {
+            searchSourceJSON: '{}',
+          },
+        },
+      };
+      expect(() => migrate(doc)).toThrowError(/My Vis/);
+    });
+  });
+
+  describe('7.2.0', () => {
+    describe('date histogram custom interval removal', () => {
+      const migrate = (doc: any) =>
+        visualizationSavedObjectTypeMigrations['7.2.0'](
+          doc as Parameters<SavedObjectMigrationFn>[0],
+          savedObjectMigrationContext
+        );
+      let doc: any;
+
+      beforeEach(() => {
+        doc = {
+          attributes: {
+            visState: JSON.stringify({
+              aggs: [
+                {
+                  enabled: true,
+                  id: '1',
+                  params: {
+                    customInterval: '1h',
+                  },
+                  schema: 'metric',
+                  type: 'count',
+                },
+                {
+                  enabled: true,
+                  id: '2',
+                  params: {
+                    customInterval: '2h',
+                    drop_partials: false,
+                    extended_bounds: {},
+                    field: 'timestamp',
+                    interval: 'auto',
+                    min_doc_count: 1,
+                    useNormalizedEsInterval: true,
+                  },
+                  schema: 'segment',
+                  type: 'date_histogram',
+                },
+                {
+                  enabled: true,
+                  id: '4',
+                  params: {
+                    customInterval: '2h',
+                    drop_partials: false,
+                    extended_bounds: {},
+                    field: 'timestamp',
+                    interval: 'custom',
+                    min_doc_count: 1,
+                    useNormalizedEsInterval: true,
+                  },
+                  schema: 'segment',
+                  type: 'date_histogram',
+                },
+                {
+                  enabled: true,
+                  id: '3',
+                  params: {
+                    customBucket: {
+                      enabled: true,
+                      id: '1-bucket',
+                      params: {
+                        customInterval: '2h',
+                        drop_partials: false,
+                        extended_bounds: {},
+                        field: 'timestamp',
+                        interval: 'custom',
+                        min_doc_count: 1,
+                        useNormalizedEsInterval: true,
+                      },
+                      type: 'date_histogram',
+                    },
+                    customMetric: {
+                      enabled: true,
+                      id: '1-metric',
+                      params: {},
+                      type: 'count',
+                    },
+                  },
+                  schema: 'metric',
+                  type: 'max_bucket',
+                },
+              ],
+            }),
+          },
+        };
+      });
+
+      it('should remove customInterval from date_histogram aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[1]).not.toHaveProperty('params.customInterval');
+      });
+
+      it('should not change interval from date_histogram aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[1].params.interval).toBe(
+          JSON.parse(doc.attributes.visState).aggs[1].params.interval
+        );
+      });
+
+      it('should not remove customInterval from non date_histogram aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[0]).toHaveProperty('params.customInterval');
+      });
+
+      it('should set interval with customInterval value and remove customInterval when interval equals "custom"', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[2].params.interval).toBe(
+          JSON.parse(doc.attributes.visState).aggs[2].params.customInterval
+        );
+        expect(aggs[2]).not.toHaveProperty('params.customInterval');
+      });
+
+      it('should remove customInterval from nested aggregations', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[3]).not.toHaveProperty('params.customBucket.params.customInterval');
+      });
+
+      it('should remove customInterval from nested aggregations and set interval with customInterval value', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[3].params.customBucket.params.interval).toBe(
+          JSON.parse(doc.attributes.visState).aggs[3].params.customBucket.params.customInterval
+        );
+        expect(aggs[3]).not.toHaveProperty('params.customBucket.params.customInterval');
+      });
+
+      it('should not fail on date histograms without a customInterval', () => {
+        const migratedDoc = migrate(doc);
+        const { aggs } = JSON.parse(migratedDoc.attributes.visState);
+
+        expect(aggs[3]).not.toHaveProperty('params.customInterval');
+      });
+    });
+  });
+
+  describe('7.3.0', () => {
+    const logMsgArr: string[] = [];
+    const logger = ({
+      log: {
+        warn: (msg: string) => logMsgArr.push(msg),
+      },
+    } as unknown) as SavedObjectMigrationContext;
+
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.3.0'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        logger
+      );
+
+    it('migrates type = gauge verticalSplit: false to alignment: vertical', () => {
+      const migratedDoc = migrate({
+        attributes: {
+          visState: JSON.stringify({ type: 'gauge', params: { gauge: { verticalSplit: false } } }),
+        },
+      });
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "visState": "{\\"type\\":\\"gauge\\",\\"params\\":{\\"gauge\\":{\\"alignment\\":\\"horizontal\\"}}}",
+  },
+}
+`);
+    });
+
+    it('migrates type = gauge verticalSplit: false to alignment: horizontal', () => {
+      const migratedDoc = migrate({
+        attributes: {
+          visState: JSON.stringify({ type: 'gauge', params: { gauge: { verticalSplit: true } } }),
+        },
+      });
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "visState": "{\\"type\\":\\"gauge\\",\\"params\\":{\\"gauge\\":{\\"alignment\\":\\"vertical\\"}}}",
+  },
+}
+`);
+    });
+
+    it('doesnt migrate type = gauge containing invalid visState object, adds message to log', () => {
+      const migratedDoc = migrate({
+        attributes: {
+          visState: JSON.stringify({ type: 'gauge' }),
+        },
+      });
+
+      expect(migratedDoc).toMatchInlineSnapshot(`
+Object {
+  "attributes": Object {
+    "visState": "{\\"type\\":\\"gauge\\"}",
+  },
+}
+`);
+      expect(logMsgArr).toMatchInlineSnapshot(`
+Array [
+  "Exception @ migrateGaugeVerticalSplitToAlignment! TypeError: Cannot read property 'gauge' of undefined",
+  "Exception @ migrateGaugeVerticalSplitToAlignment! Payload: {\\"type\\":\\"gauge\\"}",
+]
+`);
+    });
+
+    describe('filters agg query migration', () => {
+      const doc = {
+        attributes: {
+          visState: JSON.stringify({
+            aggs: [
+              {
+                type: 'filters',
+                params: {
+                  filters: [
+                    {
+                      input: {
+                        query: 'response:200',
+                      },
+                      label: '',
+                    },
+                    {
+                      input: {
+                        query: 'response:404',
+                      },
+                      label: 'bad response',
+                    },
+                    {
+                      input: {
+                        query: {
+                          exists: {
+                            field: 'phpmemory',
+                          },
+                        },
+                      },
+                      label: '',
+                    },
+                  ],
+                },
+              },
+            ],
+          }),
+        },
+      };
+
+      it('should add language property to filters without one, assuming lucene', () => {
+        const migrationResult = migrate(doc);
+
+        expect(migrationResult).toEqual({
+          attributes: {
+            visState: JSON.stringify({
+              aggs: [
+                {
+                  type: 'filters',
+                  params: {
+                    filters: [
+                      {
+                        input: {
+                          query: 'response:200',
+                          language: 'lucene',
+                        },
+                        label: '',
+                      },
+                      {
+                        input: {
+                          query: 'response:404',
+                          language: 'lucene',
+                        },
+                        label: 'bad response',
+                      },
+                      {
+                        input: {
+                          query: {
+                            exists: {
+                              field: 'phpmemory',
+                            },
+                          },
+                          language: 'lucene',
+                        },
+                        label: '',
+                      },
+                    ],
+                  },
+                },
+              ],
+            }),
+          },
+        });
+      });
+    });
+
+    describe('replaceMovAvgToMovFn()', () => {
+      let doc: any;
+
+      beforeEach(() => {
+        doc = {
+          attributes: {
+            title: 'VIS',
+            visState: `{"title":"VIS","type":"metrics","params":{"id":"61ca57f0-469d-11e7-af02-69e470af7417",
+            "type":"timeseries","series":[{"id":"61ca57f1-469d-11e7-af02-69e470af7417","color":"rgba(0,156,224,1)",
+            "split_mode":"terms","metrics":[{"id":"61ca57f2-469d-11e7-af02-69e470af7417","type":"count",
+            "numerator":"FlightDelay:true"},{"settings":"","minimize":0,"window":5,"model":
+            "holt_winters","id":"23054fe0-8915-11e9-9b86-d3f94982620f","type":"moving_average","field":
+            "61ca57f2-469d-11e7-af02-69e470af7417","predict":1}],"separate_axis":0,"axis_position":"right",
+            "formatter":"number","chart_type":"line","line_width":"2","point_size":"0","fill":0.5,"stacked":"none",
+            "label":"Percent Delays","terms_size":"2","terms_field":"OriginCityName"}],"time_field":"timestamp",
+            "index_pattern":"kibana_sample_data_flights","interval":">=12h","axis_position":"left","axis_formatter":
+            "number","show_legend":1,"show_grid":1,"annotations":[{"fields":"FlightDelay,Cancelled,Carrier",
+            "template":"{{Carrier}}: Flight Delayed and Cancelled!","index_pattern":"kibana_sample_data_flights",
+            "query_string":"FlightDelay:true AND Cancelled:true","id":"53b7dff0-4c89-11e8-a66a-6989ad5a0a39",
+            "color":"rgba(0,98,177,1)","time_field":"timestamp","icon":"fa-exclamation-triangle",
+            "ignore_global_filters":1,"ignore_panel_filters":1,"hidden":true}],"legend_position":"bottom",
+            "axis_scale":"normal","default_index_pattern":"kibana_sample_data_flights","default_timefield":"timestamp"},
+            "aggs":[]}`,
+          },
+          migrationVersion: {
+            visualization: '7.2.0',
+          },
+          type: 'visualization',
+        };
+      });
+
+      test('should add some necessary moving_fn fields', () => {
+        const migratedDoc = migrate(doc);
+        const visState = JSON.parse(migratedDoc.attributes.visState);
+        const metric = visState.params.series[0].metrics[1];
+
+        expect(metric).toHaveProperty('model_type');
+        expect(metric).toHaveProperty('alpha');
+        expect(metric).toHaveProperty('beta');
+        expect(metric).toHaveProperty('gamma');
+        expect(metric).toHaveProperty('period');
+        expect(metric).toHaveProperty('multiplicative');
+      });
+    });
+  });
+
+  describe('7.3.0 tsvb', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.3.0'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+
+    const generateDoc = (params: any) => ({
+      attributes: {
+        title: 'My Vis',
+        description: 'This is my super cool vis.',
+        visState: JSON.stringify({ params }),
+        uiStateJSON: '{}',
+        version: 1,
+        kibanaSavedObjectMeta: {
+          searchSourceJSON: '{}',
+        },
+      },
+    });
+    it('should change series item filters from a string into an object', () => {
+      const params = { type: 'metric', series: [{ filter: 'Filter Bytes Test:>1000' }] };
+      const testDoc1 = generateDoc(params);
+      const migratedTestDoc1 = migrate(testDoc1);
+      const series = JSON.parse(migratedTestDoc1.attributes.visState).params.series;
+
+      expect(series[0].filter).toHaveProperty('query');
+      expect(series[0].filter).toHaveProperty('language');
+    });
+    it('should not change a series item filter string in the object after migration', () => {
+      const markdownParams = {
+        type: 'markdown',
+        series: [
+          {
+            filter: 'Filter Bytes Test:>1000',
+            split_filters: [{ filter: 'bytes:>1000' }],
+          },
+        ],
+      };
+      const markdownDoc = generateDoc(markdownParams);
+      const migratedMarkdownDoc = migrate(markdownDoc);
+      const markdownSeries = JSON.parse(migratedMarkdownDoc.attributes.visState).params.series;
+
+      expect(markdownSeries[0].filter.query).toBe(
+        JSON.parse(markdownDoc.attributes.visState).params.series[0].filter
+      );
+      expect(markdownSeries[0].split_filters[0].filter.query).toBe(
+        JSON.parse(markdownDoc.attributes.visState).params.series[0].split_filters[0].filter
+      );
+    });
+
+    it('should change series item filters from a string into an object for all filters', () => {
+      const params = {
+        type: 'timeseries',
+        filter: 'bytes:>1000',
+        series: [
+          {
+            filter: 'Filter Bytes Test:>1000',
+            split_filters: [{ filter: 'bytes:>1000' }],
+          },
+        ],
+        annotations: [{ query_string: 'bytes:>1000' }],
+      };
+      const timeSeriesDoc = generateDoc(params);
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+
+      expect(Object.keys(timeSeriesParams.series[0].filter)).toEqual(
+        expect.arrayContaining(['query', 'language'])
+      );
+      expect(Object.keys(timeSeriesParams.series[0].split_filters[0].filter)).toEqual(
+        expect.arrayContaining(['query', 'language'])
+      );
+      expect(Object.keys(timeSeriesParams.annotations[0].query_string)).toEqual(
+        expect.arrayContaining(['query', 'language'])
+      );
+    });
+
+    it('should not fail on a metric visualization without a filter in a series item', () => {
+      const params = { type: 'metric', series: [{}, {}, {}] };
+      const testDoc1 = generateDoc(params);
+      const migratedTestDoc1 = migrate(testDoc1);
+      const series = JSON.parse(migratedTestDoc1.attributes.visState).params.series;
+
+      expect(series[2]).not.toHaveProperty('filter.query');
+    });
+
+    it('should not migrate a visualization of unknown type', () => {
+      const params = { type: 'unknown', series: [{ filter: 'foo:bar' }] };
+      const doc = generateDoc(params);
+      const migratedDoc = migrate(doc);
+      const series = JSON.parse(migratedDoc.attributes.visState).params.series;
+
+      expect(series[0].filter).toEqual(params.series[0].filter);
+    });
+  });
+
+  describe('7.3.1', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.3.1'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+
+    it('should migrate filters agg query string queries', () => {
+      const state = {
+        aggs: [
+          { type: 'count', params: {} },
+          {
+            type: 'filters',
+            params: {
+              filters: [
+                {
+                  input: {
+                    query: {
+                      query_string: { query: 'machine.os.keyword:"win 8"' },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      };
+      const expected = {
+        aggs: [
+          { type: 'count', params: {} },
+          {
+            type: 'filters',
+            params: {
+              filters: [{ input: { query: 'machine.os.keyword:"win 8"' } }],
+            },
+          },
+        ],
+      };
+      const migratedDoc = migrate({ attributes: { visState: JSON.stringify(state) } });
+
+      expect(migratedDoc).toEqual({ attributes: { visState: JSON.stringify(expected) } });
+    });
+  });
+
+  describe('7.4.2 tsvb split_filters migration', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.4.2'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+    const generateDoc = (params: any) => ({
+      attributes: {
+        title: 'My Vis',
+        description: 'This is my super cool vis.',
+        visState: JSON.stringify({ params }),
+        uiStateJSON: '{}',
+        version: 1,
+        kibanaSavedObjectMeta: {
+          searchSourceJSON: '{}',
+        },
+      },
+    });
+
+    it('should change series item filters from a string into an object for all filters', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene',
+        },
+        series: [
+          {
+            split_filters: [{ filter: 'bytes:>1000' }],
+          },
+        ],
+      };
+      const timeSeriesDoc = generateDoc(params);
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+
+      expect(Object.keys(timeSeriesParams.filter)).toEqual(
+        expect.arrayContaining(['query', 'language'])
+      );
+      expect(timeSeriesParams.series[0].split_filters[0].filter).toEqual({
+        query: 'bytes:>1000',
+        language: 'lucene',
+      });
+    });
+
+    it('should change series item split filters when there is no filter item', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene',
+        },
+        series: [
+          {
+            split_filters: [{ filter: 'bytes:>1000' }],
+          },
+        ],
+        annotations: [
+          {
+            query_string: {
+              query: 'bytes:>1000',
+              language: 'lucene',
+            },
+          },
+        ],
+      };
+      const timeSeriesDoc = generateDoc(params);
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+
+      expect(timeSeriesParams.series[0].split_filters[0].filter).toEqual({
+        query: 'bytes:>1000',
+        language: 'lucene',
+      });
+    });
+
+    it('should not convert split_filters to objects if there are no split filter filters', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene',
+        },
+        series: [
+          {
+            split_filters: [],
+          },
+        ],
+      };
+      const timeSeriesDoc = generateDoc(params);
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+
+      expect(timeSeriesParams.series[0].split_filters).not.toHaveProperty('query');
+    });
+
+    it('should do nothing if a split_filter is already a query:language object', () => {
+      const params = {
+        type: 'timeseries',
+        filter: {
+          query: 'bytes:>1000',
+          language: 'lucene',
+        },
+        series: [
+          {
+            split_filters: [
+              {
+                filter: {
+                  query: 'bytes:>1000',
+                  language: 'lucene',
+                },
+              },
+            ],
+          },
+        ],
+        annotations: [
+          {
+            query_string: {
+              query: 'bytes:>1000',
+              language: 'lucene',
+            },
+          },
+        ],
+      };
+      const timeSeriesDoc = generateDoc(params);
+      const migratedtimeSeriesDoc = migrate(timeSeriesDoc);
+      const timeSeriesParams = JSON.parse(migratedtimeSeriesDoc.attributes.visState).params;
+
+      expect(timeSeriesParams.series[0].split_filters[0].filter.query).toEqual('bytes:>1000');
+      expect(timeSeriesParams.series[0].split_filters[0].filter.language).toEqual('lucene');
+    });
+  });
+});
diff --git a/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
new file mode 100644
index 00000000000000..9ee355cbb23cfe
--- /dev/null
+++ b/src/plugins/visualizations/server/saved_objects/visualization_migrations.ts
@@ -0,0 +1,574 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { SavedObjectMigrationFn } from 'kibana/server';
+import { cloneDeep, get, omit, has, flow } from 'lodash';
+
+const migrateIndexPattern: SavedObjectMigrationFn = doc => {
+  const searchSourceJSON = get(doc, 'attributes.kibanaSavedObjectMeta.searchSourceJSON');
+  if (typeof searchSourceJSON !== 'string') {
+    return doc;
+  }
+  let searchSource;
+  try {
+    searchSource = JSON.parse(searchSourceJSON);
+  } catch (e) {
+    // Let it go, the data is invalid and we'll leave it as is
+    return doc;
+  }
+
+  if (searchSource.index && Array.isArray(doc.references)) {
+    searchSource.indexRefName = 'kibanaSavedObjectMeta.searchSourceJSON.index';
+    doc.references.push({
+      name: searchSource.indexRefName,
+      type: 'index-pattern',
+      id: searchSource.index,
+    });
+    delete searchSource.index;
+  }
+  if (searchSource.filter) {
+    searchSource.filter.forEach((filterRow: any, i: number) => {
+      if (!filterRow.meta || !filterRow.meta.index || !Array.isArray(doc.references)) {
+        return;
+      }
+      filterRow.meta.indexRefName = `kibanaSavedObjectMeta.searchSourceJSON.filter[${i}].meta.index`;
+      doc.references.push({
+        name: filterRow.meta.indexRefName,
+        type: 'index-pattern',
+        id: filterRow.meta.index,
+      });
+      delete filterRow.meta.index;
+    });
+  }
+
+  doc.attributes.kibanaSavedObjectMeta.searchSourceJSON = JSON.stringify(searchSource);
+
+  return doc;
+};
+
+// [TSVB] Migrate percentile-rank aggregation (value -> values)
+const migratePercentileRankAggregation: SavedObjectMigrationFn = doc => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+  let visState;
+
+  if (visStateJSON) {
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState && visState.type === 'metrics') {
+      const series: any[] = get(visState, 'params.series') || [];
+
+      series.forEach(part => {
+        (part.metrics || []).forEach((metric: any) => {
+          if (metric.type === 'percentile_rank' && has(metric, 'value')) {
+            metric.values = [metric.value];
+
+            delete metric.value;
+          }
+        });
+      });
+
+      return {
+        ...doc,
+        attributes: {
+          ...doc.attributes,
+          visState: JSON.stringify(visState),
+        },
+      };
+    }
+  }
+  return doc;
+};
+
+// Migrate date histogram aggregation (remove customInterval)
+const migrateDateHistogramAggregation: SavedObjectMigrationFn = doc => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+  let visState;
+
+  if (visStateJSON) {
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+
+    if (visState && visState.aggs) {
+      visState.aggs.forEach((agg: any) => {
+        if (agg.type === 'date_histogram' && agg.params) {
+          if (agg.params.interval === 'custom') {
+            agg.params.interval = agg.params.customInterval;
+          }
+          delete agg.params.customInterval;
+        }
+
+        if (
+          get(agg, 'params.customBucket.type', null) === 'date_histogram' &&
+          agg.params.customBucket.params
+        ) {
+          if (agg.params.customBucket.params.interval === 'custom') {
+            agg.params.customBucket.params.interval = agg.params.customBucket.params.customInterval;
+          }
+          delete agg.params.customBucket.params.customInterval;
+        }
+      });
+      return {
+        ...doc,
+        attributes: {
+          ...doc.attributes,
+          visState: JSON.stringify(visState),
+        },
+      };
+    }
+  }
+  return doc;
+};
+
+const removeDateHistogramTimeZones: SavedObjectMigrationFn = doc => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+  if (visStateJSON) {
+    let visState;
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState && visState.aggs) {
+      visState.aggs.forEach((agg: any) => {
+        // We're checking always for the existance of agg.params here. This should always exist, but better
+        // be safe then sorry during migrations.
+        if (agg.type === 'date_histogram' && agg.params) {
+          delete agg.params.time_zone;
+        }
+
+        if (
+          get(agg, 'params.customBucket.type', null) === 'date_histogram' &&
+          agg.params.customBucket.params
+        ) {
+          delete agg.params.customBucket.params.time_zone;
+        }
+      });
+      doc.attributes.visState = JSON.stringify(visState);
+    }
+  }
+  return doc;
+};
+
+// migrate gauge verticalSplit to alignment
+// https://github.com/elastic/kibana/issues/34636
+const migrateGaugeVerticalSplitToAlignment: SavedObjectMigrationFn = (doc, logger) => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+
+  if (visStateJSON) {
+    try {
+      const visState = JSON.parse(visStateJSON);
+      if (visState && visState.type === 'gauge' && !visState.params.gauge.alignment) {
+        visState.params.gauge.alignment = visState.params.gauge.verticalSplit
+          ? 'vertical'
+          : 'horizontal';
+        delete visState.params.gauge.verticalSplit;
+        return {
+          ...doc,
+          attributes: {
+            ...doc.attributes,
+            visState: JSON.stringify(visState),
+          },
+        };
+      }
+    } catch (e) {
+      logger.log.warn(`Exception @ migrateGaugeVerticalSplitToAlignment! ${e}`);
+      logger.log.warn(`Exception @ migrateGaugeVerticalSplitToAlignment! Payload: ${visStateJSON}`);
+    }
+  }
+  return doc;
+};
+// Migrate filters (string -> { query: string, language: lucene })
+/*
+  Enabling KQL in TSVB causes problems with savedObject visualizations when these are saved with filters.
+  In a visualisation type of saved object, if the visState param is of type metric, the filter is saved as a string that is not interpretted correctly as a lucene query in the visualization itself.
+  We need to transform the filter string into an object containing the original string as a query and specify the query language as lucene.
+  For Metrics visualizations (param.type === "metric"), filters can be applied to each series object in the series array within the SavedObject.visState.params object.
+  Path to the series array is thus:
+  attributes.visState.
+*/
+const transformFilterStringToQueryObject: SavedObjectMigrationFn = (doc, logger) => {
+  // Migrate filters
+  // If any filters exist and they are a string, we assume it to be lucene and transform the filter into an object accordingly
+  const newDoc = cloneDeep(doc);
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+  if (visStateJSON) {
+    let visState;
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState) {
+      const visType = get<string>(visState, 'params.type');
+      const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
+      if (tsvbTypes.indexOf(visType) === -1) {
+        // skip
+        return doc;
+      }
+      // migrate the params fitler
+      const params: any = get(visState, 'params');
+      if (params.filter && typeof params.filter === 'string') {
+        const paramsFilterObject = {
+          query: params.filter,
+          language: 'lucene',
+        };
+        params.filter = paramsFilterObject;
+      }
+
+      // migrate the annotations query string:
+      const annotations: any[] = get(visState, 'params.annotations') || [];
+      annotations.forEach(item => {
+        if (!item.query_string) {
+          // we don't need to transform anything if there isn't a filter at all
+          return;
+        }
+        if (typeof item.query_string === 'string') {
+          const itemQueryStringObject = {
+            query: item.query_string,
+            language: 'lucene',
+          };
+          item.query_string = itemQueryStringObject;
+        }
+      });
+      // migrate the series filters
+      const series: any[] = get(visState, 'params.series') || [];
+
+      series.forEach(item => {
+        if (!item.filter) {
+          // we don't need to transform anything if there isn't a filter at all
+          return;
+        }
+        // series item filter
+        if (typeof item.filter === 'string') {
+          const itemfilterObject = {
+            query: item.filter,
+            language: 'lucene',
+          };
+          item.filter = itemfilterObject;
+        }
+        // series item split filters filter
+        if (item.split_filters) {
+          const splitFilters: any[] = get(item, 'split_filters') || [];
+          splitFilters.forEach(filter => {
+            if (!filter.filter) {
+              // we don't need to transform anything if there isn't a filter at all
+              return;
+            }
+            if (typeof filter.filter === 'string') {
+              const filterfilterObject = {
+                query: filter.filter,
+                language: 'lucene',
+              };
+              filter.filter = filterfilterObject;
+            }
+          });
+        }
+      });
+      newDoc.attributes.visState = JSON.stringify(visState);
+    }
+  }
+  return newDoc;
+};
+
+const transformSplitFiltersStringToQueryObject: SavedObjectMigrationFn = doc => {
+  // Migrate split_filters in TSVB objects that weren't migrated in 7.3
+  // If any filters exist and they are a string, we assume them to be lucene syntax and transform the filter into an object accordingly
+  const newDoc = cloneDeep(doc);
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+  if (visStateJSON) {
+    let visState;
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState) {
+      const visType = get<string>(visState, 'params.type');
+      const tsvbTypes = ['metric', 'markdown', 'top_n', 'gauge', 'table', 'timeseries'];
+      if (tsvbTypes.indexOf(visType) === -1) {
+        // skip
+        return doc;
+      }
+      // migrate the series split_filter filters
+      const series: any[] = get(visState, 'params.series') || [];
+      series.forEach(item => {
+        // series item split filters filter
+        if (item.split_filters) {
+          const splitFilters: any[] = get(item, 'split_filters') || [];
+          if (splitFilters.length > 0) {
+            // only transform split_filter filters if we have filters
+            splitFilters.forEach(filter => {
+              if (typeof filter.filter === 'string') {
+                const filterfilterObject = {
+                  query: filter.filter,
+                  language: 'lucene',
+                };
+                filter.filter = filterfilterObject;
+              }
+            });
+          }
+        }
+      });
+      newDoc.attributes.visState = JSON.stringify(visState);
+    }
+  }
+  return newDoc;
+};
+
+const migrateFiltersAggQuery: SavedObjectMigrationFn = doc => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+
+  if (visStateJSON) {
+    try {
+      const visState = JSON.parse(visStateJSON);
+
+      if (visState && visState.aggs) {
+        visState.aggs.forEach((agg: any) => {
+          if (agg.type !== 'filters') return;
+
+          agg.params.filters.forEach((filter: any) => {
+            if (filter.input.language) return filter;
+            filter.input.language = 'lucene';
+          });
+        });
+
+        return {
+          ...doc,
+          attributes: {
+            ...doc.attributes,
+            visState: JSON.stringify(visState),
+          },
+        };
+      }
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+  }
+  return doc;
+};
+
+const replaceMovAvgToMovFn: SavedObjectMigrationFn = (doc, logger) => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+  let visState;
+
+  if (visStateJSON) {
+    try {
+      visState = JSON.parse(visStateJSON);
+
+      if (visState && visState.type === 'metrics') {
+        const series: any[] = get(visState, 'params.series', []);
+
+        series.forEach(part => {
+          if (part.metrics && Array.isArray(part.metrics)) {
+            part.metrics.forEach((metric: any) => {
+              if (metric.type === 'moving_average') {
+                metric.model_type = metric.model;
+                metric.alpha = get(metric, 'settings.alpha', 0.3);
+                metric.beta = get(metric, 'settings.beta', 0.1);
+                metric.gamma = get(metric, 'settings.gamma', 0.3);
+                metric.period = get(metric, 'settings.period', 1);
+                metric.multiplicative = get(metric, 'settings.type') === 'mult';
+
+                delete metric.minimize;
+                delete metric.model;
+                delete metric.settings;
+                delete metric.predict;
+              }
+            });
+          }
+        });
+
+        return {
+          ...doc,
+          attributes: {
+            ...doc.attributes,
+            visState: JSON.stringify(visState),
+          },
+        };
+      }
+    } catch (e) {
+      logger.log.warn(`Exception @ replaceMovAvgToMovFn! ${e}`);
+      logger.log.warn(`Exception @ replaceMovAvgToMovFn! Payload: ${visStateJSON}`);
+    }
+  }
+
+  return doc;
+};
+
+const migrateFiltersAggQueryStringQueries: SavedObjectMigrationFn = (doc, logger) => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+
+  if (visStateJSON) {
+    try {
+      const visState = JSON.parse(visStateJSON);
+
+      if (visState && visState.aggs) {
+        visState.aggs.forEach((agg: any) => {
+          if (agg.type !== 'filters') return doc;
+
+          agg.params.filters.forEach((filter: any) => {
+            if (filter.input.query.query_string) {
+              filter.input.query = filter.input.query.query_string.query;
+            }
+          });
+        });
+
+        return {
+          ...doc,
+          attributes: {
+            ...doc.attributes,
+            visState: JSON.stringify(visState),
+          },
+        };
+      }
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+  }
+  return doc;
+};
+
+const addDocReferences: SavedObjectMigrationFn = doc => ({
+  ...doc,
+  references: doc.references || [],
+});
+
+const migrateSavedSearch: SavedObjectMigrationFn = doc => {
+  const savedSearchId = get<string>(doc, 'attributes.savedSearchId');
+
+  if (savedSearchId && doc.references) {
+    doc.references.push({
+      type: 'search',
+      name: 'search_0',
+      id: savedSearchId,
+    });
+    doc.attributes.savedSearchRefName = 'search_0';
+  }
+
+  delete doc.attributes.savedSearchId;
+
+  return doc;
+};
+
+const migrateControls: SavedObjectMigrationFn = doc => {
+  const visStateJSON = get<string>(doc, 'attributes.visState');
+
+  if (visStateJSON) {
+    let visState;
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+    if (visState) {
+      const controls: any[] = get(visState, 'params.controls') || [];
+      controls.forEach((control, i) => {
+        if (!control.indexPattern || !doc.references) {
+          return;
+        }
+        control.indexPatternRefName = `control_${i}_index_pattern`;
+        doc.references.push({
+          name: control.indexPatternRefName,
+          type: 'index-pattern',
+          id: control.indexPattern,
+        });
+        delete control.indexPattern;
+      });
+      doc.attributes.visState = JSON.stringify(visState);
+    }
+  }
+
+  return doc;
+};
+
+const migrateTableSplits: SavedObjectMigrationFn = doc => {
+  try {
+    const visState = JSON.parse(doc.attributes.visState);
+    if (get(visState, 'type') !== 'table') {
+      return doc; // do nothing; we only want to touch tables
+    }
+
+    let splitCount = 0;
+    visState.aggs = visState.aggs.map((agg: any) => {
+      if (agg.schema !== 'split') {
+        return agg;
+      }
+
+      splitCount++;
+      if (splitCount === 1) {
+        return agg; // leave the first split agg unchanged
+      }
+      agg.schema = 'bucket';
+      // the `row` param is exclusively used by split aggs, so we remove it
+      agg.params = omit(agg.params, ['row']);
+      return agg;
+    });
+
+    if (splitCount <= 1) {
+      return doc; // do nothing; we only want to touch tables with multiple split aggs
+    }
+
+    const newDoc = cloneDeep(doc);
+    newDoc.attributes.visState = JSON.stringify(visState);
+
+    return newDoc;
+  } catch (e) {
+    throw new Error(`Failure attempting to migrate saved object '${doc.attributes.title}' - ${e}`);
+  }
+};
+
+export const visualizationSavedObjectTypeMigrations = {
+  /**
+   * We need to have this migration twice, once with a version prior to 7.0.0 once with a version
+   * after it. The reason for that is, that this migration has been introduced once 7.0.0 was already
+   * released. Thus a user who already had 7.0.0 installed already got the 7.0.0 migrations below running,
+   * so we need a version higher than that. But this fix was backported to the 6.7 release, meaning if we
+   * would only have the 7.0.1 migration in here a user on the 6.7 release will migrate their saved objects
+   * to the 7.0.1 state, and thus when updating their Kibana to 7.0, will never run the 7.0.0 migrations introduced
+   * in that version. So we apply this twice, once with 6.7.2 and once with 7.0.1 while the backport to 6.7
+   * only contained the 6.7.2 migration and not the 7.0.1 migration.
+   */
+  '6.7.2': flow<SavedObjectMigrationFn>(removeDateHistogramTimeZones),
+  '7.0.0': flow<SavedObjectMigrationFn>(
+    addDocReferences,
+    migrateIndexPattern,
+    migrateSavedSearch,
+    migrateControls,
+    migrateTableSplits
+  ),
+  '7.0.1': flow<SavedObjectMigrationFn>(removeDateHistogramTimeZones),
+  '7.2.0': flow<SavedObjectMigrationFn>(
+    migratePercentileRankAggregation,
+    migrateDateHistogramAggregation
+  ),
+  '7.3.0': flow<SavedObjectMigrationFn>(
+    migrateGaugeVerticalSplitToAlignment,
+    transformFilterStringToQueryObject,
+    migrateFiltersAggQuery,
+    replaceMovAvgToMovFn
+  ),
+  '7.3.1': flow<SavedObjectMigrationFn>(migrateFiltersAggQueryStringQueries),
+  '7.4.2': flow<SavedObjectMigrationFn>(transformSplitFiltersStringToQueryObject),
+};
diff --git a/src/plugins/visualizations/server/types.ts b/src/plugins/visualizations/server/types.ts
new file mode 100644
index 00000000000000..6924edb29627d9
--- /dev/null
+++ b/src/plugins/visualizations/server/types.ts
@@ -0,0 +1,23 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface VisualizationsPluginSetup {}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface VisualizationsPluginStart {}

From 271c9597bed0487a899821538d183d91342e7461 Mon Sep 17 00:00:00 2001
From: Christos Nasikas <christos.nasikas@elastic.co>
Date: Mon, 16 Mar 2020 14:33:03 +0200
Subject: [PATCH 4/4] [SIEM][CASE] Change configuration button (#60229)

* Change button

* Make URLs constants
---
 .../pages/case/components/all_cases/index.tsx  | 18 +++++++++---------
 .../siem/public/pages/case/translations.ts     |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
index 1349246494ec81..7b655999ace09c 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
+++ b/x-pack/legacy/plugins/siem/public/pages/case/components/all_cases/index.tsx
@@ -8,7 +8,6 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import {
   EuiBasicTable,
   EuiButton,
-  EuiButtonIcon,
   EuiContextMenuPanel,
   EuiEmptyPrompt,
   EuiFlexGroup,
@@ -45,6 +44,9 @@ import { OpenClosedStats } from '../open_closed_stats';
 import { getActions } from './actions';
 import { CasesTableFilters } from './table_filters';
 
+const CONFIGURE_CASES_URL = getConfigureCasesUrl();
+const CREATE_CASE_URL = getCreateCaseUrl();
+
 const Div = styled.div`
   margin-top: ${({ theme }) => theme.eui.paddingSizes.m};
 `;
@@ -259,16 +261,14 @@ export const AllCases = React.memo(() => {
             />
           </FlexItemDivider>
           <EuiFlexItem grow={false}>
-            <EuiButton fill href={getCreateCaseUrl()} iconType="plusInCircle">
-              {i18n.CREATE_TITLE}
+            <EuiButton href={CONFIGURE_CASES_URL} iconType="controlsHorizontal">
+              {i18n.CONFIGURE_CASES_BUTTON}
             </EuiButton>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiButtonIcon
-              aria-label={i18n.CONFIGURE_CASES_BUTTON}
-              href={getConfigureCasesUrl()}
-              iconType="gear"
-            />
+            <EuiButton fill href={CREATE_CASE_URL} iconType="plusInCircle">
+              {i18n.CREATE_TITLE}
+            </EuiButton>
           </EuiFlexItem>
         </EuiFlexGroup>
       </CaseHeaderPage>
@@ -325,7 +325,7 @@ export const AllCases = React.memo(() => {
                   titleSize="xs"
                   body={i18n.NO_CASES_BODY}
                   actions={
-                    <EuiButton fill size="s" href={getCreateCaseUrl()} iconType="plusInCircle">
+                    <EuiButton fill size="s" href={CREATE_CASE_URL} iconType="plusInCircle">
                       {i18n.ADD_NEW_CASE}
                     </EuiButton>
                   }
diff --git a/x-pack/legacy/plugins/siem/public/pages/case/translations.ts b/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
index 9c0287a56ccbcd..6ef412d408ae5d 100644
--- a/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
+++ b/x-pack/legacy/plugins/siem/public/pages/case/translations.ts
@@ -120,7 +120,7 @@ export const CONFIGURE_CASES_PAGE_TITLE = i18n.translate(
 );
 
 export const CONFIGURE_CASES_BUTTON = i18n.translate('xpack.siem.case.configureCasesButton', {
-  defaultMessage: 'Configure cases',
+  defaultMessage: 'Edit third-party connection',
 });
 
 export const ADD_COMMENT = i18n.translate('xpack.siem.case.caseView.comment.addComment', {