Use kibana advanced config for limiting the number of services

Author: younesmln

x-pack/plugins/apm/server/routes/service_map/get_service_map.ts

@@ -90,10 +90,17 @@ async function getConnectionData({
   });
 }
 
-async function getServicesData(options: IEnvOptions) {
-  const { environment, setup, searchAggregatedTransactions, start, end } =
-    options;
-
+async function getServicesData(
+  options: IEnvOptions & { maxNumberOfServices: number }
+) {
+  const {
+    environment,
+    setup,
+    searchAggregatedTransactions,
+    start,
+    end,
+    maxNumberOfServices,
+  } = options;
   const params = {
     apm: {
       events: [
@@ -117,7 +124,7 @@ async function getServicesData(options: IEnvOptions) {
         services: {
           terms: {
             field: SERVICE_NAME,
-            size: 500,
+            size: maxNumberOfServices,
           },
           aggs: {
             agent_name: {
@@ -156,7 +163,9 @@ async function getServicesData(options: IEnvOptions) {
 export type ConnectionsResponse = Awaited<ReturnType<typeof getConnectionData>>;
 export type ServicesResponse = Awaited<ReturnType<typeof getServicesData>>;
 
-export function getServiceMap(options: IEnvOptions) {
+export function getServiceMap(
+  options: IEnvOptions & { maxNumberOfServices: number }
+) {
   return withApmSpan('get_service_map', async () => {
     const { logger } = options;
     const anomaliesPromise = getServiceAnomalies(

x-pack/plugins/apm/server/routes/service_map/route.ts

@@ -7,6 +7,7 @@
 
 import Boom from '@hapi/boom';
 import * as t from 'io-ts';
+import { apmServiceGroupMaxNumberOfServices } from '@kbn/observability-plugin/common';
 import { isActivePlatinumLicense } from '../../../common/license_check';
 import { invalidLicenseMessage } from '../../../common/service_map';
 import { notifyFeatureUsage } from '../../feature';
@@ -109,15 +110,19 @@ const serviceMapRoute = createApmServerRoute({
       },
     } = params;
 
-    const savedObjectsClient = (await context.core).savedObjects.client;
-    const [setup, serviceGroup] = await Promise.all([
+    const {
+      savedObjects: { client: savedObjectsClient },
+      uiSettings: { client: uiSettingsClient },
+    } = await context.core;
+    const [setup, serviceGroup, maxNumberOfServices] = await Promise.all([
       setupRequest(resources),
       serviceGroupId
         ? getServiceGroup({
             savedObjectsClient,
             serviceGroupId,
           })
         : Promise.resolve(null),
+      uiSettingsClient.get<number>(apmServiceGroupMaxNumberOfServices),
     ]);
 
     const serviceNames = [
@@ -140,6 +145,7 @@ const serviceMapRoute = createApmServerRoute({
       logger,
       start,
       end,
+      maxNumberOfServices,
     });
   },
 });

x-pack/plugins/apm/server/routes/services/get_services/get_sorted_and_filtered_services.ts

@@ -22,13 +22,15 @@ export async function getSortedAndFilteredServices({
   environment,
   logger,
   serviceGroup,
+  maxNumberOfServices,
 }: {
   setup: Setup;
   start: number;
   end: number;
   environment: Environment;
   logger: Logger;
   serviceGroup: ServiceGroup | null;
+  maxNumberOfServices: number;
 }) {
   const { apmEventClient } = setup;
 
@@ -48,7 +50,7 @@ export async function getSortedAndFilteredServices({
           ],
         },
         body: {
-          size: 500,
+          size: maxNumberOfServices,
           field: SERVICE_NAME,
         },
       }

x-pack/plugins/apm/server/routes/services/route.ts

@@ -16,6 +16,7 @@ import {
 } from '@kbn/ml-plugin/server';
 import { ScopedAnnotationsClient } from '@kbn/observability-plugin/server';
 import { Annotation } from '@kbn/observability-plugin/common/annotations';
+import { apmServiceGroupMaxNumberOfServices } from '@kbn/observability-plugin/common';
 import { latencyAggregationTypeRt } from '../../../common/latency_aggregation_types';
 import { ProfilingValueType } from '../../../common/profiling';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/transactions';
@@ -1246,14 +1247,17 @@ const sortedAndFilteredServicesRoute = createApmServerRoute({
       };
     }
 
-    const savedObjectsClient = (await resources.context.core).savedObjects
-      .client;
+    const {
+      savedObjects: { client: savedObjectsClient },
+      uiSettings: { client: uiSettingsClient },
+    } = await resources.context.core;
 
-    const [setup, serviceGroup] = await Promise.all([
+    const [setup, serviceGroup, maxNumberOfServices] = await Promise.all([
       setupRequest(resources),
       serviceGroupId
         ? getServiceGroup({ savedObjectsClient, serviceGroupId })
         : Promise.resolve(null),
+      uiSettingsClient.get<number>(apmServiceGroupMaxNumberOfServices),
     ]);
     return {
       services: await getSortedAndFilteredServices({
@@ -1263,6 +1267,7 @@ const sortedAndFilteredServicesRoute = createApmServerRoute({
         environment,
         logger: resources.logger,
         serviceGroup,
+        maxNumberOfServices,
       }),
     };
   },