type es agg response

x-pack/plugins/infra/common/http_api/services/get_infra_services.ts → x-pack/plugins/infra/common/http_api/host_details/get_infra_services.ts

@@ -13,9 +13,11 @@ import {
 } from '@kbn/io-ts-utils';
 import * as rt from 'io-ts';
 
+const AgentNameRT = rt.union([rt.string, rt.null]);
+
 export const serviceAssetRT = rt.type({
   'service.name': rt.string,
-  'agent.name': rt.union([rt.string, rt.undefined]),
+  'agent.name': AgentNameRT,
 });
 
 export type ServiceAsset = rt.TypeOf<typeof serviceAssetRT>;
@@ -45,6 +47,32 @@ export const GetServicesRequestQueryRT = rt.intersection([
   }),
 ]);
 
-export interface GetServicesResponse {
-  services: ServiceAsset[];
+export interface ServicesAPIRequest {
+  filters: ServicesFilter;
+  from: string;
+  to?: string;
 }
+
+export const ServicesAPIQueryAggregationRT = rt.type({
+  services: rt.type({
+    buckets: rt.array(
+      rt.type({
+        key: rt.string,
+        latestAgent: rt.type({
+          top: rt.array(
+            rt.type({
+              sort: rt.array(rt.string),
+              metrics: rt.type({
+                'agent.name': AgentNameRT,
+              }),
+            })
+          ),
+        }),
+      })
+    ),
+  }),
+});
+
+export type ServicesAPIQueryAggregationAggregation = rt.TypeOf<
+  typeof ServicesAPIQueryAggregationRT
+>;

x-pack/plugins/infra/common/http_api/host_details/index.ts

@@ -6,3 +6,4 @@
  */
 
 export * from './process_list';
+export * from './get_infra_services';

x-pack/plugins/infra/server/routes/services/lib/get_services.ts → x-pack/plugins/infra/server/lib/host_details/get_services.ts

@@ -6,12 +6,20 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
-import { estypes } from '@elastic/elasticsearch';
-import { ServiceAsset, GetServicesResponse } from '../../../../common/http_api/services';
-import { GetServicesOptions } from './types';
+import { APMDataAccessConfig } from '@kbn/apm-data-access-plugin/server';
+import { ESSearchClient } from '../metrics/types';
+import {
+  ServiceAsset,
+  ServicesAPIRequest,
+  ServicesAPIQueryAggregationAggregation,
+} from '../../../common/http_api/host_details';
 
-export const getServices = async (options: GetServicesOptions): Promise<GetServicesResponse> => {
-  const { transaction, error, metric } = options.apmIndices;
+export const getServices = async (
+  client: ESSearchClient,
+  apmIndices: APMDataAccessConfig['indices'],
+  options: ServicesAPIRequest
+) => {
+  const { transaction, error, metric } = apmIndices;
   const filters: QueryDslQueryContainer[] = [];
   filters.push({
     bool: {
@@ -23,8 +31,7 @@ export const getServices = async (options: GetServicesOptions): Promise<GetServi
     },
   });
 
-  const dsl: estypes.SearchRequest = {
-    index: [transaction, error, metric],
+  const body = {
     size: 0,
     _source: false,
     query: {
@@ -62,12 +69,16 @@ export const getServices = async (options: GetServicesOptions): Promise<GetServi
       },
     },
   };
-  const esResponse = await options.searchClient.search(dsl);
 
-  const { buckets = [] } = (esResponse.aggregations?.services || {}) as any;
-  const services = buckets.reduce((acc: ServiceAsset[], bucket: any) => {
+  const result = await client<{}, ServicesAPIQueryAggregationAggregation>({
+    body,
+    index: [transaction, error, metric],
+  });
+
+  const { buckets: servicesListBuckets } = result.aggregations!.services;
+  const services = servicesListBuckets.reduce((acc: ServiceAsset[], bucket) => {
     const serviceName = bucket.key;
-    const agentName = bucket.latestAgent.top[0]?.metrics['agent.name'];
+    const agentName = bucket.latestAgent.top[0].metrics['agent.name'];
 
     if (!serviceName) {
       return acc;

x-pack/plugins/infra/server/routes/services/index.ts

@@ -10,10 +10,11 @@ import { createRouteValidationFunction } from '@kbn/io-ts-utils';
 import {
   GetServicesRequestQueryRT,
   GetServicesRequestQuery,
-} from '../../../common/http_api/services';
+} from '../../../common/http_api/host_details';
 import { InfraBackendLibs } from '../../lib/infra_types';
-import { getServices } from './lib/get_services';
+import { getServices } from '../../lib/host_details/get_services';
 import { validateStringAssetFilters } from './lib/utils';
+import { createSearchClient } from '../../lib/create_search_client';
 
 export const initServicesRoute = (libs: InfraBackendLibs) => {
   const validate = createRouteValidationFunction(GetServicesRequestQueryRT);
@@ -45,16 +46,13 @@ export const initServicesRoute = (libs: InfraBackendLibs) => {
         if (!filters) {
           throw Boom.badRequest('Invalid filters');
         }
-        const coreContext = await requestContext.core;
-        const searchClient = coreContext.elasticsearch.client.asCurrentUser;
+        const client = createSearchClient(requestContext, framework, request);
         const soClient = savedObjects.getScopedClient(request);
         const apmIndices = await libs.getApmIndices(soClient);
-        const services = await getServices({
+        const services = await getServices(client, apmIndices, {
           from,
           to,
           filters,
-          searchClient,
-          apmIndices,
         });
         return response.ok({
           body: services,

x-pack/plugins/infra/server/routes/services/lib/utils.ts

@@ -6,7 +6,7 @@
  */
 import { RouteValidationError, RouteValidationResultFactory } from '@kbn/core/server';
 import { isLeft } from 'fp-ts/Either';
-import { servicesFiltersRT, ServicesFilter } from '../../../../common/http_api/services';
+import { servicesFiltersRT, ServicesFilter } from '../../../../common/http_api/host_details';
 
 type ValidateStringAssetFiltersReturn = [{ error: RouteValidationError }] | [null, ServicesFilter];