From 5696f6285cbb0e296c0046017d3fbaa9c5004f39 Mon Sep 17 00:00:00 2001 From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com> Date: Sat, 4 Apr 2020 17:05:00 +0300 Subject: [PATCH 01/12] [Discover] Fix flaky FT in field visualize (#62418) * Unskip * Set only suite * Add field search * Use alternative flaky fix * Remove extra actions Co-authored-by: Elastic Machine --- .../apps/discover/_field_visualize.ts | 9 ++++----- test/functional/page_objects/discover_page.ts | 19 +++++++++++++++---- x-pack/test/functional/apps/maps/discover.js | 2 -- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/test/functional/apps/discover/_field_visualize.ts b/test/functional/apps/discover/_field_visualize.ts index 24f4ba592324c..f8f290b259b7e 100644 --- a/test/functional/apps/discover/_field_visualize.ts +++ b/test/functional/apps/discover/_field_visualize.ts @@ -32,8 +32,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { defaultIndex: 'logstash-*', }; - // FLAKY: https://github.com/elastic/kibana/issues/61714 - describe.skip('discover field visualize button', () => { + describe('discover field visualize button', () => { before(async function() { log.debug('load kibana index with default index pattern'); await esArchiver.load('discover'); @@ -50,7 +49,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { }); it('should visualize a field in area chart', async () => { - await PageObjects.discover.clickFieldListItem('phpmemory'); + await PageObjects.discover.findFieldByName('phpmemory'); log.debug('visualize a phpmemory field'); await PageObjects.discover.clickFieldListItemVisualize('phpmemory'); await PageObjects.header.waitUntilLoadingHasFinished(); @@ -83,7 +82,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { it('should preserve app filters in visualize', async () => { await filterBar.addFilter('bytes', 'is between', '3500', '4000'); - await PageObjects.discover.clickFieldListItem('geo.src'); + await PageObjects.discover.findFieldByName('geo.src'); log.debug('visualize a geo.src field with filter applied'); await PageObjects.discover.clickFieldListItemVisualize('geo.src'); await PageObjects.header.waitUntilLoadingHasFinished(); @@ -119,7 +118,7 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { it('should preserve query in visualize', async () => { await queryBar.setQuery('machine.os : ios'); await queryBar.submitQuery(); - await PageObjects.discover.clickFieldListItem('geo.dest'); + await PageObjects.discover.findFieldByName('geo.dest'); log.debug('visualize a geo.dest field with query applied'); await PageObjects.discover.clickFieldListItemVisualize('geo.dest'); await PageObjects.header.waitUntilLoadingHasFinished(); diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts index 10652ce3ec4b2..2377c32a80b5b 100644 --- a/test/functional/page_objects/discover_page.ts +++ b/test/functional/page_objects/discover_page.ts @@ -40,6 +40,11 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider return await el.getVisibleText(); } + public async findFieldByName(name: string) { + const fieldSearch = await testSubjects.find('fieldFilterSearchInput'); + await fieldSearch.type(name); + } + public async saveSearch(searchName: string) { log.debug('saveSearch'); await this.clickSaveSearchButton(); @@ -239,10 +244,16 @@ export function DiscoverPageProvider({ getService, getPageObjects }: FtrProvider await testSubjects.click(`fieldToggle-${field}`); } - public async clickFieldListItemVisualize(field: string) { - return await retry.try(async () => { - await testSubjects.click(`fieldVisualize-${field}`); - }); + public async clickFieldListItemVisualize(fieldName: string) { + const field = await testSubjects.find(`field-${fieldName}-showDetails`); + const isActive = await field.elementHasClass('dscSidebarItem--active'); + + if (!isActive) { + // expand the field to show the "Visualize" button + await field.click(); + } + + await testSubjects.click(`fieldVisualize-${fieldName}`); } public async expectFieldListItemVisualize(field: string) { diff --git a/x-pack/test/functional/apps/maps/discover.js b/x-pack/test/functional/apps/maps/discover.js index ce33596476755..43a7a93ad62e4 100644 --- a/x-pack/test/functional/apps/maps/discover.js +++ b/x-pack/test/functional/apps/maps/discover.js @@ -17,7 +17,6 @@ export default function({ getService, getPageObjects }) { it('should link geo_shape fields to Maps application', async () => { await PageObjects.discover.selectIndexPattern('geo_shapes*'); - await PageObjects.discover.clickFieldListItem('geometry'); await PageObjects.discover.clickFieldListItemVisualize('geometry'); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.maps.waitForLayersToLoad(); @@ -37,7 +36,6 @@ export default function({ getService, getPageObjects }) { await queryBar.submitQuery(); await PageObjects.header.waitUntilLoadingHasFinished(); - await PageObjects.discover.clickFieldListItem('geo.coordinates'); await PageObjects.discover.clickFieldListItemVisualize('geo.coordinates'); await PageObjects.header.waitUntilLoadingHasFinished(); await PageObjects.maps.waitForLayersToLoad(); From 3d154a389e6bfec74ff588d1d736bde3ed23dfd0 Mon Sep 17 00:00:00 2001 From: spalger Date: Sat, 4 Apr 2020 07:08:17 -0700 Subject: [PATCH 02/12] skip flaky suite (#60470) --- test/accessibility/apps/management.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts index ac2921ed063f5..9e75250403d6b 100644 --- a/test/accessibility/apps/management.ts +++ b/test/accessibility/apps/management.ts @@ -35,7 +35,8 @@ export default function({ getService, getPageObjects }: FtrProviderContext) { // await PageObjects.common.navigateToApp('settings'); // }); - describe('Management', () => { + // FLAKY: https://github.com/elastic/kibana/issues/60470 + describe.skip('Management', () => { before(async () => { await esArchiver.load('discover'); await esArchiver.loadIfNeeded('logstash_functional'); From 4962fe9d8a92893d628d2bcb5dfafd1592e429cb Mon Sep 17 00:00:00 2001 From: Spencer Date: Sat, 4 Apr 2020 07:11:31 -0700 Subject: [PATCH 03/12] [jenkins] refer to sizes in most pipeline code (#62082) * [jenkins] refer to sizes in most pipeline code * switch back to `linux && immutable` for small instances Co-authored-by: spalger Co-authored-by: Elastic Machine --- .ci/Jenkinsfile_coverage | 2 +- .ci/Jenkinsfile_visual_baseline | 4 +-- .ci/es-snapshots/Jenkinsfile_build_es | 2 +- .ci/es-snapshots/Jenkinsfile_verify_es | 2 +- vars/workers.groovy | 35 ++++++++++++++++++-------- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.ci/Jenkinsfile_coverage b/.ci/Jenkinsfile_coverage index 6b8dc31bab34e..f2a58e7b6a7ac 100644 --- a/.ci/Jenkinsfile_coverage +++ b/.ci/Jenkinsfile_coverage @@ -44,7 +44,7 @@ kibanaPipeline(timeoutMinutes: 180) { 'xpack-ciGroup10': kibanaPipeline.xpackCiGroupProcess(10), ]), ]) - workers.base(name: 'coverage-worker', label: 'tests-l', ramDisk: false, bootstrapped: false) { + workers.base(name: 'coverage-worker', size: 'l', ramDisk: false, bootstrapped: false) { kibanaPipeline.downloadCoverageArtifacts() kibanaPipeline.bash( ''' diff --git a/.ci/Jenkinsfile_visual_baseline b/.ci/Jenkinsfile_visual_baseline index 5c13ccccd9c6f..815c1345bbb68 100644 --- a/.ci/Jenkinsfile_visual_baseline +++ b/.ci/Jenkinsfile_visual_baseline @@ -7,12 +7,12 @@ kibanaPipeline(timeoutMinutes: 120) { catchError { parallel([ 'oss-visualRegression': { - workers.ci(name: 'oss-visualRegression', label: 'linux && immutable', ramDisk: false) { + workers.ci(name: 'oss-visualRegression', size: 's', ramDisk: false) { kibanaPipeline.functionalTestProcess('oss-visualRegression', './test/scripts/jenkins_visual_regression.sh')(1) } }, 'xpack-visualRegression': { - workers.ci(name: 'xpack-visualRegression', label: 'linux && immutable', ramDisk: false) { + workers.ci(name: 'xpack-visualRegression', size: 's', ramDisk: false) { kibanaPipeline.functionalTestProcess('xpack-visualRegression', './test/scripts/jenkins_xpack_visual_regression.sh')(1) } }, diff --git a/.ci/es-snapshots/Jenkinsfile_build_es b/.ci/es-snapshots/Jenkinsfile_build_es index a00bcb3bbc946..a3470cd750738 100644 --- a/.ci/es-snapshots/Jenkinsfile_build_es +++ b/.ci/es-snapshots/Jenkinsfile_build_es @@ -25,7 +25,7 @@ def PROMOTE_WITHOUT_VERIFY = !!params.PROMOTE_WITHOUT_VERIFICATION timeout(time: 120, unit: 'MINUTES') { timestamps { ansiColor('xterm') { - node('linux && immutable') { + node(workers.label('s')) { catchErrors { def VERSION def SNAPSHOT_ID diff --git a/.ci/es-snapshots/Jenkinsfile_verify_es b/.ci/es-snapshots/Jenkinsfile_verify_es index ce472a404c053..ade79f27e10e9 100644 --- a/.ci/es-snapshots/Jenkinsfile_verify_es +++ b/.ci/es-snapshots/Jenkinsfile_verify_es @@ -61,7 +61,7 @@ kibanaPipeline(timeoutMinutes: 120) { } def promoteSnapshot(snapshotVersion, snapshotId) { - node('linux && immutable') { + node(workers.label('s')) { esSnapshots.promote(snapshotVersion, snapshotId) } } diff --git a/vars/workers.groovy b/vars/workers.groovy index c5638f2624fe5..1c55c676d9425 100644 --- a/vars/workers.groovy +++ b/vars/workers.groovy @@ -1,23 +1,38 @@ // "Workers" in this file will spin up an instance, do some setup etc depending on the configuration, and then execute some work that you define // e.g. workers.base(name: 'my-worker') { sh "echo 'ready to execute some kibana scripts'" } +def label(size) { + switch(size) { + case 's': + return 'linux && immutable' + case 'l': + return 'tests-l' + case 'xl': + return 'tests-xl' + case 'xxl': + return 'tests-xxl' + } + + error "unknown size '${size}'" +} + /* The base worker that all of the others use. Will clone the scm (assumed to be kibana), and run kibana bootstrap processes by default. Parameters: - label - gobld/agent label to use, e.g. 'linux && immutable' + size - size of worker label to use, e.g. 's' or 'xl' ramDisk - Should the workspace be mounted in memory? Default: true bootstrapped - If true, download kibana dependencies, run kbn bootstrap, etc. Default: true name - Name of the worker for display purposes, filenames, etc. scm - Jenkins scm configuration for checking out code. Use `null` to disable checkout. Default: inherited from job */ def base(Map params, Closure closure) { - def config = [label: '', ramDisk: true, bootstrapped: true, name: 'unnamed-worker', scm: scm] + params - if (!config.label) { - error "You must specify an agent label, such as 'tests-xl' or 'linux && immutable', when using workers.base()" + def config = [size: '', ramDisk: true, bootstrapped: true, name: 'unnamed-worker', scm: scm] + params + if (!config.size) { + error "You must specify an agent size, such as 'xl' or 's', when using workers.base()" } - node(config.label) { + node(label(config.size)) { agentInfo.print() if (config.ramDisk) { @@ -88,7 +103,7 @@ def ci(Map params, Closure closure) { // Worker for running the current intake jobs. Just runs a single script after bootstrap. def intake(jobName, String script) { return { - ci(name: jobName, label: 'linux && immutable', ramDisk: false) { + ci(name: jobName, size: 's', ramDisk: false) { withEnv(["JOB=${jobName}"]) { runbld(script, "Execute ${jobName}") } @@ -99,7 +114,7 @@ def intake(jobName, String script) { // Worker for running functional tests. Runs a setup process (e.g. the kibana build) then executes a map of closures in parallel (e.g. one for each ciGroup) def functional(name, Closure setup, Map processes) { return { - parallelProcesses(name: name, setup: setup, processes: processes, delayBetweenProcesses: 20, label: 'tests-xl') + parallelProcesses(name: name, setup: setup, processes: processes, delayBetweenProcesses: 20, size: 'xl') } } @@ -111,12 +126,12 @@ def functional(name, Closure setup, Map processes) { setup: Closure to execute after the agent is bootstrapped, before starting the parallel work processes: Map of closures that will execute in parallel after setup. Each closure is passed a unique number. delayBetweenProcesses: Number of seconds to wait between starting the parallel processes. Useful to spread the load of heavy init processes, e.g. Elasticsearch starting up. Default: 0 - label: gobld/agent label to use, e.g. 'linux && immutable'. Default: 'tests-xl', a 32 CPU machine used for running many functional test suites in parallel + size: size of worker label to use, e.g. 's' or 'xl' */ def parallelProcesses(Map params) { - def config = [name: 'parallel-worker', setup: {}, processes: [:], delayBetweenProcesses: 0, label: 'tests-xl'] + params + def config = [name: 'parallel-worker', setup: {}, processes: [:], delayBetweenProcesses: 0, size: 'xl'] + params - ci(label: config.label, name: config.name) { + ci(size: config.size, name: config.name) { config.setup() def nextProcessNumber = 1 From ddc90247c2733d5afe8b15050c274e0e2941cf67 Mon Sep 17 00:00:00 2001 From: Liza Katz Date: Mon, 6 Apr 2020 10:41:05 +0300 Subject: [PATCH 04/12] [BUG] Back navigation from surrounding documents doesn't work properly (#62350) * replace state for load more documents * simpler solution * simpler solution + functional test * fix test * disable flaky test --- .../discover/np_ready/angular/context.js | 2 + .../np_ready/angular/context_state.ts | 4 +- .../apps/context/_context_navigation.js | 61 +++++++++++++++++++ test/functional/apps/context/index.js | 1 + 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 test/functional/apps/context/_context_navigation.js diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js index f8e764cbcbebb..5b03b313e4e3e 100644 --- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js +++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context.js @@ -76,6 +76,7 @@ function ContextAppRouteController($routeParams, $scope, $route) { getFilters, setFilters, setAppState, + flushToUrl, } = getState({ defaultStepSize: getServices().uiSettings.get('context:defaultSize'), timeFieldName: indexPattern.timeFieldName, @@ -99,6 +100,7 @@ function ContextAppRouteController($routeParams, $scope, $route) { const [columns, predecessorCount, successorCount] = newValues; if (Array.isArray(columns) && predecessorCount >= 0 && successorCount >= 0) { setAppState({ columns, predecessorCount, successorCount }); + flushToUrl(true); } } ); diff --git a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts index bf185f78941de..ed59143b163f6 100644 --- a/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts +++ b/src/legacy/core_plugins/kibana/public/discover/np_ready/angular/context_state.ts @@ -109,7 +109,7 @@ interface GetStateReturn { /** * sync state to URL, used for testing */ - flushToUrl: () => void; + flushToUrl: (replace?: boolean) => void; } const GLOBAL_STATE_URL_KEY = '_g'; const APP_STATE_URL_KEY = '_a'; @@ -205,7 +205,7 @@ export function getState({ } }, // helper function just needed for testing - flushToUrl: () => stateStorage.flush(), + flushToUrl: (replace?: boolean) => stateStorage.flush({ replace }), }; } diff --git a/test/functional/apps/context/_context_navigation.js b/test/functional/apps/context/_context_navigation.js new file mode 100644 index 0000000000000..e4066d4159b9e --- /dev/null +++ b/test/functional/apps/context/_context_navigation.js @@ -0,0 +1,61 @@ +/* + * Licensed to Elasticsearch B.V. under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch B.V. licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import expect from '@kbn/expect'; + +const TEST_COLUMN_NAMES = ['@message']; +const TEST_FILTER_COLUMN_NAMES = [ + ['extension', 'jpg'], + ['geo.src', 'IN'], +]; + +export default function({ getService, getPageObjects }) { + const browser = getService('browser'); + const docTable = getService('docTable'); + const PageObjects = getPageObjects(['common', 'context', 'discover', 'timePicker']); + + describe('context link in discover', function contextSize() { + before(async function() { + await PageObjects.common.navigateToApp('discover'); + await PageObjects.timePicker.setDefaultAbsoluteRange(); + await Promise.all( + TEST_COLUMN_NAMES.map(columnName => PageObjects.discover.clickFieldListItemAdd(columnName)) + ); + for (const [columnName, value] of TEST_FILTER_COLUMN_NAMES) { + await PageObjects.discover.clickFieldListItem(columnName); + await PageObjects.discover.clickFieldListPlusFilter(columnName, value); + } + }); + + it('should go back after loading', async function() { + // navigate to the context view + await docTable.clickRowToggle({ rowIndex: 0 }); + await (await docTable.getRowActions({ rowIndex: 0 }))[0].click(); + await PageObjects.context.waitUntilContextLoadingHasFinished(); + await PageObjects.context.clickSuccessorLoadMoreButton(); + await PageObjects.context.clickSuccessorLoadMoreButton(); + await PageObjects.context.clickSuccessorLoadMoreButton(); + await PageObjects.context.waitUntilContextLoadingHasFinished(); + await browser.goBack(); + await PageObjects.discover.waitForDocTableLoadingComplete(); + const hitCount = await PageObjects.discover.getHitCount(); + expect(hitCount).to.be('1,556'); + }); + }); +} diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js index c3c938c623731..ffd7daf42c642 100644 --- a/test/functional/apps/context/index.js +++ b/test/functional/apps/context/index.js @@ -38,6 +38,7 @@ export default function({ getService, getPageObjects, loadTestFile }) { return esArchiver.unload('logstash_functional'); }); + loadTestFile(require.resolve('./_context_navigation')); loadTestFile(require.resolve('./_discover_navigation')); loadTestFile(require.resolve('./_filters')); loadTestFile(require.resolve('./_size')); From ae9a7516ce9acf1e5bfdcd6573d656534d7c3bfa Mon Sep 17 00:00:00 2001 From: Jean-Louis Leysens Date: Mon, 6 Apr 2020 10:07:56 +0200 Subject: [PATCH 05/12] [Console] Handle the case where saving to history may throw an error (#62424) * Handle the case where saving to history may throw an error We should still show the request result even if localStorage is full (or any other save error occurs) * Update src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts Co-Authored-By: Alison Goryachev Co-authored-by: Alison Goryachev Co-authored-by: Elastic Machine --- .../use_send_current_request_to_es.ts | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts index 548366c63aa05..dde793d9b9691 100644 --- a/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts +++ b/src/plugins/console/public/application/hooks/use_send_current_request_to_es/use_send_current_request_to_es.ts @@ -39,7 +39,7 @@ export const useSendCurrentRequestToES = () => { const requests = await editor.getRequestsInRange(); if (!requests.length) { notifications.toasts.add( - i18n.translate('console.notification.noReqeustSelectedTitle', { + i18n.translate('console.notification.error.noRequestSelectedTitle', { defaultMessage: 'No request selected. Select a request by placing the cursor inside it.', }) @@ -55,7 +55,16 @@ export const useSendCurrentRequestToES = () => { const results = await sendRequestToES({ requests }); results.forEach(({ request: { path, method, data } }) => { - history.addToHistory(path, method, data); + try { + history.addToHistory(path, method, data); + } catch (e) { + // Best effort, but notify the user. + notifications.toasts.addError(e, { + title: i18n.translate('console.notification.error.couldNotSaveRequestTitle', { + defaultMessage: 'Could not save request to history.', + }), + }); + } }); const { polling } = settings.toJSON(); @@ -85,7 +94,7 @@ export const useSendCurrentRequestToES = () => { payload: undefined, }); notifications.toasts.addError(e, { - title: i18n.translate('console.notification.unknownRequestErrorTitle', { + title: i18n.translate('console.notification.error.unknownErrorTitle', { defaultMessage: 'Unknown Request Error', }), }); From 4ab89e914523445a6c2219483e994923edff558f Mon Sep 17 00:00:00 2001 From: Alison Goryachev Date: Mon, 6 Apr 2020 05:05:29 -0400 Subject: [PATCH 06/12] [DOCS] Update index templates example (#62530) --- docs/management/managing-indices.asciidoc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docs/management/managing-indices.asciidoc b/docs/management/managing-indices.asciidoc index 933a2ffbf6ee2..946d9ee1b41c7 100644 --- a/docs/management/managing-indices.asciidoc +++ b/docs/management/managing-indices.asciidoc @@ -126,6 +126,23 @@ under the *Mapped fields* tab as follows: [role="screenshot"] image::images/management-index-templates-mappings.png[Mapped fields page] +Alternatively, you can click the *Load JSON* link and define the mapping as JSON: + +[source,js] +---------------------------------- +{ + "properties": { + "geo": { + "properties": { + "coordinates": { + "type": "geo_point" + } + } + } + } +} +---------------------------------- + You can create additional mapping configurations in the *Dynamic templates* and *Advanced options* tabs. No additional mappings are required for this example. From 104b49015ec5ce1260880016600d665bdb54c926 Mon Sep 17 00:00:00 2001 From: Daniil Suleiman <31325372+sulemanof@users.noreply.github.com> Date: Mon, 6 Apr 2020 12:11:48 +0300 Subject: [PATCH 07/12] [NP] Dashboard (#61895) * Remove absoluteToParsedUrl reference in dashboard * Remove KibanaParsedUrl from visualize * Fix tests * Add tests * Fix saved dashboard * Fix empty line after resolving conflicts * Move dashboard to np * Move migrations back to legacy * Make it works * Other fixes * Move into application folder * FIx translations * Make share & home plugins otional * FIx kbn url tracking, jest tests * Import from dashboard_constants in FT * Fix translations order * Use getStartServices for start plugin deps * Path fixes * i18n fix Co-authored-by: Elastic Machine --- src/legacy/core_plugins/kibana/index.js | 1 - .../kibana/public/dashboard/_variables.scss | 1 - .../kibana/public/dashboard/index.ts | 28 --- .../kibana/public/dashboard/legacy.ts | 30 --- .../kibana/public/dashboard/legacy_imports.ts | 32 --- .../migrations/migrate_to_730_panels.test.ts | 23 +- .../migrations/migrate_to_730_panels.ts | 5 +- .../migrations/migrations_730.test.ts | 2 +- .../migrations/move_filters_to_query.ts | 2 +- .../dashboard/np_ready/dashboard_constants.ts | 32 --- .../dashboard/np_ready/np_core.test.mocks.ts | 41 ---- .../kibana/public/dashboard/np_ready/types.ts | 131 ----------- .../kibana/public/dashboard/plugin.ts | 219 ------------------ .../core_plugins/kibana/public/index.scss | 4 - .../core_plugins/kibana/public/kibana.js | 1 - .../kibana/public/visualize/legacy_imports.ts | 2 +- src/plugins/dashboard/kibana.json | 6 +- .../dashboard_empty_screen.test.tsx.snap | 0 .../public/application}/_dashboard_app.scss | 0 .../dashboard/public/application}/_hacks.scss | 0 .../actions/expand_panel_action.test.tsx | 4 +- .../actions/expand_panel_action.tsx | 4 +- .../public/{ => application}/actions/index.ts | 12 +- .../actions/open_replace_panel_flyout.tsx | 6 +- .../actions/replace_panel_action.test.tsx | 6 +- .../actions/replace_panel_action.tsx | 6 +- .../actions/replace_panel_flyout.tsx | 11 +- .../public/application}/application.ts | 34 ++- .../public/application}/dashboard_app.html | 0 .../public/application}/dashboard_app.tsx | 16 +- .../application}/dashboard_app_controller.tsx | 77 +++--- .../dashboard_empty_screen.test.tsx | 2 +- .../application}/dashboard_empty_screen.tsx | 0 .../dashboard_empty_screen_constants.tsx | 24 +- .../application}/dashboard_state.test.ts | 3 +- .../application}/dashboard_state_manager.ts | 38 +-- .../public/application}/dashboard_strings.ts | 8 +- .../embeddable/dashboard_constants.ts | 0 .../embeddable/dashboard_container.test.tsx | 4 +- .../embeddable/dashboard_container.tsx | 12 +- .../dashboard_container_factory.tsx | 10 +- .../embeddable/grid/_dashboard_grid.scss | 0 .../embeddable/grid/_index.scss | 0 .../embeddable/grid/dashboard_grid.test.tsx | 4 +- .../embeddable/grid/dashboard_grid.tsx | 4 +- .../embeddable/grid/index.ts | 0 .../{ => application}/embeddable/index.ts | 0 .../embeddable/panel/_dashboard_panel.scss | 0 .../embeddable/panel/_index.scss | 0 .../panel/create_panel_state.test.ts | 4 +- .../embeddable/panel/create_panel_state.ts | 2 +- .../embeddable/panel/index.ts | 0 .../{ => application}/embeddable/types.ts | 2 +- .../viewport/_dashboard_viewport.scss | 0 .../embeddable/viewport/_index.scss | 0 .../viewport/dashboard_viewport.test.tsx | 4 +- .../viewport/dashboard_viewport.tsx | 4 +- .../application}/help_menu/help_menu_util.ts | 2 +- .../dashboard/public/application/index.scss} | 10 +- .../dashboard/public/application}/index.ts | 4 +- .../public/application}/legacy_app.js | 18 +- ...embeddable_saved_object_converters.test.ts | 5 +- .../lib/embeddable_saved_object_converters.ts | 4 +- .../public/application}/lib/filter_utils.ts | 2 +- .../lib/get_app_state_defaults.ts | 6 +- .../public/application}/lib/index.ts | 0 .../lib/migrate_app_state.test.ts | 4 +- .../application}/lib/migrate_app_state.ts | 20 +- .../public/application}/lib/save_dashboard.ts | 2 +- .../lib/update_saved_dashboard.ts | 4 +- .../public/application}/lib/url.test.ts | 0 .../dashboard/public/application}/lib/url.ts | 0 .../dashboard_listing.test.js.snap | 52 ++--- .../application}/listing/dashboard_listing.js | 24 +- .../listing/dashboard_listing.test.js | 10 - .../listing/dashboard_listing_ng_wrapper.html | 0 .../get_sample_dashboard_input.ts | 2 +- .../test_helpers}/get_saved_dashboard_mock.ts | 4 +- .../{ => application}/test_helpers/index.ts | 1 + .../tests/dashboard_container.test.tsx | 15 +- .../__snapshots__/clone_modal.test.js.snap | 8 +- .../__snapshots__/save_modal.test.js.snap | 6 +- .../application}/top_nav/clone_modal.test.js | 0 .../application}/top_nav/clone_modal.tsx | 16 +- .../top_nav/get_top_nav_config.ts | 44 ++-- .../public/application}/top_nav/options.tsx | 11 +- .../application}/top_nav/save_modal.test.js | 4 +- .../application}/top_nav/save_modal.tsx | 8 +- .../application}/top_nav/show_clone_modal.tsx | 2 +- .../top_nav/show_options_popover.tsx | 0 .../application}/top_nav/top_nav_ids.ts | 0 src/plugins/dashboard/public/bwc/types.ts | 2 +- src/plugins/dashboard/public/index.scss | 5 - src/plugins/dashboard/public/index.ts | 23 +- src/plugins/dashboard/public/plugin.tsx | 186 +++++++++++++-- src/plugins/dashboard/public/types.ts | 114 ++++++++- .../add_panel/add_panel_flyout.tsx | 2 +- .../state_management/url/kbn_url_tracker.ts | 2 +- .../apps/dashboard/dashboard_state.js | 5 +- .../functional/page_objects/dashboard_page.ts | 2 +- .../dashboard_mode/public/dashboard_viewer.js | 6 +- .../plugins/lens/public/legacy_imports.ts | 2 +- .../translations/translations/ja-JP.json | 128 +++++----- .../translations/translations/zh-CN.json | 128 +++++----- .../feature_controls/dashboard_security.ts | 2 +- .../feature_controls/dashboard_spaces.ts | 2 +- 106 files changed, 732 insertions(+), 1026 deletions(-) delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/_variables.scss delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/index.ts delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/legacy.ts delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/np_ready/np_core.test.mocks.ts delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts delete mode 100644 src/legacy/core_plugins/kibana/public/dashboard/plugin.ts rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/__snapshots__/dashboard_empty_screen.test.tsx.snap (100%) rename src/{legacy/core_plugins/kibana/public/dashboard => plugins/dashboard/public/application}/_dashboard_app.scss (100%) rename src/{legacy/core_plugins/kibana/public/dashboard => plugins/dashboard/public/application}/_hacks.scss (100%) rename src/plugins/dashboard/public/{ => application}/actions/expand_panel_action.test.tsx (97%) rename src/plugins/dashboard/public/{ => application}/actions/expand_panel_action.tsx (95%) rename src/plugins/dashboard/public/{ => application}/actions/index.ts (77%) rename src/plugins/dashboard/public/{ => application}/actions/open_replace_panel_flyout.tsx (92%) rename src/plugins/dashboard/public/{ => application}/actions/replace_panel_action.test.tsx (96%) rename src/plugins/dashboard/public/{ => application}/actions/replace_panel_action.tsx (93%) rename src/plugins/dashboard/public/{ => application}/actions/replace_panel_flyout.tsx (94%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/application.ts (83%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_app.html (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_app.tsx (87%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_app_controller.tsx (94%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_empty_screen.test.tsx (97%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_empty_screen.tsx (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_empty_screen_constants.tsx (76%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_state.test.ts (97%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_state_manager.ts (95%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/dashboard_strings.ts (84%) rename src/plugins/dashboard/public/{ => application}/embeddable/dashboard_constants.ts (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/dashboard_container.test.tsx (97%) rename src/plugins/dashboard/public/{ => application}/embeddable/dashboard_container.tsx (92%) rename src/plugins/dashboard/public/{ => application}/embeddable/dashboard_container_factory.tsx (88%) rename src/plugins/dashboard/public/{ => application}/embeddable/grid/_dashboard_grid.scss (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/grid/_index.scss (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/grid/dashboard_grid.test.tsx (97%) rename src/plugins/dashboard/public/{ => application}/embeddable/grid/dashboard_grid.tsx (98%) rename src/plugins/dashboard/public/{ => application}/embeddable/grid/index.ts (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/index.ts (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/panel/_dashboard_panel.scss (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/panel/_index.scss (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/panel/create_panel_state.test.ts (95%) rename src/plugins/dashboard/public/{ => application}/embeddable/panel/create_panel_state.ts (97%) rename src/plugins/dashboard/public/{ => application}/embeddable/panel/index.ts (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/types.ts (94%) rename src/plugins/dashboard/public/{ => application}/embeddable/viewport/_dashboard_viewport.scss (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/viewport/_index.scss (100%) rename src/plugins/dashboard/public/{ => application}/embeddable/viewport/dashboard_viewport.test.tsx (98%) rename src/plugins/dashboard/public/{ => application}/embeddable/viewport/dashboard_viewport.tsx (97%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/help_menu/help_menu_util.ts (95%) rename src/{legacy/core_plugins/kibana/public/dashboard/_index.scss => plugins/dashboard/public/application/index.scss} (56%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils => plugins/dashboard/public/application}/index.ts (88%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/legacy_app.js (92%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/embeddable_saved_object_converters.test.ts (95%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/embeddable_saved_object_converters.ts (93%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/filter_utils.ts (97%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/get_app_state_defaults.ts (87%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/index.ts (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/migrate_app_state.test.ts (98%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/migrate_app_state.ts (77%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/save_dashboard.ts (95%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/update_saved_dashboard.ts (93%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/url.test.ts (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/lib/url.ts (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/listing/__snapshots__/dashboard_listing.test.js.snap (86%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/listing/dashboard_listing.js (84%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/listing/dashboard_listing.test.js (97%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/listing/dashboard_listing_ng_wrapper.html (100%) rename src/plugins/dashboard/public/{ => application}/test_helpers/get_sample_dashboard_input.ts (96%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils => plugins/dashboard/public/application/test_helpers}/get_saved_dashboard_mock.ts (88%) rename src/plugins/dashboard/public/{ => application}/test_helpers/index.ts (92%) rename src/plugins/dashboard/public/{ => application}/tests/dashboard_container.test.tsx (90%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/__snapshots__/clone_modal.test.js.snap (83%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/__snapshots__/save_modal.test.js.snap (86%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/clone_modal.test.js (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/clone_modal.tsx (88%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/get_top_nav_config.ts (76%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/options.tsx (88%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/save_modal.test.js (92%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/save_modal.tsx (91%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/show_clone_modal.tsx (96%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/show_options_popover.tsx (100%) rename src/{legacy/core_plugins/kibana/public/dashboard/np_ready => plugins/dashboard/public/application}/top_nav/top_nav_ids.ts (100%) delete mode 100644 src/plugins/dashboard/public/index.scss diff --git a/src/legacy/core_plugins/kibana/index.js b/src/legacy/core_plugins/kibana/index.js index cac9ef30fba4f..1d643418997f5 100644 --- a/src/legacy/core_plugins/kibana/index.js +++ b/src/legacy/core_plugins/kibana/index.js @@ -58,7 +58,6 @@ export default function(kibana) { 'plugins/kibana/discover/legacy', 'plugins/kibana/dev_tools', 'plugins/kibana/visualize/legacy', - 'plugins/kibana/dashboard/legacy', ], app: { id: 'kibana', diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_variables.scss b/src/legacy/core_plugins/kibana/public/dashboard/_variables.scss deleted file mode 100644 index 4a715ab255166..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/_variables.scss +++ /dev/null @@ -1 +0,0 @@ -$dshEditingModeHoverColor: transparentize($euiColorWarning, lightOrDarkTheme(.9, .7)); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/index.ts b/src/legacy/core_plugins/kibana/public/dashboard/index.ts deleted file mode 100644 index 8900d017ef81a..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/index.ts +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { PluginInitializerContext } from 'kibana/public'; -import { DashboardPlugin } from './plugin'; - -export * from './np_ready/dashboard_constants'; - -// Core will be looking for this when loading our plugin in the new platform -export const plugin = (context: PluginInitializerContext) => { - return new DashboardPlugin(context); -}; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts deleted file mode 100644 index cedb6fbc9b5ef..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/legacy.ts +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { PluginInitializerContext } from 'kibana/public'; -import { npSetup, npStart } from './legacy_imports'; -import { plugin } from './index'; - -(async () => { - const instance = plugin({ - env: npSetup.plugins.kibanaLegacy.env, - } as PluginInitializerContext); - instance.setup(npSetup.core, npSetup.plugins); - instance.start(npStart.core, npStart.plugins); -})(); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts deleted file mode 100644 index 86bce5997cdd2..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/legacy_imports.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -/** - * The imports in this file are static functions and types which still live in legacy folders and are used - * within dashboard. To consolidate them all in one place, they are re-exported from this file. Eventually - * this list should become empty. Imports from the top level of shimmed or moved plugins can be imported - * directly where they are needed. - */ - -export { npSetup, npStart } from 'ui/new_platform'; -export { - configureAppAngularModule, - migrateLegacyQuery, - subscribeWithScope, -} from '../../../../../plugins/kibana_legacy/public'; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts index e37c8de08fec4..4dd71fd8ee5f4 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.test.ts @@ -16,28 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -jest.mock( - 'ui/chrome', - () => ({ - getKibanaVersion: () => '6.3.0', - }), - { virtual: true } -); - -jest.mock( - 'ui/notify', - () => ({ - toastNotifications: { - addDanger: () => {}, - }, - }), - { virtual: true } -); - -jest.mock('ui/new_platform'); - import { migratePanelsTo730 } from './migrate_to_730_panels'; -import { SavedDashboardPanelTo60, SavedDashboardPanel730ToLatest } from '../np_ready/types'; import { RawSavedDashboardPanelTo60, RawSavedDashboardPanel610, @@ -46,6 +25,8 @@ import { RawSavedDashboardPanel640To720, DEFAULT_PANEL_WIDTH, DEFAULT_PANEL_HEIGHT, + SavedDashboardPanelTo60, + SavedDashboardPanel730ToLatest, } from '../../../../../../plugins/dashboard/public'; test('6.0 migrates uiState, sort, scales, and gridData', async () => { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts index 047ec15f9a5d6..a19c861f092d5 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels.ts @@ -27,14 +27,11 @@ import { RawSavedDashboardPanel730ToLatest, RawSavedDashboardPanel610, RawSavedDashboardPanel620, -} from '../../../../../../plugins/dashboard/public'; - -import { SavedDashboardPanelTo60, SavedDashboardPanel620, SavedDashboardPanel630, SavedDashboardPanel610, -} from '../np_ready/types'; +} from '../../../../../../plugins/dashboard/public'; const PANEL_HEIGHT_SCALE_FACTOR = 5; const PANEL_HEIGHT_SCALE_FACTOR_WITH_MARGINS = 4; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts index 34bb46ce5d407..5a4970897098d 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/migrations_730.test.ts @@ -17,7 +17,7 @@ * under the License. */ -import { migrations } from '../../../migrations/'; +import { migrations } from '../../../migrations'; import { migrations730 } from './migrations_730'; import { DashboardDoc700To720, diff --git a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts index 7207f601a225e..01a66445e4fc2 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts +++ b/src/legacy/core_plugins/kibana/public/dashboard/migrations/move_filters_to_query.ts @@ -17,7 +17,7 @@ * under the License. */ -import { Filter, Query } from '../../../../../../plugins/data/public'; +import { Filter, Query } from 'src/plugins/data/public'; export interface Pre600FilterQuery { // pre 6.0.0 global query:queryString:options were stored per dashboard and would diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts deleted file mode 100644 index 0820ebd371004..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -export const DashboardConstants = { - ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM: 'addToDashboard', - LANDING_PAGE_PATH: '/dashboards', - CREATE_NEW_DASHBOARD_URL: '/dashboard', - ADD_EMBEDDABLE_ID: 'addEmbeddableId', - ADD_EMBEDDABLE_TYPE: 'addEmbeddableType', - DASHBOARDS_ID: 'dashboards', - DASHBOARD_ID: 'dashboard', -}; - -export function createDashboardEditUrl(id: string) { - return `/dashboard/${id}`; -} diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/np_core.test.mocks.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/np_core.test.mocks.ts deleted file mode 100644 index e1d9cfac95268..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/np_core.test.mocks.ts +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -let modalContents: React.Component; - -export const getModalContents = () => modalContents; - -jest.mock('ui/new_platform'); - -jest.doMock('ui/metadata', () => ({ - metadata: { - branch: 'my-metadata-branch', - version: 'my-metadata-version', - }, -})); - -jest.doMock('ui/capabilities', () => ({ - uiCapabilities: { - visualize: { - save: true, - }, - }, -})); - -jest.doMock('ui/chrome', () => ({ getKibanaVersion: () => '6.3.0', setVisible: () => {} })); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts b/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts deleted file mode 100644 index 9f8682f13d811..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/types.ts +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { ViewMode } from 'src/plugins/embeddable/public'; -import { - RawSavedDashboardPanelTo60, - RawSavedDashboardPanel610, - RawSavedDashboardPanel620, - RawSavedDashboardPanel630, - RawSavedDashboardPanel640To720, - RawSavedDashboardPanel730ToLatest, -} from '../../../../../../plugins/dashboard/public'; -import { Query, Filter } from '../../../../../../plugins/data/public'; - -export type NavAction = (anchorElement?: any) => void; - -/** - * This should always represent the latest dashboard panel shape, after all possible migrations. - */ -export type SavedDashboardPanel = SavedDashboardPanel730ToLatest; - -// id becomes optional starting in 7.3.0 -export type SavedDashboardPanel730ToLatest = Pick< - RawSavedDashboardPanel730ToLatest, - Exclude -> & { - readonly id?: string; - readonly type: string; -}; - -export type SavedDashboardPanel640To720 = Pick< - RawSavedDashboardPanel640To720, - Exclude -> & { - readonly id: string; - readonly type: string; -}; - -export type SavedDashboardPanel630 = Pick< - RawSavedDashboardPanel630, - Exclude -> & { - readonly id: string; - readonly type: string; -}; - -export type SavedDashboardPanel620 = Pick< - RawSavedDashboardPanel620, - Exclude -> & { - readonly id: string; - readonly type: string; -}; - -export type SavedDashboardPanel610 = Pick< - RawSavedDashboardPanel610, - Exclude -> & { - readonly id: string; - readonly type: string; -}; - -export type SavedDashboardPanelTo60 = Pick< - RawSavedDashboardPanelTo60, - Exclude -> & { - readonly id: string; - readonly type: string; -}; - -export interface DashboardAppState { - panels: SavedDashboardPanel[]; - fullScreenMode: boolean; - title: string; - description: string; - timeRestore: boolean; - options: { - hidePanelTitles: boolean; - useMargins: boolean; - }; - query: Query | string; - filters: Filter[]; - viewMode: ViewMode; - savedQuery?: string; -} - -export type DashboardAppStateDefaults = DashboardAppState & { - description?: string; -}; - -export interface DashboardAppStateTransitions { - set: ( - state: DashboardAppState - ) => ( - prop: T, - value: DashboardAppState[T] - ) => DashboardAppState; - setOption: ( - state: DashboardAppState - ) => ( - prop: T, - value: DashboardAppState['options'][T] - ) => DashboardAppState; -} - -export interface SavedDashboardPanelMap { - [key: string]: SavedDashboardPanel; -} - -export interface StagedFilter { - field: string; - value: string; - operator: string; - index: string; -} diff --git a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts b/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts deleted file mode 100644 index 7452807454fe7..0000000000000 --- a/src/legacy/core_plugins/kibana/public/dashboard/plugin.ts +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Licensed to Elasticsearch B.V. under one or more contributor - * license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright - * ownership. Elasticsearch B.V. licenses this file to you under - * the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -import { BehaviorSubject } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; -import { - App, - AppMountParameters, - CoreSetup, - CoreStart, - Plugin, - PluginInitializerContext, - SavedObjectsClientContract, -} from 'kibana/public'; -import { i18n } from '@kbn/i18n'; -import { RenderDeps } from './np_ready/application'; -import { - DataPublicPluginStart, - DataPublicPluginSetup, - esFilters, -} from '../../../../../plugins/data/public'; -import { EmbeddableStart } from '../../../../../plugins/embeddable/public'; -import { Storage } from '../../../../../plugins/kibana_utils/public'; -import { NavigationPublicPluginStart as NavigationStart } from '../../../../../plugins/navigation/public'; -import { DashboardConstants } from './np_ready/dashboard_constants'; -import { - FeatureCatalogueCategory, - HomePublicPluginSetup, -} from '../../../../../plugins/home/public'; -import { SharePluginStart } from '../../../../../plugins/share/public'; -import { - AngularRenderedAppUpdater, - KibanaLegacySetup, - KibanaLegacyStart, -} from '../../../../../plugins/kibana_legacy/public'; -import { createKbnUrlTracker } from '../../../../../plugins/kibana_utils/public'; -import { DashboardStart } from '../../../../../plugins/dashboard/public'; - -export interface DashboardPluginStartDependencies { - data: DataPublicPluginStart; - embeddable: EmbeddableStart; - navigation: NavigationStart; - share: SharePluginStart; - kibanaLegacy: KibanaLegacyStart; - dashboard: DashboardStart; -} - -export interface DashboardPluginSetupDependencies { - home: HomePublicPluginSetup; - kibanaLegacy: KibanaLegacySetup; - data: DataPublicPluginSetup; -} - -export class DashboardPlugin implements Plugin { - private startDependencies: { - data: DataPublicPluginStart; - savedObjectsClient: SavedObjectsClientContract; - embeddable: EmbeddableStart; - navigation: NavigationStart; - share: SharePluginStart; - dashboardConfig: KibanaLegacyStart['dashboardConfig']; - dashboard: DashboardStart; - } | null = null; - - private appStateUpdater = new BehaviorSubject(() => ({})); - private stopUrlTracking: (() => void) | undefined = undefined; - - constructor(private initializerContext: PluginInitializerContext) {} - - public setup(core: CoreSetup, { home, kibanaLegacy, data }: DashboardPluginSetupDependencies) { - const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({ - baseUrl: core.http.basePath.prepend('/app/kibana'), - defaultSubUrl: `#${DashboardConstants.LANDING_PAGE_PATH}`, - shouldTrackUrlUpdate: pathname => { - const targetAppName = pathname.split('/')[1]; - return ( - targetAppName === DashboardConstants.DASHBOARDS_ID || - targetAppName === DashboardConstants.DASHBOARD_ID - ); - }, - storageKey: 'lastUrl:dashboard', - navLinkUpdater$: this.appStateUpdater, - toastNotifications: core.notifications.toasts, - stateParams: [ - { - kbnUrlKey: '_g', - stateUpdate$: data.query.state$.pipe( - filter( - ({ changes }) => !!(changes.globalFilters || changes.time || changes.refreshInterval) - ), - map(({ state }) => ({ - ...state, - filters: state.filters?.filter(esFilters.isFilterPinned), - })) - ), - }, - ], - }); - this.stopUrlTracking = () => { - stopUrlTracker(); - }; - const app: App = { - id: '', - title: 'Dashboards', - mount: async (params: AppMountParameters) => { - const [coreStart] = await core.getStartServices(); - if (this.startDependencies === null) { - throw new Error('not started yet'); - } - appMounted(); - const { - savedObjectsClient, - embeddable, - navigation, - share, - data: dataStart, - dashboardConfig, - dashboard: { getSavedDashboardLoader }, - } = this.startDependencies; - const savedDashboards = getSavedDashboardLoader(); - - const deps: RenderDeps = { - pluginInitializerContext: this.initializerContext, - core: coreStart, - dashboardConfig, - navigation, - share, - data: dataStart, - savedObjectsClient, - savedDashboards, - chrome: coreStart.chrome, - addBasePath: coreStart.http.basePath.prepend, - uiSettings: coreStart.uiSettings, - config: kibanaLegacy.config, - savedQueryService: dataStart.query.savedQueries, - embeddable, - dashboardCapabilities: coreStart.application.capabilities.dashboard, - embeddableCapabilities: { - visualizeCapabilities: coreStart.application.capabilities.visualize, - mapsCapabilities: coreStart.application.capabilities.maps, - }, - localStorage: new Storage(localStorage), - }; - const { renderApp } = await import('./np_ready/application'); - const unmount = renderApp(params.element, params.appBasePath, deps); - return () => { - unmount(); - appUnMounted(); - }; - }, - }; - kibanaLegacy.registerLegacyApp({ - ...app, - id: DashboardConstants.DASHBOARD_ID, - // only register the updater in once app, otherwise all updates would happen twice - updater$: this.appStateUpdater.asObservable(), - navLinkId: 'kibana:dashboard', - }); - kibanaLegacy.registerLegacyApp({ ...app, id: DashboardConstants.DASHBOARDS_ID }); - - home.featureCatalogue.register({ - id: DashboardConstants.DASHBOARD_ID, - title: i18n.translate('kbn.dashboard.featureCatalogue.dashboardTitle', { - defaultMessage: 'Dashboard', - }), - description: i18n.translate('kbn.dashboard.featureCatalogue.dashboardDescription', { - defaultMessage: 'Display and share a collection of visualizations and saved searches.', - }), - icon: 'dashboardApp', - path: `/app/kibana#${DashboardConstants.LANDING_PAGE_PATH}`, - showOnHomePage: true, - category: FeatureCatalogueCategory.DATA, - }); - } - - start( - { savedObjects: { client: savedObjectsClient } }: CoreStart, - { - embeddable, - navigation, - data, - share, - kibanaLegacy: { dashboardConfig }, - dashboard, - }: DashboardPluginStartDependencies - ) { - this.startDependencies = { - data, - savedObjectsClient, - embeddable, - navigation, - share, - dashboardConfig, - dashboard, - }; - } - - stop() { - if (this.stopUrlTracking) { - this.stopUrlTracking(); - } - } -} diff --git a/src/legacy/core_plugins/kibana/public/index.scss b/src/legacy/core_plugins/kibana/public/index.scss index 547f44652cf2b..9b7d0afcd7e39 100644 --- a/src/legacy/core_plugins/kibana/public/index.scss +++ b/src/legacy/core_plugins/kibana/public/index.scss @@ -27,7 +27,3 @@ // Local application mount wrapper styles @import 'local_application_service/index'; - -// Dashboard styles -// MUST STAY AT THE BOTTOM BECAUSE OF DARK THEME IMPORTS -@import './dashboard/index'; diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js index df6b08ef76556..bceb3fa7eef8a 100644 --- a/src/legacy/core_plugins/kibana/public/kibana.js +++ b/src/legacy/core_plugins/kibana/public/kibana.js @@ -44,7 +44,6 @@ import 'uiExports/interpreter'; import 'ui/autoload/all'; import './discover/legacy'; import './visualize/legacy'; -import './dashboard/legacy'; import './management'; import './dev_tools'; import 'ui/agg_response'; diff --git a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts index 6a2034d9a62e4..f6d73b987912d 100644 --- a/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts +++ b/src/legacy/core_plugins/kibana/public/visualize/legacy_imports.ts @@ -24,7 +24,7 @@ * directly where they are needed. */ -export { DashboardConstants } from '../dashboard/np_ready/dashboard_constants'; +export { DashboardConstants } from '../../../../../plugins/dashboard/public'; export { VisSavedObject, VISUALIZE_EMBEDDABLE_TYPE, diff --git a/src/plugins/dashboard/kibana.json b/src/plugins/dashboard/kibana.json index e35599a5f0b66..9bcd999c2dcc0 100644 --- a/src/plugins/dashboard/kibana.json +++ b/src/plugins/dashboard/kibana.json @@ -5,12 +5,12 @@ "data", "embeddable", "inspector", + "kibanaLegacy", + "navigation", "uiActions", "savedObjects" ], - "optionalPlugins": [ - "share" - ], + "optionalPlugins": ["home", "share", "usageCollection"], "server": false, "ui": true } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/__snapshots__/dashboard_empty_screen.test.tsx.snap rename to src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss b/src/plugins/dashboard/public/application/_dashboard_app.scss similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/_dashboard_app.scss rename to src/plugins/dashboard/public/application/_dashboard_app.scss diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss b/src/plugins/dashboard/public/application/_hacks.scss similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/_hacks.scss rename to src/plugins/dashboard/public/application/_hacks.scss diff --git a/src/plugins/dashboard/public/actions/expand_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx similarity index 97% rename from src/plugins/dashboard/public/actions/expand_panel_action.test.tsx rename to src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx index e9696938b8629..0f4a92a1a7b7d 100644 --- a/src/plugins/dashboard/public/actions/expand_panel_action.test.tsx +++ b/src/plugins/dashboard/public/application/actions/expand_panel_action.test.tsx @@ -17,7 +17,7 @@ * under the License. */ -import { isErrorEmbeddable } from '../embeddable_plugin'; +import { isErrorEmbeddable } from '../../embeddable_plugin'; import { ExpandPanelAction } from './expand_panel_action'; import { DashboardContainer } from '../embeddable'; import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers'; @@ -27,7 +27,7 @@ import { ContactCardEmbeddable, ContactCardEmbeddableInput, ContactCardEmbeddableOutput, -} from '../embeddable_plugin_test_samples'; +} from '../../embeddable_plugin_test_samples'; // eslint-disable-next-line import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks'; diff --git a/src/plugins/dashboard/public/actions/expand_panel_action.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx similarity index 95% rename from src/plugins/dashboard/public/actions/expand_panel_action.tsx rename to src/plugins/dashboard/public/application/actions/expand_panel_action.tsx index 27d4078411564..d0442fbc26073 100644 --- a/src/plugins/dashboard/public/actions/expand_panel_action.tsx +++ b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx @@ -18,8 +18,8 @@ */ import { i18n } from '@kbn/i18n'; -import { IEmbeddable } from '../embeddable_plugin'; -import { ActionByType, IncompatibleActionError } from '../ui_actions_plugin'; +import { IEmbeddable } from '../../embeddable_plugin'; +import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin'; import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable'; export const ACTION_EXPAND_PANEL = 'togglePanel'; diff --git a/src/plugins/dashboard/public/actions/index.ts b/src/plugins/dashboard/public/application/actions/index.ts similarity index 77% rename from src/plugins/dashboard/public/actions/index.ts rename to src/plugins/dashboard/public/application/actions/index.ts index 304fb98b4f842..23c26dbd280f8 100644 --- a/src/plugins/dashboard/public/actions/index.ts +++ b/src/plugins/dashboard/public/application/actions/index.ts @@ -17,5 +17,13 @@ * under the License. */ -export { ExpandPanelAction, ACTION_EXPAND_PANEL } from './expand_panel_action'; -export { ReplacePanelAction, ACTION_REPLACE_PANEL } from './replace_panel_action'; +export { + ExpandPanelAction, + ExpandPanelActionContext, + ACTION_EXPAND_PANEL, +} from './expand_panel_action'; +export { + ReplacePanelAction, + ReplacePanelActionContext, + ACTION_REPLACE_PANEL, +} from './replace_panel_action'; diff --git a/src/plugins/dashboard/public/actions/open_replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx similarity index 92% rename from src/plugins/dashboard/public/actions/open_replace_panel_flyout.tsx rename to src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx index 3472d208f814c..c676ca052d687 100644 --- a/src/plugins/dashboard/public/actions/open_replace_panel_flyout.tsx +++ b/src/plugins/dashboard/public/application/actions/open_replace_panel_flyout.tsx @@ -17,8 +17,8 @@ * under the License. */ import React from 'react'; -import { CoreStart } from '../../../../core/public'; -import { toMountPoint } from '../../../../plugins/kibana_react/public'; +import { CoreStart } from 'src/core/public'; +import { toMountPoint } from '../../../../../plugins/kibana_react/public'; import { ReplacePanelFlyout } from './replace_panel_flyout'; import { IEmbeddable, @@ -26,7 +26,7 @@ import { EmbeddableOutput, EmbeddableStart, IContainer, -} from '../embeddable_plugin'; +} from '../../embeddable_plugin'; export async function openReplacePanelFlyout(options: { embeddable: IContainer; diff --git a/src/plugins/dashboard/public/actions/replace_panel_action.test.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx similarity index 96% rename from src/plugins/dashboard/public/actions/replace_panel_action.test.tsx rename to src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx index 2252928f46f6a..cc06bd41379aa 100644 --- a/src/plugins/dashboard/public/actions/replace_panel_action.test.tsx +++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.test.tsx @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { isErrorEmbeddable } from '../embeddable_plugin'; +import { isErrorEmbeddable } from '../../embeddable_plugin'; import { ReplacePanelAction } from './replace_panel_action'; import { DashboardContainer } from '../embeddable'; import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers'; @@ -26,8 +26,8 @@ import { ContactCardEmbeddable, ContactCardEmbeddableInput, ContactCardEmbeddableOutput, -} from '../embeddable_plugin_test_samples'; -import { coreMock } from '../../../../core/public/mocks'; +} from '../../embeddable_plugin_test_samples'; +import { coreMock } from '../../../../../core/public/mocks'; import { CoreStart } from 'kibana/public'; // eslint-disable-next-line diff --git a/src/plugins/dashboard/public/actions/replace_panel_action.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx similarity index 93% rename from src/plugins/dashboard/public/actions/replace_panel_action.tsx rename to src/plugins/dashboard/public/application/actions/replace_panel_action.tsx index 21ec961917d17..ddc255295e89b 100644 --- a/src/plugins/dashboard/public/actions/replace_panel_action.tsx +++ b/src/plugins/dashboard/public/application/actions/replace_panel_action.tsx @@ -18,10 +18,10 @@ */ import { i18n } from '@kbn/i18n'; -import { CoreStart } from '../../../../core/public'; -import { IEmbeddable, ViewMode, EmbeddableStart } from '../embeddable_plugin'; +import { CoreStart } from 'src/core/public'; +import { IEmbeddable, ViewMode, EmbeddableStart } from '../../embeddable_plugin'; import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable'; -import { ActionByType, IncompatibleActionError } from '../ui_actions_plugin'; +import { ActionByType, IncompatibleActionError } from '../../ui_actions_plugin'; import { openReplacePanelFlyout } from './open_replace_panel_flyout'; export const ACTION_REPLACE_PANEL = 'replacePanel'; diff --git a/src/plugins/dashboard/public/actions/replace_panel_flyout.tsx b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx similarity index 94% rename from src/plugins/dashboard/public/actions/replace_panel_flyout.tsx rename to src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx index a1cd865f771d4..d182deb813e11 100644 --- a/src/plugins/dashboard/public/actions/replace_panel_flyout.tsx +++ b/src/plugins/dashboard/public/application/actions/replace_panel_flyout.tsx @@ -20,10 +20,15 @@ import { i18n } from '@kbn/i18n'; import React from 'react'; import { EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui'; -import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public'; +import { NotificationsStart, Toast } from 'src/core/public'; import { DashboardPanelState } from '../embeddable'; -import { NotificationsStart, Toast } from '../../../../core/public'; -import { IContainer, IEmbeddable, EmbeddableInput, EmbeddableOutput } from '../embeddable_plugin'; +import { + IContainer, + IEmbeddable, + EmbeddableInput, + EmbeddableOutput, + EmbeddableStart, +} from '../../embeddable_plugin'; interface Props { container: IContainer; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts b/src/plugins/dashboard/public/application/application.ts similarity index 83% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts rename to src/plugins/dashboard/public/application/application.ts index 877ccab99171d..3134a5bfe2c67 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts +++ b/src/plugins/dashboard/public/application/application.ts @@ -17,6 +17,8 @@ * under the License. */ +import './index.scss'; + import { EuiIcon } from '@elastic/eui'; import angular, { IModule } from 'angular'; import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular'; @@ -28,20 +30,21 @@ import { SavedObjectsClientContract, PluginInitializerContext, } from 'kibana/public'; -import { Storage } from '../../../../../../plugins/kibana_utils/public'; -import { configureAppAngularModule } from '../legacy_imports'; +import { UsageCollectionSetup } from 'src/plugins/usage_collection/public'; +import { Storage } from '../../../kibana_utils/public'; // @ts-ignore import { initDashboardApp } from './legacy_app'; -import { EmbeddableStart } from '../../../../../../plugins/embeddable/public'; -import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public'; -import { DataPublicPluginStart } from '../../../../../../plugins/data/public'; -import { SharePluginStart } from '../../../../../../plugins/share/public'; +import { EmbeddableStart } from '../../../embeddable/public'; +import { NavigationPublicPluginStart as NavigationStart } from '../../../navigation/public'; +import { DataPublicPluginStart } from '../../../data/public'; +import { SharePluginStart } from '../../../share/public'; import { KibanaLegacyStart, + configureAppAngularModule, createTopNavDirective, createTopNavHelper, -} from '../../../../../../plugins/kibana_legacy/public'; -import { SavedObjectLoader } from '../../../../../../plugins/saved_objects/public'; +} from '../../../kibana_legacy/public'; +import { SavedObjectLoader } from '../../../saved_objects/public'; export interface RenderDeps { pluginInitializerContext: PluginInitializerContext; @@ -62,8 +65,9 @@ export interface RenderDeps { savedQueryService: DataPublicPluginStart['query']['savedQueries']; embeddable: EmbeddableStart; localStorage: Storage; - share: SharePluginStart; + share?: SharePluginStart; config: KibanaLegacyStart['config']; + usageCollection?: UsageCollectionSetup; } let angularModuleInstance: IModule | null = null; @@ -110,13 +114,11 @@ function mountDashboardApp(appBasePath: string, element: HTMLElement) { function createLocalAngularModule(core: AppMountContext['core'], navigation: NavigationStart) { createLocalI18nModule(); - createLocalConfigModule(core); createLocalTopNavModule(navigation); createLocalIconModule(); const dashboardAngularModule = angular.module(moduleName, [ ...thirdPartyAngularDependencies, - 'app/dashboard/Config', 'app/dashboard/I18n', 'app/dashboard/TopNav', 'app/dashboard/icon', @@ -130,16 +132,6 @@ function createLocalIconModule() { .directive('icon', reactDirective => reactDirective(EuiIcon)); } -function createLocalConfigModule(core: AppMountContext['core']) { - angular.module('app/dashboard/Config', []).provider('config', () => { - return { - $get: () => ({ - get: core.uiSettings.get.bind(core.uiSettings), - }), - }; - }); -} - function createLocalTopNavModule(navigation: NavigationStart) { angular .module('app/dashboard/TopNav', ['react']) diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html b/src/plugins/dashboard/public/application/dashboard_app.html similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.html rename to src/plugins/dashboard/public/application/dashboard_app.html diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx similarity index 87% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx rename to src/plugins/dashboard/public/application/dashboard_app.tsx index cc7299b884890..150cd8f8fcbb5 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx +++ b/src/plugins/dashboard/public/application/dashboard_app.tsx @@ -21,20 +21,14 @@ import moment from 'moment'; import { Subscription } from 'rxjs'; import { History } from 'history'; -import { ViewMode } from '../../../../../../plugins/embeddable/public'; -import { SavedObjectDashboard } from '../../../../../../plugins/dashboard/public'; -import { DashboardAppState, SavedDashboardPanel } from './types'; -import { - IIndexPattern, - TimeRange, - Query, - Filter, - SavedQuery, -} from '../../../../../../plugins/data/public'; +import { ViewMode } from 'src/plugins/embeddable/public'; +import { IIndexPattern, TimeRange, Query, Filter, SavedQuery } from 'src/plugins/data/public'; +import { IKbnUrlStateStorage } from 'src/plugins/kibana_utils/public'; +import { DashboardAppState, SavedDashboardPanel } from '../types'; import { DashboardAppController } from './dashboard_app_controller'; import { RenderDeps } from './application'; -import { IKbnUrlStateStorage } from '../../../../../../plugins/kibana_utils/public/'; +import { SavedObjectDashboard } from '../saved_dashboards'; export interface DashboardAppScope extends ng.IScope { dash: SavedObjectDashboard; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx similarity index 94% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx rename to src/plugins/dashboard/public/application/dashboard_app_controller.tsx index e38345989598d..d1c7d2d9eba3e 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx +++ b/src/plugins/dashboard/public/application/dashboard_app_controller.tsx @@ -29,7 +29,6 @@ import { History } from 'history'; import { SavedObjectSaveOpts } from 'src/plugins/saved_objects/public'; import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen'; -import { migrateLegacyQuery, subscribeWithScope } from '../legacy_imports'; import { connectToQueryState, esFilters, @@ -39,19 +38,15 @@ import { QueryState, SavedQuery, syncQueryStateWithUrl, -} from '../../../../../../plugins/data/public'; -import { - getSavedObjectFinder, - SaveResult, - showSaveModal, -} from '../../../../../../plugins/saved_objects/public'; +} from '../../../data/public'; +import { getSavedObjectFinder, SaveResult, showSaveModal } from '../../../saved_objects/public'; import { DASHBOARD_CONTAINER_TYPE, DashboardContainer, DashboardContainerInput, DashboardPanelState, -} from '../../../../../../plugins/dashboard/public'; +} from './embeddable'; import { EmbeddableFactoryNotFoundError, ErrorEmbeddable, @@ -59,31 +54,29 @@ import { openAddPanelFlyout, ViewMode, ContainerOutput, -} from '../../../../../../plugins/embeddable/public'; -import { NavAction, SavedDashboardPanel } from './types'; +} from '../../../embeddable/public'; +import { NavAction, SavedDashboardPanel } from '../types'; import { showOptionsPopover } from './top_nav/show_options_popover'; import { DashboardSaveModal } from './top_nav/save_modal'; import { showCloneModal } from './top_nav/show_clone_modal'; import { saveDashboard } from './lib'; import { DashboardStateManager } from './dashboard_state_manager'; -import { createDashboardEditUrl, DashboardConstants } from './dashboard_constants'; +import { createDashboardEditUrl, DashboardConstants } from '../dashboard_constants'; import { getTopNavConfig } from './top_nav/get_top_nav_config'; import { TopNavIds } from './top_nav/top_nav_ids'; import { getDashboardTitle } from './dashboard_strings'; import { DashboardAppScope } from './dashboard_app'; import { convertSavedDashboardPanelToPanelState } from './lib/embeddable_saved_object_converters'; import { RenderDeps } from './application'; -import { - IKbnUrlStateStorage, - removeQueryParam, - unhashUrl, -} from '../../../../../../plugins/kibana_utils/public'; +import { IKbnUrlStateStorage, removeQueryParam, unhashUrl } from '../../../kibana_utils/public'; import { addFatalError, AngularHttpError, KibanaLegacyStart, -} from '../../../../../../plugins/kibana_legacy/public'; + migrateLegacyQuery, + subscribeWithScope, +} from '../../../kibana_legacy/public'; export interface DashboardAppControllerDependencies extends RenderDeps { $scope: DashboardAppScope; @@ -128,6 +121,7 @@ export class DashboardAppController { }, history, kbnUrlStateStorage, + usageCollection, }: DashboardAppControllerDependencies) { const filterManager = queryService.filterManager; const queryFilter = filterManager; @@ -145,6 +139,7 @@ export class DashboardAppController { kibanaVersion: pluginInitializerContext.env.packageInfo.version, kbnUrlStateStorage, history, + usageCollection, }); // sync initial app filters from state to filterManager @@ -439,7 +434,7 @@ export class DashboardAppController { const updateBreadcrumbs = () => { chrome.setBreadcrumbs([ { - text: i18n.translate('kbn.dashboard.dashboardAppBreadcrumbsTitle', { + text: i18n.translate('dashboard.dashboardAppBreadcrumbsTitle', { defaultMessage: 'Dashboard', }), href: landingPageUrl(), @@ -680,20 +675,20 @@ export class DashboardAppController { overlays .openConfirm( - i18n.translate('kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription', { + i18n.translate('dashboard.changeViewModeConfirmModal.discardChangesDescription', { defaultMessage: `Once you discard your changes, there's no getting them back.`, }), { confirmButtonText: i18n.translate( - 'kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel', + 'dashboard.changeViewModeConfirmModal.confirmButtonLabel', { defaultMessage: 'Discard changes' } ), cancelButtonText: i18n.translate( - 'kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel', + 'dashboard.changeViewModeConfirmModal.cancelButtonLabel', { defaultMessage: 'Continue editing' } ), defaultFocusedButton: EUI_MODAL_CANCEL_BUTTON, - title: i18n.translate('kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle', { + title: i18n.translate('dashboard.changeViewModeConfirmModal.discardChangesTitle', { defaultMessage: 'Discard changes to dashboard?', }), } @@ -722,7 +717,7 @@ export class DashboardAppController { .then(function(id) { if (id) { notifications.toasts.addSuccess({ - title: i18n.translate('kbn.dashboard.dashboardWasSavedSuccessMessage', { + title: i18n.translate('dashboard.dashboardWasSavedSuccessMessage', { defaultMessage: `Dashboard '{dashTitle}' was saved`, values: { dashTitle: dash.title }, }), @@ -744,7 +739,7 @@ export class DashboardAppController { }) .catch(error => { notifications.toasts.addDanger({ - title: i18n.translate('kbn.dashboard.dashboardWasNotSavedDangerMessage', { + title: i18n.translate('dashboard.dashboardWasNotSavedDangerMessage', { defaultMessage: `Dashboard '{dashTitle}' was not saved. Error: {errorMessage}`, values: { dashTitle: dash.title, @@ -899,21 +894,25 @@ export class DashboardAppController { }, }); }; - navActions[TopNavIds.SHARE] = anchorElement => { - share.toggleShareContextMenu({ - anchorElement, - allowEmbed: true, - allowShortUrl: - !dashboardConfig.getHideWriteControls() || dashboardCapabilities.createShortUrl, - shareableUrl: unhashUrl(window.location.href), - objectId: dash.id, - objectType: 'dashboard', - sharingData: { - title: dash.title, - }, - isDirty: dashboardStateManager.getIsDirty(), - }); - }; + + if (share) { + // the share button is only availabale if "share" plugin contract enabled + navActions[TopNavIds.SHARE] = anchorElement => { + share.toggleShareContextMenu({ + anchorElement, + allowEmbed: true, + allowShortUrl: + !dashboardConfig.getHideWriteControls() || dashboardCapabilities.createShortUrl, + shareableUrl: unhashUrl(window.location.href), + objectId: dash.id, + objectType: 'dashboard', + sharingData: { + title: dash.title, + }, + isDirty: dashboardStateManager.getIsDirty(), + }); + }; + } updateViewMode(dashboardStateManager.getViewMode()); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.test.tsx b/src/plugins/dashboard/public/application/dashboard_empty_screen.test.tsx similarity index 97% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.test.tsx rename to src/plugins/dashboard/public/application/dashboard_empty_screen.test.tsx index d5e22798b4f24..933475d354cfa 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.test.tsx +++ b/src/plugins/dashboard/public/application/dashboard_empty_screen.test.tsx @@ -21,7 +21,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers'; import { DashboardEmptyScreen, DashboardEmptyScreenProps } from './dashboard_empty_screen'; // @ts-ignore import { findTestSubject } from '@elastic/eui/lib/test'; -import { coreMock } from '../../../../../../core/public/mocks'; +import { coreMock } from '../../../../core/public/mocks'; describe('DashboardEmptyScreen', () => { const setupMock = coreMock.createSetup(); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx b/src/plugins/dashboard/public/application/dashboard_empty_screen.tsx similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen.tsx rename to src/plugins/dashboard/public/application/dashboard_empty_screen.tsx diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx b/src/plugins/dashboard/public/application/dashboard_empty_screen_constants.tsx similarity index 76% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx rename to src/plugins/dashboard/public/application/dashboard_empty_screen_constants.tsx index 51fe31913662a..4904d08e958d5 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_empty_screen_constants.tsx +++ b/src/plugins/dashboard/public/application/dashboard_empty_screen_constants.tsx @@ -20,70 +20,70 @@ import { i18n } from '@kbn/i18n'; /** READONLY VIEW CONSTANTS **/ -export const emptyDashboardTitle: string = i18n.translate('kbn.dashboard.emptyDashboardTitle', { +export const emptyDashboardTitle: string = i18n.translate('dashboard.emptyDashboardTitle', { defaultMessage: 'This dashboard is empty.', }); export const emptyDashboardAdditionalPrivilege = i18n.translate( - 'kbn.dashboard.emptyDashboardAdditionalPrivilege', + 'dashboard.emptyDashboardAdditionalPrivilege', { defaultMessage: 'You need additional privileges to edit this dashboard.', } ); /** VIEW MODE CONSTANTS **/ -export const fillDashboardTitle: string = i18n.translate('kbn.dashboard.fillDashboardTitle', { +export const fillDashboardTitle: string = i18n.translate('dashboard.fillDashboardTitle', { defaultMessage: 'This dashboard is empty. Let\u2019s fill it up!', }); export const howToStartWorkingOnNewDashboardDescription1: string = i18n.translate( - 'kbn.dashboard.howToStartWorkingOnNewDashboardDescription1', + 'dashboard.howToStartWorkingOnNewDashboardDescription1', { defaultMessage: 'Click', } ); export const howToStartWorkingOnNewDashboardDescription2: string = i18n.translate( - 'kbn.dashboard.howToStartWorkingOnNewDashboardDescription2', + 'dashboard.howToStartWorkingOnNewDashboardDescription2', { defaultMessage: 'in the menu bar above to start adding panels.', } ); export const howToStartWorkingOnNewDashboardEditLinkText: string = i18n.translate( - 'kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText', + 'dashboard.howToStartWorkingOnNewDashboardEditLinkText', { defaultMessage: 'Edit', } ); export const howToStartWorkingOnNewDashboardEditLinkAriaLabel: string = i18n.translate( - 'kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel', + 'dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel', { defaultMessage: 'Edit dashboard', } ); /** EDIT MODE CONSTANTS **/ export const addExistingVisualizationLinkText: string = i18n.translate( - 'kbn.dashboard.addExistingVisualizationLinkText', + 'dashboard.addExistingVisualizationLinkText', { defaultMessage: 'Add an existing', } ); export const addExistingVisualizationLinkAriaLabel: string = i18n.translate( - 'kbn.dashboard.addVisualizationLinkAriaLabel', + 'dashboard.addVisualizationLinkAriaLabel', { defaultMessage: 'Add an existing visualization', } ); export const addNewVisualizationDescription: string = i18n.translate( - 'kbn.dashboard.addNewVisualizationText', + 'dashboard.addNewVisualizationText', { defaultMessage: 'or new object to this dashboard', } ); export const createNewVisualizationButton: string = i18n.translate( - 'kbn.dashboard.createNewVisualizationButton', + 'dashboard.createNewVisualizationButton', { defaultMessage: 'Create new', } ); export const createNewVisualizationButtonAriaLabel: string = i18n.translate( - 'kbn.dashboard.createNewVisualizationButtonAriaLabel', + 'dashboard.createNewVisualizationButtonAriaLabel', { defaultMessage: 'Create new visualization button', } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts b/src/plugins/dashboard/public/application/dashboard_state.test.ts similarity index 97% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts rename to src/plugins/dashboard/public/application/dashboard_state.test.ts index 14af89f80f9aa..cfb7fc7e56e42 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state.test.ts +++ b/src/plugins/dashboard/public/application/dashboard_state.test.ts @@ -17,10 +17,9 @@ * under the License. */ -import './np_core.test.mocks'; import { createBrowserHistory } from 'history'; import { DashboardStateManager } from './dashboard_state_manager'; -import { getSavedDashboardMock } from './test_utils'; +import { getSavedDashboardMock } from './test_helpers'; import { InputTimeRange, TimefilterContract, TimeRange } from 'src/plugins/data/public'; import { ViewMode } from 'src/plugins/embeddable/public'; import { createKbnUrlStateStorage } from 'src/plugins/kibana_utils/public'; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts b/src/plugins/dashboard/public/application/dashboard_state_manager.ts similarity index 95% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts rename to src/plugins/dashboard/public/application/dashboard_state_manager.ts index 9b8f75bdcf953..6025f535ae761 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_state_manager.ts +++ b/src/plugins/dashboard/public/application/dashboard_state_manager.ts @@ -23,18 +23,11 @@ import { Observable, Subscription } from 'rxjs'; import { Moment } from 'moment'; import { History } from 'history'; -import { - DashboardContainer, - SavedObjectDashboard, -} from '../../../../../../plugins/dashboard/public'; -import { ViewMode } from '../../../../../../plugins/embeddable/public'; -import { migrateLegacyQuery } from '../legacy_imports'; -import { - Filter, - Query, - TimefilterContract as Timefilter, -} from '../../../../../../plugins/data/public'; +import { Filter, Query, TimefilterContract as Timefilter } from 'src/plugins/data/public'; +import { UsageCollectionSetup } from 'src/plugins/usage_collection/public'; +import { migrateLegacyQuery } from '../../../kibana_legacy/public'; +import { ViewMode } from '../embeddable_plugin'; import { getAppStateDefaults, migrateAppState, getDashboardIdFromUrl } from './lib'; import { convertPanelStateToSavedDashboardPanel } from './lib/embeddable_saved_object_converters'; import { FilterUtils } from './lib/filter_utils'; @@ -43,14 +36,16 @@ import { DashboardAppStateDefaults, DashboardAppStateTransitions, SavedDashboardPanel, -} from './types'; +} from '../types'; import { createStateContainer, IKbnUrlStateStorage, ISyncStateRef, ReduxLikeStateContainer, syncState, -} from '../../../../../../plugins/kibana_utils/public'; +} from '../../../kibana_utils/public'; +import { SavedObjectDashboard } from '../saved_dashboards'; +import { DashboardContainer } from './embeddable'; /** * Dashboard state manager handles connecting angular and redux state between the angular and react portions of the @@ -89,6 +84,7 @@ export class DashboardStateManager { private readonly kbnUrlStateStorage: IKbnUrlStateStorage; private readonly stateSyncRef: ISyncStateRef; private readonly history: History; + private readonly usageCollection: UsageCollectionSetup | undefined; /** * @@ -103,22 +99,26 @@ export class DashboardStateManager { kibanaVersion, kbnUrlStateStorage, history, + usageCollection, }: { savedDashboard: SavedObjectDashboard; hideWriteControls: boolean; kibanaVersion: string; kbnUrlStateStorage: IKbnUrlStateStorage; history: History; + usageCollection?: UsageCollectionSetup; }) { this.history = history; this.kibanaVersion = kibanaVersion; this.savedDashboard = savedDashboard; this.hideWriteControls = hideWriteControls; + this.usageCollection = usageCollection; // get state defaults from saved dashboard, make sure it is migrated this.stateDefaults = migrateAppState( getAppStateDefaults(this.savedDashboard, this.hideWriteControls), - kibanaVersion + kibanaVersion, + usageCollection ); this.kbnUrlStateStorage = kbnUrlStateStorage; @@ -130,7 +130,8 @@ export class DashboardStateManager { ...this.stateDefaults, ...this.kbnUrlStateStorage.get(this.STATE_STORAGE_KEY), }, - kibanaVersion + kibanaVersion, + usageCollection ); // setup state container using initial state both from defaults and from url @@ -300,7 +301,8 @@ export class DashboardStateManager { // now. TODO: revisit this! this.stateDefaults = migrateAppState( getAppStateDefaults(this.savedDashboard, this.hideWriteControls), - this.kibanaVersion + this.kibanaVersion, + this.usageCollection ); // The original query won't be restored by the above because the query on this.savedDashboard is applied // in place in order for it to affect the visualizations. @@ -519,7 +521,7 @@ export class DashboardStateManager { public syncTimefilterWithDashboardTime(timeFilter: Timefilter) { if (!this.getIsTimeSavedWithDashboard()) { throw new Error( - i18n.translate('kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', { + i18n.translate('dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', { defaultMessage: 'The time is not saved with this dashboard so should not be synced.', }) ); @@ -540,7 +542,7 @@ export class DashboardStateManager { public syncTimefilterWithDashboardRefreshInterval(timeFilter: Timefilter) { if (!this.getIsTimeSavedWithDashboard()) { throw new Error( - i18n.translate('kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', { + i18n.translate('dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', { defaultMessage: 'The time is not saved with this dashboard so should not be synced.', }) ); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts b/src/plugins/dashboard/public/application/dashboard_strings.ts similarity index 84% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts rename to src/plugins/dashboard/public/application/dashboard_strings.ts index d9406ccba18ba..9109012adcfa6 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_strings.ts +++ b/src/plugins/dashboard/public/application/dashboard_strings.ts @@ -18,7 +18,7 @@ */ import { i18n } from '@kbn/i18n'; -import { ViewMode } from '../../../../../../plugins/embeddable/public'; +import { ViewMode } from '../embeddable_plugin'; /** * @param title {string} the current title of the dashboard @@ -35,18 +35,18 @@ export function getDashboardTitle( ): string { const isEditMode = viewMode === ViewMode.EDIT; let displayTitle: string; - const newDashboardTitle = i18n.translate('kbn.dashboard.savedDashboard.newDashboardTitle', { + const newDashboardTitle = i18n.translate('dashboard.savedDashboard.newDashboardTitle', { defaultMessage: 'New Dashboard', }); const dashboardTitle = isNew ? newDashboardTitle : title; if (isEditMode && isDirty) { - displayTitle = i18n.translate('kbn.dashboard.strings.dashboardUnsavedEditTitle', { + displayTitle = i18n.translate('dashboard.strings.dashboardUnsavedEditTitle', { defaultMessage: 'Editing {title} (unsaved)', values: { title: dashboardTitle }, }); } else if (isEditMode) { - displayTitle = i18n.translate('kbn.dashboard.strings.dashboardEditTitle', { + displayTitle = i18n.translate('dashboard.strings.dashboardEditTitle', { defaultMessage: 'Editing {title}', values: { title: dashboardTitle }, }); diff --git a/src/plugins/dashboard/public/embeddable/dashboard_constants.ts b/src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts similarity index 100% rename from src/plugins/dashboard/public/embeddable/dashboard_constants.ts rename to src/plugins/dashboard/public/application/embeddable/dashboard_constants.ts diff --git a/src/plugins/dashboard/public/embeddable/dashboard_container.test.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx similarity index 97% rename from src/plugins/dashboard/public/embeddable/dashboard_container.test.tsx rename to src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx index 6a734cb68fd9c..6785a373c065b 100644 --- a/src/plugins/dashboard/public/embeddable/dashboard_container.test.tsx +++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.test.tsx @@ -20,7 +20,7 @@ // @ts-ignore import { findTestSubject } from '@elastic/eui/lib/test'; import { nextTick } from 'test_utils/enzyme_helpers'; -import { isErrorEmbeddable, ViewMode } from '../embeddable_plugin'; +import { isErrorEmbeddable, ViewMode } from '../../embeddable_plugin'; import { DashboardContainer, DashboardContainerOptions } from './dashboard_container'; import { getSampleDashboardInput, getSampleDashboardPanel } from '../test_helpers'; import { @@ -29,7 +29,7 @@ import { ContactCardEmbeddableInput, ContactCardEmbeddable, ContactCardEmbeddableOutput, -} from '../embeddable_plugin_test_samples'; +} from '../../embeddable_plugin_test_samples'; // eslint-disable-next-line import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks'; diff --git a/src/plugins/dashboard/public/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx similarity index 92% rename from src/plugins/dashboard/public/embeddable/dashboard_container.tsx rename to src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx index d29ce2e4f38f5..7f3a2913daac3 100644 --- a/src/plugins/dashboard/public/embeddable/dashboard_container.tsx +++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx @@ -20,9 +20,10 @@ import React from 'react'; import ReactDOM from 'react-dom'; import { I18nProvider } from '@kbn/i18n/react'; -import { RefreshInterval, TimeRange, Query, Filter } from '../../../data/public'; -import { CoreStart } from '../../../../core/public'; -import { UiActionsStart } from '../ui_actions_plugin'; +import { RefreshInterval, TimeRange, Query, Filter } from 'src/plugins/data/public'; +import { CoreStart } from 'src/core/public'; +import { Start as InspectorStartContract } from 'src/plugins/inspector/public'; +import { UiActionsStart } from '../../ui_actions_plugin'; import { Container, ContainerInput, @@ -31,17 +32,16 @@ import { EmbeddableFactory, IEmbeddable, EmbeddableStart, -} from '../embeddable_plugin'; +} from '../../embeddable_plugin'; import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; import { createPanelState } from './panel'; import { DashboardPanelState } from './types'; import { DashboardViewport } from './viewport/dashboard_viewport'; -import { Start as InspectorStartContract } from '../../../inspector/public'; import { KibanaContextProvider, KibanaReactContext, KibanaReactContextValue, -} from '../../../kibana_react/public'; +} from '../../../../kibana_react/public'; export interface DashboardContainerInput extends ContainerInput { viewMode: ViewMode; diff --git a/src/plugins/dashboard/public/embeddable/dashboard_container_factory.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx similarity index 88% rename from src/plugins/dashboard/public/embeddable/dashboard_container_factory.tsx rename to src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx index 9ff48cb45adfd..a20ba148115a0 100644 --- a/src/plugins/dashboard/public/embeddable/dashboard_container_factory.tsx +++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx @@ -18,18 +18,18 @@ */ import { i18n } from '@kbn/i18n'; -import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public'; -import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public'; -import { CoreStart } from '../../../../core/public'; +import { UiActionsStart } from 'src/plugins/ui_actions/public'; +import { EmbeddableStart } from 'src/plugins/embeddable/public'; +import { CoreStart } from 'src/core/public'; +import { Start as InspectorStartContract } from 'src/plugins/inspector/public'; import { ContainerOutput, EmbeddableFactoryDefinition, ErrorEmbeddable, Container, -} from '../embeddable_plugin'; +} from '../../embeddable_plugin'; import { DashboardContainer, DashboardContainerInput } from './dashboard_container'; import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants'; -import { Start as InspectorStartContract } from '../../../inspector/public'; interface StartServices { capabilities: CoreStart['application']['capabilities']; diff --git a/src/plugins/dashboard/public/embeddable/grid/_dashboard_grid.scss b/src/plugins/dashboard/public/application/embeddable/grid/_dashboard_grid.scss similarity index 100% rename from src/plugins/dashboard/public/embeddable/grid/_dashboard_grid.scss rename to src/plugins/dashboard/public/application/embeddable/grid/_dashboard_grid.scss diff --git a/src/plugins/dashboard/public/embeddable/grid/_index.scss b/src/plugins/dashboard/public/application/embeddable/grid/_index.scss similarity index 100% rename from src/plugins/dashboard/public/embeddable/grid/_index.scss rename to src/plugins/dashboard/public/application/embeddable/grid/_index.scss diff --git a/src/plugins/dashboard/public/embeddable/grid/dashboard_grid.test.tsx b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx similarity index 97% rename from src/plugins/dashboard/public/embeddable/grid/dashboard_grid.test.tsx rename to src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx index a946c21765311..948e22e86a302 100644 --- a/src/plugins/dashboard/public/embeddable/grid/dashboard_grid.test.tsx +++ b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.test.tsx @@ -29,8 +29,8 @@ import { getSampleDashboardInput } from '../../test_helpers'; import { CONTACT_CARD_EMBEDDABLE, ContactCardEmbeddableFactory, -} from '../../embeddable_plugin_test_samples'; -import { KibanaContextProvider } from '../../../../kibana_react/public'; +} from '../../../embeddable_plugin_test_samples'; +import { KibanaContextProvider } from '../../../../../kibana_react/public'; // eslint-disable-next-line import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks'; diff --git a/src/plugins/dashboard/public/embeddable/grid/dashboard_grid.tsx b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx similarity index 98% rename from src/plugins/dashboard/public/embeddable/grid/dashboard_grid.tsx rename to src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx index 3f1f1056cf1b4..b15a813aff903 100644 --- a/src/plugins/dashboard/public/embeddable/grid/dashboard_grid.tsx +++ b/src/plugins/dashboard/public/application/embeddable/grid/dashboard_grid.tsx @@ -29,10 +29,10 @@ import _ from 'lodash'; import React from 'react'; import { Subscription } from 'rxjs'; import ReactGridLayout, { Layout } from 'react-grid-layout'; -import { ViewMode, EmbeddableChildPanel } from '../../embeddable_plugin'; +import { ViewMode, EmbeddableChildPanel } from '../../../embeddable_plugin'; import { DASHBOARD_GRID_COLUMN_COUNT, DASHBOARD_GRID_HEIGHT } from '../dashboard_constants'; import { DashboardPanelState, GridData } from '../types'; -import { withKibana } from '../../../../kibana_react/public'; +import { withKibana } from '../../../../../kibana_react/public'; import { DashboardContainerInput } from '../dashboard_container'; import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container'; diff --git a/src/plugins/dashboard/public/embeddable/grid/index.ts b/src/plugins/dashboard/public/application/embeddable/grid/index.ts similarity index 100% rename from src/plugins/dashboard/public/embeddable/grid/index.ts rename to src/plugins/dashboard/public/application/embeddable/grid/index.ts diff --git a/src/plugins/dashboard/public/embeddable/index.ts b/src/plugins/dashboard/public/application/embeddable/index.ts similarity index 100% rename from src/plugins/dashboard/public/embeddable/index.ts rename to src/plugins/dashboard/public/application/embeddable/index.ts diff --git a/src/plugins/dashboard/public/embeddable/panel/_dashboard_panel.scss b/src/plugins/dashboard/public/application/embeddable/panel/_dashboard_panel.scss similarity index 100% rename from src/plugins/dashboard/public/embeddable/panel/_dashboard_panel.scss rename to src/plugins/dashboard/public/application/embeddable/panel/_dashboard_panel.scss diff --git a/src/plugins/dashboard/public/embeddable/panel/_index.scss b/src/plugins/dashboard/public/application/embeddable/panel/_index.scss similarity index 100% rename from src/plugins/dashboard/public/embeddable/panel/_index.scss rename to src/plugins/dashboard/public/application/embeddable/panel/_index.scss diff --git a/src/plugins/dashboard/public/embeddable/panel/create_panel_state.test.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts similarity index 95% rename from src/plugins/dashboard/public/embeddable/panel/create_panel_state.test.ts rename to src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts index 8889f4dc27544..409cae8b49a53 100644 --- a/src/plugins/dashboard/public/embeddable/panel/create_panel_state.test.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.test.ts @@ -20,8 +20,8 @@ import { DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH } from '../dashboard_constants'; import { DashboardPanelState } from '../types'; import { createPanelState } from './create_panel_state'; -import { EmbeddableInput } from '../../embeddable_plugin'; -import { CONTACT_CARD_EMBEDDABLE } from '../../embeddable_plugin_test_samples'; +import { EmbeddableInput } from '../../../embeddable_plugin'; +import { CONTACT_CARD_EMBEDDABLE } from '../../../embeddable_plugin_test_samples'; interface TestInput extends EmbeddableInput { test: string; diff --git a/src/plugins/dashboard/public/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts similarity index 97% rename from src/plugins/dashboard/public/embeddable/panel/create_panel_state.ts rename to src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts index 7139cddf02b33..f3a48368fe1b3 100644 --- a/src/plugins/dashboard/public/embeddable/panel/create_panel_state.ts +++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { PanelState, EmbeddableInput } from '../../embeddable_plugin'; +import { PanelState, EmbeddableInput } from '../../../embeddable_plugin'; import { DASHBOARD_GRID_COLUMN_COUNT, DEFAULT_PANEL_HEIGHT, diff --git a/src/plugins/dashboard/public/embeddable/panel/index.ts b/src/plugins/dashboard/public/application/embeddable/panel/index.ts similarity index 100% rename from src/plugins/dashboard/public/embeddable/panel/index.ts rename to src/plugins/dashboard/public/application/embeddable/panel/index.ts diff --git a/src/plugins/dashboard/public/embeddable/types.ts b/src/plugins/dashboard/public/application/embeddable/types.ts similarity index 94% rename from src/plugins/dashboard/public/embeddable/types.ts rename to src/plugins/dashboard/public/application/embeddable/types.ts index 480d03552ca68..3df305b0d7f1b 100644 --- a/src/plugins/dashboard/public/embeddable/types.ts +++ b/src/plugins/dashboard/public/application/embeddable/types.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { PanelState, EmbeddableInput } from '../embeddable_plugin'; +import { PanelState, EmbeddableInput } from '../../embeddable_plugin'; export type PanelId = string; export type SavedObjectId = string; diff --git a/src/plugins/dashboard/public/embeddable/viewport/_dashboard_viewport.scss b/src/plugins/dashboard/public/application/embeddable/viewport/_dashboard_viewport.scss similarity index 100% rename from src/plugins/dashboard/public/embeddable/viewport/_dashboard_viewport.scss rename to src/plugins/dashboard/public/application/embeddable/viewport/_dashboard_viewport.scss diff --git a/src/plugins/dashboard/public/embeddable/viewport/_index.scss b/src/plugins/dashboard/public/application/embeddable/viewport/_index.scss similarity index 100% rename from src/plugins/dashboard/public/embeddable/viewport/_index.scss rename to src/plugins/dashboard/public/application/embeddable/viewport/_index.scss diff --git a/src/plugins/dashboard/public/embeddable/viewport/dashboard_viewport.test.tsx b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx similarity index 98% rename from src/plugins/dashboard/public/embeddable/viewport/dashboard_viewport.test.tsx rename to src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx index be4d2e3851f11..4f9aa75f52105 100644 --- a/src/plugins/dashboard/public/embeddable/viewport/dashboard_viewport.test.tsx +++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.test.tsx @@ -30,8 +30,8 @@ import { getSampleDashboardInput } from '../../test_helpers'; import { CONTACT_CARD_EMBEDDABLE, ContactCardEmbeddableFactory, -} from '../../embeddable_plugin_test_samples'; -import { KibanaContextProvider } from '../../../../../plugins/kibana_react/public'; +} from '../../../embeddable_plugin_test_samples'; +import { KibanaContextProvider } from '../../../../../kibana_react/public'; // eslint-disable-next-line import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks'; diff --git a/src/plugins/dashboard/public/embeddable/viewport/dashboard_viewport.tsx b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx similarity index 97% rename from src/plugins/dashboard/public/embeddable/viewport/dashboard_viewport.tsx rename to src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx index e7fd379898dd1..ae239bc27fdba 100644 --- a/src/plugins/dashboard/public/embeddable/viewport/dashboard_viewport.tsx +++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx @@ -19,10 +19,10 @@ import React from 'react'; import { Subscription } from 'rxjs'; -import { PanelState } from '../../embeddable_plugin'; +import { PanelState } from '../../../embeddable_plugin'; import { DashboardContainer, DashboardReactContextValue } from '../dashboard_container'; import { DashboardGrid } from '../grid'; -import { context } from '../../../../kibana_react/public'; +import { context } from '../../../../../kibana_react/public'; export interface DashboardViewportProps { container: DashboardContainer; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts b/src/plugins/dashboard/public/application/help_menu/help_menu_util.ts similarity index 95% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts rename to src/plugins/dashboard/public/application/help_menu/help_menu_util.ts index bc281c6eb340f..efdff051a25a0 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/help_menu/help_menu_util.ts +++ b/src/plugins/dashboard/public/application/help_menu/help_menu_util.ts @@ -25,7 +25,7 @@ export function addHelpMenuToAppChrome( docLinks: CoreStart['docLinks'] ) { chrome.setHelpExtension({ - appName: i18n.translate('kbn.dashboard.helpMenu.appName', { + appName: i18n.translate('dashboard.helpMenu.appName', { defaultMessage: 'Dashboards', }), links: [ diff --git a/src/legacy/core_plugins/kibana/public/dashboard/_index.scss b/src/plugins/dashboard/public/application/index.scss similarity index 56% rename from src/legacy/core_plugins/kibana/public/dashboard/_index.scss rename to src/plugins/dashboard/public/application/index.scss index 35d4127365f02..6e158b2ec2e47 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/_index.scss +++ b/src/plugins/dashboard/public/application/index.scss @@ -1,9 +1,8 @@ -// External libraries -// 'react-grid-layout/css/styles.css'; -// 'react-resizable/css/styles.css'; -// ... are being imported via JS in grid/dashboard_grid.js +@import '../../../embeddable/public/variables'; -@import './variables'; +@import './embeddable/grid/index'; +@import './embeddable/panel/index'; +@import './embeddable/viewport/index'; // Temporary hacks @import './hacks'; @@ -16,3 +15,4 @@ // dshChart__legend-isLoading @import './dashboard_app'; + diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/index.ts b/src/plugins/dashboard/public/application/index.ts similarity index 88% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/index.ts rename to src/plugins/dashboard/public/application/index.ts index a9a306da7f1a2..fcd92da33aa5f 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/index.ts +++ b/src/plugins/dashboard/public/application/index.ts @@ -17,4 +17,6 @@ * under the License. */ -export { getSavedDashboardMock } from './get_saved_dashboard_mock'; +export * from './embeddable'; +export * from './actions'; +export { RenderDeps } from './application'; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js b/src/plugins/dashboard/public/application/legacy_app.js similarity index 92% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js rename to src/plugins/dashboard/public/application/legacy_app.js index dbeaf8a98b461..10243dbf2f979 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js +++ b/src/plugins/dashboard/public/application/legacy_app.js @@ -25,17 +25,17 @@ import dashboardListingTemplate from './listing/dashboard_listing_ng_wrapper.htm import { createHashHistory } from 'history'; import { initDashboardAppDirective } from './dashboard_app'; -import { createDashboardEditUrl, DashboardConstants } from './dashboard_constants'; +import { createDashboardEditUrl, DashboardConstants } from '../dashboard_constants'; import { createKbnUrlStateStorage, ensureDefaultIndexPattern, redirectWhenMissing, InvalidJSONProperty, SavedObjectNotFound, -} from '../../../../../../plugins/kibana_utils/public'; +} from '../../../kibana_utils/public'; import { DashboardListing, EMPTY_FILTER } from './listing/dashboard_listing'; import { addHelpMenuToAppChrome } from './help_menu/help_menu_util'; -import { syncQueryStateWithUrl } from '../../../../../../plugins/data/public'; +import { syncQueryStateWithUrl } from '../../../data/public'; export function initDashboardApp(app, deps) { initDashboardAppDirective(app, deps); @@ -55,7 +55,7 @@ export function initDashboardApp(app, deps) { }); function createNewDashboardCtrl($scope) { - $scope.visitVisualizeAppLinkText = i18n.translate('kbn.dashboard.visitVisualizeAppLinkText', { + $scope.visitVisualizeAppLinkText = i18n.translate('dashboard.visitVisualizeAppLinkText', { defaultMessage: 'visit the Visualize app', }); addHelpMenuToAppChrome(deps.chrome, deps.core.docLinks); @@ -79,10 +79,10 @@ export function initDashboardApp(app, deps) { } return { - text: i18n.translate('kbn.dashboard.badge.readOnly.text', { + text: i18n.translate('dashboard.badge.readOnly.text', { defaultMessage: 'Read only', }), - tooltip: i18n.translate('kbn.dashboard.badge.readOnly.tooltip', { + tooltip: i18n.translate('dashboard.badge.readOnly.tooltip', { defaultMessage: 'Unable to save dashboards', }), iconType: 'glasses', @@ -94,7 +94,7 @@ export function initDashboardApp(app, deps) { .when(DashboardConstants.LANDING_PAGE_PATH, { ...defaults, template: dashboardListingTemplate, - controller($scope, kbnUrlStateStorage, history) { + controller: function($scope, kbnUrlStateStorage, history) { const service = deps.savedDashboards; const dashboardConfig = deps.dashboardConfig; @@ -124,7 +124,7 @@ export function initDashboardApp(app, deps) { $scope.initialFilter = parse(history.location.search).filter || EMPTY_FILTER; deps.chrome.setBreadcrumbs([ { - text: i18n.translate('kbn.dashboard.dashboardBreadcrumbsTitle', { + text: i18n.translate('dashboard.dashboardBreadcrumbsTitle', { defaultMessage: 'Dashboards', }), }, @@ -222,7 +222,7 @@ export function initDashboardApp(app, deps) { }); deps.core.notifications.toasts.addWarning( - i18n.translate('kbn.dashboard.urlWasRemovedInSixZeroWarningMessage', { + i18n.translate('dashboard.urlWasRemovedInSixZeroWarningMessage', { defaultMessage: 'The url "dashboard/create" was removed in 6.0. Please update your bookmarks.', }) diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts similarity index 95% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts rename to src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts index d3c3dc46c7057..447563bbfbcfa 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.test.ts +++ b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.test.ts @@ -16,14 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -import '../np_core.test.mocks'; import { convertSavedDashboardPanelToPanelState, convertPanelStateToSavedDashboardPanel, } from './embeddable_saved_object_converters'; -import { SavedDashboardPanel } from '../types'; -import { DashboardPanelState } from 'src/plugins/dashboard/public'; +import { SavedDashboardPanel } from '../../types'; +import { DashboardPanelState } from '../embeddable'; import { EmbeddableInput } from 'src/plugins/embeddable/public'; interface CustomInput extends EmbeddableInput { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts similarity index 93% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts rename to src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts index 500ee7e28daa6..01cd55df0d8e9 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/embeddable_saved_object_converters.ts +++ b/src/plugins/dashboard/public/application/lib/embeddable_saved_object_converters.ts @@ -17,8 +17,8 @@ * under the License. */ import { omit } from 'lodash'; -import { DashboardPanelState } from '../../../../../../../plugins/dashboard/public'; -import { SavedDashboardPanel } from '../types'; +import { SavedDashboardPanel } from '../../types'; +import { DashboardPanelState } from '../embeddable'; export function convertSavedDashboardPanelToPanelState( savedDashboardPanel: SavedDashboardPanel diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts b/src/plugins/dashboard/public/application/lib/filter_utils.ts similarity index 97% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts rename to src/plugins/dashboard/public/application/lib/filter_utils.ts index f7b45b0371378..1ec231db0c3d2 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/filter_utils.ts +++ b/src/plugins/dashboard/public/application/lib/filter_utils.ts @@ -19,7 +19,7 @@ import _ from 'lodash'; import moment, { Moment } from 'moment'; -import { Filter } from '../../../../../../../plugins/data/public'; +import { Filter } from 'src/plugins/data/public'; /** * @typedef {Object} QueryFilter diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts b/src/plugins/dashboard/public/application/lib/get_app_state_defaults.ts similarity index 87% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts rename to src/plugins/dashboard/public/application/lib/get_app_state_defaults.ts index b3acefeba0146..f008c787cb95d 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/get_app_state_defaults.ts +++ b/src/plugins/dashboard/public/application/lib/get_app_state_defaults.ts @@ -17,9 +17,9 @@ * under the License. */ -import { ViewMode } from '../../../../../../../plugins/embeddable/public'; -import { SavedObjectDashboard } from '../../../../../../../plugins/dashboard/public'; -import { DashboardAppStateDefaults } from '../types'; +import { ViewMode } from '../../embeddable_plugin'; +import { SavedObjectDashboard } from '../../saved_dashboards'; +import { DashboardAppStateDefaults } from '../../types'; export function getAppStateDefaults( savedDashboard: SavedObjectDashboard, diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/index.ts b/src/plugins/dashboard/public/application/lib/index.ts similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/index.ts rename to src/plugins/dashboard/public/application/lib/index.ts diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts b/src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts similarity index 98% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts rename to src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts index 73336ec951894..d037fb3808406 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.test.ts +++ b/src/plugins/dashboard/public/application/lib/migrate_app_state.test.ts @@ -17,9 +17,7 @@ * under the License. */ -import '../np_core.test.mocks'; - -import { SavedDashboardPanel } from '../types'; +import { SavedDashboardPanel } from '../../types'; import { migrateAppState } from './migrate_app_state'; test('migrate app state from 6.0', async () => { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts b/src/plugins/dashboard/public/application/lib/migrate_app_state.ts similarity index 77% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts rename to src/plugins/dashboard/public/application/lib/migrate_app_state.ts index 0cd958ced0eb1..8f8de3663518a 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/migrate_app_state.ts +++ b/src/plugins/dashboard/public/application/lib/migrate_app_state.ts @@ -19,7 +19,9 @@ import semver from 'semver'; import { i18n } from '@kbn/i18n'; -import { createUiStatsReporter, METRIC_TYPE } from '../../../../../ui_metric/public'; +import { METRIC_TYPE } from '@kbn/analytics'; + +import { UsageCollectionSetup } from 'src/plugins/usage_collection/public'; import { DashboardAppState, SavedDashboardPanelTo60, @@ -29,8 +31,9 @@ import { SavedDashboardPanel640To720, SavedDashboardPanel620, SavedDashboardPanel, -} from '../types'; -import { migratePanelsTo730 } from '../../migrations/migrate_to_730_panels'; +} from '../../types'; +// should be moved in src/plugins/dashboard/common right after https://github.com/elastic/kibana/pull/61895 is merged +import { migratePanelsTo730 } from '../../../../../legacy/core_plugins/kibana/public/dashboard/migrations/migrate_to_730_panels'; /** * Attempts to migrate the state stored in the URL into the latest version of it. @@ -39,11 +42,12 @@ import { migratePanelsTo730 } from '../../migrations/migrate_to_730_panels'; */ export function migrateAppState( appState: { [key: string]: unknown } & DashboardAppState, - kibanaVersion: string + kibanaVersion: string, + usageCollection?: UsageCollectionSetup ): DashboardAppState { if (!appState.panels) { throw new Error( - i18n.translate('kbn.dashboard.panel.invalidData', { + i18n.translate('dashboard.panel.invalidData', { defaultMessage: 'Invalid data in url', }) ); @@ -61,8 +65,10 @@ export function migrateAppState( const version = (panel as SavedDashboardPanel730ToLatest).version; - // This will help us figure out when to remove support for older style URLs. - createUiStatsReporter('DashboardPanelVersionInUrl')(METRIC_TYPE.LOADED, `${version}`); + if (usageCollection) { + // This will help us figure out when to remove support for older style URLs. + usageCollection.reportUiStats('DashboardPanelVersionInUrl', METRIC_TYPE.LOADED, `${version}`); + } return semver.satisfies(version, '<7.3'); }); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts b/src/plugins/dashboard/public/application/lib/save_dashboard.ts similarity index 95% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts rename to src/plugins/dashboard/public/application/lib/save_dashboard.ts index db2b1f15247de..c948c25cb2ab5 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/save_dashboard.ts +++ b/src/plugins/dashboard/public/application/lib/save_dashboard.ts @@ -18,7 +18,7 @@ */ import { TimefilterContract } from 'src/plugins/data/public'; -import { SavedObjectSaveOpts } from '../../../../../../../plugins/saved_objects/public'; +import { SavedObjectSaveOpts } from 'src/plugins/saved_objects/public'; import { updateSavedDashboard } from './update_saved_dashboard'; import { DashboardStateManager } from '../dashboard_state_manager'; diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts similarity index 93% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts rename to src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts index dee279550aa6a..53dc7d9b460de 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/update_saved_dashboard.ts +++ b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts @@ -20,8 +20,8 @@ import _ from 'lodash'; import { RefreshInterval, TimefilterContract } from 'src/plugins/data/public'; import { FilterUtils } from './filter_utils'; -import { SavedObjectDashboard } from '../../../../../../../plugins/dashboard/public'; -import { DashboardAppState } from '../types'; +import { SavedObjectDashboard } from '../../saved_dashboards'; +import { DashboardAppState } from '../../types'; export function updateSavedDashboard( savedDashboard: SavedObjectDashboard, diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/url.test.ts b/src/plugins/dashboard/public/application/lib/url.test.ts similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/url.test.ts rename to src/plugins/dashboard/public/application/lib/url.test.ts diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/url.ts b/src/plugins/dashboard/public/application/lib/url.ts similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/lib/url.ts rename to src/plugins/dashboard/public/application/lib/url.ts diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.js.snap similarity index 86% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap rename to src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.js.snap index 2a9a793ba43c4..8c91776cabc9c 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/__snapshots__/dashboard_listing.test.js.snap +++ b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.js.snap @@ -22,7 +22,7 @@ exports[`after fetch hideWriteControls 1`] = ` > @@ -81,7 +81,7 @@ exports[`after fetch initialFilter 1`] = ` > @@ -91,14 +91,14 @@ exports[`after fetch initialFilter 1`] = `

, @@ -123,7 +123,7 @@ exports[`after fetch initialFilter 1`] = ` > @@ -182,7 +182,7 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = ` > @@ -192,14 +192,14 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `

, @@ -224,7 +224,7 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = ` > @@ -283,7 +283,7 @@ exports[`after fetch renders table rows 1`] = ` > @@ -293,14 +293,14 @@ exports[`after fetch renders table rows 1`] = `

, @@ -325,7 +325,7 @@ exports[`after fetch renders table rows 1`] = ` > @@ -384,7 +384,7 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = ` > @@ -394,14 +394,14 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = `

, @@ -426,7 +426,7 @@ exports[`after fetch renders warning when listingLimit is exceeded 1`] = ` > @@ -485,7 +485,7 @@ exports[`renders empty page in before initial fetch to avoid flickering 1`] = ` > @@ -495,14 +495,14 @@ exports[`renders empty page in before initial fetch to avoid flickering 1`] = `

, @@ -527,7 +527,7 @@ exports[`renders empty page in before initial fetch to avoid flickering 1`] = ` > diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js b/src/plugins/dashboard/public/application/listing/dashboard_listing.js similarity index 84% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js rename to src/plugins/dashboard/public/application/listing/dashboard_listing.js index 30bf940069fb7..e123a87bf10d5 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.js +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.js @@ -24,7 +24,7 @@ import { FormattedMessage, I18nProvider } from '@kbn/i18n/react'; import { i18n } from '@kbn/i18n'; import { EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui'; -import { TableListView } from '../../../../../../../plugins/kibana_react/public'; +import { TableListView } from '../../../../kibana_react/public'; export const EMPTY_FILTER = ''; @@ -51,13 +51,13 @@ export class DashboardListing extends React.Component { listingLimit={this.props.listingLimit} initialFilter={this.props.initialFilter} noItemsFragment={this.getNoItemsMessage()} - entityName={i18n.translate('kbn.dashboard.listing.table.entityName', { + entityName={i18n.translate('dashboard.listing.table.entityName', { defaultMessage: 'dashboard', })} - entityNamePlural={i18n.translate('kbn.dashboard.listing.table.entityNamePlural', { + entityNamePlural={i18n.translate('dashboard.listing.table.entityNamePlural', { defaultMessage: 'dashboards', })} - tableListTitle={i18n.translate('kbn.dashboard.listing.dashboardsTitle', { + tableListTitle={i18n.translate('dashboard.listing.dashboardsTitle', { defaultMessage: 'Dashboards', })} toastNotifications={this.props.core.notifications.toasts} @@ -76,7 +76,7 @@ export class DashboardListing extends React.Component { title={

@@ -93,7 +93,7 @@ export class DashboardListing extends React.Component { title={

@@ -102,19 +102,19 @@ export class DashboardListing extends React.Component {

@@ -132,7 +132,7 @@ export class DashboardListing extends React.Component { data-test-subj="createDashboardPromptButton" > @@ -146,7 +146,7 @@ export class DashboardListing extends React.Component { const tableColumns = [ { field: 'title', - name: i18n.translate('kbn.dashboard.listing.table.titleColumnName', { + name: i18n.translate('dashboard.listing.table.titleColumnName', { defaultMessage: 'Title', }), sortable: true, @@ -161,7 +161,7 @@ export class DashboardListing extends React.Component { }, { field: 'description', - name: i18n.translate('kbn.dashboard.listing.table.descriptionColumnName', { + name: i18n.translate('dashboard.listing.table.descriptionColumnName', { defaultMessage: 'Description', }), dataType: 'string', diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js similarity index 97% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js rename to src/plugins/dashboard/public/application/listing/dashboard_listing.test.js index c47a54ad60460..0cdefff6a738e 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing.test.js +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.js @@ -17,16 +17,6 @@ * under the License. */ -jest.mock( - 'ui/notify', - () => ({ - toastNotifications: { - addWarning: () => {}, - }, - }), - { virtual: true } -); - jest.mock( 'lodash', () => ({ diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html b/src/plugins/dashboard/public/application/listing/dashboard_listing_ng_wrapper.html similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/listing/dashboard_listing_ng_wrapper.html rename to src/plugins/dashboard/public/application/listing/dashboard_listing_ng_wrapper.html diff --git a/src/plugins/dashboard/public/test_helpers/get_sample_dashboard_input.ts b/src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts similarity index 96% rename from src/plugins/dashboard/public/test_helpers/get_sample_dashboard_input.ts rename to src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts index 09478d8e8af35..4ceac90672cb3 100644 --- a/src/plugins/dashboard/public/test_helpers/get_sample_dashboard_input.ts +++ b/src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts @@ -17,7 +17,7 @@ * under the License. */ -import { ViewMode, EmbeddableInput } from '../embeddable_plugin'; +import { ViewMode, EmbeddableInput } from '../../embeddable_plugin'; import { DashboardContainerInput, DashboardPanelState } from '../embeddable'; export function getSampleDashboardInput( diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts similarity index 88% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts rename to src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts index 53618f1cfe5fa..57c147ffe3588 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/test_utils/get_saved_dashboard_mock.ts +++ b/src/plugins/dashboard/public/application/test_helpers/get_saved_dashboard_mock.ts @@ -17,8 +17,8 @@ * under the License. */ -import { searchSourceMock } from '../../../../../../../plugins/data/public/mocks'; -import { SavedObjectDashboard } from '../../../../../../../plugins/dashboard/public/'; +import { searchSourceMock } from '../../../../data/public/mocks'; +import { SavedObjectDashboard } from '../../saved_dashboards'; export function getSavedDashboardMock( config?: Partial diff --git a/src/plugins/dashboard/public/test_helpers/index.ts b/src/plugins/dashboard/public/application/test_helpers/index.ts similarity index 92% rename from src/plugins/dashboard/public/test_helpers/index.ts rename to src/plugins/dashboard/public/application/test_helpers/index.ts index 88909826971fc..c22c614e9ffcf 100644 --- a/src/plugins/dashboard/public/test_helpers/index.ts +++ b/src/plugins/dashboard/public/application/test_helpers/index.ts @@ -18,3 +18,4 @@ */ export { getSampleDashboardInput, getSampleDashboardPanel } from './get_sample_dashboard_input'; +export { getSavedDashboardMock } from './get_saved_dashboard_mock'; diff --git a/src/plugins/dashboard/public/tests/dashboard_container.test.tsx b/src/plugins/dashboard/public/application/tests/dashboard_container.test.tsx similarity index 90% rename from src/plugins/dashboard/public/tests/dashboard_container.test.tsx rename to src/plugins/dashboard/public/application/tests/dashboard_container.test.tsx index 1c72ad34e5446..836cea298f035 100644 --- a/src/plugins/dashboard/public/tests/dashboard_container.test.tsx +++ b/src/plugins/dashboard/public/application/tests/dashboard_container.test.tsx @@ -23,7 +23,7 @@ import React from 'react'; import { mount } from 'enzyme'; import { nextTick } from 'test_utils/enzyme_helpers'; import { I18nProvider } from '@kbn/i18n/react'; -import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../embeddable_plugin'; +import { ViewMode, CONTEXT_MENU_TRIGGER, EmbeddablePanel } from '../../embeddable_plugin'; import { DashboardContainer, DashboardContainerOptions } from '../embeddable/dashboard_container'; import { getSampleDashboardInput } from '../test_helpers'; import { @@ -33,14 +33,11 @@ import { ContactCardEmbeddable, ContactCardEmbeddableOutput, createEditModeAction, -} from '../embeddable_plugin_test_samples'; -// eslint-disable-next-line -import { embeddablePluginMock } from '../../../embeddable/public/mocks'; -// eslint-disable-next-line -import { inspectorPluginMock } from '../../../inspector/public/mocks'; -import { KibanaContextProvider } from '../../../kibana_react/public'; -// eslint-disable-next-line -import { uiActionsPluginMock } from '../../../ui_actions/public/mocks'; +} from '../../embeddable_plugin_test_samples'; +import { embeddablePluginMock } from '../../../../embeddable/public/mocks'; +import { inspectorPluginMock } from '../../../../inspector/public/mocks'; +import { KibanaContextProvider } from '../../../../kibana_react/public'; +import { uiActionsPluginMock } from '../../../../ui_actions/public/mocks'; test('DashboardContainer in edit mode shows edit mode actions', async () => { const inspector = inspectorPluginMock.createStartContract(); diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/clone_modal.test.js.snap b/src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap similarity index 83% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/clone_modal.test.js.snap rename to src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap index 771d53b73d960..d289d267a2fd6 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/clone_modal.test.js.snap +++ b/src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap @@ -11,7 +11,7 @@ exports[`renders DashboardCloneModal 1`] = ` @@ -21,7 +21,7 @@ exports[`renders DashboardCloneModal 1`] = `

@@ -43,7 +43,7 @@ exports[`renders DashboardCloneModal 1`] = ` > @@ -55,7 +55,7 @@ exports[`renders DashboardCloneModal 1`] = ` > diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/save_modal.test.js.snap b/src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap similarity index 86% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/save_modal.test.js.snap rename to src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap index 7ac2e2d9dd317..bc4ed477d9eea 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/__snapshots__/save_modal.test.js.snap +++ b/src/plugins/dashboard/public/application/top_nav/__snapshots__/save_modal.test.js.snap @@ -16,7 +16,7 @@ exports[`renders DashboardSaveModal 1`] = ` label={ } @@ -37,7 +37,7 @@ exports[`renders DashboardSaveModal 1`] = ` helpText={ } @@ -49,7 +49,7 @@ exports[`renders DashboardSaveModal 1`] = ` label={ } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.test.js b/src/plugins/dashboard/public/application/top_nav/clone_modal.test.js similarity index 100% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.test.js rename to src/plugins/dashboard/public/application/top_nav/clone_modal.test.js diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.tsx b/src/plugins/dashboard/public/application/top_nav/clone_modal.tsx similarity index 88% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.tsx rename to src/plugins/dashboard/public/application/top_nav/clone_modal.tsx index 08e2b98d1c73d..16cfced6573ca 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/clone_modal.tsx +++ b/src/plugins/dashboard/public/application/top_nav/clone_modal.tsx @@ -117,7 +117,7 @@ export class DashboardCloneModal extends React.Component { { >

@@ -158,7 +158,7 @@ export class DashboardCloneModal extends React.Component { @@ -168,7 +168,7 @@ export class DashboardCloneModal extends React.Component {

@@ -178,7 +178,7 @@ export class DashboardCloneModal extends React.Component { { @@ -205,7 +205,7 @@ export class DashboardCloneModal extends React.Component { isLoading={this.state.isLoading} > diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts similarity index 76% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts rename to src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts index 7a3cb4b7dad56..dbdadeb4e4e7c 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/get_top_nav_config.ts +++ b/src/plugins/dashboard/public/application/top_nav/get_top_nav_config.ts @@ -18,9 +18,9 @@ */ import { i18n } from '@kbn/i18n'; -import { ViewMode } from '../../../../../../../plugins/embeddable/public'; +import { ViewMode } from '../../embeddable_plugin'; import { TopNavIds } from './top_nav_ids'; -import { NavAction } from '../types'; +import { NavAction } from '../../types'; /** * @param actions - A mapping of TopNavIds to an action function that should run when the @@ -63,10 +63,10 @@ export function getTopNavConfig( function getFullScreenConfig(action: NavAction) { return { id: 'full-screen', - label: i18n.translate('kbn.dashboard.topNave.fullScreenButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.fullScreenButtonAriaLabel', { defaultMessage: 'full screen', }), - description: i18n.translate('kbn.dashboard.topNave.fullScreenConfigDescription', { + description: i18n.translate('dashboard.topNave.fullScreenConfigDescription', { defaultMessage: 'Full Screen Mode', }), testId: 'dashboardFullScreenMode', @@ -80,10 +80,10 @@ function getFullScreenConfig(action: NavAction) { function getEditConfig(action: NavAction) { return { id: 'edit', - label: i18n.translate('kbn.dashboard.topNave.editButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.editButtonAriaLabel', { defaultMessage: 'edit', }), - description: i18n.translate('kbn.dashboard.topNave.editConfigDescription', { + description: i18n.translate('dashboard.topNave.editConfigDescription', { defaultMessage: 'Switch to edit mode', }), testId: 'dashboardEditMode', @@ -100,10 +100,10 @@ function getEditConfig(action: NavAction) { function getSaveConfig(action: NavAction) { return { id: 'save', - label: i18n.translate('kbn.dashboard.topNave.saveButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.saveButtonAriaLabel', { defaultMessage: 'save', }), - description: i18n.translate('kbn.dashboard.topNave.saveConfigDescription', { + description: i18n.translate('dashboard.topNave.saveConfigDescription', { defaultMessage: 'Save your dashboard', }), testId: 'dashboardSaveMenuItem', @@ -117,10 +117,10 @@ function getSaveConfig(action: NavAction) { function getViewConfig(action: NavAction) { return { id: 'cancel', - label: i18n.translate('kbn.dashboard.topNave.cancelButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.cancelButtonAriaLabel', { defaultMessage: 'cancel', }), - description: i18n.translate('kbn.dashboard.topNave.viewConfigDescription', { + description: i18n.translate('dashboard.topNave.viewConfigDescription', { defaultMessage: 'Cancel editing and switch to view-only mode', }), testId: 'dashboardViewOnlyMode', @@ -134,10 +134,10 @@ function getViewConfig(action: NavAction) { function getCloneConfig(action: NavAction) { return { id: 'clone', - label: i18n.translate('kbn.dashboard.topNave.cloneButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.cloneButtonAriaLabel', { defaultMessage: 'clone', }), - description: i18n.translate('kbn.dashboard.topNave.cloneConfigDescription', { + description: i18n.translate('dashboard.topNave.cloneConfigDescription', { defaultMessage: 'Create a copy of your dashboard', }), testId: 'dashboardClone', @@ -151,10 +151,10 @@ function getCloneConfig(action: NavAction) { function getAddConfig(action: NavAction) { return { id: 'add', - label: i18n.translate('kbn.dashboard.topNave.addButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.addButtonAriaLabel', { defaultMessage: 'add', }), - description: i18n.translate('kbn.dashboard.topNave.addConfigDescription', { + description: i18n.translate('dashboard.topNave.addConfigDescription', { defaultMessage: 'Add a panel to the dashboard', }), testId: 'dashboardAddPanelButton', @@ -170,10 +170,10 @@ function getCreateNewConfig(action: NavAction) { emphasize: true, iconType: 'plusInCircle', id: 'addNew', - label: i18n.translate('kbn.dashboard.topNave.addNewButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.addNewButtonAriaLabel', { defaultMessage: 'Create new', }), - description: i18n.translate('kbn.dashboard.topNave.addNewConfigDescription', { + description: i18n.translate('dashboard.topNave.addNewConfigDescription', { defaultMessage: 'Create a new panel on this dashboard', }), testId: 'dashboardAddNewPanelButton', @@ -184,17 +184,19 @@ function getCreateNewConfig(action: NavAction) { /** * @returns {kbnTopNavConfig} */ -function getShareConfig(action: NavAction) { +function getShareConfig(action: NavAction | undefined) { return { id: 'share', - label: i18n.translate('kbn.dashboard.topNave.shareButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.shareButtonAriaLabel', { defaultMessage: 'share', }), - description: i18n.translate('kbn.dashboard.topNave.shareConfigDescription', { + description: i18n.translate('dashboard.topNave.shareConfigDescription', { defaultMessage: 'Share Dashboard', }), testId: 'shareTopNavButton', run: action, + // disable the Share button if no action specified + disableButton: !action, }; } @@ -204,10 +206,10 @@ function getShareConfig(action: NavAction) { function getOptionsConfig(action: NavAction) { return { id: 'options', - label: i18n.translate('kbn.dashboard.topNave.optionsButtonAriaLabel', { + label: i18n.translate('dashboard.topNave.optionsButtonAriaLabel', { defaultMessage: 'options', }), - description: i18n.translate('kbn.dashboard.topNave.optionsConfigDescription', { + description: i18n.translate('dashboard.topNave.optionsConfigDescription', { defaultMessage: 'Options', }), testId: 'dashboardOptionsButton', diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/options.tsx b/src/plugins/dashboard/public/application/top_nav/options.tsx similarity index 88% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/options.tsx rename to src/plugins/dashboard/public/application/top_nav/options.tsx index af284e6f557cb..3398696ff40db 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/options.tsx +++ b/src/plugins/dashboard/public/application/top_nav/options.tsx @@ -61,12 +61,9 @@ export class OptionsMenu extends Component { { ({ +jest.mock('../../../../saved_objects/public', () => ({ SavedObjectSaveModal: () => null, })); -jest.mock('ui/new_platform'); - import { DashboardSaveModal } from './save_modal'; test('renders DashboardSaveModal', () => { diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx b/src/plugins/dashboard/public/application/top_nav/save_modal.tsx similarity index 91% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx rename to src/plugins/dashboard/public/application/top_nav/save_modal.tsx index 4a4fcb7e1adc8..609ed23472924 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/save_modal.tsx +++ b/src/plugins/dashboard/public/application/top_nav/save_modal.tsx @@ -21,7 +21,7 @@ import React, { Fragment } from 'react'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui'; -import { SavedObjectSaveModal } from '../../../../../../../plugins/saved_objects/public'; +import { SavedObjectSaveModal } from '../../../../saved_objects/public'; interface SaveOptions { newTitle: string; @@ -102,7 +102,7 @@ export class DashboardSaveModal extends React.Component { } @@ -117,7 +117,7 @@ export class DashboardSaveModal extends React.Component { } @@ -128,7 +128,7 @@ export class DashboardSaveModal extends React.Component { onChange={this.onTimeRestoreChange} label={ } diff --git a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx b/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx similarity index 96% rename from src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx rename to src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx index af1020e01e0c5..ee356b81802ee 100644 --- a/src/legacy/core_plugins/kibana/public/dashboard/np_ready/top_nav/show_clone_modal.tsx +++ b/src/plugins/dashboard/public/application/top_nav/show_clone_modal.tsx @@ -58,7 +58,7 @@ export function showCloneModal( { - constructor(initializerContext: PluginInitializerContext) {} + constructor(private initializerContext: PluginInitializerContext) {} + + private appStateUpdater = new BehaviorSubject(() => ({})); + private stopUrlTracking: (() => void) | undefined = undefined; public setup( - core: CoreSetup, - { share, uiActions, embeddable }: SetupDependencies + core: CoreSetup, + { share, uiActions, embeddable, home, kibanaLegacy, data, usageCollection }: SetupDependencies ): Setup { const expandPanelAction = new ExpandPanelAction(); uiActions.registerAction(expandPanelAction); @@ -128,6 +172,112 @@ export class DashboardEmbeddableContainerPublicPlugin const factory = new DashboardContainerFactory(getStartServices); embeddable.registerEmbeddableFactory(factory.type, factory); + + const { appMounted, appUnMounted, stop: stopUrlTracker } = createKbnUrlTracker({ + baseUrl: core.http.basePath.prepend('/app/kibana'), + defaultSubUrl: `#${DashboardConstants.LANDING_PAGE_PATH}`, + shouldTrackUrlUpdate: pathname => { + const targetAppName = pathname.split('/')[1]; + return ( + targetAppName === DashboardConstants.DASHBOARDS_ID || + targetAppName === DashboardConstants.DASHBOARD_ID + ); + }, + storageKey: 'lastUrl:dashboard', + navLinkUpdater$: this.appStateUpdater, + toastNotifications: core.notifications.toasts, + stateParams: [ + { + kbnUrlKey: '_g', + stateUpdate$: data.query.state$.pipe( + filter( + ({ changes }) => !!(changes.globalFilters || changes.time || changes.refreshInterval) + ), + map(({ state }) => ({ + ...state, + filters: state.filters?.filter(esFilters.isFilterPinned), + })) + ), + }, + ], + }); + + this.stopUrlTracking = () => { + stopUrlTracker(); + }; + + const app: App = { + id: '', + title: 'Dashboards', + mount: async (params: AppMountParameters) => { + const [coreStart, pluginsStart, dashboardStart] = await core.getStartServices(); + appMounted(); + const { + embeddable: embeddableStart, + navigation, + share: shareStart, + data: dataStart, + kibanaLegacy: { dashboardConfig }, + } = pluginsStart; + + const deps: RenderDeps = { + pluginInitializerContext: this.initializerContext, + core: coreStart, + dashboardConfig, + navigation, + share: shareStart, + data: dataStart, + savedObjectsClient: coreStart.savedObjects.client, + savedDashboards: dashboardStart.getSavedDashboardLoader(), + chrome: coreStart.chrome, + addBasePath: coreStart.http.basePath.prepend, + uiSettings: coreStart.uiSettings, + config: kibanaLegacy.config, + savedQueryService: dataStart.query.savedQueries, + embeddable: embeddableStart, + dashboardCapabilities: coreStart.application.capabilities.dashboard, + embeddableCapabilities: { + visualizeCapabilities: coreStart.application.capabilities.visualize, + mapsCapabilities: coreStart.application.capabilities.maps, + }, + localStorage: new Storage(localStorage), + usageCollection, + }; + const { renderApp } = await import('./application/application'); + const unmount = renderApp(params.element, params.appBasePath, deps); + return () => { + unmount(); + appUnMounted(); + }; + }, + }; + + initAngularBootstrap(); + + kibanaLegacy.registerLegacyApp({ + ...app, + id: DashboardConstants.DASHBOARD_ID, + // only register the updater in once app, otherwise all updates would happen twice + updater$: this.appStateUpdater.asObservable(), + navLinkId: 'kibana:dashboard', + }); + kibanaLegacy.registerLegacyApp({ ...app, id: DashboardConstants.DASHBOARDS_ID }); + + if (home) { + home.featureCatalogue.register({ + id: DashboardConstants.DASHBOARD_ID, + title: i18n.translate('dashboard.featureCatalogue.dashboardTitle', { + defaultMessage: 'Dashboard', + }), + description: i18n.translate('dashboard.featureCatalogue.dashboardDescription', { + defaultMessage: 'Display and share a collection of visualizations and saved searches.', + }), + icon: 'dashboardApp', + path: `/app/kibana#${DashboardConstants.LANDING_PAGE_PATH}`, + showOnHomePage: true, + category: FeatureCatalogueCategory.DATA, + }); + } } public start(core: CoreStart, plugins: StartDependencies): DashboardStart { @@ -158,5 +308,9 @@ export class DashboardEmbeddableContainerPublicPlugin }; } - public stop() {} + public stop() { + if (this.stopUrlTracking) { + this.stopUrlTracking(); + } + } } diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts index f58be10e11ba6..7bccd3de6eca8 100644 --- a/src/plugins/dashboard/public/types.ts +++ b/src/plugins/dashboard/public/types.ts @@ -17,7 +17,17 @@ * under the License. */ -import { SavedObject as SavedObjectType, SavedObjectAttributes } from '../../../core/public'; +import { Query, Filter } from 'src/plugins/data/public'; +import { SavedObject as SavedObjectType, SavedObjectAttributes } from 'src/core/public'; +import { + RawSavedDashboardPanelTo60, + RawSavedDashboardPanel610, + RawSavedDashboardPanel620, + RawSavedDashboardPanel630, + RawSavedDashboardPanel640To720, + RawSavedDashboardPanel730ToLatest, +} from './bwc'; +import { ViewMode } from './embeddable_plugin'; export interface DashboardCapabilities { showWriteControls: boolean; @@ -65,3 +75,105 @@ export interface Field { searchable: boolean; subType?: FieldSubType; } + +export type NavAction = (anchorElement?: any) => void; + +/** + * This should always represent the latest dashboard panel shape, after all possible migrations. + */ +export type SavedDashboardPanel = SavedDashboardPanel730ToLatest; + +// id becomes optional starting in 7.3.0 +export type SavedDashboardPanel730ToLatest = Pick< + RawSavedDashboardPanel730ToLatest, + Exclude +> & { + readonly id?: string; + readonly type: string; +}; + +export type SavedDashboardPanel640To720 = Pick< + RawSavedDashboardPanel640To720, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanel630 = Pick< + RawSavedDashboardPanel630, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanel620 = Pick< + RawSavedDashboardPanel620, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanel610 = Pick< + RawSavedDashboardPanel610, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export type SavedDashboardPanelTo60 = Pick< + RawSavedDashboardPanelTo60, + Exclude +> & { + readonly id: string; + readonly type: string; +}; + +export interface DashboardAppState { + panels: SavedDashboardPanel[]; + fullScreenMode: boolean; + title: string; + description: string; + timeRestore: boolean; + options: { + hidePanelTitles: boolean; + useMargins: boolean; + }; + query: Query | string; + filters: Filter[]; + viewMode: ViewMode; + savedQuery?: string; +} + +export type DashboardAppStateDefaults = DashboardAppState & { + description?: string; +}; + +export interface DashboardAppStateTransitions { + set: ( + state: DashboardAppState + ) => ( + prop: T, + value: DashboardAppState[T] + ) => DashboardAppState; + setOption: ( + state: DashboardAppState + ) => ( + prop: T, + value: DashboardAppState['options'][T] + ) => DashboardAppState; +} + +export interface SavedDashboardPanelMap { + [key: string]: SavedDashboardPanel; +} + +export interface StagedFilter { + field: string; + value: string; + operator: string; + index: string; +} diff --git a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx index 06c47bd1bcad8..50d8bcef8506c 100644 --- a/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx +++ b/src/plugins/embeddable/public/lib/panel/panel_header/panel_actions/add_panel/add_panel_flyout.tsx @@ -29,7 +29,7 @@ import { EuiTitle, } from '@elastic/eui'; -import { EmbeddableStart } from 'src/plugins/embeddable/public/plugin'; +import { EmbeddableStart } from 'src/plugins/embeddable/public'; import { IContainer } from '../../../../containers'; import { EmbeddableFactoryNotFoundError } from '../../../../errors'; import { SavedObjectFinderCreateNew } from './saved_object_finder_create_new'; diff --git a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts index b778535a2d428..af8811b1969e6 100644 --- a/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts +++ b/src/plugins/kibana_utils/public/state_management/url/kbn_url_tracker.ts @@ -115,7 +115,6 @@ export function createKbnUrlTracker({ */ shouldTrackUrlUpdate?: (pathname: string) => boolean; }): KbnUrlTracker { - const historyInstance = history || createHashHistory(); const storageInstance = storage || sessionStorage; // local state storing current listeners and active url @@ -159,6 +158,7 @@ export function createKbnUrlTracker({ function onMountApp() { unsubscribe(); + const historyInstance = history || createHashHistory(); // track current hash when within app unsubscribeURLHistory = historyInstance.listen(location => { if (shouldTrackUrlUpdate(location.pathname)) { diff --git a/test/functional/apps/dashboard/dashboard_state.js b/test/functional/apps/dashboard/dashboard_state.js index a643a9ee40aa2..024ca0d6dc9e7 100644 --- a/test/functional/apps/dashboard/dashboard_state.js +++ b/test/functional/apps/dashboard/dashboard_state.js @@ -21,10 +21,7 @@ import expect from '@kbn/expect'; import { PIE_CHART_VIS_NAME, AREA_CHART_VIS_NAME } from '../../page_objects/dashboard_page'; -// eslint-disable-next-line -import { - DEFAULT_PANEL_WIDTH -} from '../../../../src/plugins/dashboard/public/embeddable/dashboard_constants'; +import { DEFAULT_PANEL_WIDTH } from '../../../../src/plugins/dashboard/public/application/embeddable/dashboard_constants'; export default function({ getService, getPageObjects }) { const PageObjects = getPageObjects([ diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts index 0f01097cf50dc..a20d7ae9a5372 100644 --- a/test/functional/page_objects/dashboard_page.ts +++ b/test/functional/page_objects/dashboard_page.ts @@ -17,7 +17,7 @@ * under the License. */ -import { DashboardConstants } from '../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants'; +import { DashboardConstants } from '../../../src/plugins/dashboard/public/dashboard_constants'; export const PIE_CHART_VIS_NAME = 'Visualization PieChart'; export const AREA_CHART_VIS_NAME = 'Visualization漢字 AreaChart'; diff --git a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js index a51972852c6ca..905c88a6d18a0 100644 --- a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js +++ b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js @@ -29,12 +29,14 @@ import _ from 'lodash'; import 'ui/autoload/all'; import 'ui/agg_response'; import 'leaflet'; -import 'plugins/kibana/dashboard/legacy'; import { npStart } from 'ui/new_platform'; import { localApplicationService } from 'plugins/kibana/local_application_service'; import { showAppRedirectNotification } from '../../../../../src/plugins/kibana_legacy/public'; -import { DashboardConstants, createDashboardEditUrl } from 'plugins/kibana/dashboard'; +import { + DashboardConstants, + createDashboardEditUrl, +} from '../../../../../src/plugins/dashboard/public'; npStart.plugins.kibanaLegacy.dashboardConfig.turnHideWriteControlsOn(); diff --git a/x-pack/legacy/plugins/lens/public/legacy_imports.ts b/x-pack/legacy/plugins/lens/public/legacy_imports.ts index 857443ae0fa1c..0f37e460e2957 100644 --- a/x-pack/legacy/plugins/lens/public/legacy_imports.ts +++ b/x-pack/legacy/plugins/lens/public/legacy_imports.ts @@ -7,4 +7,4 @@ import { npSetup } from 'ui/new_platform'; export const { visualizations } = npSetup.plugins; export { VisualizationsSetup } from '../../../../../src/plugins/visualizations/public'; -export { DashboardConstants } from '../../../../../src/legacy/core_plugins/kibana/public/dashboard'; +export { DashboardConstants } from '../../../../../src/plugins/dashboard/public'; diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 1b4810e8fdf0a..96af5df454b98 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -630,6 +630,70 @@ "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全画面", "dashboard.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "ダッシュボードが読み込めません。", "dashboard.factory.displayName": "ダッシュボード", + "dashboard.addVisualizationLinkAriaLabel": "ビジュアライゼーションを追加", + "dashboard.badge.readOnly.text": "読み込み専用", + "dashboard.badge.readOnly.tooltip": "ダッシュボードを保存できません", + "dashboard.changeViewModeConfirmModal.cancelButtonLabel": "編集を続行", + "dashboard.changeViewModeConfirmModal.confirmButtonLabel": "変更を破棄", + "dashboard.changeViewModeConfirmModal.discardChangesDescription": "変更を破棄すると、元に戻すことはできません。", + "dashboard.changeViewModeConfirmModal.discardChangesTitle": "ダッシュボードへの変更を破棄しますか？", + "dashboard.dashboardAppBreadcrumbsTitle": "ダッシュボード", + "dashboard.dashboardBreadcrumbsTitle": "ダッシュボード", + "dashboard.dashboardWasNotSavedDangerMessage": "ダッシュボード「{dashTitle}」は保存されませんでした。エラー: {errorMessage}", + "dashboard.dashboardWasSavedSuccessMessage": "ダッシュボード「{dashTitle}」が保存されました。", + "dashboard.featureCatalogue.dashboardDescription": "ビジュアライゼーションと保存された検索のコレクションの表示と共有を行います。", + "dashboard.featureCatalogue.dashboardTitle": "ダッシュボード", + "dashboard.fillDashboardTitle": "このダッシュボードは空です。コンテンツを追加しましょう！", + "dashboard.howToStartWorkingOnNewDashboardDescription1": "上のメニューバーの ", + "dashboard.howToStartWorkingOnNewDashboardDescription2": " ダッシュボードの作成を始めましょう。", + "dashboard.howToStartWorkingOnNewDashboardEditLinkText": "編集", + "dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "あらゆる Kibana アプリからダッシュボードでデータビューを組み合わせて、すべてを 1 か所に表示できます。", + "dashboard.listing.createNewDashboard.createButtonLabel": "新規ダッシュボードを作成", + "dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana は初心者ですか？{sampleDataInstallLink} してお試しください。", + "dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "サンプルデータをインストール", + "dashboard.listing.createNewDashboard.title": "初めてのダッシュボードを作成してみましょう。", + "dashboard.listing.dashboardsTitle": "ダッシュボード", + "dashboard.listing.noItemsMessage": "ダッシュボードがないようです。", + "dashboard.listing.table.descriptionColumnName": "説明", + "dashboard.listing.table.entityName": "ダッシュボード", + "dashboard.listing.table.entityNamePlural": "ダッシュボード", + "dashboard.listing.table.titleColumnName": "タイトル", + "dashboard.panel.invalidData": "URLの無効なデータ", + "dashboard.savedDashboard.newDashboardTitle": "新規ダッシュボード", + "dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "このダッシュボードに時刻が保存されていないため、同期できません。", + "dashboard.strings.dashboardEditTitle": "{title} を編集中", + "dashboard.strings.dashboardUnsavedEditTitle": "{title} を編集中 (未保存)", + "dashboard.topNav.cloneModal.cancelButtonLabel": "キャンセル", + "dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "ダッシュボードのクローンを作成", + "dashboard.topNav.cloneModal.confirmButtonLabel": "クローンの確認", + "dashboard.topNav.cloneModal.confirmCloneDescription": "クローンの確認", + "dashboard.topNav.cloneModal.dashboardExistsDescription": "{confirmClone} をクリックして重複タイトルでダッシュボードのクローンを作成します。", + "dashboard.topNav.cloneModal.dashboardExistsTitle": "「{newDashboardName}」というタイトルのダッシュボードが既に存在します。", + "dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "ダッシュボードの新しい名前を入力してください。", + "dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "パネルタイトルを表示", + "dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "パネルの間に余白を使用", + "dashboard.topNav.saveModal.descriptionFormRowLabel": "説明", + "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "有効化すると、ダッシュボードが読み込まれるごとに現在選択された時刻の時間フィルターが変更されます。", + "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "ダッシュボードに時刻を保存", + "dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} のコピー", + "dashboard.topNave.addButtonAriaLabel": "追加", + "dashboard.topNave.addConfigDescription": "ダッシュボードにパネルを追加します", + "dashboard.topNave.cancelButtonAriaLabel": "キャンセル", + "dashboard.topNave.cloneButtonAriaLabel": "クローンを作成", + "dashboard.topNave.cloneConfigDescription": "ダッシュボードのコピーを作成します", + "dashboard.topNave.editButtonAriaLabel": "編集", + "dashboard.topNave.editConfigDescription": "編集モードに切り替えます", + "dashboard.topNave.fullScreenButtonAriaLabel": "全画面", + "dashboard.topNave.fullScreenConfigDescription": "全画面モード", + "dashboard.topNave.optionsButtonAriaLabel": "オプション", + "dashboard.topNave.optionsConfigDescription": "オプション", + "dashboard.topNave.saveButtonAriaLabel": "保存", + "dashboard.topNave.saveConfigDescription": "ダッシュボードを保存します", + "dashboard.topNave.shareButtonAriaLabel": "共有", + "dashboard.topNave.shareConfigDescription": "ダッシュボードを共有します", + "dashboard.topNave.viewConfigDescription": "編集をキャンセルして表示限定モードに切り替えます", + "dashboard.urlWasRemovedInSixZeroWarningMessage": "URL「dashboard/create」は 6.0 で廃止されました。ブックマークを更新してください。", + "dashboard.visitVisualizeAppLinkText": "可視化アプリにアクセス", "embeddableApi.actions.applyFilterActionTitle": "現在のビューにフィルターを適用", "embeddableApi.addPanel.createNewDefaultOption": "新規作成...", "embeddableApi.addPanel.displayName": "パネルの追加", @@ -976,73 +1040,9 @@ "kbn.context.reloadPageDescription.selectValidAnchorDocumentTextMessage": "にアクセスして有効な別のドキュメントを選択してください。", "kbn.context.unableToLoadAnchorDocumentDescription": "別のドキュメントが読み込めません", "kbn.context.unableToLoadDocumentDescription": "ドキュメントが読み込めません", - "kbn.dashboard.addVisualizationLinkAriaLabel": "ビジュアライゼーションを追加", - "kbn.dashboard.badge.readOnly.text": "読み込み専用", - "kbn.dashboard.badge.readOnly.tooltip": "ダッシュボードを保存できません", - "kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel": "編集を続行", - "kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel": "変更を破棄", - "kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription": "変更を破棄すると、元に戻すことはできません。", - "kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle": "ダッシュボードへの変更を破棄しますか？", - "kbn.dashboard.dashboardAppBreadcrumbsTitle": "ダッシュボード", - "kbn.dashboard.dashboardBreadcrumbsTitle": "ダッシュボード", - "kbn.dashboard.dashboardWasNotSavedDangerMessage": "ダッシュボード「{dashTitle}」は保存されませんでした。エラー: {errorMessage}", - "kbn.dashboard.dashboardWasSavedSuccessMessage": "ダッシュボード「{dashTitle}」が保存されました。", - "kbn.dashboard.featureCatalogue.dashboardDescription": "ビジュアライゼーションと保存された検索のコレクションの表示と共有を行います。", - "kbn.dashboard.featureCatalogue.dashboardTitle": "ダッシュボード", - "kbn.dashboard.fillDashboardTitle": "このダッシュボードは空です。コンテンツを追加しましょう！", - "kbn.dashboard.howToStartWorkingOnNewDashboardDescription1": "上のメニューバーの ", - "kbn.dashboard.howToStartWorkingOnNewDashboardDescription2": " ダッシュボードの作成を始めましょう。", - "kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText": "編集", - "kbn.dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "あらゆる Kibana アプリからダッシュボードでデータビューを組み合わせて、すべてを 1 か所に表示できます。", - "kbn.dashboard.listing.createNewDashboard.createButtonLabel": "新規ダッシュボードを作成", - "kbn.dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana は初心者ですか？{sampleDataInstallLink} してお試しください。", - "kbn.dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "サンプルデータをインストール", - "kbn.dashboard.listing.createNewDashboard.title": "初めてのダッシュボードを作成してみましょう。", - "kbn.dashboard.listing.dashboardsTitle": "ダッシュボード", - "kbn.dashboard.listing.noItemsMessage": "ダッシュボードがないようです。", - "kbn.dashboard.listing.table.descriptionColumnName": "説明", - "kbn.dashboard.listing.table.entityName": "ダッシュボード", - "kbn.dashboard.listing.table.entityNamePlural": "ダッシュボード", - "kbn.dashboard.listing.table.titleColumnName": "タイトル", - "kbn.dashboard.panel.invalidData": "URLの無効なデータ", "kbn.dashboard.panel.unableToMigratePanelDataForSixOneZeroErrorMessage": "「6.1.0」のダッシュボードの互換性のため、パネルデータを移行できませんでした。パネルには想定された列または行フィールドがありません", "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "「6.3.0」のダッシュボードの互換性のため、パネルデータを移行できませんでした。パネルに必要なフィールドがありません: {key}", - "kbn.dashboard.savedDashboard.newDashboardTitle": "新規ダッシュボード", "kbn.dashboard.savedDashboardsTitle": "ダッシュボード", - "kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "このダッシュボードに時刻が保存されていないため、同期できません。", - "kbn.dashboard.strings.dashboardEditTitle": "{title} を編集中", - "kbn.dashboard.strings.dashboardUnsavedEditTitle": "{title} を編集中 (未保存)", - "kbn.dashboard.topNav.cloneModal.cancelButtonLabel": "キャンセル", - "kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "ダッシュボードのクローンを作成", - "kbn.dashboard.topNav.cloneModal.confirmButtonLabel": "クローンの確認", - "kbn.dashboard.topNav.cloneModal.confirmCloneDescription": "クローンの確認", - "kbn.dashboard.topNav.cloneModal.dashboardExistsDescription": "{confirmClone} をクリックして重複タイトルでダッシュボードのクローンを作成します。", - "kbn.dashboard.topNav.cloneModal.dashboardExistsTitle": "「{newDashboardName}」というタイトルのダッシュボードが既に存在します。", - "kbn.dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "ダッシュボードの新しい名前を入力してください。", - "kbn.dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "パネルタイトルを表示", - "kbn.dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "パネルの間に余白を使用", - "kbn.dashboard.topNav.saveModal.descriptionFormRowLabel": "説明", - "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "有効化すると、ダッシュボードが読み込まれるごとに現在選択された時刻の時間フィルターが変更されます。", - "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "ダッシュボードに時刻を保存", - "kbn.dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} のコピー", - "kbn.dashboard.topNave.addButtonAriaLabel": "追加", - "kbn.dashboard.topNave.addConfigDescription": "ダッシュボードにパネルを追加します", - "kbn.dashboard.topNave.cancelButtonAriaLabel": "キャンセル", - "kbn.dashboard.topNave.cloneButtonAriaLabel": "クローンを作成", - "kbn.dashboard.topNave.cloneConfigDescription": "ダッシュボードのコピーを作成します", - "kbn.dashboard.topNave.editButtonAriaLabel": "編集", - "kbn.dashboard.topNave.editConfigDescription": "編集モードに切り替えます", - "kbn.dashboard.topNave.fullScreenButtonAriaLabel": "全画面", - "kbn.dashboard.topNave.fullScreenConfigDescription": "全画面モード", - "kbn.dashboard.topNave.optionsButtonAriaLabel": "オプション", - "kbn.dashboard.topNave.optionsConfigDescription": "オプション", - "kbn.dashboard.topNave.saveButtonAriaLabel": "保存", - "kbn.dashboard.topNave.saveConfigDescription": "ダッシュボードを保存します", - "kbn.dashboard.topNave.shareButtonAriaLabel": "共有", - "kbn.dashboard.topNave.shareConfigDescription": "ダッシュボードを共有します", - "kbn.dashboard.topNave.viewConfigDescription": "編集をキャンセルして表示限定モードに切り替えます", - "kbn.dashboard.urlWasRemovedInSixZeroWarningMessage": "URL「dashboard/create」は 6.0 で廃止されました。ブックマークを更新してください。", - "kbn.dashboard.visitVisualizeAppLinkText": "可視化アプリにアクセス", "kbn.dashboardTitle": "ダッシュボード", "kbn.devToolsTitle": "開発ツール", "kbn.discover.backToTopLinkText": "最上部へ戻る。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 5b3baa3552dbe..0a70c78d46664 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -630,6 +630,70 @@ "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "全屏", "dashboard.dashboardGrid.toast.unableToLoadDashboardDangerMessage": "无法加载仪表板。", "dashboard.factory.displayName": "仪表板", + "dashboard.addVisualizationLinkAriaLabel": "添加可视化", + "dashboard.badge.readOnly.text": "只读", + "dashboard.badge.readOnly.tooltip": "无法保存仪表板", + "dashboard.changeViewModeConfirmModal.cancelButtonLabel": "继续编辑", + "dashboard.changeViewModeConfirmModal.confirmButtonLabel": "放弃更改", + "dashboard.changeViewModeConfirmModal.discardChangesDescription": "放弃更改后，它们将无法恢复。", + "dashboard.changeViewModeConfirmModal.discardChangesTitle": "放弃对仪表板的更改？", + "dashboard.dashboardAppBreadcrumbsTitle": "仪表板", + "dashboard.dashboardBreadcrumbsTitle": "仪表板", + "dashboard.dashboardWasNotSavedDangerMessage": "仪表板 “{dashTitle}” 未保存。错误：{errorMessage}", + "dashboard.dashboardWasSavedSuccessMessage": "仪表板 “{dashTitle}” 已保存", + "dashboard.featureCatalogue.dashboardDescription": "显示和共享可视化和已保存搜索的集合。", + "dashboard.featureCatalogue.dashboardTitle": "仪表板", + "dashboard.fillDashboardTitle": "此仪表板是空的。让我们来填充它！", + "dashboard.howToStartWorkingOnNewDashboardDescription1": "单击上述菜单栏中的 ", + "dashboard.howToStartWorkingOnNewDashboardDescription2": " 按钮以着手处理新的仪表板。", + "dashboard.howToStartWorkingOnNewDashboardEditLinkText": "编辑", + "dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "您可以将任何 Kibana 应用的数据视图组合到一个仪表板中，从而在一个位置查看所有内容。", + "dashboard.listing.createNewDashboard.createButtonLabel": "创建新的仪表板", + "dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana 新手？{sampleDataInstallLink}来试用一下。", + "dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "安装一些样例数据", + "dashboard.listing.createNewDashboard.title": "创建您的首个仪表板", + "dashboard.listing.dashboardsTitle": "仪表板", + "dashboard.listing.noItemsMessage": "似乎您没有任何仪表板。", + "dashboard.listing.table.descriptionColumnName": "描述", + "dashboard.listing.table.entityName": "仪表板", + "dashboard.listing.table.entityNamePlural": "仪表板", + "dashboard.listing.table.titleColumnName": "标题", + "dashboard.panel.invalidData": "url 中的数据无效", + "dashboard.savedDashboard.newDashboardTitle": "新建仪表板", + "dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "时间未随此仪表板保存，因此无法同步。", + "dashboard.strings.dashboardEditTitle": "编辑 {title}", + "dashboard.strings.dashboardUnsavedEditTitle": "编辑 {title}（未保存）", + "dashboard.topNav.cloneModal.cancelButtonLabel": "取消", + "dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "克隆面板", + "dashboard.topNav.cloneModal.confirmButtonLabel": "确认克隆", + "dashboard.topNav.cloneModal.confirmCloneDescription": "确认克隆", + "dashboard.topNav.cloneModal.dashboardExistsDescription": "单击 “{confirmClone}” 以克隆具有重复标题的仪表板。", + "dashboard.topNav.cloneModal.dashboardExistsTitle": "具有标题 {newDashboardName} 的仪表板已存在。", + "dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "请为您的仪表板输入新的名称。", + "dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "显示面板标题", + "dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "在面板间使用边距", + "dashboard.topNav.saveModal.descriptionFormRowLabel": "描述", + "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "每次加载此仪表板时，这都会将时间筛选更改为当前选定的时间。", + "dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "将时间随仪表板保存", + "dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} 副本", + "dashboard.topNave.addButtonAriaLabel": "添加", + "dashboard.topNave.addConfigDescription": "将面板保存到仪表板", + "dashboard.topNave.cancelButtonAriaLabel": "取消", + "dashboard.topNave.cloneButtonAriaLabel": "克隆", + "dashboard.topNave.cloneConfigDescription": "创建仪表板的副本", + "dashboard.topNave.editButtonAriaLabel": "编辑", + "dashboard.topNave.editConfigDescription": "切换到编辑模式", + "dashboard.topNave.fullScreenButtonAriaLabel": "全屏", + "dashboard.topNave.fullScreenConfigDescription": "全屏模式", + "dashboard.topNave.optionsButtonAriaLabel": "选项", + "dashboard.topNave.optionsConfigDescription": "选项", + "dashboard.topNave.saveButtonAriaLabel": "保存", + "dashboard.topNave.saveConfigDescription": "保存您的仪表板", + "dashboard.topNave.shareButtonAriaLabel": "共享", + "dashboard.topNave.shareConfigDescription": "共享仪表板", + "dashboard.topNave.viewConfigDescription": "取消编辑并切换到仅查看模式", + "dashboard.urlWasRemovedInSixZeroWarningMessage": "6.0 中未移除 url“dashboard/create”。请更新您的书签。", + "dashboard.visitVisualizeAppLinkText": "访问 Visualize 应用", "embeddableApi.actions.applyFilterActionTitle": "将筛选应用于当前视图", "embeddableApi.addPanel.createNewDefaultOption": "创建新的......", "embeddableApi.addPanel.displayName": "添加面板", @@ -976,73 +1040,9 @@ "kbn.context.reloadPageDescription.selectValidAnchorDocumentTextMessage": "以选择有效地定位点文档。", "kbn.context.unableToLoadAnchorDocumentDescription": "无法加载该定位点文档", "kbn.context.unableToLoadDocumentDescription": "无法加载文档", - "kbn.dashboard.addVisualizationLinkAriaLabel": "添加可视化", - "kbn.dashboard.badge.readOnly.text": "只读", - "kbn.dashboard.badge.readOnly.tooltip": "无法保存仪表板", - "kbn.dashboard.changeViewModeConfirmModal.cancelButtonLabel": "继续编辑", - "kbn.dashboard.changeViewModeConfirmModal.confirmButtonLabel": "放弃更改", - "kbn.dashboard.changeViewModeConfirmModal.discardChangesDescription": "放弃更改后，它们将无法恢复。", - "kbn.dashboard.changeViewModeConfirmModal.discardChangesTitle": "放弃对仪表板的更改？", - "kbn.dashboard.dashboardAppBreadcrumbsTitle": "仪表板", - "kbn.dashboard.dashboardBreadcrumbsTitle": "仪表板", - "kbn.dashboard.dashboardWasNotSavedDangerMessage": "仪表板 “{dashTitle}” 未保存。错误：{errorMessage}", - "kbn.dashboard.dashboardWasSavedSuccessMessage": "仪表板 “{dashTitle}” 已保存", - "kbn.dashboard.featureCatalogue.dashboardDescription": "显示和共享可视化和已保存搜索的集合。", - "kbn.dashboard.featureCatalogue.dashboardTitle": "仪表板", - "kbn.dashboard.fillDashboardTitle": "此仪表板是空的。让我们来填充它！", - "kbn.dashboard.howToStartWorkingOnNewDashboardDescription1": "单击上述菜单栏中的 ", - "kbn.dashboard.howToStartWorkingOnNewDashboardDescription2": " 按钮以着手处理新的仪表板。", - "kbn.dashboard.howToStartWorkingOnNewDashboardEditLinkText": "编辑", - "kbn.dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "您可以将任何 Kibana 应用的数据视图组合到一个仪表板中，从而在一个位置查看所有内容。", - "kbn.dashboard.listing.createNewDashboard.createButtonLabel": "创建新的仪表板", - "kbn.dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana 新手？{sampleDataInstallLink}来试用一下。", - "kbn.dashboard.listing.createNewDashboard.sampleDataInstallLinkText": "安装一些样例数据", - "kbn.dashboard.listing.createNewDashboard.title": "创建您的首个仪表板", - "kbn.dashboard.listing.dashboardsTitle": "仪表板", - "kbn.dashboard.listing.noItemsMessage": "似乎您没有任何仪表板。", - "kbn.dashboard.listing.table.descriptionColumnName": "描述", - "kbn.dashboard.listing.table.entityName": "仪表板", - "kbn.dashboard.listing.table.entityNamePlural": "仪表板", - "kbn.dashboard.listing.table.titleColumnName": "标题", - "kbn.dashboard.panel.invalidData": "url 中的数据无效", "kbn.dashboard.panel.unableToMigratePanelDataForSixOneZeroErrorMessage": "无法迁移用于“6.1.0”向后兼容的面板数据，面板不包含所需的列和/或行字段", "kbn.dashboard.panel.unableToMigratePanelDataForSixThreeZeroErrorMessage": "无法迁移用于“6.3.0”向后兼容的面板数据，面板不包含预期字段：{key}", - "kbn.dashboard.savedDashboard.newDashboardTitle": "新建仪表板", "kbn.dashboard.savedDashboardsTitle": "仪表板", - "kbn.dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "时间未随此仪表板保存，因此无法同步。", - "kbn.dashboard.strings.dashboardEditTitle": "编辑 {title}", - "kbn.dashboard.strings.dashboardUnsavedEditTitle": "编辑 {title}（未保存）", - "kbn.dashboard.topNav.cloneModal.cancelButtonLabel": "取消", - "kbn.dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "克隆面板", - "kbn.dashboard.topNav.cloneModal.confirmButtonLabel": "确认克隆", - "kbn.dashboard.topNav.cloneModal.confirmCloneDescription": "确认克隆", - "kbn.dashboard.topNav.cloneModal.dashboardExistsDescription": "单击 “{confirmClone}” 以克隆具有重复标题的仪表板。", - "kbn.dashboard.topNav.cloneModal.dashboardExistsTitle": "具有标题 {newDashboardName} 的仪表板已存在。", - "kbn.dashboard.topNav.cloneModal.enterNewNameForDashboardDescription": "请为您的仪表板输入新的名称。", - "kbn.dashboard.topNav.options.hideAllPanelTitlesSwitchLabel": "显示面板标题", - "kbn.dashboard.topNav.options.useMarginsBetweenPanelsSwitchLabel": "在面板间使用边距", - "kbn.dashboard.topNav.saveModal.descriptionFormRowLabel": "描述", - "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowHelpText": "每次加载此仪表板时，这都会将时间筛选更改为当前选定的时间。", - "kbn.dashboard.topNav.saveModal.storeTimeWithDashboardFormRowLabel": "将时间随仪表板保存", - "kbn.dashboard.topNav.showCloneModal.dashboardCopyTitle": "{title} 副本", - "kbn.dashboard.topNave.addButtonAriaLabel": "添加", - "kbn.dashboard.topNave.addConfigDescription": "将面板保存到仪表板", - "kbn.dashboard.topNave.cancelButtonAriaLabel": "取消", - "kbn.dashboard.topNave.cloneButtonAriaLabel": "克隆", - "kbn.dashboard.topNave.cloneConfigDescription": "创建仪表板的副本", - "kbn.dashboard.topNave.editButtonAriaLabel": "编辑", - "kbn.dashboard.topNave.editConfigDescription": "切换到编辑模式", - "kbn.dashboard.topNave.fullScreenButtonAriaLabel": "全屏", - "kbn.dashboard.topNave.fullScreenConfigDescription": "全屏模式", - "kbn.dashboard.topNave.optionsButtonAriaLabel": "选项", - "kbn.dashboard.topNave.optionsConfigDescription": "选项", - "kbn.dashboard.topNave.saveButtonAriaLabel": "保存", - "kbn.dashboard.topNave.saveConfigDescription": "保存您的仪表板", - "kbn.dashboard.topNave.shareButtonAriaLabel": "共享", - "kbn.dashboard.topNave.shareConfigDescription": "共享仪表板", - "kbn.dashboard.topNave.viewConfigDescription": "取消编辑并切换到仅查看模式", - "kbn.dashboard.urlWasRemovedInSixZeroWarningMessage": "6.0 中未移除 url“dashboard/create”。请更新您的书签。", - "kbn.dashboard.visitVisualizeAppLinkText": "访问 Visualize 应用", "kbn.dashboardTitle": "仪表板", "kbn.devToolsTitle": "开发工具", "kbn.discover.backToTopLinkText": "返至顶部。", diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts index de68ec0c64c17..b6889f21bb1ab 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_security.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { createDashboardEditUrl, DashboardConstants, -} from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants'; +} from '../../../../../../src/plugins/dashboard/public/dashboard_constants'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function({ getPageObjects, getService }: FtrProviderContext) { diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts index 5ab26e4189096..1e6f8d5b5a97e 100644 --- a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts +++ b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts @@ -7,7 +7,7 @@ import expect from '@kbn/expect'; import { createDashboardEditUrl, DashboardConstants, -} from '../../../../../../src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_constants'; +} from '../../../../../../src/plugins/dashboard/public/dashboard_constants'; import { FtrProviderContext } from '../../../ftr_provider_context'; export default function({ getPageObjects, getService }: FtrProviderContext) { From 3c923d7071cb8acde7e1b8c378f52716829c0766 Mon Sep 17 00:00:00 2001 From: Dario Gieselaar Date: Mon, 6 Apr 2020 11:39:34 +0200 Subject: [PATCH 08/12] [APM] Set action variables for APM alert types (#62416) Closes #61941. Co-authored-by: Elastic Machine --- .../alerts/register_error_rate_alert_type.ts | 19 ++++++++++-- ...egister_transaction_duration_alert_type.ts | 29 +++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts index 187a75d0b61f2..d6242507e4011 100644 --- a/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts +++ b/x-pack/plugins/apm/server/lib/alerts/register_error_rate_alert_type.ts @@ -7,6 +7,7 @@ import { schema, TypeOf } from '@kbn/config-schema'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; +import { i18n } from '@kbn/i18n'; import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types'; import { ESSearchResponse, @@ -46,7 +47,19 @@ export function registerErrorRateAlertType({ validate: { params: paramsSchema }, - + actionVariables: { + context: [ + { + description: i18n.translate( + 'xpack.apm.registerErrorRateAlertType.variables.serviceName', + { + defaultMessage: 'Service name' + } + ), + name: 'serviceName' + } + ] + }, executor: async ({ services, params }) => { const config = await config$.pipe(take(1)).toPromise(); @@ -99,7 +112,9 @@ export function registerErrorRateAlertType({ const alertInstance = services.alertInstanceFactory( AlertType.ErrorRate ); - alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId); + alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId, { + serviceName: alertParams.serviceName + }); } return {}; diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts index 7575a8268bc26..2799da16cf6a9 100644 --- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts +++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts @@ -7,6 +7,7 @@ import { schema, TypeOf } from '@kbn/config-schema'; import { Observable } from 'rxjs'; import { take } from 'rxjs/operators'; +import { i18n } from '@kbn/i18n'; import { AlertType, ALERT_TYPES_CONFIG } from '../../../common/alert_types'; import { ESSearchResponse } from '../../../typings/elasticsearch'; import { @@ -51,7 +52,28 @@ export function registerTransactionDurationAlertType({ validate: { params: paramsSchema }, - + actionVariables: { + context: [ + { + description: i18n.translate( + 'xpack.apm.registerTransactionDurationAlertType.variables.serviceName', + { + defaultMessage: 'Service name' + } + ), + name: 'serviceName' + }, + { + description: i18n.translate( + 'xpack.apm.registerTransactionDurationAlertType.variables.transactionType', + { + defaultMessage: 'Transaction type' + } + ), + name: 'transactionType' + } + ] + }, executor: async ({ services, params }) => { const config = await config$.pipe(take(1)).toPromise(); @@ -131,7 +153,10 @@ export function registerTransactionDurationAlertType({ const alertInstance = services.alertInstanceFactory( AlertType.TransactionDuration ); - alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId); + alertInstance.scheduleActions(alertTypeConfig.defaultActionGroupId, { + transactionType: alertParams.transactionType, + serviceName: alertParams.serviceName + }); } return {}; From ca1d77cc14d20d8d4f543063459ba05a0b41c1b3 Mon Sep 17 00:00:00 2001 From: Dario Gieselaar Date: Mon, 6 Apr 2020 11:42:17 +0200 Subject: [PATCH 09/12] [APM] Prevent "For the last" expression from jumping (#62414) Closes #61063. Co-authored-by: Elastic Machine --- .../public/components/shared/ErrorRateAlertTrigger/index.tsx | 2 +- .../components/shared/TransactionDurationAlertTrigger/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx index 6d0a2b96092a1..9bfc5936a555e 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/ErrorRateAlertTrigger/index.tsx @@ -58,7 +58,7 @@ export function ErrorRateAlertTrigger(props: Props) { , - setAlertParams('windowSize', windowSize) + setAlertParams('windowSize', windowSize || '') } onChangeWindowUnit={windowUnit => setAlertParams('windowUnit', windowUnit) diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx index cdc7c30089b4f..077e6535a8b21 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionDurationAlertTrigger/index.tsx @@ -123,7 +123,7 @@ export function TransactionDurationAlertTrigger(props: Props) { , - setAlertParams('windowSize', timeWindowSize) + setAlertParams('windowSize', timeWindowSize || '') } onChangeWindowUnit={timeWindowUnit => setAlertParams('windowUnit', timeWindowUnit) From 5940b72d67e3bfafc34a83aed2f72ab684b8b2b2 Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Mon, 6 Apr 2020 12:29:11 +0200 Subject: [PATCH 10/12] load assets lazily in es-ui plugins (#62487) * load assets lazily * addres cj comments --- .../public/services/short_url_redirect_app.ts | 2 +- .../application/mount_management_section.ts | 51 +++++++++++++++++++ .../plugins/index_management/public/plugin.ts | 36 ++++--------- .../application/mount_management_section.ts | 48 +++++++++++++++++ .../plugins/snapshot_restore/public/plugin.ts | 33 +++--------- .../application/mount_management_section.ts | 23 +++++++++ .../upgrade_assistant/public/plugin.ts | 10 ++-- 7 files changed, 143 insertions(+), 60 deletions(-) create mode 100644 x-pack/plugins/index_management/public/application/mount_management_section.ts create mode 100644 x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts create mode 100644 x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts diff --git a/src/plugins/share/public/services/short_url_redirect_app.ts b/src/plugins/share/public/services/short_url_redirect_app.ts index 6f72b711f6602..5326aa3a21dc5 100644 --- a/src/plugins/share/public/services/short_url_redirect_app.ts +++ b/src/plugins/share/public/services/short_url_redirect_app.ts @@ -19,7 +19,6 @@ import { CoreSetup } from 'kibana/public'; import { getUrlIdFromGotoRoute, getUrlPath, GOTO_PREFIX } from '../../common/short_url_routes'; -import { hashUrl } from '../../../kibana_utils/public'; export const createShortUrlRedirectApp = (core: CoreSetup, location: Location) => ({ id: 'short_url_redirect', @@ -35,6 +34,7 @@ export const createShortUrlRedirectApp = (core: CoreSetup, location: Location) = const response = await core.http.get<{ url: string }>(getUrlPath(urlId)); const redirectUrl = response.url; + const { hashUrl } = await import('../../../kibana_utils/public'); const hashedUrl = hashUrl(redirectUrl); const url = core.http.basePath.prepend(hashedUrl); diff --git a/x-pack/plugins/index_management/public/application/mount_management_section.ts b/x-pack/plugins/index_management/public/application/mount_management_section.ts new file mode 100644 index 0000000000000..c47b0603dc1c8 --- /dev/null +++ b/x-pack/plugins/index_management/public/application/mount_management_section.ts @@ -0,0 +1,51 @@ +/* + * 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 { CoreSetup } from 'src/core/public'; +import { ManagementAppMountParams } from 'src/plugins/management/public/'; +import { UsageCollectionSetup } from 'src/plugins/usage_collection/public'; + +import { ExtensionsService } from '../services'; +import { IndexMgmtMetricsType } from '../types'; +import { AppDependencies } from './app_context'; +import { breadcrumbService } from './services/breadcrumbs'; +import { documentationService } from './services/documentation'; +import { HttpService, NotificationService, UiMetricService } from './services'; + +import { renderApp } from '.'; + +interface InternalServices { + httpService: HttpService; + notificationService: NotificationService; + uiMetricService: UiMetricService; + extensionsService: ExtensionsService; +} + +export async function mountManagementSection( + coreSetup: CoreSetup, + usageCollection: UsageCollectionSetup, + services: InternalServices, + params: ManagementAppMountParams +) { + const { element, setBreadcrumbs } = params; + const [core] = await coreSetup.getStartServices(); + const { docLinks, fatalErrors } = core; + + breadcrumbService.setup(setBreadcrumbs); + documentationService.setup(docLinks); + + const appDependencies: AppDependencies = { + core: { + fatalErrors, + }, + plugins: { + usageCollection, + }, + services, + }; + + return renderApp(element, { core, dependencies: appDependencies }); +} diff --git a/x-pack/plugins/index_management/public/plugin.ts b/x-pack/plugins/index_management/public/plugin.ts index c1b26fe3ca56b..4aa06d286e3c4 100644 --- a/x-pack/plugins/index_management/public/plugin.ts +++ b/x-pack/plugins/index_management/public/plugin.ts @@ -10,10 +10,7 @@ import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/p import { ManagementSetup } from '../../../../src/plugins/management/public'; import { UIM_APP_NAME, PLUGIN } from '../common/constants'; -import { AppDependencies } from './application'; import { httpService } from './application/services/http'; -import { breadcrumbService } from './application/services/breadcrumbs'; -import { documentationService } from './application/services/documentation'; import { notificationService } from './application/services/notification'; import { UiMetricService } from './application/services/ui_metric'; @@ -44,7 +41,7 @@ export class IndexMgmtUIPlugin { } public setup(coreSetup: CoreSetup, plugins: PluginsDependencies): IndexMgmtSetup { - const { http, notifications, getStartServices } = coreSetup; + const { http, notifications } = coreSetup; const { usageCollection, management } = plugins; httpService.setup(http); @@ -55,30 +52,15 @@ export class IndexMgmtUIPlugin { id: PLUGIN.id, title: i18n.translate('xpack.idxMgmt.appTitle', { defaultMessage: 'Index Management' }), order: 1, - mount: async ({ element, setBreadcrumbs }) => { - const [core] = await getStartServices(); - const { docLinks, fatalErrors } = core; - - breadcrumbService.setup(setBreadcrumbs); - documentationService.setup(docLinks); - - const appDependencies: AppDependencies = { - core: { - fatalErrors, - }, - plugins: { - usageCollection, - }, - services: { - uiMetricService: this.uiMetricService, - extensionsService: this.extensionsService, - httpService, - notificationService, - }, + mount: async params => { + const { mountManagementSection } = await import('./application/mount_management_section'); + const services = { + httpService, + notificationService, + uiMetricService: this.uiMetricService, + extensionsService: this.extensionsService, }; - - const { renderApp } = await import('./application'); - return renderApp(element, { core, dependencies: appDependencies }); + return mountManagementSection(coreSetup, usageCollection, services, params); }, }); diff --git a/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts b/x-pack/plugins/snapshot_restore/public/application/mount_management_section.ts new file mode 100644 index 0000000000000..9697e24a7147e --- /dev/null +++ b/x-pack/plugins/snapshot_restore/public/application/mount_management_section.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 { CoreSetup } from 'src/core/public'; +import { ManagementAppMountParams } from 'src/plugins/management/public'; +import { i18n } from '@kbn/i18n'; + +import { ClientConfigType } from '../types'; +import { httpService } from './services/http'; +import { UiMetricService } from './services'; +import { breadcrumbService, docTitleService } from './services/navigation'; +import { documentationLinksService } from './services/documentation'; +import { AppDependencies } from './app_context'; +import { renderApp } from '.'; + +export async function mountManagementSection( + coreSetup: CoreSetup, + services: { + uiMetricService: UiMetricService; + }, + config: ClientConfigType, + params: ManagementAppMountParams +) { + const { element, setBreadcrumbs } = params; + const [core] = await coreSetup.getStartServices(); + const { + docLinks, + chrome: { docTitle }, + } = core; + + docTitleService.setup(docTitle.change); + breadcrumbService.setup(setBreadcrumbs); + documentationLinksService.setup(docLinks); + + const appDependencies: AppDependencies = { + core, + config, + services: { + httpService, + uiMetricService: services.uiMetricService, + i18n, + }, + }; + + return renderApp(element, appDependencies); +} diff --git a/x-pack/plugins/snapshot_restore/public/plugin.ts b/x-pack/plugins/snapshot_restore/public/plugin.ts index 30862c2adb35a..d966d0c32651c 100644 --- a/x-pack/plugins/snapshot_restore/public/plugin.ts +++ b/x-pack/plugins/snapshot_restore/public/plugin.ts @@ -9,11 +9,9 @@ import { CoreSetup, PluginInitializerContext } from 'src/core/public'; import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public'; import { ManagementSetup } from '../../../../src/plugins/management/public'; import { PLUGIN } from '../common/constants'; -import { AppDependencies } from './application'; + import { ClientConfigType } from './types'; -import { breadcrumbService, docTitleService } from './application/services/navigation'; -import { documentationLinksService } from './application/services/documentation'; import { httpService, setUiMetricService } from './application/services/http'; import { textService } from './application/services/text'; import { UiMetricService } from './application/services'; @@ -34,7 +32,7 @@ export class SnapshotRestoreUIPlugin { public setup(coreSetup: CoreSetup, plugins: PluginsDependencies): void { const config = this.initializerContext.config.get(); - const { http, getStartServices } = coreSetup; + const { http } = coreSetup; const { management, usageCollection } = plugins; // Initialize services @@ -48,29 +46,12 @@ export class SnapshotRestoreUIPlugin { defaultMessage: 'Snapshot and Restore', }), order: 7, - mount: async ({ element, setBreadcrumbs }) => { - const [core] = await getStartServices(); - const { - docLinks, - chrome: { docTitle }, - } = core; - - docTitleService.setup(docTitle.change); - breadcrumbService.setup(setBreadcrumbs); - documentationLinksService.setup(docLinks); - - const appDependencies: AppDependencies = { - core, - config, - services: { - httpService, - uiMetricService: this.uiMetricService, - i18n, - }, + mount: async params => { + const { mountManagementSection } = await import('./application/mount_management_section'); + const services = { + uiMetricService: this.uiMetricService, }; - - const { renderApp } = await import('./application'); - return renderApp(element, appDependencies); + return await mountManagementSection(coreSetup, services, config, params); }, }); } diff --git a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts new file mode 100644 index 0000000000000..c0124d52e45d7 --- /dev/null +++ b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts @@ -0,0 +1,23 @@ +/* + * 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 { CoreSetup } from 'src/core/public'; +import { ManagementAppMountParams } from '../../../../../src/plugins/management/public'; +import { renderApp } from './render_app'; + +export async function mountManagementSection( + coreSetup: CoreSetup, + isCloudEnabled: boolean, + params: ManagementAppMountParams +) { + const [{ i18n, docLinks }] = await coreSetup.getStartServices(); + return renderApp({ + element: params.element, + isCloudEnabled, + http: coreSetup.http, + i18n, + docLinks, + }); +} diff --git a/x-pack/plugins/upgrade_assistant/public/plugin.ts b/x-pack/plugins/upgrade_assistant/public/plugin.ts index 300da4eccae15..bb0f21062c151 100644 --- a/x-pack/plugins/upgrade_assistant/public/plugin.ts +++ b/x-pack/plugins/upgrade_assistant/public/plugin.ts @@ -12,8 +12,6 @@ import { ManagementSetup } from '../../../../src/plugins/management/public'; import { NEXT_MAJOR_VERSION } from '../common/version'; import { Config } from '../common/config'; -import { renderApp } from './application/render_app'; - interface Dependencies { cloud: CloudSetup; management: ManagementSetup; @@ -21,7 +19,7 @@ interface Dependencies { export class UpgradeAssistantUIPlugin implements Plugin { constructor(private ctx: PluginInitializerContext) {} - setup({ http, getStartServices }: CoreSetup, { cloud, management }: Dependencies) { + setup(coreSetup: CoreSetup, { cloud, management }: Dependencies) { const { enabled } = this.ctx.config.get(); if (!enabled) { return; @@ -36,9 +34,9 @@ export class UpgradeAssistantUIPlugin implements Plugin { values: { version: `${NEXT_MAJOR_VERSION}.0` }, }), order: 1000, - async mount({ element }) { - const [{ i18n: i18nDep, docLinks }] = await getStartServices(); - return renderApp({ element, isCloudEnabled, http, i18n: i18nDep, docLinks }); + async mount(params) { + const { mountManagementSection } = await import('./application/mount_management_section'); + return mountManagementSection(coreSetup, isCloudEnabled, params); }, }); } From bdf628d29a51c7f072f4986a2181058d48321a1b Mon Sep 17 00:00:00 2001 From: Mikhail Shustov Date: Mon, 6 Apr 2020 12:31:36 +0200 Subject: [PATCH 11/12] use union of strings instead of enum (#62493) Co-authored-by: Elastic Machine --- x-pack/legacy/plugins/maps/server/plugin.js | 3 +-- .../actions/server/lib/license_state.mock.ts | 3 +-- .../actions/server/lib/license_state.test.ts | 6 +++--- .../actions/server/lib/license_state.ts | 18 ++++++++-------- .../alerting/server/lib/license_state.mock.ts | 4 ++-- .../alerting/server/lib/license_state.test.ts | 5 ++--- .../alerting/server/lib/license_state.ts | 10 ++++----- x-pack/plugins/graph/common/check_license.ts | 10 ++++----- .../server/services/license.ts | 4 ++-- x-pack/plugins/licensing/README.md | 8 +++---- .../plugins/licensing/common/license.test.ts | 21 +++++++++---------- x-pack/plugins/licensing/common/license.ts | 12 +++++------ .../licensing/common/licensing.mock.ts | 4 ++-- x-pack/plugins/licensing/common/types.ts | 9 ++------ .../plugins/ml/common/license/ml_license.ts | 8 +++---- .../ml/public/application/management/index.ts | 4 +--- x-pack/plugins/painless_lab/public/plugin.tsx | 3 +-- .../painless_lab/server/services/license.ts | 4 ++-- .../plugins/remote_clusters/server/plugin.ts | 3 +-- .../public/lib/license_check.test.ts | 9 ++++---- .../reporting/public/lib/license_check.ts | 10 ++++----- .../plugins/searchprofiler/public/plugin.ts | 3 +-- .../plugins/searchprofiler/server/plugin.ts | 4 +--- .../server/routes/api_keys/get.test.ts | 11 +++------- .../server/routes/api_keys/invalidate.test.ts | 11 +++------- .../server/routes/api_keys/privileges.test.ts | 10 +++------ .../routes/authentication/basic.test.ts | 3 +-- .../routes/authentication/common.test.ts | 3 +-- .../authorization/privileges/get.test.ts | 10 +++------ .../routes/authorization/roles/delete.test.ts | 11 +++------- .../routes/authorization/roles/get.test.ts | 11 +++------- .../authorization/roles/get_all.test.ts | 6 +++--- .../routes/authorization/roles/put.test.ts | 6 +++--- .../server/routes/licensed_route_handler.ts | 6 +----- .../server/routes/role_mapping/delete.test.ts | 5 ++--- .../routes/role_mapping/feature_check.test.ts | 4 ++-- .../server/routes/role_mapping/get.test.ts | 9 ++++---- .../server/routes/role_mapping/post.test.ts | 5 ++--- .../routes/users/change_password.test.ts | 3 +-- .../server/services/license.ts | 3 +-- .../routes/api/__fixtures__/route_contexts.ts | 5 ++--- .../routes/lib/licensed_route_handler.ts | 6 +----- .../transform/server/services/license.ts | 4 ++-- x-pack/plugins/watcher/public/plugin.ts | 4 ++-- x-pack/plugins/watcher/server/plugin.ts | 3 +-- 45 files changed, 120 insertions(+), 184 deletions(-) diff --git a/x-pack/legacy/plugins/maps/server/plugin.js b/x-pack/legacy/plugins/maps/server/plugin.js index 5b52a3eba2f23..25c552433e9f8 100644 --- a/x-pack/legacy/plugins/maps/server/plugin.js +++ b/x-pack/legacy/plugins/maps/server/plugin.js @@ -9,7 +9,6 @@ import { getEcommerceSavedObjects } from './sample_data/ecommerce_saved_objects' import { getFlightsSavedObjects } from './sample_data/flights_saved_objects.js'; import { getWebLogsSavedObjects } from './sample_data/web_logs_saved_objects.js'; import { registerMapsUsageCollector } from './maps_telemetry/collectors/register'; -import { LICENSE_CHECK_STATE } from '../../../../plugins/licensing/server'; import { initRoutes } from './routes'; import { emsBoundariesSpecProvider } from './tutorials/ems'; @@ -52,7 +51,7 @@ export class MapPlugin { licensing.license$.subscribe(license => { const { state } = license.check('maps', 'basic'); - if (state === LICENSE_CHECK_STATE.Valid && !routesInitialized) { + if (state === 'valid' && !routesInitialized) { routesInitialized = true; initRoutes(__LEGACY, license.uid); } diff --git a/x-pack/plugins/actions/server/lib/license_state.mock.ts b/x-pack/plugins/actions/server/lib/license_state.mock.ts index 72a21f878a150..d59e9dbdc540f 100644 --- a/x-pack/plugins/actions/server/lib/license_state.mock.ts +++ b/x-pack/plugins/actions/server/lib/license_state.mock.ts @@ -5,7 +5,6 @@ */ import { ILicenseState } from './license_state'; -import { LICENSE_CHECK_STATE } from '../../../licensing/server'; export const createLicenseStateMock = () => { const licenseState: jest.Mocked = { @@ -14,7 +13,7 @@ export const createLicenseStateMock = () => { ensureLicenseForActionType: jest.fn(), isLicenseValidForActionType: jest.fn(), checkLicense: jest.fn().mockResolvedValue({ - state: LICENSE_CHECK_STATE.Valid, + state: 'valid', }), }; return licenseState; diff --git a/x-pack/plugins/actions/server/lib/license_state.test.ts b/x-pack/plugins/actions/server/lib/license_state.test.ts index ba1fbcb83464a..eb10e69a444e8 100644 --- a/x-pack/plugins/actions/server/lib/license_state.test.ts +++ b/x-pack/plugins/actions/server/lib/license_state.test.ts @@ -8,7 +8,7 @@ import { ActionType } from '../types'; import { BehaviorSubject } from 'rxjs'; import { LicenseState, ILicenseState } from './license_state'; import { licensingMock } from '../../../licensing/server/mocks'; -import { LICENSE_CHECK_STATE, ILicense } from '../../../licensing/server'; +import { ILicense } from '../../../licensing/server'; describe('checkLicense()', () => { let getRawLicense: any; @@ -21,7 +21,7 @@ describe('checkLicense()', () => { beforeEach(() => { const license = licensingMock.createLicense({ license: { status: 'invalid' } }); license.check = jest.fn(() => ({ - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', })); getRawLicense.mockReturnValue(license); }); @@ -38,7 +38,7 @@ describe('checkLicense()', () => { beforeEach(() => { const license = licensingMock.createLicense({ license: { status: 'active' } }); license.check = jest.fn(() => ({ - state: LICENSE_CHECK_STATE.Valid, + state: 'valid', })); getRawLicense.mockReturnValue(license); }); diff --git a/x-pack/plugins/actions/server/lib/license_state.ts b/x-pack/plugins/actions/server/lib/license_state.ts index 9d87818805dcf..ae7180c4658bc 100644 --- a/x-pack/plugins/actions/server/lib/license_state.ts +++ b/x-pack/plugins/actions/server/lib/license_state.ts @@ -7,7 +7,7 @@ import { i18n } from '@kbn/i18n'; import { Observable, Subscription } from 'rxjs'; import { assertNever } from '../../../../../src/core/utils'; -import { ILicense, LICENSE_CHECK_STATE } from '../../../licensing/common/types'; +import { ILicense } from '../../../licensing/common/types'; import { PLUGIN } from '../constants/plugin'; import { ActionType } from '../types'; import { ActionTypeDisabledError } from './errors'; @@ -52,13 +52,13 @@ export class LicenseState { const check = this.license.check(actionType.id, actionType.minimumLicenseRequired); switch (check.state) { - case LICENSE_CHECK_STATE.Expired: + case 'expired': return { isValid: false, reason: 'expired' }; - case LICENSE_CHECK_STATE.Invalid: + case 'invalid': return { isValid: false, reason: 'invalid' }; - case LICENSE_CHECK_STATE.Unavailable: + case 'unavailable': return { isValid: false, reason: 'unavailable' }; - case LICENSE_CHECK_STATE.Valid: + case 'valid': return { isValid: true }; default: return assertNever(check.state); @@ -125,20 +125,20 @@ export class LicenseState { const check = license.check(PLUGIN.ID, PLUGIN.MINIMUM_LICENSE_REQUIRED); switch (check.state) { - case LICENSE_CHECK_STATE.Expired: + case 'expired': return { showAppLink: true, enableAppLink: false, message: check.message || '', }; - case LICENSE_CHECK_STATE.Invalid: - case LICENSE_CHECK_STATE.Unavailable: + case 'invalid': + case 'unavailable': return { showAppLink: false, enableAppLink: false, message: check.message || '', }; - case LICENSE_CHECK_STATE.Valid: + case 'valid': return { showAppLink: true, enableAppLink: true, diff --git a/x-pack/plugins/alerting/server/lib/license_state.mock.ts b/x-pack/plugins/alerting/server/lib/license_state.mock.ts index f36f3a9eaeade..aaccbfcc0af0e 100644 --- a/x-pack/plugins/alerting/server/lib/license_state.mock.ts +++ b/x-pack/plugins/alerting/server/lib/license_state.mock.ts @@ -6,7 +6,7 @@ import { of } from 'rxjs'; import { LicenseState } from './license_state'; -import { LICENSE_CHECK_STATE, ILicense } from '../../../licensing/server'; +import { ILicense } from '../../../licensing/server'; export const mockLicenseState = () => { const license: ILicense = { @@ -24,7 +24,7 @@ export const mockLicenseState = () => { }, check() { return { - state: LICENSE_CHECK_STATE.Valid, + state: 'valid', }; }, getFeature() { diff --git a/x-pack/plugins/alerting/server/lib/license_state.test.ts b/x-pack/plugins/alerting/server/lib/license_state.test.ts index 8feb8d74976fd..9bbd619dc4868 100644 --- a/x-pack/plugins/alerting/server/lib/license_state.test.ts +++ b/x-pack/plugins/alerting/server/lib/license_state.test.ts @@ -7,7 +7,6 @@ import expect from '@kbn/expect'; import { LicenseState } from './license_state'; import { licensingMock } from '../../../../plugins/licensing/server/mocks'; -import { LICENSE_CHECK_STATE } from '../../../../plugins/licensing/server'; describe('license_state', () => { let getRawLicense: any; @@ -20,7 +19,7 @@ describe('license_state', () => { beforeEach(() => { const license = licensingMock.createLicense({ license: { status: 'invalid' } }); license.check = jest.fn(() => ({ - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', })); getRawLicense.mockReturnValue(license); }); @@ -37,7 +36,7 @@ describe('license_state', () => { beforeEach(() => { const license = licensingMock.createLicense({ license: { status: 'active' } }); license.check = jest.fn(() => ({ - state: LICENSE_CHECK_STATE.Valid, + state: 'valid', })); getRawLicense.mockReturnValue(license); }); diff --git a/x-pack/plugins/alerting/server/lib/license_state.ts b/x-pack/plugins/alerting/server/lib/license_state.ts index 690eaed9e2b89..db60d64db5df4 100644 --- a/x-pack/plugins/alerting/server/lib/license_state.ts +++ b/x-pack/plugins/alerting/server/lib/license_state.ts @@ -7,7 +7,7 @@ import Boom from 'boom'; import { i18n } from '@kbn/i18n'; import { Observable, Subscription } from 'rxjs'; -import { ILicense, LICENSE_CHECK_STATE } from '../../../../plugins/licensing/common/types'; +import { ILicense } from '../../../../plugins/licensing/common/types'; import { assertNever } from '../../../../../src/core/utils'; import { PLUGIN } from '../constants/plugin'; @@ -55,20 +55,20 @@ export class LicenseState { const check = license.check(PLUGIN.ID, PLUGIN.MINIMUM_LICENSE_REQUIRED); switch (check.state) { - case LICENSE_CHECK_STATE.Expired: + case 'expired': return { showAppLink: true, enableAppLink: false, message: check.message || '', }; - case LICENSE_CHECK_STATE.Invalid: - case LICENSE_CHECK_STATE.Unavailable: + case 'invalid': + case 'unavailable': return { showAppLink: false, enableAppLink: false, message: check.message || '', }; - case LICENSE_CHECK_STATE.Valid: + case 'valid': return { showAppLink: true, enableAppLink: true, diff --git a/x-pack/plugins/graph/common/check_license.ts b/x-pack/plugins/graph/common/check_license.ts index a918f53776b17..f9a663f35ed47 100644 --- a/x-pack/plugins/graph/common/check_license.ts +++ b/x-pack/plugins/graph/common/check_license.ts @@ -5,7 +5,7 @@ */ import { i18n } from '@kbn/i18n'; -import { ILicense, LICENSE_CHECK_STATE } from '../../licensing/common/types'; +import { ILicense } from '../../licensing/common/types'; import { assertNever } from '../../../../src/core/utils'; export interface GraphLicenseInformation { @@ -43,20 +43,20 @@ export function checkLicense(license: ILicense | undefined): GraphLicenseInforma const check = license.check('graph', 'platinum'); switch (check.state) { - case LICENSE_CHECK_STATE.Expired: + case 'expired': return { showAppLink: true, enableAppLink: false, message: check.message || '', }; - case LICENSE_CHECK_STATE.Invalid: - case LICENSE_CHECK_STATE.Unavailable: + case 'invalid': + case 'unavailable': return { showAppLink: false, enableAppLink: false, message: check.message || '', }; - case LICENSE_CHECK_STATE.Valid: + case 'valid': return { showAppLink: true, enableAppLink: true, diff --git a/x-pack/plugins/index_management/server/services/license.ts b/x-pack/plugins/index_management/server/services/license.ts index c490aa7b57ed9..31d3654c51e3e 100644 --- a/x-pack/plugins/index_management/server/services/license.ts +++ b/x-pack/plugins/index_management/server/services/license.ts @@ -12,7 +12,7 @@ import { } from 'kibana/server'; import { LicensingPluginSetup } from '../../../licensing/server'; -import { LicenseType, LICENSE_CHECK_STATE } from '../../../licensing/common/types'; +import { LicenseType } from '../../../licensing/common/types'; export interface LicenseStatus { isValid: boolean; @@ -37,7 +37,7 @@ export class License { ) { licensing.license$.subscribe(license => { const { state, message } = license.check(pluginId, minimumLicenseType); - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; if (hasRequiredLicense) { this.licenseStatus = { isValid: true }; diff --git a/x-pack/plugins/licensing/README.md b/x-pack/plugins/licensing/README.md index 7a155dfd405c5..a058d42fe908b 100644 --- a/x-pack/plugins/licensing/README.md +++ b/x-pack/plugins/licensing/README.md @@ -59,7 +59,7 @@ chrome.navLinks.update('myPlugin', { "requiredPlugins": ["licensing"], // my_plugin/server/plugin.ts -import { LicensingPluginSetup, LICENSE_CHECK_STATE } from '../licensing/server' +import { LicensingPluginSetup } from '../licensing/server' interface SetupDeps { licensing: LicensingPluginSetup; @@ -69,7 +69,7 @@ class MyPlugin { setup(core: CoreSetup, deps: SetupDeps) { deps.licensing.license$.subscribe(license => { const { state, message } = license.check('myPlugin', 'gold') - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; if (hasRequiredLicense && license.getFeature('name').isAvailable) { // enable some server side logic } else { @@ -81,12 +81,12 @@ class MyPlugin { } // my_plugin/public/plugin.ts -import { LicensingPluginSetup, LICENSE_CHECK_STATE } from '../licensing/public' +import { LicensingPluginSetup } from '../licensing/public' class MyPlugin { setup(core: CoreSetup, deps: SetupDeps) { deps.licensing.license$.subscribe(license => { const { state, message } = license.check('myPlugin', 'gold') - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; const showLinks = hasRequiredLicense && license.getFeature('name').isAvailable; chrome.navLinks.update('myPlugin', { diff --git a/x-pack/plugins/licensing/common/license.test.ts b/x-pack/plugins/licensing/common/license.test.ts index 622572a6a95ba..648b0a2180928 100644 --- a/x-pack/plugins/licensing/common/license.test.ts +++ b/x-pack/plugins/licensing/common/license.test.ts @@ -5,7 +5,6 @@ */ import { License } from './license'; -import { LICENSE_CHECK_STATE } from './types'; import { licenseMock } from './licensing.mock'; describe('License', () => { @@ -86,21 +85,21 @@ describe('License', () => { describe('check', () => { it('provides availability status', () => { - expect(basicLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Invalid); + expect(basicLicense.check('ccr', 'gold').state).toBe('invalid'); - expect(goldLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Valid); - expect(goldLicense.check('ccr', 'basic').state).toBe(LICENSE_CHECK_STATE.Valid); + expect(goldLicense.check('ccr', 'gold').state).toBe('valid'); + expect(goldLicense.check('ccr', 'basic').state).toBe('valid'); - expect(basicExpiredLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Expired); + expect(basicExpiredLicense.check('ccr', 'gold').state).toBe('expired'); - expect(errorLicense.check('ccr', 'basic').state).toBe(LICENSE_CHECK_STATE.Unavailable); - expect(errorLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Unavailable); + expect(errorLicense.check('ccr', 'basic').state).toBe('unavailable'); + expect(errorLicense.check('ccr', 'gold').state).toBe('unavailable'); - expect(unavailableLicense.check('ccr', 'basic').state).toBe(LICENSE_CHECK_STATE.Unavailable); - expect(unavailableLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Unavailable); + expect(unavailableLicense.check('ccr', 'basic').state).toBe('unavailable'); + expect(unavailableLicense.check('ccr', 'gold').state).toBe('unavailable'); - expect(enterpriseLicense.check('ccr', 'gold').state).toBe(LICENSE_CHECK_STATE.Valid); - expect(enterpriseLicense.check('ccr', 'enterprise').state).toBe(LICENSE_CHECK_STATE.Valid); + expect(enterpriseLicense.check('ccr', 'gold').state).toBe('valid'); + expect(enterpriseLicense.check('ccr', 'enterprise').state).toBe('valid'); }); it('throws in case of unknown license type', () => { diff --git a/x-pack/plugins/licensing/common/license.ts b/x-pack/plugins/licensing/common/license.ts index 41f3c73db9c06..bb3480a482f0f 100644 --- a/x-pack/plugins/licensing/common/license.ts +++ b/x-pack/plugins/licensing/common/license.ts @@ -9,7 +9,7 @@ import { LicenseType, ILicense, LicenseStatus, - LICENSE_CHECK_STATE, + LicenseCheck, LICENSE_TYPE, PublicLicenseJSON, PublicLicense, @@ -98,10 +98,10 @@ export class License implements ILicense { return LICENSE_TYPE[minimumLicenseRequired] <= LICENSE_TYPE[type]; } - check(pluginName: string, minimumLicenseRequired: LicenseType) { + check(pluginName: string, minimumLicenseRequired: LicenseType): LicenseCheck { if (!this.isAvailable) { return { - state: LICENSE_CHECK_STATE.Unavailable, + state: 'unavailable', message: i18n.translate('xpack.licensing.check.errorUnavailableMessage', { defaultMessage: 'You cannot use {pluginName} because license information is not available at this time.', @@ -112,7 +112,7 @@ export class License implements ILicense { if (!this.isActive) { return { - state: LICENSE_CHECK_STATE.Expired, + state: 'expired', message: i18n.translate('xpack.licensing.check.errorExpiredMessage', { defaultMessage: 'You cannot use {pluginName} because your {licenseType} license has expired.', @@ -123,7 +123,7 @@ export class License implements ILicense { if (!this.hasAtLeast(minimumLicenseRequired)) { return { - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', message: i18n.translate('xpack.licensing.check.errorUnsupportedMessage', { defaultMessage: 'Your {licenseType} license does not support {pluginName}. Please upgrade your license.', @@ -132,7 +132,7 @@ export class License implements ILicense { }; } - return { state: LICENSE_CHECK_STATE.Valid }; + return { state: 'valid' }; } getFeature(name: string) { diff --git a/x-pack/plugins/licensing/common/licensing.mock.ts b/x-pack/plugins/licensing/common/licensing.mock.ts index bbe63d5c0d70a..bf8b85e3e981b 100644 --- a/x-pack/plugins/licensing/common/licensing.mock.ts +++ b/x-pack/plugins/licensing/common/licensing.mock.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { ILicense, PublicLicense, PublicFeatures, LICENSE_CHECK_STATE } from './types'; +import { ILicense, PublicLicense, PublicFeatures } from './types'; import { License } from './license'; function createLicense({ @@ -51,7 +51,7 @@ const createLicenseMock = () => { check: jest.fn(), hasAtLeast: jest.fn(), }; - mock.check.mockReturnValue({ state: LICENSE_CHECK_STATE.Valid }); + mock.check.mockReturnValue({ state: 'valid' }); mock.hasAtLeast.mockReturnValue(true); return mock; }; diff --git a/x-pack/plugins/licensing/common/types.ts b/x-pack/plugins/licensing/common/types.ts index 78c31963da9b1..f589ba7e9e44f 100644 --- a/x-pack/plugins/licensing/common/types.ts +++ b/x-pack/plugins/licensing/common/types.ts @@ -4,12 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -export enum LICENSE_CHECK_STATE { - Unavailable = 'UNAVAILABLE', - Invalid = 'INVALID', - Expired = 'EXPIRED', - Valid = 'VALID', -} +export type LicenseCheckState = 'unavailable' | 'invalid' | 'valid' | 'expired'; export enum LICENSE_TYPE { basic = 10, @@ -90,7 +85,7 @@ export interface LicenseCheck { /** * The state of checking the results of a license type meeting the license minimum. */ - state: LICENSE_CHECK_STATE; + state: LicenseCheckState; /** * A message containing the reason for a license type not being valid. */ diff --git a/x-pack/plugins/ml/common/license/ml_license.ts b/x-pack/plugins/ml/common/license/ml_license.ts index 31a1b44d297ed..2a60887310447 100644 --- a/x-pack/plugins/ml/common/license/ml_license.ts +++ b/x-pack/plugins/ml/common/license/ml_license.ts @@ -5,7 +5,7 @@ */ import { Observable, Subscription } from 'rxjs'; -import { ILicense, LICENSE_CHECK_STATE } from '../../../licensing/common/types'; +import { ILicense } from '../../../licensing/common/types'; import { PLUGIN_ID } from '../constants/app'; export const MINIMUM_LICENSE = 'basic'; @@ -38,10 +38,8 @@ export class MlLicense { this._isSecurityEnabled = securityIsEnabled; this._hasLicenseExpired = this._license.status === 'expired'; this._isMlEnabled = this._license.getFeature(PLUGIN_ID).isEnabled; - this._isMinimumLicense = - this._license.check(PLUGIN_ID, MINIMUM_LICENSE).state === LICENSE_CHECK_STATE.Valid; - this._isFullLicense = - this._license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === LICENSE_CHECK_STATE.Valid; + this._isMinimumLicense = this._license.check(PLUGIN_ID, MINIMUM_LICENSE).state === 'valid'; + this._isFullLicense = this._license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === 'valid'; if (this._initialized === false && postInitFunctions !== undefined) { postInitFunctions.forEach(f => f(this)); diff --git a/x-pack/plugins/ml/public/application/management/index.ts b/x-pack/plugins/ml/public/application/management/index.ts index 385140771e08f..a6fe9e1d11953 100644 --- a/x-pack/plugins/ml/public/application/management/index.ts +++ b/x-pack/plugins/ml/public/application/management/index.ts @@ -16,8 +16,6 @@ import { take } from 'rxjs/operators'; import { CoreSetup } from 'kibana/public'; import { MlStartDependencies, MlSetupDependencies } from '../../plugin'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/public'; - import { PLUGIN_ID, PLUGIN_ICON } from '../../../common/constants/app'; import { MINIMUM_FULL_LICENSE } from '../../../common/license'; @@ -27,7 +25,7 @@ export function initManagementSection( ) { const licensing = pluginsSetup.licensing.license$.pipe(take(1)); licensing.subscribe(license => { - if (license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === LICENSE_CHECK_STATE.Valid) { + if (license.check(PLUGIN_ID, MINIMUM_FULL_LICENSE).state === 'valid') { const management = pluginsSetup.management; const mlSection = management.sections.register({ id: PLUGIN_ID, diff --git a/x-pack/plugins/painless_lab/public/plugin.tsx b/x-pack/plugins/painless_lab/public/plugin.tsx index b9ca7031cf670..e76128313545a 100644 --- a/x-pack/plugins/painless_lab/public/plugin.tsx +++ b/x-pack/plugins/painless_lab/public/plugin.tsx @@ -11,7 +11,6 @@ import { first } from 'rxjs/operators'; import { EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui'; import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public'; -import { LICENSE_CHECK_STATE } from '../../licensing/public'; import { PLUGIN } from '../common/constants'; @@ -82,7 +81,7 @@ export class PainlessLabUIPlugin implements Plugin { const { state, message } = license.check(pluginId, minimumLicenseType); - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; if (hasRequiredLicense) { this.licenseStatus = { isValid: true }; diff --git a/x-pack/plugins/remote_clusters/server/plugin.ts b/x-pack/plugins/remote_clusters/server/plugin.ts index 837d53c7dbc1b..b86f16228878a 100644 --- a/x-pack/plugins/remote_clusters/server/plugin.ts +++ b/x-pack/plugins/remote_clusters/server/plugin.ts @@ -7,7 +7,6 @@ import { i18n } from '@kbn/i18n'; import { CoreSetup, Logger, Plugin, PluginInitializerContext } from 'src/core/server'; import { Observable } from 'rxjs'; -import { LICENSE_CHECK_STATE } from '../../licensing/common/types'; import { PLUGIN } from '../common/constants'; import { Dependencies, LicenseStatus, RouteDependencies } from './types'; @@ -54,7 +53,7 @@ export class RemoteClustersServerPlugin implements Plugin licensing.license$.subscribe(license => { const { state, message } = license.check(PLUGIN.getI18nName(), PLUGIN.minimumLicenseType); - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; if (hasRequiredLicense) { this.licenseStatus = { valid: true }; } else { diff --git a/x-pack/plugins/reporting/public/lib/license_check.test.ts b/x-pack/plugins/reporting/public/lib/license_check.test.ts index 24e14969d2c81..22737509923d3 100644 --- a/x-pack/plugins/reporting/public/lib/license_check.test.ts +++ b/x-pack/plugins/reporting/public/lib/license_check.test.ts @@ -4,11 +4,10 @@ * you may not use this file except in compliance with the Elastic License. */ import { checkLicense } from './license_check'; -import { LicenseCheck } from '../../../licensing/public'; describe('License check', () => { it('enables and shows links when licenses are good mkay', () => { - expect(checkLicense({ state: 'VALID' } as LicenseCheck)).toEqual({ + expect(checkLicense({ state: 'valid' })).toEqual({ enableLinks: true, showLinks: true, message: '', @@ -16,7 +15,7 @@ describe('License check', () => { }); it('disables and shows links when licenses are not valid', () => { - expect(checkLicense({ state: 'INVALID' } as LicenseCheck)).toEqual({ + expect(checkLicense({ state: 'invalid' })).toEqual({ enableLinks: false, showLinks: false, message: 'Your license does not support Reporting. Please upgrade your license.', @@ -24,7 +23,7 @@ describe('License check', () => { }); it('shows links, but disables them, on expired licenses', () => { - expect(checkLicense({ state: 'EXPIRED' } as LicenseCheck)).toEqual({ + expect(checkLicense({ state: 'expired' })).toEqual({ enableLinks: false, showLinks: true, message: 'You cannot use Reporting because your license has expired.', @@ -32,7 +31,7 @@ describe('License check', () => { }); it('shows links, but disables them, when license checks are unavailable', () => { - expect(checkLicense({ state: 'UNAVAILABLE' } as LicenseCheck)).toEqual({ + expect(checkLicense({ state: 'unavailable' })).toEqual({ enableLinks: false, showLinks: true, message: diff --git a/x-pack/plugins/reporting/public/lib/license_check.ts b/x-pack/plugins/reporting/public/lib/license_check.ts index ca803fb38ef2a..0c16ead0b116d 100644 --- a/x-pack/plugins/reporting/public/lib/license_check.ts +++ b/x-pack/plugins/reporting/public/lib/license_check.ts @@ -4,11 +4,11 @@ * you may not use this file except in compliance with the Elastic License. */ import { LicenseCheckResults } from '../..'; -import { LICENSE_CHECK_STATE, LicenseCheck } from '../../../licensing/public'; +import { LicenseCheck } from '../../../licensing/public'; export const checkLicense = (checkResults: LicenseCheck): LicenseCheckResults => { switch (checkResults.state) { - case LICENSE_CHECK_STATE.Valid: { + case 'valid': { return { showLinks: true, enableLinks: true, @@ -16,7 +16,7 @@ export const checkLicense = (checkResults: LicenseCheck): LicenseCheckResults => }; } - case LICENSE_CHECK_STATE.Invalid: { + case 'invalid': { return { showLinks: false, enableLinks: false, @@ -24,7 +24,7 @@ export const checkLicense = (checkResults: LicenseCheck): LicenseCheckResults => }; } - case LICENSE_CHECK_STATE.Unavailable: { + case 'unavailable': { return { showLinks: true, enableLinks: false, @@ -33,7 +33,7 @@ export const checkLicense = (checkResults: LicenseCheck): LicenseCheckResults => }; } - case LICENSE_CHECK_STATE.Expired: { + case 'expired': { return { showLinks: true, enableLinks: false, diff --git a/x-pack/plugins/searchprofiler/public/plugin.ts b/x-pack/plugins/searchprofiler/public/plugin.ts index 7d77b274ec49d..179886c0807d2 100644 --- a/x-pack/plugins/searchprofiler/public/plugin.ts +++ b/x-pack/plugins/searchprofiler/public/plugin.ts @@ -9,7 +9,6 @@ import { Plugin, CoreStart, CoreSetup, PluginInitializerContext } from 'kibana/p import { first } from 'rxjs/operators'; import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public'; -import { LICENSE_CHECK_STATE } from '../../licensing/public'; import { PLUGIN } from '../common'; import { AppPublicPluginDependencies } from './types'; @@ -50,7 +49,7 @@ export class SearchProfilerUIPlugin implements Plugin { const { state, message } = license.check(PLUGIN.id, PLUGIN.minimumLicenseType); - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; if (hasRequiredLicense) { this.licenseStatus = { valid: true }; } else { diff --git a/x-pack/plugins/security/server/routes/api_keys/get.test.ts b/x-pack/plugins/security/server/routes/api_keys/get.test.ts index 2b2283edea2e8..f77469552d980 100644 --- a/x-pack/plugins/security/server/routes/api_keys/get.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/get.test.ts @@ -5,7 +5,7 @@ */ import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE, LicenseCheck } from '../../../../licensing/server'; +import { LicenseCheck } from '../../../../licensing/server'; import { defineGetApiKeysRoutes } from './get'; import { elasticsearchServiceMock, httpServerMock } from '../../../../../../src/core/server/mocks'; @@ -22,12 +22,7 @@ interface TestOptions { describe('Get API keys', () => { const getApiKeysTest = ( description: string, - { - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, - apiResponse, - asserts, - isAdmin = true, - }: TestOptions + { licenseCheckResult = { state: 'valid' }, apiResponse, asserts, isAdmin = true }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -71,7 +66,7 @@ describe('Get API keys', () => { describe('failure', () => { getApiKeysTest('returns result of license checker', { - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); diff --git a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts index 4ea21bda5f743..2889cf78aff83 100644 --- a/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/invalidate.test.ts @@ -7,7 +7,7 @@ import Boom from 'boom'; import { Type } from '@kbn/config-schema'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE, LicenseCheck } from '../../../../licensing/server'; +import { LicenseCheck } from '../../../../licensing/server'; import { defineInvalidateApiKeysRoutes } from './invalidate'; import { elasticsearchServiceMock, httpServerMock } from '../../../../../../src/core/server/mocks'; @@ -23,12 +23,7 @@ interface TestOptions { describe('Invalidate API keys', () => { const postInvalidateTest = ( description: string, - { - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, - apiResponses = [], - asserts, - payload, - }: TestOptions + { licenseCheckResult = { state: 'valid' }, apiResponses = [], asserts, payload }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -116,7 +111,7 @@ describe('Invalidate API keys', () => { describe('failure', () => { postInvalidateTest('returns result of license checker', { - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, payload: { apiKeys: [{ id: 'si8If24B1bKsmSLTAhJV', name: 'my-api-key' }], isAdmin: true }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); diff --git a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts index 866e455063bdc..311d50e9eb169 100644 --- a/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts +++ b/x-pack/plugins/security/server/routes/api_keys/privileges.test.ts @@ -5,7 +5,7 @@ */ import Boom from 'boom'; -import { LICENSE_CHECK_STATE, LicenseCheck } from '../../../../licensing/server'; +import { LicenseCheck } from '../../../../licensing/server'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../src/core/server'; import { elasticsearchServiceMock, httpServerMock } from '../../../../../../src/core/server/mocks'; @@ -21,11 +21,7 @@ interface TestOptions { describe('Check API keys privileges', () => { const getPrivilegesTest = ( description: string, - { - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, - apiResponses = [], - asserts, - }: TestOptions + { licenseCheckResult = { state: 'valid' }, apiResponses = [], asserts }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -68,7 +64,7 @@ describe('Check API keys privileges', () => { describe('failure', () => { getPrivilegesTest('returns result of license checker', { - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); diff --git a/x-pack/plugins/security/server/routes/authentication/basic.test.ts b/x-pack/plugins/security/server/routes/authentication/basic.test.ts index 3c114978f26d2..5eed8e166c957 100644 --- a/x-pack/plugins/security/server/routes/authentication/basic.test.ts +++ b/x-pack/plugins/security/server/routes/authentication/basic.test.ts @@ -12,7 +12,6 @@ import { RequestHandlerContext, RouteConfig, } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; import { Authentication, AuthenticationResult } from '../../authentication'; import { defineBasicRoutes } from './basic'; @@ -33,7 +32,7 @@ describe('Basic authentication routes', () => { mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ check: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ check: 'valid' }) }, }, } as unknown) as RequestHandlerContext; diff --git a/x-pack/plugins/security/server/routes/authentication/common.test.ts b/x-pack/plugins/security/server/routes/authentication/common.test.ts index e2f9593bc09ee..156c03e90210b 100644 --- a/x-pack/plugins/security/server/routes/authentication/common.test.ts +++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts @@ -12,7 +12,6 @@ import { RequestHandlerContext, RouteConfig, } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; import { Authentication, AuthenticationResult, @@ -37,7 +36,7 @@ describe('Common authentication routes', () => { mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ check: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ check: 'valid' }) }, }, } as unknown) as RequestHandlerContext; diff --git a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts index 6afbad8e83ebe..7301a3cf51974 100644 --- a/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/privileges/get.test.ts @@ -5,7 +5,7 @@ */ import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../../src/core/server'; -import { LicenseCheck, LICENSE_CHECK_STATE } from '../../../../../licensing/server'; +import { LicenseCheck } from '../../../../../licensing/server'; import { RawKibanaPrivileges } from '../../../../common/model'; import { defineGetPrivilegesRoutes } from './get'; @@ -46,11 +46,7 @@ interface TestOptions { describe('GET privileges', () => { const getPrivilegesTest = ( description: string, - { - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, - includeActions, - asserts, - }: TestOptions + { licenseCheckResult = { state: 'valid' }, includeActions, asserts }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -82,7 +78,7 @@ describe('GET privileges', () => { describe('failure', () => { getPrivilegesTest('returns result of license checker', { - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); }); diff --git a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts index 22268245c3a44..ada6a1c8d2dc3 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/delete.test.ts @@ -6,7 +6,7 @@ import Boom from 'boom'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../../src/core/server'; -import { LicenseCheck, LICENSE_CHECK_STATE } from '../../../../../licensing/server'; +import { LicenseCheck } from '../../../../../licensing/server'; import { defineDeleteRolesRoutes } from './delete'; import { @@ -25,12 +25,7 @@ interface TestOptions { describe('DELETE role', () => { const deleteRoleTest = ( description: string, - { - name, - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, - apiResponse, - asserts, - }: TestOptions + { name, licenseCheckResult = { state: 'valid' }, apiResponse, asserts }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -75,7 +70,7 @@ describe('DELETE role', () => { describe('failure', () => { deleteRoleTest('returns result of license checker', { name: 'foo-role', - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts index bb9edbd17b2c8..49123fe9c74d7 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/get.test.ts @@ -5,7 +5,7 @@ */ import Boom from 'boom'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../../src/core/server'; -import { LicenseCheck, LICENSE_CHECK_STATE } from '../../../../../licensing/server'; +import { LicenseCheck } from '../../../../../licensing/server'; import { defineGetRolesRoutes } from './get'; import { @@ -27,12 +27,7 @@ interface TestOptions { describe('GET role', () => { const getRoleTest = ( description: string, - { - name, - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, - apiResponse, - asserts, - }: TestOptions + { name, licenseCheckResult = { state: 'valid' }, apiResponse, asserts }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -76,7 +71,7 @@ describe('GET role', () => { describe('failure', () => { getRoleTest('returns result of license checker', { - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); diff --git a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts index 96f065d6c765a..5dbe8682c5426 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/get_all.test.ts @@ -5,7 +5,7 @@ */ import Boom from 'boom'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../../src/core/server'; -import { LicenseCheck, LICENSE_CHECK_STATE } from '../../../../../licensing/server'; +import { LicenseCheck } from '../../../../../licensing/server'; import { defineGetAllRolesRoutes } from './get_all'; import { @@ -27,7 +27,7 @@ interface TestOptions { describe('GET all roles', () => { const getRolesTest = ( description: string, - { licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, apiResponse, asserts }: TestOptions + { licenseCheckResult = { state: 'valid' }, apiResponse, asserts }: TestOptions ) => { test(description, async () => { const mockRouteDefinitionParams = routeDefinitionParamsMock.create(); @@ -68,7 +68,7 @@ describe('GET all roles', () => { describe('failure', () => { getRolesTest('returns result of license checker', { - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); diff --git a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts index 62b49f0c4e7f0..d7710bf669ce1 100644 --- a/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts +++ b/x-pack/plugins/security/server/routes/authorization/roles/put.test.ts @@ -6,7 +6,7 @@ import { Type } from '@kbn/config-schema'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../../src/core/server'; -import { LicenseCheck, LICENSE_CHECK_STATE } from '../../../../../licensing/server'; +import { LicenseCheck } from '../../../../../licensing/server'; import { GLOBAL_RESOURCE } from '../../../../common/constants'; import { definePutRolesRoutes } from './put'; @@ -55,7 +55,7 @@ const putRoleTest = ( { name, payload, - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, + licenseCheckResult = { state: 'valid' }, apiResponses = [], asserts, }: TestOptions @@ -140,7 +140,7 @@ describe('PUT role', () => { describe('failure', () => { putRoleTest('returns result of license checker', { name: 'foo-role', - licenseCheckResult: { state: LICENSE_CHECK_STATE.Invalid, message: 'test forbidden message' }, + licenseCheckResult: { state: 'invalid', message: 'test forbidden message' }, asserts: { statusCode: 403, result: { message: 'test forbidden message' } }, }); }); diff --git a/x-pack/plugins/security/server/routes/licensed_route_handler.ts b/x-pack/plugins/security/server/routes/licensed_route_handler.ts index bc5a6a1139215..b113b2ca59e3e 100644 --- a/x-pack/plugins/security/server/routes/licensed_route_handler.ts +++ b/x-pack/plugins/security/server/routes/licensed_route_handler.ts @@ -5,16 +5,12 @@ */ import { RequestHandler } from 'kibana/server'; -import { LICENSE_CHECK_STATE } from '../../../licensing/server'; export const createLicensedRouteHandler = (handler: RequestHandler) => { const licensedRouteHandler: RequestHandler = (context, request, responseToolkit) => { const { license } = context.licensing; const licenseCheck = license.check('security', 'basic'); - if ( - licenseCheck.state === LICENSE_CHECK_STATE.Unavailable || - licenseCheck.state === LICENSE_CHECK_STATE.Invalid - ) { + if (licenseCheck.state === 'unavailable' || licenseCheck.state === 'invalid') { return responseToolkit.forbidden({ body: { message: licenseCheck.message! } }); } diff --git a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts index e8a8a7216330b..34961dbe27675 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/delete.test.ts @@ -7,7 +7,6 @@ import { routeDefinitionParamsMock } from '../index.mock'; import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; import { defineRoleMappingDeleteRoutes } from './delete'; describe('DELETE role mappings', () => { @@ -33,7 +32,7 @@ describe('DELETE role mappings', () => { }); const mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ state: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ state: 'valid' }) }, }, } as unknown) as RequestHandlerContext; @@ -67,7 +66,7 @@ describe('DELETE role mappings', () => { licensing: { license: { check: jest.fn().mockReturnValue({ - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', message: 'test forbidden message', }), }, diff --git a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts index f2c48fd370434..4fde93d0ad859 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/feature_check.test.ts @@ -11,7 +11,7 @@ import { RequestHandlerContext, IClusterClient, } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE, LicenseCheck } from '../../../../licensing/server'; +import { LicenseCheck } from '../../../../licensing/server'; import { defineRoleMappingFeatureCheckRoute } from './feature_check'; interface TestOptions { @@ -62,7 +62,7 @@ describe('GET role mappings feature check', () => { const getFeatureCheckTest = ( description: string, { - licenseCheckResult = { state: LICENSE_CHECK_STATE.Valid }, + licenseCheckResult = { state: 'valid' }, canManageRoleMappings = true, nodeSettingsResponse = {}, xpackUsageResponse = defaultXpackUsageResponse, diff --git a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts index c60d5518097ba..e0df59ebe7a00 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/get.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/get.test.ts @@ -9,7 +9,6 @@ import { routeDefinitionParamsMock } from '../index.mock'; import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks'; import { defineRoleMappingGetRoutes } from './get'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; const mockRoleMappingResponse = { mapping1: { @@ -70,7 +69,7 @@ describe('GET role mappings', () => { }); const mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ state: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ state: 'valid' }) }, }, } as unknown) as RequestHandlerContext; @@ -158,7 +157,7 @@ describe('GET role mappings', () => { }); const mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ state: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ state: 'valid' }) }, }, } as unknown) as RequestHandlerContext; @@ -201,7 +200,7 @@ describe('GET role mappings', () => { licensing: { license: { check: jest.fn().mockReturnValue({ - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', message: 'test forbidden message', }), }, @@ -238,7 +237,7 @@ describe('GET role mappings', () => { }); const mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ state: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ state: 'valid' }) }, }, } as unknown) as RequestHandlerContext; diff --git a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts index 7d820d668a6da..ed3d1bbd0fca2 100644 --- a/x-pack/plugins/security/server/routes/role_mapping/post.test.ts +++ b/x-pack/plugins/security/server/routes/role_mapping/post.test.ts @@ -7,7 +7,6 @@ import { routeDefinitionParamsMock } from '../index.mock'; import { elasticsearchServiceMock, httpServerMock } from 'src/core/server/mocks'; import { kibanaResponseFactory, RequestHandlerContext } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; import { defineRoleMappingPostRoutes } from './post'; describe('POST role mappings', () => { @@ -42,7 +41,7 @@ describe('POST role mappings', () => { }); const mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ state: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ state: 'valid' }) }, }, } as unknown) as RequestHandlerContext; @@ -86,7 +85,7 @@ describe('POST role mappings', () => { licensing: { license: { check: jest.fn().mockReturnValue({ - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', message: 'test forbidden message', }), }, diff --git a/x-pack/plugins/security/server/routes/users/change_password.test.ts b/x-pack/plugins/security/server/routes/users/change_password.test.ts index bac40202ee6ef..fd05821f9d520 100644 --- a/x-pack/plugins/security/server/routes/users/change_password.test.ts +++ b/x-pack/plugins/security/server/routes/users/change_password.test.ts @@ -16,7 +16,6 @@ import { RouteConfig, ScopeableRequest, } from '../../../../../../src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; import { Authentication, AuthenticationResult } from '../../authentication'; import { defineChangeUserPasswordRoutes } from './change_password'; @@ -63,7 +62,7 @@ describe('Change password', () => { mockContext = ({ licensing: { - license: { check: jest.fn().mockReturnValue({ check: LICENSE_CHECK_STATE.Valid }) }, + license: { check: jest.fn().mockReturnValue({ check: 'valid' }) }, }, } as unknown) as RequestHandlerContext; diff --git a/x-pack/plugins/snapshot_restore/server/services/license.ts b/x-pack/plugins/snapshot_restore/server/services/license.ts index 74696bb966e8a..31d3654c51e3e 100644 --- a/x-pack/plugins/snapshot_restore/server/services/license.ts +++ b/x-pack/plugins/snapshot_restore/server/services/license.ts @@ -13,7 +13,6 @@ import { import { LicensingPluginSetup } from '../../../licensing/server'; import { LicenseType } from '../../../licensing/common/types'; -import { LICENSE_CHECK_STATE } from '../../../licensing/common/types'; export interface LicenseStatus { isValid: boolean; @@ -38,7 +37,7 @@ export class License { ) { licensing.license$.subscribe(license => { const { state, message } = license.check(pluginId, minimumLicenseType); - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; if (hasRequiredLicense) { this.licenseStatus = { isValid: true }; diff --git a/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts b/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts index 0bc1685345857..be8322138ec78 100644 --- a/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts +++ b/x-pack/plugins/spaces/server/routes/api/__fixtures__/route_contexts.ts @@ -5,13 +5,12 @@ */ import { RequestHandlerContext } from 'src/core/server'; -import { LICENSE_CHECK_STATE } from '../../../../../licensing/server'; export const mockRouteContext = ({ licensing: { license: { check: jest.fn().mockReturnValue({ - state: LICENSE_CHECK_STATE.Valid, + state: 'valid', }), }, }, @@ -21,7 +20,7 @@ export const mockRouteContextWithInvalidLicense = ({ licensing: { license: { check: jest.fn().mockReturnValue({ - state: LICENSE_CHECK_STATE.Invalid, + state: 'invalid', message: 'License is invalid for spaces', }), }, diff --git a/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts b/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts index 13bed5ce58e2b..d56414a12b838 100644 --- a/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts +++ b/x-pack/plugins/spaces/server/routes/lib/licensed_route_handler.ts @@ -5,16 +5,12 @@ */ import { RequestHandler } from 'kibana/server'; -import { LICENSE_CHECK_STATE } from '../../../../licensing/server'; export const createLicensedRouteHandler = (handler: RequestHandler) => { const licensedRouteHandler: RequestHandler = (context, request, responseToolkit) => { const { license } = context.licensing; const licenseCheck = license.check('spaces', 'basic'); - if ( - licenseCheck.state === LICENSE_CHECK_STATE.Unavailable || - licenseCheck.state === LICENSE_CHECK_STATE.Invalid - ) { + if (licenseCheck.state === 'unavailable' || licenseCheck.state === 'invalid') { return responseToolkit.forbidden({ body: { message: licenseCheck.message! } }); } diff --git a/x-pack/plugins/transform/server/services/license.ts b/x-pack/plugins/transform/server/services/license.ts index 93346160c6f44..18ed7db1e3f6d 100644 --- a/x-pack/plugins/transform/server/services/license.ts +++ b/x-pack/plugins/transform/server/services/license.ts @@ -12,7 +12,7 @@ import { RequestHandlerContext, } from 'kibana/server'; -import { LicensingPluginSetup, LicenseType, LICENSE_CHECK_STATE } from '../../../licensing/server'; +import { LicensingPluginSetup, LicenseType } from '../../../licensing/server'; export interface LicenseStatus { isValid: boolean; @@ -39,7 +39,7 @@ export class License { ) { licensing.license$.subscribe(license => { const { state, message } = license.check(pluginId, minimumLicenseType); - const hasRequiredLicense = state === LICENSE_CHECK_STATE.Valid; + const hasRequiredLicense = state === 'valid'; const securityFeature = license.getFeature('security'); const isSecurityEnabled = diff --git a/x-pack/plugins/watcher/public/plugin.ts b/x-pack/plugins/watcher/public/plugin.ts index cb9ad4eb21fcf..9bee7e60273e4 100644 --- a/x-pack/plugins/watcher/public/plugin.ts +++ b/x-pack/plugins/watcher/public/plugin.ts @@ -11,7 +11,7 @@ import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public'; import { LicenseStatus } from '../common/types/license_status'; -import { ILicense, LICENSE_CHECK_STATE } from '../../licensing/public'; +import { ILicense } from '../../licensing/public'; import { TimeBuckets } from './legacy'; import { PLUGIN } from '../common/constants'; import { Dependencies } from './types'; @@ -19,7 +19,7 @@ import { Dependencies } from './types'; const licenseToLicenseStatus = (license: ILicense): LicenseStatus => { const { state, message } = license.check(PLUGIN.ID, PLUGIN.MINIMUM_LICENSE_REQUIRED); return { - valid: state === LICENSE_CHECK_STATE.Valid && license.getFeature(PLUGIN.ID).isAvailable, + valid: state === 'valid' && license.getFeature(PLUGIN.ID).isAvailable, message, }; }; diff --git a/x-pack/plugins/watcher/server/plugin.ts b/x-pack/plugins/watcher/server/plugin.ts index 51d85c2001bd2..6a2e3b2e596b6 100644 --- a/x-pack/plugins/watcher/server/plugin.ts +++ b/x-pack/plugins/watcher/server/plugin.ts @@ -19,7 +19,6 @@ import { } from 'kibana/server'; import { PLUGIN } from '../common/constants'; import { Dependencies, LicenseStatus, RouteDependencies } from './types'; -import { LICENSE_CHECK_STATE } from '../../licensing/server'; import { registerSettingsRoutes } from './routes/api/settings'; import { registerIndicesRoutes } from './routes/api/indices'; @@ -73,7 +72,7 @@ export class WatcherServerPlugin implements Plugin { licensing.license$.subscribe(async license => { const { state, message } = license.check(PLUGIN.ID, PLUGIN.MINIMUM_LICENSE_REQUIRED); - const hasMinimumLicense = state === LICENSE_CHECK_STATE.Valid; + const hasMinimumLicense = state === 'valid'; if (hasMinimumLicense && license.getFeature(PLUGIN.ID)) { this.log.info('Enabling Watcher plugin.'); this.licenseStatus = { From 6a32b457f0627e2293dfbfd04abd8b9464b98b5d Mon Sep 17 00:00:00 2001 From: Shahzad Date: Mon, 6 Apr 2020 12:32:36 +0200 Subject: [PATCH 12/12] =?UTF-8?q?[Uptime]=20Replace=20usage=20of=20date=5F?= =?UTF-8?q?histogram=20with=20aut=5Fdate=5Fhistogr=E2=80=A6=20(#59577)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove usage of manual date_histogram * update * update * remove unused * update fixtures * update snaps * remove duplicate test * type * update test * update fixtures * update interface * updated type Co-authored-by: Elastic Machine --- .../uptime/common/types/ping/histogram.ts | 10 +- .../functional/charts/ping_histogram.tsx | 47 +- .../translations/translations/ja-JP.json | 1 - .../translations/translations/zh-CN.json | 1 - .../get_histogram_interval_formatted.test.ts | 35 - .../get_histogram_interval_formatted.ts | 13 - .../plugins/uptime/server/lib/helper/index.ts | 1 - .../get_monitor_charts.test.ts.snap | 69 +- .../__tests__/get_monitor_charts.test.ts | 55 +- .../lib/requests/get_monitor_duration.ts | 7 +- .../requests/search/enrich_monitor_groups.ts | 10 +- .../graphql/fixtures/monitor_states.json | 742 ++++++------------ .../fixtures/monitor_states_id_filtered.json | 76 +- .../fixtures/monitor_states_page_1.json | 742 ++++++------------ .../fixtures/monitor_states_page_10.json | 742 ++++++------------ .../monitor_states_page_10_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_2.json | 742 ++++++------------ .../monitor_states_page_2_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_3.json | 742 ++++++------------ .../monitor_states_page_3_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_4.json | 742 ++++++------------ .../monitor_states_page_4_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_5.json | 742 ++++++------------ .../monitor_states_page_5_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_6.json | 742 ++++++------------ .../monitor_states_page_6_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_7.json | 742 ++++++------------ .../monitor_states_page_7_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_8.json | 742 ++++++------------ .../monitor_states_page_8_previous.json | 742 ++++++------------ .../fixtures/monitor_states_page_9.json | 742 ++++++------------ .../monitor_states_page_9_previous.json | 742 ++++++------------ .../uptime/graphql/fixtures/snapshot.json | 4 +- .../graphql/fixtures/snapshot_empty.json | 4 +- .../fixtures/snapshot_filtered_by_down.json | 4 +- .../fixtures/snapshot_filtered_by_up.json | 4 +- .../apis/uptime/rest/fixtures/doc_count.json | 6 +- .../uptime/rest/fixtures/monitor_charts.json | 146 +--- .../fixtures/monitor_charts_empty_sets.json | 6 +- .../rest/fixtures/monitor_latest_status.json | 2 +- .../uptime/rest/fixtures/ping_histogram.json | 142 +++- .../fixtures/ping_histogram_by_filter.json | 142 +++- .../rest/fixtures/ping_histogram_by_id.json | 142 +++- .../rest/fixtures/selected_monitor.json | 0 44 files changed, 5106 insertions(+), 10661 deletions(-) delete mode 100644 x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.ts delete mode 100644 x-pack/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts create mode 100644 x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json diff --git a/x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts b/x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts index a4e03a2b762c8..3ae32e15ca55c 100644 --- a/x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts +++ b/x-pack/legacy/plugins/uptime/common/types/ping/histogram.ts @@ -5,15 +5,15 @@ */ export interface HistogramDataPoint { - upCount?: number | null; + upCount?: number; - downCount?: number | null; + downCount?: number; - x?: number | null; + x?: number; - x0?: number | null; + x0?: number; - y?: number | null; + y?: number; } export interface GetPingHistogramParams { 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 17fa8781b828b..f988afc7fc84d 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 @@ -37,6 +37,12 @@ export interface PingHistogramComponentProps { loading?: boolean; } +interface BarPoint { + x?: number; + y?: number; + type: string; +} + export const PingHistogramComponent: React.FC = ({ absoluteStartDate, absoluteEndDate, @@ -65,8 +71,8 @@ export const PingHistogramComponent: React.FC = ({ } else { const { histogram } = data; - const downSpecId = i18n.translate('xpack.uptime.snapshotHistogram.downMonitorsId', { - defaultMessage: 'Down Monitors', + const downSpecId = i18n.translate('xpack.uptime.snapshotHistogram.series.downLabel', { + defaultMessage: 'Down', }); const upMonitorsId = i18n.translate('xpack.uptime.snapshotHistogram.series.upLabel', { @@ -79,6 +85,16 @@ export const PingHistogramComponent: React.FC = ({ dateRangeEnd: moment(max).toISOString(), }); }; + + const barData: BarPoint[] = []; + + histogram.forEach(({ x, upCount, downCount }) => { + barData.push( + { x, y: downCount ?? 0, type: downSpecId }, + { x, y: upCount ?? 0, type: upMonitorsId } + ); + }); + content = ( = ({ /> [x, downCount || 0])} + color={[danger, gray]} + data={barData} id={downSpecId} - name={i18n.translate('xpack.uptime.snapshotHistogram.series.downLabel', { - defaultMessage: 'Down', + name={i18n.translate('xpack.uptime.snapshotHistogram.series.pings', { + defaultMessage: 'Monitor Pings', })} - stackAccessors={[0]} - timeZone="local" - xAccessor={0} - xScaleType="time" - yAccessors={[1]} - yScaleType="linear" - /> - [x, upCount || 0])} - id={upMonitorsId} - name={upMonitorsId} - stackAccessors={[0]} + stackAccessors={['x']} + splitSeriesAccessors={['type']} timeZone="local" - xAccessor={0} + xAccessor="x" xScaleType="time" - yAccessors={[1]} + yAccessors={['y']} yScaleType="linear" /> diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 96af5df454b98..d9c47ddb1af99 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -12589,7 +12589,6 @@ "xpack.uptime.snapshot.noDataTitle": "ヒストグラムデータがありません", "xpack.uptime.snapshot.pingsOverTimeTitle": "一定時間のピング", "xpack.uptime.snapshotHistogram.description": "{startTime} から {endTime} までの期間のアップタイムステータスを表示する棒グラフです。", - "xpack.uptime.snapshotHistogram.downMonitorsId": "ダウンモニター", "xpack.uptime.snapshotHistogram.series.downLabel": "ダウン", "xpack.uptime.snapshotHistogram.series.upLabel": "アップ", "xpack.uptime.snapshotHistogram.xAxisId": "スナップショットX軸", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 0a70c78d46664..0901cc7fab59a 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -12589,7 +12589,6 @@ "xpack.uptime.snapshot.noDataTitle": "没有可用的直方图数据", "xpack.uptime.snapshot.pingsOverTimeTitle": "时移 Ping 数", "xpack.uptime.snapshotHistogram.description": "显示从 {startTime} 到 {endTime} 的运行时间时移状态的条形图。", - "xpack.uptime.snapshotHistogram.downMonitorsId": "已关闭监测", "xpack.uptime.snapshotHistogram.series.downLabel": "关闭", "xpack.uptime.snapshotHistogram.series.upLabel": "运行", "xpack.uptime.snapshotHistogram.xAxisId": "快照 X 轴", diff --git a/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.ts b/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.ts deleted file mode 100644 index e67a93f24b3ca..0000000000000 --- a/x-pack/plugins/uptime/server/lib/helper/__test__/get_histogram_interval_formatted.test.ts +++ /dev/null @@ -1,35 +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 { getHistogramIntervalFormatted } from '../get_histogram_interval_formatted'; - -describe('getHistogramIntervalFormatted', () => { - it('specifies the interval necessary to divide a given timespan into equal buckets, rounded to the nearest integer, expressed in ms', () => { - const intervalFormatted = getHistogramIntervalFormatted('now-15m', 'now', 10); - /** - * Expected result is 90000. - * These assertions were verbatim comparisons but that introduced - * some flakiness at the ms resolution, sometimes values like "9001ms" - * are returned. - */ - expect(intervalFormatted.startsWith('9000')).toBeTruthy(); - expect(intervalFormatted.endsWith('ms')).toBeTruthy(); - expect(intervalFormatted).toHaveLength(7); - }); - - it('will supply a default constant value for bucketCount when none is provided', () => { - const intervalFormatted = getHistogramIntervalFormatted('now-15m', 'now'); - /** - * Expected result is 36000. - * These assertions were verbatim comparisons but that introduced - * some flakiness at the ms resolution, sometimes values like "9001ms" - * are returned. - */ - expect(intervalFormatted.startsWith('3600')).toBeTruthy(); - expect(intervalFormatted.endsWith('ms')).toBeTruthy(); - expect(intervalFormatted).toHaveLength(7); - }); -}); diff --git a/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts b/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts deleted file mode 100644 index 29af862611ca4..0000000000000 --- a/x-pack/plugins/uptime/server/lib/helper/get_histogram_interval_formatted.ts +++ /dev/null @@ -1,13 +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 { getHistogramInterval } from './get_histogram_interval'; - -export const getHistogramIntervalFormatted = ( - dateRangeStart: string, - dateRangeEnd: string, - bucketCount?: number -): string => `${getHistogramInterval(dateRangeStart, dateRangeEnd, bucketCount)}ms`; diff --git a/x-pack/plugins/uptime/server/lib/helper/index.ts b/x-pack/plugins/uptime/server/lib/helper/index.ts index 1607c36f1d1b7..02e5d065c9813 100644 --- a/x-pack/plugins/uptime/server/lib/helper/index.ts +++ b/x-pack/plugins/uptime/server/lib/helper/index.ts @@ -6,6 +6,5 @@ export { getFilterClause } from './get_filter_clause'; export { parseRelativeDate } from './get_histogram_interval'; -export { getHistogramIntervalFormatted } from './get_histogram_interval_formatted'; export { assertCloseTo } from './assert_close_to'; export { objectValuesToArrays } from './object_to_array'; diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap b/x-pack/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap index 5acf6ef40a1e3..7b717949c70c5 100644 --- a/x-pack/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap +++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/__snapshots__/get_monitor_charts.test.ts.snap @@ -29,77 +29,12 @@ Array [ }, }, }, - "date_histogram": Object { + "auto_date_histogram": Object { + "buckets": 25, "field": "@timestamp", - "fixed_interval": "36000ms", - "min_doc_count": 0, - }, - }, - }, - "query": Object { - "bool": Object { - "filter": Array [ - Object { - "range": Object { - "@timestamp": Object { - "gte": "now-15m", - "lte": "now", - }, - }, - }, - Object { - "term": Object { - "monitor.id": "fooID", - }, - }, - Object { - "term": Object { - "monitor.status": "up", - }, - }, - ], - }, - }, - "size": 0, - }, - "index": "heartbeat-8*", - }, -] -`; - -exports[`ElasticsearchMonitorsAdapter getMonitorChartsData will run expected parameters when no location is specified 1`] = ` -Array [ - "search", - Object { - "body": Object { - "aggs": Object { - "timeseries": Object { - "aggs": Object { - "location": Object { - "aggs": Object { - "duration": Object { - "stats": Object { - "field": "monitor.duration.us", - }, - }, - "status": Object { - "terms": Object { - "field": "monitor.status", - "shard_size": 2, - "size": 2, - }, - }, - }, - "terms": Object { - "field": "observer.geo.name", - "missing": "N/A", - }, - }, }, "date_histogram": Object { - "field": "@timestamp", "fixed_interval": "36000ms", - "min_doc_count": 0, }, }, }, diff --git a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts index e54a17f934bcc..c740581734fdd 100644 --- a/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts +++ b/x-pack/plugins/uptime/server/lib/requests/__tests__/get_monitor_charts.test.ts @@ -4,51 +4,14 @@ * you may not use this file except in compliance with the Elastic License. */ -import { get, set } from 'lodash'; +import { set } from 'lodash'; import mockChartsData from './monitor_charts_mock.json'; -import { assertCloseTo } from '../../helper'; import { getMonitorDurationChart } from '../get_monitor_duration'; import { defaultDynamicSettings } from '../../../../../../legacy/plugins/uptime/common/runtime_types'; describe('ElasticsearchMonitorsAdapter', () => { - it('getMonitorChartsData will run expected parameters when no location is specified', async () => { - expect.assertions(3); - const searchMock = jest.fn(); - const search = searchMock.bind({}); - await getMonitorDurationChart({ - callES: search, - dynamicSettings: defaultDynamicSettings, - monitorId: 'fooID', - dateStart: 'now-15m', - dateEnd: 'now', - }); - expect(searchMock).toHaveBeenCalledTimes(1); - // protect against possible rounding errors polluting the snapshot comparison - const fixedInterval = parseInt( - get( - searchMock.mock.calls[0][1], - 'body.aggs.timeseries.date_histogram.fixed_interval', - '' - ).split('ms')[0], - 10 - ); - expect(fixedInterval).not.toBeNaN(); - - /** - * The value based on the input should be ~36000 - */ - assertCloseTo(fixedInterval, 36000, 100); - - set( - searchMock.mock.calls[0][1], - 'body.aggs.timeseries.date_histogram.fixed_interval', - '36000ms' - ); - expect(searchMock.mock.calls[0]).toMatchSnapshot(); - }); - it('getMonitorChartsData will provide expected filters', async () => { - expect.assertions(3); + expect.assertions(2); const searchMock = jest.fn(); const search = searchMock.bind({}); await getMonitorDurationChart({ @@ -60,20 +23,6 @@ describe('ElasticsearchMonitorsAdapter', () => { }); expect(searchMock).toHaveBeenCalledTimes(1); // protect against possible rounding errors polluting the snapshot comparison - const fixedInterval = parseInt( - get( - searchMock.mock.calls[0][1], - 'body.aggs.timeseries.date_histogram.fixed_interval', - '' - ).split('ms')[0], - 10 - ); - expect(fixedInterval).not.toBeNaN(); - - /** - * The value based on the input should be ~36000 - */ - assertCloseTo(fixedInterval, 36000, 100); set( searchMock.mock.calls[0][1], diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts index 40156132aafcf..01bfc52489bf3 100644 --- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts +++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts @@ -5,7 +5,7 @@ */ import { UMElasticsearchQueryFn } from '../adapters'; -import { getHistogramIntervalFormatted } from '../helper'; +import { QUERY } from '../../../../../legacy/plugins/uptime/common/constants'; import { LocationDurationLine, MonitorDurationResult, @@ -62,10 +62,9 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn< size: 0, aggs: { timeseries: { - date_histogram: { + auto_date_histogram: { field: '@timestamp', - fixed_interval: getHistogramIntervalFormatted(dateStart, dateEnd), - min_doc_count: 0, + buckets: QUERY.DEFAULT_BUCKET_COUNT, }, aggs: { location: { diff --git a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts index bcb106eef0ba6..1798550875276 100644 --- a/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts +++ b/x-pack/plugins/uptime/server/lib/requests/search/enrich_monitor_groups.ts @@ -6,8 +6,7 @@ import { get, sortBy } from 'lodash'; import { QueryContext } from './query_context'; -import { getHistogramIntervalFormatted } from '../../helper'; -import { STATES } from '../../../../../../legacy/plugins/uptime/common/constants'; +import { QUERY, STATES } from '../../../../../../legacy/plugins/uptime/common/constants'; import { MonitorSummary, SummaryHistogram, @@ -322,12 +321,9 @@ const getHistogramForMonitors = async ( }, aggs: { histogram: { - date_histogram: { + auto_date_histogram: { field: '@timestamp', - fixed_interval: getHistogramIntervalFormatted( - queryContext.dateRangeStart, - queryContext.dateRangeEnd - ), + buckets: QUERY.DEFAULT_BUCKET_COUNT, missing: 0, }, aggs: { diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json index 05724f0716e8d..a748225dda7cf 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json index 6e62787069f40..44644be5a0724 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_id_filtered.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -194,4 +166,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json index 05724f0716e8d..a748225dda7cf 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_1.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json index 6cbe4ee3659a8..fbd0776fade62 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json index 9a3f781735cb7..e630e227f473b 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_10_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json index 4f4af9c2c6012..26b4b1a195567 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json index fe48ad49d13ba..0b93e66f50246 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_2_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json index 70ca665704a79..7b47742f8859a 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json index 3f09c951ec2fa..0d5a76059d004 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_3_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json index cdc0f32c9765e..4caff800ac96e 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json index 9f6d004380c16..02bd149b50247 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_4_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json index dedddb2a78ade..11e880f1ec329 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json index fabcf70404952..26cfa7c7162e8 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_5_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json index 943cc68249dc1..8f4b5d4c52e71 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json index 564f58f59f373..50f8f61b13d68 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_6_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json index cb94273e91fd8..18ab2c6fdf336 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json index 7aac62bba84f7..825d6365e3a9d 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_7_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json index 08cbd0d878b44..abb9bcdd804ed 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json index 8de639b705ee9..46a5f195e6a82 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_8_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json index c38f5c801a267..035baf0ab5b5e 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json index 5c2ec8512e320..a6d274056eec6 100644 --- a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json +++ b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/monitor_states_page_9_previous.json @@ -10,132 +10,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 0, "down": 1 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 0, "down": 1 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 0, "down": 1 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 0, "down": 1 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 0, "down": 1 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 0, "down": 1 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 0, "down": 1 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 0, "down": 1 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 0, "down": 1 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 0, "down": 1 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 0, "down": 1 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 0, "down": 1 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 0, "down": 1 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 0, "down": 1 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 0, "down": 1 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 0, "down": 1 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 0, "down": 1 } @@ -170,7 +140,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -198,132 +170,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -358,7 +300,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -386,132 +330,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -546,7 +460,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -574,132 +490,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -734,7 +620,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -762,132 +650,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -922,7 +780,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -950,132 +810,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 0, "down": 1 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 0, "down": 1 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 0, "down": 1 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1110,7 +940,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1138,132 +970,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1298,7 +1100,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1326,132 +1130,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1486,7 +1260,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1514,132 +1290,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1674,7 +1420,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1702,132 +1450,102 @@ "count": 20, "points": [ { - "timestamp": 1568172657286, + "timestamp": 1568172664000, "up": 1, "down": 0 }, { - "timestamp": 1568172680087, + "timestamp": 1568172694000, "up": 1, "down": 0 }, { - "timestamp": 1568172702888, + "timestamp": 1568172724000, "up": 1, "down": 0 }, { - "timestamp": 1568172725689, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172748490, + "timestamp": 1568172754000, "up": 1, "down": 0 }, { - "timestamp": 1568172771291, + "timestamp": 1568172784000, "up": 1, "down": 0 }, { - "timestamp": 1568172794092, + "timestamp": 1568172814000, "up": 1, "down": 0 }, { - "timestamp": 1568172816893, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172839694, + "timestamp": 1568172844000, "up": 1, "down": 0 }, { - "timestamp": 1568172862495, + "timestamp": 1568172874000, "up": 1, "down": 0 }, { - "timestamp": 1568172885296, + "timestamp": 1568172904000, "up": 1, "down": 0 }, { - "timestamp": 1568172908097, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568172930898, + "timestamp": 1568172934000, "up": 1, "down": 0 }, { - "timestamp": 1568172953699, + "timestamp": 1568172964000, "up": 1, "down": 0 }, { - "timestamp": 1568172976500, + "timestamp": 1568172994000, "up": 1, "down": 0 }, { - "timestamp": 1568172999301, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173022102, + "timestamp": 1568173024000, "up": 1, "down": 0 }, { - "timestamp": 1568173044903, + "timestamp": 1568173054000, "up": 1, "down": 0 }, { - "timestamp": 1568173067704, + "timestamp": 1568173084000, "up": 1, "down": 0 }, { - "timestamp": 1568173090505, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173113306, + "timestamp": 1568173114000, "up": 1, "down": 0 }, { - "timestamp": 1568173136107, + "timestamp": 1568173144000, "up": 1, "down": 0 }, { - "timestamp": 1568173158908, + "timestamp": 1568173174000, "up": 1, "down": 0 }, { - "timestamp": 1568173181709, + "timestamp": 1568173204000, "up": 1, "down": 0 }, { - "timestamp": 1568173204510, - "up": 0, - "down": 0 - }, - { - "timestamp": 1568173227311, + "timestamp": 1568173234000, "up": 1, "down": 0 } @@ -1862,7 +1580,9 @@ "geo": null, "observer": { "geo": { - "name": ["mpls"], + "name": [ + "mpls" + ], "location": null } }, @@ -1886,4 +1606,4 @@ } ] } -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json b/x-pack/test/api_integration/apis/uptime/graphql/fixtures/snapshot.json index 12d8f514a3a30..87042f2acb677 100644 --- 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,5 +1,5 @@ { + "total": 17, "up": 10, - "down": 7, - "total": 17 + "down": 7 } \ No newline at end of file diff --git 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 index c1e7f0ba247fb..6816dd3c15428 100644 --- 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,5 +1,5 @@ { + "total": 0, "up": 0, - "down": 0, - "total": 0 + "down": 0 } \ No newline at end of file diff --git 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 index 94777570dd6f0..27ba69411f88d 100644 --- 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,5 @@ { + "total": 7, "up": 0, - "down": 7, - "total": 7 + "down": 7 } \ No newline at end of file diff --git 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 index 42a1581707360..33e60a4340a13 100644 --- 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,5 @@ { + "total": 10, "up": 10, - "down": 0, - "total": 10 + "down": 0 } \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json index 41b9af392dded..69d768b1126df 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/doc_count.json @@ -1,4 +1,4 @@ { - "docCount": 2000, - "indexExists": true -} + "indexExists": true, + "docCount": 2000 +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts.json index 1aa0788a6da05..8edcff158b0ae 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts.json @@ -4,107 +4,83 @@ "name": "mpls", "line": [ { - "x": 1568172657286, + "x": 1568172664000, "y": 16274 }, { - "x": 1568172680087, + "x": 1568172694000, "y": 16713 }, { - "x": 1568172702888, + "x": 1568172724000, "y": 34756 }, { - "x": 1568172725689, - "y": null - }, - { - "x": 1568172748490, + "x": 1568172754000, "y": 22205 }, { - "x": 1568172771291, + "x": 1568172784000, "y": 6071 }, { - "x": 1568172794092, + "x": 1568172814000, "y": 15681 }, { - "x": 1568172816893, - "y": null - }, - { - "x": 1568172839694, + "x": 1568172844000, "y": 1669 }, { - "x": 1568172862495, + "x": 1568172874000, "y": 956 }, { - "x": 1568172885296, + "x": 1568172904000, "y": 1435 }, { - "x": 1568172908097, - "y": null - }, - { - "x": 1568172930898, + "x": 1568172934000, "y": 32906 }, { - "x": 1568172953699, + "x": 1568172964000, "y": 892 }, { - "x": 1568172976500, + "x": 1568172994000, "y": 1514 }, { - "x": 1568172999301, - "y": null - }, - { - "x": 1568173022102, + "x": 1568173024000, "y": 2367 }, { - "x": 1568173044903, + "x": 1568173054000, "y": 3389 }, { - "x": 1568173067704, + "x": 1568173084000, "y": 362 }, { - "x": 1568173090505, - "y": null - }, - { - "x": 1568173113306, + "x": 1568173114000, "y": 3066 }, { - "x": 1568173136107, + "x": 1568173144000, "y": 44513 }, { - "x": 1568173158908, + "x": 1568173174000, "y": 6417 }, { - "x": 1568173181709, + "x": 1568173204000, "y": 1416 }, { - "x": 1568173204510, - "y": null - }, - { - "x": 1568173227311, + "x": 1568173234000, "y": 24627 } ] @@ -112,162 +88,126 @@ ], "status": [ { - "x": 1568172657286, + "x": 1568172664000, "up": null, "down": null, "total": 1 }, { - "x": 1568172680087, + "x": 1568172694000, "up": null, "down": null, "total": 1 }, { - "x": 1568172702888, + "x": 1568172724000, "up": null, "down": null, "total": 1 }, { - "x": 1568172725689, - "up": null, - "down": null, - "total": 0 - }, - { - "x": 1568172748490, + "x": 1568172754000, "up": null, "down": null, "total": 1 }, { - "x": 1568172771291, + "x": 1568172784000, "up": null, "down": null, "total": 1 }, { - "x": 1568172794092, + "x": 1568172814000, "up": null, "down": null, "total": 1 }, { - "x": 1568172816893, - "up": null, - "down": null, - "total": 0 - }, - { - "x": 1568172839694, + "x": 1568172844000, "up": null, "down": null, "total": 1 }, { - "x": 1568172862495, + "x": 1568172874000, "up": null, "down": null, "total": 1 }, { - "x": 1568172885296, + "x": 1568172904000, "up": null, "down": null, "total": 1 }, { - "x": 1568172908097, - "up": null, - "down": null, - "total": 0 - }, - { - "x": 1568172930898, + "x": 1568172934000, "up": null, "down": null, "total": 1 }, { - "x": 1568172953699, + "x": 1568172964000, "up": null, "down": null, "total": 1 }, { - "x": 1568172976500, + "x": 1568172994000, "up": null, "down": null, "total": 1 }, { - "x": 1568172999301, - "up": null, - "down": null, - "total": 0 - }, - { - "x": 1568173022102, + "x": 1568173024000, "up": null, "down": null, "total": 1 }, { - "x": 1568173044903, + "x": 1568173054000, "up": null, "down": null, "total": 1 }, { - "x": 1568173067704, + "x": 1568173084000, "up": null, "down": null, "total": 1 }, { - "x": 1568173090505, - "up": null, - "down": null, - "total": 0 - }, - { - "x": 1568173113306, + "x": 1568173114000, "up": null, "down": null, "total": 1 }, { - "x": 1568173136107, + "x": 1568173144000, "up": null, "down": null, "total": 1 }, { - "x": 1568173158908, + "x": 1568173174000, "up": null, "down": null, "total": 1 }, { - "x": 1568173181709, + "x": 1568173204000, "up": null, "down": null, "total": 1 }, { - "x": 1568173204510, - "up": null, - "down": null, - "total": 0 - }, - { - "x": 1568173227311, + "x": 1568173234000, "up": null, "down": null, "total": 1 } ], - "statusMaxCount": 0, - "durationMaxValue": 0 -} + "durationMaxValue": 0, + "statusMaxCount": 0 +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts_empty_sets.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts_empty_sets.json index e7245a479a962..674338101bc5b 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts_empty_sets.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/monitor_charts_empty_sets.json @@ -1,6 +1,6 @@ { "locationDurationLines": [], "status": [], - "statusMaxCount": 0, - "durationMaxValue": 0 -} + "durationMaxValue": 0, + "statusMaxCount": 0 +} \ No newline at end of file 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 5d41cdf611824..2e5854f4d9866 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 @@ -26,4 +26,4 @@ "query": "r=200x1", "full": "http://localhost:5678/pattern?r=200x1" } -} \ No newline at end of file +} diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram.json index 972d1fd51760c..562ba64c24b0b 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram.json @@ -1,24 +1,124 @@ { "histogram": [ - { "x": 1568172664000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172694000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172724000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172754000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172784000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172814000, "downCount": 8, "upCount": 92, "y": 1 }, - { "x": 1568172844000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172874000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172904000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172934000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172964000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568172994000, "downCount": 8, "upCount": 92, "y": 1 }, - { "x": 1568173024000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568173054000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568173084000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568173114000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568173144000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568173174000, "downCount": 8, "upCount": 92, "y": 1 }, - { "x": 1568173204000, "downCount": 7, "upCount": 93, "y": 1 }, - { "x": 1568173234000, "downCount": 7, "upCount": 93, "y": 1 } + { + "x": 1568172664000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172694000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172724000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172754000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172784000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172814000, + "downCount": 8, + "upCount": 92, + "y": 1 + }, + { + "x": 1568172844000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172874000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172904000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172934000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172964000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172994000, + "downCount": 8, + "upCount": 92, + "y": 1 + }, + { + "x": 1568173024000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173054000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173084000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173114000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173144000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173174000, + "downCount": 8, + "upCount": 92, + "y": 1 + }, + { + "x": 1568173204000, + "downCount": 7, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173234000, + "downCount": 7, + "upCount": 93, + "y": 1 + } ] -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_filter.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_filter.json index 72b2d5276e025..42be715c4acd4 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_filter.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_filter.json @@ -1,24 +1,124 @@ { "histogram": [ - { "x": 1568172664000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172694000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172724000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172754000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172784000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172814000, "downCount": 0, "upCount": 92, "y": 1 }, - { "x": 1568172844000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172874000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172904000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172934000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172964000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568172994000, "downCount": 0, "upCount": 92, "y": 1 }, - { "x": 1568173024000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568173054000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568173084000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568173114000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568173144000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568173174000, "downCount": 0, "upCount": 92, "y": 1 }, - { "x": 1568173204000, "downCount": 0, "upCount": 93, "y": 1 }, - { "x": 1568173234000, "downCount": 0, "upCount": 93, "y": 1 } + { + "x": 1568172664000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172694000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172724000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172754000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172784000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172814000, + "downCount": 0, + "upCount": 92, + "y": 1 + }, + { + "x": 1568172844000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172874000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172904000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172934000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172964000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568172994000, + "downCount": 0, + "upCount": 92, + "y": 1 + }, + { + "x": 1568173024000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173054000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173084000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173114000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173144000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173174000, + "downCount": 0, + "upCount": 92, + "y": 1 + }, + { + "x": 1568173204000, + "downCount": 0, + "upCount": 93, + "y": 1 + }, + { + "x": 1568173234000, + "downCount": 0, + "upCount": 93, + "y": 1 + } ] -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_id.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_id.json index 8e184b247ab52..9a726db616325 100644 --- a/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_id.json +++ b/x-pack/test/api_integration/apis/uptime/rest/fixtures/ping_histogram_by_id.json @@ -1,24 +1,124 @@ { "histogram": [ - { "x": 1568172664000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172694000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172724000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172754000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172784000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172814000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172844000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172874000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172904000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172934000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172964000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568172994000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173024000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173054000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173084000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173114000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173144000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173174000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173204000, "downCount": 0, "upCount": 1, "y": 1 }, - { "x": 1568173234000, "downCount": 0, "upCount": 1, "y": 1 } + { + "x": 1568172664000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172694000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172724000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172754000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172784000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172814000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172844000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172874000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172904000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172934000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172964000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568172994000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173024000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173054000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173084000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173114000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173144000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173174000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173204000, + "downCount": 0, + "upCount": 1, + "y": 1 + }, + { + "x": 1568173234000, + "downCount": 0, + "upCount": 1, + "y": 1 + } ] -} +} \ No newline at end of file diff --git a/x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json b/x-pack/test/api_integration/apis/uptime/rest/fixtures/selected_monitor.json new file mode 100644 index 0000000000000..e69de29bb2d1d