From 4a04c71f76a4b00ef9e263ff4f3b10b547c69908 Mon Sep 17 00:00:00 2001 From: Andrew Cholakian Date: Fri, 20 Dec 2019 09:46:06 -0600 Subject: [PATCH] Temp --- .../lib/adapters/monitor_states/adapter_types.ts | 1 + .../elasticsearch_monitor_states_adapter.ts | 10 +++++++++- .../saved_objects/kibana_saved_objects_adapter.ts | 8 ++++---- .../uptime/server/lib/adapters/saved_objects/types.ts | 4 ++-- .../uptime/server/rest_api/dynamic_settings/index.ts | 6 +++--- .../server/rest_api/snapshot/get_snapshot_count.ts | 3 ++- x-pack/legacy/plugins/uptime/server/rest_api/types.ts | 2 +- .../uptime/server/rest_api/uptime_route_wrapper.ts | 4 ++-- 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts index 4104a9287a28d1..35c929e6517f01 100644 --- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts +++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/adapter_types.ts @@ -22,6 +22,7 @@ export interface MonitorStatesParams { } export interface GetSnapshotCountParams { + indexName: string; dateRangeStart: string; dateRangeEnd: string; filters?: string | null; diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts index d264da2e7ec0c6..a9b4eeb2e018ec 100644 --- a/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts +++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts @@ -55,10 +55,18 @@ export const elasticsearchMonitorStatesAdapter: UMMonitorStatesAdapter = { }; }, - getSnapshotCount: async ({ callES, dateRangeStart, dateRangeEnd, filters, statusFilter }) => { + getSnapshotCount: async ({ + callES, + indexPattern, + dateRangeStart, + dateRangeEnd, + filters, + statusFilter, + }) => { const context: QueryContext = { count: query => callES('count', query), search: query => callES('search', query), + indexPattern, dateRangeStart, dateRangeEnd, pagination: CONTEXT_DEFAULTS.CURSOR_PAGINATION, diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts index 225ab123798b95..fdba232f8a2ad8 100644 --- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts +++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts @@ -23,7 +23,7 @@ export const savedObjectsAdapter: UMSavedObjectsAdapter = { ); } }, - getUptimeSourceSettings: async (client): Promise => { + getUptimeDynamicSettings: async (client): Promise => { try { return (await client.get(umDynamicSettings.type, umDynamicSettings.id)).attributes; } catch (e) { @@ -34,12 +34,12 @@ export const savedObjectsAdapter: UMSavedObjectsAdapter = { overwrite: false, }) ).attributes; - } catch (e) { - return e; + } catch (otherE) { + return otherE; } } }, - setUptimeSourceSettings: async (client, settings) => { + setUptimeDynamicSettings: async (client, settings) => { // @ts-ignore client.update(umDynamicSettings.type, umDynamicSettings.id, settings); }, diff --git a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts index 595dd5dfc287bc..2188579cfeb163 100644 --- a/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts +++ b/x-pack/legacy/plugins/uptime/server/lib/adapters/saved_objects/types.ts @@ -9,6 +9,6 @@ import { UMDynamicSettingsType } from '../../sources'; export interface UMSavedObjectsAdapter { getUptimeIndexPattern: UMSavedObjectsQueryFn; - getUptimeSourceSettings: UMSavedObjectsQueryFn; - setUptimeSourceSettings: UMSavedObjectsQueryFn; + getUptimeDynamicSettings: UMSavedObjectsQueryFn; + setUptimeDynamicSettings: UMSavedObjectsQueryFn; } diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/dynamic_settings/index.ts b/x-pack/legacy/plugins/uptime/server/rest_api/dynamic_settings/index.ts index cb627e12d3a226..a7a779efbd330b 100644 --- a/x-pack/legacy/plugins/uptime/server/rest_api/dynamic_settings/index.ts +++ b/x-pack/legacy/plugins/uptime/server/rest_api/dynamic_settings/index.ts @@ -17,10 +17,10 @@ export const createGetDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSer options: { tags: ['access:uptime'], }, - handler: async ({ sourceSettings }, _context, _request, response): Promise => { + handler: async ({ dynamicSettings }, _context, _request, response): Promise => { return response.ok({ body: { - dynamic_settings: sourceSettings, + dynamic_settings: dynamicSettings, }, }); }, @@ -36,7 +36,7 @@ export const createPostDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSe handler: async ({ savedObjectsClient }, _context, request, response): Promise => { // @ts-ignore const newSettings: UMDynamicSettingsType = request.body; - await savedObjectsAdapter.setUptimeSourceSettings(savedObjectsClient, newSettings); + await savedObjectsAdapter.setUptimeDynamicSettings(savedObjectsClient, newSettings); return response.ok({ body: { diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts b/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts index 986ac797d63b62..71d0b44e9fdadd 100644 --- a/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts +++ b/x-pack/legacy/plugins/uptime/server/rest_api/snapshot/get_snapshot_count.ts @@ -22,10 +22,11 @@ export const createGetSnapshotCount: UMRestApiRouteFactory = (libs: UMServerLibs options: { tags: ['access:uptime'], }, - handler: async ({ callES }, _context, request, response): Promise => { + handler: async ({ callES, dynamicSettings }, _context, request, response): Promise => { const { dateRangeStart, dateRangeEnd, filters, statusFilter } = request.query; const result = await libs.monitorStates.getSnapshotCount({ callES, + indexName: dynamicSettings.heartbeatIndexName, dateRangeStart, dateRangeEnd, filters, diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/types.ts b/x-pack/legacy/plugins/uptime/server/rest_api/types.ts index bcc4f3523f1c69..6e72b48d8f6259 100644 --- a/x-pack/legacy/plugins/uptime/server/rest_api/types.ts +++ b/x-pack/legacy/plugins/uptime/server/rest_api/types.ts @@ -67,7 +67,7 @@ export interface UMRouteParams { clientParams?: Record, options?: CallAPIOptions | undefined ) => Promise; - sourceSettings: UMDynamicSettingsType; + dynamicSettings: UMDynamicSettingsType; savedObjectsClient: Pick< SavedObjectsClient, | 'errors' diff --git a/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.ts b/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.ts index 68833b636691d9..f61be6c84f4f10 100644 --- a/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.ts +++ b/x-pack/legacy/plugins/uptime/server/rest_api/uptime_route_wrapper.ts @@ -13,12 +13,12 @@ export const uptimeRouteWrapper: UMKibanaRouteWrapper = uptimeRoute => { handler: async (context, request, response) => { const { callAsCurrentUser: callES } = context.core.elasticsearch.dataClient; const { client: savedObjectsClient } = context.core.savedObjects; - const sourceSettings = await savedObjectsAdapter.getUptimeSourceSettings( + const dynamicSettings = await savedObjectsAdapter.getUptimeDynamicSettings( savedObjectsClient, undefined ); return await uptimeRoute.handler( - { callES, savedObjectsClient, sourceSettings }, + { callES, savedObjectsClient, dynamicSettings }, context, request, response