diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
index b146f2467c46c..0e32f1f053b9d 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.test.tsx
@@ -16,6 +16,7 @@ import {
 } from '../mocks';
 import { act } from 'react-dom/test-utils';
 import { ReactExpressionRendererType } from '../../../../../../../src/plugins/expressions/public';
+import { esFilters, IFieldType, IIndexPattern } from '../../../../../../../src/plugins/data/public';
 import { SuggestionPanel, SuggestionPanelProps } from './suggestion_panel';
 import { getSuggestions, Suggestion } from './suggestion_helpers';
 import { EuiIcon, EuiPanel, EuiToolTip } from '@elastic/eui';
@@ -243,14 +244,25 @@ describe('suggestion_panel', () => {
     (mockVisualization.toPreviewExpression as jest.Mock).mockReturnValueOnce('test | expression');
     mockDatasource.toExpression.mockReturnValue('datasource_expression');
 
-    mount(<SuggestionPanel {...defaultProps} />);
+    const indexPattern = ({ id: 'index1' } as unknown) as IIndexPattern;
+    const field = ({ name: 'myfield' } as unknown) as IFieldType;
+
+    mount(
+      <SuggestionPanel
+        {...defaultProps}
+        frame={{
+          ...createMockFramePublicAPI(),
+          filters: [esFilters.buildExistsFilter(field, indexPattern)],
+        }}
+      />
+    );
 
     expect(expressionRendererMock).toHaveBeenCalledTimes(1);
     const passedExpression = (expressionRendererMock as jest.Mock).mock.calls[0][0].expression;
 
     expect(passedExpression).toMatchInlineSnapshot(`
       "kibana
-      | kibana_context timeRange=\\"{\\\\\\"from\\\\\\":\\\\\\"now-7d\\\\\\",\\\\\\"to\\\\\\":\\\\\\"now\\\\\\"}\\" query=\\"{\\\\\\"query\\\\\\":\\\\\\"\\\\\\",\\\\\\"language\\\\\\":\\\\\\"lucene\\\\\\"}\\" filters=\\"[]\\"
+      | kibana_context timeRange=\\"{\\\\\\"from\\\\\\":\\\\\\"now-7d\\\\\\",\\\\\\"to\\\\\\":\\\\\\"now\\\\\\"}\\" query=\\"{\\\\\\"query\\\\\\":\\\\\\"\\\\\\",\\\\\\"language\\\\\\":\\\\\\"lucene\\\\\\"}\\" filters=\\"[{\\\\\\"meta\\\\\\":{\\\\\\"index\\\\\\":\\\\\\"index1\\\\\\"},\\\\\\"exists\\\\\\":{\\\\\\"field\\\\\\":\\\\\\"myfield\\\\\\"}}]\\"
       | lens_merge_tables layerIds=\\"first\\" tables={datasource_expression}
       | test
       | expression"
diff --git a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
index 93f6ea6ea67ac..76443027ab88a 100644
--- a/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
+++ b/x-pack/legacy/plugins/lens/public/editor_frame_service/editor_frame/suggestion_panel.tsx
@@ -235,6 +235,7 @@ export function SuggestionPanel({
 
   const expressionContext = {
     query: frame.query,
+    filters: frame.filters,
     timeRange: {
       from: frame.dateRange.fromDate,
       to: frame.dateRange.toDate,
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
index c8beb91d807d5..506966ec6b5c9 100644
--- a/x-pack/legacy/plugins/uptime/common/graphql/types.ts
+++ b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
@@ -15,294 +15,15 @@ export type UnsignedInteger = any;
 // ====================================================
 
 export interface Query {
-  /** Get a list of all recorded pings for all monitors */
-  allPings: PingResults;
-
   /** Fetches the current state of Uptime monitors for the given parameters. */
   getMonitorStates?: MonitorSummaryResult | null;
 }
 
-export interface PingResults {
-  /** Total number of matching pings */
-  total: UnsignedInteger;
-  /** Unique list of all locations the query matched */
-  locations: string[];
-  /** List of pings */
-  pings: Ping[];
-}
-/** A request sent from a monitor to a host */
-export interface Ping {
-  /** unique ID for this ping */
-  id: string;
-  /** The timestamp of the ping's creation */
-  timestamp: string;
-  /** The agent that recorded the ping */
-  beat?: Beat | null;
-
-  container?: Container | null;
-
-  docker?: Docker | null;
-
-  ecs?: Ecs | null;
-
-  error?: Error | null;
-
-  host?: Host | null;
-
-  http?: Http | null;
-
-  icmp?: Icmp | null;
-
-  kubernetes?: Kubernetes | null;
-
-  meta?: Meta | null;
-
-  monitor?: Monitor | null;
-
-  observer?: Observer | null;
-
-  resolve?: Resolve | null;
-
-  socks5?: Socks5 | null;
-
-  summary?: Summary | null;
-
-  tags?: string | null;
-
-  tcp?: Tcp | null;
-
-  tls?: PingTls | null;
-
-  url?: Url | null;
-}
-/** An agent for recording a beat */
-export interface Beat {
-  hostname?: string | null;
-
-  name?: string | null;
-
-  timezone?: string | null;
-
-  type?: string | null;
-}
-
-export interface Container {
-  id?: string | null;
-
-  image?: ContainerImage | null;
-
-  name?: string | null;
-
-  runtime?: string | null;
-}
-
-export interface ContainerImage {
-  name?: string | null;
-
-  tag?: string | null;
-}
-
-export interface Docker {
-  id?: string | null;
-
-  image?: string | null;
-
-  name?: string | null;
-}
-
-export interface Ecs {
-  version?: string | null;
-}
-
-export interface Error {
-  code?: number | null;
-
-  message?: string | null;
-
-  type?: string | null;
-}
-
-export interface Host {
-  architecture?: string | null;
-
-  id?: string | null;
-
-  hostname?: string | null;
-
-  ip?: string | null;
-
-  mac?: string | null;
-
-  name?: string | null;
-
-  os?: Os | null;
-}
-
-export interface Os {
-  family?: string | null;
-
-  kernel?: string | null;
-
-  platform?: string | null;
-
-  version?: string | null;
-
-  name?: string | null;
-
-  build?: string | null;
-}
-
-export interface Http {
-  response?: HttpResponse | null;
-
-  rtt?: HttpRtt | null;
-
-  url?: string | null;
-}
-
-export interface HttpResponse {
-  status_code?: UnsignedInteger | null;
-
-  body?: HttpBody | null;
-}
-
-export interface HttpBody {
-  /** Size of HTTP response body in bytes */
-  bytes?: UnsignedInteger | null;
-  /** Hash of the HTTP response body */
-  hash?: string | null;
-  /** Response body of the HTTP Response. May be truncated based on client settings. */
-  content?: string | null;
-  /** Byte length of the content string, taking into account multibyte chars. */
-  content_bytes?: UnsignedInteger | null;
-}
-
-export interface HttpRtt {
-  content?: Duration | null;
-
-  response_header?: Duration | null;
-
-  total?: Duration | null;
-
-  validate?: Duration | null;
-
-  validate_body?: Duration | null;
-
-  write_request?: Duration | null;
-}
 /** The monitor's status for a ping */
 export interface Duration {
   us?: UnsignedInteger | null;
 }
 
-export interface Icmp {
-  requests?: number | null;
-
-  rtt?: number | null;
-}
-
-export interface Kubernetes {
-  container?: KubernetesContainer | null;
-
-  namespace?: string | null;
-
-  node?: KubernetesNode | null;
-
-  pod?: KubernetesPod | null;
-}
-
-export interface KubernetesContainer {
-  image?: string | null;
-
-  name?: string | null;
-}
-
-export interface KubernetesNode {
-  name?: string | null;
-}
-
-export interface KubernetesPod {
-  name?: string | null;
-
-  uid?: string | null;
-}
-
-export interface Meta {
-  cloud?: MetaCloud | null;
-}
-
-export interface MetaCloud {
-  availability_zone?: string | null;
-
-  instance_id?: string | null;
-
-  instance_name?: string | null;
-
-  machine_type?: string | null;
-
-  project_id?: string | null;
-
-  provider?: string | null;
-
-  region?: string | null;
-}
-
-export interface Monitor {
-  duration?: Duration | null;
-
-  host?: string | null;
-  /** The id of the monitor */
-  id?: string | null;
-  /** The IP pinged by the monitor */
-  ip?: string | null;
-  /** The name of the protocol being monitored */
-  name?: string | null;
-  /** The protocol scheme of the monitored host */
-  scheme?: string | null;
-  /** The status of the monitored host */
-  status?: string | null;
-  /** The type of host being monitored */
-  type?: string | null;
-
-  check_group?: string | null;
-}
-/** Metadata added by a proccessor, which is specified in its configuration. */
-export interface Observer {
-  /** Geolocation data for the agent. */
-  geo?: Geo | null;
-}
-/** Geolocation data added via processors to enrich events. */
-export interface Geo {
-  /** Name of the city in which the agent is running. */
-  city_name?: string | null;
-  /** The name of the continent on which the agent is running. */
-  continent_name?: string | null;
-  /** ISO designation for the agent's country. */
-  country_iso_code?: string | null;
-  /** The name of the agent's country. */
-  country_name?: string | null;
-  /** The lat/long of the agent. */
-  location?: string | null;
-  /** A name for the host's location, e.g. 'us-east-1' or 'LAX'. */
-  name?: string | null;
-  /** ISO designation of the agent's region. */
-  region_iso_code?: string | null;
-  /** Name of the region hosting the agent. */
-  region_name?: string | null;
-}
-
-export interface Resolve {
-  host?: string | null;
-
-  ip?: string | null;
-
-  rtt?: Duration | null;
-}
-
-export interface Socks5 {
-  rtt?: Rtt | null;
-}
-
 export interface Rtt {
   connect?: Duration | null;
 
@@ -331,53 +52,10 @@ export interface Location {
   lon?: number | null;
 }
 
-export interface Tcp {
-  port?: number | null;
-
-  rtt?: Rtt | null;
-}
-/** Contains monitor transmission encryption information. */
-export interface PingTls {
-  /** The date and time after which the certificate is invalid. */
-  certificate_not_valid_after?: string | null;
-
-  certificate_not_valid_before?: string | null;
-
-  certificates?: string | null;
-
-  rtt?: Rtt | null;
-}
-
-export interface Url {
-  full?: string | null;
-
-  scheme?: string | null;
-
-  domain?: string | null;
-
-  port?: number | null;
-
-  path?: string | null;
-
-  query?: string | null;
-}
-
 export interface DocCount {
   count: UnsignedInteger;
 }
 
-export interface Snapshot {
-  counts: SnapshotCount;
-}
-
-export interface SnapshotCount {
-  up: number;
-
-  down: number;
-
-  total: number;
-}
-
 /** The primary object returned for monitor states. */
 export interface MonitorSummaryResult {
   /** Used to go to the next page of results */
@@ -521,24 +199,6 @@ export interface SummaryHistogramPoint {
   down: number;
 }
 
-export interface AllPingsQueryArgs {
-  /** Optional: the direction to sort by. Accepts 'asc' and 'desc'. Defaults to 'desc'. */
-  sort?: string | null;
-  /** Optional: the number of results to return. */
-  size?: number | null;
-  /** Optional: the monitor ID filter. */
-  monitorId?: string | null;
-  /** Optional: the check status to filter by. */
-  status?: string | null;
-  /** The lower limit of the date range. */
-  dateRangeStart: string;
-  /** The upper limit of the date range. */
-  dateRangeEnd: string;
-  /** Optional: agent location to filter by. */
-  location?: string | null;
-  page?: number;
-}
-
 export interface GetMonitorStatesQueryArgs {
   dateRangeStart: string;
 
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 37101b5b46fd2..9018f4acaa320 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/common.ts
@@ -27,7 +27,13 @@ export const StatesIndexStatusType = t.type({
   docCount: t.number,
 });
 
+export const DateRangeType = t.type({
+  from: t.string,
+  to: t.string,
+});
+
 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>;
+export type DateRange = t.TypeOf<typeof DateRangeType>;
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
index 5e3fb2326bdb9..652d60cbe304d 100644
--- a/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/index.ts
@@ -8,5 +8,6 @@ export * from './alerts';
 export * from './common';
 export * from './monitor';
 export * from './overview_filters';
+export * from './ping';
 export * from './snapshot';
 export * from './dynamic_settings';
diff --git a/x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/ping/histogram.ts
similarity index 77%
rename from x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts
rename to x-pack/legacy/plugins/uptime/common/runtime_types/ping/histogram.ts
index 3ae32e15ca55c..2c3b52051be0f 100644
--- a/x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/ping/histogram.ts
@@ -28,3 +28,15 @@ export interface HistogramResult {
   histogram: HistogramDataPoint[];
   interval: string;
 }
+
+export interface HistogramQueryResult {
+  key: number;
+  key_as_string: string;
+  doc_count: number;
+  down: {
+    doc_count: number;
+  };
+  up: {
+    doc_count: number;
+  };
+}
diff --git a/x-pack/legacy/plugins/uptime/public/queries/index.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/ping/index.ts
similarity index 79%
rename from x-pack/legacy/plugins/uptime/public/queries/index.ts
rename to x-pack/legacy/plugins/uptime/common/runtime_types/ping/index.ts
index 283382ec1b7ba..a2fc7c1b243ba 100644
--- a/x-pack/legacy/plugins/uptime/public/queries/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/ping/index.ts
@@ -4,4 +4,5 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { pingsQuery, pingsQueryString } from './pings_query';
+export * from './histogram';
+export * from './ping';
diff --git a/x-pack/legacy/plugins/uptime/common/runtime_types/ping/ping.ts b/x-pack/legacy/plugins/uptime/common/runtime_types/ping/ping.ts
new file mode 100644
index 0000000000000..ee14b298f3810
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/common/runtime_types/ping/ping.ts
@@ -0,0 +1,181 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import * as t from 'io-ts';
+import { DateRangeType } from '../common';
+
+export const HttpResponseBodyType = t.partial({
+  bytes: t.number,
+  content: t.string,
+  content_bytes: t.number,
+  hash: t.string,
+});
+
+export type HttpResponseBody = t.TypeOf<typeof HttpResponseBodyType>;
+
+export const TlsType = t.partial({
+  certificate_not_valid_after: t.string,
+  certificate_not_valid_before: t.string,
+});
+
+export type Tls = t.TypeOf<typeof TlsType>;
+
+export const MonitorType = t.intersection([
+  t.type({
+    duration: t.type({
+      us: t.number,
+    }),
+    id: t.string,
+    status: t.string,
+    type: t.string,
+  }),
+  t.partial({
+    check_group: t.string,
+    ip: t.string,
+    name: t.string,
+    timespan: t.partial({
+      gte: t.string,
+      lte: t.string,
+    }),
+  }),
+]);
+
+export type Monitor = t.TypeOf<typeof MonitorType>;
+
+export const PingType = t.intersection([
+  t.type({
+    timestamp: t.string,
+    monitor: MonitorType,
+    docId: t.string,
+  }),
+  t.partial({
+    agent: t.intersection([
+      t.type({
+        ephemeral_id: t.string,
+        hostname: t.string,
+        id: t.string,
+        type: t.string,
+        version: t.string,
+      }),
+      t.partial({
+        name: t.string,
+      }),
+    ]),
+    container: t.partial({
+      id: t.string,
+      image: t.partial({
+        name: t.string,
+        tag: t.string,
+      }),
+      name: t.string,
+      runtime: t.string,
+    }),
+    ecs: t.partial({
+      version: t.string,
+    }),
+    error: t.intersection([
+      t.partial({
+        code: t.string,
+        id: t.string,
+        stack_trace: t.string,
+        type: t.string,
+      }),
+      t.type({
+        // this is _always_ on the error field
+        message: t.string,
+      }),
+    ]),
+    http: t.partial({
+      request: t.partial({
+        body: t.partial({
+          bytes: t.number,
+          content: t.partial({
+            text: t.string,
+          }),
+        }),
+        bytes: t.number,
+        method: t.string,
+        referrer: t.string,
+      }),
+      response: t.partial({
+        body: HttpResponseBodyType,
+        bytes: t.number,
+        redirects: t.string,
+        status_code: t.number,
+      }),
+      version: t.string,
+    }),
+    icmp: t.partial({
+      requests: t.number,
+      rtt: t.partial({
+        us: t.number,
+      }),
+    }),
+    kubernetes: t.partial({
+      pod: t.partial({
+        name: t.string,
+        uid: t.string,
+      }),
+    }),
+    observer: t.partial({
+      geo: t.partial({
+        name: t.string,
+      }),
+    }),
+    resolve: t.partial({
+      ip: t.string,
+      rtt: t.partial({
+        us: t.number,
+      }),
+    }),
+    summary: t.partial({
+      down: t.number,
+      up: t.number,
+    }),
+    tags: t.array(t.string),
+    tcp: t.partial({
+      rtt: t.partial({
+        connect: t.partial({
+          us: t.number,
+        }),
+      }),
+    }),
+    tls: TlsType,
+    // should this be partial?
+    url: t.partial({
+      domain: t.string,
+      full: t.string,
+      port: t.number,
+      scheme: t.string,
+    }),
+  }),
+]);
+
+export type Ping = t.TypeOf<typeof PingType>;
+
+export const PingsResponseType = t.type({
+  total: t.number,
+  locations: t.array(t.string),
+  pings: t.array(PingType),
+});
+
+export type PingsResponse = t.TypeOf<typeof PingsResponseType>;
+
+export const GetPingsParamsType = t.intersection([
+  t.type({
+    dateRange: DateRangeType,
+  }),
+  t.partial({
+    index: t.number,
+    size: t.number,
+    location: t.string,
+    monitorId: t.string,
+    sort: t.string,
+    status: t.string,
+  }),
+]);
+
+export type GetPingsParams = t.TypeOf<typeof GetPingsParamsType>;
diff --git a/x-pack/legacy/plugins/uptime/common/types/index.ts b/x-pack/legacy/plugins/uptime/common/types/index.ts
index 2c39f2a3b7314..1d0003addd761 100644
--- a/x-pack/legacy/plugins/uptime/common/types/index.ts
+++ b/x-pack/legacy/plugins/uptime/common/types/index.ts
@@ -41,5 +41,3 @@ export interface MonitorDurationResult {
   /** The maximum duration value in this chart. */
   durationMaxValue: number;
 }
-
-export * from './ping/histogram';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx
index 6428ddfd10f8c..cf35dbf4e5206 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/charts/ping_histogram.tsx
@@ -14,7 +14,7 @@ import {
 import { getPingHistogram } from '../../../state/actions';
 import { selectPingHistogram } from '../../../state/selectors';
 import { withResponsiveWrapper, ResponsiveWrapperProps } from '../../higher_order';
-import { GetPingHistogramParams, HistogramResult } from '../../../../common/types';
+import { GetPingHistogramParams, HistogramResult } from '../../../../common/runtime_types';
 import { useGetUrlParams } from '../../../hooks';
 
 type Props = ResponsiveWrapperProps &
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 7e442cbe850ba..be3cc5b65aa0e 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/index.ts
@@ -13,5 +13,6 @@ export { MonitorStatusDetails } from './monitor/status_details_container';
 export { MonitorStatusBar } from './monitor/status_bar_container';
 export { MonitorListDrawer } from './monitor/list_drawer_container';
 export { MonitorListActionsPopover } from './monitor/drawer_popover_container';
+export { PingList, PingListProps } from './pings';
 export { DurationChart } from './charts/monitor_duration';
 export { EmptyState } from './empty_state/empty_state';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
index 00cfd02d8dc32..3a96aa7c0275b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/monitor/status_bar_container.tsx
@@ -12,7 +12,7 @@ import { monitorLocationsSelector, monitorStatusSelector } from '../../../state/
 import { MonitorStatusBarComponent } from '../../functional/monitor_status_details/monitor_status_bar';
 import { getMonitorStatusAction } from '../../../state/actions';
 import { useGetUrlParams } from '../../../hooks';
-import { Ping } from '../../../../common/graphql/types';
+import { Ping } from '../../../../common/runtime_types';
 import { MonitorLocations } from '../../../../common/runtime_types/monitor';
 import { UptimeRefreshContext } from '../../../contexts';
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/pings/index.ts b/x-pack/legacy/plugins/uptime/public/components/connected/pings/index.ts
new file mode 100644
index 0000000000000..95ced104e5188
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/pings/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { PingList, PingListProps } from './ping_list';
diff --git a/x-pack/legacy/plugins/uptime/public/components/connected/pings/ping_list.tsx b/x-pack/legacy/plugins/uptime/public/components/connected/pings/ping_list.tsx
new file mode 100644
index 0000000000000..5b32a623495f1
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/components/connected/pings/ping_list.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { useSelector, useDispatch } from 'react-redux';
+import React, { useContext, useCallback } from 'react';
+import { selectPingList } from '../../../state/selectors';
+import { getPings } from '../../../state/actions';
+import { GetPingsParams } from '../../../../common/runtime_types';
+import { UptimeSettingsContext } from '../../../contexts';
+import { PingListComponent } from '../../functional';
+
+export interface PingListProps {
+  monitorId: string;
+}
+
+export const PingList = (props: PingListProps) => {
+  const {
+    lastRefresh,
+    pings: {
+      error,
+      loading,
+      pingList: { locations, pings, total },
+    },
+  } = useSelector(selectPingList);
+
+  const { dateRangeStart: drs, dateRangeEnd: dre } = useContext(UptimeSettingsContext);
+
+  const dispatch = useDispatch();
+  const getPingsCallback = useCallback((params: GetPingsParams) => dispatch(getPings(params)), [
+    dispatch,
+  ]);
+
+  return (
+    <PingListComponent
+      dateRange={{
+        from: drs,
+        to: dre,
+      }}
+      error={error}
+      getPings={getPingsCallback}
+      lastRefresh={lastRefresh}
+      loading={loading}
+      locations={locations}
+      pings={pings}
+      total={total}
+      {...props}
+    />
+  );
+};
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx
index f988afc7fc84d..66e86d6731236 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/charts/ping_histogram.tsx
@@ -13,7 +13,7 @@ import moment from 'moment';
 import { getChartDateLabel } from '../../../lib/helper';
 import { ChartWrapper } from './chart_wrapper';
 import { UptimeThemeContext } from '../../../contexts';
-import { HistogramResult } from '../../../../common/types';
+import { HistogramResult } from '../../../../common/runtime_types';
 import { useUrlParams } from '../../../hooks';
 import { ChartEmptyState } from './chart_empty_state';
 
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 8d0352e01d40e..d82912a6216e8 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/index.ts
@@ -15,6 +15,6 @@ export { KueryBarComponent } from './kuery_bar/kuery_bar';
 export { MonitorCharts } from './monitor_charts';
 export { MonitorList } from './monitor_list';
 export { OverviewPageParsingErrorCallout } from './overview_page_parsing_error_callout';
-export { PingList } from './ping_list';
+export { PingListComponent } from './ping_list';
 export { PingHistogramComponent } from './charts';
 export { StatusPanel } from './status_panel';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx
index 2eae14301fd4d..57ed09cc30ef1 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_ssl_certificate.test.tsx
@@ -9,11 +9,11 @@ import moment from 'moment';
 import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { EuiBadge } from '@elastic/eui';
 import { renderWithIntl } from 'test_utils/enzyme_helpers';
-import { PingTls } from '../../../../../common/graphql/types';
+import { Tls } from '../../../../../common/runtime_types';
 import { MonitorSSLCertificate } from '../monitor_status_bar';
 
 describe('MonitorStatusBar component', () => {
-  let monitorTls: PingTls;
+  let monitorTls: Tls;
 
   beforeEach(() => {
     const dateInTwoMonths = moment()
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_status.bar.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_status.bar.test.tsx
index 0a53eeb89d793..5fd32c808da42 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_status.bar.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/__test__/monitor_status.bar.test.tsx
@@ -8,7 +8,7 @@ import moment from 'moment';
 import React from 'react';
 import { renderWithIntl } from 'test_utils/enzyme_helpers';
 import { MonitorStatusBarComponent } from '../monitor_status_bar';
-import { Ping } from '../../../../../common/graphql/types';
+import { Ping } from '../../../../../common/runtime_types';
 
 describe('MonitorStatusBar component', () => {
   let monitorStatus: Ping;
@@ -16,7 +16,7 @@ describe('MonitorStatusBar component', () => {
 
   beforeEach(() => {
     monitorStatus = {
-      id: 'id1',
+      docId: 'few213kl',
       timestamp: moment(new Date())
         .subtract(15, 'm')
         .toString(),
@@ -24,7 +24,9 @@ describe('MonitorStatusBar component', () => {
         duration: {
           us: 1234567,
         },
+        id: 'id1',
         status: 'up',
+        type: 'http',
       },
       url: {
         full: 'https://www.example.com/',
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx
index c57348c4ab4cd..d92534aecd175 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_ssl_certificate.tsx
@@ -9,14 +9,13 @@ import moment from 'moment';
 import { EuiSpacer, EuiText, EuiBadge } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-
-import { PingTls } from '../../../../../common/graphql/types';
+import { Tls } from '../../../../../common/runtime_types';
 
 interface Props {
   /**
    * TLS information coming from monitor in ES heartbeat index
    */
-  tls: PingTls | null | undefined;
+  tls: Tls | null | undefined;
 }
 
 export const MonitorSSLCertificate = ({ tls }: Props) => {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx
index 22e4377944be1..ac3cedc517995 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/monitor_status_details/monitor_status_bar/monitor_status_bar.tsx
@@ -17,7 +17,7 @@ import {
 import { MonitorSSLCertificate } from './monitor_ssl_certificate';
 import * as labels from './translations';
 import { StatusByLocations } from './status_by_location';
-import { Ping } from '../../../../../common/graphql/types';
+import { Ping } from '../../../../../common/runtime_types';
 import { MonitorLocations } from '../../../../../common/runtime_types';
 
 interface MonitorStatusBarProps {
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
index 2e59ec5e57337..154ab6399452d 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/__snapshots__/ping_list.test.tsx.snap
@@ -1,384 +1,349 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`PingList component renders sorted list without errors 1`] = `
-<Fragment>
-  <EuiPanel>
-    <EuiTitle
-      size="xs"
+<EuiPanel>
+  <EuiTitle
+    size="xs"
+  >
+    <h4>
+      <FormattedMessage
+        defaultMessage="History"
+        id="xpack.uptime.pingList.checkHistoryTitle"
+        values={Object {}}
+      />
+    </h4>
+  </EuiTitle>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiFlexGroup
+    justifyContent="spaceBetween"
+  >
+    <EuiFlexItem
+      grow={false}
     >
-      <h4>
-        <FormattedMessage
-          defaultMessage="History"
-          id="xpack.uptime.pingList.checkHistoryTitle"
-          values={Object {}}
+      <EuiFormRow
+        aria-label="Status"
+        describedByIds={Array []}
+        display="row"
+        fullWidth={false}
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label="Status"
+        labelType="label"
+      >
+        <EuiSelect
+          aria-label="Status"
+          data-test-subj="xpack.uptime.pingList.statusSelect"
+          onChange={[Function]}
+          options={
+            Array [
+              Object {
+                "data-test-subj": "xpack.uptime.pingList.statusOptions.all",
+                "text": "All",
+                "value": "",
+              },
+              Object {
+                "data-test-subj": "xpack.uptime.pingList.statusOptions.up",
+                "text": "Up",
+                "value": "up",
+              },
+              Object {
+                "data-test-subj": "xpack.uptime.pingList.statusOptions.down",
+                "text": "Down",
+                "value": "down",
+              },
+            ]
+          }
+          value=""
         />
-      </h4>
-    </EuiTitle>
-    <EuiSpacer
-      size="s"
-    />
-    <EuiFlexGroup
-      justifyContent="spaceBetween"
-    >
-      <EuiFlexItem
-        grow={false}
+      </EuiFormRow>
+    </EuiFlexItem>
+    <EuiFlexItem>
+      <EuiFormRow
+        aria-label="Location"
+        describedByIds={Array []}
+        display="row"
+        fullWidth={false}
+        hasChildLabel={true}
+        hasEmptyLabelSpace={false}
+        label="Location"
+        labelType="label"
       >
-        <EuiFlexGroup>
-          <EuiFlexItem
-            style={
+        <EuiSelect
+          aria-label="Location"
+          data-test-subj="xpack.uptime.pingList.locationSelect"
+          onChange={[Function]}
+          options={
+            Array [
               Object {
-                "minWidth": 200,
-              }
-            }
-          >
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <EuiFormRow
-                  aria-label="Status"
-                  describedByIds={Array []}
-                  display="row"
-                  fullWidth={false}
-                  hasChildLabel={true}
-                  hasEmptyLabelSpace={false}
-                  label="Status"
-                  labelType="label"
-                >
-                  <EuiSelect
-                    aria-label="Status"
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "All",
-                          "value": "",
-                        },
-                        Object {
-                          "text": "Up",
-                          "value": "up",
-                        },
-                        Object {
-                          "text": "Down",
-                          "value": "down",
-                        },
-                      ]
-                    }
-                    value="down"
-                  />
-                </EuiFormRow>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiFormRow
-                  aria-label="Location"
-                  describedByIds={Array []}
-                  display="row"
-                  fullWidth={false}
-                  hasChildLabel={true}
-                  hasEmptyLabelSpace={false}
-                  label="Location"
-                  labelType="label"
-                >
-                  <EuiSelect
-                    aria-label="Location"
-                    onChange={[Function]}
-                    options={
-                      Array [
-                        Object {
-                          "text": "All",
-                          "value": "",
-                        },
-                        Object {
-                          "text": "nyc",
-                          "value": "nyc",
-                        },
-                      ]
-                    }
-                    value=""
-                  />
-                </EuiFormRow>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-    <EuiSpacer
-      size="s"
-    />
-    <EuiBasicTable
-      columns={
-        Array [
-          Object {
-            "field": "monitor.status",
-            "name": "Status",
-            "render": [Function],
-          },
-          Object {
-            "align": "left",
-            "field": "observer.geo.name",
-            "name": "Location",
-            "render": [Function],
+                "data-test-subj": "xpack.uptime.pingList.locationOptions.all",
+                "text": "All",
+                "value": "",
+              },
+            ]
+          }
+          value=""
+        />
+      </EuiFormRow>
+    </EuiFlexItem>
+  </EuiFlexGroup>
+  <EuiSpacer
+    size="s"
+  />
+  <EuiBasicTable
+    columns={
+      Array [
+        Object {
+          "field": "monitor.status",
+          "name": "Status",
+          "render": [Function],
+        },
+        Object {
+          "align": "left",
+          "field": "observer.geo.name",
+          "name": "Location",
+          "render": [Function],
+        },
+        Object {
+          "align": "right",
+          "dataType": "number",
+          "field": "monitor.ip",
+          "name": "IP",
+        },
+        Object {
+          "align": "right",
+          "field": "monitor.duration.us",
+          "name": "Duration",
+          "render": [Function],
+        },
+        Object {
+          "align": "right",
+          "field": "error.type",
+          "name": "Error type",
+          "render": [Function],
+        },
+        Object {
+          "align": "right",
+          "field": "http.response.status_code",
+          "name": <ForwardRef(styled.span)>
+            Response code
+          </ForwardRef(styled.span)>,
+          "render": [Function],
+        },
+        Object {
+          "align": "right",
+          "isExpander": true,
+          "render": [Function],
+          "width": "24px",
+        },
+      ]
+    }
+    hasActions={true}
+    isExpandable={true}
+    itemId="docId"
+    itemIdToExpandedRowMap={Object {}}
+    items={
+      Array [
+        Object {
+          "docId": "fewjio21",
+          "error": Object {
+            "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+            "type": "io",
           },
-          Object {
-            "align": "right",
-            "dataType": "number",
-            "field": "monitor.ip",
-            "name": "IP",
+          "monitor": Object {
+            "duration": Object {
+              "us": 1430,
+            },
+            "id": "auto-tcp-0X81440A68E839814F",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "tcp",
           },
-          Object {
-            "align": "right",
-            "field": "monitor.duration.us",
-            "name": "Duration",
-            "render": [Function],
+          "timestamp": "2019-01-28T17:47:08.078Z",
+        },
+        Object {
+          "docId": "fewjoo21",
+          "error": Object {
+            "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+            "type": "io",
           },
-          Object {
-            "align": "right",
-            "field": "error.type",
-            "name": "Error type",
-            "render": [Function],
+          "monitor": Object {
+            "duration": Object {
+              "us": 1370,
+            },
+            "id": "auto-tcp-0X81440A68E839814D",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "tcp",
           },
-          Object {
-            "align": "right",
-            "field": "http.response.status_code",
-            "name": <ForwardRef(styled.span)>
-              Response code
-            </ForwardRef(styled.span)>,
-            "render": [Function],
+          "timestamp": "2019-01-28T17:47:09.075Z",
+        },
+        Object {
+          "docId": "fejjio21",
+          "monitor": Object {
+            "duration": Object {
+              "us": 1452,
+            },
+            "id": "auto-tcp-0X81440A68E839814D",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "up",
+            "type": "tcp",
           },
-          Object {
-            "align": "right",
-            "isExpander": true,
-            "render": [Function],
-            "width": "24px",
+          "timestamp": "2019-01-28T17:47:06.077Z",
+        },
+        Object {
+          "docId": "fewzio21",
+          "error": Object {
+            "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+            "type": "io",
           },
-        ]
-      }
-      hasActions={true}
-      isExpandable={true}
-      itemId="id"
-      itemIdToExpandedRowMap={Object {}}
-      items={
-        Array [
-          Object {
-            "error": Object {
-              "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
-              "type": "io",
+          "monitor": Object {
+            "duration": Object {
+              "us": 1094,
             },
-            "http": null,
-            "id": "id1",
-            "monitor": Object {
-              "duration": Object {
-                "us": 1430,
-              },
-              "id": "auto-tcp-0X81440A68E839814C",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "tcp",
-            },
-            "timestamp": "2019-01-28T17:47:08.078Z",
+            "id": "auto-tcp-0X81440A68E839814E",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "tcp",
           },
-          Object {
-            "error": Object {
-              "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
-              "type": "io",
-            },
-            "http": null,
-            "id": "id2",
-            "monitor": Object {
-              "duration": Object {
-                "us": 1370,
-              },
-              "id": "auto-tcp-0X81440A68E839814C",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "tcp",
-            },
-            "timestamp": "2019-01-28T17:47:09.075Z",
+          "timestamp": "2019-01-28T17:47:07.075Z",
+        },
+        Object {
+          "docId": "fewpi321",
+          "error": Object {
+            "message": "Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused",
+            "type": "io",
           },
-          Object {
-            "error": null,
-            "http": null,
-            "id": "id3",
-            "monitor": Object {
-              "duration": Object {
-                "us": 1452,
-              },
-              "id": "auto-tcp-0X81440A68E839814C",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "up",
-              "type": "tcp",
+          "monitor": Object {
+            "duration": Object {
+              "us": 1597,
             },
-            "timestamp": "2019-01-28T17:47:06.077Z",
+            "id": "auto-http-0X3675F89EF061209G",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "http",
           },
-          Object {
-            "error": Object {
-              "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
-              "type": "io",
-            },
-            "http": null,
-            "id": "id4",
-            "monitor": Object {
-              "duration": Object {
-                "us": 1094,
-              },
-              "id": "auto-tcp-0X81440A68E839814C",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "tcp",
-            },
-            "timestamp": "2019-01-28T17:47:07.075Z",
+          "timestamp": "2019-01-28T17:47:07.074Z",
+        },
+        Object {
+          "docId": "0ewjio21",
+          "error": Object {
+            "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+            "type": "io",
           },
-          Object {
-            "error": Object {
-              "message": "Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused",
-              "type": "io",
+          "monitor": Object {
+            "duration": Object {
+              "us": 1699,
             },
-            "http": null,
-            "id": "id5",
-            "monitor": Object {
-              "duration": Object {
-                "us": 1597,
-              },
-              "id": "auto-http-0X3675F89EF0612091",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "http",
-            },
-            "timestamp": "2019-01-28T17:47:07.074Z",
+            "id": "auto-tcp-0X81440A68E839814H",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "tcp",
           },
-          Object {
-            "error": Object {
-              "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
-              "type": "io",
-            },
-            "http": null,
-            "id": "id6",
-            "monitor": Object {
-              "duration": Object {
-                "us": 1699,
-              },
-              "id": "auto-tcp-0X81440A68E839814C",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "tcp",
-            },
-            "timestamp": "2019-01-28T17:47:18.080Z",
+          "timestamp": "2019-01-28T17:47:18.080Z",
+        },
+        Object {
+          "docId": "3ewjio21",
+          "error": Object {
+            "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+            "type": "io",
           },
-          Object {
-            "error": Object {
-              "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
-              "type": "io",
-            },
-            "http": null,
-            "id": "id7",
-            "monitor": Object {
-              "duration": Object {
-                "us": 5384,
-              },
-              "id": "auto-tcp-0X81440A68E839814C",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "tcp",
+          "monitor": Object {
+            "duration": Object {
+              "us": 5384,
             },
-            "timestamp": "2019-01-28T17:47:19.076Z",
+            "id": "auto-tcp-0X81440A68E839814I",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "tcp",
           },
-          Object {
-            "error": Object {
-              "message": "Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused",
-              "type": "io",
-            },
-            "http": null,
-            "id": "id8",
-            "monitor": Object {
-              "duration": Object {
-                "us": 5397,
-              },
-              "id": "auto-http-0X3675F89EF0612091",
-              "ip": "127.0.0.1",
-              "name": "",
-              "scheme": null,
-              "status": "down",
-              "type": "http",
+          "timestamp": "2019-01-28T17:47:19.076Z",
+        },
+        Object {
+          "docId": "fewjip21",
+          "error": Object {
+            "message": "Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused",
+            "type": "io",
+          },
+          "monitor": Object {
+            "duration": Object {
+              "us": 5397,
             },
-            "timestamp": "2019-01-28T17:47:19.076Z",
+            "id": "auto-http-0X3675F89EF061209J",
+            "ip": "127.0.0.1",
+            "name": "",
+            "status": "down",
+            "type": "http",
           },
-          Object {
-            "error": null,
-            "http": Object {
-              "response": Object {
-                "status_code": 200,
-              },
+          "timestamp": "2019-01-28T17:47:19.076Z",
+        },
+        Object {
+          "docId": "fewjio21",
+          "http": Object {
+            "response": Object {
+              "status_code": 200,
             },
-            "id": "id9",
-            "monitor": Object {
-              "duration": Object {
-                "us": 127511,
-              },
-              "id": "auto-http-0X131221E73F825974",
-              "ip": "172.217.7.4",
-              "name": "",
-              "scheme": null,
-              "status": "up",
-              "type": "http",
+          },
+          "monitor": Object {
+            "duration": Object {
+              "us": 127511,
             },
-            "timestamp": "2019-01-28T17:47:19.077Z",
+            "id": "auto-tcp-0X81440A68E839814C",
+            "ip": "172.217.7.4",
+            "name": "",
+            "status": "up",
+            "type": "http",
           },
-          Object {
-            "error": null,
-            "http": Object {
-              "response": Object {
-                "status_code": 200,
-              },
+          "timestamp": "2019-01-28T17:47:19.077Z",
+        },
+        Object {
+          "docId": "fewjik81",
+          "http": Object {
+            "response": Object {
+              "status_code": 200,
             },
-            "id": "id10",
-            "monitor": Object {
-              "duration": Object {
-                "us": 287543,
-              },
-              "id": "auto-http-0X9CB71300ABD5A2A8",
-              "ip": "192.30.253.112",
-              "name": "",
-              "scheme": null,
-              "status": "up",
-              "type": "http",
+          },
+          "monitor": Object {
+            "duration": Object {
+              "us": 287543,
             },
-            "timestamp": "2019-01-28T17:47:19.077Z",
+            "id": "auto-http-0X131221E73F825974",
+            "ip": "192.30.253.112",
+            "name": "",
+            "status": "up",
+            "type": "http",
           },
-        ]
-      }
-      loading={false}
-      noItemsMessage="No items found"
-      onChange={[Function]}
-      pagination={
-        Object {
-          "initialPageSize": 25,
-          "pageIndex": 0,
-          "pageSize": 10,
-          "pageSizeOptions": Array [
-            10,
-            25,
-            50,
-            100,
-          ],
-          "totalItemCount": 9231,
-        }
+          "timestamp": "2019-01-28T17:47:19.077Z",
+        },
+      ]
+    }
+    loading={false}
+    noItemsMessage="No items found"
+    onChange={[Function]}
+    pagination={
+      Object {
+        "initialPageSize": 10,
+        "pageIndex": 0,
+        "pageSize": 10,
+        "pageSizeOptions": Array [
+          10,
+          25,
+          50,
+          100,
+        ],
+        "totalItemCount": 10,
       }
-      responsive={true}
-      tableLayout="fixed"
-    />
-  </EuiPanel>
-</Fragment>
+    }
+    responsive={true}
+    tableLayout="fixed"
+  />
+</EuiPanel>
 `;
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/expanded_row.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/expanded_row.test.tsx
index 9dbe48ec5553a..2c1434cfd64bd 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/expanded_row.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/expanded_row.test.tsx
@@ -7,15 +7,23 @@
 import { mountWithIntl, renderWithIntl, shallowWithIntl } from 'test_utils/enzyme_helpers';
 import React from 'react';
 import { PingListExpandedRowComponent } from '../expanded_row';
-import { Ping } from '../../../../../common/graphql/types';
+import { Ping } from '../../../../../common/runtime_types';
 import { DocLinkForBody } from '../doc_link_body';
 
 describe('PingListExpandedRow', () => {
   let ping: Ping;
   beforeEach(() => {
     ping = {
-      id: '123',
+      docId: 'fdeio12',
       timestamp: '19290310',
+      monitor: {
+        duration: {
+          us: 12345,
+        },
+        id: '123',
+        status: 'down',
+        type: 'http',
+      },
       http: {
         response: {
           body: {
@@ -34,7 +42,7 @@ describe('PingListExpandedRow', () => {
 
   it('renders error information when an error field is present', () => {
     ping.error = {
-      code: 403,
+      code: '403',
       message: 'Forbidden',
     };
     expect(shallowWithIntl(<PingListExpandedRowComponent ping={ping} />)).toMatchSnapshot();
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx
index 68d285bd0baf1..ec256a886aa16 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/__tests__/ping_list.test.tsx
@@ -6,211 +6,188 @@
 
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
-import { PingResults, Ping } from '../../../../../common/graphql/types';
-import { PingListComponent, AllLocationOption, toggleDetails } from '../ping_list';
+import { PingListComponent, toggleDetails } from '../ping_list';
 import { ExpandedRowMap } from '../../monitor_list/types';
+import { Ping, PingsResponse } from '../../../../../common/runtime_types';
 
 describe('PingList component', () => {
-  let pingList: { allPings: PingResults };
+  let response: PingsResponse;
 
   beforeEach(() => {
-    pingList = {
-      allPings: {
-        total: 9231,
-        pings: [
-          {
-            id: 'id1',
-            timestamp: '2019-01-28T17:47:08.078Z',
-            http: null,
-            error: {
-              message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 1430 },
-              id: 'auto-tcp-0X81440A68E839814C',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'tcp',
-            },
-          },
-          {
-            id: 'id2',
-            timestamp: '2019-01-28T17:47:09.075Z',
-            http: null,
-            error: {
-              message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 1370 },
-              id: 'auto-tcp-0X81440A68E839814C',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'tcp',
-            },
-          },
-          {
-            id: 'id3',
-            timestamp: '2019-01-28T17:47:06.077Z',
-            http: null,
-            error: null,
-            monitor: {
-              duration: { us: 1452 },
-              id: 'auto-tcp-0X81440A68E839814C',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'up',
-              type: 'tcp',
-            },
-          },
-          {
-            id: 'id4',
-            timestamp: '2019-01-28T17:47:07.075Z',
-            http: null,
-            error: {
-              message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 1094 },
-              id: 'auto-tcp-0X81440A68E839814C',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'tcp',
-            },
-          },
-          {
-            id: 'id5',
-            timestamp: '2019-01-28T17:47:07.074Z',
-            http: null,
-            error: {
-              message:
-                'Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 1597 },
-              id: 'auto-http-0X3675F89EF0612091',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'http',
-            },
-          },
-          {
-            id: 'id6',
-            timestamp: '2019-01-28T17:47:18.080Z',
-            http: null,
-            error: {
-              message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 1699 },
-              id: 'auto-tcp-0X81440A68E839814C',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'tcp',
-            },
-          },
-          {
-            id: 'id7',
-            timestamp: '2019-01-28T17:47:19.076Z',
-            http: null,
-            error: {
-              message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 5384 },
-              id: 'auto-tcp-0X81440A68E839814C',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'tcp',
-            },
-          },
-          {
-            id: 'id8',
-            timestamp: '2019-01-28T17:47:19.076Z',
-            http: null,
-            error: {
-              message:
-                'Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused',
-              type: 'io',
-            },
-            monitor: {
-              duration: { us: 5397 },
-              id: 'auto-http-0X3675F89EF0612091',
-              ip: '127.0.0.1',
-              name: '',
-              scheme: null,
-              status: 'down',
-              type: 'http',
-            },
-          },
-          {
-            id: 'id9',
-            timestamp: '2019-01-28T17:47:19.077Z',
-            http: { response: { status_code: 200 } },
-            error: null,
-            monitor: {
-              duration: { us: 127511 },
-              id: 'auto-http-0X131221E73F825974',
-              ip: '172.217.7.4',
-              name: '',
-              scheme: null,
-              status: 'up',
-              type: 'http',
-            },
-          },
-          {
-            id: 'id10',
-            timestamp: '2019-01-28T17:47:19.077Z',
-            http: { response: { status_code: 200 } },
-            error: null,
-            monitor: {
-              duration: { us: 287543 },
-              id: 'auto-http-0X9CB71300ABD5A2A8',
-              ip: '192.30.253.112',
-              name: '',
-              scheme: null,
-              status: 'up',
-              type: 'http',
-            },
-          },
-        ],
-        locations: ['nyc'],
-      },
+    response = {
+      total: 9231,
+      locations: ['nyc'],
+      pings: [
+        {
+          docId: 'fewjio21',
+          timestamp: '2019-01-28T17:47:08.078Z',
+          error: {
+            message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 1430 },
+            id: 'auto-tcp-0X81440A68E839814F',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'tcp',
+          },
+        },
+        {
+          docId: 'fewjoo21',
+          timestamp: '2019-01-28T17:47:09.075Z',
+          error: {
+            message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 1370 },
+            id: 'auto-tcp-0X81440A68E839814D',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'tcp',
+          },
+        },
+        {
+          docId: 'fejjio21',
+          timestamp: '2019-01-28T17:47:06.077Z',
+          monitor: {
+            duration: { us: 1452 },
+            id: 'auto-tcp-0X81440A68E839814D',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'up',
+            type: 'tcp',
+          },
+        },
+        {
+          docId: 'fewzio21',
+          timestamp: '2019-01-28T17:47:07.075Z',
+          error: {
+            message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 1094 },
+            id: 'auto-tcp-0X81440A68E839814E',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'tcp',
+          },
+        },
+        {
+          docId: 'fewpi321',
+          timestamp: '2019-01-28T17:47:07.074Z',
+          error: {
+            message:
+              'Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 1597 },
+            id: 'auto-http-0X3675F89EF061209G',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'http',
+          },
+        },
+        {
+          docId: '0ewjio21',
+          timestamp: '2019-01-28T17:47:18.080Z',
+          error: {
+            message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 1699 },
+            id: 'auto-tcp-0X81440A68E839814H',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'tcp',
+          },
+        },
+        {
+          docId: '3ewjio21',
+          timestamp: '2019-01-28T17:47:19.076Z',
+          error: {
+            message: 'dial tcp 127.0.0.1:9200: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 5384 },
+            id: 'auto-tcp-0X81440A68E839814I',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'tcp',
+          },
+        },
+        {
+          docId: 'fewjip21',
+          timestamp: '2019-01-28T17:47:19.076Z',
+          error: {
+            message:
+              'Get http://localhost:12349/: dial tcp 127.0.0.1:12349: connect: connection refused',
+            type: 'io',
+          },
+          monitor: {
+            duration: { us: 5397 },
+            id: 'auto-http-0X3675F89EF061209J',
+            ip: '127.0.0.1',
+            name: '',
+            status: 'down',
+            type: 'http',
+          },
+        },
+        {
+          docId: 'fewjio21',
+          timestamp: '2019-01-28T17:47:19.077Z',
+          http: { response: { status_code: 200 } },
+          monitor: {
+            duration: { us: 127511 },
+            id: 'auto-tcp-0X81440A68E839814C',
+            ip: '172.217.7.4',
+            name: '',
+            status: 'up',
+            type: 'http',
+          },
+        },
+        {
+          docId: 'fewjik81',
+          timestamp: '2019-01-28T17:47:19.077Z',
+          http: { response: { status_code: 200 } },
+          monitor: {
+            duration: { us: 287543 },
+            id: 'auto-http-0X131221E73F825974',
+            ip: '192.30.253.112',
+            name: '',
+            status: 'up',
+            type: 'http',
+          },
+        },
+      ],
     };
   });
 
   it('renders sorted list without errors', () => {
-    const { allPings } = pingList;
     const component = shallowWithIntl(
       <PingListComponent
+        dateRange={{
+          from: 'now-15m',
+          to: 'now',
+        }}
+        getPings={jest.fn()}
+        lastRefresh={123}
         loading={false}
-        data={{ allPings }}
-        onPageCountChange={jest.fn()}
-        onPageIndexChange={jest.fn()}
-        onSelectedLocationChange={(_loc: any[]) => {}}
-        onSelectedStatusChange={jest.fn()}
-        pageIndex={0}
-        pageSize={10}
-        selectedOption="down"
-        selectedLocation={AllLocationOption.value}
+        locations={[]}
+        monitorId="foo"
+        pings={response.pings}
+        total={10}
       />
     );
     expect(component).toMatchSnapshot();
@@ -224,13 +201,38 @@ describe('PingList component', () => {
 
     beforeEach(() => {
       itemIdToExpandedRowMap = {};
-      pings = pingList.allPings.pings;
+      pings = response.pings;
     });
 
     it('should expand an item if empty', () => {
       const ping = pings[0];
       toggleDetails(ping, itemIdToExpandedRowMap, setItemIdToExpandedRowMap);
-      expect(itemIdToExpandedRowMap).toHaveProperty(ping.id);
+      expect(itemIdToExpandedRowMap).toMatchInlineSnapshot(`
+        Object {
+          "fewjio21": <PingListExpandedRowComponent
+            ping={
+              Object {
+                "docId": "fewjio21",
+                "error": Object {
+                  "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+                  "type": "io",
+                },
+                "monitor": Object {
+                  "duration": Object {
+                    "us": 1430,
+                  },
+                  "id": "auto-tcp-0X81440A68E839814F",
+                  "ip": "127.0.0.1",
+                  "name": "",
+                  "status": "down",
+                  "type": "tcp",
+                },
+                "timestamp": "2019-01-28T17:47:08.078Z",
+              }
+            }
+          />,
+        }
+      `);
     });
 
     it('should un-expand an item if clicked again', () => {
@@ -245,7 +247,31 @@ describe('PingList component', () => {
       const pingB = pings[1];
       toggleDetails(pingA, itemIdToExpandedRowMap, setItemIdToExpandedRowMap);
       toggleDetails(pingB, itemIdToExpandedRowMap, setItemIdToExpandedRowMap);
-      expect(itemIdToExpandedRowMap).toHaveProperty(pingB.id);
+      expect(pingA.docId).not.toEqual(pingB.docId);
+      expect(itemIdToExpandedRowMap[pingB.docId]).toMatchInlineSnapshot(`
+        <PingListExpandedRowComponent
+          ping={
+            Object {
+              "docId": "fewjoo21",
+              "error": Object {
+                "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
+                "type": "io",
+              },
+              "monitor": Object {
+                "duration": Object {
+                  "us": 1370,
+                },
+                "id": "auto-tcp-0X81440A68E839814D",
+                "ip": "127.0.0.1",
+                "name": "",
+                "status": "down",
+                "type": "tcp",
+              },
+              "timestamp": "2019-01-28T17:47:09.075Z",
+            }
+          }
+        />
+      `);
     });
   });
 });
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/expanded_row.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/expanded_row.tsx
index c684235122e34..28b96fcb1bf7b 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/expanded_row.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/expanded_row.tsx
@@ -16,14 +16,14 @@ import {
 } from '@elastic/eui';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { Ping, HttpBody } from '../../../../common/graphql/types';
+import { Ping, HttpResponseBody } from '../../../../common/runtime_types';
 import { DocLinkForBody } from './doc_link_body';
 
 interface Props {
   ping: Ping;
 }
 
-const BodyDescription = ({ body }: { body: HttpBody }) => {
+const BodyDescription = ({ body }: { body: HttpResponseBody }) => {
   const contentBytes = body.content_bytes || 0;
   const bodyBytes = body.bytes || 0;
 
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/index.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/index.tsx
index e57b229dfd973..808f3f90ef015 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/index.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/index.tsx
@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from './ping_list';
+export { PingListComponent } from './ping_list';
diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
index 19768c7104e91..934dfd961f9e0 100644
--- a/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
+++ b/x-pack/legacy/plugins/uptime/public/components/functional/ping_list/ping_list.tsx
@@ -20,109 +20,127 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { get } from 'lodash';
 import moment from 'moment';
-import React, { Fragment, useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import styled from 'styled-components';
-import { CriteriaWithPagination } from '@elastic/eui/src/components/basic_table/basic_table';
-import { Ping, PingResults } from '../../../../common/graphql/types';
+import { Ping, GetPingsParams, DateRange } from '../../../../common/runtime_types';
 import { convertMicrosecondsToMilliseconds as microsToMillis } from '../../../lib/helper';
-import { UptimeGraphQLQueryProps, withUptimeGraphQL } from '../../higher_order';
-import { pingsQuery } from '../../../queries';
 import { LocationName } from './location_name';
 import { Pagination } from './../monitor_list';
 import { PingListExpandedRowComponent } from './expanded_row';
+import { PingListProps } from '../../connected/pings';
 
-interface PingListQueryResult {
-  allPings?: PingResults;
-}
-
-interface PingListProps {
-  onSelectedStatusChange: (status: string | undefined) => void;
-  onSelectedLocationChange: (location: any) => void;
-  onPageCountChange: (itemCount: number) => void;
-  onPageIndexChange: (index: number) => void;
-  pageSize: number;
-  pageIndex: number;
-  selectedOption: string;
-  selectedLocation: string | undefined;
-}
-
-type Props = UptimeGraphQLQueryProps<PingListQueryResult> & PingListProps;
-interface ExpandedRowMap {
-  [key: string]: JSX.Element;
-}
-
-export const AllLocationOption = { text: 'All', value: '' };
+export const AllLocationOption = {
+  'data-test-subj': 'xpack.uptime.pingList.locationOptions.all',
+  text: 'All',
+  value: '',
+};
 
 export const toggleDetails = (
   ping: Ping,
-  itemIdToExpandedRowMap: ExpandedRowMap,
-  setItemIdToExpandedRowMap: (update: ExpandedRowMap) => any
+  expandedRows: Record<string, JSX.Element>,
+  setExpandedRows: (update: Record<string, JSX.Element>) => any
 ) => {
-  // If the user has clicked on the expanded map, close all expanded rows.
-  if (itemIdToExpandedRowMap[ping.id]) {
-    setItemIdToExpandedRowMap({});
+  // If already expanded, collapse
+  if (expandedRows[ping.docId]) {
+    delete expandedRows[ping.docId];
+    setExpandedRows({ ...expandedRows });
     return;
   }
 
   // Otherwise expand this row
-  const newItemIdToExpandedRowMap: ExpandedRowMap = {};
-  newItemIdToExpandedRowMap[ping.id] = <PingListExpandedRowComponent ping={ping} />;
-  setItemIdToExpandedRowMap(newItemIdToExpandedRowMap);
+  setExpandedRows({
+    ...expandedRows,
+    [ping.docId]: <PingListExpandedRowComponent ping={ping} />,
+  });
 };
 
 const SpanWithMargin = styled.span`
   margin-right: 16px;
 `;
 
-export const PingListComponent = ({
-  data,
-  loading,
-  onPageCountChange,
-  onPageIndexChange,
-  onSelectedLocationChange,
-  onSelectedStatusChange,
-  pageIndex,
-  pageSize,
-  selectedOption,
-  selectedLocation,
-}: Props) => {
-  const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<ExpandedRowMap>({});
+interface Props extends PingListProps {
+  dateRange: DateRange;
+  error?: Error;
+  getPings: (props: GetPingsParams) => void;
+  lastRefresh: number;
+  loading: boolean;
+  locations: string[];
+  pings: Ping[];
+  total: number;
+}
+
+const DEFAULT_PAGE_SIZE = 10;
+
+const statusOptions = [
+  {
+    'data-test-subj': 'xpack.uptime.pingList.statusOptions.all',
+    text: i18n.translate('xpack.uptime.pingList.statusOptions.allStatusOptionLabel', {
+      defaultMessage: 'All',
+    }),
+    value: '',
+  },
+  {
+    'data-test-subj': 'xpack.uptime.pingList.statusOptions.up',
+    text: i18n.translate('xpack.uptime.pingList.statusOptions.upStatusOptionLabel', {
+      defaultMessage: 'Up',
+    }),
+    value: 'up',
+  },
+  {
+    'data-test-subj': 'xpack.uptime.pingList.statusOptions.down',
+    text: i18n.translate('xpack.uptime.pingList.statusOptions.downStatusOptionLabel', {
+      defaultMessage: 'Down',
+    }),
+    value: 'down',
+  },
+];
+
+export const PingListComponent = (props: Props) => {
+  const [selectedLocation, setSelectedLocation] = useState<string>('');
+  const [status, setStatus] = useState<string>('');
+  const [pageSize, setPageSize] = useState(DEFAULT_PAGE_SIZE);
+  const [pageIndex, setPageIndex] = useState(0);
+  const {
+    dateRange: { from, to },
+    error,
+    getPings,
+    lastRefresh,
+    loading,
+    locations,
+    monitorId,
+    pings,
+    total,
+  } = props;
+
+  useEffect(() => {
+    getPings({
+      dateRange: {
+        from,
+        to,
+      },
+      location: selectedLocation,
+      monitorId,
+      index: pageIndex,
+      size: pageSize,
+      status: status !== 'all' ? status : '',
+    });
+  }, [from, to, getPings, monitorId, lastRefresh, selectedLocation, pageIndex, pageSize, status]);
+
+  const [expandedRows, setExpandedRows] = useState<Record<string, JSX.Element>>({});
 
-  const statusOptions = [
-    {
-      text: i18n.translate('xpack.uptime.pingList.statusOptions.allStatusOptionLabel', {
-        defaultMessage: 'All',
-      }),
-      value: '',
-    },
-    {
-      text: i18n.translate('xpack.uptime.pingList.statusOptions.upStatusOptionLabel', {
-        defaultMessage: 'Up',
-      }),
-      value: 'up',
-    },
-    {
-      text: i18n.translate('xpack.uptime.pingList.statusOptions.downStatusOptionLabel', {
-        defaultMessage: 'Down',
-      }),
-      value: 'down',
-    },
-  ];
-  const locations = get<string[]>(data, 'allPings.locations');
   const locationOptions = !locations
     ? [AllLocationOption]
     : [AllLocationOption].concat(
-        locations.map(name => {
-          return { text: name, value: name };
-        })
+        locations.map(name => ({
+          text: name,
+          'data-test-subj': `xpack.uptime.pingList.locationOptions.${name}`,
+          value: name,
+        }))
       );
 
-  const pings: Ping[] = data?.allPings?.pings ?? [];
-
   const hasStatus: boolean = pings.reduce(
-    (hasHttpStatus: boolean, currentPing: Ping) =>
+    (hasHttpStatus: boolean, currentPing) =>
       hasHttpStatus || !!currentPing.http?.response?.status_code,
     false
   );
@@ -134,7 +152,7 @@ export const PingListComponent = ({
         defaultMessage: 'Status',
       }),
       render: (pingStatus: string, item: Ping) => (
-        <div>
+        <div data-test-subj={`xpack.uptime.pingList.ping-${item.docId}`}>
           <EuiHealth color={pingStatus === 'up' ? 'success' : 'danger'}>
             {pingStatus === 'up'
               ? i18n.translate('xpack.uptime.pingList.statusColumnHealthUpLabel', {
@@ -189,7 +207,7 @@ export const PingListComponent = ({
       name: i18n.translate('xpack.uptime.pingList.errorTypeColumnLabel', {
         defaultMessage: 'Error type',
       }),
-      render: (error: string) => error ?? '-',
+      render: (errorType: string) => errorType ?? '-',
     },
     // Only add this column is there is any status present in list
     ...(hasStatus
@@ -219,16 +237,16 @@ export const PingListComponent = ({
       render: (item: Ping) => {
         return (
           <EuiButtonIcon
-            onClick={() => toggleDetails(item, itemIdToExpandedRowMap, setItemIdToExpandedRowMap)}
-            disabled={!item.error && !(item.http?.response?.body?.bytes > 0)}
+            onClick={() => toggleDetails(item, expandedRows, setExpandedRows)}
+            disabled={!item.error && !(item.http?.response?.body?.bytes ?? 0 > 0)}
             aria-label={
-              itemIdToExpandedRowMap[item.id]
+              expandedRows[item.docId]
                 ? i18n.translate('xpack.uptime.pingList.collapseRow', {
                     defaultMessage: 'Collapse',
                   })
                 : i18n.translate('xpack.uptime.pingList.expandRow', { defaultMessage: 'Expand' })
             }
-            iconType={itemIdToExpandedRowMap[item.id] ? 'arrowUp' : 'arrowDown'}
+            iconType={expandedRows[item.docId] ? 'arrowUp' : 'arrowDown'}
           />
         );
       },
@@ -236,104 +254,83 @@ export const PingListComponent = ({
   ];
 
   const pagination: Pagination = {
-    initialPageSize: 25,
+    initialPageSize: DEFAULT_PAGE_SIZE,
     pageIndex,
     pageSize,
     pageSizeOptions: [10, 25, 50, 100],
-    totalItemCount: data?.allPings?.total ?? pageSize,
+    /**
+     * we're not currently supporting pagination in this component
+     * so the first page is the only page
+     */
+    totalItemCount: total,
   };
 
   return (
-    <Fragment>
-      <EuiPanel>
-        <EuiTitle size="xs">
-          <h4>
-            <FormattedMessage
-              id="xpack.uptime.pingList.checkHistoryTitle"
-              defaultMessage="History"
+    <EuiPanel>
+      <EuiTitle size="xs">
+        <h4>
+          <FormattedMessage id="xpack.uptime.pingList.checkHistoryTitle" defaultMessage="History" />
+        </h4>
+      </EuiTitle>
+      <EuiSpacer size="s" />
+      <EuiFlexGroup justifyContent="spaceBetween">
+        <EuiFlexItem grow={false}>
+          <EuiFormRow
+            label="Status"
+            aria-label={i18n.translate('xpack.uptime.pingList.statusLabel', {
+              defaultMessage: 'Status',
+            })}
+          >
+            <EuiSelect
+              options={statusOptions}
+              aria-label={i18n.translate('xpack.uptime.pingList.statusLabel', {
+                defaultMessage: 'Status',
+              })}
+              data-test-subj="xpack.uptime.pingList.statusSelect"
+              value={status}
+              onChange={selected => {
+                setStatus(selected.target.value);
+              }}
             />
-          </h4>
-        </EuiTitle>
-        <EuiSpacer size="s" />
-        <EuiFlexGroup justifyContent="spaceBetween">
-          <EuiFlexItem grow={false}>
-            <EuiFlexGroup>
-              <EuiFlexItem style={{ minWidth: 200 }}>
-                <EuiFlexGroup>
-                  <EuiFlexItem>
-                    <EuiFormRow
-                      label="Status"
-                      aria-label={i18n.translate('xpack.uptime.pingList.statusLabel', {
-                        defaultMessage: 'Status',
-                      })}
-                    >
-                      <EuiSelect
-                        options={statusOptions}
-                        aria-label={i18n.translate('xpack.uptime.pingList.statusLabel', {
-                          defaultMessage: 'Status',
-                        })}
-                        value={selectedOption}
-                        onChange={selected => {
-                          if (typeof selected.target.value === 'string') {
-                            onSelectedStatusChange(
-                              selected.target && selected.target.value !== ''
-                                ? selected.target.value
-                                : undefined
-                            );
-                          }
-                        }}
-                      />
-                    </EuiFormRow>
-                  </EuiFlexItem>
-                  <EuiFlexItem>
-                    <EuiFormRow
-                      label="Location"
-                      aria-label={i18n.translate('xpack.uptime.pingList.locationLabel', {
-                        defaultMessage: 'Location',
-                      })}
-                    >
-                      <EuiSelect
-                        options={locationOptions}
-                        value={selectedLocation}
-                        aria-label={i18n.translate('xpack.uptime.pingList.locationLabel', {
-                          defaultMessage: 'Location',
-                        })}
-                        onChange={selected => {
-                          onSelectedLocationChange(
-                            selected.target && selected.target.value !== ''
-                              ? selected.target.value
-                              : null
-                          );
-                        }}
-                      />
-                    </EuiFormRow>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer size="s" />
-        <EuiBasicTable
-          loading={loading}
-          columns={columns}
-          isExpandable={true}
-          hasActions={true}
-          items={pings}
-          itemId="id"
-          itemIdToExpandedRowMap={itemIdToExpandedRowMap}
-          pagination={pagination}
-          onChange={(criteria: CriteriaWithPagination<Ping>) => {
-            onPageCountChange(criteria.page!.size);
-            onPageIndexChange(criteria.page!.index);
-          }}
-        />
-      </EuiPanel>
-    </Fragment>
+          </EuiFormRow>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFormRow
+            label="Location"
+            aria-label={i18n.translate('xpack.uptime.pingList.locationLabel', {
+              defaultMessage: 'Location',
+            })}
+          >
+            <EuiSelect
+              options={locationOptions}
+              value={selectedLocation}
+              aria-label={i18n.translate('xpack.uptime.pingList.locationLabel', {
+                defaultMessage: 'Location',
+              })}
+              data-test-subj="xpack.uptime.pingList.locationSelect"
+              onChange={selected => {
+                setSelectedLocation(selected.target.value);
+              }}
+            />
+          </EuiFormRow>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiSpacer size="s" />
+      <EuiBasicTable
+        loading={loading}
+        columns={columns}
+        error={error?.message}
+        isExpandable={true}
+        hasActions={true}
+        items={pings}
+        itemId="docId"
+        itemIdToExpandedRowMap={expandedRows}
+        pagination={pagination}
+        onChange={(criteria: any) => {
+          setPageSize(criteria.page!.size);
+          setPageIndex(criteria.page!.index);
+        }}
+      />
+    </EuiPanel>
   );
 };
-
-export const PingList = withUptimeGraphQL<PingListQueryResult, PingListProps>(
-  PingListComponent,
-  pingsQuery
-);
diff --git a/x-pack/legacy/plugins/uptime/public/hooks/index.ts b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
index e022248df407a..1f50e995eda49 100644
--- a/x-pack/legacy/plugins/uptime/public/hooks/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/hooks/index.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+export * from './use_monitor';
 export * from './use_url_params';
 export * from './use_telemetry';
 export * from './update_kuery_string';
diff --git a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
index 5016ccebbab54..683af81239c99 100644
--- a/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
+++ b/x-pack/legacy/plugins/uptime/public/pages/monitor.tsx
@@ -5,39 +5,21 @@
  */
 
 import { EuiSpacer } from '@elastic/eui';
-import React, { useContext, useState } from 'react';
+import React from 'react';
 import { useSelector } from 'react-redux';
-import { MonitorCharts, PingList } from '../components/functional';
-import { UptimeRefreshContext } from '../contexts';
-import { useUptimeTelemetry, useUrlParams, UptimePage } from '../hooks';
 import { useTrackPageview } from '../../../../../plugins/observability/public';
-import { MonitorStatusDetails } from '../components/connected';
+import { MonitorStatusDetails, PingList } from '../components/connected';
 import { monitorStatusSelector } from '../state/selectors';
 import { PageHeader } from './page_header';
+import { MonitorCharts } from '../components/functional';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { useMonitorId } from '../hooks/use_monitor';
+import { useMonitorId, useUptimeTelemetry, UptimePage } from '../hooks';
 
 export const MonitorPage: React.FC = () => {
   const monitorId = useMonitorId();
 
-  const [pingListPageCount, setPingListPageCount] = useState<number>(10);
-  const { refreshApp } = useContext(UptimeRefreshContext);
-  const [getUrlParams, updateUrlParams] = useUrlParams();
-  const { absoluteDateRangeStart, absoluteDateRangeEnd, ...params } = getUrlParams();
-  const { dateRangeStart, dateRangeEnd, selectedPingStatus } = params;
-
-  const [selectedLocation, setSelectedLocation] = useState(undefined);
-  const [pingListIndex, setPingListIndex] = useState(0);
-
   const selectedMonitor = useSelector(monitorStatusSelector);
 
-  const sharedVariables = {
-    dateRangeStart,
-    dateRangeEnd,
-    monitorId,
-    location: selectedLocation,
-  };
-
   useUptimeTelemetry(UptimePage.Monitor);
 
   useTrackPageview({ app: 'uptime', path: 'monitor' });
@@ -53,25 +35,7 @@ export const MonitorPage: React.FC = () => {
       <EuiSpacer size="s" />
       <MonitorCharts monitorId={monitorId} />
       <EuiSpacer size="s" />
-      <PingList
-        onPageCountChange={setPingListPageCount}
-        onSelectedLocationChange={setSelectedLocation}
-        onSelectedStatusChange={(selectedStatus: string | undefined) => {
-          updateUrlParams({ selectedPingStatus: selectedStatus || '' });
-          refreshApp();
-        }}
-        onPageIndexChange={(index: number) => setPingListIndex(index)}
-        pageIndex={pingListIndex}
-        pageSize={pingListPageCount}
-        selectedOption={selectedPingStatus}
-        selectedLocation={selectedLocation}
-        variables={{
-          ...sharedVariables,
-          page: pingListIndex,
-          size: pingListPageCount,
-          status: selectedPingStatus,
-        }}
-      />
+      <PingList monitorId={monitorId} />
     </>
   );
 };
diff --git a/x-pack/legacy/plugins/uptime/public/queries/pings_query.ts b/x-pack/legacy/plugins/uptime/public/queries/pings_query.ts
deleted file mode 100644
index ed20fe8eb2931..0000000000000
--- a/x-pack/legacy/plugins/uptime/public/queries/pings_query.ts
+++ /dev/null
@@ -1,73 +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 pingsQueryString = `
-query PingList(
-  $dateRangeStart: String!
-  $dateRangeEnd: String!
-  $monitorId: String
-  $status: String
-  $sort: String
-  $size: Int
-  $location: String
-  $page: Int
-) {
-  allPings(
-    dateRangeStart: $dateRangeStart
-    dateRangeEnd: $dateRangeEnd
-    monitorId: $monitorId
-    status: $status
-    sort: $sort
-    size: $size
-    location: $location
-    page: $page
-  ) {
-      total
-      locations
-      pings {
-        id
-        timestamp
-        http {
-          response {
-            status_code 
-            body {
-              bytes
-              hash
-              content
-              content_bytes
-            }
-          }
-        }
-        error {
-          message
-          type
-        }
-        monitor {
-          duration {
-            us
-          }
-          id
-          ip
-          name
-          scheme
-          status
-          type
-        }
-        observer {
-          geo {
-            name
-          }
-        }
-      }
-    }
-  }
-`;
-
-export const pingsQuery = gql`
-  ${pingsQueryString}
-`;
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts
index a8f37d38ebae6..e8c862e209739 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/monitor_status.ts
@@ -5,7 +5,7 @@
  */
 import { createAction } from 'redux-actions';
 import { QueryParams } from './types';
-import { Ping } from '../../../common/graphql/types';
+import { Ping } from '../../../common/runtime_types';
 
 export const getMonitorStatusAction = createAction<QueryParams>('GET_MONITOR_STATUS');
 export const getMonitorStatusActionSuccess = createAction<Ping>('GET_MONITOR_STATUS_SUCCESS');
diff --git a/x-pack/legacy/plugins/uptime/public/state/actions/ping.ts b/x-pack/legacy/plugins/uptime/public/state/actions/ping.ts
index bb7258d9a54b2..70918a4cc70e5 100644
--- a/x-pack/legacy/plugins/uptime/public/state/actions/ping.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/actions/ping.ts
@@ -5,8 +5,17 @@
  */
 
 import { createAction } from 'redux-actions';
-import { GetPingHistogramParams, HistogramResult } from '../../../common/types';
+import {
+  GetPingHistogramParams,
+  HistogramResult,
+  PingsResponse,
+  GetPingsParams,
+} from '../../../common/runtime_types';
 
 export const getPingHistogram = createAction<GetPingHistogramParams>('GET_PING_HISTOGRAM');
 export const getPingHistogramSuccess = createAction<HistogramResult>('GET_PING_HISTOGRAM_SUCCESS');
 export const getPingHistogramFail = createAction<Error>('GET_PING_HISTOGRAM_FAIL');
+
+export const getPings = createAction<GetPingsParams>('GET PINGS');
+export const getPingsSuccess = createAction<PingsResponse>('GET PINGS SUCCESS');
+export const getPingsFail = createAction<Error>('GET PINGS FAIL');
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
index f9e171adda334..7c8ab3518b5a0 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/monitor_status.ts
@@ -5,9 +5,9 @@
  */
 
 import { QueryParams } from '../actions/types';
-import { Ping } from '../../../common/graphql/types';
-import { apiService } from './utils';
+import { Ping } from '../../../common/runtime_types';
 import { API_URLS } from '../../../common/constants';
+import { apiService } from './utils';
 
 export const fetchMonitorStatus = async ({
   monitorId,
diff --git a/x-pack/legacy/plugins/uptime/public/state/api/ping.ts b/x-pack/legacy/plugins/uptime/public/state/api/ping.ts
index df71cc8d67bd0..bbd3ddf399dcc 100644
--- a/x-pack/legacy/plugins/uptime/public/state/api/ping.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/api/ping.ts
@@ -5,10 +5,21 @@
  */
 
 import { APIFn } from './types';
-import { GetPingHistogramParams, HistogramResult } from '../../../common/types';
+import {
+  PingsResponseType,
+  PingsResponse,
+  GetPingsParams,
+  GetPingHistogramParams,
+  HistogramResult,
+} from '../../../common/runtime_types';
 import { apiService } from './utils';
 import { API_URLS } from '../../../common/constants/rest_api';
 
+export const fetchPings: APIFn<GetPingsParams, PingsResponse> = async ({
+  dateRange: { from, to },
+  ...optional
+}) => await apiService.get(API_URLS.PINGS, { from, to, ...optional }, PingsResponseType);
+
 export const fetchPingHistogram: APIFn<GetPingHistogramParams, HistogramResult> = async ({
   monitorId,
   dateStart,
@@ -19,9 +30,9 @@ export const fetchPingHistogram: APIFn<GetPingHistogramParams, HistogramResult>
   const queryParams = {
     dateStart,
     dateEnd,
-    ...(monitorId && { monitorId }),
-    ...(statusFilter && { statusFilter }),
-    ...(filters && { filters }),
+    monitorId,
+    statusFilter,
+    filters,
   };
 
   return await apiService.get(API_URLS.PING_HISTOGRAM, queryParams);
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 49e497952ea44..b0734cb5ccabb 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
@@ -16,7 +16,7 @@ import { IHttpFetchError } from '../../../../../../../target/types/core/public/h
  * @param fail creates a failure action
  * @template T the action type expected by the fetch action
  * @template R the type that the API request should return on success
- * @template S tye type of the success action
+ * @template S the type of the success action
  * @template F the type of the failure action
  */
 export function fetchEffectFactory<T, R, S, F>(
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 8d457be1d1c78..8df11312b6455 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/index.ts
@@ -11,7 +11,7 @@ import { fetchSnapshotCountEffect } from './snapshot';
 import { fetchMonitorStatusEffect } from './monitor_status';
 import { fetchDynamicSettingsEffect, setDynamicSettingsEffect } from './dynamic_settings';
 import { fetchIndexPatternEffect } from './index_pattern';
-import { fetchPingHistogramEffect } from './ping';
+import { fetchPingsEffect, fetchPingHistogramEffect } from './ping';
 import { fetchMonitorDurationEffect } from './monitor_duration';
 import { fetchMLJobEffect } from './ml_anomaly';
 import { fetchIndexStatusEffect } from './index_status';
@@ -24,6 +24,7 @@ export function* rootEffect() {
   yield fork(fetchDynamicSettingsEffect);
   yield fork(setDynamicSettingsEffect);
   yield fork(fetchIndexPatternEffect);
+  yield fork(fetchPingsEffect);
   yield fork(fetchPingHistogramEffect);
   yield fork(fetchMLJobEffect);
   yield fork(fetchMonitorDurationEffect);
diff --git a/x-pack/legacy/plugins/uptime/public/state/effects/ping.ts b/x-pack/legacy/plugins/uptime/public/state/effects/ping.ts
index acb9b31915fa9..dec67ed8cf979 100644
--- a/x-pack/legacy/plugins/uptime/public/state/effects/ping.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/effects/ping.ts
@@ -5,10 +5,21 @@
  */
 
 import { takeLatest } from 'redux-saga/effects';
-import { getPingHistogram, getPingHistogramSuccess, getPingHistogramFail } from '../actions';
-import { fetchPingHistogram } from '../api';
+import {
+  getPingHistogram,
+  getPingHistogramSuccess,
+  getPingHistogramFail,
+  getPings,
+  getPingsSuccess,
+  getPingsFail,
+} from '../actions';
+import { fetchPingHistogram, fetchPings } from '../api';
 import { fetchEffectFactory } from './fetch_effect';
 
+export function* fetchPingsEffect() {
+  yield takeLatest(String(getPings), fetchEffectFactory(fetchPings, getPingsSuccess, getPingsFail));
+}
+
 export function* fetchPingHistogramEffect() {
   yield takeLatest(
     String(getPingHistogram),
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 7bf8af5dd4d03..0a3ff35df0599 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 { dynamicSettingsReducer } from './dynamic_settings';
 import { indexPatternReducer } from './index_pattern';
 import { pingReducer } from './ping';
+import { pingListReducer } from './ping_list';
 import { monitorDurationReducer } from './monitor_duration';
 import { indexStatusReducer } from './index_status';
 import { mlJobsReducer } from './ml_anomaly';
@@ -26,6 +27,7 @@ export const rootReducer = combineReducers({
   dynamicSettings: dynamicSettingsReducer,
   indexPattern: indexPatternReducer,
   ping: pingReducer,
+  pingList: pingListReducer,
   ml: mlJobsReducer,
   monitorDuration: monitorDurationReducer,
   indexStatus: indexStatusReducer,
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
index 6cfaa9f8f59c1..fa3e377b5ebf4 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/monitor_status.ts
@@ -9,7 +9,7 @@ import {
   getMonitorStatusActionSuccess,
   getMonitorStatusActionFail,
 } from '../actions';
-import { Ping } from '../../../common/graphql/types';
+import { Ping } from '../../../common/runtime_types';
 import { QueryParams } from '../actions/types';
 
 export interface MonitorStatusState {
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ping.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/ping.ts
index 76775e6a0a355..4c8715038ce36 100644
--- a/x-pack/legacy/plugins/uptime/public/state/reducers/ping.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/ping.ts
@@ -6,7 +6,7 @@
 
 import { handleActions, Action } from 'redux-actions';
 import { getPingHistogram, getPingHistogramSuccess, getPingHistogramFail } from '../actions';
-import { HistogramResult } from '../../../common/types';
+import { HistogramResult } from '../../../common/runtime_types';
 
 export interface PingState {
   pingHistogram: HistogramResult | null;
diff --git a/x-pack/legacy/plugins/uptime/public/state/reducers/ping_list.ts b/x-pack/legacy/plugins/uptime/public/state/reducers/ping_list.ts
new file mode 100644
index 0000000000000..e3ccb1e663eda
--- /dev/null
+++ b/x-pack/legacy/plugins/uptime/public/state/reducers/ping_list.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { handleActions, Action } from 'redux-actions';
+import { PingsResponse } from '../../../common/runtime_types';
+import { getPings, getPingsSuccess, getPingsFail } from '../actions';
+
+export interface PingListState {
+  pingList: PingsResponse;
+  error?: Error;
+  loading: boolean;
+}
+
+const initialState: PingListState = {
+  pingList: {
+    total: 0,
+    locations: [],
+    pings: [],
+  },
+  loading: false,
+};
+
+type PingListPayload = PingsResponse & Error;
+
+export const pingListReducer = handleActions<PingListState, PingListPayload>(
+  {
+    [String(getPings)]: state => ({
+      ...state,
+      loading: true,
+    }),
+
+    [String(getPingsSuccess)]: (state, action: Action<PingsResponse>) => ({
+      ...state,
+      pingList: { ...action.payload },
+      loading: false,
+    }),
+
+    [String(getPingsFail)]: (state, action: Action<Error>) => ({
+      ...state,
+      error: action.payload,
+      loading: false,
+    }),
+  },
+  initialState
+);
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/__tests__/index.test.ts
index 3b4547514a11e..77902f347f6f9 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
@@ -58,6 +58,14 @@ describe('state selectors', () => {
       loading: false,
       errors: [],
     },
+    pingList: {
+      loading: false,
+      pingList: {
+        total: 0,
+        locations: [],
+        pings: [],
+      },
+    },
     monitorDuration: {
       durationLines: null,
       loading: false,
diff --git a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
index 0fc3c7151cb3b..37695e4274306 100644
--- a/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
+++ b/x-pack/legacy/plugins/uptime/public/state/selectors/index.ts
@@ -41,6 +41,11 @@ export const selectPingHistogram = ({ ping, ui }: AppState) => {
   };
 };
 
+export const selectPingList = ({ pingList, ui: { lastRefresh } }: AppState) => ({
+  pings: pingList,
+  lastRefresh,
+});
+
 const mlCapabilitiesSelector = (state: AppState) => state.ml.mlCapabilities.data;
 
 export const hasMLFeatureAvailable = createSelector(
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts
index 30f45e54c2005..5269ee72f4039 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/models/policy.ts
@@ -15,8 +15,13 @@ export const generatePolicy = (): PolicyConfig => {
   return {
     windows: {
       events: {
-        process: true,
+        dll_and_driver_load: true,
+        dns: true,
+        file: true,
         network: true,
+        process: true,
+        registry: true,
+        security: true,
       },
       malware: {
         mode: ProtectionModes.prevent,
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
index e09a62b235e35..f81852d6a074a 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/index.test.ts
@@ -98,4 +98,26 @@ describe('policy details: ', () => {
       expect(config!.mac.events.file).toEqual(true);
     });
   });
+
+  describe('when the user has enabled linux process events', () => {
+    beforeEach(() => {
+      const config = policyConfig(getState());
+      if (!config) {
+        throw new Error();
+      }
+
+      const newPayload1 = clone(config);
+      newPayload1.linux.events.file = true;
+
+      dispatch({
+        type: 'userChangedPolicyConfig',
+        payload: { policyConfig: newPayload1 },
+      });
+    });
+
+    it('linux file events is enabled', () => {
+      const config = policyConfig(getState());
+      expect(config!.linux.events.file).toEqual(true);
+    });
+  });
 });
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
index 4b4dc9d9bee43..a37a06bafcf05 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/policy_details/selectors.ts
@@ -119,6 +119,26 @@ export const selectedMacEvents = (state: PolicyDetailsState): number => {
   return 0;
 };
 
+/** Returns the total number of possible linux eventing configurations */
+export const totalLinuxEvents = (state: PolicyDetailsState): number => {
+  const config = policyConfig(state);
+  if (config) {
+    return Object.keys(config.linux.events).length;
+  }
+  return 0;
+};
+
+/** Returns the number of selected liinux eventing configurations */
+export const selectedLinuxEvents = (state: PolicyDetailsState): number => {
+  const config = policyConfig(state);
+  if (config) {
+    return Object.values(config.linux.events).reduce((count, event) => {
+      return event === true ? count + 1 : count;
+    }, 0);
+  }
+  return 0;
+};
+
 /** is there an api call in flight */
 export const isLoading = (state: PolicyDetailsState) => state.isLoading;
 
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
index a625c49bf7d5a..54afbf220944e 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/types.ts
@@ -131,21 +131,42 @@ export interface PolicyListUrlSearchParams {
  * Endpoint Policy configuration
  */
 export interface PolicyConfig {
-  windows: UIPolicyConfig['windows'] & {
+  windows: {
+    events: {
+      dll_and_driver_load: boolean;
+      dns: boolean;
+      file: boolean;
+      network: boolean;
+      process: boolean;
+      registry: boolean;
+      security: boolean;
+    };
+    malware: MalwareFields;
     logging: {
       stdout: string;
       file: string;
     };
     advanced: PolicyConfigAdvancedOptions;
   };
-  mac: UIPolicyConfig['mac'] & {
+  mac: {
+    events: {
+      file: boolean;
+      process: boolean;
+      network: boolean;
+    };
+    malware: MalwareFields;
     logging: {
       stdout: string;
       file: string;
     };
     advanced: PolicyConfigAdvancedOptions;
   };
-  linux: UIPolicyConfig['linux'] & {
+  linux: {
+    events: {
+      file: boolean;
+      process: boolean;
+      network: boolean;
+    };
     logging: {
       stdout: string;
       file: string;
@@ -169,38 +190,28 @@ interface PolicyConfigAdvancedOptions {
 }
 
 /**
- * The set of Policy configuration settings that are show/edited via the UI
+ * Windows-specific policy configuration that is supported via the UI
  */
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-export type UIPolicyConfig = {
-  windows: {
-    events: {
-      process: boolean;
-      network: boolean;
-    };
-    /** malware mode can be off, detect, prevent or prevent and notify user */
-    malware: MalwareFields;
-  };
-  mac: {
-    events: {
-      file: boolean;
-      process: boolean;
-      network: boolean;
-    };
-    malware: MalwareFields;
-  };
+type WindowsPolicyConfig = Pick<PolicyConfig['windows'], 'events' | 'malware'>;
 
-  /**
-   * Linux-specific policy configuration that is supported via the UI
-   */
-  linux: {
-    events: {
-      file: boolean;
-      process: boolean;
-      network: boolean;
-    };
-  };
-};
+/**
+ * Mac-specific policy configuration that is supported via the UI
+ */
+type MacPolicyConfig = Pick<PolicyConfig['mac'], 'malware' | 'events'>;
+
+/**
+ * Linux-specific policy configuration that is supported via the UI
+ */
+type LinuxPolicyConfig = Pick<PolicyConfig['linux'], 'events'>;
+
+/**
+ * The set of Policy configuration settings that are show/edited via the UI
+ */
+export interface UIPolicyConfig {
+  windows: WindowsPolicyConfig;
+  mac: MacPolicyConfig;
+  linux: LinuxPolicyConfig;
+}
 
 /** OS used in Policy */
 export enum OS {
@@ -209,13 +220,6 @@ export enum OS {
   linux = 'linux',
 }
 
-/** Used in Policy */
-export enum EventingFields {
-  process = 'process',
-  network = 'network',
-  file = 'file',
-}
-
 /**
  * Returns the keys of an object whose values meet a criteria.
  *  Ex) interface largeNestedObject = {
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
index 267077da6598c..076de7b57b44b 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_details.tsx
@@ -34,7 +34,7 @@ import { AppAction } from '../../types';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { AgentsSummary } from './agents_summary';
 import { VerticalDivider } from './vertical_divider';
-import { WindowsEvents, MacEvents } from './policy_forms/events';
+import { WindowsEvents, MacEvents, LinuxEvents } from './policy_forms/events';
 import { MalwareProtections } from './policy_forms/protections/malware';
 
 export const PolicyDetails = React.memo(() => {
@@ -208,6 +208,8 @@ export const PolicyDetails = React.memo(() => {
         <WindowsEvents />
         <EuiSpacer size="l" />
         <MacEvents />
+        <EuiSpacer size="l" />
+        <LinuxEvents />
       </PageView>
     </>
   );
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx
index 44716d8183041..927456fb671d8 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/index.tsx
@@ -6,3 +6,4 @@
 
 export { WindowsEvents } from './windows';
 export { MacEvents } from './mac';
+export { LinuxEvents } from './linux';
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/linux.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/linux.tsx
new file mode 100644
index 0000000000000..9d2ce03c20462
--- /dev/null
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/linux.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import React, { useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiTitle, EuiText, EuiSpacer } from '@elastic/eui';
+import { EventsCheckbox } from './checkbox';
+import { OS, UIPolicyConfig } from '../../../../types';
+import { usePolicyDetailsSelector } from '../../policy_hooks';
+import { selectedLinuxEvents, totalLinuxEvents } from '../../../../store/policy_details/selectors';
+import { ConfigForm } from '../config_form';
+import { getIn, setIn } from '../../../../models/policy_details_config';
+
+export const LinuxEvents = React.memo(() => {
+  const selected = usePolicyDetailsSelector(selectedLinuxEvents);
+  const total = usePolicyDetailsSelector(totalLinuxEvents);
+
+  const checkboxes: Array<{
+    name: string;
+    os: 'linux';
+    protectionField: keyof UIPolicyConfig['linux']['events'];
+  }> = useMemo(
+    () => [
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.linux.events.file', {
+          defaultMessage: 'File',
+        }),
+        os: OS.linux,
+        protectionField: 'file',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.linux.events.process', {
+          defaultMessage: 'Process',
+        }),
+        os: OS.linux,
+        protectionField: 'process',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.linux.events.network', {
+          defaultMessage: 'Network',
+        }),
+        os: OS.linux,
+        protectionField: 'network',
+      },
+    ],
+    []
+  );
+
+  const renderCheckboxes = () => {
+    return (
+      <>
+        <EuiTitle size="xxs">
+          <h5>
+            <FormattedMessage
+              id="xpack.endpoint.policyDetailsConfig.eventingEvents"
+              defaultMessage="Events"
+            />
+          </h5>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        {checkboxes.map((item, index) => {
+          return (
+            <EventsCheckbox
+              name={item.name}
+              key={index}
+              setter={(config, checked) =>
+                setIn(config)(item.os)('events')(item.protectionField)(checked)
+              }
+              getter={config => getIn(config)(item.os)('events')(item.protectionField)}
+            />
+          );
+        })}
+      </>
+    );
+  };
+
+  const collectionsEnabled = () => {
+    return (
+      <EuiText size="s" color="subdued">
+        <FormattedMessage
+          id="xpack.endpoint.policy.details.eventCollectionsEnabled"
+          defaultMessage="{selected} / {total} event collections enabled"
+          values={{ selected, total }}
+        />
+      </EuiText>
+    );
+  };
+
+  return (
+    <ConfigForm
+      type={i18n.translate('xpack.endpoint.policy.details.eventCollection', {
+        defaultMessage: 'Event Collection',
+      })}
+      supportedOss={[
+        i18n.translate('xpack.endpoint.policy.details.linux', { defaultMessage: 'Linux' }),
+      ]}
+      id="linuxEventingForm"
+      rightCorner={collectionsEnabled()}
+      children={renderCheckboxes()}
+    />
+  );
+});
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
index 63a140912437d..da675dc1e2393 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/policy/policy_forms/events/windows.tsx
@@ -29,11 +29,25 @@ export const WindowsEvents = React.memo(() => {
   }> = useMemo(
     () => [
       {
-        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.process', {
-          defaultMessage: 'Process',
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.dllDriverLoad', {
+          defaultMessage: 'DLL and Driver Load',
         }),
         os: OS.windows,
-        protectionField: 'process',
+        protectionField: 'dll_and_driver_load',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.dns', {
+          defaultMessage: 'DNS',
+        }),
+        os: OS.windows,
+        protectionField: 'dns',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.file', {
+          defaultMessage: 'File',
+        }),
+        os: OS.windows,
+        protectionField: 'file',
       },
       {
         name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.network', {
@@ -42,6 +56,27 @@ export const WindowsEvents = React.memo(() => {
         os: OS.windows,
         protectionField: 'network',
       },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.process', {
+          defaultMessage: 'Process',
+        }),
+        os: OS.windows,
+        protectionField: 'process',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.registry', {
+          defaultMessage: 'Registry',
+        }),
+        os: OS.windows,
+        protectionField: 'registry',
+      },
+      {
+        name: i18n.translate('xpack.endpoint.policyDetailsConfig.windows.events.security', {
+          defaultMessage: 'Security',
+        }),
+        os: OS.windows,
+        protectionField: 'security',
+      },
     ],
     []
   );
diff --git a/x-pack/plugins/lens/server/migrations.test.ts b/x-pack/plugins/lens/server/migrations.test.ts
new file mode 100644
index 0000000000000..e80308cc9acdb
--- /dev/null
+++ b/x-pack/plugins/lens/server/migrations.test.ts
@@ -0,0 +1,161 @@
+/*
+ * 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 { migrations } from './migrations';
+import { SavedObjectMigrationContext } from 'src/core/server';
+
+describe('Lens migrations', () => {
+  describe('7.7.0 missing dimensions in XY', () => {
+    const context = {} as SavedObjectMigrationContext;
+
+    const example = {
+      type: 'lens',
+      attributes: {
+        expression:
+          'kibana\n| kibana_context  query="{\\"language\\":\\"kuery\\",\\"query\\":\\"\\"}" \n| lens_merge_tables layerIds="c61a8afb-a185-4fae-a064-fb3846f6c451" \n  tables={esaggs index="logstash-*" metricsAtAllLevels=false partialRows=false includeFormatHints=true aggConfigs="[{\\"id\\":\\"2cd09808-3915-49f4-b3b0-82767eba23f7\\",\\"enabled\\":true,\\"type\\":\\"max\\",\\"schema\\":\\"metric\\",\\"params\\":{\\"field\\":\\"bytes\\"}}]" | lens_rename_columns idMap="{\\"col-0-2cd09808-3915-49f4-b3b0-82767eba23f7\\":\\"2cd09808-3915-49f4-b3b0-82767eba23f7\\"}"}\n| lens_metric_chart title="Maximum of bytes" accessor="2cd09808-3915-49f4-b3b0-82767eba23f7"',
+        state: {
+          datasourceMetaData: {
+            filterableIndexPatterns: [
+              {
+                id: 'logstash-*',
+                title: 'logstash-*',
+              },
+            ],
+          },
+          datasourceStates: {
+            indexpattern: {
+              currentIndexPatternId: 'logstash-*',
+              layers: {
+                'c61a8afb-a185-4fae-a064-fb3846f6c451': {
+                  columnOrder: ['2cd09808-3915-49f4-b3b0-82767eba23f7'],
+                  columns: {
+                    '2cd09808-3915-49f4-b3b0-82767eba23f7': {
+                      dataType: 'number',
+                      isBucketed: false,
+                      label: 'Maximum of bytes',
+                      operationType: 'max',
+                      scale: 'ratio',
+                      sourceField: 'bytes',
+                    },
+                    'd3e62a7a-c259-4fff-a2fc-eebf20b7008a': {
+                      dataType: 'number',
+                      isBucketed: false,
+                      label: 'Minimum of bytes',
+                      operationType: 'min',
+                      scale: 'ratio',
+                      sourceField: 'bytes',
+                    },
+                    'd6e40cea-6299-43b4-9c9d-b4ee305a2ce8': {
+                      dataType: 'date',
+                      isBucketed: true,
+                      label: 'Date Histogram of @timestamp',
+                      operationType: 'date_histogram',
+                      params: {
+                        interval: 'auto',
+                      },
+                      scale: 'interval',
+                      sourceField: '@timestamp',
+                    },
+                  },
+                  indexPatternId: 'logstash-*',
+                },
+              },
+            },
+          },
+          filters: [],
+          query: {
+            language: 'kuery',
+            query: '',
+          },
+          visualization: {
+            accessor: '2cd09808-3915-49f4-b3b0-82767eba23f7',
+            isHorizontal: false,
+            layerId: 'c61a8afb-a185-4fae-a064-fb3846f6c451',
+            layers: [
+              {
+                accessors: [
+                  'd3e62a7a-c259-4fff-a2fc-eebf20b7008a',
+                  '26ef70a9-c837-444c-886e-6bd905ee7335',
+                ],
+                layerId: 'c61a8afb-a185-4fae-a064-fb3846f6c451',
+                seriesType: 'area',
+                splitAccessor: '54cd64ed-2a44-4591-af84-b2624504569a',
+                xAccessor: 'd6e40cea-6299-43b4-9c9d-b4ee305a2ce8',
+              },
+            ],
+            legend: {
+              isVisible: true,
+              position: 'right',
+            },
+            preferredSeriesType: 'area',
+          },
+        },
+        title: 'Artistpreviouslyknownaslens',
+        visualizationType: 'lnsXY',
+      },
+    };
+
+    it('should not change anything by XY visualizations', () => {
+      const target = {
+        ...example,
+        attributes: {
+          ...example.attributes,
+          visualizationType: 'lnsMetric',
+        },
+      };
+      const result = migrations['7.7.0'](target, context);
+      expect(result).toEqual(target);
+    });
+
+    it('should handle missing layers', () => {
+      const result = migrations['7.7.0'](
+        {
+          ...example,
+          attributes: {
+            ...example.attributes,
+            state: {
+              ...example.attributes.state,
+              datasourceStates: {
+                indexpattern: {
+                  layers: [],
+                },
+              },
+            },
+          },
+        },
+        context
+      );
+
+      expect(result.attributes.state.visualization.layers).toEqual([
+        {
+          layerId: 'c61a8afb-a185-4fae-a064-fb3846f6c451',
+          seriesType: 'area',
+          // Removed split accessor
+          splitAccessor: undefined,
+          xAccessor: undefined,
+          // Removed a yAcccessor
+          accessors: [],
+        },
+      ]);
+    });
+
+    it('should remove only missing accessors', () => {
+      const result = migrations['7.7.0'](example, context);
+
+      expect(result.attributes.state.visualization.layers).toEqual([
+        {
+          layerId: 'c61a8afb-a185-4fae-a064-fb3846f6c451',
+          seriesType: 'area',
+          xAccessor: 'd6e40cea-6299-43b4-9c9d-b4ee305a2ce8',
+          // Removed split accessor
+          splitAccessor: undefined,
+          // Removed a yAcccessor
+          accessors: ['d3e62a7a-c259-4fff-a2fc-eebf20b7008a'],
+        },
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/lens/server/migrations.ts b/x-pack/plugins/lens/server/migrations.ts
new file mode 100644
index 0000000000000..3d238723b7438
--- /dev/null
+++ b/x-pack/plugins/lens/server/migrations.ts
@@ -0,0 +1,37 @@
+/*
+ * 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 { cloneDeep } from 'lodash';
+import { SavedObjectMigrationFn } from 'src/core/server';
+
+interface XYLayerPre77 {
+  layerId: string;
+  xAccessor: string;
+  splitAccessor: string;
+  accessors: string[];
+}
+
+export const migrations: Record<string, SavedObjectMigrationFn> = {
+  '7.7.0': doc => {
+    const newDoc = cloneDeep(doc);
+    if (newDoc.attributes?.visualizationType === 'lnsXY') {
+      const datasourceState = newDoc.attributes.state?.datasourceStates?.indexpattern;
+      const datasourceLayers = datasourceState?.layers ?? {};
+      const xyState = newDoc.attributes.state?.visualization;
+      newDoc.attributes.state.visualization.layers = xyState.layers.map((layer: XYLayerPre77) => {
+        const layerId = layer.layerId;
+        const datasource = datasourceLayers[layerId];
+        return {
+          ...layer,
+          xAccessor: datasource?.columns[layer.xAccessor] ? layer.xAccessor : undefined,
+          splitAccessor: datasource?.columns[layer.splitAccessor] ? layer.splitAccessor : undefined,
+          accessors: layer.accessors.filter(accessor => !!datasource?.columns[accessor]),
+        };
+      }) as typeof xyState.layers;
+    }
+    return newDoc;
+  },
+};
diff --git a/x-pack/plugins/lens/server/saved_objects.ts b/x-pack/plugins/lens/server/saved_objects.ts
index 42dc750878f45..b2eb325c09266 100644
--- a/x-pack/plugins/lens/server/saved_objects.ts
+++ b/x-pack/plugins/lens/server/saved_objects.ts
@@ -6,6 +6,7 @@
 
 import { CoreSetup } from 'kibana/server';
 import { getEditPath } from '../common';
+import { migrations } from './migrations';
 
 export function setupSavedObjects(core: CoreSetup) {
   core.savedObjects.registerType({
@@ -22,6 +23,7 @@ export function setupSavedObjects(core: CoreSetup) {
         uiCapabilitiesPath: 'visualize.show',
       }),
     },
+    migrations,
     mappings: {
       properties: {
         title: {
diff --git a/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
index 91354155cacb0..4fc3c438e76d6 100644
--- a/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
+++ b/x-pack/plugins/remote_clusters/public/application/services/ui_metric.ts
@@ -3,17 +3,24 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
+import { UiStatsMetricType, METRIC_TYPE } from '@kbn/analytics';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
-import { UiStatsMetricType } from '@kbn/analytics';
 import { UIM_APP_NAME } from '../constants';
 
-export let trackUiMetric: (metricType: UiStatsMetricType, eventName: string) => void;
-export let METRIC_TYPE: UsageCollectionSetup['METRIC_TYPE'];
+export { METRIC_TYPE };
+
+export let usageCollection: UsageCollectionSetup | undefined;
+
+export function init(_usageCollection: UsageCollectionSetup): void {
+  usageCollection = _usageCollection;
+}
 
-export function init(usageCollection: UsageCollectionSetup): void {
-  trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, UIM_APP_NAME);
-  METRIC_TYPE = usageCollection.METRIC_TYPE;
+export function trackUiMetric(metricType: UiStatsMetricType, name: string) {
+  if (!usageCollection) {
+    return;
+  }
+  const { reportUiStats } = usageCollection;
+  reportUiStats(UIM_APP_NAME, metricType, name);
 }
 
 /**
diff --git a/x-pack/plugins/uptime/server/graphql/index.ts b/x-pack/plugins/uptime/server/graphql/index.ts
index 49ba5583b417b..a88afd7ac769c 100644
--- a/x-pack/plugins/uptime/server/graphql/index.ts
+++ b/x-pack/plugins/uptime/server/graphql/index.ts
@@ -5,14 +5,13 @@
  */
 
 import { createMonitorStatesResolvers, monitorStatesSchema } from './monitor_states';
-import { createPingsResolvers, pingsSchema } from './pings';
+import { pingsSchema } from './pings';
 import { CreateUMGraphQLResolvers } from './types';
 import { unsignedIntegerResolverFunctions, unsignedIntegerSchema } from './unsigned_int_scalar';
 
 export { DEFAULT_GRAPHQL_PATH } from './constants';
 export const resolvers: CreateUMGraphQLResolvers[] = [
   createMonitorStatesResolvers,
-  createPingsResolvers,
   unsignedIntegerResolverFunctions,
 ];
 export const typeDefs: any[] = [pingsSchema, unsignedIntegerSchema, monitorStatesSchema];
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 6ab564fdeb532..040ad99ac0c64 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
@@ -169,7 +169,7 @@ export const monitorStatesSchema = gql`
     DESC
   }
 
-  extend type Query {
+  type Query {
     "Fetches the current state of Uptime monitors for the given parameters."
     getMonitorStates(
       dateRangeStart: String!
diff --git a/x-pack/plugins/uptime/server/graphql/pings/index.ts b/x-pack/plugins/uptime/server/graphql/pings/index.ts
index 57ec3242a7aa9..100ce29c398ec 100644
--- a/x-pack/plugins/uptime/server/graphql/pings/index.ts
+++ b/x-pack/plugins/uptime/server/graphql/pings/index.ts
@@ -4,5 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { createPingsResolvers } from './resolvers';
 export { pingsSchema } from './schema.gql';
diff --git a/x-pack/plugins/uptime/server/graphql/pings/resolvers.ts b/x-pack/plugins/uptime/server/graphql/pings/resolvers.ts
deleted file mode 100644
index 2bb1e13bc4b1f..0000000000000
--- a/x-pack/plugins/uptime/server/graphql/pings/resolvers.ts
+++ /dev/null
@@ -1,59 +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 { UMResolver } from '../../../../../legacy/plugins/uptime/common/graphql/resolver_types';
-import {
-  AllPingsQueryArgs,
-  PingResults,
-} from '../../../../../legacy/plugins/uptime/common/graphql/types';
-import { UMServerLibs } from '../../lib/lib';
-import { UMContext } from '../types';
-import { CreateUMGraphQLResolvers } from '../types';
-import { savedObjectsAdapter } from '../../lib/saved_objects';
-
-export type UMAllPingsResolver = UMResolver<
-  PingResults | Promise<PingResults>,
-  any,
-  AllPingsQueryArgs,
-  UMContext
->;
-
-export interface UMPingResolver {
-  allPings: () => PingResults;
-}
-
-export const createPingsResolvers: CreateUMGraphQLResolvers = (
-  libs: UMServerLibs
-): {
-  Query: {
-    allPings: UMAllPingsResolver;
-  };
-} => ({
-  Query: {
-    async allPings(
-      _resolver,
-      { monitorId, sort, size, status, dateRangeStart, dateRangeEnd, location, page },
-      { APICaller, savedObjectsClient }
-    ): Promise<PingResults> {
-      const dynamicSettings = await savedObjectsAdapter.getUptimeDynamicSettings(
-        savedObjectsClient
-      );
-
-      return await libs.requests.getPings({
-        callES: APICaller,
-        dynamicSettings,
-        dateRangeStart,
-        dateRangeEnd,
-        monitorId,
-        status,
-        sort,
-        size,
-        location,
-        page,
-      });
-    },
-  },
-});
diff --git a/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts b/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts
index 25767fb544104..179bca53db161 100644
--- a/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts
+++ b/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts
@@ -7,10 +7,6 @@
 import gql from 'graphql-tag';
 
 export const pingsSchema = gql`
-  schema {
-    query: Query
-  }
-
   type PingResults {
     "Total number of matching pings"
     total: UnsignedInteger!
@@ -20,28 +16,6 @@ export const pingsSchema = gql`
     pings: [Ping!]!
   }
 
-  type Query {
-    "Get a list of all recorded pings for all monitors"
-    allPings(
-      "Optional: the direction to sort by. Accepts 'asc' and 'desc'. Defaults to 'desc'."
-      sort: String
-      "Optional: the number of results to return."
-      size: Int
-      "Optional: the monitor ID filter."
-      monitorId: String
-      "Optional: the check status to filter by."
-      status: String
-      "The lower limit of the date range."
-      dateRangeStart: String!
-      "The upper limit of the date range."
-      dateRangeEnd: String!
-      "Optional: agent location to filter by."
-      location: String
-      "Optional: current page."
-      page: Int
-    ): PingResults!
-  }
-
   type ContainerImage {
     name: String
     tag: String
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
index 112c8e97d4c00..cf8414a3b0a68 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_latest_monitor.test.ts
@@ -42,10 +42,16 @@ describe('getLatestMonitor', () => {
       hits: {
         hits: [
           {
+            _id: 'fejwio32',
             _source: {
-              timestamp: 123456,
+              '@timestamp': '123456',
               monitor: {
+                duration: {
+                  us: 12345,
+                },
                 id: 'testMonitor',
+                status: 'down',
+                type: 'http',
               },
             },
           },
@@ -64,7 +70,22 @@ describe('getLatestMonitor', () => {
       monitorId: 'testMonitor',
     });
 
-    expect(result.timestamp).toBe(123456);
+    expect(result).toMatchInlineSnapshot(`
+      Object {
+        "@timestamp": "123456",
+        "docId": "fejwio32",
+        "monitor": Object {
+          "duration": Object {
+            "us": 12345,
+          },
+          "id": "testMonitor",
+          "status": "down",
+          "type": "http",
+        },
+        "timestamp": "123456",
+      }
+    `);
+    expect(result.timestamp).toBe('123456');
     expect(result.monitor).not.toBeFalsy();
     expect(result?.monitor?.id).toBe('testMonitor');
     expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetLatestSearchParams);
diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
index 9145ccca1b6d1..fcf773db23de6 100644
--- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_pings.test.ts
@@ -17,16 +17,34 @@ describe('getAll', () => {
       {
         _source: {
           '@timestamp': '2018-10-30T18:51:59.792Z',
+          monitor: {
+            duration: { us: 2134 },
+            id: 'foo',
+            status: 'up',
+            type: 'http',
+          },
         },
       },
       {
         _source: {
           '@timestamp': '2018-10-30T18:53:59.792Z',
+          monitor: {
+            duration: { us: 2131 },
+            id: 'foo',
+            status: 'up',
+            type: 'http',
+          },
         },
       },
       {
         _source: {
           '@timestamp': '2018-10-30T18:55:59.792Z',
+          monitor: {
+            duration: { us: 2132 },
+            id: 'foo',
+            status: 'up',
+            type: 'http',
+          },
         },
       },
     ];
@@ -48,7 +66,7 @@ describe('getAll', () => {
       body: {
         query: {
           bool: {
-            filter: [{ range: { '@timestamp': { gte: 'now-1h', lte: 'now' } } }],
+            filter: [{ range: { timestamp: { gte: 'now-1h', lte: 'now' } } }],
           },
         },
         aggregations: {
@@ -60,8 +78,7 @@ describe('getAll', () => {
             },
           },
         },
-        sort: [{ '@timestamp': { order: 'desc' } }],
-        size: 12,
+        sort: [{ timestamp: { order: 'desc' } }],
       },
     };
   });
@@ -72,8 +89,7 @@ describe('getAll', () => {
     const result = await getPings({
       callES: mockEsClient,
       dynamicSettings: defaultDynamicSettings,
-      dateRangeStart: 'now-1h',
-      dateRangeEnd: 'now',
+      dateRange: { from: 'now-1h', to: 'now' },
       sort: 'asc',
       size: 12,
     });
@@ -95,15 +111,54 @@ describe('getAll', () => {
     await getPings({
       callES: mockEsClient,
       dynamicSettings: defaultDynamicSettings,
-      dateRangeStart: 'now-1h',
-      dateRangeEnd: 'now',
+      dateRange: { from: 'now-1h', to: 'now' },
       sort: 'asc',
       size: 12,
     });
-    set(expectedGetAllParams, 'body.sort[0]', { '@timestamp': { order: 'asc' } });
+    set(expectedGetAllParams, 'body.sort[0]', { timestamp: { order: 'asc' } });
 
     expect(mockEsClient).toHaveBeenCalledTimes(1);
-    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+    expect(mockEsClient.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "search",
+        Object {
+          "body": Object {
+            "aggregations": Object {
+              "locations": Object {
+                "terms": Object {
+                  "field": "observer.geo.name",
+                  "missing": "N/A",
+                  "size": 1000,
+                },
+              },
+            },
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "range": Object {
+                      "@timestamp": Object {
+                        "gte": "now-1h",
+                        "lte": "now",
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+            "size": 12,
+            "sort": Array [
+              Object {
+                "@timestamp": Object {
+                  "order": "asc",
+                },
+              },
+            ],
+          },
+          "index": "heartbeat-8*",
+        },
+      ]
+    `);
   });
 
   it('omits the sort param when no sort passed', async () => {
@@ -112,12 +167,52 @@ describe('getAll', () => {
     await getPings({
       callES: mockEsClient,
       dynamicSettings: defaultDynamicSettings,
-      dateRangeStart: 'now-1h',
-      dateRangeEnd: 'now',
+      dateRange: { from: 'now-1h', to: 'now' },
       size: 12,
     });
 
-    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "search",
+        Object {
+          "body": Object {
+            "aggregations": Object {
+              "locations": Object {
+                "terms": Object {
+                  "field": "observer.geo.name",
+                  "missing": "N/A",
+                  "size": 1000,
+                },
+              },
+            },
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "range": Object {
+                      "@timestamp": Object {
+                        "gte": "now-1h",
+                        "lte": "now",
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+            "size": 12,
+            "sort": Array [
+              Object {
+                "@timestamp": Object {
+                  "order": "desc",
+                },
+              },
+            ],
+          },
+          "index": "heartbeat-8*",
+        },
+      ]
+    `);
   });
 
   it('omits the size param when no size passed', async () => {
@@ -126,14 +221,52 @@ describe('getAll', () => {
     await getPings({
       callES: mockEsClient,
       dynamicSettings: defaultDynamicSettings,
-      dateRangeStart: 'now-1h',
-      dateRangeEnd: 'now',
+      dateRange: { from: 'now-1h', to: 'now' },
       sort: 'desc',
     });
-    delete expectedGetAllParams.body.size;
-    set(expectedGetAllParams, 'body.sort[0].@timestamp.order', 'desc');
 
-    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "search",
+        Object {
+          "body": Object {
+            "aggregations": Object {
+              "locations": Object {
+                "terms": Object {
+                  "field": "observer.geo.name",
+                  "missing": "N/A",
+                  "size": 1000,
+                },
+              },
+            },
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "range": Object {
+                      "@timestamp": Object {
+                        "gte": "now-1h",
+                        "lte": "now",
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+            "size": 25,
+            "sort": Array [
+              Object {
+                "@timestamp": Object {
+                  "order": "desc",
+                },
+              },
+            ],
+          },
+          "index": "heartbeat-8*",
+        },
+      ]
+    `);
   });
 
   it('adds a filter for monitor ID', async () => {
@@ -142,14 +275,57 @@ describe('getAll', () => {
     await getPings({
       callES: mockEsClient,
       dynamicSettings: defaultDynamicSettings,
-      dateRangeStart: 'now-1h',
-      dateRangeEnd: 'now',
+      dateRange: { from: 'now-1h', to: 'now' },
       monitorId: 'testmonitorid',
     });
-    delete expectedGetAllParams.body.size;
-    expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.id': 'testmonitorid' } });
 
-    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "search",
+        Object {
+          "body": Object {
+            "aggregations": Object {
+              "locations": Object {
+                "terms": Object {
+                  "field": "observer.geo.name",
+                  "missing": "N/A",
+                  "size": 1000,
+                },
+              },
+            },
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "range": Object {
+                      "@timestamp": Object {
+                        "gte": "now-1h",
+                        "lte": "now",
+                      },
+                    },
+                  },
+                  Object {
+                    "term": Object {
+                      "monitor.id": "testmonitorid",
+                    },
+                  },
+                ],
+              },
+            },
+            "size": 25,
+            "sort": Array [
+              Object {
+                "@timestamp": Object {
+                  "order": "desc",
+                },
+              },
+            ],
+          },
+          "index": "heartbeat-8*",
+        },
+      ]
+    `);
   });
 
   it('adds a filter for monitor status', async () => {
@@ -158,13 +334,56 @@ describe('getAll', () => {
     await getPings({
       callES: mockEsClient,
       dynamicSettings: defaultDynamicSettings,
-      dateRangeStart: 'now-1h',
-      dateRangeEnd: 'now',
+      dateRange: { from: 'now-1h', to: 'now' },
       status: 'down',
     });
-    delete expectedGetAllParams.body.size;
-    expectedGetAllParams.body.query.bool.filter.push({ term: { 'monitor.status': 'down' } });
 
-    expect(mockEsClient).toHaveBeenCalledWith('search', expectedGetAllParams);
+    expect(mockEsClient).toHaveBeenCalledTimes(1);
+    expect(mockEsClient.mock.calls[0]).toMatchInlineSnapshot(`
+      Array [
+        "search",
+        Object {
+          "body": Object {
+            "aggregations": Object {
+              "locations": Object {
+                "terms": Object {
+                  "field": "observer.geo.name",
+                  "missing": "N/A",
+                  "size": 1000,
+                },
+              },
+            },
+            "query": Object {
+              "bool": Object {
+                "filter": Array [
+                  Object {
+                    "range": Object {
+                      "@timestamp": Object {
+                        "gte": "now-1h",
+                        "lte": "now",
+                      },
+                    },
+                  },
+                  Object {
+                    "term": Object {
+                      "monitor.status": "down",
+                    },
+                  },
+                ],
+              },
+            },
+            "size": 25,
+            "sort": Array [
+              Object {
+                "@timestamp": Object {
+                  "order": "desc",
+                },
+              },
+            ],
+          },
+          "index": "heartbeat-8*",
+        },
+      ]
+    `);
   });
 });
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index 299e3eb6ca3cf..a8e9ccb875a08 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -5,7 +5,7 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { Ping } from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import { Ping } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
 export interface GetLatestMonitorParams {
   /** @member dateRangeStart timestamp bounds */
@@ -53,11 +53,9 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
   };
 
   const result = await callES('search', params);
-  const ping: any = result.hits?.hits?.[0] ?? {};
-  const { '@timestamp': timestamp, ...monitorResult } = ping?._source ?? {};
+  const doc = result.hits?.hits?.[0];
+  const source = doc?._source ?? {};
+  const docId = doc?._id ?? '';
 
-  return {
-    timestamp,
-    ...monitorResult,
-  };
+  return { ...source, docId, timestamp: source['@timestamp'] };
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts b/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
index a49e4c8931142..5a8927764ea5c 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_ping_histogram.ts
@@ -7,8 +7,10 @@
 import { UMElasticsearchQueryFn } from '../adapters';
 import { QUERY } from '../../../../../legacy/plugins/uptime/common/constants';
 import { getFilterClause } from '../helper';
-import { HistogramQueryResult } from './types';
-import { HistogramResult } from '../../../../../legacy/plugins/uptime/common/types';
+import {
+  HistogramResult,
+  HistogramQueryResult,
+} from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
 export interface GetPingHistogramParams {
   /** @member dateRangeStart timestamp bounds */
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts b/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
index c64b5f3ad4af4..6eccfdb13cef7 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
@@ -6,52 +6,28 @@
 
 import { UMElasticsearchQueryFn } from '../adapters/framework';
 import {
-  PingResults,
+  GetPingsParams,
+  HttpResponseBody,
+  PingsResponse,
   Ping,
-  HttpBody,
-} from '../../../../../legacy/plugins/uptime/common/graphql/types';
+} from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
-export interface GetPingsParams {
-  /** @member dateRangeStart timestamp bounds */
-  dateRangeStart: string;
+const DEFAULT_PAGE_SIZE = 25;
 
-  /** @member dateRangeEnd timestamp bounds */
-  dateRangeEnd: string;
-
-  /** @member monitorId optional limit by monitorId */
-  monitorId?: string | null;
-
-  /** @member status optional limit by check statuses */
-  status?: string | null;
-
-  /** @member sort optional sort by timestamp */
-  sort?: string | null;
-
-  /** @member size optional limit query size */
-  size?: number | null;
-
-  /** @member location optional location value for use in filtering*/
-  location?: string | null;
-
-  /** @member page the number to provide to Elasticsearch as the "from" parameter */
-  page?: number;
-}
-
-export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingResults> = async ({
+export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingsResponse> = async ({
   callES,
   dynamicSettings,
-  dateRangeStart,
-  dateRangeEnd,
+  dateRange: { from, to },
+  index,
   monitorId,
   status,
   sort,
-  size,
+  size: sizeParam,
   location,
-  page,
 }) => {
+  const size = sizeParam ?? DEFAULT_PAGE_SIZE;
   const sortParam = { sort: [{ '@timestamp': { order: sort ?? 'desc' } }] };
-  const sizeParam = size ? { size } : undefined;
-  const filter: any[] = [{ range: { '@timestamp': { gte: dateRangeStart, lte: dateRangeEnd } } }];
+  const filter: any[] = [{ range: { '@timestamp': { gte: from, lte: to } } }];
   if (monitorId) {
     filter.push({ term: { 'monitor.id': monitorId } });
   }
@@ -71,7 +47,7 @@ export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingResults> = asy
         ...queryContext,
       },
       ...sortParam,
-      ...sizeParam,
+      size,
       aggregations: {
         locations: {
           terms: {
@@ -85,8 +61,8 @@ export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingResults> = asy
     },
   };
 
-  if (page) {
-    params.body.from = page * (size ?? 25);
+  if (index) {
+    params.body.from = index * size;
   }
 
   const {
@@ -96,25 +72,22 @@ export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingResults> = asy
 
   const locations = aggs?.locations ?? { buckets: [{ key: 'N/A', doc_count: 0 }] };
 
-  const pings: Ping[] = hits.map(({ _id, _source }: any) => {
-    const timestamp = _source['@timestamp'];
-
+  const pings: Ping[] = hits.map((doc: any) => {
+    const { _id, _source } = doc;
     // Calculate here the length of the content string in bytes, this is easier than in client JS, where
     // we don't have access to Buffer.byteLength. There are some hacky ways to do this in the
     // client but this is cleaner.
-    const httpBody: HttpBody | undefined = _source?.http?.response?.body;
+    const httpBody: HttpResponseBody | undefined = _source?.http?.response?.body;
     if (httpBody && httpBody.content) {
       httpBody.content_bytes = Buffer.byteLength(httpBody.content);
     }
 
-    return { id: _id, timestamp, ..._source };
+    return { ..._source, timestamp: _source['@timestamp'], docId: _id };
   });
 
-  const results: PingResults = {
+  return {
     total: total.value,
     locations: locations.buckets.map((bucket: { key: string }) => bucket.key),
     pings,
   };
-
-  return results;
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/index.ts b/x-pack/plugins/uptime/server/lib/requests/index.ts
index 445adc3c15a93..6317f665d377f 100644
--- a/x-pack/plugins/uptime/server/lib/requests/index.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/index.ts
@@ -13,7 +13,7 @@ export { getMonitorLocations, GetMonitorLocationsParams } from './get_monitor_lo
 export { getMonitorStates, GetMonitorStatesParams } from './get_monitor_states';
 export { getMonitorStatus, GetMonitorStatusParams } from './get_monitor_status';
 export * from './get_monitor_status';
-export { getPings, GetPingsParams } from './get_pings';
+export { getPings } from './get_pings';
 export { getPingHistogram, GetPingHistogramParams } from './get_ping_histogram';
 export { UptimeRequests } from './uptime_requests';
 export { getSnapshotCount, GetSnapshotCountParams } from './get_snapshot_counts';
diff --git a/x-pack/plugins/uptime/server/lib/requests/types.ts b/x-pack/plugins/uptime/server/lib/requests/types.ts
deleted file mode 100644
index 53a4e989e3789..0000000000000
--- a/x-pack/plugins/uptime/server/lib/requests/types.ts
+++ /dev/null
@@ -1,72 +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 { Ping, PingResults } from '../../../../../legacy/plugins/uptime/common/graphql/types';
-import { UMElasticsearchQueryFn } from '../adapters';
-import {
-  GetPingHistogramParams,
-  HistogramResult,
-} from '../../../../../legacy/plugins/uptime/common/types';
-
-export interface GetAllParams {
-  /** @member dateRangeStart timestamp bounds */
-  dateRangeStart: string;
-
-  /** @member dateRangeEnd timestamp bounds */
-  dateRangeEnd: string;
-
-  /** @member monitorId optional limit by monitorId */
-  monitorId?: string | null;
-
-  /** @member status optional limit by check statuses */
-  status?: string | null;
-
-  /** @member sort optional sort by timestamp */
-  sort?: string | null;
-
-  /** @member size optional limit query size */
-  size?: number | null;
-
-  /** @member location optional location value for use in filtering*/
-  location?: string | null;
-}
-
-export interface GetLatestMonitorDocsParams {
-  /** @member dateRangeStart timestamp bounds */
-  dateStart?: string;
-
-  /** @member dateRangeEnd timestamp bounds */
-  dateEnd?: string;
-
-  /** @member monitorId optional limit to monitorId */
-  monitorId?: string | null;
-}
-
-/**
- * Count the number of documents in heartbeat indices
- */
-export interface UMPingsAdapter {
-  getAll: UMElasticsearchQueryFn<GetAllParams, PingResults>;
-
-  // Get the monitor meta info regardless of timestamp
-  getMonitor: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping>;
-
-  getLatestMonitorStatus: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping>;
-
-  getPingHistogram: UMElasticsearchQueryFn<GetPingHistogramParams, HistogramResult>;
-}
-
-export interface HistogramQueryResult {
-  key: number;
-  key_as_string: string;
-  doc_count: number;
-  down: {
-    doc_count: number;
-  };
-  up: {
-    doc_count: number;
-  };
-}
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 9d3fa5aa08aed..e9a7aa94dd3aa 100644
--- a/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/uptime_requests.ts
@@ -5,7 +5,12 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import { Ping, PingResults } from '../../../../../legacy/plugins/uptime/common/graphql/types';
+import {
+  HistogramResult,
+  Ping,
+  PingsResponse as PingResults,
+  GetPingsParams,
+} from '../../../../../legacy/plugins/uptime/common/runtime_types';
 import {
   GetFilterBarParams,
   GetLatestMonitorParams,
@@ -13,7 +18,6 @@ import {
   GetMonitorDetailsParams,
   GetMonitorLocationsParams,
   GetMonitorStatesParams,
-  GetPingsParams,
   GetPingHistogramParams,
   GetMonitorStatusParams,
   GetMonitorStatusResult,
@@ -27,10 +31,7 @@ import {
 } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 import { GetMonitorStatesResult } from './get_monitor_states';
 import { GetSnapshotCountParams } from './get_snapshot_counts';
-import {
-  HistogramResult,
-  MonitorDurationResult,
-} from '../../../../../legacy/plugins/uptime/common/types';
+import { MonitorDurationResult } from '../../../../../legacy/plugins/uptime/common/types';
 
 type ESQ<P, R> = UMElasticsearchQueryFn<P, R>;
 
diff --git a/x-pack/plugins/uptime/server/rest_api/index.ts b/x-pack/plugins/uptime/server/rest_api/index.ts
index c84ea71037953..c0412e588fa93 100644
--- a/x-pack/plugins/uptime/server/rest_api/index.ts
+++ b/x-pack/plugins/uptime/server/rest_api/index.ts
@@ -5,7 +5,7 @@
  */
 
 import { createGetOverviewFilters } from './overview_filters';
-import { createGetPingsRoute } from './pings';
+import { createGetPingHistogramRoute, createGetPingsRoute } from './pings';
 import { createGetDynamicSettingsRoute, createPostDynamicSettingsRoute } from './dynamic_settings';
 import { createLogPageViewRoute } from './telemetry';
 import { createGetSnapshotCount } from './snapshot';
@@ -15,10 +15,8 @@ import {
   createGetMonitorLocationsRoute,
   createGetStatusBarRoute,
 } 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';
 export { uptimeRouteWrapper } from './uptime_route_wrapper';
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/get_all.ts b/x-pack/plugins/uptime/server/rest_api/pings/get_all.ts
deleted file mode 100644
index c76892103da6b..0000000000000
--- a/x-pack/plugins/uptime/server/rest_api/pings/get_all.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { schema } from '@kbn/config-schema';
-import { UMServerLibs } from '../../lib/lib';
-import { UMRestApiRouteFactory } from '../types';
-import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
-
-export const createGetAllRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
-  method: 'GET',
-  path: API_URLS.PINGS,
-  validate: {
-    query: schema.object({
-      dateRangeStart: schema.string(),
-      dateRangeEnd: schema.string(),
-      location: schema.maybe(schema.string()),
-      monitorId: schema.maybe(schema.string()),
-      size: schema.maybe(schema.number()),
-      sort: schema.maybe(schema.string()),
-      status: schema.maybe(schema.string()),
-    }),
-  },
-  handler: async ({ callES, dynamicSettings }, _context, request, response): Promise<any> => {
-    const { dateRangeStart, dateRangeEnd, location, monitorId, size, sort, status } = request.query;
-
-    const result = await libs.requests.getPings({
-      callES,
-      dynamicSettings,
-      dateRangeStart,
-      dateRangeEnd,
-      monitorId,
-      status,
-      sort,
-      size,
-      location,
-    });
-
-    return response.ok({
-      body: {
-        ...result,
-      },
-    });
-  },
-});
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts b/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
index cde9a8c4e47ea..80a887a7f64a9 100644
--- a/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
+++ b/x-pack/plugins/uptime/server/rest_api/pings/get_pings.ts
@@ -5,37 +5,41 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { isLeft } from 'fp-ts/lib/Either';
+import { PathReporter } from 'io-ts/lib/PathReporter';
 import { UMServerLibs } from '../../lib/lib';
 import { UMRestApiRouteFactory } from '../types';
 import { API_URLS } from '../../../../../legacy/plugins/uptime/common/constants/rest_api';
+import { GetPingsParamsType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
 
 export const createGetPingsRoute: UMRestApiRouteFactory = (libs: UMServerLibs) => ({
   method: 'GET',
   path: API_URLS.PINGS,
   validate: {
     query: schema.object({
-      dateRangeStart: schema.string(),
-      dateRangeEnd: schema.string(),
+      from: schema.string(),
+      to: schema.string(),
       location: schema.maybe(schema.string()),
       monitorId: schema.maybe(schema.string()),
+      index: schema.maybe(schema.number()),
       size: schema.maybe(schema.number()),
       sort: schema.maybe(schema.string()),
       status: schema.maybe(schema.string()),
     }),
   },
   handler: async ({ callES, dynamicSettings }, _context, request, response): Promise<any> => {
-    const { dateRangeStart, dateRangeEnd, location, monitorId, size, sort, status } = request.query;
+    const { from, to, ...optional } = request.query;
+    const params = GetPingsParamsType.decode({ dateRange: { from, to }, ...optional });
+    if (isLeft(params)) {
+      // eslint-disable-next-line no-console
+      console.error(new Error(PathReporter.report(params).join(';')));
+      return response.badRequest({ body: { message: 'Received invalid request parameters.' } });
+    }
 
     const result = await libs.requests.getPings({
       callES,
       dynamicSettings,
-      dateRangeStart,
-      dateRangeEnd,
-      monitorId,
-      status,
-      sort,
-      size,
-      location,
+      ...params.right,
     });
 
     return response.ok({
diff --git a/x-pack/plugins/uptime/server/rest_api/pings/index.ts b/x-pack/plugins/uptime/server/rest_api/pings/index.ts
index abb7da26f994f..a10ab435e4b0a 100644
--- a/x-pack/plugins/uptime/server/rest_api/pings/index.ts
+++ b/x-pack/plugins/uptime/server/rest_api/pings/index.ts
@@ -5,3 +5,4 @@
  */
 
 export { createGetPingsRoute } from './get_pings';
+export { createGetPingHistogramRoute } from './get_ping_histogram';
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 4c3b7f97c9544..8b82735fc38b0 100644
--- a/x-pack/test/api_integration/apis/uptime/feature_controls.ts
+++ b/x-pack/test/api_integration/apis/uptime/feature_controls.ts
@@ -40,7 +40,7 @@ export default function featureControlsTests({ getService }: FtrProviderContext)
   const executePingsRequest = async (username: string, password: string, spaceId?: string) => {
     const basePath = spaceId ? `/s/${spaceId}` : '';
 
-    const url = `${basePath}${API_URLS.PINGS}?sort=desc&dateRangeStart=${PINGS_DATE_RANGE_START}&dateRangeEnd=${PINGS_DATE_RANGE_END}`;
+    const url = `${basePath}${API_URLS.PINGS}?sort=desc&from=${PINGS_DATE_RANGE_START}&to=${PINGS_DATE_RANGE_END}`;
     return await supertest
       .get(url)
       .auth(username, password)
diff --git a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
index 666986e7008b7..0b3f5faccb044 100644
--- a/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
+++ b/x-pack/test/api_integration/apis/uptime/get_all_pings.ts
@@ -22,7 +22,7 @@ export default function({ getService }: FtrProviderContext) {
     it('should get all pings stored in index', async () => {
       const { body: apiResponse } = await supertest
         .get(
-          `/api/uptime/pings?sort=desc&dateRangeStart=${PINGS_DATE_RANGE_START}&dateRangeEnd=${PINGS_DATE_RANGE_END}`
+          `/api/uptime/pings?sort=desc&from=${PINGS_DATE_RANGE_START}&to=${PINGS_DATE_RANGE_END}`
         )
         .expect(200);
 
@@ -33,21 +33,19 @@ export default function({ getService }: FtrProviderContext) {
 
     it('should sort pings according to timestamp', async () => {
       const { body: apiResponse } = await supertest
-        .get(
-          `/api/uptime/pings?sort=asc&dateRangeStart=${PINGS_DATE_RANGE_START}&dateRangeEnd=${PINGS_DATE_RANGE_END}`
-        )
+        .get(`/api/uptime/pings?sort=asc&from=${PINGS_DATE_RANGE_START}&to=${PINGS_DATE_RANGE_END}`)
         .expect(200);
 
       expect(apiResponse.total).to.be(2);
       expect(apiResponse.pings.length).to.be(2);
-      expect(apiResponse.pings[0].timestamp).to.be('2018-10-30T14:49:23.889Z');
-      expect(apiResponse.pings[1].timestamp).to.be('2018-10-30T18:51:56.792Z');
+      expect(apiResponse.pings[0]['@timestamp']).to.be('2018-10-30T14:49:23.889Z');
+      expect(apiResponse.pings[1]['@timestamp']).to.be('2018-10-30T18:51:56.792Z');
     });
 
     it('should return results of n length', async () => {
       const { body: apiResponse } = await supertest
         .get(
-          `/api/uptime/pings?sort=desc&size=1&dateRangeStart=${PINGS_DATE_RANGE_START}&dateRangeEnd=${PINGS_DATE_RANGE_END}`
+          `/api/uptime/pings?sort=desc&size=1&from=${PINGS_DATE_RANGE_START}&to=${PINGS_DATE_RANGE_END}`
         )
         .expect(200);
 
@@ -57,10 +55,10 @@ export default function({ getService }: FtrProviderContext) {
     });
 
     it('should miss pings outside of date range', async () => {
-      const dateRangeStart = moment('2002-01-01').valueOf();
-      const dateRangeEnd = moment('2002-01-02').valueOf();
+      const from = moment('2002-01-01').valueOf();
+      const to = moment('2002-01-02').valueOf();
       const { body: apiResponse } = await supertest
-        .get(`/api/uptime/pings?dateRangeStart=${dateRangeStart}&dateRangeEnd=${dateRangeEnd}`)
+        .get(`/api/uptime/pings?from=${from}&to=${to}`)
         .expect(200);
 
       expect(apiResponse.total).to.be(0);
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list.json
deleted file mode 100644
index 330ec83931a62..0000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list.json
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-  "allPings": {
-    "total": 2000,
-    "locations": [
-      "mpls"
-    ],
-    "pings": [
-      {
-        "timestamp": "2019-09-11T03:40:34.410Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 413
-          },
-          "id": "0074-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 441
-          },
-          "id": "0073-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 482
-          },
-          "id": "0099-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 558
-          },
-          "id": "0098-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 304
-          },
-          "id": "0075-intermittent",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.405Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 487
-          },
-          "id": "0097-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.405Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 602
-          },
-          "id": "0049-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.390Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 365
-          },
-          "id": "0047-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.389Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 870
-          },
-          "id": "0077-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.387Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 2808
-          },
-          "id": "0076-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_count.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_count.json
deleted file mode 100644
index 3a619f517626a..0000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_count.json
+++ /dev/null
@@ -1,1569 +0,0 @@
-{
-  "allPings": {
-    "total": 2000,
-    "locations": [
-      "mpls"
-    ],
-    "pings": [
-      {
-        "timestamp": "2019-09-11T03:40:34.410Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 413
-          },
-          "id": "0074-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 441
-          },
-          "id": "0073-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 482
-          },
-          "id": "0099-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 558
-          },
-          "id": "0098-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.406Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 304
-          },
-          "id": "0075-intermittent",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.405Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 487
-          },
-          "id": "0097-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.405Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 602
-          },
-          "id": "0049-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.390Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 365
-          },
-          "id": "0047-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.389Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 870
-          },
-          "id": "0077-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.387Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 2808
-          },
-          "id": "0076-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.386Z",
-        "http": {
-          "response": {
-            "status_code": 400,
-            "body": {
-              "bytes": 3,
-              "hash": "26d228663f13a88592a12d16cf9587caab0388b262d6d9f126ed62f9333aca94",
-              "content": "400",
-              "content_bytes": 3
-            }
-          }
-        },
-        "error": {
-          "message": "400 Bad Request",
-          "type": "validate"
-        },
-        "monitor": {
-          "duration": {
-            "us": 4258
-          },
-          "id": "0050-down",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "down",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.386Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 4784
-          },
-          "id": "0048-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.376Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 14580
-          },
-          "id": "0072-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.376Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 14679
-          },
-          "id": "0096-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15308
-          },
-          "id": "0092-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15183
-          },
-          "id": "0069-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15013
-          },
-          "id": "0093-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 400,
-            "body": {
-              "bytes": 3,
-              "hash": "26d228663f13a88592a12d16cf9587caab0388b262d6d9f126ed62f9333aca94",
-              "content": "400",
-              "content_bytes": 3
-            }
-          }
-        },
-        "error": {
-          "message": "400 Bad Request",
-          "type": "validate"
-        },
-        "monitor": {
-          "duration": {
-            "us": 15117
-          },
-          "id": "0070-down",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "down",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 14875
-          },
-          "id": "0071-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 14801
-          },
-          "id": "0095-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15065
-          },
-          "id": "0032-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 14911
-          },
-          "id": "0094-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 16135
-          },
-          "id": "0046-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15428
-          },
-          "id": "0091-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15499
-          },
-          "id": "0067-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15464
-          },
-          "id": "0068-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 21736
-          },
-          "id": "0090-intermittent",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 21874
-          },
-          "id": "0031-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.374Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 36584
-          },
-          "id": "0066-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 3148
-          },
-          "id": "0084-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 13442
-          },
-          "id": "0083-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 13666
-          },
-          "id": "0041-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 16290
-          },
-          "id": "0045-intermittent",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 17255
-          },
-          "id": "0042-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 500,
-            "body": {
-              "bytes": 3,
-              "hash": "0604cd3138feed202ef293e062da2f4720f77a05d25ee036a7a01c9cfcdd1f0a",
-              "content": "500",
-              "content_bytes": 3
-            }
-          }
-        },
-        "error": {
-          "message": "500 Internal Server Error",
-          "type": "validate"
-        },
-        "monitor": {
-          "duration": {
-            "us": 17146
-          },
-          "id": "0030-intermittent",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "down",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 17770
-          },
-          "id": "0063-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 18194
-          },
-          "id": "0061-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 17587
-          },
-          "id": "0065-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 22666
-          },
-          "id": "0062-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 33311
-          },
-          "id": "0026-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 33506
-          },
-          "id": "0085-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 33974
-          },
-          "id": "0025-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 33693
-          },
-          "id": "0088-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 33833
-          },
-          "id": "0089-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 34600
-          },
-          "id": "0087-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 35573
-          },
-          "id": "0028-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 35830
-          },
-          "id": "0086-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 35698
-          },
-          "id": "0064-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 35594
-          },
-          "id": "0029-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 35652
-          },
-          "id": "0044-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_monitor_id.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_monitor_id.json
deleted file mode 100644
index 5826fd9f3f540..0000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_monitor_id.json
+++ /dev/null
@@ -1,475 +0,0 @@
-{
-  "allPings": {
-    "total": 20,
-    "locations": [
-      "mpls"
-    ],
-    "pings": [
-      {
-        "timestamp": "2019-09-11T03:40:34.371Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 35534
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:40:04.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 3080
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:39:34.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 7810
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:39:04.371Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 1575
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:38:34.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 1787
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:38:04.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 654
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:37:34.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 15915
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:37:04.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 2679
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:36:34.371Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 2104
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:36:04.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 5759
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:35:34.373Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 7166
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:35:04.371Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 26830
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:34:34.371Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 993
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:34:04.381Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 3880
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:33:34.371Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 1604
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_sort.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_sort.json
deleted file mode 100644
index b9b8deae2e564..0000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/ping_list_sort.json
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "allPings": {
-    "total": 20,
-    "locations": [
-      "mpls"
-    ],
-    "pings": [
-      {
-        "timestamp": "2019-09-11T03:31:04.380Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 56940
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:31:34.366Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 9861
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:32:04.372Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 2924
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:32:34.375Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 21665
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      },
-      {
-        "timestamp": "2019-09-11T03:33:04.370Z",
-        "http": {
-          "response": {
-            "status_code": 200,
-            "body": {
-              "bytes": 3,
-              "hash": "27badc983df1780b60c2b3fa9d3a19a00e46aac798451f0febdca52920faaddf",
-              "content": null,
-              "content_bytes": null
-            }
-          }
-        },
-        "error": null,
-        "monitor": {
-          "duration": {
-            "us": 2128
-          },
-          "id": "0001-up",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "up",
-          "type": "http"
-        },
-        "observer": {
-          "geo": {
-            "name": "mpls"
-          }
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/index.ts b/x-pack/test/api_integration/apis/uptime/graphql/index.ts
index 2e0b5e2eea2a5..862cce47f257a 100644
--- a/x-pack/test/api_integration/apis/uptime/graphql/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/index.ts
@@ -13,6 +13,5 @@ export default function({ loadTestFile }: FtrProviderContext) {
     // verifying the pre-loaded documents are returned in a way that
     // matches the snapshots contained in './fixtures'
     loadTestFile(require.resolve('./monitor_states'));
-    loadTestFile(require.resolve('./ping_list'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/uptime/graphql/ping_list.ts b/x-pack/test/api_integration/apis/uptime/graphql/ping_list.ts
deleted file mode 100644
index c84b9c382acdd..0000000000000
--- a/x-pack/test/api_integration/apis/uptime/graphql/ping_list.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import expect from '@kbn/expect';
-import { pingsQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
-import { expectFixtureEql } from './helpers/expect_fixture_eql';
-import { Ping, PingResults } from '../../../../../legacy/plugins/uptime/common/graphql/types';
-
-const expectPingFixtureEql = (data: { allPings: PingResults }, fixtureName: string) => {
-  expectFixtureEql(data, fixtureName, d => d.allPings.pings.forEach((p: Ping) => delete p.id));
-};
-
-export default function({ getService }: any) {
-  describe('pingList 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('returns a list of pings for the given date range and default size', async () => {
-      const getPingsQuery = {
-        operationName: 'PingList',
-        query: pingsQueryString,
-        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({ ...getPingsQuery });
-      const {
-        allPings: { pings },
-      } = data;
-      expect(pings).length(10);
-
-      expectPingFixtureEql(data, 'ping_list');
-    });
-
-    it('returns a list of pings for the date range and given size', async () => {
-      const SIZE = 50;
-      const getPingsQuery = {
-        operationName: 'PingList',
-        query: pingsQueryString,
-        variables: {
-          dateRangeStart: '2019-01-28T17:40:08.078Z',
-          dateRangeEnd: '2025-01-28T19:00:16.078Z',
-          size: SIZE,
-        },
-      };
-      const {
-        body: { data },
-      } = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getPingsQuery });
-      const {
-        allPings: { pings },
-      } = data;
-      expect(pings).length(SIZE);
-      expectPingFixtureEql(data, 'ping_list_count');
-    });
-
-    it('returns a list of pings for a monitor ID', async () => {
-      const SIZE = 15;
-      const MONITOR_ID = '0001-up';
-      const getPingsQuery = {
-        operationName: 'PingList',
-        query: pingsQueryString,
-        variables: {
-          dateRangeStart: '2019-01-28T17:40:08.078Z',
-          dateRangeEnd: '2025-01-28T19:00:16.078Z',
-          monitorId: MONITOR_ID,
-          size: SIZE,
-        },
-      };
-      const {
-        body: { data },
-      } = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getPingsQuery });
-      expectPingFixtureEql(data, 'ping_list_monitor_id');
-    });
-
-    it('returns a list of pings sorted ascending', async () => {
-      const SIZE = 5;
-      const MONITOR_ID = '0001-up';
-      const getPingsQuery = {
-        operationName: 'PingList',
-        query: pingsQueryString,
-        variables: {
-          dateRangeStart: '2019-01-28T17:40:08.078Z',
-          dateRangeEnd: '2025-01-28T19:00:16.078Z',
-          monitorId: MONITOR_ID,
-          size: SIZE,
-          sort: 'asc',
-        },
-      };
-      const {
-        body: { data },
-      } = await supertest
-        .post('/api/uptime/graphql')
-        .set('kbn-xsrf', 'foo')
-        .send({ ...getPingsQuery });
-
-      expectPingFixtureEql(data, 'ping_list_sort');
-    });
-  });
-}
diff --git a/x-pack/test/api_integration/apis/uptime/index.ts b/x-pack/test/api_integration/apis/uptime/index.ts
index a21db08d58c4d..8def64b71a110 100644
--- a/x-pack/test/api_integration/apis/uptime/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/index.ts
@@ -10,11 +10,12 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
   const es = getService('legacyEs');
 
   describe('uptime', () => {
-    before(() =>
-      es.indices.delete({
-        index: 'heartbeat*',
-        ignore: [404],
-      })
+    before(
+      async () =>
+        await es.indices.delete({
+          index: 'heartbeat*',
+          ignore: [404],
+        })
     );
 
     loadTestFile(require.resolve('./feature_controls'));
diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
index 2e5854f4d9866..6a832ad8536f7 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
+++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_latest_status.json
@@ -1,16 +1,11 @@
 {
-  "timestamp": "2019-09-11T03:40:34.371Z",
   "observer": {
-    "geo": {
-      "name": "mpls",
-      "location": "37.926868, -78.024902"
-    },
+    "geo": { "name": "mpls", "location": "37.926868, -78.024902" },
     "hostname": "avc-x1x"
   },
+  "@timestamp": "2019-09-11T03:40:34.371Z",
   "monitor": {
-    "duration": {
-      "us": 24627
-    },
+    "duration": { "us": 24627 },
     "ip": "127.0.0.1",
     "name": "",
     "check_group": "d76f0762-d445-11e9-88e3-3e80641b9c71",
@@ -25,5 +20,7 @@
     "domain": "localhost",
     "query": "r=200x1",
     "full": "http://localhost:5678/pattern?r=200x1"
-  }
+  },
+  "docId": "h5toHm0B0I9WX_CznN_V",
+  "timestamp": "2019-09-11T03:40:34.371Z"
 }
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 9b0cd61c22462..3f8df81856f5c 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -45,10 +45,11 @@ export default function({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./telemetry_collectors'));
     });
     describe('with real-world data', () => {
-      before('load heartbeat data', async () => await esArchiver.load('uptime/full_heartbeat'));
-      after('unload', async () => await esArchiver.unload('uptime/full_heartbeat'));
+      beforeEach('load heartbeat data', async () => await esArchiver.load('uptime/full_heartbeat'));
+      afterEach('unload', async () => await esArchiver.unload('uptime/full_heartbeat'));
       loadTestFile(require.resolve('./monitor_latest_status'));
       loadTestFile(require.resolve('./ping_histogram'));
+      loadTestFile(require.resolve('./ping_list'));
       loadTestFile(require.resolve('./monitor_duration'));
       loadTestFile(require.resolve('./doc_count'));
     });
diff --git a/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
new file mode 100644
index 0000000000000..a261763d5991f
--- /dev/null
+++ b/x-pack/test/api_integration/apis/uptime/rest/ping_list.ts
@@ -0,0 +1,178 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import { isLeft } from 'fp-ts/lib/Either';
+import { PathReporter } from 'io-ts/lib/PathReporter';
+import { PingsResponseType } from '../../../../../legacy/plugins/uptime/common/runtime_types';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+function decodePingsResponseData(response: any) {
+  const decoded = PingsResponseType.decode(response);
+  if (isLeft(decoded)) {
+    throw Error(JSON.stringify(PathReporter.report(decoded), null, 2));
+  }
+  return decoded.right;
+}
+
+export default function({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  describe('pingList query', () => {
+    before('load heartbeat data', () => getService('esArchiver').load('uptime/full_heartbeat'));
+    after('unload heartbeat index', () => getService('esArchiver').unload('uptime/full_heartbeat'));
+
+    it('returns a list of pings for the given date range and default size', async () => {
+      const from = '2019-01-28T17:40:08.078Z';
+      const to = '2025-01-28T19:00:16.078Z';
+
+      const apiResponse = await supertest.get(`/api/uptime/pings?from=${from}&to=${to}&size=10`);
+
+      const { total, locations, pings } = decodePingsResponseData(apiResponse.body);
+
+      expect(total).to.be(2000);
+      expect(locations).to.eql(['mpls']);
+      expect(pings).length(10);
+      expect(pings.map(({ monitor: { id } }) => id)).to.eql([
+        '0074-up',
+        '0073-up',
+        '0099-up',
+        '0098-up',
+        '0075-intermittent',
+        '0097-up',
+        '0049-up',
+        '0047-up',
+        '0077-up',
+        '0076-up',
+      ]);
+    });
+
+    it('returns a list of pings for the date range and given size', async () => {
+      const from = '2019-01-28T17:40:08.078Z';
+      const to = '2025-01-28T19:00:16.078Z';
+      const size = 50;
+
+      const apiResponse = await supertest.get(
+        `/api/uptime/pings?from=${from}&to=${to}&size=${size}`
+      );
+
+      const { total, locations, pings } = decodePingsResponseData(apiResponse.body);
+
+      expect(total).to.be(2000);
+      expect(locations).to.eql(['mpls']);
+      expect(pings).length(50);
+      expect(pings.map(({ monitor: { id } }) => id)).to.eql([
+        '0074-up',
+        '0073-up',
+        '0099-up',
+        '0098-up',
+        '0075-intermittent',
+        '0097-up',
+        '0049-up',
+        '0047-up',
+        '0077-up',
+        '0076-up',
+        '0050-down',
+        '0048-up',
+        '0072-up',
+        '0096-up',
+        '0092-up',
+        '0069-up',
+        '0093-up',
+        '0070-down',
+        '0071-up',
+        '0095-up',
+        '0032-up',
+        '0094-up',
+        '0046-up',
+        '0091-up',
+        '0067-up',
+        '0068-up',
+        '0090-intermittent',
+        '0031-up',
+        '0066-up',
+        '0084-up',
+        '0083-up',
+        '0041-up',
+        '0045-intermittent',
+        '0042-up',
+        '0030-intermittent',
+        '0063-up',
+        '0061-up',
+        '0065-up',
+        '0062-up',
+        '0026-up',
+        '0085-up',
+        '0025-up',
+        '0088-up',
+        '0089-up',
+        '0087-up',
+        '0028-up',
+        '0086-up',
+        '0064-up',
+        '0029-up',
+        '0044-up',
+      ]);
+    });
+
+    it('returns a list of pings for a monitor ID', async () => {
+      const from = '2019-01-28T17:40:08.078Z';
+      const to = '2025-01-28T19:00:16.078Z';
+      const monitorId = '0001-up';
+      const size = 15;
+
+      const apiResponse = await supertest.get(
+        `/api/uptime/pings?from=${from}&to=${to}&monitorId=${monitorId}&size=${size}`
+      );
+
+      const { total, locations, pings } = decodePingsResponseData(apiResponse.body);
+
+      expect(total).to.be(20);
+      expect(locations).to.eql(['mpls']);
+      pings.forEach(({ monitor: { id } }) => expect(id).to.eql('0001-up'));
+      expect(pings.map(({ timestamp }) => timestamp)).to.eql([
+        '2019-09-11T03:40:34.371Z',
+        '2019-09-11T03:40:04.370Z',
+        '2019-09-11T03:39:34.370Z',
+        '2019-09-11T03:39:04.371Z',
+        '2019-09-11T03:38:34.370Z',
+        '2019-09-11T03:38:04.370Z',
+        '2019-09-11T03:37:34.370Z',
+        '2019-09-11T03:37:04.370Z',
+        '2019-09-11T03:36:34.371Z',
+        '2019-09-11T03:36:04.370Z',
+        '2019-09-11T03:35:34.373Z',
+        '2019-09-11T03:35:04.371Z',
+        '2019-09-11T03:34:34.371Z',
+        '2019-09-11T03:34:04.381Z',
+        '2019-09-11T03:33:34.371Z',
+      ]);
+    });
+
+    it('returns a list of pings sorted ascending', async () => {
+      const from = '2019-01-28T17:40:08.078Z';
+      const to = '2025-01-28T19:00:16.078Z';
+      const monitorId = '0001-up';
+      const size = 5;
+      const sort = 'asc';
+
+      const apiResponse = await supertest.get(
+        `/api/uptime/pings?from=${from}&to=${to}&monitorId=${monitorId}&size=${size}&sort=${sort}`
+      );
+
+      const { total, locations, pings } = decodePingsResponseData(apiResponse.body);
+
+      expect(total).to.be(20);
+      expect(locations).to.eql(['mpls']);
+      expect(pings.map(({ timestamp }) => timestamp)).to.eql([
+        '2019-09-11T03:31:04.380Z',
+        '2019-09-11T03:31:34.366Z',
+        '2019-09-11T03:32:04.372Z',
+        '2019-09-11T03:32:34.375Z',
+        '2019-09-11T03:33:04.370Z',
+      ]);
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts
index 90ad1836c69d3..388d660f21eb3 100644
--- a/x-pack/test/functional/apps/uptime/monitor.ts
+++ b/x-pack/test/functional/apps/uptime/monitor.ts
@@ -23,8 +23,33 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await uptimeService.navigation.goToUptime();
     });
 
-    it('loads and displays uptime data based on date range', async () => {
-      await uptime.loadDataAndGoToMonitorPage(dateStart, dateEnd, monitorId);
+    after(async () => {
+      await esArchiver.unload(archive);
+    });
+
+    describe('navigation to monitor page', () => {
+      before(async () => {
+        await uptime.loadDataAndGoToMonitorPage(dateStart, dateEnd, monitorId);
+      });
+
+      it('displays ping data as expected', async () => {
+        await uptime.checkPingListInteractions(
+          [
+            'XZtoHm0B0I9WX_CznN-6',
+            '7ZtoHm0B0I9WX_CzJ96M',
+            'pptnHm0B0I9WX_Czst5X',
+            'I5tnHm0B0I9WX_CzPd46',
+            'y5tmHm0B0I9WX_Czx93x',
+            'XZtmHm0B0I9WX_CzUt3H',
+            '-JtlHm0B0I9WX_Cz3dyX',
+            'k5tlHm0B0I9WX_CzaNxm',
+            'NZtkHm0B0I9WX_Cz89w9',
+            'zJtkHm0B0I9WX_CzftsN',
+          ],
+          'mpls',
+          'up'
+        );
+      });
     });
   });
 };
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 7157bbfb3811b..0ebcb5c87deee 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export function UptimePageProvider({ getPageObjects, getService }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common', 'timePicker']);
-  const { common: commonService, navigation, alerts } = getService('uptime');
+  const { alerts, common: commonService, monitor, navigation } = getService('uptime');
   const retry = getService('retry');
 
   return new (class UptimePage {
@@ -137,6 +137,20 @@ export function UptimePageProvider({ getPageObjects, getService }: FtrProviderCo
       return commonService.clickPageSizeSelectPopoverItem(size);
     }
 
+    public async checkPingListInteractions(
+      timestamps: string[],
+      location?: string,
+      status?: string
+    ): Promise<void> {
+      if (location) {
+        await monitor.setPingListLocation(location);
+      }
+      if (status) {
+        await monitor.setPingListStatus(status);
+      }
+      return monitor.checkForPingListTimestamps(timestamps);
+    }
+
     public async resetFilters() {
       await this.inputFilterQuery('');
       await commonService.resetStatusFilter();
diff --git a/x-pack/test/functional/services/uptime/monitor.ts b/x-pack/test/functional/services/uptime/monitor.ts
index 3bdec4b6749d4..a3e3d953e2eb7 100644
--- a/x-pack/test/functional/services/uptime/monitor.ts
+++ b/x-pack/test/functional/services/uptime/monitor.ts
@@ -27,5 +27,22 @@ export function UptimeMonitorProvider({ getService }: FtrProviderContext) {
         await find.descendantExistsByCssSelector('canvas.mapboxgl-canvas', mapPanel);
       });
     },
+    async setPingListLocation(location: string) {
+      await testSubjects.click('xpack.uptime.pingList.locationSelect', 5000);
+      return testSubjects.click(`xpack.uptime.pingList.locationOptions.${location}`, 5000);
+    },
+    async setPingListStatus(status: string) {
+      await testSubjects.click('xpack.uptime.pingList.statusSelect', 5000);
+      return testSubjects.click(`xpack.uptime.pingList.statusOptions.${status}`, 5000);
+    },
+    async checkForPingListTimestamps(timestamps: string[]): Promise<void> {
+      return retry.tryForTime(10000, async () => {
+        await Promise.all(
+          timestamps.map(timestamp =>
+            testSubjects.existOrFail(`xpack.uptime.pingList.ping-${timestamp}`)
+          )
+        );
+      });
+    },
   };
 }