From 7375f09472bcea4d53660d4b4e41ca3d44e2a7ad Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 10 Jan 2019 13:41:28 -0600 Subject: [PATCH 01/10] checkpoint --- .../components/queries/monitor_list/get_monitor_list.ts | 5 ++++- .../components/queries/monitor_list/monitor_list.tsx | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts b/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts index ed93ef8ef45a..ccad41b7323a 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts @@ -25,9 +25,12 @@ export const getMonitorListQuery = gql` ping { timestamp monitor { + id status type - host + url { + full + } ip duration { us diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx index 03385239e7f4..c78f04e83c80 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx @@ -51,13 +51,13 @@ const monitorListColumns = [ sortable: true, }, { - field: 'ping.monitor.host', - name: 'Host', + field: 'ping.monitor.id', + name: 'ID', render: (host: string, monitor: any) => {host}, }, { - field: 'key.port', - name: 'Port', + field: 'ping.url.full', + name: 'URL', sortable: true, }, { @@ -65,7 +65,6 @@ const monitorListColumns = [ name: 'Type', sortable: true, }, - { field: 'ping.monitor.ip', name: 'IP', sortable: true }, { field: 'upSeries', name: 'Monitor History', From 676bed6e42f9617f81da895f899b99ac9f3f0338 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 10 Jan 2019 17:26:07 -0600 Subject: [PATCH 02/10] [Uptime] Adapt UI to 7.x Heartbeat Field Changes In Heartbeat 7.0 there are a number of field changes that have been made to support ECS and refine the schema in other ways. This PR seeks to accomodate those changes, the most significant of which is the switch to extensive use of the ECS `url` namespace. One part of that is removing the Host dropdown filter rather than updating it. This control has always been effectively broken due to its inability to scale to a large number of hosts. Updating it makes no sense when it should be removed. --- .../uptime/common/graphql/introspection.json | 27 +++++++++++++++++++ x-pack/plugins/uptime/common/graphql/types.ts | 6 +++++ .../queries/filter_bar/filter_bar.tsx | 12 --------- .../queries/monitor_list/get_monitor_list.ts | 7 +++-- .../queries/monitor_list/monitor_list.tsx | 13 ++++----- .../uptime/server/graphql/pings/schema.gql.ts | 10 +++++++ .../elasticsearch_monitors_adapter.ts | 4 +-- 7 files changed, 55 insertions(+), 24 deletions(-) diff --git a/x-pack/plugins/uptime/common/graphql/introspection.json b/x-pack/plugins/uptime/common/graphql/introspection.json index 0a0e3fa3b848..d5617178aef0 100644 --- a/x-pack/plugins/uptime/common/graphql/introspection.json +++ b/x-pack/plugins/uptime/common/graphql/introspection.json @@ -470,6 +470,14 @@ "type": { "kind": "OBJECT", "name": "TLS", "ofType": null }, "isDeprecated": false, "deprecationReason": null + }, + { + "name": "url", + "description": "", + "args": [], + "type": { "kind": "OBJECT", "name": "URL", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null } ], "inputFields": null, @@ -1287,6 +1295,25 @@ "enumValues": null, "possibleTypes": null }, + { + "kind": "OBJECT", + "name": "URL", + "description": "", + "fields": [ + { + "name": "full", + "description": "", + "args": [], + "type": { "kind": "SCALAR", "name": "String", "ofType": null }, + "isDeprecated": false, + "deprecationReason": null + } + ], + "inputFields": null, + "interfaces": [], + "enumValues": null, + "possibleTypes": null + }, { "kind": "OBJECT", "name": "DocCount", diff --git a/x-pack/plugins/uptime/common/graphql/types.ts b/x-pack/plugins/uptime/common/graphql/types.ts index 575846395a9d..c3f8710786b9 100644 --- a/x-pack/plugins/uptime/common/graphql/types.ts +++ b/x-pack/plugins/uptime/common/graphql/types.ts @@ -64,6 +64,8 @@ export interface Ping { tcp?: Tcp | null; tls?: Tls | null; + + url?: Url | null; } /** An agent for recording a beat */ export interface Beat { @@ -252,6 +254,10 @@ export interface Tls { rtt?: Rtt | null; } +export interface Url { + full?: string | null; +} + export interface DocCount { count: UnsignedInteger; } diff --git a/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx b/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx index fe8c93abb885..a46199471e05 100644 --- a/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx +++ b/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx @@ -53,18 +53,6 @@ export const FilterBar = ({ dateRangeEnd, dateRangeStart, updateQuery }: FilterB }, ], }, - // TODO: add health to this select - { - type: 'field_value_selection', - field: 'monitor.id', - name: 'Host', - multiSelect: false, - options: take(id, MAX_SELECTION_LENGTH).map((idValue: any) => ({ - value: idValue, - view: idValue, - })), - searchThreshold: SEARCH_THRESHOLD, - }, { type: 'field_value_selection', field: 'tcp.port', diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts b/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts index ccad41b7323a..41462fe7fb44 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/get_monitor_list.ts @@ -27,15 +27,14 @@ export const getMonitorListQuery = gql` monitor { id status - type - url { - full - } ip duration { us } } + url { + full + } } upSeries { x diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx index c78f04e83c80..13c4120d6bc7 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx @@ -10,6 +10,7 @@ import { EuiInMemoryTable, // @ts-ignore missing type definition EuiLineSeries, + EuiLink, EuiPanel, // @ts-ignore missing type definition EuiSeriesChart, @@ -53,17 +54,17 @@ const monitorListColumns = [ { field: 'ping.monitor.id', name: 'ID', - render: (host: string, monitor: any) => {host}, + render: (id: string, monitor: any) => {id}, }, { field: 'ping.url.full', name: 'URL', sortable: true, - }, - { - field: 'ping.monitor.type', - name: 'Type', - sortable: true, + render: (url: string) => ( + + {url} + + ), }, { field: 'upSeries', diff --git a/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts b/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts index 6475e832511b..07c0e2307c65 100644 --- a/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts +++ b/x-pack/plugins/uptime/server/graphql/pings/schema.gql.ts @@ -175,6 +175,15 @@ export const pingsSchema = gql` rtt: RTT } + type URL { + full: String + scheme: String + domain: String + port: Int + path: String + query: String + } + "A request sent from a monitor to a host" type Ping { "The timestamp of the ping's creation" @@ -194,5 +203,6 @@ export const pingsSchema = gql` tags: String tcp: TCP tls: TLS + url: URL } `; diff --git a/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts index 99b8f88f0f0f..b5d988d2c188 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/monitors/elasticsearch_monitors_adapter.ts @@ -152,7 +152,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter { body: { query: getFilteredQuery(dateRangeStart, dateRangeEnd, filters), aggs: { - hosts: { + urls: { composite: { sources: [ { @@ -165,7 +165,7 @@ export class ElasticsearchMonitorsAdapter implements UMMonitorsAdapter { { port: { terms: { - field: 'tcp.port', + field: 'url.full', }, }, }, From e40fc8fd9e5ec6d11486dc1a222e3158d23f2a64 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 10 Jan 2019 17:59:28 -0600 Subject: [PATCH 03/10] More field changes --- .../components/queries/monitor_list/monitor_list.tsx | 5 +++++ .../queries/monitor_status_bar/get_monitor_status_bar.ts | 5 ++--- .../queries/monitor_status_bar/monitor_status_bar.tsx | 7 +++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx index 13c4120d6bc7..173c13e1fe34 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx @@ -66,6 +66,11 @@ const monitorListColumns = [ ), }, + { + field: 'ping.monitor.ip', + name: 'IP', + sortable: true, + }, { field: 'upSeries', name: 'Monitor History', diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/get_monitor_status_bar.ts b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/get_monitor_status_bar.ts index 12fd1a09985d..0eca6693ac84 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/get_monitor_status_bar.ts +++ b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/get_monitor_status_bar.ts @@ -25,10 +25,9 @@ export const createGetMonitorStatusBarQuery = gql` duration { us } - scheme } - tcp { - port + url { + full } } } diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx index 7c582541b2a0..c21d3d802f03 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx @@ -41,7 +41,7 @@ export const MonitorStatusBar = ({ if (!monitorStatus.length) { return `No data found for monitor id ${monitorId}`; } - const { monitor, tcp } = monitorStatus[0]; + const { monitor, tcp, url } = monitorStatus[0]; return ( @@ -62,13 +62,12 @@ export const MonitorStatusBar = ({ Last update: {moment(monitor.timestamp).fromNow()} - Host: {monitor.host} - Port: {tcp.port} + URL: {url.full} + IP: {monitor.ip} Duration: {monitor.duration.us / 1000} ms - Scheme: {monitor.scheme} ); From 70730d4607eeac2cbbd0b5c3a3a107e0d9f5f604 Mon Sep 17 00:00:00 2001 From: Justin Kambic Date: Tue, 15 Jan 2019 17:33:08 -0500 Subject: [PATCH 04/10] Prefer count over search for counting docs in HB index. --- .../lib/adapters/database/adapter_types.ts | 1 + .../database/kibana_database_adapter.ts | 4 ++++ .../pings/elasticsearch_pings_adapter.ts | 17 +++++------------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/x-pack/plugins/uptime/server/lib/adapters/database/adapter_types.ts b/x-pack/plugins/uptime/server/lib/adapters/database/adapter_types.ts index 21310d4afbd3..58f4ffdd52b5 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/database/adapter_types.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/database/adapter_types.ts @@ -5,5 +5,6 @@ */ export interface DatabaseAdapter { + count(request: any, params: any): Promise; search(request: any, params: any): Promise; } diff --git a/x-pack/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts index 41d20c852c23..717fb5209025 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/database/kibana_database_adapter.ts @@ -21,4 +21,8 @@ export class UMKibanaDatabaseAdapter implements DatabaseAdapter { public async search(request: any, params: any): Promise { return this.elasticsearch.callWithRequest(request, 'search', params); } + + public async count(request: any, params: any): Promise { + return this.elasticsearch.callWithRequest(request, 'count', params); + } } diff --git a/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts index af2f3d1249bd..698b36f89d78 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts @@ -233,18 +233,11 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter { } public async getDocCount(request: any): Promise { - const params = { + const { count } = await this.database.count(request, { index: INDEX_NAMES.HEARTBEAT, - body: { - query: { - match_all: {}, - }, - size: 1, - }, - }; - const result = await this.database.search(request, params); - return { - count: get(result, 'hits.total.value', 0), - }; + body: {}, + }); + + return { count }; } } From bdb1030849d1a7cd071857d2ceaac6adcde35a7d Mon Sep 17 00:00:00 2001 From: Justin Kambic Date: Tue, 15 Jan 2019 17:48:03 -0500 Subject: [PATCH 05/10] Write test for updated adapter function. --- .../elasticsearch_pings_adapter.test.ts | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts b/x-pack/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts index 90a04b814c09..64f9ae42f06b 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/pings/__tests__/elasticsearch_pings_adapter.test.ts @@ -13,7 +13,8 @@ describe('ElasticsearchPingsAdapter class', () => { let adapter: ElasticsearchPingsAdapter; let serverRequest: any; let mockHits: any[]; - let mockEsResult: any; + let mockEsSearchResult: any; + let mockEsCountResult: any; beforeEach(() => { mockHits = [ @@ -33,7 +34,7 @@ describe('ElasticsearchPingsAdapter class', () => { }, }, ]; - mockEsResult = { + mockEsSearchResult = { hits: { total: { value: mockHits.length, @@ -41,8 +42,12 @@ describe('ElasticsearchPingsAdapter class', () => { hits: mockHits, }, }; + mockEsCountResult = { + count: mockHits.length, + }; database = { - search: async (request: any, params: any) => mockEsResult, + search: async (request: any, params: any) => mockEsSearchResult, + count: async (request: any, params: any) => mockEsCountResult, }; adapter = new ElasticsearchPingsAdapter(database); serverRequest = { @@ -50,11 +55,18 @@ describe('ElasticsearchPingsAdapter class', () => { }; }); + describe('getDocCount', () => { + it('returns data in appropriate shape', async () => { + const { count } = await adapter.getDocCount(serverRequest); + expect(count).toEqual(3); + }); + }); + describe('getAll', () => { let getAllSearchMock: (request: any, params: any) => Promise; let expectedGetAllParams: any; beforeEach(() => { - getAllSearchMock = jest.fn(async (request: any, params: any) => mockEsResult); + getAllSearchMock = jest.fn(async (request: any, params: any) => mockEsSearchResult); expectedGetAllParams = { index: 'heartbeat*', body: { @@ -130,7 +142,7 @@ describe('ElasticsearchPingsAdapter class', () => { let getLatestSearchMock: (request: any, params: any) => Promise; let expectedGetLatestSearchParams: any; beforeEach(() => { - getLatestSearchMock = jest.fn(async (request: any, params: any) => mockEsResult); + getLatestSearchMock = jest.fn(async (request: any, params: any) => mockEsSearchResult); expectedGetLatestSearchParams = { index: 'heartbeat*', body: { @@ -169,7 +181,7 @@ describe('ElasticsearchPingsAdapter class', () => { }, }, }; - mockEsResult = { + mockEsSearchResult = { aggregations: { by_id: { buckets: [ From 66ab7be8cbc4d4fa8e54a6be5aea39d037dccdb8 Mon Sep 17 00:00:00 2001 From: Justin Kambic Date: Wed, 16 Jan 2019 09:32:55 -0500 Subject: [PATCH 06/10] Remove unused body from request to avoid breaking ES change. --- .../server/lib/adapters/pings/elasticsearch_pings_adapter.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts b/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts index 698b36f89d78..5d1099d37230 100644 --- a/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts +++ b/x-pack/plugins/uptime/server/lib/adapters/pings/elasticsearch_pings_adapter.ts @@ -233,10 +233,7 @@ export class ElasticsearchPingsAdapter implements UMPingsAdapter { } public async getDocCount(request: any): Promise { - const { count } = await this.database.count(request, { - index: INDEX_NAMES.HEARTBEAT, - body: {}, - }); + const { count } = await this.database.count(request, { index: INDEX_NAMES.HEARTBEAT }); return { count }; } From 5687f874a163b4e53603a42f79037b0ed7279b55 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 17 Jan 2019 14:25:36 -0600 Subject: [PATCH 07/10] Fix broken pages with 7.x schema --- .../queries/filter_bar/filter_bar.tsx | 4 ++-- .../queries/monitor_list/monitor_list.tsx | 17 ++++++++++++++--- .../monitor_status_bar/monitor_status_bar.tsx | 14 +++++--------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx b/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx index b83970e47cea..b9306428d0d5 100644 --- a/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx +++ b/x-pack/plugins/uptime/public/components/queries/filter_bar/filter_bar.tsx @@ -67,8 +67,8 @@ export const FilterBar = ({ dateRangeEnd, dateRangeStart, updateQuery }: FilterB { type: 'field_value_selection', field: 'monitor.id', - name: i18n.translate('xpack.uptime.filterBar.options.hostLabel', { - defaultMessage: 'Host', + name: i18n.translate('xpack.uptime.filterBar.options.idLabel', { + defaultMessage: 'ID', }), multiSelect: false, options: take(id, MAX_SELECTION_LENGTH).map((idValue: any) => ({ diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx index cd43e6f37129..f34b676bc04f 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx @@ -65,12 +65,23 @@ const monitorListColumns = [ render: (timestamp: string) => moment(timestamp).fromNow(), sortable: true, }, + { + field: 'ping.monitor.id', + name: i18n.translate('xpack.uptime.monitorList.idColumnLabel', { + defaultMessage: 'URL', + }), + render: (id: string, monitor: any) => {id}, + }, { field: 'ping.url.full', - name: i18n.translate('xpack.uptime.monitorList.hostColumnLabel', { - defaultMessage: 'Host', + name: i18n.translate('xpack.uptime.monitorList.urlColumnLabel', { + defaultMessage: 'URL', }), - render: (host: string, monitor: any) => {host}, + render: (url: string, monitor: any) => ( + + {url} + + ), }, { field: 'ping.monitor.ip', diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx index 3e0755d3525e..834634d04067 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiPanel } from '@elastic/eui'; +import { EuiFlexGroup, EuiFlexItem, EuiHealth, EuiLink, EuiPanel } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import moment from 'moment'; @@ -59,7 +59,6 @@ export const MonitorStatusBar = ({ duration: { us }, }, url: { full }, - tcp: { port }, } = monitorStatus[0]; return ( @@ -98,15 +97,12 @@ export const MonitorStatusBar = ({ defaultMessage="Last update: {timeFromNow}" /> - URL: {full} - IP: {ip} - + + {full} + + IP: {ip} Date: Thu, 17 Jan 2019 13:11:35 -0800 Subject: [PATCH 08/10] Update x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx Co-Authored-By: andrewvc --- .../public/components/queries/monitor_list/monitor_list.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx index f34b676bc04f..a5e95a14d186 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_list/monitor_list.tsx @@ -68,7 +68,7 @@ const monitorListColumns = [ { field: 'ping.monitor.id', name: i18n.translate('xpack.uptime.monitorList.idColumnLabel', { - defaultMessage: 'URL', + defaultMessage: 'ID', }), render: (id: string, monitor: any) => {id}, }, From fbe5d8c799cc22bf852c02a425eb241e6e0afb23 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Thu, 17 Jan 2019 15:14:55 -0600 Subject: [PATCH 09/10] Incorporate PR feedback --- .../queries/monitor_status_bar/monitor_status_bar.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx index 834634d04067..0455ab54747d 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx @@ -58,7 +58,7 @@ export const MonitorStatusBar = ({ ip, duration: { us }, }, - url: { full }, + url: { full: fullURL }, } = monitorStatus[0]; return ( @@ -98,8 +98,8 @@ export const MonitorStatusBar = ({ /> - - {full} + + {fullURL} IP: {ip} From 03ab216042f2dac591caed7835573e83da394655 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Fri, 18 Jan 2019 09:06:11 -0600 Subject: [PATCH 10/10] Properly format IP --- .../queries/monitor_status_bar/monitor_status_bar.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx index 0455ab54747d..53f9577306ad 100644 --- a/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx +++ b/x-pack/plugins/uptime/public/components/queries/monitor_status_bar/monitor_status_bar.tsx @@ -102,7 +102,14 @@ export const MonitorStatusBar = ({ {fullURL} - IP: {ip} + + +