[APM] Add kibana config for limiting the number of services in a service group

x-pack/plugins/apm/common/service_groups.ts

@@ -7,7 +7,6 @@
 
 export const APM_SERVICE_GROUP_SAVED_OBJECT_TYPE = 'apm-service-group';
 export const SERVICE_GROUP_COLOR_DEFAULT = '#D1DAE7';
-export const MAX_NUMBER_OF_SERVICE_GROUPS = 500;
 
 export interface ServiceGroup {
   groupName: string;

x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts

@@ -5,23 +5,32 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from '@kbn/core/server';
+import {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+} from '@kbn/core/server';
+import { serviceGroupMaxNumberOfServices } from '@kbn/observability-plugin/common';
 import {
   ServiceGroup,
   SavedServiceGroup,
   APM_SERVICE_GROUP_SAVED_OBJECT_TYPE,
-  MAX_NUMBER_OF_SERVICE_GROUPS,
 } from '../../../common/service_groups';
 
 export async function getServiceGroups({
   savedObjectsClient,
+  uiSettingsClient,
 }: {
   savedObjectsClient: SavedObjectsClientContract;
+  uiSettingsClient: IUiSettingsClient;
 }): Promise<SavedServiceGroup[]> {
+  const maxNumberOfServices = await uiSettingsClient.get<number>(
+    serviceGroupMaxNumberOfServices
+  );
+
   const result = await savedObjectsClient.find<ServiceGroup>({
     type: APM_SERVICE_GROUP_SAVED_OBJECT_TYPE,
     page: 1,
-    perPage: MAX_NUMBER_OF_SERVICE_GROUPS,
+    perPage: maxNumberOfServices,
   });
   return result.saved_objects.map(
     ({ id, attributes, updated_at: upatedAt }) => ({

x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts

@@ -6,6 +6,8 @@
  */
 
 import { kqlQuery, rangeQuery } from '@kbn/observability-plugin/server';
+import { IUiSettingsClient } from '@kbn/core/server';
+import { serviceGroupMaxNumberOfServices } from '@kbn/observability-plugin/common';
 import { AgentName } from '../../../typings/es_schemas/ui/fields/agent';
 import {
   AGENT_NAME,
@@ -14,20 +16,24 @@ import {
 } from '../../../common/elasticsearch_fieldnames';
 import { ProcessorEvent } from '../../../common/processor_event';
 import { Setup } from '../../lib/helpers/setup_request';
-import { MAX_NUMBER_OF_SERVICE_GROUPS } from '../../../common/service_groups';
 
 export async function lookupServices({
   setup,
+  uiSettingsClient,
   kuery,
   start,
   end,
 }: {
   setup: Setup;
+  uiSettingsClient: IUiSettingsClient;
   kuery: string;
   start: number;
   end: number;
 }) {
   const { apmEventClient } = setup;
+  const maxNumberOfServices = await uiSettingsClient.get<number>(
+    serviceGroupMaxNumberOfServices
+  );
 
   const response = await apmEventClient.search('lookup_services', {
     apm: {
@@ -49,7 +55,7 @@ export async function lookupServices({
         services: {
           terms: {
             field: SERVICE_NAME,
-            size: MAX_NUMBER_OF_SERVICE_GROUPS,
+            size: maxNumberOfServices,
           },
           aggs: {
             environments: {

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

@@ -28,8 +28,14 @@ const serviceGroupsRoute = createApmServerRoute({
     resources
   ): Promise<{ serviceGroups: SavedServiceGroup[] }> => {
     const { context } = resources;
-    const savedObjectsClient = (await context.core).savedObjects.client;
-    const serviceGroups = await getServiceGroups({ savedObjectsClient });
+    const {
+      savedObjects: { client: savedObjectsClient },
+      uiSettings: { client: uiSettingsClient },
+    } = await context.core;
+    const serviceGroups = await getServiceGroups({
+      savedObjectsClient,
+      uiSettingsClient,
+    });
     return { serviceGroups };
   },
 });
@@ -46,7 +52,9 @@ const serviceGroupRoute = createApmServerRoute({
   },
   handler: async (resources): Promise<{ serviceGroup: SavedServiceGroup }> => {
     const { context, params } = resources;
-    const savedObjectsClient = (await context.core).savedObjects.client;
+    const {
+      savedObjects: { client: savedObjectsClient },
+    } = await context.core;
     const serviceGroup = await getServiceGroup({
       savedObjectsClient,
       serviceGroupId: params.query.serviceGroup,
@@ -75,10 +83,15 @@ const serviceGroupSaveRoute = createApmServerRoute({
   handler: async (resources): Promise<void> => {
     const { context, params } = resources;
     const { start, end, serviceGroupId } = params.query;
-    const savedObjectsClient = (await context.core).savedObjects.client;
+    const {
+      savedObjects: { client: savedObjectsClient },
+      uiSettings: { client: uiSettingsClient },
+    } = await context.core;
+
     const setup = await setupRequest(resources);
     const items = await lookupServices({
       setup,
+      uiSettingsClient,
       kuery: params.body.kuery,
       start,
       end,
@@ -126,11 +139,15 @@ const serviceGroupServicesRoute = createApmServerRoute({
   handler: async (
     resources
   ): Promise<{ items: Awaited<ReturnType<typeof lookupServices>> }> => {
-    const { params } = resources;
+    const { params, context } = resources;
     const { kuery = '', start, end } = params.query;
+    const {
+      uiSettings: { client: uiSettingsClient },
+    } = await context.core;
     const setup = await setupRequest(resources);
     const items = await lookupServices({
       setup,
+      uiSettingsClient,
       kuery,
       start,
       end,

x-pack/plugins/observability/common/index.ts

@@ -17,6 +17,7 @@ export {
   defaultApmServiceEnvironment,
   apmServiceInventoryOptimizedSorting,
   apmProgressiveLoading,
+  serviceGroupMaxNumberOfServices,
 } from './ui_settings_keys';
 
 export {

x-pack/plugins/observability/common/ui_settings_keys.ts

@@ -15,3 +15,4 @@ export const apmProgressiveLoading = 'observability:apmProgressiveLoading';
 export const enableServiceGroups = 'observability:enableServiceGroups';
 export const apmServiceInventoryOptimizedSorting =
   'observability:apmServiceInventoryOptimizedSorting';
+export const serviceGroupMaxNumberOfServices = 'observability:serviceGroupMaxNumberOfServices';

x-pack/plugins/observability/public/index.ts

@@ -29,6 +29,7 @@ export {
   enableInfrastructureView,
   enableServiceGroups,
   enableNewSyntheticsView,
+  serviceGroupMaxNumberOfServices,
 } from '../common/ui_settings_keys';
 export { uptimeOverviewLocatorID } from '../common';
 

x-pack/plugins/observability/server/ui_settings.ts

@@ -19,6 +19,7 @@ import {
   enableServiceGroups,
   apmServiceInventoryOptimizedSorting,
   enableNewSyntheticsView,
+  serviceGroupMaxNumberOfServices,
 } from '../common/ui_settings_keys';
 
 const technicalPreviewLabel = i18n.translate(
@@ -187,4 +188,15 @@ export const uiSettings: Record<string, UiSettingsParams<boolean | number | stri
     requiresPageReload: false,
     type: 'boolean',
   },
+  [serviceGroupMaxNumberOfServices]: {
+    category: [observabilityFeatureId],
+    name: i18n.translate('xpack.observability.serviceGroupMaxServicesUiSettingName', {
+      defaultMessage: 'Maximum services in a service group',
+    }),
+    value: 500,
+    description: i18n.translate('xpack.observability.serviceGroupMaxServicesUiSettingDescription', {
+      defaultMessage: 'Limit the number of services in a given service group',
+    }),
+    schema: schema.number(),
+  },
 };