From f5557eed51259e9b5926d3adf1b3e1b5c908bbd9 Mon Sep 17 00:00:00 2001
From: Diana Derevyankina <dziyana_dzeraviankina@epam.com>
Date: Fri, 27 Aug 2021 15:42:44 +0300
Subject: [PATCH 1/2] [Discover] Rename Index pattern to Data view

---
 ...iscover_index_pattern_management.test.tsx.snap |  6 +++---
 .../components/sidebar/change_indexpattern.tsx    |  4 ++--
 .../main/components/sidebar/discover_field.tsx    |  6 +++---
 .../sidebar/discover_index_pattern_management.tsx |  6 +++---
 .../apps/main/utils/resolve_index_pattern.ts      | 12 ++++++------
 .../public/application/components/doc/doc.tsx     |  6 +++---
 src/plugins/discover/server/ui_settings.ts        |  8 ++++----
 .../plugins/translations/translations/ja-JP.json  | 15 ---------------
 .../plugins/translations/translations/zh-CN.json  | 15 ---------------
 9 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
index 3ad902ed22fe8c..609b408188e9ad 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
@@ -708,7 +708,7 @@ exports[`Discover IndexPattern Management renders correctly 1`] = `
     anchorPosition="downCenter"
     button={
       <EuiButtonIcon
-        aria-label="Index pattern settings"
+        aria-label="Data view settings"
         color="text"
         data-test-subj="discoverIndexPatternActions"
         iconType="boxesHorizontal"
@@ -731,14 +731,14 @@ exports[`Discover IndexPattern Management renders correctly 1`] = `
         className="euiPopover__anchor"
       >
         <EuiButtonIcon
-          aria-label="Index pattern settings"
+          aria-label="Data view settings"
           color="text"
           data-test-subj="discoverIndexPatternActions"
           iconType="boxesHorizontal"
           onClick={[Function]}
         >
           <button
-            aria-label="Index pattern settings"
+            aria-label="Data view settings"
             className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
             data-test-subj="discoverIndexPatternActions"
             disabled={false}
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
index 5f2f35e2419dd7..d498894ace9e51 100644
--- 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
@@ -67,8 +67,8 @@ export function ChangeIndexPattern({
     >
       <div style={{ width: 320 }}>
         <EuiPopoverTitle>
-          {i18n.translate('discover.fieldChooser.indexPattern.changeIndexPatternTitle', {
-            defaultMessage: 'Change index pattern',
+          {i18n.translate('discover.fieldChooser.indexPattern.changeDataViewTitle', {
+            defaultMessage: 'Change data view',
           })}
         </EuiPopoverTitle>
         <EuiSelectable<{ value: string }>
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
index 707514073e23e4..f2919f6a9bfd42 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
@@ -328,7 +328,7 @@ function DiscoverFieldComponent({
               iconType="pencil"
               data-test-subj={`discoverFieldListPanelEdit-${field.name}`}
               aria-label={i18n.translate('discover.fieldChooser.discoverField.editFieldLabel', {
-                defaultMessage: 'Edit index pattern field',
+                defaultMessage: 'Edit data view field',
               })}
             />
           </EuiFlexItem>
@@ -337,7 +337,7 @@ function DiscoverFieldComponent({
           <EuiFlexItem grow={false} data-test-subj="discoverFieldListPanelDeleteItem">
             <EuiToolTip
               content={i18n.translate('discover.fieldChooser.discoverField.deleteFieldLabel', {
-                defaultMessage: 'Delete index pattern field',
+                defaultMessage: 'Delete data view field',
               })}
             >
               <EuiButtonIcon
@@ -348,7 +348,7 @@ function DiscoverFieldComponent({
                 data-test-subj={`discoverFieldListPanelDelete-${field.name}`}
                 color="danger"
                 aria-label={i18n.translate('discover.fieldChooser.discoverField.deleteFieldLabel', {
-                  defaultMessage: 'Delete index pattern field',
+                  defaultMessage: 'Delete data view field',
                 })}
               />
             </EuiToolTip>
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx
index 125172f47b7c42..8270981329cc02 100644
--- a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx
@@ -62,7 +62,7 @@ export function DiscoverIndexPatternManagement(props: DiscoverIndexPatternManage
           iconType="boxesHorizontal"
           data-test-subj="discoverIndexPatternActions"
           aria-label={i18n.translate('discover.fieldChooser.indexPatterns.actionsPopoverLabel', {
-            defaultMessage: 'Index pattern settings',
+            defaultMessage: 'Data view settings',
           })}
           onClick={() => {
             setIsAddIndexPatternFieldPopoverOpen(!isAddIndexPatternFieldPopoverOpen);
@@ -83,7 +83,7 @@ export function DiscoverIndexPatternManagement(props: DiscoverIndexPatternManage
             }}
           >
             {i18n.translate('discover.fieldChooser.indexPatterns.addFieldButton', {
-              defaultMessage: 'Add field to index pattern',
+              defaultMessage: 'Add field to data view',
             })}
           </EuiContextMenuItem>,
           <EuiContextMenuItem
@@ -98,7 +98,7 @@ export function DiscoverIndexPatternManagement(props: DiscoverIndexPatternManage
             }}
           >
             {i18n.translate('discover.fieldChooser.indexPatterns.manageFieldButton', {
-              defaultMessage: 'Manage index pattern fields',
+              defaultMessage: 'Manage data view fields',
             })}
           </EuiContextMenuItem>,
         ]}
diff --git a/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
index a5149ea2b3dd7b..65185c937e70d1 100644
--- a/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
@@ -109,8 +109,8 @@ export function resolveIndexPattern(
   }
 
   if (stateVal && !stateValFound) {
-    const warningTitle = i18n.translate('discover.valueIsNotConfiguredIndexPatternIDWarningTitle', {
-      defaultMessage: '{stateVal} is not a configured index pattern ID',
+    const warningTitle = i18n.translate('discover.valueIsNotConfiguredDataViewIDWarningTitle', {
+      defaultMessage: '{stateVal} is not a configured data view ID',
       values: {
         stateVal: `"${stateVal}"`,
       },
@@ -119,9 +119,9 @@ export function resolveIndexPattern(
     if (ownIndexPattern) {
       toastNotifications.addWarning({
         title: warningTitle,
-        text: i18n.translate('discover.showingSavedIndexPatternWarningDescription', {
+        text: i18n.translate('discover.showingSavedDataViewWarningDescription', {
           defaultMessage:
-            'Showing the saved index pattern: "{ownIndexPatternTitle}" ({ownIndexPatternId})',
+            'Showing the saved data view: "{ownIndexPatternTitle}" ({ownIndexPatternId})',
           values: {
             ownIndexPatternTitle: ownIndexPattern.title,
             ownIndexPatternId: ownIndexPattern.id,
@@ -133,9 +133,9 @@ export function resolveIndexPattern(
 
     toastNotifications.addWarning({
       title: warningTitle,
-      text: i18n.translate('discover.showingDefaultIndexPatternWarningDescription', {
+      text: i18n.translate('discover.showingDefaultDataViewWarningDescription', {
         defaultMessage:
-          'Showing the default index pattern: "{loadedIndexPatternTitle}" ({loadedIndexPatternId})',
+          'Showing the default data view: "{loadedIndexPatternTitle}" ({loadedIndexPatternId})',
         values: {
           loadedIndexPatternTitle: loadedIndexPattern.title,
           loadedIndexPatternId: loadedIndexPattern.id,
diff --git a/src/plugins/discover/public/application/components/doc/doc.tsx b/src/plugins/discover/public/application/components/doc/doc.tsx
index ed8bcf30d2bd17..11ee3fa55d2720 100644
--- a/src/plugins/discover/public/application/components/doc/doc.tsx
+++ b/src/plugins/discover/public/application/components/doc/doc.tsx
@@ -53,8 +53,8 @@ export function Doc(props: DocProps) {
               iconType="alert"
               title={
                 <FormattedMessage
-                  id="discover.doc.failedToLocateIndexPattern"
-                  defaultMessage="No index pattern matches ID {indexPatternId}."
+                  id="discover.doc.failedToLocateDataView"
+                  defaultMessage="No data view matches ID {indexPatternId}."
                   values={{ indexPatternId: props.indexPatternId }}
                 />
               }
@@ -99,7 +99,7 @@ export function Doc(props: DocProps) {
               <EuiLink href={indexExistsLink} target="_blank">
                 <FormattedMessage
                   id="discover.doc.somethingWentWrongDescriptionAddon"
-                  defaultMessage="Please ensure the index exists."
+                  defaultMessage="Please ensure the data view exists."
                 />
               </EuiLink>
             </EuiCallOut>
diff --git a/src/plugins/discover/server/ui_settings.ts b/src/plugins/discover/server/ui_settings.ts
index aa1b44da12bfc9..98d8a3c6dc46eb 100644
--- a/src/plugins/discover/server/ui_settings.ts
+++ b/src/plugins/discover/server/ui_settings.ts
@@ -79,7 +79,7 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
     type: 'select',
     description: i18n.translate('discover.advancedSettings.sortDefaultOrderText', {
       defaultMessage:
-        'Controls the default sort direction for time based index patterns in the Discover app.',
+        'Controls the default sort direction for time based data views in the Discover app.',
     }),
     category: ['discover'],
     schema: schema.oneOf([schema.literal('desc'), schema.literal('asc')]),
@@ -149,7 +149,7 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
     description: i18n.translate('discover.advancedSettings.context.tieBreakerFieldsText', {
       defaultMessage:
         'A comma-separated list of fields to use for tie-breaking between documents that have the same timestamp value. ' +
-        'From this list the first field that is present and sortable in the current index pattern is used.',
+        'From this list the first field that is present and sortable in the current data view is used.',
     }),
     category: ['discover'],
     schema: schema.arrayOf(schema.string()),
@@ -173,11 +173,11 @@ export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
   },
   [MODIFY_COLUMNS_ON_SWITCH]: {
     name: i18n.translate('discover.advancedSettings.discover.modifyColumnsOnSwitchTitle', {
-      defaultMessage: 'Modify columns when changing index patterns',
+      defaultMessage: 'Modify columns when changing data views',
     }),
     value: true,
     description: i18n.translate('discover.advancedSettings.discover.modifyColumnsOnSwitchText', {
-      defaultMessage: 'Remove columns that are not available in the new index pattern.',
+      defaultMessage: 'Remove columns that are not available in the new data view.',
     }),
     category: ['discover'],
     schema: schema.boolean(),
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 6115e07189ed1f..c4584daae3861b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1441,12 +1441,9 @@
     "discover.advancedSettings.context.defaultSizeTitle": "コンテキストサイズ",
     "discover.advancedSettings.context.sizeStepText": "コンテキストサイズを増減させる際の最低単位です",
     "discover.advancedSettings.context.sizeStepTitle": "コンテキストサイズのステップ",
-    "discover.advancedSettings.context.tieBreakerFieldsText": "同じタイムスタンプ値のドキュメントを区別するためのコンマ区切りのフィールドのリストです。このリストから、現在のインデックスパターンに含まれ並べ替え可能な初めのフィールドが使用されます。",
     "discover.advancedSettings.context.tieBreakerFieldsTitle": "タイブレーカーフィールド",
     "discover.advancedSettings.defaultColumnsText": "デフォルトで Discover タブに表示される列です",
     "discover.advancedSettings.defaultColumnsTitle": "デフォルトの列",
-    "discover.advancedSettings.discover.modifyColumnsOnSwitchText": "新しいインデックスパターンで使用できない列を削除します。",
-    "discover.advancedSettings.discover.modifyColumnsOnSwitchTitle": "インデックスパターンを変更するときに列を修正",
     "discover.advancedSettings.discover.multiFieldsLinkText": "マルチフィールド",
     "discover.advancedSettings.discover.readFieldsFromSource": "_sourceからフィールドを読み取る",
     "discover.advancedSettings.discover.readFieldsFromSourceDescription": "有効にすると、「_source」から直接ドキュメントを読み込みます。これはまもなく廃止される予定です。無効にすると、上位レベルの検索サービスで新しいフィールドAPI経由でフィールドを取得します。",
@@ -1464,7 +1461,6 @@
     "discover.advancedSettings.sampleSizeTitle": "行数",
     "discover.advancedSettings.searchOnPageLoadText": "Discover の最初の読み込み時に検索を実行するかを制御します。この設定は、保存された検索の読み込み時には影響しません。",
     "discover.advancedSettings.searchOnPageLoadTitle": "ページの読み込み時の検索",
-    "discover.advancedSettings.sortDefaultOrderText": "Discover アプリのインデックスパターンに基づく時刻のデフォルトの並べ替え方向をコントロールします。",
     "discover.advancedSettings.sortDefaultOrderTitle": "デフォルトの並べ替え方向",
     "discover.advancedSettings.sortOrderAsc": "昇順",
     "discover.advancedSettings.sortOrderDesc": "降順",
@@ -1503,10 +1499,8 @@
     "discover.doc.couldNotFindDocumentsDescription": "そのIDに一致するドキュメントがありません。",
     "discover.doc.failedToExecuteQueryDescription": "検索の実行に失敗しました",
     "discover.doc.failedToLocateDocumentDescription": "ドキュメントが見つかりませんでした",
-    "discover.doc.failedToLocateIndexPattern": "ID {indexPatternId}に一致するインデックスパターンがありません。",
     "discover.doc.loadingDescription": "読み込み中…",
     "discover.doc.somethingWentWrongDescription": "{indexName}が見つかりません。",
-    "discover.doc.somethingWentWrongDescriptionAddon": "インデックスが存在することを確認してください。",
     "discover.docTable.limitedSearchResultLabel": "{resultCount}件の結果のみが表示されます。検索結果を絞り込みます。",
     "discover.docTable.noResultsTitle": "結果が見つかりませんでした",
     "discover.docTable.tableHeader.documentHeader": "ドキュメント",
@@ -1555,8 +1549,6 @@
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue}件のレコード",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "{field}を表に追加",
     "discover.fieldChooser.discoverField.addFieldTooltip": "フィールドを列として追加",
-    "discover.fieldChooser.discoverField.deleteFieldLabel": "インデックスパターンフィールドを削除",
-    "discover.fieldChooser.discoverField.editFieldLabel": "インデックスパターンフィールドを編集",
     "discover.fieldChooser.discoverField.fieldTopValuesLabel": "トップ5の値",
     "discover.fieldChooser.discoverField.multiFields": "マルチフィールド",
     "discover.fieldChooser.discoverField.removeButtonAriaLabel": "{field}を表から削除",
@@ -1579,10 +1571,6 @@
     "discover.fieldChooser.filter.toggleButton.no": "いいえ",
     "discover.fieldChooser.filter.toggleButton.yes": "はい",
     "discover.fieldChooser.filter.typeLabel": "型",
-    "discover.fieldChooser.indexPattern.changeIndexPatternTitle": "インデックスパターンを変更",
-    "discover.fieldChooser.indexPatterns.actionsPopoverLabel": "インデックスパターン設定",
-    "discover.fieldChooser.indexPatterns.addFieldButton": "フィールドをインデックスパターンに追加",
-    "discover.fieldChooser.indexPatterns.manageFieldButton": "インデックスパターンを管理",
     "discover.fieldChooser.searchPlaceHolder": "検索フィールド名",
     "discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "フィールド設定を非表示",
     "discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "フィールド設定を表示",
@@ -1665,8 +1653,6 @@
     "discover.showAllDocuments": "すべてのドキュメントを表示",
     "discover.showChart": "グラフを表示",
     "discover.showErrorMessageAgain": "エラーメッセージを表示",
-    "discover.showingDefaultIndexPatternWarningDescription": "デフォルトのインデックスパターン「{loadedIndexPatternTitle}」 ({loadedIndexPatternId}) を表示中",
-    "discover.showingSavedIndexPatternWarningDescription": "保存されたインデックスパターン「{ownIndexPatternTitle}」 ({ownIndexPatternId}) を表示中",
     "discover.showSelectedDocumentsOnly": "選択したドキュメントのみを表示",
     "discover.skipToBottomButtonLabel": "テーブルの最後に移動",
     "discover.sourceViewer.errorMessage": "現在データを取得できませんでした。タブを更新して、再試行してください。",
@@ -1685,7 +1671,6 @@
     "discover.uninitializedRefreshButtonText": "データを更新",
     "discover.uninitializedText": "クエリを作成、フィルターを追加、または［更新］をクリックして、現在のクエリの結果を取得します。",
     "discover.uninitializedTitle": "検索開始",
-    "discover.valueIsNotConfiguredIndexPatternIDWarningTitle": "{stateVal}は設定されたインデックスパターンIDではありません",
     "embeddableApi.addPanel.createNewDefaultOption": "新規作成",
     "embeddableApi.addPanel.displayName": "パネルの追加",
     "embeddableApi.addPanel.noMatchingObjectsMessage": "一致するオブジェクトが見つかりませんでした。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index c7aff32f16dbd4..536c0d894fa185 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1450,12 +1450,9 @@
     "discover.advancedSettings.context.defaultSizeTitle": "上下文大小",
     "discover.advancedSettings.context.sizeStepText": "递增或递减上下文大小的步进大小",
     "discover.advancedSettings.context.sizeStepTitle": "上下文大小步进",
-    "discover.advancedSettings.context.tieBreakerFieldsText": "要在具有相同时间戳值的文档之间用于平分决胜的字段逗号分隔列表。将使用此列表上存在且在当前索引模式下可排序的第一个字段。",
     "discover.advancedSettings.context.tieBreakerFieldsTitle": "平分决胜字段",
     "discover.advancedSettings.defaultColumnsText": "“发现”选项卡中默认显示的列",
     "discover.advancedSettings.defaultColumnsTitle": "默认列",
-    "discover.advancedSettings.discover.modifyColumnsOnSwitchText": "移除新索引模式中不存在的列。",
-    "discover.advancedSettings.discover.modifyColumnsOnSwitchTitle": "更改索引模式时修改列",
     "discover.advancedSettings.discover.multiFieldsLinkText": "多字段",
     "discover.advancedSettings.discover.readFieldsFromSource": "从 _source 读取字段",
     "discover.advancedSettings.discover.readFieldsFromSourceDescription": "启用后，将直接从 `_source` 加载文档。这很快将被弃用。禁用后，将通过高级别搜索服务中的新字段 API 检索字段。",
@@ -1473,7 +1470,6 @@
     "discover.advancedSettings.sampleSizeTitle": "行数目",
     "discover.advancedSettings.searchOnPageLoadText": "控制在 Discover 首次加载时是否执行搜索。加载已保存搜索时，此设置无效。",
     "discover.advancedSettings.searchOnPageLoadTitle": "在页面加载时搜索",
-    "discover.advancedSettings.sortDefaultOrderText": "在 Discover 应用中控制基于时间的索引模式的默认排序方向。",
     "discover.advancedSettings.sortDefaultOrderTitle": "默认排序方向",
     "discover.advancedSettings.sortOrderAsc": "升序",
     "discover.advancedSettings.sortOrderDesc": "降序",
@@ -1512,10 +1508,8 @@
     "discover.doc.couldNotFindDocumentsDescription": "无文档匹配该 ID。",
     "discover.doc.failedToExecuteQueryDescription": "无法执行搜索",
     "discover.doc.failedToLocateDocumentDescription": "无法找到文档",
-    "discover.doc.failedToLocateIndexPattern": "无索引模式匹配 ID {indexPatternId}。",
     "discover.doc.loadingDescription": "正在加载……",
     "discover.doc.somethingWentWrongDescription": "{indexName} 缺失。",
-    "discover.doc.somethingWentWrongDescriptionAddon": "请确保索引存在。",
     "discover.docTable.limitedSearchResultLabel": "仅限于 {resultCount} 个结果。优化您的搜索。",
     "discover.docTable.noResultsTitle": "找不到结果",
     "discover.docTable.tableHeader.documentHeader": "文档",
@@ -1564,8 +1558,6 @@
     "discover.fieldChooser.detailViews.valueOfRecordsText": "{value} / {totalValue} 条记录",
     "discover.fieldChooser.discoverField.addButtonAriaLabel": "将 {field} 添加到表中",
     "discover.fieldChooser.discoverField.addFieldTooltip": "将字段添加为列",
-    "discover.fieldChooser.discoverField.deleteFieldLabel": "删除索引模式字段",
-    "discover.fieldChooser.discoverField.editFieldLabel": "编辑索引模式字段",
     "discover.fieldChooser.discoverField.fieldTopValuesLabel": "排名前 5 值",
     "discover.fieldChooser.discoverField.multiFields": "多字段",
     "discover.fieldChooser.discoverField.removeButtonAriaLabel": "从表中移除 {field}",
@@ -1588,10 +1580,6 @@
     "discover.fieldChooser.filter.toggleButton.no": "否",
     "discover.fieldChooser.filter.toggleButton.yes": "是",
     "discover.fieldChooser.filter.typeLabel": "类型",
-    "discover.fieldChooser.indexPattern.changeIndexPatternTitle": "更改索引模式",
-    "discover.fieldChooser.indexPatterns.actionsPopoverLabel": "索引模式设置",
-    "discover.fieldChooser.indexPatterns.addFieldButton": "将字段添加到索引模式",
-    "discover.fieldChooser.indexPatterns.manageFieldButton": "管理索引模式字段",
     "discover.fieldChooser.searchPlaceHolder": "搜索字段名称",
     "discover.fieldChooser.toggleFieldFilterButtonHideAriaLabel": "隐藏字段筛选设置",
     "discover.fieldChooser.toggleFieldFilterButtonShowAriaLabel": "显示字段筛选设置",
@@ -1674,8 +1662,6 @@
     "discover.showAllDocuments": "显示所有文档",
     "discover.showChart": "显示图表",
     "discover.showErrorMessageAgain": "显示错误消息",
-    "discover.showingDefaultIndexPatternWarningDescription": "正在显示默认索引模式：“{loadedIndexPatternTitle}”({loadedIndexPatternId})",
-    "discover.showingSavedIndexPatternWarningDescription": "正在显示已保存索引模式：“{ownIndexPatternTitle}”({ownIndexPatternId})",
     "discover.showSelectedDocumentsOnly": "仅显示选定的文档",
     "discover.skipToBottomButtonLabel": "转到表尾",
     "discover.sourceViewer.errorMessage": "当前无法获取数据。请刷新选项卡以重试。",
@@ -1694,7 +1680,6 @@
     "discover.uninitializedRefreshButtonText": "刷新数据",
     "discover.uninitializedText": "编写查询，添加一些筛选，或只需单击“刷新”来检索当前查询的结果。",
     "discover.uninitializedTitle": "开始搜索",
-    "discover.valueIsNotConfiguredIndexPatternIDWarningTitle": "{stateVal} 不是配置的索引模式 ID",
     "embeddableApi.addPanel.createNewDefaultOption": "新建",
     "embeddableApi.addPanel.displayName": "添加面板",
     "embeddableApi.addPanel.noMatchingObjectsMessage": "未找到任何匹配对象。",

From f22e5f953f6f039e890faac87ef95ca31e010461 Mon Sep 17 00:00:00 2001
From: Diana Derevyankina <dziyana_dzeraviankina@epam.com>
Date: Tue, 5 Oct 2021 14:31:41 +0300
Subject: [PATCH 2/2] Revert changes for somethingWentWrongDescriptionAddon
 translation

---
 .../discover/public/application/apps/doc/components/doc.tsx     | 2 +-
 x-pack/plugins/translations/translations/ja-JP.json             | 1 +
 x-pack/plugins/translations/translations/zh-CN.json             | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/plugins/discover/public/application/apps/doc/components/doc.tsx b/src/plugins/discover/public/application/apps/doc/components/doc.tsx
index ab9b85f5a27119..f9f85acd2fe96c 100644
--- a/src/plugins/discover/public/application/apps/doc/components/doc.tsx
+++ b/src/plugins/discover/public/application/apps/doc/components/doc.tsx
@@ -98,7 +98,7 @@ export function Doc(props: DocProps) {
             <EuiLink href={indexExistsLink} target="_blank">
               <FormattedMessage
                 id="discover.doc.somethingWentWrongDescriptionAddon"
-                defaultMessage="Please ensure the data view exists."
+                defaultMessage="Please ensure the index exists."
               />
             </EuiLink>
           </EuiCallOut>
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 86c50e72e5d5fb..71ad59c2a52d2b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2366,6 +2366,7 @@
     "discover.doc.failedToLocateDocumentDescription": "ドキュメントが見つかりませんでした",
     "discover.doc.loadingDescription": "読み込み中…",
     "discover.doc.somethingWentWrongDescription": "{indexName}が見つかりません。",
+    "discover.doc.somethingWentWrongDescriptionAddon": "インデックスが存在することを確認してください。",
     "discover.docTable.documentsNavigation": "ドキュメントナビゲーション",
     "discover.docTable.limitedSearchResultLabel": "{resultCount}件の結果のみが表示されます。検索結果を絞り込みます。",
     "discover.docTable.noResultsTitle": "結果が見つかりませんでした",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 34aa2183a21fed..1fc3b627931ec5 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2388,6 +2388,7 @@
     "discover.doc.failedToLocateDocumentDescription": "无法找到文档",
     "discover.doc.loadingDescription": "正在加载……",
     "discover.doc.somethingWentWrongDescription": "{indexName} 缺失。",
+    "discover.doc.somethingWentWrongDescriptionAddon": "请确保索引存在。",
     "discover.docTable.documentsNavigation": "文档导航",
     "discover.docTable.limitedSearchResultLabel": "仅限于 {resultCount} 个结果。优化您的搜索。",
     "discover.docTable.noResultsTitle": "找不到结果",