[Uptime] Remove redundant adapter function (elastic#56980)

* Remove get_doc_count function in favor of index status function. * Rename adapter function. * Remove obsolete import. Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
justinkambic · Feb 25, 2020 · de8507c · de8507c
1 parent cc655a7
commit de8507c
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 105 deletions.
diff --git a/x-pack/legacy/plugins/uptime/common/graphql/introspection.json b/x-pack/legacy/plugins/uptime/common/graphql/introspection.json
@@ -72,18 +72,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "getDocCount",
-            "description": "Gets the number of documents in the target index",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": { "kind": "OBJECT", "name": "DocCount", "ofType": null }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "getMonitors",
             "description": "",

diff --git a/x-pack/legacy/plugins/uptime/common/graphql/types.ts b/x-pack/legacy/plugins/uptime/common/graphql/types.ts
@@ -17,8 +17,6 @@ export type UnsignedInteger = any;
 export interface Query {
   /** Get a list of all recorded pings for all monitors */
   allPings: PingResults;
-  /** Gets the number of documents in the target index */
-  getDocCount: DocCount;
 
   getMonitors?: LatestMonitorsResult | null;
 

diff --git a/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/monitor_states/resolvers.ts
@@ -47,10 +47,10 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
           ? JSON.parse(decodeURIComponent(pagination))
           : CONTEXT_DEFAULTS.CURSOR_PAGINATION;
         const [
-          totalSummaryCount,
+          indexStatus,
           { summaries, nextPagePagination, prevPagePagination },
         ] = await Promise.all([
-          libs.requests.getDocCount({ callES: APICaller }),
+          libs.requests.getIndexStatus({ callES: APICaller }),
           libs.requests.getMonitorStates({
             callES: APICaller,
             dateRangeStart,
@@ -63,6 +63,9 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
             statusFilter: statusFilter || undefined,
           }),
         ]);
+
+        const totalSummaryCount = indexStatus?.docCount ?? { count: undefined };
+
         return {
           summaries,
           nextPagePagination,
@@ -71,7 +74,7 @@ export const createMonitorStatesResolvers: CreateUMGraphQLResolvers = (
         };
       },
       async getStatesIndexStatus(_resolver, {}, { APICaller }): Promise<StatesIndexStatus> {
-        return await libs.requests.getStatesIndexStatus({ callES: APICaller });
+        return await libs.requests.getIndexStatus({ callES: APICaller });
       },
     },
   };

diff --git a/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts b/x-pack/legacy/plugins/uptime/server/graphql/pings/resolvers.ts
@@ -5,7 +5,7 @@
  */
 
 import { UMResolver } from '../../../common/graphql/resolver_types';
-import { AllPingsQueryArgs, DocCount, PingResults } from '../../../common/graphql/types';
+import { AllPingsQueryArgs, PingResults } from '../../../common/graphql/types';
 import { UMServerLibs } from '../../lib/lib';
 import { UMContext } from '../types';
 import { CreateUMGraphQLResolvers } from '../types';
@@ -17,19 +17,15 @@ export type UMAllPingsResolver = UMResolver<
   UMContext
 >;
 
-export type UMGetDocCountResolver = UMResolver<DocCount | Promise<DocCount>, any, never, UMContext>;
-
 export interface UMPingResolver {
   allPings: () => PingResults;
-  getDocCount: () => number;
 }
 
 export const createPingsResolvers: CreateUMGraphQLResolvers = (
   libs: UMServerLibs
 ): {
   Query: {
     allPings: UMAllPingsResolver;
-    getDocCount: UMGetDocCountResolver;
   };
 } => ({
   Query: {
@@ -49,8 +45,5 @@ export const createPingsResolvers: CreateUMGraphQLResolvers = (
         location,
       });
     },
-    async getDocCount(_resolver, _args, { APICaller }): Promise<DocCount> {
-      return libs.requests.getDocCount({ callES: APICaller });
-    },
   },
 });
diff --git a/x-pack/legacy/plugins/uptime/server/graphql/pings/schema.gql.ts b/x-pack/legacy/plugins/uptime/server/graphql/pings/schema.gql.ts
@@ -38,9 +38,6 @@ export const pingsSchema = gql`
       "Optional: agent location to filter by."
       location: String
     ): PingResults!
-
-    "Gets the number of documents in the target index"
-    getDocCount: DocCount!
   }
 
   type ContainerImage {

diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_doc_count.test.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/__tests__/get_doc_count.test.ts
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/get_doc_count.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/get_doc_count.ts
diff --git a/...r/lib/requests/get_states_index_status.ts → ...e/server/lib/requests/get_index_status.ts b/...r/lib/requests/get_states_index_status.ts → ...e/server/lib/requests/get_index_status.ts
@@ -8,9 +8,7 @@ import { UMElasticsearchQueryFn } from '../adapters';
 import { StatesIndexStatus } from '../../../common/graphql/types';
 import { INDEX_NAMES } from '../../../common/constants';
 
-export const getStatesIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({
-  callES,
-}) => {
+export const getIndexStatus: UMElasticsearchQueryFn<{}, StatesIndexStatus> = async ({ callES }) => {
   const {
     _shards: { total },
     count,

diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/index.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/index.ts
@@ -4,7 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { getDocCount } from './get_doc_count';
 export { getFilterBar, GetFilterBarParams } from './get_filter_bar';
 export { getUptimeIndexPattern as getIndexPattern } from './get_index_pattern';
 export { getLatestMonitor, GetLatestMonitorParams } from './get_latest_monitor';
@@ -17,4 +16,4 @@ export { getPings, GetPingsParams } from './get_pings';
 export { getPingHistogram, GetPingHistogramParams } from './get_ping_histogram';
 export { UptimeRequests } from './uptime_requests';
 export { getSnapshotCount, GetSnapshotCountParams } from './get_snapshot_counts';
-export { getStatesIndexStatus } from './get_states_index_status';
+export { getIndexStatus } from './get_index_status';
diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/types.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/types.ts
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { DocCount, Ping, PingResults } from '../../../common/graphql/types';
+import { Ping, PingResults } from '../../../common/graphql/types';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { GetPingHistogramParams, HistogramResult } from '../../../common/types';
 
@@ -54,11 +54,6 @@ export interface UMPingsAdapter {
   getLatestMonitorStatus: UMElasticsearchQueryFn<GetLatestMonitorDocsParams, Ping>;
 
   getPingHistogram: UMElasticsearchQueryFn<GetPingHistogramParams, HistogramResult>;
-
-  /**
-   * Gets data used for a composite histogram for the currently-running monitors.
-   */
-  getDocCount: UMElasticsearchQueryFn<{}, DocCount>;
 }
 
 export interface HistogramQueryResult {

diff --git a/x-pack/legacy/plugins/uptime/server/lib/requests/uptime_requests.ts b/x-pack/legacy/plugins/uptime/server/lib/requests/uptime_requests.ts
@@ -5,13 +5,7 @@
  */
 
 import { UMElasticsearchQueryFn } from '../adapters';
-import {
-  DocCount,
-  Ping,
-  MonitorChart,
-  PingResults,
-  StatesIndexStatus,
-} from '../../../common/graphql/types';
+import { Ping, MonitorChart, PingResults, StatesIndexStatus } from '../../../common/graphql/types';
 import {
   GetFilterBarParams,
   GetLatestMonitorParams,
@@ -36,7 +30,6 @@ import { HistogramResult } from '../../../common/types';
 type ESQ<P, R> = UMElasticsearchQueryFn<P, R>;
 
 export interface UptimeRequests {
-  getDocCount: ESQ<{}, DocCount>;
   getFilterBar: ESQ<GetFilterBarParams, OverviewFilters>;
   getIndexPattern: ESQ<any, {}>;
   getLatestMonitor: ESQ<GetLatestMonitorParams, Ping>;
@@ -48,5 +41,5 @@ export interface UptimeRequests {
   getPings: ESQ<GetPingsParams, PingResults>;
   getPingHistogram: ESQ<GetPingHistogramParams, HistogramResult>;
   getSnapshotCount: ESQ<GetSnapshotCountParams, Snapshot>;
-  getStatesIndexStatus: ESQ<{}, StatesIndexStatus>;
+  getIndexStatus: ESQ<{}, StatesIndexStatus>;
 }