[Ingest Manager] Surface saved object client 10,000 limitation to bul…

…k actions UI (#78520) * Surface saved object client 10,000 limitation to UI * Update x-pack/plugins/ingest_manager/server/services/saved_object.ts Co-authored-by: John Schulz <github.com@jfsiii.org> Co-authored-by: John Schulz <github.com@jfsiii.org> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
elastic · Sep 28, 2020 · 26f2bd2 · 26f2bd2
1 parent 9017d50
commit 26f2bd2
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 17 deletions.
diff --git a/x-pack/plugins/ingest_manager/common/constants/index.ts b/x-pack/plugins/ingest_manager/common/constants/index.ts
@@ -13,3 +13,9 @@ export * from './epm';
 export * from './output';
 export * from './enrollment_api_key';
 export * from './settings';
+
+// TODO: This is the default `index.max_result_window` ES setting, which dictates
+// the maximum amount of results allowed to be returned from a search. It's possible
+// for the actual setting to differ from the default. Can we retrieve the real
+// setting in the future?
+export const SO_SEARCH_LIMIT = 10000;
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/constants/index.ts
@@ -7,6 +7,7 @@ export {
   PLUGIN_ID,
   EPM_API_ROUTES,
   AGENT_API_ROUTES,
+  SO_SEARCH_LIMIT,
   AGENT_POLICY_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_SAVED_OBJECT_TYPE,

diff --git a/...ic/applications/ingest_manager/sections/fleet/agent_list_page/components/bulk_actions.tsx b/...ic/applications/ingest_manager/sections/fleet/agent_list_page/components/bulk_actions.tsx
@@ -15,7 +15,8 @@ import {
   EuiIcon,
   EuiPortal,
 } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
+import { FormattedMessage, FormattedNumber } from '@kbn/i18n/react';
+import { SO_SEARCH_LIMIT } from '../../../../constants';
 import { Agent } from '../../../../types';
 import { AgentReassignAgentPolicyFlyout, AgentUnenrollAgentModal } from '../../components';
 
@@ -153,11 +154,22 @@ export const AgentBulkActions: React.FunctionComponent<{
       <EuiFlexGroup gutterSize="m" alignItems="center">
         <EuiFlexItem grow={false}>
           <EuiText size="xs" color="subdued">
-            <FormattedMessage
-              id="xpack.ingestManager.agentBulkActions.totalAgents"
-              defaultMessage="Showing {count, plural, one {# agent} other {# agents}}"
-              values={{ count: totalAgents }}
-            />
+            {totalAgents > SO_SEARCH_LIMIT ? (
+              <FormattedMessage
+                id="xpack.ingestManager.agentBulkActions.totalAgentsWithLimit"
+                defaultMessage="Showing {count} of {total} agents"
+                values={{
+                  count: <FormattedNumber value={SO_SEARCH_LIMIT} />,
+                  total: <FormattedNumber value={totalAgents} />,
+                }}
+              />
+            ) : (
+              <FormattedMessage
+                id="xpack.ingestManager.agentBulkActions.totalAgents"
+                defaultMessage="Showing {count, plural, one {# agent} other {# agents}}"
+                values={{ count: totalAgents }}
+              />
+            )}
           </EuiText>
         </EuiFlexItem>
         {(selectionMode === 'manual' && selectedAgents.length) ||
@@ -184,7 +196,7 @@ export const AgentBulkActions: React.FunctionComponent<{
                         count:
                           selectionMode === 'manual'
                             ? selectedAgents.length
-                            : totalAgents - totalInactiveAgents,
+                            : Math.min(totalAgents - totalInactiveAgents, SO_SEARCH_LIMIT),
                       }}
                     />
                   </Button>

diff --git a/...gest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx b/...gest_manager/sections/fleet/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -8,6 +8,7 @@ import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSelect, EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
+import { SO_SEARCH_LIMIT } from '../../../../constants';
 import { AgentPolicy, GetEnrollmentAPIKeysResponse } from '../../../../types';
 import { sendGetEnrollmentAPIKeys, useCore } from '../../../../hooks';
 import { AgentPolicyPackageBadges } from '../agent_policy_package_badges';
@@ -98,7 +99,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
         try {
           const res = await sendGetEnrollmentAPIKeys({
             page: 1,
-            perPage: 10000,
+            perPage: SO_SEARCH_LIMIT,
           });
           if (res.error) {
             throw res.error;

diff --git a/.../public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx b/.../public/applications/ingest_manager/sections/overview/components/agent_policy_section.tsx
@@ -15,6 +15,7 @@ import {
 } from '@elastic/eui';
 import { OverviewPanel } from './overview_panel';
 import { OverviewStats } from './overview_stats';
+import { SO_SEARCH_LIMIT } from '../../../constants';
 import { useLink, useGetPackagePolicies } from '../../../hooks';
 import { AgentPolicy } from '../../../types';
 import { Loading } from '../../fleet/components';
@@ -25,7 +26,7 @@ export const OverviewPolicySection: React.FC<{ agentPolicies: AgentPolicy[] }> =
   const { getHref } = useLink();
   const packagePoliciesRequest = useGetPackagePolicies({
     page: 1,
-    perPage: 10000,
+    perPage: SO_SEARCH_LIMIT,
   });
 
   return (

diff --git a/x-pack/plugins/ingest_manager/server/constants/index.ts b/x-pack/plugins/ingest_manager/server/constants/index.ts
@@ -31,6 +31,7 @@ export {
   SETTINGS_API_ROUTES,
   APP_API_ROUTES,
   // Saved object types
+  SO_SEARCH_LIMIT,
   AGENT_SAVED_OBJECT_TYPE,
   AGENT_EVENT_SAVED_OBJECT_TYPE,
   AGENT_ACTION_SAVED_OBJECT_TYPE,

diff --git a/x-pack/plugins/ingest_manager/server/services/saved_object.ts b/x-pack/plugins/ingest_manager/server/services/saved_object.ts
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { SavedObjectsClientContract, SavedObjectsFindResponse } from 'src/core/server';
+import { SO_SEARCH_LIMIT } from '../constants';
 import { ListWithKuery } from '../types';
 
 /**
@@ -40,19 +41,13 @@ export const findAllSOs = async <T = unknown>(
   const { type, sortField, sortOrder, kuery } = options;
   let savedObjectResults: SavedObjectsFindResponse<T>['saved_objects'] = [];
 
-  // TODO: This is the default `index.max_result_window` ES setting, which dictates
-  // the maximum amount of results allowed to be returned from a search. It's possible
-  // for the actual setting to differ from the default. Can we retrieve the real
-  // setting in the future?
-  const searchLimit = 10000;
-
   const query = {
     type,
     sortField,
     sortOrder,
     filter: kuery,
     page: 1,
-    perPage: searchLimit,
+    perPage: SO_SEARCH_LIMIT,
   };
 
   const { saved_objects: initialSOs, total } = await soClient.find<T>(query);

diff --git a/x-pack/plugins/ingest_manager/server/services/setup.ts b/x-pack/plugins/ingest_manager/server/services/setup.ts
@@ -22,6 +22,7 @@ import {
   Output,
   DEFAULT_AGENT_POLICIES_PACKAGES,
 } from '../../common';
+import { SO_SEARCH_LIMIT } from '../constants';
 import { getPackageInfo } from './epm/packages';
 import { packagePolicyService } from './package_policy';
 import { generateEnrollmentAPIKey } from './api_keys';
@@ -159,7 +160,7 @@ export async function setupFleet(
   });
 
   const { items: agentPolicies } = await agentPolicyService.list(soClient, {
-    perPage: 10000,
+    perPage: SO_SEARCH_LIMIT,
   });
 
   await Promise.all(