From ce562e7f5ca4660c8e86f5652087be1d497b9181 Mon Sep 17 00:00:00 2001
From: shahzad <shahzad31comp@gmail.com>
Date: Mon, 9 Mar 2020 15:07:36 +0100
Subject: [PATCH 1/3] gql to rest

---
 .../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   | 169 ++++++++++++++++++
 .../__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 +-
 .../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 -
 .../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 +-
 .../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 +
 42 files changed, 463 insertions(+), 125 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%)

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 0000000000000..f09c795977831
--- /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 a33a69c229873..1a37ce0b18c73 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 84e3ae33294f0..37101b5b46fd2 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 0000000000000..cac7042ca5b5c
--- /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 2e30e5c3cb24f..baa961ddc87d2 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 d0f160b2c5540..a42f96962b95e 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 cbd1fae77c518..79aaa071507e1 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 8fa7a581b99b2..4ee86383a0f60 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
@@ -465,6 +465,175 @@ exports[`EmptyState component doesn't render child components when count is fals
 </EmptyStateComponent>
 `;
 
+exports[`EmptyState component doesn't render child components when count is falsy 1`] = `
+<EmptyStateComponent
+  intl={
+    Object {
+      "defaultFormats": Object {},
+      "defaultLocale": "en",
+      "formatDate": [Function],
+      "formatHTMLMessage": [Function],
+      "formatMessage": [Function],
+      "formatNumber": [Function],
+      "formatPlural": [Function],
+      "formatRelative": [Function],
+      "formatTime": [Function],
+      "formats": Object {
+        "date": Object {
+          "full": Object {
+            "day": "numeric",
+            "month": "long",
+            "weekday": "long",
+            "year": "numeric",
+          },
+          "long": Object {
+            "day": "numeric",
+            "month": "long",
+            "year": "numeric",
+          },
+          "medium": Object {
+            "day": "numeric",
+            "month": "short",
+            "year": "numeric",
+          },
+          "short": Object {
+            "day": "numeric",
+            "month": "numeric",
+            "year": "2-digit",
+          },
+        },
+        "number": Object {
+          "currency": Object {
+            "style": "currency",
+          },
+          "percent": Object {
+            "style": "percent",
+          },
+        },
+        "relative": Object {
+          "days": Object {
+            "units": "day",
+          },
+          "hours": Object {
+            "units": "hour",
+          },
+          "minutes": Object {
+            "units": "minute",
+          },
+          "months": Object {
+            "units": "month",
+          },
+          "seconds": Object {
+            "units": "second",
+          },
+          "years": Object {
+            "units": "year",
+          },
+        },
+        "time": Object {
+          "full": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "long": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+            "timeZoneName": "short",
+          },
+          "medium": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+            "second": "numeric",
+          },
+          "short": Object {
+            "hour": "numeric",
+            "minute": "numeric",
+          },
+        },
+      },
+      "formatters": Object {
+        "getDateTimeFormat": [Function],
+        "getMessageFormat": [Function],
+        "getNumberFormat": [Function],
+        "getPluralFormat": [Function],
+        "getRelativeFormat": [Function],
+      },
+      "locale": "en",
+      "messages": Object {},
+      "now": [Function],
+      "onError": [Function],
+      "textComponent": Symbol(react.fragment),
+      "timeZone": null,
+    }
+  }
+  loading={false}
+  statesIndexStatus={null}
+>
+  <EmptyStateLoading>
+    <EuiEmptyPrompt
+      body={
+        <React.Fragment>
+          <EuiLoadingSpinner
+            size="xl"
+          />
+          <EuiSpacer />
+          <EuiTitle
+            size="l"
+          >
+            <h2>
+              Loading…
+            </h2>
+          </EuiTitle>
+        </React.Fragment>
+      }
+    >
+      <div
+        className="euiEmptyPrompt"
+      >
+        <EuiTextColor
+          color="subdued"
+        >
+          <span
+            className="euiTextColor euiTextColor--subdued"
+          >
+            <EuiText>
+              <div
+                className="euiText euiText--medium"
+              >
+                <EuiLoadingSpinner
+                  size="xl"
+                >
+                  <span
+                    className="euiLoadingSpinner euiLoadingSpinner--xLarge"
+                  />
+                </EuiLoadingSpinner>
+                <EuiSpacer>
+                  <div
+                    className="euiSpacer euiSpacer--l"
+                  />
+                </EuiSpacer>
+                <EuiTitle
+                  size="l"
+                >
+                  <h2
+                    className="euiTitle euiTitle--large"
+                  >
+                    Loading…
+                  </h2>
+                </EuiTitle>
+              </div>
+            </EuiText>
+          </span>
+        </EuiTextColor>
+      </div>
+    </EuiEmptyPrompt>
+  </EmptyStateLoading>
+</EmptyStateComponent>
+`;
+
 exports[`EmptyState component notifies when index does not exist 1`] = `
 <EmptyStateComponent
   data={
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 32d55519acf27..20113df3010f8 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 d2d46dff3b9f5..ed2537a8ded6d 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 && 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 745b185b57fac..c8e2bece1cb7f 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 e86ba548fb5d9..daba13d8df641 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 496e8d898df3c..2f5ccc2adf313 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 14e91b9db920e..5cdd1772a7f24 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 ff54e61006156..1aef9281a3066 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/hooks/update_kuery_string.ts b/x-pack/legacy/plugins/uptime/public/hooks/update_kuery_string.ts
index 5fcacf8424660..ab4d6f75849e8 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 15e31d5e44629..af9b8bf046416 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 3067a9d16f050..0000000000000
--- 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 f2fff9bc506d0..283382ec1b7ba 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/state/actions/index.ts b/x-pack/legacy/plugins/uptime/public/state/actions/index.ts
index dfcea64bf9c08..b2ab73879a4a7 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 0000000000000..336758a71ce60
--- /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 dba70ed839ac5..e9bf11256b0b8 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 0000000000000..337c4bfb2fa47
--- /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 7d42c6ee46bdc..518091cb36dde 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 0000000000000..9c531b3406a7c
--- /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 d293cdbe451b5..ea389ff0a6745 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 43af88f4cc291..7c45aa142ecfd 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 0000000000000..793a671f5fed8
--- /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 32362afae42bc..4a83b54504ca8 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 dff043f81b95c..bc482e2f35c45 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 0000000000000..50a02210fb5d3
--- /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 8ee70bf51f006..40fe4bddbf172 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 0000000000000..773ec10686943
--- /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 24d34b4d067cc..de446418632b8 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 0a914a14c372b..adba288b8b145 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 6ac42f7717259..9526ed5e73602 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;
 
         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/lib/requests/get_index_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_index_status.ts
index 95aa7eeef88e1..d8a05c08b1417 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 6fd77afe711d4..7f192994bd075 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 69981b7860d59..b0cc38ebfb4b6 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 0000000000000..44799aa19c140
--- /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 b35e2e7b65a29..ff44794bfe7d1 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';

From 70fe3dc8976286678fac4000d0965b4d898d1d24 Mon Sep 17 00:00:00 2001
From: shahzad <shahzad31comp@gmail.com>
Date: Mon, 9 Mar 2020 15:36:10 +0100
Subject: [PATCH 2/3] update snap

---
 .../__snapshots__/empty_state.test.tsx.snap   | 202 ++----------------
 .../functional/empty_state/empty_state.tsx    |   2 +-
 2 files changed, 15 insertions(+), 189 deletions(-)

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 4ee86383a0f60..7cae34e21e85c 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"
@@ -297,174 +293,6 @@ 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`] = `
-<EmptyStateComponent
-  intl={
-    Object {
-      "defaultFormats": Object {},
-      "defaultLocale": "en",
-      "formatDate": [Function],
-      "formatHTMLMessage": [Function],
-      "formatMessage": [Function],
-      "formatNumber": [Function],
-      "formatPlural": [Function],
-      "formatRelative": [Function],
-      "formatTime": [Function],
-      "formats": Object {
-        "date": Object {
-          "full": Object {
-            "day": "numeric",
-            "month": "long",
-            "weekday": "long",
-            "year": "numeric",
-          },
-          "long": Object {
-            "day": "numeric",
-            "month": "long",
-            "year": "numeric",
-          },
-          "medium": Object {
-            "day": "numeric",
-            "month": "short",
-            "year": "numeric",
-          },
-          "short": Object {
-            "day": "numeric",
-            "month": "numeric",
-            "year": "2-digit",
-          },
-        },
-        "number": Object {
-          "currency": Object {
-            "style": "currency",
-          },
-          "percent": Object {
-            "style": "percent",
-          },
-        },
-        "relative": Object {
-          "days": Object {
-            "units": "day",
-          },
-          "hours": Object {
-            "units": "hour",
-          },
-          "minutes": Object {
-            "units": "minute",
-          },
-          "months": Object {
-            "units": "month",
-          },
-          "seconds": Object {
-            "units": "second",
-          },
-          "years": Object {
-            "units": "year",
-          },
-        },
-        "time": Object {
-          "full": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "long": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-            "timeZoneName": "short",
-          },
-          "medium": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-            "second": "numeric",
-          },
-          "short": Object {
-            "hour": "numeric",
-            "minute": "numeric",
-          },
-        },
-      },
-      "formatters": Object {
-        "getDateTimeFormat": [Function],
-        "getMessageFormat": [Function],
-        "getNumberFormat": [Function],
-        "getPluralFormat": [Function],
-        "getRelativeFormat": [Function],
-      },
-      "locale": "en",
-      "messages": Object {},
-      "now": [Function],
-      "onError": [Function],
-      "textComponent": Symbol(react.fragment),
-      "timeZone": null,
-    }
-  }
-  loading={false}
->
-  <EmptyStateLoading>
-    <EuiEmptyPrompt
-      body={
-        <React.Fragment>
-          <EuiLoadingSpinner
-            size="xl"
-          />
-          <EuiSpacer />
-          <EuiTitle
-            size="l"
-          >
-            <h2>
-              Loading…
-            </h2>
-          </EuiTitle>
-        </React.Fragment>
-      }
-    >
-      <div
-        className="euiEmptyPrompt"
-      >
-        <EuiTextColor
-          color="subdued"
-        >
-          <span
-            className="euiTextColor euiTextColor--subdued"
-          >
-            <EuiText>
-              <div
-                className="euiText euiText--medium"
-              >
-                <EuiLoadingSpinner
-                  size="xl"
-                >
-                  <span
-                    className="euiLoadingSpinner euiLoadingSpinner--xLarge"
-                  />
-                </EuiLoadingSpinner>
-                <EuiSpacer>
-                  <div
-                    className="euiSpacer euiSpacer--l"
-                  />
-                </EuiSpacer>
-                <EuiTitle
-                  size="l"
-                >
-                  <h2
-                    className="euiTitle euiTitle--large"
-                  >
-                    Loading…
-                  </h2>
-                </EuiTitle>
-              </div>
-            </EuiText>
-          </span>
-        </EuiTextColor>
-      </div>
-    </EuiEmptyPrompt>
-  </EmptyStateLoading>
-</EmptyStateComponent>
-`;
-
 exports[`EmptyState component doesn't render child components when count is falsy 1`] = `
 <EmptyStateComponent
   intl={
@@ -636,16 +464,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 {},
@@ -749,6 +567,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"
@@ -1065,6 +889,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
     }
   }
   loading={false}
+  statesIndexStatus={null}
 >
   <EmptyStateError
     errors={
@@ -1309,6 +1134,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/empty_state.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/empty_state/empty_state.tsx
index ed2537a8ded6d..80afc2894ea44 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
@@ -37,7 +37,7 @@ export const EmptyStateComponent = ({
           })}
         />
       );
-    } else if (indexExists && docCount && docCount === 0) {
+    } else if (indexExists && docCount === 0) {
       return (
         <DataMissing
           headingMessage={i18n.translate('xpack.uptime.emptyState.noDataMessage', {

From 873050cbfce4a001eec73abba5390b127704b46a Mon Sep 17 00:00:00 2001
From: shahzad <shahzad31comp@gmail.com>
Date: Mon, 9 Mar 2020 17:29:26 +0100
Subject: [PATCH 3/3] fix api

---
 .../plugins/uptime/common/constants/index.ts  |  1 +
 .../monitor_list_drawer/__tests__/data.json   |  2 +-
 .../public/queries/monitor_states_query.ts    |  4 +-
 .../graphql/monitor_states/resolvers.ts       |  2 +-
 .../graphql/monitor_states/schema.gql.ts      | 13 +-----
 .../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 +
 33 files changed, 281 insertions(+), 766 deletions(-)
 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 9d5ad4607491c..0425fc19a7b45 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/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 a45e974685b9c..e8142f0480c4a 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/queries/monitor_states_query.ts b/x-pack/legacy/plugins/uptime/public/queries/monitor_states_query.ts
index 76f62ad453bd9..9e609786094d5 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/plugins/uptime/server/graphql/monitor_states/resolvers.ts b/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
index 9526ed5e73602..1560b78b3c050 100644
--- a/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
+++ b/x-pack/plugins/uptime/server/graphql/monitor_states/resolvers.ts
@@ -55,7 +55,7 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           }),
         ]);
 
-        const totalSummaryCount = indexStatus?.docCount;
+        const totalSummaryCount = indexStatus?.docCount ?? 0;
 
         return {
           summaries,
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 198f97eab9652..d088aed951204 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/test/api_integration/apis/uptime/feature_controls.ts b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
index adbfacb014e9f..15666acab2335 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 1aa69faaab736..0000000000000
--- 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 4daf223a79a69..0000000000000
--- 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 59f5f95e7d840..05724f0716e8d 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 9a1363f00578a..6e62787069f40 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 59f5f95e7d840..05724f0716e8d 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 5c07b4daaf543..6cbe4ee3659a8 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 71184093f4318..9a3f781735cb7 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 3b15ea3c24eeb..4f4af9c2c6012 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 eb6512d2f75b3..fe48ad49d13ba 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 aee4fa6946fc0..70ca665704a79 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 03164f794a4d5..3f09c951ec2fa 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 488fdab14f1e2..cdc0f32c9765e 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 79ce05d86f533..9f6d004380c16 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 ef62cdd86c2a9..dedddb2a78ade 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 34e8269cb95d9..fabcf70404952 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 d733467c3f9b6..943cc68249dc1 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 12e27106bd533..564f58f59f373 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 d0f2b820f8327..cb94273e91fd8 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 cf0c8641cc87b..7aac62bba84f7 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 2801e94e034c7..08cbd0d878b44 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 7fcbd4dd59659..8de639b705ee9 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 0adb7ad0b0dba..c38f5c801a267 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 a796be38bd0d9..5c2ec8512e320 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 c2fdc57edede3..ee22974d47170 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 0000000000000..1f5322f581b39
--- /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 0000000000000..41b9af392dded
--- /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 5e26cb9216f45..67b94f19c638f 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'));
     });
   });
 }