Temp

elastic · Dec 20, 2019 · 4a04c71 · 4a04c71
1 parent 0e5cf0a
commit 4a04c71
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 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
@@ -22,6 +22,7 @@ export interface MonitorStatesParams {
 }
 
 export interface GetSnapshotCountParams {
+  indexName: string;
   dateRangeStart: string;
   dateRangeEnd: string;
   filters?: string | null;

diff --git a/...plugins/uptime/server/lib/adapters/monitor_states/elasticsearch_monitor_states_adapter.ts b/...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/...k/legacy/plugins/uptime/server/lib/adapters/saved_objects/kibana_saved_objects_adapter.ts b/...k/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<UMDynamicSettingsType> => {
+  getUptimeDynamicSettings: async (client): Promise<UMDynamicSettingsType> => {
     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
@@ -9,6 +9,6 @@ import { UMDynamicSettingsType } from '../../sources';
 
 export interface UMSavedObjectsAdapter {
   getUptimeIndexPattern: UMSavedObjectsQueryFn;
-  getUptimeSourceSettings: UMSavedObjectsQueryFn<UMDynamicSettingsType>;
-  setUptimeSourceSettings: UMSavedObjectsQueryFn<void, UMDynamicSettingsType>;
+  getUptimeDynamicSettings: UMSavedObjectsQueryFn<UMDynamicSettingsType>;
+  setUptimeDynamicSettings: UMSavedObjectsQueryFn<void, UMDynamicSettingsType>;
 }
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
@@ -17,10 +17,10 @@ export const createGetDynamicSettingsRoute: UMRestApiRouteFactory = (libs: UMSer
   options: {
     tags: ['access:uptime'],
   },
-  handler: async ({ sourceSettings }, _context, _request, response): Promise<any> => {
+  handler: async ({ dynamicSettings }, _context, _request, response): Promise<any> => {
     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<any> => {
     // @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
@@ -22,10 +22,11 @@ export const createGetSnapshotCount: UMRestApiRouteFactory = (libs: UMServerLibs
   options: {
     tags: ['access:uptime'],
   },
-  handler: async ({ callES }, _context, request, response): Promise<any> => {
+  handler: async ({ callES, dynamicSettings }, _context, request, response): Promise<any> => {
     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
@@ -67,7 +67,7 @@ export interface UMRouteParams {
     clientParams?: Record<string, any>,
     options?: CallAPIOptions | undefined
   ) => Promise<any>;
-  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
@@ -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