diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/components/events_viewer/index.tsx index 1225054c078a9..e97aa6aca1bf2 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/components/events_viewer/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/components/events_viewer/index.tsx @@ -233,7 +233,7 @@ const StatefulEventsViewerComponent: React.FC = ({ browserFields, dataProviders, field, - dataViewSpec: indexPattern, + dataViewSpec, globalFilters = EMPTY_FILTERS, globalQuery = EMPTY_QUERY, kqlMode, @@ -121,7 +121,7 @@ const StatefulTopNComponent: React.FC = ({ config: getEsQueryConfig(uiSettings), dataProviders, filters: activeTimelineFilters, - indexPattern, + dataViewSpec, kqlMode, kqlQuery: { language: 'kuery', @@ -135,7 +135,7 @@ const StatefulTopNComponent: React.FC = ({ uiSettings, dataProviders, activeTimelineFilters, - indexPattern, + dataViewSpec, kqlMode, activeTimelineKqlQueryExpression, ] @@ -155,7 +155,7 @@ const StatefulTopNComponent: React.FC = ({ field={field as AlertsStackByField} filters={isActiveTimeline(scopeId ?? '') ? EMPTY_FILTERS : globalFilters} from={isActiveTimeline(scopeId ?? '') ? activeTimelineFrom : from} - indexPattern={indexPattern} + dataViewSpec={dataViewSpec} options={options} paddingSize={paddingSize} query={isActiveTimeline(scopeId ?? '') ? EMPTY_QUERY : globalQuery} diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.test.tsx index 4067827e6de98..f7bff34b61f39 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.test.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.test.tsx @@ -107,7 +107,7 @@ describe('TopN', () => { field, filters: [], from: '2020-04-14T00:31:47.695Z', - indexPattern: mockDataViewSpec, + dataViewSpec: mockDataViewSpec, options: defaultOptions, query, setAbsoluteRangeDatePickerTarget: InputsModelId.global, diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.tsx index 7b21dcd945d8d..aa6c526d281a8 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/components/top_n/top_n.tsx @@ -52,7 +52,7 @@ export interface Props extends Pick = ({ filters, field, from, - indexPattern, + dataViewSpec, options, paddingSize, query, @@ -124,7 +124,7 @@ const TopNComponent: React.FC = ({ filters={applicableFilters} from={from} headerChildren={headerChildren} - dataViewSpec={indexPattern} + dataViewSpec={dataViewSpec} onlyField={field} paddingSize={paddingSize} query={query} diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/lib/kuery/index.ts b/x-pack/solutions/security/plugins/security_solution/public/common/lib/kuery/index.ts index c3ae79dd80e95..ac66e8f051b2e 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/lib/kuery/index.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/common/lib/kuery/index.ts @@ -30,7 +30,7 @@ export type PrimitiveOrArrayOfPrimitives = export interface CombineQueries { config: EsQueryConfig; dataProviders: DataProvider[]; - indexPattern?: DataViewSpec; + dataViewSpec?: DataViewSpec; browserFields: BrowserFields; filters: Filter[]; kqlQuery: Query; @@ -245,7 +245,7 @@ export interface CombinedQuery { export const combineQueries = ({ config, dataProviders = [], - indexPattern, + dataViewSpec, browserFields, filters = [], kqlQuery, @@ -258,7 +258,7 @@ export const combineQueries = ({ const [filterQuery, kqlError] = convertToBuildEsQuery({ config, queries: [kuery], - dataViewSpec: indexPattern, + dataViewSpec, filters, }); @@ -286,7 +286,7 @@ export const combineQueries = ({ const [filterQuery, kqlError] = convertToBuildEsQuery({ config, queries: [kuery], - dataViewSpec: indexPattern, + dataViewSpec, filters, }); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx index b0b821088b5e8..9e6cc89634a36 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx @@ -100,7 +100,7 @@ export const GroupedSubLevelComponent: React.FC = ({ return combineQueries({ config: getEsQueryConfig(uiSettings), dataProviders: [], - indexPattern: sourcererDataView, + dataViewSpec: sourcererDataView, browserFields, filters: [ ...(defaultFilters ?? []), diff --git a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/index.tsx index 3acb0578dad0f..4572a7a924c4b 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_table/index.tsx @@ -219,7 +219,7 @@ const DetectionEngineAlertsTableComponent: FC { - const columns = getNetworkTopCountriesColumns(indexPattern, flowTarget, type, tableId); + const columns = getNetworkTopCountriesColumns(flowTarget, type, tableId); // Columns to exclude from host details pages if (type === networkModel.NetworkType.details) { diff --git a/x-pack/solutions/security/plugins/security_solution/public/explore/network/components/network_top_countries_table/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/explore/network/components/network_top_countries_table/index.tsx index 3f34d79775f6f..0bee284e5f0e3 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/explore/network/components/network_top_countries_table/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/explore/network/components/network_top_countries_table/index.tsx @@ -9,7 +9,6 @@ import { last } from 'lodash/fp'; import React, { useCallback, useMemo } from 'react'; import { useDispatch } from 'react-redux'; import deepEqual from 'fast-deep-equal'; -import type { DataViewBase } from '@kbn/es-query'; import { networkActions, networkModel, networkSelectors } from '../../store'; import type { NetworkTopCountriesEdges, SortField } from '../../../../../common/search_strategy'; @@ -31,7 +30,6 @@ interface NetworkTopCountriesTableProps { fakeTotalCount: number; flowTargeted: FlowTargetSourceDest; id: string; - indexPattern: DataViewBase; isInspect: boolean; loading: boolean; loadPage: (newActivePage: number) => void; @@ -59,7 +57,6 @@ const NetworkTopCountriesTableComponent: React.FC fakeTotalCount, flowTargeted, id, - indexPattern, isInspect, loading, loadPage, @@ -152,8 +149,8 @@ const NetworkTopCountriesTableComponent: React.FC ); const columns = useMemo( - () => getCountriesColumnsCurated(indexPattern, flowTargeted, type, NetworkTopCountriesTableId), - [indexPattern, flowTargeted, type] + () => getCountriesColumnsCurated(flowTargeted, type, NetworkTopCountriesTableId), + [flowTargeted, type] ); return ( diff --git a/x-pack/solutions/security/plugins/security_solution/public/explore/network/pages/navigation/countries_query_tab_body.tsx b/x-pack/solutions/security/plugins/security_solution/public/explore/network/pages/navigation/countries_query_tab_body.tsx index e7c378f19768b..cd19ab18956c5 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/explore/network/pages/navigation/countries_query_tab_body.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/explore/network/pages/navigation/countries_query_tab_body.tsx @@ -56,7 +56,6 @@ export const CountriesQueryTabBody = ({ fakeTotalCount={getOr(50, 'fakeTotalCount', pageInfo)} flowTargeted={flowTarget} id={id} - indexPattern={indexPattern} inspect={inspect} isInspect={isInspected} loading={loading} diff --git a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.test.tsx index 1d9181b8514b1..4582469fbd9cc 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.test.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.test.tsx @@ -64,7 +64,6 @@ describe('useEventDetails', () => { expect(hookResult.result.current.dataAsNestedObject).toEqual({}); expect(hookResult.result.current.dataFormattedForFieldBrowser).toEqual([]); expect(hookResult.result.current.getFieldsData('test')).toEqual('test'); - expect('indexPattern' in hookResult.result.current).toEqual(true); expect(hookResult.result.current.loading).toEqual(false); expect(hookResult.result.current.refetchFlyoutData()).toEqual(undefined); expect(hookResult.result.current.searchHit).toEqual({}); diff --git a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.ts b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.ts index b880e372d5bed..3c2f4b7acb745 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/flyout/document_details/shared/hooks/use_event_details.ts @@ -8,7 +8,6 @@ import type { BrowserFields, TimelineEventsDetailsItem } from '@kbn/timelines-plugin/common'; import type { EcsSecurityExtension as Ecs } from '@kbn/securitysolution-ecs'; import { SecurityPageName } from '@kbn/security-solution-navigation'; -import { type DataViewSpec } from '@kbn/data-plugin/common'; import { DEFAULT_ALERTS_INDEX, DEFAULT_PREVIEW_INDEX } from '../../../../../common/constants'; import type { RunTimeMappings } from '../../../../../common/api/search_strategy'; import { useSpaceId } from '../../../../common/hooks/use_space_id'; @@ -63,10 +62,6 @@ export interface UseEventDetailsResult { * Retrieves searchHit values for the provided field */ getFieldsData: GetFieldsData; - /** - * Index pattern for rule details - */ - indexPattern?: DataViewSpec; /** * Whether the data is loading */ @@ -112,7 +107,6 @@ export const useEventDetails = ({ dataAsNestedObject, dataFormattedForFieldBrowser, getFieldsData, - indexPattern: sourcererDataView.sourcererDataView, loading, refetchFlyoutData, searchHit, diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx index 57eab0e4b32c6..80e435fda0955 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/modal/header/index.tsx @@ -109,7 +109,7 @@ export const TimelineModalHeader = React.memo( combineQueries({ config: esQueryConfig, dataProviders, - indexPattern: dataView, + dataViewSpec: dataView, browserFields, filters: filters ? filters : [], kqlQuery: kqlQueryObj, diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx index 17f06f0bb415c..4ad7ac0bdae68 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/kpi/kpi_container.tsx @@ -97,7 +97,7 @@ export const TimelineKpisContainer = ({ timelineId }: KpiExpandedProps) => { combineQueries({ config: esQueryConfig, dataProviders, - indexPattern: sourcererDataView, + dataViewSpec: sourcererDataView, browserFields, filters: filters ? filters : [], kqlQuery, diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/events_count.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/events_count.tsx index 621a1c79d9660..8b7cae36d54f9 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/events_count.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/events_count.tsx @@ -116,7 +116,7 @@ export const TimelineQueryTabEventsCountComponent: React.FC<{ timelineId: string return combineQueries({ config: esQueryConfig, dataProviders, - indexPattern: sourcererDataView, + dataViewSpec: sourcererDataView, browserFields, filters, kqlQuery, diff --git a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx index 3493a547a9d5b..e016b769115e0 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx @@ -149,7 +149,7 @@ export const QueryTabContentComponent: React.FC = ({ return combineQueries({ config: esQueryConfig, dataProviders, - indexPattern: sourcererDataView, + dataViewSpec: sourcererDataView, browserFields, filters, kqlQuery,