no

elastic · Jun 29, 2021 · c77026a · c77026a
1 parent d3805a6
commit c77026a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx b/x-pack/plugins/security_solution/public/common/components/matrix_histogram/index.tsx
@@ -91,6 +91,7 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
   title,
   titleSize,
   yTickFormatter,
+  skip,
 }) => {
   const dispatch = useDispatch();
   const handleBrushEnd = useCallback(
@@ -146,6 +147,7 @@ export const MatrixHistogramComponent: React.FC<MatrixHistogramComponentProps> =
     stackByField: selectedStackByOption.value,
     isPtrIncluded,
     docValueFields,
+    skip,
   };
 
   const [loading, { data, inspect, totalCount, refetch }] = useMatrixHistogramCombined(

diff --git a/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.tsx b/x-pack/plugins/security_solution/public/hosts/pages/details/details_tabs.tsx
@@ -70,7 +70,7 @@ export const HostDetailsTabs = React.memo<HostDetailsTabsProps>(
       deleteQuery,
       endDate: to,
       filterQuery,
-      skip: isInitializing,
+      skip: isInitializing || filterQuery === undefined,
       setQuery,
       startDate: from,
       type,

diff --git a/x-pack/plugins/security_solution/public/hosts/pages/hosts_tabs.tsx b/x-pack/plugins/security_solution/public/hosts/pages/hosts_tabs.tsx
@@ -69,7 +69,7 @@ export const HostsTabs = memo<HostsTabsProps>(
       endDate: to,
       filterQuery,
       indexNames,
-      skip: isInitializing,
+      skip: isInitializing || filterQuery === undefined,
       setQuery,
       startDate: from,
       type,

diff --git a/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx b/x-pack/plugins/security_solution/public/overview/components/events_by_dataset/index.tsx
@@ -180,6 +180,7 @@ const EventsByDatasetComponent: React.FC<Props> = ({
       setAbsoluteRangeDatePickerTarget={setAbsoluteRangeDatePickerTarget}
       setQuery={setQuery}
       showSpacer={showSpacer}
+      skip={filterQuery === undefined}
       startDate={from}
       timelineId={timelineId}
       {...eventsByDatasetHistogramConfigs}

diff --git a/...curity_solution/public/overview/containers/overview_cti_links/use_request_event_counts.ts b/...curity_solution/public/overview/containers/overview_cti_links/use_request_event_counts.ts
@@ -16,36 +16,38 @@ import { useKibana } from '../../../common/lib/kibana';
 export const useRequestEventCounts = (to: string, from: string) => {
   const { uiSettings } = useKibana().services;
 
+  const [filterQuery] = convertToBuildEsQuery({
+    config: esQuery.getEsQueryConfig(uiSettings),
+    indexPattern: {
+      fields: [
+        {
+          name: 'event.kind',
+          aggregatable: true,
+          searchable: true,
+          type: 'string',
+          esTypes: ['keyword'],
+        },
+      ],
+      title: 'filebeat-*',
+    },
+    queries: [{ query: 'event.type:indicator', language: 'kuery' }],
+    filters: [],
+  });
+
   const matrixHistogramRequest = useMemo(() => {
     return {
       endDate: to,
       errorMessage: i18n.translate('xpack.securitySolution.overview.errorFetchingEvents', {
         defaultMessage: 'Error fetching events',
       }),
-      filterQuery: convertToBuildEsQuery({
-        config: esQuery.getEsQueryConfig(uiSettings),
-        indexPattern: {
-          fields: [
-            {
-              name: 'event.kind',
-              aggregatable: true,
-              searchable: true,
-              type: 'string',
-              esTypes: ['keyword'],
-            },
-          ],
-          title: 'filebeat-*',
-        },
-        queries: [{ query: 'event.type:indicator', language: 'kuery' }],
-        filters: [],
-      }),
+      filterQuery,
       histogramType: MatrixHistogramType.events,
       indexNames: DEFAULT_CTI_SOURCE_INDEX,
       stackByField: EVENT_DATASET,
       startDate: from,
       size: 0,
     };
-  }, [to, from, uiSettings]);
+  }, [to, from, filterQuery]);
 
   const results = useMatrixHistogram(matrixHistogramRequest);