Merge branch 'main' into 197612-obxuxinfra-remove-feature-flags-for-g…

…a-features

x-pack/plugins/security_solution/public/app/components/top_values_popover/top_values_popover.tsx

@@ -16,7 +16,7 @@ import { useKibana } from '../../../common/lib/kibana';
 
 export const TopValuesPopover = React.memo(() => {
   const { pathname } = useLocation();
-  const { browserFields, indexPattern } = useSourcererDataView(getScopeFromPath(pathname));
+  const { browserFields, sourcererDataView } = useSourcererDataView(getScopeFromPath(pathname));
   const {
     services: { topValuesPopover },
   } = useKibana();
@@ -44,7 +44,7 @@ export const TopValuesPopover = React.memo(() => {
         showLegend
         scopeId={data.scopeId}
         toggleTopN={onClose}
-        indexPattern={indexPattern}
+        dataViewSpec={sourcererDataView}
         browserFields={browserFields}
       />
     </EuiWrappingPopover>

x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx

@@ -180,9 +180,8 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
   const {
     browserFields,
     dataViewId,
-    indexPattern,
-    sourcererDataView,
     selectedPatterns,
+    sourcererDataView,
     dataViewId: selectedDataViewId,
     loading: isLoadingIndexPattern,
   } = useSourcererDataView(sourcererScope);
@@ -271,12 +270,12 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
         dataProviders: [],
         filters: globalFilters,
         from: start,
-        indexPattern,
+        indexPattern: sourcererDataView,
         kqlMode: 'filter',
         kqlQuery: query,
         to: end,
       }),
-    [esQueryConfig, browserFields, globalFilters, start, indexPattern, query, end]
+    [esQueryConfig, browserFields, globalFilters, start, sourcererDataView, query, end]
   );
 
   const canQueryTimeline = useMemo(
@@ -318,7 +317,7 @@ const StatefulEventsViewerComponent: React.FC<EventsViewerProps & PropsFromRedux
       id: tableId,
       indexNames: indexNames ?? selectedPatterns,
       limit: itemsPerPage,
-      runtimeMappings: sourcererDataView?.runtimeFieldMap as RunTimeMappings,
+      runtimeMappings: sourcererDataView.runtimeFieldMap as RunTimeMappings,
       skip: !canQueryTimeline,
       sort: sortField,
       startDate: start,

x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/index.tsx

@@ -281,7 +281,7 @@ const InsightEditorComponent = ({
   onCancel,
 }: EuiMarkdownEditorUiPluginEditorProps<InsightComponentProps & { relativeTimerange: string }>) => {
   const isEditMode = node != null;
-  const { indexPattern } = useSourcererDataView(SourcererScopeName.default);
+  const { sourcererDataView } = useSourcererDataView(SourcererScopeName.default);
   const {
     unifiedSearch: {
       ui: { FiltersBuilderLazy },
@@ -400,7 +400,7 @@ const InsightEditorComponent = ({
     );
   }, [labelController.field.value, providers, dataView]);
   const filtersStub = useMemo(() => {
-    const index = indexPattern && indexPattern.getName ? indexPattern.getName() : '*';
+    const index = sourcererDataView.name ?? '*';
     return [
       {
         $state: {
@@ -414,7 +414,7 @@ const InsightEditorComponent = ({
         },
       },
     ];
-  }, [indexPattern]);
+  }, [sourcererDataView]);
   const isPlatinum = useLicense().isAtLeast('platinum');
 
   return (

x-pack/plugins/security_solution/public/common/components/markdown_editor/plugins/insight/use_insight_query.ts

@@ -41,7 +41,7 @@ export const useInsightQuery = ({
 }: UseInsightQuery): UseInsightQueryResult => {
   const { uiSettings } = useKibana().services;
   const esQueryConfig = useMemo(() => getEsQueryConfig(uiSettings), [uiSettings]);
-  const { browserFields, selectedPatterns, indexPattern, dataViewId } = useSourcererDataView(
+  const { browserFields, selectedPatterns, sourcererDataView, dataViewId } = useSourcererDataView(
     SourcererScopeName.timeline
   );
   const [hasError, setHasError] = useState(false);
@@ -51,7 +51,7 @@ export const useInsightQuery = ({
         const parsedCombinedQueries = combineQueries({
           config: esQueryConfig,
           dataProviders,
-          indexPattern,
+          indexPattern: sourcererDataView,
           browserFields,
           filters,
           kqlQuery: {
@@ -66,7 +66,7 @@ export const useInsightQuery = ({
       setHasError(true);
       return null;
     }
-  }, [browserFields, dataProviders, esQueryConfig, hasError, indexPattern, filters]);
+  }, [browserFields, dataProviders, esQueryConfig, hasError, sourcererDataView, filters]);
 
   const [dataLoadingState, { events, totalCount }] = useTimelineEvents({
     dataViewId,

x-pack/plugins/security_solution/public/common/components/top_n/index.test.tsx

@@ -10,7 +10,7 @@ import { mount } from 'enzyme';
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 import { mockBrowserFields } from '../../containers/source/mock';
-import { mockGlobalState, TestProviders, mockIndexPattern, createMockStore } from '../../mock';
+import { mockGlobalState, TestProviders, createMockStore, mockDataViewSpec } from '../../mock';
 import type { State } from '../../store';
 
 import type { Props } from './top_n';
@@ -145,7 +145,7 @@ const store = createMockStore(state);
 const testProps = {
   browserFields: mockBrowserFields,
   field,
-  indexPattern: mockIndexPattern,
+  indexPattern: mockDataViewSpec,
   scopeId: TableId.hostsPageEvents,
   toggleTopN: jest.fn(),
   onFilterAdded: jest.fn(),

x-pack/plugins/security_solution/public/common/components/top_n/index.tsx

@@ -9,8 +9,8 @@ import React, { useMemo } from 'react';
 import type { ConnectedProps } from 'react-redux';
 import { connect } from 'react-redux';
 
-import type { DataViewBase, Filter, Query } from '@kbn/es-query';
-import { getEsQueryConfig } from '@kbn/data-plugin/common';
+import type { Filter, Query } from '@kbn/es-query';
+import { type DataViewSpec, getEsQueryConfig } from '@kbn/data-plugin/common';
 import { isActiveTimeline } from '../../../helpers';
 import { InputsModelId } from '../../store/inputs/constants';
 import { useGlobalTime } from '../../containers/use_global_time';
@@ -77,7 +77,7 @@ const connector = connect(makeMapStateToProps);
 export interface OwnProps {
   browserFields: BrowserFields;
   field: string;
-  indexPattern: DataViewBase;
+  dataViewSpec?: DataViewSpec;
   scopeId?: string;
   toggleTopN: () => void;
   onFilterAdded?: () => void;
@@ -97,7 +97,7 @@ const StatefulTopNComponent: React.FC<Props> = ({
   browserFields,
   dataProviders,
   field,
-  indexPattern,
+  dataViewSpec: indexPattern,
   globalFilters = EMPTY_FILTERS,
   globalQuery = EMPTY_QUERY,
   kqlMode,

x-pack/plugins/security_solution/public/common/components/top_n/top_n.test.tsx

@@ -10,7 +10,7 @@ import { mount } from 'enzyme';
 import React from 'react';
 import { waitFor } from '@testing-library/react';
 
-import { TestProviders, mockIndexPattern } from '../../mock';
+import { TestProviders, mockDataViewSpec } from '../../mock';
 
 import { allEvents, defaultOptions } from './helpers';
 import type { Props as TopNProps } from './top_n';
@@ -107,7 +107,7 @@ describe('TopN', () => {
     field,
     filters: [],
     from: '2020-04-14T00:31:47.695Z',
-    indexPattern: mockIndexPattern,
+    indexPattern: mockDataViewSpec,
     options: defaultOptions,
     query,
     setAbsoluteRangeDatePickerTarget: InputsModelId.global,

x-pack/plugins/security_solution/public/common/components/top_n/top_n.tsx

@@ -9,7 +9,8 @@ import { EuiButtonIcon, EuiSuperSelect } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import styled from 'styled-components';
 
-import type { DataViewBase, Filter, Query } from '@kbn/es-query';
+import type { Filter, Query } from '@kbn/es-query';
+import type { DataViewSpec } from '@kbn/data-plugin/common';
 import type { GlobalTimeArgs } from '../../containers/use_global_time';
 import { EventsByDataset } from '../../../overview/components/events_by_dataset';
 import { SignalsByCategory } from '../../../overview/components/signals_by_category';
@@ -48,7 +49,7 @@ export interface Props extends Pick<GlobalTimeArgs, 'from' | 'to' | 'deleteQuery
   defaultView: TimelineEventsType;
   field: AlertsStackByField;
   filters: Filter[];
-  indexPattern: DataViewBase;
+  indexPattern?: DataViewSpec;
   options: TopNOption[];
   paddingSize?: 's' | 'm' | 'l' | 'none';
   query: Query;
@@ -118,7 +119,7 @@ const TopNComponent: React.FC<Props> = ({
             filters={applicableFilters}
             from={from}
             headerChildren={headerChildren}
-            indexPattern={indexPattern}
+            dataViewSpec={indexPattern}
             onlyField={field}
             paddingSize={paddingSize}
             query={query}

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/alerts_by_status_donut.test.ts

@@ -20,6 +20,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/alerts_histogram.test.ts

@@ -20,6 +20,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/alerts_table.test.ts

@@ -32,6 +32,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/alerts/rule_preview.test.ts

@@ -22,6 +22,7 @@ jest.mock('../../../../../../sourcerer/containers', () => ({
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
     selectedPatterns: ['signal-index'],
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/authentication.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/event.test.ts

@@ -22,6 +22,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/external_alert.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_area.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_host_metric.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_area.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_bar.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_destination_metric.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/hosts/kpi_unique_ips_source_metric.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/dns_top_domains.test.ts

@@ -19,6 +19,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_dns_queries.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_network_events.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_tls_handshakes.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_flow_ids.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_area.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_bar.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_destination_metric.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/network/kpi_unique_private_ips_source_metric.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_area.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_total_users_metric.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));
 

x-pack/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/users/kpi_user_authentication_metric_failure.test.ts

@@ -17,6 +17,7 @@ jest.mock('../../../../../sourcerer/containers', () => ({
     selectedPatterns: ['auditbeat-mytest-*'],
     dataViewId: 'security-solution-my-test',
     indicesExist: true,
+    sourcererDataView: {},
   }),
 }));