[SECURITY SOLUTIONS] Bring Async Search Back (#82650) (#82731)

* bring async search back to the security solutions * remove id for timeline details searchStrategy * fix events count * fix total count * update units * update integration tests Co-authored-by: Angela Chuang <yi-chun.chuang@elastic.co> Co-authored-by: Patryk Kopycinski <contact@patrykkopycinski.com> Co-authored-by: Angela Chuang <yi-chun.chuang@elastic.co> Co-authored-by: Patryk Kopycinski <contact@patrykkopycinski.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
elastic · Nov 5, 2020 · 3a00dd3 · 3a00dd3
1 parent 850c0bb
commit 3a00dd3
Show file tree

Hide file tree

Showing 37 changed files with 46 additions and 115 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts b/x-pack/plugins/security_solution/public/common/containers/events/last_event_time/index.ts
@@ -25,8 +25,6 @@ import {
 import * as i18n from './translations';
 import { DocValueFields } from '../../../../../common/search_strategy';
 
-const ID = 'timelineEventsLastEventTimeQuery';
-
 export interface UseTimelineLastEventTimeArgs {
   lastSeen: string | null;
   refetch: inputsModel.Refetch;
@@ -56,7 +54,6 @@ export const useTimelineLastEventTime = ({
     defaultIndex: indexNames,
     docValueFields,
     factoryQueryType: TimelineEventsQueries.lastEventTime,
-    id: ID,
     indexKey,
     details,
   });

diff --git a/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts b/x-pack/plugins/security_solution/public/common/containers/matrix_histogram/index.ts
@@ -45,8 +45,6 @@ export interface UseMatrixHistogramArgs {
   }>;
 }
 
-const ID = 'matrixHistogramQuery';
-
 export const useMatrixHistogram = ({
   endDate,
   errorMessage,
@@ -73,7 +71,6 @@ export const useMatrixHistogram = ({
     factoryQueryType: MatrixHistogramQuery,
     filterQuery: createFilter(filterQuery),
     histogramType,
-    id: ID,
     timerange: {
       interval: '12h',
       from: startDate,

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/authentications/index.tsx
@@ -88,7 +88,6 @@ export const useAuthentications = ({
           docValueFields: docValueFields ?? [],
           factoryQueryType: HostsQueries.authentications,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           pagination: generateTablePaginationOptions(activePage, limit),
           timerange: {
             interval: '12h',
@@ -203,7 +202,6 @@ export const useAuthentications = ({
         docValueFields: docValueFields ?? [],
         factoryQueryType: HostsQueries.authentications,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         pagination: generateTablePaginationOptions(activePage, limit),
         timerange: {
           interval: '12h',

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/_index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/details/_index.tsx
@@ -65,7 +65,6 @@ export const useHostDetails = ({
       ? {
           defaultIndex: indexNames,
           hostName,
-          id,
           factoryQueryType: HostsQueries.details,
           timerange: {
             interval: '12h',
@@ -79,7 +78,7 @@ export const useHostDetails = ({
   const [hostDetailsResponse, setHostDetailsResponse] = useState<HostDetailsArgs>({
     endDate,
     hostDetails: {},
-    id: ID,
+    id,
     inspect: {
       dsl: [],
       response: [],
@@ -154,7 +153,6 @@ export const useHostDetails = ({
         defaultIndex: indexNames,
         factoryQueryType: HostsQueries.details,
         hostName,
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/hosts/index.tsx
@@ -83,7 +83,6 @@ export const useAllHost = ({
           docValueFields: docValueFields ?? [],
           factoryQueryType: HostsQueries.hosts,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           pagination: generateTablePaginationOptions(activePage, limit),
           timerange: {
             interval: '12h',
@@ -200,7 +199,6 @@ export const useAllHost = ({
         docValueFields: docValueFields ?? [],
         factoryQueryType: HostsQueries.hosts,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         pagination: generateTablePaginationOptions(activePage, limit),
         timerange: {
           interval: '12h',

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/authentications/index.tsx
@@ -61,7 +61,6 @@ export const useHostsKpiAuthentications = ({
           defaultIndex: indexNames,
           factoryQueryType: HostsKpiQueries.kpiAuthentications,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -159,7 +158,6 @@ export const useHostsKpiAuthentications = ({
         defaultIndex: indexNames,
         factoryQueryType: HostsKpiQueries.kpiAuthentications,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/hosts/index.tsx
@@ -60,7 +60,6 @@ export const useHostsKpiHosts = ({
           defaultIndex: indexNames,
           factoryQueryType: HostsKpiQueries.kpiHosts,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -149,7 +148,6 @@ export const useHostsKpiHosts = ({
         defaultIndex: indexNames,
         factoryQueryType: HostsKpiQueries.kpiHosts,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/kpi_hosts/unique_ips/index.tsx
@@ -61,7 +61,6 @@ export const useHostsKpiUniqueIps = ({
           defaultIndex: indexNames,
           factoryQueryType: HostsKpiQueries.kpiUniqueIps,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -156,7 +155,6 @@ export const useHostsKpiUniqueIps = ({
         defaultIndex: indexNames,
         factoryQueryType: HostsKpiQueries.kpiUniqueIps,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx b/x-pack/plugins/security_solution/public/hosts/containers/uncommon_processes/index.tsx
@@ -85,7 +85,6 @@ export const useUncommonProcesses = ({
           docValueFields: docValueFields ?? [],
           factoryQueryType: HostsQueries.uncommonProcesses,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           pagination: generateTablePaginationOptions(activePage, limit),
           timerange: {
             interval: '12h',
@@ -204,7 +203,6 @@ export const useUncommonProcesses = ({
         docValueFields: docValueFields ?? [],
         factoryQueryType: HostsQueries.uncommonProcesses,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         pagination: generateTablePaginationOptions(activePage, limit),
         timerange: {
           interval: '12h',

diff --git a/x-pack/plugins/security_solution/public/network/containers/details/index.tsx b/x-pack/plugins/security_solution/public/network/containers/details/index.tsx
@@ -69,7 +69,6 @@ export const useNetworkDetails = ({
           docValueFields: docValueFields ?? [],
           factoryQueryType: NetworkQueries.details,
           filterQuery: createFilter(filterQuery),
-          id,
           ip,
         }
       : null
@@ -153,7 +152,6 @@ export const useNetworkDetails = ({
         docValueFields: docValueFields ?? [],
         factoryQueryType: NetworkQueries.details,
         filterQuery: createFilter(filterQuery),
-        id,
         ip,
       };
       if (!skip && !deepEqual(prevRequest, myRequest)) {

diff --git a/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx b/x-pack/plugins/security_solution/public/network/containers/kpi_network/dns/index.tsx
@@ -65,7 +65,6 @@ export const useNetworkKpiDns = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkKpiQueries.dns,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -152,7 +151,6 @@ export const useNetworkKpiDns = ({
         defaultIndex: indexNames,
         factoryQueryType: NetworkKpiQueries.dns,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/.../plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx b/.../plugins/security_solution/public/network/containers/kpi_network/network_events/index.tsx
@@ -65,7 +65,6 @@ export const useNetworkKpiNetworkEvents = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkKpiQueries.networkEvents,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -157,7 +156,6 @@ export const useNetworkKpiNetworkEvents = ({
         defaultIndex: indexNames,
         factoryQueryType: NetworkKpiQueries.networkEvents,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/.../plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx b/.../plugins/security_solution/public/network/containers/kpi_network/tls_handshakes/index.tsx
@@ -65,7 +65,6 @@ export const useNetworkKpiTlsHandshakes = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkKpiQueries.tlsHandshakes,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -156,7 +155,6 @@ export const useNetworkKpiTlsHandshakes = ({
         defaultIndex: indexNames,
         factoryQueryType: NetworkKpiQueries.tlsHandshakes,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/...ck/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx b/...ck/plugins/security_solution/public/network/containers/kpi_network/unique_flows/index.tsx
@@ -65,7 +65,6 @@ export const useNetworkKpiUniqueFlows = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkKpiQueries.uniqueFlows,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -157,7 +156,6 @@ export const useNetworkKpiUniqueFlows = ({
         defaultIndex: indexNames,
         factoryQueryType: NetworkKpiQueries.uniqueFlows,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/...gins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx b/...gins/security_solution/public/network/containers/kpi_network/unique_private_ips/index.tsx
@@ -69,7 +69,6 @@ export const useNetworkKpiUniquePrivateIps = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkKpiQueries.uniquePrivateIps,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -168,7 +167,6 @@ export const useNetworkKpiUniquePrivateIps = ({
         defaultIndex: indexNames,
         factoryQueryType: NetworkKpiQueries.uniquePrivateIps,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,

diff --git a/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_dns/index.tsx
@@ -79,7 +79,6 @@ export const useNetworkDns = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkQueries.dns,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           isPtrIncluded,
           pagination: generateTablePaginationOptions(activePage, limit),
           sort,
@@ -197,7 +196,6 @@ export const useNetworkDns = ({
         isPtrIncluded,
         factoryQueryType: NetworkQueries.dns,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         pagination: generateTablePaginationOptions(activePage, limit),
         sort,
         timerange: {

diff --git a/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_http/index.tsx
@@ -82,7 +82,6 @@ export const useNetworkHttp = ({
           defaultIndex: indexNames,
           factoryQueryType: NetworkQueries.http,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           ip,
           pagination: generateTablePaginationOptions(activePage, limit),
           sort: sort as SortField,
@@ -197,7 +196,6 @@ export const useNetworkHttp = ({
         defaultIndex: indexNames,
         factoryQueryType: NetworkQueries.http,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         ip,
         pagination: generateTablePaginationOptions(activePage, limit),
         sort: sort as SortField,

diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_countries/index.tsx
@@ -86,7 +86,6 @@ export const useNetworkTopCountries = ({
           factoryQueryType: NetworkQueries.topCountries,
           filterQuery: createFilter(filterQuery),
           flowTarget,
-          id: queryId,
           ip,
           pagination: generateTablePaginationOptions(activePage, limit),
           sort,
@@ -204,7 +203,6 @@ export const useNetworkTopCountries = ({
         factoryQueryType: NetworkQueries.topCountries,
         filterQuery: createFilter(filterQuery),
         flowTarget,
-        id: queryId,
         ip,
         pagination: generateTablePaginationOptions(activePage, limit),
         sort,
@@ -219,19 +217,7 @@ export const useNetworkTopCountries = ({
       }
       return prevRequest;
     });
-  }, [
-    activePage,
-    indexNames,
-    endDate,
-    filterQuery,
-    ip,
-    limit,
-    startDate,
-    sort,
-    skip,
-    flowTarget,
-    queryId,
-  ]);
+  }, [activePage, indexNames, endDate, filterQuery, ip, limit, startDate, sort, skip, flowTarget]);
 
   useEffect(() => {
     networkTopCountriesSearch(networkTopCountriesRequest);

diff --git a/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx b/x-pack/plugins/security_solution/public/network/containers/network_top_n_flow/index.tsx
@@ -85,7 +85,6 @@ export const useNetworkTopNFlow = ({
           factoryQueryType: NetworkQueries.topNFlow,
           filterQuery: createFilter(filterQuery),
           flowTarget,
-          id: `${ID}-${flowTarget}`,
           ip,
           pagination: generateTablePaginationOptions(activePage, limit),
           sort,
@@ -201,7 +200,6 @@ export const useNetworkTopNFlow = ({
         factoryQueryType: NetworkQueries.topNFlow,
         filterQuery: createFilter(filterQuery),
         flowTarget,
-        id: `${ID}-${flowTarget}`,
         ip,
         pagination: generateTablePaginationOptions(activePage, limit),
         timerange: {

diff --git a/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx b/x-pack/plugins/security_solution/public/network/containers/tls/index.tsx
@@ -82,7 +82,6 @@ export const useNetworkTls = ({
           factoryQueryType: NetworkQueries.tls,
           filterQuery: createFilter(filterQuery),
           flowTarget,
-          id,
           ip,
           pagination: generateTablePaginationOptions(activePage, limit),
           sort,
@@ -195,7 +194,6 @@ export const useNetworkTls = ({
         factoryQueryType: NetworkQueries.tls,
         filterQuery: createFilter(filterQuery),
         flowTarget,
-        id,
         ip,
         pagination: generateTablePaginationOptions(activePage, limit),
         timerange: {

diff --git a/x-pack/plugins/security_solution/public/network/containers/users/index.tsx b/x-pack/plugins/security_solution/public/network/containers/users/index.tsx
@@ -80,7 +80,6 @@ export const useNetworkUsers = ({
           factoryQueryType: NetworkQueries.users,
           filterQuery: createFilter(filterQuery),
           flowTarget,
-          id,
           ip,
           pagination: generateTablePaginationOptions(activePage, limit),
           sort,
@@ -192,7 +191,6 @@ export const useNetworkUsers = ({
     setNetworkUsersRequest((prevRequest) => {
       const myRequest = {
         ...(prevRequest ?? {}),
-        id,
         ip,
         defaultIndex,
         factoryQueryType: NetworkQueries.users,
@@ -222,7 +220,6 @@ export const useNetworkUsers = ({
     skip,
     ip,
     flowTarget,
-    id,
   ]);
 
   useEffect(() => {

diff --git a/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx b/x-pack/plugins/security_solution/public/overview/containers/overview_host/index.tsx
@@ -61,7 +61,6 @@ export const useHostOverview = ({
           defaultIndex: indexNames,
           factoryQueryType: HostsQueries.overview,
           filterQuery: createFilter(filterQuery),
-          id: ID,
           timerange: {
             interval: '12h',
             from: startDate,
@@ -148,7 +147,6 @@ export const useHostOverview = ({
         defaultIndex: indexNames,
         factoryQueryType: HostsQueries.overview,
         filterQuery: createFilter(filterQuery),
-        id: ID,
         timerange: {
           interval: '12h',
           from: startDate,