[Uptime] Handle mode: all in uptime snapshot calculation

x-pack/legacy/plugins/uptime/README.md

@@ -56,3 +56,5 @@ In one shell, from **~/kibana/x-pack**:
 
 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`

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: {

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');
     });
   });
 }

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);
+};

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 } }

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"
     }
   ]
-}
+}

x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_id.json

@@ -11,4 +11,4 @@
       "type": "io"
     }
   ]
-}
+}

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"
     }
   ]
-}
+}

x-pack/test/api_integration/apis/uptime/graphql/fixtures/error_list_filtered_by_port_and_type.json

@@ -11,4 +11,4 @@
       "type": "io"
     }
   ]
-}
+}