stephmilovic · stephmilovic · Oct 6, 2021 · Oct 6, 2021 · Oct 6, 2021 · Oct 6, 2021
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/change_indexpattern.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/change_indexpattern.tsx
@@ -72,7 +72,7 @@ export function ChangeIndexPattern({
           })}
         </EuiPopoverTitle>
         <EuiSelectable<{ value: string }>
-          data-test-subj="indexPattern-switcher"
+          data-test-subj="sourcerer-combo-box"
           {...selectableProps}
           searchable
           singleSelection="always"

diff --git a/src/plugins/index_pattern_management/public/components/breadcrumbs.ts b/src/plugins/index_pattern_management/public/components/breadcrumbs.ts
@@ -13,7 +13,8 @@ export function getListBreadcrumbs() {
   return [
     {
       text: i18n.translate('indexPatternManagement.indexPatterns.listBreadcrumb', {
-        defaultMessage: 'Index patterns',
+        // TODO: Steph/sourcerer revert myob
+        defaultMessage: 'Data views',
       }),
       href: `/`,
     },
@@ -25,7 +26,8 @@ export function getCreateBreadcrumbs() {
     ...getListBreadcrumbs(),
     {
       text: i18n.translate('indexPatternManagement.indexPatterns.createBreadcrumb', {
-        defaultMessage: 'Create index pattern',
+        // TODO: Steph/sourcerer revert myob
+        defaultMessage: 'Create data view',
       }),
       href: `/create`,
     },

diff --git a/...ns/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/...ns/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
@@ -47,7 +47,8 @@ const search = {
 };
 
 const title = i18n.translate('indexPatternManagement.indexPatternTable.title', {
-  defaultMessage: 'Index patterns',
+  // TODO: Steph/sourcerer revert myob
+  defaultMessage: 'Data views',
 });
 
 interface Props extends RouteComponentProps {
@@ -135,7 +136,7 @@ export const IndexPatternTable = ({
     >
       <FormattedMessage
         id="indexPatternManagement.indexPatternTable.createBtn"
-        defaultMessage="Create index pattern"
+        defaultMessage="Create data view"
       />
     </EuiButton>
   ) : (
@@ -165,7 +166,8 @@ export const IndexPatternTable = ({
         description={
           <FormattedMessage
             id="indexPatternManagement.indexPatternTable.indexPatternExplanation"
-            defaultMessage="Create and manage the index patterns that help you retrieve your data from Elasticsearch."
+            // TODO: Steph/sourcerer revert myob
+            defaultMessage="Create and manage the data views that help you retrieve your data from Elasticsearch."
           />
         }
         bottomBorder

diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts
@@ -33,7 +33,8 @@ export interface IndexPatternManagementSetup {}
 export interface IndexPatternManagementStart {}
 
 const sectionsHeader = i18n.translate('indexPatternManagement.indexPattern.sectionsHeader', {
-  defaultMessage: 'Index Patterns',
+  // TODO: Steph/sourcerer revert myob
+  defaultMessage: 'Data Views',
 });
 
 const IPM_APP_ID = 'indexPatterns';

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx
@@ -611,7 +611,7 @@ export const InnerIndexPatternDataPanel = function InnerIndexPatternDataPanel({
           >
             <EuiFlexItem grow={true} className="lnsInnerIndexPatternDataPanel__switcher">
               <ChangeIndexPattern
-                data-test-subj="indexPattern-switcher"
+                data-test-subj="sourcerer-combo-box"
                 trigger={{
                   label: currentIndexPattern.title,
                   title: currentIndexPattern.title,

diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/layerpanel.tsx
@@ -30,7 +30,7 @@ export function LayerPanel({ state, layerId, onChangeIndexPattern }: IndexPatter
   return (
     <I18nProvider>
       <ChangeIndexPattern
-        data-test-subj="indexPattern-switcher"
+        data-test-subj="sourcerer-combo-box"
         trigger={{
           label: indexPattern?.title || notFoundTitleLabel,
           title: indexPattern?.title || notFoundTitleLabel,

diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
@@ -8,6 +8,8 @@
 import type { TransformConfigSchema } from './transforms/types';
 import { ENABLE_CASE_CONNECTOR } from '../../cases/common';
 import { metadataTransformPattern } from './endpoint/constants';
+import { SavedObjectReference } from '../../../../src/core/types';
+import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../../../src/plugins/data/common';
 
 export const APP_ID = 'securitySolution';
 export const SERVER_APP_ID = 'siem';
@@ -128,6 +130,12 @@ export const DEFAULT_INDEX_PATTERN = [
   'winlogbeat-*',
 ];
 
+export const defaultDataViewRef: SavedObjectReference = {
+  id: DEFAULT_INDEX_PATTERN_ID,
+  name: 'dataViewId',
+  type: DATA_VIEW_SAVED_OBJECT_TYPE,
+};
+
 export const DEFAULT_INDEX_PATTERN_EXPERIMENTAL = [
   // TODO: Steph/ueba TEMP for testing UEBA data
   'ml_host_risk_score_*',

diff --git a/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts b/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts
@@ -46,6 +46,7 @@ export interface IndexField {
 export type BeatFields = Record<string, FieldInfo>;
 
 export interface IndexFieldsStrategyRequest extends IEsSearchRequest {
+  kipId?: string;
   indices: string[];
   onlyCheckIfIndicesExist: boolean;
 }

diff --git a/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts b/x-pack/plugins/security_solution/common/search_strategy/timeline/index.ts
@@ -173,6 +173,7 @@ export interface SortTimelineInput {
 export interface TimelineInput {
   columns?: Maybe<ColumnHeaderInput[]>;
   dataProviders?: Maybe<DataProviderInput[]>;
+  dataViewId?: Maybe<string>;
   description?: Maybe<string>;
   eqlOptions?: Maybe<EqlOptionsInput>;
   eventType?: Maybe<string>;

diff --git a/x-pack/plugins/security_solution/common/types/timeline/index.ts b/x-pack/plugins/security_solution/common/types/timeline/index.ts
@@ -272,6 +272,7 @@ export type TimelineTypeLiteralWithNull = runtimeTypes.TypeOf<typeof TimelineTyp
 export const SavedTimelineRuntimeType = runtimeTypes.partial({
   columns: unionWithNullType(runtimeTypes.array(SavedColumnHeaderRuntimeType)),
   dataProviders: unionWithNullType(runtimeTypes.array(SavedDataProviderRuntimeType)),
+  dataViewId: unionWithNullType(runtimeTypes.string),
   description: unionWithNullType(runtimeTypes.string),
   eqlOptions: unionWithNullType(EqlOptionsRuntimeType),
   eventType: unionWithNullType(runtimeTypes.string),
@@ -699,6 +700,7 @@ export interface TimelineResult {
   created?: Maybe<number>;
   createdBy?: Maybe<string>;
   dataProviders?: Maybe<DataProviderResult[]>;
+  dataViewId?: Maybe<string>;
   dateRange?: Maybe<DateRangePickerResult>;
   description?: Maybe<string>;
   eqlOptions?: Maybe<EqlOptionsResult>;

diff --git a/x-pack/plugins/security_solution/common/types/timeline/store.ts b/x-pack/plugins/security_solution/common/types/timeline/store.ts
@@ -38,19 +38,20 @@ export interface SortColumnTimeline {
 }
 
 export interface TimelinePersistInput {
-  id: string;
+  columns: ColumnHeaderOptions[];
   dataProviders?: DataProvider[];
+  dataViewId: string;
   dateRange?: {
     start: string;
     end: string;
   };
+  defaultColumns?: ColumnHeaderOptions[];
   excludedRowRendererIds?: RowRendererId[];
   expandedDetail?: TimelineExpandedDetail;
   filters?: Filter[];
-  columns: ColumnHeaderOptions[];
-  defaultColumns?: ColumnHeaderOptions[];
-  itemsPerPage?: number;
+  id: string;
   indexNames: string[];
+  itemsPerPage?: number;
   kqlQuery?: {
     filterQuery: SerializedFilterQuery | null;
   };

diff --git a/x-pack/plugins/security_solution/cypress/screens/sourcerer.ts b/x-pack/plugins/security_solution/cypress/screens/sourcerer.ts
@@ -7,10 +7,10 @@
 
 export const SOURCERER_TRIGGER = '[data-test-subj="sourcerer-trigger"]';
 export const SOURCERER_INPUT =
-  '[data-test-subj="indexPattern-switcher"] [data-test-subj="comboBoxInput"]';
+  '[data-test-subj="sourcerer-combo-box"] [data-test-subj="comboBoxInput"]';
 export const SOURCERER_OPTIONS =
-  '[data-test-subj="comboBoxOptionsList indexPattern-switcher-optionsList"]';
-export const SOURCERER_SAVE_BUTTON = 'button[data-test-subj="add-index"]';
+  '[data-test-subj="comboBoxOptionsList sourcerer-combo-box-optionsList"]';
+export const SOURCERER_SAVE_BUTTON = 'button[data-test-subj="sourcerer-save"]';
 export const SOURCERER_RESET_BUTTON = 'button[data-test-subj="sourcerer-reset"]';
 export const SOURCERER_POPOVER_TITLE = '.euiPopoverTitle';
 export const HOSTS_STAT = '[data-test-subj="stat-hosts"] [data-test-subj="stat-title"]';

diff --git a/x-pack/plugins/security_solution/public/cases/components/case_view/index.tsx b/x-pack/plugins/security_solution/public/cases/components/case_view/index.tsx
@@ -146,6 +146,7 @@ export const CaseView = React.memo(({ caseId, subCaseId, userCanCrud }: Props) =
       timelineActions.createTimeline({
         id: TimelineId.casePage,
         columns: [],
+        dataViewId: '',
         indexNames: [],
         expandedDetail: {},
         show: false,

diff --git a/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx b/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx
@@ -116,6 +116,7 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
     docValueFields,
     indexPattern,
     selectedPatterns,
+    selectedKipId,
     loading: isLoadingIndexPattern,
   } = useSourcererScope(scopeId);
   const { globalFullScreen } = useGlobalFullScreen();
@@ -127,14 +128,15 @@ const StatefulEventsViewerComponent: React.FC<Props> = ({
   useEffect(() => {
     if (createTimeline != null) {
       createTimeline({
-        id,
         columns,
+        dataViewId: selectedKipId,
         defaultColumns,
         excludedRowRendererIds,
+        id,
         indexNames: selectedPatterns,
-        sort,
         itemsPerPage,
         showCheckboxes,
+        sort,
       });
     }
     return () => {