[Security Solution] remove query strategy v1 (elastic#104196)

x-pack/plugins/security_solution/common/endpoint/types/index.ts

@@ -178,8 +178,6 @@ export interface HostResultList {
   request_page_size: number;
   /* the page index requested */
   request_page_index: number;
-  /* the version of the query strategy */
-  query_strategy_version: MetadataQueryStrategyVersions;
   /* policy IDs and versions */
   policy_info?: HostInfo['policy_info'];
 }
@@ -404,21 +402,11 @@ export enum HostStatus {
   INACTIVE = 'inactive',
 }
 
-export enum MetadataQueryStrategyVersions {
-  VERSION_1 = 'v1',
-  VERSION_2 = 'v2',
-}
-
 export type PolicyInfo = Immutable<{
   revision: number;
   id: string;
 }>;
 
-export interface HostMetadataInfo {
-  metadata: HostMetadata;
-  query_strategy_version: MetadataQueryStrategyVersions;
-}
-
 export type HostInfo = Immutable<{
   metadata: HostMetadata;
   host_status: HostStatus;
@@ -438,8 +426,6 @@ export type HostInfo = Immutable<{
      */
     endpoint: PolicyInfo;
   };
-  /* the version of the query strategy */
-  query_strategy_version: MetadataQueryStrategyVersions;
 }>;
 
 // HostMetadataDetails is now just HostMetadata

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts

@@ -15,7 +15,6 @@ import {
   HostPolicyResponse,
   HostResultList,
   HostStatus,
-  MetadataQueryStrategyVersions,
 } from '../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
 import {
@@ -54,7 +53,6 @@ export const endpointMetadataHttpMocks = httpHandlerMockFactory<EndpointMetadata
             const endpoint = {
               metadata: generator.generateHostMetadata(),
               host_status: HostStatus.UNHEALTHY,
-              query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
             };
 
             generator.updateCommonInfo();
@@ -64,7 +62,6 @@ export const endpointMetadataHttpMocks = httpHandlerMockFactory<EndpointMetadata
           total: 10,
           request_page_size: 10,
           request_page_index: 0,
-          query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
         };
       },
     },
@@ -78,7 +75,6 @@ export const endpointMetadataHttpMocks = httpHandlerMockFactory<EndpointMetadata
         return {
           metadata: generator.generateHostMetadata(),
           host_status: HostStatus.UNHEALTHY,
-          query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
         };
       },
     },

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts

@@ -56,7 +56,6 @@ export const initialEndpointPageState = (): Immutable<EndpointState> => {
     agentsWithEndpointsTotalError: undefined,
     endpointsTotal: 0,
     endpointsTotalError: undefined,
-    queryStrategyVersion: undefined,
     policyVersionInfo: undefined,
     hostStatus: undefined,
     isolationRequestState: createUninitialisedResourceState(),

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts

@@ -28,7 +28,6 @@ import {
   nonExistingPolicies,
   patterns,
   searchBarQuery,
-  isTransformEnabled,
   getIsIsolationRequestPending,
   getCurrentIsolationRequestState,
   getActivityLogData,
@@ -180,7 +179,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
       }
 
       // get index pattern and fields for search bar
-      if (patterns(getState()).length === 0 && isTransformEnabled(getState())) {
+      if (patterns(getState()).length === 0) {
         try {
           const indexPatterns = await fetchIndexPatterns();
           if (indexPatterns !== undefined) {

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/mock_endpoint_result_list.ts

@@ -12,7 +12,6 @@ import {
   HostPolicyResponse,
   HostResultList,
   HostStatus,
-  MetadataQueryStrategyVersions,
   PendingActionsResponse,
 } from '../../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
@@ -38,13 +37,11 @@ export const mockEndpointResultList: (options?: {
   total?: number;
   request_page_size?: number;
   request_page_index?: number;
-  query_strategy_version?: MetadataQueryStrategyVersions;
 }) => HostResultList = (options = {}) => {
   const {
     total = 1,
     request_page_size: requestPageSize = 10,
     request_page_index: requestPageIndex = 0,
-    query_strategy_version: queryStrategyVersion = MetadataQueryStrategyVersions.VERSION_2,
   } = options;
 
   // Skip any that are before the page we're on
@@ -58,15 +55,13 @@ export const mockEndpointResultList: (options?: {
     hosts.push({
       metadata: generator.generateHostMetadata(),
       host_status: HostStatus.UNHEALTHY,
-      query_strategy_version: queryStrategyVersion,
     });
   }
   const mock: HostResultList = {
     hosts,
     total,
     request_page_size: requestPageSize,
     request_page_index: requestPageIndex,
-    query_strategy_version: queryStrategyVersion,
   };
   return mock;
 };
@@ -78,7 +73,6 @@ export const mockEndpointDetailsApiResult = (): HostInfo => {
   return {
     metadata: generator.generateHostMetadata(),
     host_status: HostStatus.UNHEALTHY,
-    query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
   };
 };
 
@@ -92,7 +86,6 @@ const endpointListApiPathHandlerMocks = ({
   endpointPackagePolicies = [],
   policyResponse = generator.generatePolicyResponse(),
   agentPolicy = generator.generateAgentPolicy(),
-  queryStrategyVersion = MetadataQueryStrategyVersions.VERSION_2,
   totalAgentsUsingEndpoint = 0,
 }: {
   /** route handlers will be setup for each individual host in this array */
@@ -101,7 +94,6 @@ const endpointListApiPathHandlerMocks = ({
   endpointPackagePolicies?: GetPolicyListResponse['items'];
   policyResponse?: HostPolicyResponse;
   agentPolicy?: GetAgentPoliciesResponseItem;
-  queryStrategyVersion?: MetadataQueryStrategyVersions;
   totalAgentsUsingEndpoint?: number;
 } = {}) => {
   const apiHandlers = {
@@ -119,7 +111,6 @@ const endpointListApiPathHandlerMocks = ({
         request_page_size: 10,
         request_page_index: 0,
         total: endpointsResults?.length || 0,
-        query_strategy_version: queryStrategyVersion,
       };
     },
 
@@ -192,16 +183,11 @@ export const setEndpointListApiMockImplementation: (
   apiResponses?: Parameters<typeof endpointListApiPathHandlerMocks>[0]
 ) => void = (
   mockedHttpService,
-  {
-    endpointsResults = mockEndpointResultList({ total: 3 }).hosts,
-    queryStrategyVersion = MetadataQueryStrategyVersions.VERSION_2,
-    ...pathHandlersOptions
-  } = {}
+  { endpointsResults = mockEndpointResultList({ total: 3 }).hosts, ...pathHandlersOptions } = {}
 ) => {
   const apiHandlers = endpointListApiPathHandlerMocks({
     ...pathHandlersOptions,
     endpointsResults,
-    queryStrategyVersion,
   });
 
   mockedHttpService.post

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts

@@ -89,7 +89,6 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
       total,
       request_page_size: pageSize,
       request_page_index: pageIndex,
-      query_strategy_version: queryStrategyVersion,
       policy_info: policyVersionInfo,
     } = action.payload;
     return {
@@ -98,7 +97,6 @@ export const endpointListReducer: StateReducer = (state = initialEndpointPageSta
       total,
       pageSize,
       pageIndex,
-      queryStrategyVersion,
       policyVersionInfo,
       loading: false,
       error: undefined,

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts

@@ -15,7 +15,6 @@ import {
   HostPolicyResponseAppliedAction,
   HostPolicyResponseConfiguration,
   HostPolicyResponseActionStatus,
-  MetadataQueryStrategyVersions,
   HostStatus,
   ActivityLog,
   HostMetadata,
@@ -90,17 +89,11 @@ export const agentsWithEndpointsTotalError = (state: Immutable<EndpointState>) =
   state.agentsWithEndpointsTotalError;
 
 export const endpointsTotalError = (state: Immutable<EndpointState>) => state.endpointsTotalError;
-const queryStrategyVersion = (state: Immutable<EndpointState>) => state.queryStrategyVersion;
 
 export const endpointPackageVersion = createSelector(endpointPackageInfo, (info) =>
   isLoadedResourceState(info) ? info.data.version : undefined
 );
 
-export const isTransformEnabled = createSelector(
-  queryStrategyVersion,
-  (version) => version !== MetadataQueryStrategyVersions.VERSION_1
-);
-
 /**
  * Returns the index patterns for the SearchBar to use for autosuggest
  */

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts

@@ -13,7 +13,6 @@ import {
   HostPolicyResponse,
   AppLocation,
   PolicyData,
-  MetadataQueryStrategyVersions,
   HostStatus,
   HostIsolationResponse,
   EndpointPendingActions,
@@ -96,8 +95,6 @@ export interface EndpointState {
   endpointsTotal: number;
   /** api error for total, actual Endpoints */
   endpointsTotalError?: ServerApiError;
-  /** The query strategy version that informs whether the transform for KQL is enabled or not */
-  queryStrategyVersion?: MetadataQueryStrategyVersions;
   /** The policy IDs and revision number of the corresponding agent, and endpoint. May be more recent than what's running */
   policyVersionInfo?: HostInfo['policy_info'];
   /** The status of the host, which is mapped to the Elastic Agent status in Fleet */

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.test.tsx

@@ -23,7 +23,6 @@ import {
   HostPolicyResponseActionStatus,
   HostPolicyResponseAppliedAction,
   HostStatus,
-  MetadataQueryStrategyVersions,
 } from '../../../../../common/endpoint/types';
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { POLICY_STATUS_TO_TEXT } from './host_constants';
@@ -167,31 +166,6 @@ describe('when on the endpoint list page', () => {
     });
   });
 
-  describe('when loading data with the query_strategy_version is `v1`', () => {
-    beforeEach(() => {
-      reactTestingLibrary.act(() => {
-        const mockedEndpointListData = mockEndpointResultList({
-          total: 4,
-          query_strategy_version: MetadataQueryStrategyVersions.VERSION_1,
-        });
-        setEndpointListApiMockImplementation(coreStart.http, {
-          endpointsResults: mockedEndpointListData.hosts,
-          queryStrategyVersion: mockedEndpointListData.query_strategy_version,
-        });
-      });
-    });
-    afterEach(() => {
-      jest.clearAllMocks();
-    });
-    it('should not display the KQL bar', async () => {
-      const renderResult = render();
-      await reactTestingLibrary.act(async () => {
-        await middlewareSpy.waitForAction('serverReturnedEndpointList');
-      });
-      expect(renderResult.queryByTestId('adminSearchBar')).toBeNull();
-    });
-  });
-
   describe('when determining when to show the enrolling message', () => {
     afterEach(() => {
       jest.clearAllMocks();
@@ -268,7 +242,6 @@ describe('when on the endpoint list page', () => {
         reactTestingLibrary.act(() => {
           const mockedEndpointData = mockEndpointResultList({ total: 5 });
           const hostListData = mockedEndpointData.hosts;
-          const queryStrategyVersion = mockedEndpointData.query_strategy_version;
 
           firstPolicyID = hostListData[0].metadata.Endpoint.policy.applied.id;
           firstPolicyRev = hostListData[0].metadata.Endpoint.policy.applied.endpoint_policy_version;
@@ -329,7 +302,6 @@ describe('when on the endpoint list page', () => {
                 hostListData[index].metadata.Endpoint.policy.applied,
                 setup.policy
               ),
-              query_strategy_version: queryStrategyVersion,
             };
           });
           hostListData.forEach((item, index) => {
@@ -535,8 +507,6 @@ describe('when on the endpoint list page', () => {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         host_status,
         metadata: { agent, Endpoint, ...details },
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        query_strategy_version,
       } = mockEndpointDetailsApiResult();
 
       hostDetails = {
@@ -555,7 +525,6 @@ describe('when on the endpoint list page', () => {
             id: '1',
           },
         },
-        query_strategy_version,
       };
 
       const policy = docGenerator.generatePolicyPackagePolicy();
@@ -1198,7 +1167,7 @@ describe('when on the endpoint list page', () => {
     let renderResult: ReturnType<AppContextTestRender['render']>;
 
     const mockEndpointListApi = () => {
-      const { hosts, query_strategy_version: queryStrategyVersion } = mockEndpointResultList();
+      const { hosts } = mockEndpointResultList();
       hostInfo = {
         host_status: hosts[0].host_status,
         metadata: {
@@ -1222,7 +1191,6 @@ describe('when on the endpoint list page', () => {
             version: '7.14.0',
           },
         },
-        query_strategy_version: queryStrategyVersion,
       };
 
       const packagePolicy = docGenerator.generatePolicyPackagePolicy();

x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/index.tsx

@@ -120,7 +120,6 @@ export const EndpointList = () => {
     areEndpointsEnrolling,
     agentsWithEndpointsTotalError,
     endpointsTotalError,
-    isTransformEnabled,
   } = useEndpointSelector(selector);
   const { search } = useFormatUrl(SecurityPageName.administration);
   const { getAppUrl } = useAppUrl();
@@ -476,8 +475,8 @@ export const EndpointList = () => {
   const hasListData = listData && listData.length > 0;
 
   const refreshStyle = useMemo(() => {
-    return { display: endpointsExist && isTransformEnabled ? 'flex' : 'none', maxWidth: 200 };
-  }, [endpointsExist, isTransformEnabled]);
+    return { display: endpointsExist ? 'flex' : 'none', maxWidth: 200 };
+  }, [endpointsExist]);
 
   const refreshIsPaused = useMemo(() => {
     return !endpointsExist ? false : hasSelectedEndpoint ? true : !isAutoRefreshEnabled;
@@ -492,8 +491,8 @@ export const EndpointList = () => {
   }, [endpointsTotalError, agentsWithEndpointsTotalError]);
 
   const shouldShowKQLBar = useMemo(() => {
-    return endpointsExist && !patternsError && isTransformEnabled;
-  }, [endpointsExist, patternsError, isTransformEnabled]);
+    return endpointsExist && !patternsError;
+  }, [endpointsExist, patternsError]);
 
   return (
     <AdministrationListPage