[Fleet] Remove deprecated APIs for agents endpoints

x-pack/plugins/cloud_defend/server/routes/policies/policies.ts

@@ -42,7 +42,7 @@ const createPolicies = (
         const agentPolicyStatus = {
           id: agentPolicy.id,
           name: agentPolicy.name,
-          agents: agentStatusByAgentPolicyId[agentPolicy.id]?.total,
+          agents: agentStatusByAgentPolicyId[agentPolicy.id]?.active,
         };
         return {
           package_policy: cloudDefendPackage,

x-pack/plugins/cloud_security_posture/server/routes/benchmarks/v1.ts

@@ -48,7 +48,7 @@ export const getBenchmarksData = (
         const agentPolicyStatus = {
           id: agentPolicy.id,
           name: agentPolicy.name,
-          agents: agentStatusByAgentPolicyId[agentPolicy.id]?.total,
+          agents: agentStatusByAgentPolicyId[agentPolicy.id]?.active,
         };
         return {
           package_policy: cspPackage,

x-pack/plugins/fleet/common/constants/routes.ts

@@ -135,8 +135,6 @@ export const APP_API_ROUTES = {
   CHECK_PERMISSIONS_PATTERN: `${API_ROOT}/check-permissions`,
   GENERATE_SERVICE_TOKEN_PATTERN: `${API_ROOT}/service_tokens`,
   AGENT_POLICIES_SPACES: `${INTERNAL_ROOT}/agent_policies_spaces`,
-  // deprecated since 8.0
-  GENERATE_SERVICE_TOKEN_PATTERN_DEPRECATED: `${API_ROOT}/service-tokens`,
 };
 
 // Agent API routes
@@ -159,8 +157,6 @@ export const AGENT_API_ROUTES = {
   AVAILABLE_VERSIONS_PATTERN: `${API_ROOT}/agents/available_versions`,
   STATUS_PATTERN: `${API_ROOT}/agent_status`,
   DATA_PATTERN: `${API_ROOT}/agent_status/data`,
-  // deprecated since 8.0
-  STATUS_PATTERN_DEPRECATED: `${API_ROOT}/agent-status`,
   UPGRADE_PATTERN: `${API_ROOT}/agents/{agentId}/upgrade`,
   BULK_UPGRADE_PATTERN: `${API_ROOT}/agents/bulk_upgrade`,
   ACTION_STATUS_PATTERN: `${API_ROOT}/agents/action_status`,

x-pack/plugins/fleet/common/types/rest_spec/agent.ts

@@ -21,15 +21,13 @@ import type { ListResult, ListWithKuery } from './common';
 
 export interface GetAgentsRequest {
   query: ListWithKuery & {
-    showInactive: boolean;
+    showInactive?: boolean;
     showUpgradeable?: boolean;
     withMetrics?: boolean;
   };
 }
 
 export interface GetAgentsResponse extends ListResult<Agent> {
-  // deprecated in 8.x
-  list?: Agent[];
   statusSummary?: Record<AgentStatus, number>;
 }
 
@@ -128,16 +126,6 @@ export type PostBulkAgentUpgradeResponse = BulkAgentAction;
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface PostAgentUpgradeResponse {}
 
-// deprecated
-export interface PutAgentReassignRequest {
-  params: {
-    agentId: string;
-  };
-  body: { policy_id: string };
-}
-// deprecated
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface PutAgentReassignResponse {}
 export interface PostAgentReassignRequest {
   params: {
     agentId: string;
@@ -217,8 +205,6 @@ export interface GetAgentStatusRequest {
 export interface GetAgentStatusResponse {
   results: {
     events: number;
-    // deprecated
-    total: number;
     online: number;
     error: number;
     offline: number;

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx

@@ -238,8 +238,8 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
       let count = 0;
       for (const policyId of agentPolicyIds) {
         const { data } = await sendGetAgentStatus({ policyId });
-        if (data?.results.total) {
-          count += data.results.total;
+        if (data?.results.active) {
+          count += data.results.active;
         }
       }
       setAgentCount(count);

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/settings/index.tsx

@@ -150,8 +150,8 @@ export const SettingsView = memo<{ agentPolicy: AgentPolicy }>(
       if (isFleetEnabled) {
         setIsLoading(true);
         const { data } = await sendGetAgentStatus({ policyId: agentPolicy.id });
-        if (data?.results.total) {
-          setAgentCount(data.results.total);
+        if (data?.results.active) {
+          setAgentCount(data.results.active);
         } else {
           await submitUpdateAgentPolicy();
         }

x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx

@@ -166,8 +166,8 @@ export const EditPackagePolicyForm = memo<{
       let count = 0;
       for (const id of packagePolicy.policy_ids) {
         const { data } = await sendGetAgentStatus({ policyId: id });
-        if (data?.results.total) {
-          count += data.results.total;
+        if (data?.results.active) {
+          count += data.results.active;
         }
       }
       setAgentCount(count);

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/hooks/use_fetch_agents_data.tsx

@@ -16,7 +16,6 @@ import {
   usePagination,
   useGetAgentPolicies,
   sendGetAgents,
-  sendGetAgentStatus,
   useUrlParams,
   useStartServices,
   sendGetAgentTags,
@@ -218,8 +217,10 @@ export function useFetchAgentsData() {
               getStatusSummary: true,
               withMetrics: displayAgentMetrics,
             }),
-            sendGetAgentStatus({
+            sendGetAgents({
               kuery: AgentStatusKueryHelper.buildKueryForInactiveAgents(),
+              showInactive,
+              perPage: 0,
             }),
             sendGetAgentPolicies({
               kuery: `${LEGACY_AGENT_POLICY_SAVED_OBJECT_TYPE}.is_managed:true`,
@@ -298,7 +299,7 @@ export function useFetchAgentsData() {
 
           setAgentsOnCurrentPage(agentsResponse.data.items);
           setNAgentsInTable(agentsResponse.data.total);
-          setTotalInactiveAgents(totalInactiveAgentsResponse.data.results.inactive || 0);
+          setTotalInactiveAgents(totalInactiveAgentsResponse.data.total || 0);
 
           const managedAgentPolicies = managedAgentPoliciesResponse.data?.items ?? [];
 

x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/index.test.tsx

@@ -144,18 +144,27 @@ describe('agent_list_page', () => {
       jest.useRealTimers();
     });
 
-    it('should not send another agents status request if first one takes longer', () => {
-      mockedSendGetAgentStatus.mockImplementation(async () => {
-        const sleep = () => {
-          return new Promise((res) => {
+    it('should not send another call to retrieve inactive agents count if first one takes longer', () => {
+      let calls = 0;
+      mockedSendGetAgents.mockImplementation(async () => {
+        calls++;
+        if (calls === 1) {
+          await new Promise((res) => {
             setTimeout(() => res({}), 35000);
           });
+        }
+        return {
+          data: {
+            total: 0,
+          },
         };
-        await sleep();
+
         return {
           data: {
-            results: {
-              inactive: 0,
+            items: mapAgents(['agent1', 'agent2', 'agent3', 'agent4', 'agent5']),
+            total: 6,
+            statusSummary: {
+              online: 6,
             },
           },
         };
@@ -166,7 +175,7 @@ describe('agent_list_page', () => {
         jest.advanceTimersByTime(65000);
       });
 
-      expect(mockedSendGetAgentStatus).toHaveBeenCalledTimes(1);
+      expect(mockedSendGetAgents).toHaveBeenCalledTimes(2);
     });
   });
 

x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.test.tsx

@@ -28,8 +28,8 @@ jest.mock('../../../../hooks', () => {
         items: ['8.10.2', '8.7.0'],
       },
     }),
-    sendGetAgentStatus: jest.fn().mockResolvedValue({
-      data: { results: { updating: 2 } },
+    sendGetAgentsQuery: jest.fn().mockResolvedValue({
+      total: 2,
     }),
     sendPostBulkAgentUpgrade: jest.fn(),
     useAgentVersion: jest.fn().mockReturnValue('8.10.2'),

x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx

@@ -49,9 +49,9 @@ import {
   useStartServices,
   useKibanaVersion,
   useConfig,
-  sendGetAgentStatus,
   useAgentVersion,
   sendGetAllFleetServerAgents,
+  sendGetAgentsQuery,
 } from '../../../../hooks';
 
 import { sendGetAgentsAvailableVersions } from '../../../../hooks';
@@ -135,10 +135,11 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
 
       // if selection is a query, do an api call to get updating agents
       try {
-        const res = await sendGetAgentStatus({
+        const res = await sendGetAgentsQuery({
           kuery: newQuery,
+          perPage: 0,
         });
-        setUpdatingAgents(res?.data?.results?.updating ?? 0);
+        setUpdatingAgents(res?.total ?? 0);
       } catch (err) {
         return;
       }

x-pack/plugins/fleet/public/hooks/use_request/agents.ts

@@ -53,7 +53,7 @@ import type {
   PostRetrieveAgentsByActionsResponse,
 } from '../../types';
 
-import { useRequest, sendRequest } from './use_request';
+import { useRequest, sendRequest, sendRequestForRq } from './use_request';
 import type { UseRequestConfig } from './use_request';
 
 type RequestOptions = Pick<Partial<UseRequestConfig>, 'pollIntervalMs'>;
@@ -100,6 +100,16 @@ export function sendGetAgents(query: GetAgentsRequest['query'], options?: Reques
   });
 }
 
+export function sendGetAgentsQuery(query: GetAgentsRequest['query'], options?: RequestOptions) {
+  return sendRequestForRq<GetAgentsResponse>({
+    method: 'get',
+    path: agentRouteService.getListPath(),
+    version: API_VERSIONS.public.v1,
+    query,
+    ...options,
+  });
+}
+
 export function useGetAgentStatus(query: GetAgentStatusRequest['query'], options?: RequestOptions) {
   return useRequest<GetAgentStatusResponse>({
     method: 'get',

x-pack/plugins/fleet/server/routes/agent/handlers.ts

@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import { uniq } from 'lodash';
+import { omit, uniq } from 'lodash';
 import { type RequestHandler, SavedObjectsErrorHelpers } from '@kbn/core/server';
 import type { TypeOf } from '@kbn/config-schema';
 
 import type {
   GetAgentsResponse,
   GetOneAgentResponse,
   GetAgentStatusResponse,
-  PutAgentReassignResponse,
   GetAgentTagsResponse,
   GetAvailableVersionsResponse,
   GetActionStatusResponse,
@@ -30,7 +29,6 @@ import type {
   DeleteAgentRequestSchema,
   GetAgentStatusRequestSchema,
   GetAgentDataRequestSchema,
-  PutAgentReassignRequestSchemaDeprecated,
   PostAgentReassignRequestSchema,
   PostBulkAgentReassignRequestSchema,
   PostBulkUpdateAgentTagsRequestSchema,
@@ -207,7 +205,6 @@ export const getAgentsHandler: FleetRequestHandler<
     }
 
     const body: GetAgentsResponse = {
-      list: agents, // deprecated
       items: agents,
       total,
       page,
@@ -243,29 +240,6 @@ export const getAgentTagsHandler: RequestHandler<
   }
 };
 
-export const putAgentsReassignHandlerDeprecated: RequestHandler<
-  TypeOf<typeof PutAgentReassignRequestSchemaDeprecated.params>,
-  undefined,
-  TypeOf<typeof PutAgentReassignRequestSchemaDeprecated.body>
-> = async (context, request, response) => {
-  const coreContext = await context.core;
-  const soClient = coreContext.savedObjects.client;
-  const esClient = coreContext.elasticsearch.client.asInternalUser;
-  try {
-    await AgentService.reassignAgent(
-      soClient,
-      esClient,
-      request.params.agentId,
-      request.body.policy_id
-    );
-
-    const body: PutAgentReassignResponse = {};
-    return response.ok({ body });
-  } catch (error) {
-    return defaultFleetErrorHandler({ error, response });
-  }
-};
-
 export const postAgentReassignHandler: RequestHandler<
   TypeOf<typeof PostAgentReassignRequestSchema.params>,
   undefined,
@@ -341,7 +315,7 @@ export const getAgentStatusForAgentPolicyHandler: FleetRequestHandler<
       parsePolicyIds(request.query.policyIds)
     );
 
-    const body: GetAgentStatusResponse = { results };
+    const body: GetAgentStatusResponse = { results: omit(results, 'total') };
 
     return response.ok({ body });
   } catch (error) {

x-pack/plugins/fleet/server/routes/agent/index.test.ts

@@ -222,7 +222,6 @@ describe('schema validation', () => {
   it('list agents should return valid response', async () => {
     const expectedResponse: GetAgentsResponse = {
       items: [agent],
-      list: [agent],
       total: 1,
       page: 1,
       perPage: 1,
@@ -366,7 +365,6 @@ describe('schema validation', () => {
     const expectedResponse: GetAgentStatusResponse = {
       results: {
         events: 1,
-        total: 1,
         online: 1,
         error: 1,
         offline: 1,

x-pack/plugins/fleet/server/routes/agent/index.ts

@@ -23,7 +23,6 @@ import {
   GetAgentStatusRequestSchema,
   GetAgentDataRequestSchema,
   PostNewAgentActionRequestSchema,
-  PutAgentReassignRequestSchemaDeprecated,
   PostAgentReassignRequestSchema,
   PostBulkAgentReassignRequestSchema,
   PostAgentUpgradeRequestSchema,
@@ -68,7 +67,6 @@ import {
   updateAgentHandler,
   deleteAgentHandler,
   getAgentStatusForAgentPolicyHandler,
-  putAgentsReassignHandlerDeprecated,
   postBulkAgentReassignHandler,
   getAgentDataHandler,
   bulkUpdateAgentTagsHandler,
@@ -391,23 +389,6 @@ export const registerAPIRoutes = (router: FleetAuthzRouter, config: FleetConfigT
       postAgentUnenrollHandler
     );
 
-  router.versioned
-    .put({
-      path: AGENT_API_ROUTES.REASSIGN_PATTERN,
-      fleetAuthz: {
-        fleet: { allAgents: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: PutAgentReassignRequestSchemaDeprecated },
-      },
-      putAgentsReassignHandlerDeprecated
-    );
-
   router.versioned
     .post({
       path: AGENT_API_ROUTES.REASSIGN_PATTERN,
@@ -613,22 +594,6 @@ export const registerAPIRoutes = (router: FleetAuthzRouter, config: FleetConfigT
       },
       getAgentStatusForAgentPolicyHandler
     );
-  router.versioned
-    .get({
-      path: AGENT_API_ROUTES.STATUS_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        fleet: { readAgents: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: GetAgentStatusRequestSchema },
-      },
-      getAgentStatusForAgentPolicyHandler
-    );
   // Agent data
   router.versioned
     .get({