[7.x] [Uptime] Handle mode: all in uptime snapshot calculation (#41335) (#41424)

* [Uptime] Handle `mode: all` in uptime snapshot calculation (#41335) Patching this function in #41210 fixed performance but was missing this filter clause. We depend on only processing summary info. This fixes errors around missing destructured data where we expect summary fields to be present. * Update snapshot to use heartbeat7.0.0 index for backport
2025-04-24 09:48:58 -04:00 · 2019-07-18 11:07:48 -05:00 · 2019-07-18 11:07:48 -05:00 · f8aed87355
commit f8aed87355
parent 33c373840e
31 changed files with 5392 additions and 1323 deletions
--- a/x-pack/legacy/plugins/uptime/README.md
+++ b/x-pack/legacy/plugins/uptime/README.md
@ -52,8 +52,11 @@ In another shell, from **~kibana/x-pack**:
 #### API tests

 If instead you need to run API tests, start up the test server and then in another shell, from **~kibana/x-pack**:
+
 `node ../scripts/functional_test_runner.js --config test/api_integration/config.js --grep="{TEST_NAME}"`.

+You can update snapshots by prefixing the runner command with `env UPDATE_UPTIME_FIXTURES=1`
+
 You can access the functional test server's Kibana at `http://localhost:5620/`.

 You can login with username `elastic` and password `changeme` by default.
--- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
+++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts
@ -170,7 +170,11 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter {
    const params = {
      index: INDEX_NAMES.HEARTBEAT,
      body: {
-        query,
+        query: {
+          bool: {
+            filter: [{ exists: { field: 'summary.up' } }, query],
+          },
+        },
        size: 0,
        aggs: {
          ids: {
--- a/x-pack/test/api_integration/apis/uptime/graphql/error_list.js
+++ b/x-pack/test/api_integration/apis/uptime/graphql/error_list.js
@ -4,12 +4,8 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-import expect from '@kbn/expect';
 import { errorListQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
-import errorList from './fixtures/error_list';
-import errorListFilteredById from './fixtures/error_list_filtered_by_id';
-import errorListFilteredByPort from './fixtures/error_list_filtered_by_port';
-import errorListFilteredByPortAndType from './fixtures/error_list_filtered_by_port_and_type';
+import { expectFixtureEql } from './expect_fixture_eql';

 export default function ({ getService }) {
  describe('errorList query', () => {
@ -30,7 +26,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getErrorListQuery });
-      expect(data).to.eql(errorList);
+      expectFixtureEql(data, 'error_list');
    });

    it('returns an error list filtered by monitor id', async () => {
@ -49,7 +45,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getErrorListQuery });
-      expect(data).to.eql(errorListFilteredById);
+      expectFixtureEql(data, 'error_list_filtered_by_id');
    });

    it('returns an error list filtered by port', async () => {
@ -68,7 +64,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getErrorListQuery });
-      expect(data).to.eql(errorListFilteredByPort);
+      expectFixtureEql(data, 'error_list_filtered_by_port');
    });

    it('returns an error list filtered by port/type', async () => {
@ -89,7 +85,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getErrorListQuery });
-      expect(data).to.eql(errorListFilteredByPortAndType);
+      expectFixtureEql(data, 'error_list_filtered_by_port_and_type');
    });
  });
 }
--- a/x-pack/test/api_integration/apis/uptime/graphql/expect_fixture_eql.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/expect_fixture_eql.ts
@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import expect from '@kbn/expect';
+import fs from 'fs';
+import { join } from 'path';
+
+const fixturesDir = join(__dirname, 'fixtures');
+
+export const expectFixtureEql = (data: any, fixtureName: string) => {
+  const fixturePath = join(fixturesDir, `${fixtureName}.json`);
+  if (process.env.UPDATE_UPTIME_FIXTURES) {
+    fs.writeFileSync(fixturePath, JSON.stringify(data, null, 2));
+  }
+  const fixture = JSON.parse(fs.readFileSync(fixturePath, 'utf8'));
+  expect(data).to.eql(fixture);
+};
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/doc_count.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/doc_count.json
@ -1 +1 @@
-{ "statesIndexStatus": { "docCount": { "count": 9231 }, "indexExists": true } }
+{ "statesIndexStatus": { "docCount": { "count": 9234 }, "indexExists": true } }
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list.json
@ -11,7 +11,7 @@
      "type": "io"
    },
    {
-      "count": 748,
+      "count": 749,
      "latestMessage": "dial tcp 127.0.0.1:9200: connect: connection refused",
      "location": null,
      "monitorId": "auto-tcp-0X81440A68E839814C",
@ -41,4 +41,4 @@
      "type": "io"
    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_id.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_id.json
@ -11,4 +11,4 @@
      "type": "io"
    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_port.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_port.json
@ -1,7 +1,7 @@
 {
  "errorList": [
    {
-      "count": 748,
+      "count": 749,
      "latestMessage": "dial tcp 127.0.0.1:9200: connect: connection refused",
      "location": null,
      "monitorId": "auto-tcp-0X81440A68E839814C",
@ -11,4 +11,4 @@
      "type": "io"
    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_port_and_type.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_port_and_type.json
@ -11,4 +11,4 @@
      "type": "io"
    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_list.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_list.json
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_list_down_filtered.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_list_down_filtered.json
@ -2,119 +2,351 @@
  "monitorStatus": {
    "monitors": [
      {
-        "id": { "key": "auto-http-0X3675F89EF0612091", "url": "http://localhost:12349/" },
+        "id": {
+          "key": "auto-http-0X3675F89EF0612091",
+          "url": "http://localhost:12349/"
+        },
        "ping": {
          "timestamp": "2019-01-28T18:43:15.077Z",
          "container": null,
          "kubernetes": null,
          "monitor": {
-            "duration": { "us": 3331 },
+            "duration": {
+              "us": 3331
+            },
            "id": "auto-http-0X3675F89EF0612091",
            "ip": "127.0.0.1",
            "name": "",
            "status": "down"
          },
          "observer": null,
-          "url": { "domain": "localhost", "full": "http://localhost:12349/" }
+          "url": {
+            "domain": "localhost",
+            "full": "http://localhost:12349/"
+          }
        },
        "upSeries": [
-          { "x": 1548697571840, "y": null },
-          { "x": 1548697764160, "y": null },
-          { "x": 1548697956480, "y": null },
-          { "x": 1548698148800, "y": null },
-          { "x": 1548698341120, "y": null },
-          { "x": 1548698533440, "y": null },
-          { "x": 1548698725760, "y": null },
-          { "x": 1548698918080, "y": null },
-          { "x": 1548699110400, "y": null },
-          { "x": 1548699302720, "y": null },
-          { "x": 1548699495040, "y": null },
-          { "x": 1548699687360, "y": null },
-          { "x": 1548699879680, "y": null },
-          { "x": 1548700072000, "y": null },
-          { "x": 1548700264320, "y": null },
-          { "x": 1548700456640, "y": null },
-          { "x": 1548700648960, "y": null },
-          { "x": 1548700841280, "y": null }
+          {
+            "x": 1548697571840,
+            "y": null
+          },
+          {
+            "x": 1548697764160,
+            "y": null
+          },
+          {
+            "x": 1548697956480,
+            "y": null
+          },
+          {
+            "x": 1548698148800,
+            "y": null
+          },
+          {
+            "x": 1548698341120,
+            "y": null
+          },
+          {
+            "x": 1548698533440,
+            "y": null
+          },
+          {
+            "x": 1548698725760,
+            "y": null
+          },
+          {
+            "x": 1548698918080,
+            "y": null
+          },
+          {
+            "x": 1548699110400,
+            "y": null
+          },
+          {
+            "x": 1548699302720,
+            "y": null
+          },
+          {
+            "x": 1548699495040,
+            "y": null
+          },
+          {
+            "x": 1548699687360,
+            "y": null
+          },
+          {
+            "x": 1548699879680,
+            "y": null
+          },
+          {
+            "x": 1548700072000,
+            "y": null
+          },
+          {
+            "x": 1548700264320,
+            "y": null
+          },
+          {
+            "x": 1548700456640,
+            "y": null
+          },
+          {
+            "x": 1548700648960,
+            "y": null
+          },
+          {
+            "x": 1548700841280,
+            "y": null
+          }
        ],
        "downSeries": [
-          { "x": 1548697571840, "y": 35 },
-          { "x": 1548697764160, "y": 48 },
-          { "x": 1548697956480, "y": 48 },
-          { "x": 1548698148800, "y": 48 },
-          { "x": 1548698341120, "y": 48 },
-          { "x": 1548698533440, "y": 48 },
-          { "x": 1548698725760, "y": 48 },
-          { "x": 1548698918080, "y": 48 },
-          { "x": 1548699110400, "y": 48 },
-          { "x": 1548699302720, "y": 48 },
-          { "x": 1548699495040, "y": 49 },
-          { "x": 1548699687360, "y": 48 },
-          { "x": 1548699879680, "y": 48 },
-          { "x": 1548700072000, "y": 48 },
-          { "x": 1548700264320, "y": 48 },
-          { "x": 1548700456640, "y": 48 },
-          { "x": 1548700648960, "y": 48 },
-          { "x": 1548700841280, "y": 39 }
+          {
+            "x": 1548697571840,
+            "y": 35
+          },
+          {
+            "x": 1548697764160,
+            "y": 48
+          },
+          {
+            "x": 1548697956480,
+            "y": 48
+          },
+          {
+            "x": 1548698148800,
+            "y": 48
+          },
+          {
+            "x": 1548698341120,
+            "y": 48
+          },
+          {
+            "x": 1548698533440,
+            "y": 48
+          },
+          {
+            "x": 1548698725760,
+            "y": 48
+          },
+          {
+            "x": 1548698918080,
+            "y": 48
+          },
+          {
+            "x": 1548699110400,
+            "y": 48
+          },
+          {
+            "x": 1548699302720,
+            "y": 48
+          },
+          {
+            "x": 1548699495040,
+            "y": 49
+          },
+          {
+            "x": 1548699687360,
+            "y": 48
+          },
+          {
+            "x": 1548699879680,
+            "y": 48
+          },
+          {
+            "x": 1548700072000,
+            "y": 48
+          },
+          {
+            "x": 1548700264320,
+            "y": 48
+          },
+          {
+            "x": 1548700456640,
+            "y": 48
+          },
+          {
+            "x": 1548700648960,
+            "y": 48
+          },
+          {
+            "x": 1548700841280,
+            "y": 39
+          }
        ]
      },
      {
-        "id": { "key": "auto-http-0XA8096548ECEB85B7", "url": "http://www.example.com/" },
+        "id": {
+          "key": "auto-http-0XA8096548ECEB85B7",
+          "url": "http://www.example.com/"
+        },
        "ping": {
          "timestamp": "2019-01-28T18:43:07.078Z",
          "container": null,
          "kubernetes": null,
          "monitor": {
-            "duration": { "us": 4751074 },
+            "duration": {
+              "us": 4751074
+            },
            "id": "auto-http-0XA8096548ECEB85B7",
            "ip": "198.71.248.67",
            "name": "",
            "status": "down"
          },
          "observer": null,
-          "url": { "domain": "www.example.com", "full": "http://www.example.com/" }
+          "url": {
+            "domain": "www.example.com",
+            "full": "http://www.example.com/"
+          }
        },
        "upSeries": [
-          { "x": 1548697571840, "y": null },
-          { "x": 1548697764160, "y": null },
-          { "x": 1548697956480, "y": null },
-          { "x": 1548698148800, "y": null },
-          { "x": 1548698341120, "y": null },
-          { "x": 1548698533440, "y": null },
-          { "x": 1548698725760, "y": null },
-          { "x": 1548698918080, "y": null },
-          { "x": 1548699110400, "y": null },
-          { "x": 1548699302720, "y": null },
-          { "x": 1548699495040, "y": null },
-          { "x": 1548699687360, "y": null },
-          { "x": 1548699879680, "y": null },
-          { "x": 1548700072000, "y": null },
-          { "x": 1548700264320, "y": null },
-          { "x": 1548700456640, "y": null },
-          { "x": 1548700648960, "y": null },
-          { "x": 1548700841280, "y": null }
+          {
+            "x": 1548697571840,
+            "y": null
+          },
+          {
+            "x": 1548697764160,
+            "y": null
+          },
+          {
+            "x": 1548697956480,
+            "y": null
+          },
+          {
+            "x": 1548698148800,
+            "y": null
+          },
+          {
+            "x": 1548698341120,
+            "y": null
+          },
+          {
+            "x": 1548698533440,
+            "y": null
+          },
+          {
+            "x": 1548698725760,
+            "y": null
+          },
+          {
+            "x": 1548698918080,
+            "y": null
+          },
+          {
+            "x": 1548699110400,
+            "y": null
+          },
+          {
+            "x": 1548699302720,
+            "y": null
+          },
+          {
+            "x": 1548699495040,
+            "y": null
+          },
+          {
+            "x": 1548699687360,
+            "y": null
+          },
+          {
+            "x": 1548699879680,
+            "y": null
+          },
+          {
+            "x": 1548700072000,
+            "y": null
+          },
+          {
+            "x": 1548700264320,
+            "y": null
+          },
+          {
+            "x": 1548700456640,
+            "y": null
+          },
+          {
+            "x": 1548700648960,
+            "y": null
+          },
+          {
+            "x": 1548700841280,
+            "y": null
+          }
        ],
        "downSeries": [
-          { "x": 1548697571840, "y": 28 },
-          { "x": 1548697764160, "y": 37 },
-          { "x": 1548697956480, "y": 38 },
-          { "x": 1548698148800, "y": 38 },
-          { "x": 1548698341120, "y": 39 },
-          { "x": 1548698533440, "y": 39 },
-          { "x": 1548698725760, "y": 28 },
-          { "x": 1548698918080, "y": 30 },
-          { "x": 1548699110400, "y": 28 },
-          { "x": 1548699302720, "y": 37 },
-          { "x": 1548699495040, "y": 40 },
-          { "x": 1548699687360, "y": 38 },
-          { "x": 1548699879680, "y": 39 },
-          { "x": 1548700072000, "y": 40 },
-          { "x": 1548700264320, "y": 39 },
-          { "x": 1548700456640, "y": 38 },
-          { "x": 1548700648960, "y": 39 },
-          { "x": 1548700841280, "y": 30 }
+          {
+            "x": 1548697571840,
+            "y": 28
+          },
+          {
+            "x": 1548697764160,
+            "y": 37
+          },
+          {
+            "x": 1548697956480,
+            "y": 38
+          },
+          {
+            "x": 1548698148800,
+            "y": 38
+          },
+          {
+            "x": 1548698341120,
+            "y": 39
+          },
+          {
+            "x": 1548698533440,
+            "y": 39
+          },
+          {
+            "x": 1548698725760,
+            "y": 28
+          },
+          {
+            "x": 1548698918080,
+            "y": 30
+          },
+          {
+            "x": 1548699110400,
+            "y": 28
+          },
+          {
+            "x": 1548699302720,
+            "y": 37
+          },
+          {
+            "x": 1548699495040,
+            "y": 40
+          },
+          {
+            "x": 1548699687360,
+            "y": 38
+          },
+          {
+            "x": 1548699879680,
+            "y": 39
+          },
+          {
+            "x": 1548700072000,
+            "y": 40
+          },
+          {
+            "x": 1548700264320,
+            "y": 39
+          },
+          {
+            "x": 1548700456640,
+            "y": 38
+          },
+          {
+            "x": 1548700648960,
+            "y": 39
+          },
+          {
+            "x": 1548700841280,
+            "y": 30
+          }
        ]
      }
    ]
  }
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_list_up_filtered.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_list_up_filtered.json
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json
@ -1,52 +1,154 @@
 {
  "monitorStates": {
-    "totalSummaryCount": { "count": 9231 },
+    "totalSummaryCount": {
+      "count": 9234
+    },
    "summaries": [
      {
        "monitor_id": "auto-http-0XDD2D4E60FD4A61C3",
        "histogram": {
          "count": 975,
          "points": [
-            { "timestamp": 1548697571840, "up": 37, "down": 0 },
-            { "timestamp": 1548697764160, "up": 52, "down": 0 },
-            { "timestamp": 1548697956480, "up": 51, "down": 0 },
-            { "timestamp": 1548698148800, "up": 52, "down": 0 },
-            { "timestamp": 1548698341120, "up": 58, "down": 0 },
-            { "timestamp": 1548698533440, "up": 58, "down": 0 },
-            { "timestamp": 1548698725760, "up": 51, "down": 0 },
-            { "timestamp": 1548698918080, "up": 52, "down": 0 },
-            { "timestamp": 1548699110400, "up": 61, "down": 0 },
-            { "timestamp": 1548699302720, "up": 60, "down": 0 },
-            { "timestamp": 1548699495040, "up": 61, "down": 0 },
-            { "timestamp": 1548699687360, "up": 63, "down": 0 },
-            { "timestamp": 1548699879680, "up": 62, "down": 0 },
-            { "timestamp": 1548700072000, "up": 62, "down": 0 },
-            { "timestamp": 1548700264320, "up": 52, "down": 0 },
-            { "timestamp": 1548700456640, "up": 51, "down": 0 },
-            { "timestamp": 1548700648960, "up": 51, "down": 0 },
-            { "timestamp": 1548700841280, "up": 41, "down": 0 }
+            {
+              "timestamp": 1548697571840,
+              "up": 37,
+              "down": 0
+            },
+            {
+              "timestamp": 1548697764160,
+              "up": 52,
+              "down": 0
+            },
+            {
+              "timestamp": 1548697956480,
+              "up": 51,
+              "down": 0
+            },
+            {
+              "timestamp": 1548698148800,
+              "up": 52,
+              "down": 0
+            },
+            {
+              "timestamp": 1548698341120,
+              "up": 58,
+              "down": 0
+            },
+            {
+              "timestamp": 1548698533440,
+              "up": 58,
+              "down": 0
+            },
+            {
+              "timestamp": 1548698725760,
+              "up": 51,
+              "down": 0
+            },
+            {
+              "timestamp": 1548698918080,
+              "up": 52,
+              "down": 0
+            },
+            {
+              "timestamp": 1548699110400,
+              "up": 61,
+              "down": 0
+            },
+            {
+              "timestamp": 1548699302720,
+              "up": 60,
+              "down": 0
+            },
+            {
+              "timestamp": 1548699495040,
+              "up": 61,
+              "down": 0
+            },
+            {
+              "timestamp": 1548699687360,
+              "up": 63,
+              "down": 0
+            },
+            {
+              "timestamp": 1548699879680,
+              "up": 62,
+              "down": 0
+            },
+            {
+              "timestamp": 1548700072000,
+              "up": 62,
+              "down": 0
+            },
+            {
+              "timestamp": 1548700264320,
+              "up": 52,
+              "down": 0
+            },
+            {
+              "timestamp": 1548700456640,
+              "up": 51,
+              "down": 0
+            },
+            {
+              "timestamp": 1548700648960,
+              "up": 51,
+              "down": 0
+            },
+            {
+              "timestamp": 1548700841280,
+              "up": 41,
+              "down": 0
+            }
          ]
        },
        "state": {
          "agent": null,
          "checks": [
            {
-              "agent": { "id": "5884d7f7-9a49-4b0e-bff2-72a475aa695f" },
+              "agent": {
+                "id": "5884d7f7-9a49-4b0e-bff2-72a475aa695f"
+              },
              "container": null,
              "kubernetes": null,
-              "monitor": { "ip": "151.101.250.217", "name": "", "status": "up" },
-              "observer": { "geo": { "name": null, "location": null } },
+              "monitor": {
+                "ip": "151.101.250.217",
+                "name": "",
+                "status": "up"
+              },
+              "observer": {
+                "geo": {
+                  "name": null,
+                  "location": null
+                }
+              },
              "timestamp": "1548700993074"
            }
          ],
          "geo": null,
-          "observer": { "geo": { "name": [], "location": null } },
-          "monitor": { "id": null, "name": null, "status": "up", "type": null },
-          "summary": { "up": 1, "down": 0, "geo": null },
-          "url": { "full": "https://www.elastic.co", "domain": "www.elastic.co" },
+          "observer": {
+            "geo": {
+              "name": [],
+              "location": null
+            }
+          },
+          "monitor": {
+            "id": null,
+            "name": null,
+            "status": "up",
+            "type": null
+          },
+          "summary": {
+            "up": 1,
+            "down": 0,
+            "geo": null
+          },
+          "url": {
+            "full": "https://www.elastic.co",
+            "domain": "www.elastic.co"
+          },
          "timestamp": 1548700993074
        }
      }
    ]
  }
-}
+}
--- 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
@ -1,14 +1,18 @@
 {
  "allPings": {
-    "total": 9231,
-    "locations": ["N/A"],
+    "total": 9234,
+    "locations": [
+      "N/A"
+    ],
    "pings": [
      {
        "timestamp": "2019-01-28T18:43:16.078Z",
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3328 },
+          "duration": {
+            "us": 3328
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -26,7 +30,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 3331 },
+          "duration": {
+            "us": 3331
+          },
          "id": "auto-http-0X3675F89EF0612091",
          "ip": "127.0.0.1",
          "name": "",
@ -41,7 +47,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3292 },
+          "duration": {
+            "us": 3292
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -53,10 +61,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:15.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 118727 },
+          "duration": {
+            "us": 118727
+          },
          "id": "auto-http-0X970CBD2F2102BFA8",
          "ip": "172.217.12.132",
          "name": "",
@ -68,10 +82,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:15.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 132169 },
+          "duration": {
+            "us": 132169
+          },
          "id": "auto-http-0X131221E73F825974",
          "ip": "172.217.12.132",
          "name": "",
@ -83,10 +103,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:15.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 247244 },
+          "duration": {
+            "us": 247244
+          },
          "id": "auto-http-0X9CB71300ABD5A2A8",
          "ip": "192.30.253.112",
          "name": "",
@ -101,7 +127,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2080 },
+          "duration": {
+            "us": 2080
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -116,7 +144,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1921 },
+          "duration": {
+            "us": 1921
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -128,10 +158,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:13.074Z",
-        "http": { "response": { "status_code": 301 } },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 299586 },
+          "duration": {
+            "us": 299586
+          },
          "id": "auto-http-0XD9AE729FC1C1E04A",
          "ip": "151.101.249.140",
          "name": "",
@ -143,10 +179,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:13.074Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 850870 },
+          "duration": {
+            "us": 850870
+          },
          "id": "auto-http-0XDD2D4E60FD4A61C3",
          "ip": "151.101.250.217",
          "name": "",
@ -158,4 +200,4 @@
      }
    ]
  }
-}
+}
--- 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
@ -1,14 +1,18 @@
 {
  "allPings": {
-    "total": 9231,
-    "locations": ["N/A"],
+    "total": 9234,
+    "locations": [
+      "N/A"
+    ],
    "pings": [
      {
        "timestamp": "2019-01-28T18:43:16.078Z",
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3328 },
+          "duration": {
+            "us": 3328
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -26,7 +30,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 3331 },
+          "duration": {
+            "us": 3331
+          },
          "id": "auto-http-0X3675F89EF0612091",
          "ip": "127.0.0.1",
          "name": "",
@ -41,7 +47,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3292 },
+          "duration": {
+            "us": 3292
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -53,10 +61,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:15.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 118727 },
+          "duration": {
+            "us": 118727
+          },
          "id": "auto-http-0X970CBD2F2102BFA8",
          "ip": "172.217.12.132",
          "name": "",
@ -68,10 +82,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:15.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 132169 },
+          "duration": {
+            "us": 132169
+          },
          "id": "auto-http-0X131221E73F825974",
          "ip": "172.217.12.132",
          "name": "",
@ -83,10 +103,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:15.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 247244 },
+          "duration": {
+            "us": 247244
+          },
          "id": "auto-http-0X9CB71300ABD5A2A8",
          "ip": "192.30.253.112",
          "name": "",
@ -101,7 +127,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2080 },
+          "duration": {
+            "us": 2080
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -116,7 +144,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1921 },
+          "duration": {
+            "us": 1921
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -128,10 +158,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:13.074Z",
-        "http": { "response": { "status_code": 301 } },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 299586 },
+          "duration": {
+            "us": 299586
+          },
          "id": "auto-http-0XD9AE729FC1C1E04A",
          "ip": "151.101.249.140",
          "name": "",
@ -143,10 +179,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:13.074Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 850870 },
+          "duration": {
+            "us": 850870
+          },
          "id": "auto-http-0XDD2D4E60FD4A61C3",
          "ip": "151.101.250.217",
          "name": "",
@ -161,7 +203,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1771 },
+          "duration": {
+            "us": 1771
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -176,7 +220,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2226 },
+          "duration": {
+            "us": 2226
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -194,7 +240,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 2369 },
+          "duration": {
+            "us": 2369
+          },
          "id": "auto-http-0X3675F89EF0612091",
          "ip": "127.0.0.1",
          "name": "",
@ -206,10 +254,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:11.074Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 148937 },
+          "duration": {
+            "us": 148937
+          },
          "id": "auto-http-0X131221E73F825974",
          "ip": "172.217.12.132",
          "name": "",
@ -221,10 +275,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:11.074Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 235473 },
+          "duration": {
+            "us": 235473
+          },
          "id": "auto-http-0X9CB71300ABD5A2A8",
          "ip": "192.30.253.112",
          "name": "",
@ -239,7 +299,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1076 },
+          "duration": {
+            "us": 1076
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -251,10 +313,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:10.074Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 1032917 },
+          "duration": {
+            "us": 1032917
+          },
          "id": "auto-http-0X970CBD2F2102BFA8",
          "ip": "172.217.12.132",
          "name": "",
@ -269,7 +337,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1824 },
+          "duration": {
+            "us": 1824
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -284,7 +354,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1404 },
+          "duration": {
+            "us": 1404
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -299,7 +371,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3353 },
+          "duration": {
+            "us": 3353
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -317,7 +391,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 3509 },
+          "duration": {
+            "us": 3509
+          },
          "id": "auto-http-0X3675F89EF0612091",
          "ip": "127.0.0.1",
          "name": "",
@ -329,10 +405,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:07.078Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 2836762 },
+          "duration": {
+            "us": 2836762
+          },
          "id": "auto-http-0X131221E73F825974",
          "ip": "172.217.12.132",
          "name": "",
@ -344,10 +426,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:07.078Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 3991372 },
+          "duration": {
+            "us": 3991372
+          },
          "id": "auto-http-0X9CB71300ABD5A2A8",
          "ip": "192.30.253.112",
          "name": "",
@ -359,10 +447,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:07.078Z",
-        "http": { "response": { "status_code": 301 } },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 4058776 },
+          "duration": {
+            "us": 4058776
+          },
          "id": "auto-http-0XD9AE729FC1C1E04A",
          "ip": "151.101.249.140",
          "name": "",
@ -374,10 +468,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:07.078Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 4274310 },
+          "duration": {
+            "us": 4274310
+          },
          "id": "auto-http-0XDD2D4E60FD4A61C3",
          "ip": "151.101.250.217",
          "name": "",
@ -389,10 +489,19 @@
      },
      {
        "timestamp": "2019-01-28T18:43:07.078Z",
-        "http": { "response": { "status_code": 301 } },
-        "error": { "message": "received status code 301 expecting 200", "type": "validate" },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
+        "error": {
+          "message": "received status code 301 expecting 200",
+          "type": "validate"
+        },
        "monitor": {
-          "duration": { "us": 4751074 },
+          "duration": {
+            "us": 4751074
+          },
          "id": "auto-http-0XA8096548ECEB85B7",
          "ip": "198.71.248.67",
          "name": "",
@ -407,7 +516,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1861 },
+          "duration": {
+            "us": 1861
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -422,7 +533,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2476 },
+          "duration": {
+            "us": 2476
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -434,10 +547,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:05.076Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 109030 },
+          "duration": {
+            "us": 109030
+          },
          "id": "auto-http-0X970CBD2F2102BFA8",
          "ip": "172.217.12.132",
          "name": "",
@ -452,7 +571,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3512 },
+          "duration": {
+            "us": 3512
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -464,10 +585,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:04.077Z",
-        "http": { "response": { "status_code": 301 } },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 257046 },
+          "duration": {
+            "us": 257046
+          },
          "id": "auto-http-0XD9AE729FC1C1E04A",
          "ip": "151.101.249.140",
          "name": "",
@ -479,10 +606,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:04.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 443840 },
+          "duration": {
+            "us": 443840
+          },
          "id": "auto-http-0XDD2D4E60FD4A61C3",
          "ip": "151.101.250.217",
          "name": "",
@ -497,7 +630,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3158 },
+          "duration": {
+            "us": 3158
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -515,7 +650,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 3183 },
+          "duration": {
+            "us": 3183
+          },
          "id": "auto-http-0X3675F89EF0612091",
          "ip": "127.0.0.1",
          "name": "",
@ -527,10 +664,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:03.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 213987 },
+          "duration": {
+            "us": 213987
+          },
          "id": "auto-http-0X131221E73F825974",
          "ip": "172.217.12.132",
          "name": "",
@ -542,10 +685,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:03.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 263080 },
+          "duration": {
+            "us": 263080
+          },
          "id": "auto-http-0X9CB71300ABD5A2A8",
          "ip": "192.30.253.112",
          "name": "",
@ -557,10 +706,19 @@
      },
      {
        "timestamp": "2019-01-28T18:43:03.077Z",
-        "http": { "response": { "status_code": 301 } },
-        "error": { "message": "received status code 301 expecting 200", "type": "validate" },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
+        "error": {
+          "message": "received status code 301 expecting 200",
+          "type": "validate"
+        },
        "monitor": {
-          "duration": { "us": 1396605 },
+          "duration": {
+            "us": 1396605
+          },
          "id": "auto-http-0XA8096548ECEB85B7",
          "ip": "198.71.248.67",
          "name": "",
@ -575,7 +733,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1889 },
+          "duration": {
+            "us": 1889
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -590,7 +750,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3191 },
+          "duration": {
+            "us": 3191
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -602,10 +764,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:01.077Z",
-        "http": { "response": { "status_code": 301 } },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 248880 },
+          "duration": {
+            "us": 248880
+          },
          "id": "auto-http-0XD9AE729FC1C1E04A",
          "ip": "151.101.249.140",
          "name": "",
@ -617,10 +785,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:01.077Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 541379 },
+          "duration": {
+            "us": 541379
+          },
          "id": "auto-http-0XDD2D4E60FD4A61C3",
          "ip": "151.101.250.217",
          "name": "",
@ -635,7 +809,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2449 },
+          "duration": {
+            "us": 2449
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -647,10 +823,16 @@
      },
      {
        "timestamp": "2019-01-28T18:43:00.078Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 120545 },
+          "duration": {
+            "us": 120545
+          },
          "id": "auto-http-0X970CBD2F2102BFA8",
          "ip": "172.217.12.132",
          "name": "",
@ -668,7 +850,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 4736 },
+          "duration": {
+            "us": 4736
+          },
          "id": "auto-http-0X3675F89EF0612091",
          "ip": "127.0.0.1",
          "name": "",
@ -683,7 +867,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 4617 },
+          "duration": {
+            "us": 4617
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -695,10 +881,16 @@
      },
      {
        "timestamp": "2019-01-28T18:42:59.075Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 137745 },
+          "duration": {
+            "us": 137745
+          },
          "id": "auto-http-0X131221E73F825974",
          "ip": "172.217.12.132",
          "name": "",
@ -710,10 +902,16 @@
      },
      {
        "timestamp": "2019-01-28T18:42:59.075Z",
-        "http": { "response": { "status_code": 200 } },
+        "http": {
+          "response": {
+            "status_code": 200
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 204668 },
+          "duration": {
+            "us": 204668
+          },
          "id": "auto-http-0X9CB71300ABD5A2A8",
          "ip": "192.30.253.112",
          "name": "",
@ -725,10 +923,19 @@
      },
      {
        "timestamp": "2019-01-28T18:42:59.075Z",
-        "http": { "response": { "status_code": 301 } },
-        "error": { "message": "received status code 301 expecting 200", "type": "validate" },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
+        "error": {
+          "message": "received status code 301 expecting 200",
+          "type": "validate"
+        },
        "monitor": {
-          "duration": { "us": 1911427 },
+          "duration": {
+            "us": 1911427
+          },
          "id": "auto-http-0XA8096548ECEB85B7",
          "ip": "198.71.248.67",
          "name": "",
@ -743,7 +950,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1945 },
+          "duration": {
+            "us": 1945
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -755,10 +964,16 @@
      },
      {
        "timestamp": "2019-01-28T18:42:58.074Z",
-        "http": { "response": { "status_code": 301 } },
+        "http": {
+          "response": {
+            "status_code": 301
+          }
+        },
        "error": null,
        "monitor": {
-          "duration": { "us": 269254 },
+          "duration": {
+            "us": 269254
+          },
          "id": "auto-http-0XD9AE729FC1C1E04A",
          "ip": "151.101.249.140",
          "name": "",
@ -770,4 +985,4 @@
      }
    ]
  }
-}
+}
--- 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
@ -1,14 +1,18 @@
 {
  "allPings": {
-    "total": 3371,
-    "locations": ["N/A"],
+    "total": 3373,
+    "locations": [
+      "N/A"
+    ],
    "pings": [
      {
        "timestamp": "2019-01-28T18:43:16.078Z",
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3328 },
+          "duration": {
+            "us": 3328
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -23,7 +27,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3292 },
+          "duration": {
+            "us": 3292
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -38,7 +44,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2080 },
+          "duration": {
+            "us": 2080
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -53,7 +61,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1921 },
+          "duration": {
+            "us": 1921
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -68,7 +78,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1771 },
+          "duration": {
+            "us": 1771
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -83,7 +95,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2226 },
+          "duration": {
+            "us": 2226
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -98,7 +112,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1076 },
+          "duration": {
+            "us": 1076
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -113,7 +129,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1824 },
+          "duration": {
+            "us": 1824
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -128,7 +146,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1404 },
+          "duration": {
+            "us": 1404
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -143,7 +163,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3353 },
+          "duration": {
+            "us": 3353
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -158,7 +180,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1861 },
+          "duration": {
+            "us": 1861
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -173,7 +197,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 2476 },
+          "duration": {
+            "us": 2476
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -188,7 +214,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3512 },
+          "duration": {
+            "us": 3512
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -203,7 +231,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 3158 },
+          "duration": {
+            "us": 3158
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -218,7 +248,9 @@
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1889 },
+          "duration": {
+            "us": 1889
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -230,4 +262,4 @@
      }
    ]
  }
-}
+}
--- 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
@ -1,14 +1,18 @@
 {
  "allPings": {
-    "total": 3371,
-    "locations": ["N/A"],
+    "total": 3373,
+    "locations": [
+      "N/A"
+    ],
    "pings": [
      {
        "timestamp": "2019-01-28T17:47:06.077Z",
        "http": null,
        "error": null,
        "monitor": {
-          "duration": { "us": 1452 },
+          "duration": {
+            "us": 1452
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -18,6 +22,23 @@
        },
        "observer": null
      },
+      {
+        "timestamp": "2019-01-28T17:47:07.075Z",
+        "http": null,
+        "error": null,
+        "monitor": {
+          "duration": {
+            "us": 1094
+          },
+          "id": "auto-tcp-0X81440A68E839814C",
+          "ip": "127.0.1.0",
+          "name": "",
+          "scheme": null,
+          "status": "up",
+          "type": "tcp"
+        },
+        "observer": null
+      },
      {
        "timestamp": "2019-01-28T17:47:07.075Z",
        "http": null,
@ -26,7 +47,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 1094 },
+          "duration": {
+            "us": 1094
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -44,7 +67,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 1430 },
+          "duration": {
+            "us": 1430
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -62,25 +87,9 @@
          "type": "io"
        },
        "monitor": {
-          "duration": { "us": 1370 },
-          "id": "auto-tcp-0X81440A68E839814C",
-          "ip": "127.0.0.1",
-          "name": "",
-          "scheme": null,
-          "status": "down",
-          "type": "tcp"
-        },
-        "observer": null
-      },
-      {
-        "timestamp": "2019-01-28T17:47:10.075Z",
-        "http": null,
-        "error": {
-          "message": "dial tcp 127.0.0.1:9200: connect: connection refused",
-          "type": "io"
-        },
-        "monitor": {
-          "duration": { "us": 1922 },
+          "duration": {
+            "us": 1370
+          },
          "id": "auto-tcp-0X81440A68E839814C",
          "ip": "127.0.0.1",
          "name": "",
@ -92,4 +101,4 @@
      }
    ]
  }
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json
@ -1 +1,10 @@
-{ "snapshot": { "counts": { "down": 2, "mixed": 0, "up": 8, "total": 10 } } }
+{
+  "snapshot": {
+    "counts": {
+      "down": 2,
+      "mixed": 0,
+      "up": 8,
+      "total": 10
+    }
+  }
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_empty.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_empty.json
@ -1 +1,10 @@
-{ "snapshot": { "counts": { "down": 0, "mixed": 0, "up": 0, "total": 0 } } }
+{
+  "snapshot": {
+    "counts": {
+      "down": 0,
+      "mixed": 0,
+      "up": 0,
+      "total": 0
+    }
+  }
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_down.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_down.json
@ -1,5 +1,10 @@
 {
  "snapshot": {
-    "counts": { "down": 2, "mixed": 0, "up": 0, "total": 10 }
+    "counts": {
+      "down": 2,
+      "mixed": 0,
+      "up": 0,
+      "total": 10
+    }
  }
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_up.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_filtered_by_up.json
@ -1,5 +1,10 @@
 {
  "snapshot": {
-    "counts": { "down": 0, "mixed": 0, "up": 8, "total": 10 }
+    "counts": {
+      "down": 0,
+      "mixed": 0,
+      "up": 8,
+      "total": 10
+    }
  }
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram.json
@ -1,21 +1,123 @@
 {
  "histogram": [
-    { "upCount": 173, "downCount": 201, "x": 1548697764160, "x0": 1548697571840, "y": 1 },
-    { "upCount": 243, "downCount": 277, "x": 1548697956480, "x0": 1548697764160, "y": 1 },
-    { "upCount": 238, "downCount": 278, "x": 1548698148800, "x0": 1548697956480, "y": 1 },
-    { "upCount": 244, "downCount": 279, "x": 1548698341120, "x0": 1548698148800, "y": 1 },
-    { "upCount": 409, "downCount": 120, "x": 1548698533440, "x0": 1548698341120, "y": 1 },
-    { "upCount": 444, "downCount": 88, "x": 1548698725760, "x0": 1548698533440, "y": 1 },
-    { "upCount": 430, "downCount": 76, "x": 1548698918080, "x0": 1548698725760, "y": 1 },
-    { "upCount": 434, "downCount": 78, "x": 1548699110400, "x0": 1548698918080, "y": 1 },
-    { "upCount": 455, "downCount": 76, "x": 1548699302720, "x0": 1548699110400, "y": 1 },
-    { "upCount": 451, "downCount": 85, "x": 1548699495040, "x0": 1548699302720, "y": 1 },
-    { "upCount": 458, "downCount": 89, "x": 1548699687360, "x0": 1548699495040, "y": 1 },
-    { "upCount": 455, "downCount": 86, "x": 1548699879680, "x0": 1548699687360, "y": 1 },
-    { "upCount": 455, "downCount": 87, "x": 1548700072000, "x0": 1548699879680, "y": 1 },
-    { "upCount": 459, "downCount": 88, "x": 1548700264320, "x0": 1548700072000, "y": 1 },
-    { "upCount": 432, "downCount": 87, "x": 1548700456640, "x0": 1548700264320, "y": 1 },
-    { "upCount": 431, "downCount": 86, "x": 1548700648960, "x0": 1548700456640, "y": 1 },
-    { "upCount": 433, "downCount": 87, "x": 1548700841280, "x0": 1548700648960, "y": 1 }
+    {
+      "upCount": 175,
+      "downCount": 202,
+      "x": 1548697764160,
+      "x0": 1548697571840,
+      "y": 1
+    },
+    {
+      "upCount": 243,
+      "downCount": 277,
+      "x": 1548697956480,
+      "x0": 1548697764160,
+      "y": 1
+    },
+    {
+      "upCount": 238,
+      "downCount": 278,
+      "x": 1548698148800,
+      "x0": 1548697956480,
+      "y": 1
+    },
+    {
+      "upCount": 244,
+      "downCount": 279,
+      "x": 1548698341120,
+      "x0": 1548698148800,
+      "y": 1
+    },
+    {
+      "upCount": 409,
+      "downCount": 120,
+      "x": 1548698533440,
+      "x0": 1548698341120,
+      "y": 1
+    },
+    {
+      "upCount": 444,
+      "downCount": 88,
+      "x": 1548698725760,
+      "x0": 1548698533440,
+      "y": 1
+    },
+    {
+      "upCount": 430,
+      "downCount": 76,
+      "x": 1548698918080,
+      "x0": 1548698725760,
+      "y": 1
+    },
+    {
+      "upCount": 434,
+      "downCount": 78,
+      "x": 1548699110400,
+      "x0": 1548698918080,
+      "y": 1
+    },
+    {
+      "upCount": 455,
+      "downCount": 76,
+      "x": 1548699302720,
+      "x0": 1548699110400,
+      "y": 1
+    },
+    {
+      "upCount": 451,
+      "downCount": 85,
+      "x": 1548699495040,
+      "x0": 1548699302720,
+      "y": 1
+    },
+    {
+      "upCount": 458,
+      "downCount": 89,
+      "x": 1548699687360,
+      "x0": 1548699495040,
+      "y": 1
+    },
+    {
+      "upCount": 455,
+      "downCount": 86,
+      "x": 1548699879680,
+      "x0": 1548699687360,
+      "y": 1
+    },
+    {
+      "upCount": 455,
+      "downCount": 87,
+      "x": 1548700072000,
+      "x0": 1548699879680,
+      "y": 1
+    },
+    {
+      "upCount": 459,
+      "downCount": 88,
+      "x": 1548700264320,
+      "x0": 1548700072000,
+      "y": 1
+    },
+    {
+      "upCount": 432,
+      "downCount": 87,
+      "x": 1548700456640,
+      "x0": 1548700264320,
+      "y": 1
+    },
+    {
+      "upCount": 431,
+      "downCount": 86,
+      "x": 1548700648960,
+      "x0": 1548700456640,
+      "y": 1
+    },
+    {
+      "upCount": 433,
+      "downCount": 87,
+      "x": 1548700841280,
+      "x0": 1548700648960,
+      "y": 1
+    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_filter.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_filter.json
@ -1,21 +1,123 @@
 {
  "histogram": [
-    { "upCount": 173, "downCount": 0, "x": 1548697764160, "x0": 1548697571840, "y": 1 },
-    { "upCount": 243, "downCount": 0, "x": 1548697956480, "x0": 1548697764160, "y": 1 },
-    { "upCount": 238, "downCount": 0, "x": 1548698148800, "x0": 1548697956480, "y": 1 },
-    { "upCount": 244, "downCount": 0, "x": 1548698341120, "x0": 1548698148800, "y": 1 },
-    { "upCount": 409, "downCount": 0, "x": 1548698533440, "x0": 1548698341120, "y": 1 },
-    { "upCount": 444, "downCount": 0, "x": 1548698725760, "x0": 1548698533440, "y": 1 },
-    { "upCount": 430, "downCount": 0, "x": 1548698918080, "x0": 1548698725760, "y": 1 },
-    { "upCount": 434, "downCount": 0, "x": 1548699110400, "x0": 1548698918080, "y": 1 },
-    { "upCount": 455, "downCount": 0, "x": 1548699302720, "x0": 1548699110400, "y": 1 },
-    { "upCount": 451, "downCount": 0, "x": 1548699495040, "x0": 1548699302720, "y": 1 },
-    { "upCount": 458, "downCount": 0, "x": 1548699687360, "x0": 1548699495040, "y": 1 },
-    { "upCount": 455, "downCount": 0, "x": 1548699879680, "x0": 1548699687360, "y": 1 },
-    { "upCount": 455, "downCount": 0, "x": 1548700072000, "x0": 1548699879680, "y": 1 },
-    { "upCount": 459, "downCount": 0, "x": 1548700264320, "x0": 1548700072000, "y": 1 },
-    { "upCount": 432, "downCount": 0, "x": 1548700456640, "x0": 1548700264320, "y": 1 },
-    { "upCount": 431, "downCount": 0, "x": 1548700648960, "x0": 1548700456640, "y": 1 },
-    { "upCount": 433, "downCount": 0, "x": 1548700841280, "x0": 1548700648960, "y": 1 }
+    {
+      "upCount": 175,
+      "downCount": 0,
+      "x": 1548697764160,
+      "x0": 1548697571840,
+      "y": 1
+    },
+    {
+      "upCount": 243,
+      "downCount": 0,
+      "x": 1548697956480,
+      "x0": 1548697764160,
+      "y": 1
+    },
+    {
+      "upCount": 238,
+      "downCount": 0,
+      "x": 1548698148800,
+      "x0": 1548697956480,
+      "y": 1
+    },
+    {
+      "upCount": 244,
+      "downCount": 0,
+      "x": 1548698341120,
+      "x0": 1548698148800,
+      "y": 1
+    },
+    {
+      "upCount": 409,
+      "downCount": 0,
+      "x": 1548698533440,
+      "x0": 1548698341120,
+      "y": 1
+    },
+    {
+      "upCount": 444,
+      "downCount": 0,
+      "x": 1548698725760,
+      "x0": 1548698533440,
+      "y": 1
+    },
+    {
+      "upCount": 430,
+      "downCount": 0,
+      "x": 1548698918080,
+      "x0": 1548698725760,
+      "y": 1
+    },
+    {
+      "upCount": 434,
+      "downCount": 0,
+      "x": 1548699110400,
+      "x0": 1548698918080,
+      "y": 1
+    },
+    {
+      "upCount": 455,
+      "downCount": 0,
+      "x": 1548699302720,
+      "x0": 1548699110400,
+      "y": 1
+    },
+    {
+      "upCount": 451,
+      "downCount": 0,
+      "x": 1548699495040,
+      "x0": 1548699302720,
+      "y": 1
+    },
+    {
+      "upCount": 458,
+      "downCount": 0,
+      "x": 1548699687360,
+      "x0": 1548699495040,
+      "y": 1
+    },
+    {
+      "upCount": 455,
+      "downCount": 0,
+      "x": 1548699879680,
+      "x0": 1548699687360,
+      "y": 1
+    },
+    {
+      "upCount": 455,
+      "downCount": 0,
+      "x": 1548700072000,
+      "x0": 1548699879680,
+      "y": 1
+    },
+    {
+      "upCount": 459,
+      "downCount": 0,
+      "x": 1548700264320,
+      "x0": 1548700072000,
+      "y": 1
+    },
+    {
+      "upCount": 432,
+      "downCount": 0,
+      "x": 1548700456640,
+      "x0": 1548700264320,
+      "y": 1
+    },
+    {
+      "upCount": 431,
+      "downCount": 0,
+      "x": 1548700648960,
+      "x0": 1548700456640,
+      "y": 1
+    },
+    {
+      "upCount": 433,
+      "downCount": 0,
+      "x": 1548700841280,
+      "x0": 1548700648960,
+      "y": 1
+    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_id.json
+++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot_histogram_by_id.json
@ -1,21 +1,123 @@
 {
  "histogram": [
-    { "upCount": 37, "downCount": 0, "x": 1548697764160, "x0": 1548697571840, "y": 1 },
-    { "upCount": 52, "downCount": 0, "x": 1548697956480, "x0": 1548697764160, "y": 1 },
-    { "upCount": 51, "downCount": 0, "x": 1548698148800, "x0": 1548697956480, "y": 1 },
-    { "upCount": 52, "downCount": 0, "x": 1548698341120, "x0": 1548698148800, "y": 1 },
-    { "upCount": 58, "downCount": 0, "x": 1548698533440, "x0": 1548698341120, "y": 1 },
-    { "upCount": 58, "downCount": 0, "x": 1548698725760, "x0": 1548698533440, "y": 1 },
-    { "upCount": 51, "downCount": 0, "x": 1548698918080, "x0": 1548698725760, "y": 1 },
-    { "upCount": 52, "downCount": 0, "x": 1548699110400, "x0": 1548698918080, "y": 1 },
-    { "upCount": 61, "downCount": 0, "x": 1548699302720, "x0": 1548699110400, "y": 1 },
-    { "upCount": 60, "downCount": 0, "x": 1548699495040, "x0": 1548699302720, "y": 1 },
-    { "upCount": 61, "downCount": 0, "x": 1548699687360, "x0": 1548699495040, "y": 1 },
-    { "upCount": 63, "downCount": 0, "x": 1548699879680, "x0": 1548699687360, "y": 1 },
-    { "upCount": 62, "downCount": 0, "x": 1548700072000, "x0": 1548699879680, "y": 1 },
-    { "upCount": 62, "downCount": 0, "x": 1548700264320, "x0": 1548700072000, "y": 1 },
-    { "upCount": 52, "downCount": 0, "x": 1548700456640, "x0": 1548700264320, "y": 1 },
-    { "upCount": 51, "downCount": 0, "x": 1548700648960, "x0": 1548700456640, "y": 1 },
-    { "upCount": 51, "downCount": 0, "x": 1548700841280, "x0": 1548700648960, "y": 1 }
+    {
+      "upCount": 37,
+      "downCount": 0,
+      "x": 1548697764160,
+      "x0": 1548697571840,
+      "y": 1
+    },
+    {
+      "upCount": 52,
+      "downCount": 0,
+      "x": 1548697956480,
+      "x0": 1548697764160,
+      "y": 1
+    },
+    {
+      "upCount": 51,
+      "downCount": 0,
+      "x": 1548698148800,
+      "x0": 1548697956480,
+      "y": 1
+    },
+    {
+      "upCount": 52,
+      "downCount": 0,
+      "x": 1548698341120,
+      "x0": 1548698148800,
+      "y": 1
+    },
+    {
+      "upCount": 58,
+      "downCount": 0,
+      "x": 1548698533440,
+      "x0": 1548698341120,
+      "y": 1
+    },
+    {
+      "upCount": 58,
+      "downCount": 0,
+      "x": 1548698725760,
+      "x0": 1548698533440,
+      "y": 1
+    },
+    {
+      "upCount": 51,
+      "downCount": 0,
+      "x": 1548698918080,
+      "x0": 1548698725760,
+      "y": 1
+    },
+    {
+      "upCount": 52,
+      "downCount": 0,
+      "x": 1548699110400,
+      "x0": 1548698918080,
+      "y": 1
+    },
+    {
+      "upCount": 61,
+      "downCount": 0,
+      "x": 1548699302720,
+      "x0": 1548699110400,
+      "y": 1
+    },
+    {
+      "upCount": 60,
+      "downCount": 0,
+      "x": 1548699495040,
+      "x0": 1548699302720,
+      "y": 1
+    },
+    {
+      "upCount": 61,
+      "downCount": 0,
+      "x": 1548699687360,
+      "x0": 1548699495040,
+      "y": 1
+    },
+    {
+      "upCount": 63,
+      "downCount": 0,
+      "x": 1548699879680,
+      "x0": 1548699687360,
+      "y": 1
+    },
+    {
+      "upCount": 62,
+      "downCount": 0,
+      "x": 1548700072000,
+      "x0": 1548699879680,
+      "y": 1
+    },
+    {
+      "upCount": 62,
+      "downCount": 0,
+      "x": 1548700264320,
+      "x0": 1548700072000,
+      "y": 1
+    },
+    {
+      "upCount": 52,
+      "downCount": 0,
+      "x": 1548700456640,
+      "x0": 1548700264320,
+      "y": 1
+    },
+    {
+      "upCount": 51,
+      "downCount": 0,
+      "x": 1548700648960,
+      "x0": 1548700456640,
+      "y": 1
+    },
+    {
+      "upCount": 51,
+      "downCount": 0,
+      "x": 1548700841280,
+      "x0": 1548700648960,
+      "y": 1
+    }
  ]
-}
+}
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_list.js
+++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_list.js
@ -4,11 +4,8 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-import expect from '@kbn/expect';
-import monitorList from './fixtures/monitor_list';
-import monitorListDownFiltered from './fixtures/monitor_list_down_filtered';
-import monitorListUpFiltered from './fixtures/monitor_list_up_filtered';
 import { monitorListQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
+import { expectFixtureEql } from './expect_fixture_eql';

 export default function ({ getService }) {
  describe('monitorList query', () => {
@ -29,7 +26,8 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getMonitorListQuery });
-      expect(data).to.eql(monitorList);
+
+      expectFixtureEql(data, 'monitor_list');
    });

    it('will fetch a filtered list of all down monitors', async () => {
@ -48,7 +46,8 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getMonitorListQuery });
-      expect(data).to.eql(monitorListDownFiltered);
+
+      expectFixtureEql(data, 'monitor_list_down_filtered');
    });

    it('will fetch a filtered list of all up monitors', async () => {
@ -67,7 +66,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getMonitorListQuery });
-      expect(data).to.eql(monitorListUpFiltered);
+      expectFixtureEql(data, 'monitor_list_up_filtered');
    });

    // TODO: add filters for host and port
--- a/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/monitor_states.ts
@ -4,10 +4,8 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-import expect from '@kbn/expect';
 import { monitorStatesQueryString } from '../../../../../legacy/plugins/uptime/public/queries/monitor_states_query';
-import monitorStates from './fixtures/monitor_states.json';
-import monitorStatesIdFiltered from './fixtures/monitor_states_id_filtered.json';
+import { expectFixtureEql } from './expect_fixture_eql';

 // eslint-disable-next-line import/no-default-export
 export default function({ getService }: { getService: any }) {
@ -31,7 +29,7 @@ export default function({ getService }: { getService: any }) {
        .set('kbn-xsrf', 'foo')
        .send({ ...getMonitorStatesQuery });

-      expect(data).to.eql(monitorStates);
+      expectFixtureEql(data, 'monitor_states');
    });

    it('will fetch monitor state data for the given filters and range', async () => {
@ -53,7 +51,7 @@ export default function({ getService }: { getService: any }) {
        .set('kbn-xsrf', 'foo')
        .send({ ...getMonitorStatesQuery });

-      expect(data).to.eql(monitorStatesIdFiltered);
+      expectFixtureEql(data, 'monitor_states_id_filtered');
    });
  });
 }
--- a/x-pack/test/api_integration/apis/uptime/graphql/ping_list.js
+++ b/x-pack/test/api_integration/apis/uptime/graphql/ping_list.js
@ -6,10 +6,7 @@

 import expect from '@kbn/expect';
 import { pingsQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
-import pingList from './fixtures/ping_list';
-import pingListCount from './fixtures/ping_list_count';
-import pingListMonitorId from './fixtures/ping_list_monitor_id';
-import pingListSort from './fixtures/ping_list_sort';
+import { expectFixtureEql } from './expect_fixture_eql';

 export default function ({ getService }) {
  describe('pingList query', () => {
@ -34,7 +31,7 @@ export default function ({ getService }) {
        allPings: { pings },
      } = data;
      expect(pings).length(10);
-      expect(data).to.eql(pingList);
+      expectFixtureEql(data, 'ping_list');
    });

    it('returns a list of pings for the date range and given size', async () => {
@ -58,7 +55,7 @@ export default function ({ getService }) {
        allPings: { pings },
      } = data;
      expect(pings).length(SIZE);
-      expect(data).to.eql(pingListCount);
+      expectFixtureEql(data, 'ping_list_count');
    });

    it('returns a list of pings for a monitor ID', async () => {
@ -80,7 +77,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getPingsQuery });
-      expect(data).to.eql(pingListMonitorId);
+      expectFixtureEql(data, 'ping_list_monitor_id');
    });

    it('returns a list of pings sorted ascending', async () => {
@ -103,7 +100,7 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getPingsQuery });
-      expect(data).to.eql(pingListSort);
+      expectFixtureEql(data, 'ping_list_sort');
    });
  });
 }
--- a/x-pack/test/api_integration/apis/uptime/graphql/snapshot.js
+++ b/x-pack/test/api_integration/apis/uptime/graphql/snapshot.js
@ -4,12 +4,8 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-import expect from '@kbn/expect';
 import { snapshotQueryString } from '../../../../../legacy/plugins/uptime/public/queries';
-import snapshot from './fixtures/snapshot';
-import snapshotFilteredByDown from './fixtures/snapshot_filtered_by_down';
-import snapshotFilteredByUp from './fixtures/snapshot_filtered_by_up';
-import snapshotEmpty from './fixtures/snapshot_empty';
+import { expectFixtureEql } from './expect_fixture_eql';

 export default function ({ getService }) {
  describe('snapshot query', () => {
@ -30,7 +26,8 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotQuery });
-      expect(data).to.eql(snapshot);
+
+      expectFixtureEql(data, 'snapshot');
    });

    it('will fetch a monitor snapshot filtered by down status', async () => {
@ -49,7 +46,8 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotQuery });
-      expect(data).to.eql(snapshotFilteredByDown);
+
+      expectFixtureEql(data, 'snapshot_filtered_by_down');
    });

    it('will fetch a monitor snapshot filtered by up status', async () => {
@ -68,7 +66,9 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotQuery });
-      expect(data).to.eql(snapshotFilteredByUp);
+
+
+      expectFixtureEql(data, 'snapshot_filtered_by_up');
    });

    it('returns null histogram data when no data present', async () => {
@ -87,7 +87,9 @@ export default function ({ getService }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotQuery });
-      expect(data).to.eql(snapshotEmpty);
+
+
+      expectFixtureEql(data, 'snapshot_empty');
    });
    // TODO: test for host, port, etc.
  });
--- a/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
+++ b/x-pack/test/api_integration/apis/uptime/graphql/snapshot_histogram.ts
@ -4,11 +4,8 @@
 * you may not use this file except in compliance with the Elastic License.
 */

-import expect from '@kbn/expect';
 import { snapshotHistogramQueryString } from '../../../../../legacy/plugins/uptime/public/queries/snapshot_histogram_query';
-import snapshotHistogram from './fixtures/snapshot_histogram.json';
-import snapshotHistogramById from './fixtures/snapshot_histogram_by_id.json';
-import snapshotHistogramByFilter from './fixtures/snapshot_histogram_by_filter.json';
+import { expectFixtureEql } from './expect_fixture_eql';

 // eslint-disable-next-line import/no-default-export
 export default function({ getService }: { getService: any }) {
@ -31,8 +28,7 @@ export default function({ getService }: { getService: any }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotHistogramQuery });
-
-      expect(data).to.eql(snapshotHistogram);
+      expectFixtureEql(data, 'snapshot_histogram');
    });

    it('will fetch histogram data for a given monitor id', async () => {
@ -52,8 +48,7 @@ export default function({ getService }: { getService: any }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotHistogramQuery });
-
-      expect(data).to.eql(snapshotHistogramById);
+      expectFixtureEql(data, 'snapshot_histogram_by_id');
    });

    it('will fetch histogram data for a given filter', async () => {
@ -74,8 +69,7 @@ export default function({ getService }: { getService: any }) {
        .post('/api/uptime/graphql')
        .set('kbn-xsrf', 'foo')
        .send({ ...getSnapshotHistogramQuery });
-
-      expect(data).to.eql(snapshotHistogramByFilter);
+      expectFixtureEql(data, 'snapshot_histogram_by_filter');
    });
  });
 }
--- a/x-pack/test/functional/es_archives/uptime/full_heartbeat/data.json.gz
+++ b/x-pack/test/functional/es_archives/uptime/full_heartbeat/data.json.gz