From d5faaf7baac3029546490d58edc2a21a38461297 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Tue, 24 Aug 2021 06:56:43 -0500 Subject: [PATCH 01/25] [index pattern management] index pattern => data view for user facing content (#109577) * index pattern => data view for user facing content --- .../public/components/breadcrumbs.ts | 8 +++--- .../create_edit_field/create_edit_field.tsx | 13 ++++------ .../edit_index_pattern/edit_index_pattern.tsx | 8 +++--- .../index_header/index_header.tsx | 26 +++++++------------ .../table/__snapshots__/table.test.tsx.snap | 2 +- .../components/table/table.tsx | 4 +-- .../index_pattern_table.tsx | 16 +++++++----- .../mount_management_section.tsx | 4 +-- .../index_pattern_management/public/plugin.ts | 4 +-- .../_index_pattern_create_delete.js | 2 +- .../translations/translations/ja-JP.json | 15 ----------- .../translations/translations/zh-CN.json | 15 ----------- 12 files changed, 40 insertions(+), 77 deletions(-) diff --git a/src/plugins/index_pattern_management/public/components/breadcrumbs.ts b/src/plugins/index_pattern_management/public/components/breadcrumbs.ts index 444d1e35c961e0..43f9ca4374658e 100644 --- a/src/plugins/index_pattern_management/public/components/breadcrumbs.ts +++ b/src/plugins/index_pattern_management/public/components/breadcrumbs.ts @@ -12,8 +12,8 @@ import { IndexPattern } from '../../../data/public'; export function getListBreadcrumbs() { return [ { - text: i18n.translate('indexPatternManagement.indexPatterns.listBreadcrumb', { - defaultMessage: 'Index patterns', + text: i18n.translate('indexPatternManagement.dataViews.listBreadcrumb', { + defaultMessage: 'Data views', }), href: `/`, }, @@ -24,8 +24,8 @@ export function getCreateBreadcrumbs() { return [ ...getListBreadcrumbs(), { - text: i18n.translate('indexPatternManagement.indexPatterns.createBreadcrumb', { - defaultMessage: 'Create index pattern', + text: i18n.translate('indexPatternManagement.dataViews.createBreadcrumb', { + defaultMessage: 'Create data view', }), href: `/create`, }, diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx index 0c0adc6dd50295..d318a18abbddfc 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/create_edit_field/create_edit_field.tsx @@ -52,14 +52,11 @@ export const CreateEditField = withRouter( const url = `/patterns/${indexPattern.id}`; if (mode === 'edit' && !spec) { - const message = i18n.translate( - 'indexPatternManagement.editIndexPattern.scripted.noFieldLabel', - { - defaultMessage: - "'{indexPatternTitle}' index pattern doesn't have a scripted field called '{fieldName}'", - values: { indexPatternTitle: indexPattern.title, fieldName }, - } - ); + const message = i18n.translate('indexPatternManagement.editDataView.scripted.noFieldLabel', { + defaultMessage: + "'{dataViewTitle}' data view doesn't have a scripted field called '{fieldName}'", + values: { dataViewTitle: indexPattern.title, fieldName }, + }); notifications.toasts.addWarning(message); history.push(url); } diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx index a8f89b471e4eb6..fa464dbd7abe0d 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx @@ -49,8 +49,8 @@ const confirmModalOptionsDelete = { confirmButtonText: i18n.translate('indexPatternManagement.editIndexPattern.deleteButton', { defaultMessage: 'Delete', }), - title: i18n.translate('indexPatternManagement.editIndexPattern.deleteHeader', { - defaultMessage: 'Delete index pattern?', + title: i18n.translate('indexPatternManagement.editDataView.deleteHeader', { + defaultMessage: 'Delete data view?', }), }; @@ -129,8 +129,8 @@ export const EditIndexPattern = withRouter( } ); - const headingAriaLabel = i18n.translate('indexPatternManagement.editIndexPattern.detailsAria', { - defaultMessage: 'Index pattern details', + const headingAriaLabel = i18n.translate('indexPatternManagement.editDataView.detailsAria', { + defaultMessage: 'Data view details', }); chrome.docTitle.change(indexPattern.title); diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx index c141c228a68f25..e5a0f13a1f09c9 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/index_header/index_header.tsx @@ -18,26 +18,20 @@ interface IndexHeaderProps { deleteIndexPatternClick?: () => void; } -const setDefaultAriaLabel = i18n.translate( - 'indexPatternManagement.editIndexPattern.setDefaultAria', - { - defaultMessage: 'Set as default index.', - } -); +const setDefaultAriaLabel = i18n.translate('indexPatternManagement.editDataView.setDefaultAria', { + defaultMessage: 'Set as default data view.', +}); -const setDefaultTooltip = i18n.translate( - 'indexPatternManagement.editIndexPattern.setDefaultTooltip', - { - defaultMessage: 'Set as default index.', - } -); +const setDefaultTooltip = i18n.translate('indexPatternManagement.editDataView.setDefaultTooltip', { + defaultMessage: 'Set as default data view.', +}); -const removeAriaLabel = i18n.translate('indexPatternManagement.editIndexPattern.removeAria', { - defaultMessage: 'Remove index pattern.', +const removeAriaLabel = i18n.translate('indexPatternManagement.editDataView.removeAria', { + defaultMessage: 'Remove data view.', }); -const removeTooltip = i18n.translate('indexPatternManagement.editIndexPattern.removeTooltip', { - defaultMessage: 'Remove index pattern.', +const removeTooltip = i18n.translate('indexPatternManagement.editDataView.removeTooltip', { + defaultMessage: 'Remove data view.', }); export const IndexHeader: React.FC = ({ diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap index 95acb14282ba57..60138dd5fd8a61 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap @@ -14,7 +14,7 @@ exports[`Table render name 2`] = ` - This field exists on the index pattern only. + This field exists on the data view only. } title="Runtime field" diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx index 9448571facd439..4e672b615aeacb 100644 --- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx +++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/table.tsx @@ -163,8 +163,8 @@ const runtimeIconTipTitle = i18n.translate( ); const runtimeIconTipText = i18n.translate( - 'indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipText', - { defaultMessage: 'This field exists on the index pattern only.' } + 'indexPatternManagement.editDataView.fields.table.runtimeIconTipText', + { defaultMessage: 'This field exists on the data view only.' } ); interface IndexedFieldProps { diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx index 0a436f15416139..1eb795c9c5fc2b 100644 --- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx +++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx @@ -46,8 +46,8 @@ const search = { }, }; -const title = i18n.translate('indexPatternManagement.indexPatternTable.title', { - defaultMessage: 'Index patterns', +const title = i18n.translate('indexPatternManagement.dataViewTable.title', { + defaultMessage: 'Data views', }); interface Props extends RouteComponentProps { @@ -97,7 +97,9 @@ export const IndexPatternTable = ({ const columns = [ { field: 'title', - name: 'Pattern', + name: i18n.translate('indexPatternManagement.dataViewTable.nameColumn', { + defaultMessage: 'Name', + }), render: ( name: string, index: { @@ -134,8 +136,8 @@ export const IndexPatternTable = ({ data-test-subj="createIndexPatternButton" > ) : ( @@ -164,8 +166,8 @@ export const IndexPatternTable = ({ pageTitle={title} description={ } bottomBorder diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx index e493595c848cff..e4022b524337b0 100644 --- a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx +++ b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx @@ -28,8 +28,8 @@ const readOnlyBadge = { text: i18n.translate('indexPatternManagement.indexPatterns.badge.readOnly.text', { defaultMessage: 'Read only', }), - tooltip: i18n.translate('indexPatternManagement.indexPatterns.badge.readOnly.tooltip', { - defaultMessage: 'Unable to save index patterns', + tooltip: i18n.translate('indexPatternManagement.dataViews.badge.readOnly.tooltip', { + defaultMessage: 'Unable to save data views', }), iconType: 'glasses', }; diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts index 9527a04a6b0e25..f03fb48addcd15 100644 --- a/src/plugins/index_pattern_management/public/plugin.ts +++ b/src/plugins/index_pattern_management/public/plugin.ts @@ -32,8 +32,8 @@ export interface IndexPatternManagementSetup {} // eslint-disable-next-line @typescript-eslint/no-empty-interface export interface IndexPatternManagementStart {} -const sectionsHeader = i18n.translate('indexPatternManagement.indexPattern.sectionsHeader', { - defaultMessage: 'Index Patterns', +const sectionsHeader = i18n.translate('indexPatternManagement.dataView.sectionsHeader', { + defaultMessage: 'Data Views', }); const IPM_APP_ID = 'indexPatterns'; diff --git a/test/functional/apps/management/_index_pattern_create_delete.js b/test/functional/apps/management/_index_pattern_create_delete.js index 764540f5745acc..3e5bf354a48ff4 100644 --- a/test/functional/apps/management/_index_pattern_create_delete.js +++ b/test/functional/apps/management/_index_pattern_create_delete.js @@ -122,7 +122,7 @@ export default function ({ getService, getPageObjects }) { describe('index pattern deletion', function indexDelete() { before(function () { - const expectedAlertText = 'Delete index pattern?'; + const expectedAlertText = 'Delete data view?'; return PageObjects.settings.removeIndexPattern().then(function (alertText) { expect(alertText).to.be(expectedAlertText); }); diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index dda5b79ebecee0..d6f915c4b9b2c3 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -2889,9 +2889,7 @@ "indexPatternManagement.disabledCallOutLabel": "Elasticsearchでのすべてのインラインスクリプティングが無効になっています。Kibanaでスクリプトフィールドを使用するには、インラインスクリプティングを有効にする必要があります。", "indexPatternManagement.editHeader": "{fieldName}を編集", "indexPatternManagement.editIndexPattern.deleteButton": "削除", - "indexPatternManagement.editIndexPattern.deleteHeader": "インデックスパターンを削除しますか？", "indexPatternManagement.editIndexPattern.deprecation": "スクリプトフィールドは廃止予定です。代わりに{runtimeDocs}を使用してください。", - "indexPatternManagement.editIndexPattern.detailsAria": "インデックスパターンの詳細", "indexPatternManagement.editIndexPattern.fields.addFieldButtonLabel": "フィールドの追加", "indexPatternManagement.editIndexPattern.fields.allLangsDropDown": "すべての言語", "indexPatternManagement.editIndexPattern.fields.allTypesDropDown": "すべてのフィールドタイプ", @@ -2917,15 +2915,12 @@ "indexPatternManagement.editIndexPattern.fields.table.nameHeader": "名前", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeAriaLabel": "プライマリ時間フィールド", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeTooltip": "このフィールドはイベントの発生時刻を表します。", - "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipText": "このフィールドはインデックスパターンにのみ存在します。", "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipTitle": "ランタイムフィールド", "indexPatternManagement.editIndexPattern.fields.table.searchableDescription": "これらのフィールドはフィルターバーで使用できます", "indexPatternManagement.editIndexPattern.fields.table.searchableHeader": "検索可能", "indexPatternManagement.editIndexPattern.fields.table.typeHeader": "型", "indexPatternManagement.editIndexPattern.list.defaultIndexPatternListName": "デフォルト", "indexPatternManagement.editIndexPattern.mappingConflictHeader": "マッピングの矛盾", - "indexPatternManagement.editIndexPattern.removeAria": "インデックスパターンを削除します。", - "indexPatternManagement.editIndexPattern.removeTooltip": "インデックスパターンを削除します。", "indexPatternManagement.editIndexPattern.scripted.addFieldButton": "スクリプトフィールドを追加", "indexPatternManagement.editIndexPattern.scripted.deleteField.cancelButton": "キャンセル", "indexPatternManagement.editIndexPattern.scripted.deleteField.deleteButton": "削除", @@ -2934,7 +2929,6 @@ "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "次の廃止された言語が使用されています。{deprecatedLangsInUse}これらの言語は、KibanaとElasticsearchの次のメジャーバージョンでサポートされなくなります。問題を避けるため、スクリプトフィールドを{link}に変換してください。", "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "Painless", "indexPatternManagement.editIndexPattern.scripted.newFieldPlaceholder": "新規スクリプトフィールド", - "indexPatternManagement.editIndexPattern.scripted.noFieldLabel": "「{indexPatternTitle}」インデックスパターンには「{fieldName}」というスクリプトフィールドがありません", "indexPatternManagement.editIndexPattern.scripted.table.deleteDescription": "このフィールドを削除します", "indexPatternManagement.editIndexPattern.scripted.table.deleteHeader": "削除", "indexPatternManagement.editIndexPattern.scripted.table.editDescription": "このフィールドを編集します", @@ -2948,8 +2942,6 @@ "indexPatternManagement.editIndexPattern.scripted.table.scriptDescription": "フィールドのスクリプトです", "indexPatternManagement.editIndexPattern.scripted.table.scriptHeader": "スクリプト", "indexPatternManagement.editIndexPattern.scriptedLabel": "スクリプトフィールドはビジュアライゼーションで使用され、ドキュメントに表示できます。ただし、検索することはできません。", - "indexPatternManagement.editIndexPattern.setDefaultAria": "デフォルトのインデックスに設定します。", - "indexPatternManagement.editIndexPattern.setDefaultTooltip": "デフォルトのインデックスに設定します。", "indexPatternManagement.editIndexPattern.source.addButtonLabel": "追加", "indexPatternManagement.editIndexPattern.source.deleteFilter.cancelButtonLabel": "キャンセル", "indexPatternManagement.editIndexPattern.source.deleteFilter.deleteButtonLabel": "削除", @@ -2977,15 +2969,8 @@ "indexPatternManagement.formatLabel": "フォーマットは、特定の値の表示形式を管理できます。また、値を完全に変更したり、Discover でのハイライト機能を無効にしたりすることも可能です。", "indexPatternManagement.header.runtimeLink": "ランタイムフィールド", "indexPatternManagement.indexNameLabel": "インデックス名", - "indexPatternManagement.indexPattern.sectionsHeader": "インデックスパターン", "indexPatternManagement.indexPatterns.badge.readOnly.text": "読み取り専用", - "indexPatternManagement.indexPatterns.badge.readOnly.tooltip": "インデックスパターンを保存できません", - "indexPatternManagement.indexPatterns.createBreadcrumb": "インデックスパターンを作成", "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "フィールドを作成", - "indexPatternManagement.indexPatterns.listBreadcrumb": "インデックスパターン", - "indexPatternManagement.indexPatternTable.createBtn": "インデックスパターンを作成", - "indexPatternManagement.indexPatternTable.indexPatternExplanation": "Elasticsearchからのデータの取得に役立つインデックスパターンを作成して管理します。", - "indexPatternManagement.indexPatternTable.title": "インデックスパターン", "indexPatternManagement.labelHelpText": "このフィールドが Discover、Maps、Visualize に表示されるときに使用するカスタムラベルを設定します。現在、クエリとフィルターはカスタムラベルをサポートせず、元のフィールド名が使用されます。", "indexPatternManagement.languageLabel": "言語", "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict} {fieldName}というフィールドはすでに存在します。スクリプトフィールドに同じ名前を付けると、同時に両方のフィールドにクエリが実行できなくなります。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index bfee81a99d0926..aa945a4f3192da 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -2901,9 +2901,7 @@ "indexPatternManagement.disabledCallOutLabel": "所有内联脚本在 Elasticsearch 中已禁用。必须至少为一种语言启用内联脚本，才能在 Kibana 中使用脚本字段。", "indexPatternManagement.editHeader": "编辑 {fieldName}", "indexPatternManagement.editIndexPattern.deleteButton": "删除", - "indexPatternManagement.editIndexPattern.deleteHeader": "删除索引模式？", "indexPatternManagement.editIndexPattern.deprecation": "脚本字段已弃用。改用 {runtimeDocs}。", - "indexPatternManagement.editIndexPattern.detailsAria": "索引模式详细信息", "indexPatternManagement.editIndexPattern.fields.addFieldButtonLabel": "添加字段", "indexPatternManagement.editIndexPattern.fields.allLangsDropDown": "所有语言", "indexPatternManagement.editIndexPattern.fields.allTypesDropDown": "所有字段类型", @@ -2929,7 +2927,6 @@ "indexPatternManagement.editIndexPattern.fields.table.nameHeader": "名称", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeAriaLabel": "主要时间字段", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeTooltip": "此字段表示事件发生的时间。", - "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipText": "此字段仅在索引模式上存在。", "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipTitle": "运行时字段", "indexPatternManagement.editIndexPattern.fields.table.searchableDescription": "这些字段可用于筛选栏", "indexPatternManagement.editIndexPattern.fields.table.searchableHeader": "可搜索", @@ -2937,8 +2934,6 @@ "indexPatternManagement.editIndexPattern.list.defaultIndexPatternListName": "默认", "indexPatternManagement.editIndexPattern.mappingConflictHeader": "映射冲突", "indexPatternManagement.editIndexPattern.mappingConflictLabel": "{conflictFieldsLength, plural, one {一个字段} other {# 个字段}}已在匹配此模式的各个索引中定义为多个类型（字符串、整数等）。您也许仍能够在 Kibana 的各个部分中使用这些冲突字段，但它们将无法用于需要 Kibana 知道其类型的函数。要解决此问题，需要重新索引您的数据。", - "indexPatternManagement.editIndexPattern.removeAria": "移除索引模式。", - "indexPatternManagement.editIndexPattern.removeTooltip": "移除索引模式。", "indexPatternManagement.editIndexPattern.scripted.addFieldButton": "添加脚本字段", "indexPatternManagement.editIndexPattern.scripted.deleteField.cancelButton": "取消", "indexPatternManagement.editIndexPattern.scripted.deleteField.deleteButton": "删除", @@ -2947,7 +2942,6 @@ "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "以下过时的语言仍在使用：{deprecatedLangsInUse}。Kibana 和 Elasticsearch 的下一主要版本将移除对这些语言的支持。将您的脚本字段转换成 {link} 以避免问题。", "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "Painless", "indexPatternManagement.editIndexPattern.scripted.newFieldPlaceholder": "新建脚本字段", - "indexPatternManagement.editIndexPattern.scripted.noFieldLabel": "“{indexPatternTitle}”索引模式没有称作“{fieldName}”的脚本字段", "indexPatternManagement.editIndexPattern.scripted.table.deleteDescription": "删除此字段", "indexPatternManagement.editIndexPattern.scripted.table.deleteHeader": "删除", "indexPatternManagement.editIndexPattern.scripted.table.editDescription": "编辑此字段", @@ -2961,8 +2955,6 @@ "indexPatternManagement.editIndexPattern.scripted.table.scriptDescription": "字段的脚本", "indexPatternManagement.editIndexPattern.scripted.table.scriptHeader": "脚本", "indexPatternManagement.editIndexPattern.scriptedLabel": "脚本字段可用于可视化中并显示在文档中。不过，它们不可搜索。", - "indexPatternManagement.editIndexPattern.setDefaultAria": "设置为默认索引。", - "indexPatternManagement.editIndexPattern.setDefaultTooltip": "设置为默认索引。", "indexPatternManagement.editIndexPattern.source.addButtonLabel": "添加", "indexPatternManagement.editIndexPattern.source.deleteFilter.cancelButtonLabel": "取消", "indexPatternManagement.editIndexPattern.source.deleteFilter.deleteButtonLabel": "删除", @@ -2990,15 +2982,8 @@ "indexPatternManagement.formatLabel": "设置格式允许您控制特定值的显示方式。其还会导致值完全更改，并阻止 Discover 中的突出显示起作用。", "indexPatternManagement.header.runtimeLink": "运行时字段", "indexPatternManagement.indexNameLabel": "索引名称", - "indexPatternManagement.indexPattern.sectionsHeader": "索引模式", "indexPatternManagement.indexPatterns.badge.readOnly.text": "只读", - "indexPatternManagement.indexPatterns.badge.readOnly.tooltip": "无法保存索引模式", - "indexPatternManagement.indexPatterns.createBreadcrumb": "创建索引模式", "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "创建字段", - "indexPatternManagement.indexPatterns.listBreadcrumb": "索引模式", - "indexPatternManagement.indexPatternTable.createBtn": "创建索引模式", - "indexPatternManagement.indexPatternTable.indexPatternExplanation": "创建和管理帮助您从 Elasticsearch 中检索数据的索引模式。", - "indexPatternManagement.indexPatternTable.title": "索引模式", "indexPatternManagement.labelHelpText": "设置此字段在 Discover、Maps 和 Visualize 中显示时要使用的定制标签。当前查询和筛选不支持定制标签，将使用原始字段名称。", "indexPatternManagement.languageLabel": "语言", "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict}您已经有名称为 {fieldName} 的字段。使用相同的名称命名您的脚本字段意味着您将无法同时查找两个字段。", From 1601ba86021b7760004196c710198c0b727efcce Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Tue, 24 Aug 2021 09:20:28 -0500 Subject: [PATCH 02/25] [index pattern field editor] index patterns => data views for user facing content (#109704) * [index pattern field editor] index patterns => data views for user facing content --- .../public/components/field_editor_flyout_content.tsx | 2 +- .../public/components/preview/field_list/field_list.tsx | 2 +- src/plugins/index_pattern_field_editor/public/open_editor.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/index_pattern_field_editor/public/components/field_editor_flyout_content.tsx b/src/plugins/index_pattern_field_editor/public/components/field_editor_flyout_content.tsx index 19015aa9d0d101..f13b30f13327cf 100644 --- a/src/plugins/index_pattern_field_editor/public/components/field_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/field_editor_flyout_content.tsx @@ -240,7 +240,7 @@ const FieldEditorFlyoutContentComponent = ({

{indexPattern.title}, }} diff --git a/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx index aae0f0c74a5f1c..a275a9267092d1 100644 --- a/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx +++ b/src/plugins/index_pattern_field_editor/public/components/preview/field_list/field_list.tsx @@ -159,7 +159,7 @@ export const PreviewFieldList: React.FC = ({ height, clearSearch, searchV {i18n.translate( 'indexPatternFieldEditor.fieldPreview.searchResult.emptyPromptTitle', { - defaultMessage: 'No matching fields in this index pattern', + defaultMessage: 'No matching fields in this data view', } )} diff --git a/src/plugins/index_pattern_field_editor/public/open_editor.tsx b/src/plugins/index_pattern_field_editor/public/open_editor.tsx index 946e666bf82054..58e9c6715c128d 100644 --- a/src/plugins/index_pattern_field_editor/public/open_editor.tsx +++ b/src/plugins/index_pattern_field_editor/public/open_editor.tsx @@ -92,7 +92,7 @@ export const getFieldEditorOpener = ({ if (fieldName && !field) { const err = i18n.translate('indexPatternFieldEditor.noSuchFieldName', { - defaultMessage: "Field named '{fieldName}' not found on index pattern", + defaultMessage: "Field named '{fieldName}' not found in this data view", values: { fieldName }, }); notifications.toasts.addDanger(err); From 2220a35c8850226d09465f508d819d67c7df3e7f Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Tue, 24 Aug 2021 09:21:05 -0500 Subject: [PATCH 03/25] [index pattern editor] index pattern to data view for user facing content (#109578) * [index pattern editor] index pattern to data view for user facing content --- .../advanced_params_content.tsx | 2 +- .../empty_index_list_prompt.test.tsx.snap | 4 ++-- .../empty_index_list_prompt.tsx | 4 ++-- .../empty_index_pattern_prompt.test.tsx.snap | 12 ++++++------ .../empty_index_pattern_prompt.tsx | 14 +++++++------- .../public/components/footer/footer.tsx | 2 +- .../public/components/form_fields/title_field.tsx | 14 +++++++------- .../public/components/form_fields/type_field.tsx | 4 ++-- .../public/components/form_schema.ts | 4 ++-- .../index_pattern_editor_flyout_content.tsx | 2 +- .../index_pattern_flyout_content_container.tsx | 4 ++-- .../rollup_beta_warning/rollup_beta_warning.tsx | 12 ++++++------ 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx index ad876fed518017..5b25b6d06286d1 100644 --- a/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/advanced_params_content/advanced_params_content.tsx @@ -22,7 +22,7 @@ const allowHiddenAriaLabel = i18n.translate('indexPatternEditor.form.allowHidden const customIndexPatternIdLabel = i18n.translate( 'indexPatternEditor.form.customIndexPatternIdLabel', { - defaultMessage: 'Custom index pattern ID', + defaultMessage: 'Custom data view ID', } ); diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap index a104c36e3a8a09..8be758c58c756f 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/__snapshots__/empty_index_list_prompt.test.tsx.snap @@ -200,8 +200,8 @@ exports[`EmptyIndexListPrompt should render normally 1`] = ` onClick={[Function]} > , diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx index 1331eb9b7c4aca..006b90a01a3680 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_list_prompt/empty_index_list_prompt.tsx @@ -52,8 +52,8 @@ export const EmptyIndexListPrompt = ({ link: ( createAnyway()} data-test-subj="createAnyway"> ), diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap index 48f0e507ce4a64..877ca2434395f2 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/__snapshots__/empty_index_pattern_prompt.test.tsx.snap @@ -44,15 +44,15 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = ` />

@@ -63,8 +63,8 @@ exports[`EmptyIndexPatternPrompt should render normally 1`] = ` onClick={[Function]} > diff --git a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx index 57e131e8693cfd..b6859c7fa7ac00 100644 --- a/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx +++ b/src/plugins/index_pattern_editor/public/components/empty_prompts/empty_index_pattern_prompt/empty_index_pattern_prompt.tsx @@ -52,15 +52,15 @@ export const EmptyIndexPatternPrompt = ({ />

@@ -72,8 +72,8 @@ export const EmptyIndexPatternPrompt = ({ data-test-subj="createIndexPatternButtonFlyout" > )} diff --git a/src/plugins/index_pattern_editor/public/components/footer/footer.tsx b/src/plugins/index_pattern_editor/public/components/footer/footer.tsx index 0c80d0e77534c4..7c20ede540c09e 100644 --- a/src/plugins/index_pattern_editor/public/components/footer/footer.tsx +++ b/src/plugins/index_pattern_editor/public/components/footer/footer.tsx @@ -28,7 +28,7 @@ const closeButtonLabel = i18n.translate('indexPatternEditor.editor.flyoutCloseBu }); const saveButtonLabel = i18n.translate('indexPatternEditor.editor.flyoutSaveButtonLabel', { - defaultMessage: 'Create index pattern', + defaultMessage: 'Create data view', }); export const Footer = ({ onCancel, onSubmit, submitDisabled }: FooterProps) => { diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx index b03f3aa75cc237..f97ddd31770a09 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/title_field.tsx @@ -38,14 +38,14 @@ interface TitleFieldProps { } const rollupIndexPatternNoMatchError = { - message: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.noMatchError', { - defaultMessage: 'Rollup index pattern error: must match one rollup index', + message: i18n.translate('indexPatternEditor.rollupDataView.createIndex.noMatchError', { + defaultMessage: 'Rollup data view error: must match one rollup index', }), }; const rollupIndexPatternTooManyMatchesError = { - message: i18n.translate('indexPatternEditor.rollupIndexPattern.createIndex.tooManyMatchesError', { - defaultMessage: 'Rollup index pattern error: can only match one rollup index', + message: i18n.translate('indexPatternEditor.rollupDataView.createIndex.tooManyMatchesError', { + defaultMessage: 'Rollup data view error: can only match one rollup index', }), }; @@ -61,8 +61,8 @@ const createTitlesNoDupesValidator = ( validator: ({ value }) => { if (namesNotAllowed.includes(value)) { return { - message: i18n.translate('indexPatternEditor.indexPatternExists.ValidationErrorMessage', { - defaultMessage: 'An index pattern with this title already exists.', + message: i18n.translate('indexPatternEditor.dataViewExists.ValidationErrorMessage', { + defaultMessage: 'A data view with this title already exists.', }), }; } @@ -109,7 +109,7 @@ const createMatchesIndicesValidator = ({ if (error) { return { message: i18n.translate('indexPatternEditor.rollup.uncaughtError', { - defaultMessage: 'Rollup index pattern error: {error}', + defaultMessage: 'Rollup data view error: {error}', values: { error, }, diff --git a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx index 606197159e53c9..e8a48c56798790 100644 --- a/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx +++ b/src/plugins/index_pattern_editor/public/components/form_fields/type_field.tsx @@ -34,7 +34,7 @@ const standardSelectItem = ( @@ -51,7 +51,7 @@ const rollupSelectItem = (   diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index f6a3b23d9fbc1e..a66e25059096b2 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -51,12 +51,12 @@ export const schema = { }), helpText: i18n.translate('indexPatternEditor.editor.form.customIdHelp', { defaultMessage: - 'Kibana provides a unique identifier for each index pattern, or you can create your own.', + 'Kibana provides a unique identifier for each data view, or you can create your own.', }), }, type: { label: i18n.translate('indexPatternEditor.editor.form.TypeLabel', { - defaultMessage: 'Index pattern type', + defaultMessage: 'Data view type', }), defaultValue: INDEX_PATTERN_TYPE.DEFAULT, }, diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx index 982b0beaea6164..e1ea213e8cb325 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_editor_flyout_content.tsx @@ -60,7 +60,7 @@ export interface Props { } const editorTitle = i18n.translate('indexPatternEditor.title', { - defaultMessage: 'Create index pattern', + defaultMessage: 'Create data view', }); const IndexPatternEditorFlyoutContentComponent = ({ diff --git a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx index 2f60d856772074..39adf0a398a374 100644 --- a/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx +++ b/src/plugins/index_pattern_editor/public/components/index_pattern_flyout_content_container.tsx @@ -34,8 +34,8 @@ const IndexPatternFlyoutContentContainer = ({ notifications.toasts.addSuccess(message); await onSave(indexPattern); } catch (e) { - const title = i18n.translate('indexPatternEditor.indexPatterns.unableSaveLabel', { - defaultMessage: 'Failed to save index pattern.', + const title = i18n.translate('indexPatternEditor.dataView.unableSaveLabel', { + defaultMessage: 'Failed to save data view.', }); notifications.toasts.addDanger({ title }); diff --git a/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx b/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx index fcd61bab07d4c5..b37e974fbee144 100644 --- a/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx +++ b/src/plugins/index_pattern_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx @@ -23,17 +23,17 @@ export const RollupBetaWarning = () => (

From 36d0b768285b93a813c6eb93430cb53390bed1a3 Mon Sep 17 00:00:00 2001 From: Nathan Reese Date: Wed, 1 Sep 2021 13:42:00 -0600 Subject: [PATCH 04/25] [Maps] 'index patter' -> 'data view' in user facing copy (#110701) * [Maps] replace index pattern with data view in user facing copy * update docs * update file_upload * review feedback --- docs/maps/asset-tracking-tutorial.asciidoc | 18 +++++++++--------- docs/maps/geojson-upload.asciidoc | 4 ++-- .../indexing-geojson-data-tutorial.asciidoc | 9 ++------- docs/maps/maps-aggregations.asciidoc | 4 ++-- docs/maps/maps-getting-started.asciidoc | 6 +++--- docs/maps/reverse-geocoding-tutorial.asciidoc | 6 +++--- docs/maps/search.asciidoc | 2 +- docs/maps/trouble-shooting.asciidoc | 10 +++++----- docs/maps/vector-tooltips.asciidoc | 2 +- .../components/import_complete_view.tsx | 2 +- .../components/json_upload_and_parse.tsx | 8 ++++---- .../file_upload/public/validate_index_name.ts | 2 +- x-pack/plugins/maps/common/i18n_getters.ts | 19 +++++++++++++++++++ .../layer_template.tsx | 11 +++-------- .../layers/file_upload_wizard/config.tsx | 2 +- .../layers/new_vector_layer_wizard/wizard.tsx | 2 +- .../observability_layer_wizard.tsx | 2 +- .../security/index_pattern_select.tsx | 8 ++------ .../security/security_layer_wizard.tsx | 2 +- .../es_geo_grid_source/es_geo_grid_source.tsx | 6 ++---- .../update_source_editor.js | 9 ++------- .../es_geo_line_source/es_geo_line_source.tsx | 6 ++---- .../es_pew_pew_source/create_source_editor.js | 13 ++++--------- .../es_pew_pew_source/es_pew_pew_source.js | 6 ++---- .../es_pew_pew_source/update_source_editor.js | 9 ++------- .../es_search_source/es_search_source.tsx | 10 ++++------ .../top_hits/update_source_editor.tsx | 8 ++------ .../es_search_source/update_source_editor.js | 8 ++------ .../util/load_index_settings.ts | 2 +- .../classes/sources/es_source/es_source.ts | 10 +++------- .../geo_index_pattern_select.test.tsx.snap | 16 ++++++++-------- .../components/geo_index_pattern_select.tsx | 19 ++++++------------- .../join_editor/resources/join.tsx | 6 ++---- .../join_editor/resources/join_expression.tsx | 8 ++------ x-pack/plugins/maps/server/routes.js | 2 +- .../translations/translations/ja-JP.json | 16 ---------------- .../translations/translations/zh-CN.json | 16 ---------------- 37 files changed, 107 insertions(+), 182 deletions(-) diff --git a/docs/maps/asset-tracking-tutorial.asciidoc b/docs/maps/asset-tracking-tutorial.asciidoc index 822510e882c128..8f3d7b48f32218 100644 --- a/docs/maps/asset-tracking-tutorial.asciidoc +++ b/docs/maps/asset-tracking-tutorial.asciidoc @@ -156,16 +156,16 @@ image::maps/images/asset-tracking-tutorial/logstash_output.png[] . Leave the terminal window open and Logstash running throughout this tutorial. [float] -==== Step 3: Create a {kib} index pattern for the tri_met_tracks {es} index +==== Step 3: Create a data view for the tri_met_tracks {es} index -. In Kibana, open the main menu, and click *Stack Management > Index Patterns*. -. Click *Create index pattern*. -. Give the index pattern a name: *tri_met_tracks**. +. In Kibana, open the main menu, and click *Stack Management > Data views*. +. Click *Create data view*. +. Give the data view a name: *tri_met_tracks**. . Click *Next step*. . Set the *Time field* to *time*. -. Click *Create index pattern*. +. Click *Create data view*. -{kib} shows the fields in your index pattern. +{kib} shows the fields in your data view. [role="screenshot"] image::maps/images/asset-tracking-tutorial/index_pattern.png[] @@ -174,7 +174,7 @@ image::maps/images/asset-tracking-tutorial/index_pattern.png[] ==== Step 4: Explore the Portland bus data . Open the main menu, and click *Discover*. -. Set the index pattern to *tri_met_tracks**. +. Set the data view to *tri_met_tracks**. . Open the <>, and set the time range to the last 15 minutes. . Expand a document and explore some of the fields that you will use later in this tutorial: `bearing`, `in_congestion`, `location`, and `vehicle_id`. @@ -202,7 +202,7 @@ Add a layer to show the bus routes for the last 15 minutes. . Click *Add layer*. . Click *Tracks*. -. Select the *tri_met_tracks** index pattern. +. Select the *tri_met_tracks** data view. . Define the tracks: .. Set *Entity* to *vehicle_id*. .. Set *Sort* to *time*. @@ -225,7 +225,7 @@ image::maps/images/asset-tracking-tutorial/tracks_layer.png[] Add a layer that uses attributes in the data to set the style and orientation of the buses. You’ll see the direction buses are headed and what traffic is like. . Click *Add layer*, and then select *Top Hits per entity*. -. Select the *tri_met_tracks** index pattern. +. Select the *tri_met_tracks** data view. . To display the most recent location per bus: .. Set *Entity* to *vehicle_id*. .. Set *Documents per entity* to 1. diff --git a/docs/maps/geojson-upload.asciidoc b/docs/maps/geojson-upload.asciidoc index 3c9bea11176cc8..15ef3471e58d7d 100644 --- a/docs/maps/geojson-upload.asciidoc +++ b/docs/maps/geojson-upload.asciidoc @@ -30,11 +30,11 @@ a preview of the data on the map. . Use the default *Index type* of {ref}/geo-point.html[geo_point] for point data, or override it and select {ref}/geo-shape.html[geo_shape]. All other shapes will default to a type of `geo_shape`. -. Leave the default *Index name* and *Index pattern* names (the name of the uploaded +. Leave the default *Index name* and *Data view* names (the name of the uploaded file minus its extension). You might need to change the index name if it is invalid. . Click *Import file*. + -Upon completing the indexing process and creating the associated index pattern, +Upon completing the indexing process and creating the associated data view, the Elasticsearch responses are shown on the *Layer add panel* and the indexed data appears on the map. The geospatial data on the map should be identical to the locally-previewed data, but now it's indexed data from Elasticsearch. diff --git a/docs/maps/indexing-geojson-data-tutorial.asciidoc b/docs/maps/indexing-geojson-data-tutorial.asciidoc index 434c9ab369a5bd..b800608096bd37 100644 --- a/docs/maps/indexing-geojson-data-tutorial.asciidoc +++ b/docs/maps/indexing-geojson-data-tutorial.asciidoc @@ -58,8 +58,8 @@ auto-populate *Index type* with either {ref}/geo-point.html[geo_point] or . Click *Import file*. + You'll see activity as the GeoJSON Upload utility creates a new index -and index pattern for the data set. When the process is complete, you should -receive messages that the creation of the new index and index pattern +and data view for the data set. When the process is complete, you should +receive messages that the creation of the new index and data view were successful. . Click *Add layer*. @@ -88,11 +88,6 @@ lightning strikes is that you can perform aggregations on the data. . Click *Add layer*. . From the list of layer types, click *Heat map*. -+ -Because you indexed `lightning_detected.geojson` using the index name and -pattern `lightning_detected`, that data is available as a {ref}/geo-point.html[geo_point] -aggregation. - . Select `lightning_detected`. . Click *Add layer* to add the heat map layer "Lightning intensity". diff --git a/docs/maps/maps-aggregations.asciidoc b/docs/maps/maps-aggregations.asciidoc index 7f4af952653e7c..fced15771c3864 100644 --- a/docs/maps/maps-aggregations.asciidoc +++ b/docs/maps/maps-aggregations.asciidoc @@ -62,7 +62,7 @@ To enable a grid aggregation layer: To enable a blended layer that dynamically shows clusters or documents: . Click *Add layer*, then select the *Documents* layer. -. Configure *Index pattern* and the *Geospatial field*. +. Configure *Data view* and the *Geospatial field*. . In *Scaling*, select *Show clusters when results exceed 10000*. @@ -77,7 +77,7 @@ then accumulates the most relevant documents based on sort order for each entry To enable top hits: . Click *Add layer*, then select the *Top hits per entity* layer. -. Configure *Index pattern* and *Geospatial field*. +. Configure *Data view* and *Geospatial field*. . Set *Entity* to the field that identifies entities in your documents. This field will be used in the terms aggregation to group your documents into entity buckets. . Set *Documents per entity* to configure the maximum number of documents accumulated per entity. diff --git a/docs/maps/maps-getting-started.asciidoc b/docs/maps/maps-getting-started.asciidoc index 548a5742934035..d99de7effc2ba2 100644 --- a/docs/maps/maps-getting-started.asciidoc +++ b/docs/maps/maps-getting-started.asciidoc @@ -49,7 +49,7 @@ and lighter shades will symbolize countries with less traffic. . From the **Layer** dropdown menu, select **World Countries**. . In **Statistics source**, set: -** **Index pattern** to **kibana_sample_data_logs** +** **Data view** to **kibana_sample_data_logs** ** **Join field** to **geo.src** . Click **Add layer**. @@ -95,7 +95,7 @@ The layer is only visible when users zoom in. . Click **Add layer**, and then click **Documents**. -. Set **Index pattern** to **kibana_sample_data_logs**. +. Set **Data view** to **kibana_sample_data_logs**. . Set **Scaling** to *Limits results to 10000.* @@ -129,7 +129,7 @@ more total bytes transferred, and smaller circles will symbolize grids with less bytes transferred. . Click **Add layer**, and select **Clusters and grids**. -. Set **Index pattern** to **kibana_sample_data_logs**. +. Set **Data view** to **kibana_sample_data_logs**. . Click **Add layer**. . In **Layer settings**, set: ** **Name** to `Total Requests and Bytes` diff --git a/docs/maps/reverse-geocoding-tutorial.asciidoc b/docs/maps/reverse-geocoding-tutorial.asciidoc index 2dcbcdfa8a1fb0..8e25dfd01b940b 100644 --- a/docs/maps/reverse-geocoding-tutorial.asciidoc +++ b/docs/maps/reverse-geocoding-tutorial.asciidoc @@ -141,7 +141,7 @@ PUT kibana_sample_data_logs/_settings ---------------------------------- . Open the main menu, and click *Discover*. -. Set the index pattern to *kibana_sample_data_logs*. +. Set the data view to *kibana_sample_data_logs*. . Open the <>, and set the time range to the last 30 days. . Scan through the list of *Available fields* until you find the `csa.GEOID` field. You can also search for the field by name. . Click image:images/reverse-geocoding-tutorial/add-icon.png[Add icon] to toggle the field into the document table. @@ -162,10 +162,10 @@ Now that our web traffic contains CSA region identifiers, you'll visualize CSA r . Click *Choropleth*. . For *Boundaries source*: .. Select *Points, lines, and polygons from Elasticsearch*. -.. Set *Index pattern* to *csa*. +.. Set *Data view* to *csa*. .. Set *Join field* to *GEOID*. . For *Statistics source*: -.. Set *Index pattern* to *kibana_sample_data_logs*. +.. Set *Data view* to *kibana_sample_data_logs*. .. Set *Join field* to *csa.GEOID.keyword*. . Click *Add layer*. . Scroll to *Layer Style* and Set *Label* to *Fixed*. diff --git a/docs/maps/search.asciidoc b/docs/maps/search.asciidoc index ada7551f3e57d5..975e674c008797 100644 --- a/docs/maps/search.asciidoc +++ b/docs/maps/search.asciidoc @@ -7,7 +7,7 @@ Search across the layers in your map to focus in on just the data you want. Layers that request data from {es} are narrowed when you submit a <>. Layers narrowed by semi-structured search and filters contain the filter icon image:maps/images/filter_icon.png[] next to the layer name in the legend. -Layers that request data from {es} using an <> with a configured time field are narrowed by the <>. +Layers that request data from {es} using a <> with a configured time field are narrowed by the <>. These layers contain the clock icon image:maps/images/clock_icon.png[clock icon] next to the layer name in the legend. Use the time slider to quickly select time slices within the global time filter range. Click previous and next buttons to advance the time slice backward or forward. Click play to animate your spatial temporal data. diff --git a/docs/maps/trouble-shooting.asciidoc b/docs/maps/trouble-shooting.asciidoc index 60bcabad3a6b4c..4197ba9468794f 100644 --- a/docs/maps/trouble-shooting.asciidoc +++ b/docs/maps/trouble-shooting.asciidoc @@ -24,15 +24,15 @@ image::maps/images/inspector.png[] ==== Index not listed when adding layer * Verify your geospatial data is correctly mapped as {ref}/geo-point.html[geo_point] or {ref}/geo-shape.html[geo_shape]. - ** Run `GET myIndexPatternTitle/_field_caps?fields=myGeoFieldName` in <>, replacing `myIndexPatternTitle` and `myGeoFieldName` with your index pattern title and geospatial field name. + ** Run `GET myDataViewTitle/_field_caps?fields=myGeoFieldName` in <>, replacing `myDataViewTitle` and `myGeoFieldName` with your data view title and geospatial field name. ** Ensure response specifies `type` as `geo_point` or `geo_shape`. -* Verify your geospatial data is correctly mapped in your <>. - ** Open your index pattern in <>. +* Verify your geospatial data is correctly mapped in your <>. + ** Open your data view in <>. ** Ensure your geospatial field type is `geo_point` or `geo_shape`. ** Ensure your geospatial field is searchable and aggregatable. ** If your geospatial field type does not match your Elasticsearch mapping, click the *Refresh* button to refresh the field list from Elasticsearch. -* Index patterns with thousands of fields can exceed the default maximum payload size. -Increase <> for large index patterns. +* Data views with thousands of fields can exceed the default maximum payload size. +Increase <> for large data views. [float] ==== Features are not displayed diff --git a/docs/maps/vector-tooltips.asciidoc b/docs/maps/vector-tooltips.asciidoc index 2dda35aa28f768..2e4ee99d5b84ff 100644 --- a/docs/maps/vector-tooltips.asciidoc +++ b/docs/maps/vector-tooltips.asciidoc @@ -18,7 +18,7 @@ image::maps/images/multifeature_tooltip.png[] ==== Format tooltips You can format the attributes in a tooltip by adding <> to your -index pattern. You can use field formatters to round numbers, provide units, +data view. You can use field formatters to round numbers, provide units, and even display images in your tooltip. [float] diff --git a/x-pack/plugins/file_upload/public/components/import_complete_view.tsx b/x-pack/plugins/file_upload/public/components/import_complete_view.tsx index 70e1ac25a7eccd..7f180e6eb774a2 100644 --- a/x-pack/plugins/file_upload/public/components/import_complete_view.tsx +++ b/x-pack/plugins/file_upload/public/components/import_complete_view.tsx @@ -210,7 +210,7 @@ export class ImportCompleteView extends Component { {this._renderCodeEditor( this.props.indexPatternResp, i18n.translate('xpack.fileUpload.importComplete.indexPatternResponse', { - defaultMessage: 'Index pattern response', + defaultMessage: 'Data view response', }), 'indexPatternRespCopyButton' )} diff --git a/x-pack/plugins/file_upload/public/components/json_upload_and_parse.tsx b/x-pack/plugins/file_upload/public/components/json_upload_and_parse.tsx index 28e99e7ffb18be..6fc6838e2abbaa 100644 --- a/x-pack/plugins/file_upload/public/components/json_upload_and_parse.tsx +++ b/x-pack/plugins/file_upload/public/components/json_upload_and_parse.tsx @@ -180,7 +180,7 @@ export class JsonUploadAndParse extends Component [ES_FIELD_TYPES.GEO_POINT as string, ES_FIELD_TYPES.GEO_SHAPE as string].includes( @@ -202,7 +202,7 @@ export class JsonUploadAndParse extends Component { const indexPatternNames = await getIndexPatternService().getTitles(); if (indexPatternNames.includes(indexName)) { return i18n.translate('xpack.fileUpload.indexPatternAlreadyExistsErrorMessage', { - defaultMessage: 'Index pattern already exists.', + defaultMessage: 'Data view already exists.', }); } diff --git a/x-pack/plugins/maps/common/i18n_getters.ts b/x-pack/plugins/maps/common/i18n_getters.ts index 4e9537a12647f4..0c59cc891504e9 100644 --- a/x-pack/plugins/maps/common/i18n_getters.ts +++ b/x-pack/plugins/maps/common/i18n_getters.ts @@ -56,3 +56,22 @@ export function getEsSpatialRelationLabel(spatialRelation: ES_SPATIAL_RELATIONS) return spatialRelation; } } + +export function getDataViewLabel() { + return i18n.translate('xpack.maps.dataView.label', { + defaultMessage: 'Data view', + }); +} + +export function getDataViewSelectPlaceholder() { + return i18n.translate('xpack.maps.dataView.selectPlacholder', { + defaultMessage: 'Select data view', + }); +} + +export function getDataViewNotFoundMessage(id: string) { + return i18n.translate('xpack.maps.dataView.notFoundMessage', { + defaultMessage: `Unable to find data view '{id}'`, + values: { id }, + }); +} diff --git a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx index 5bd2b68e61bc4f..0ce5f40d1604ae 100644 --- a/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx +++ b/x-pack/plugins/maps/public/classes/layers/choropleth_layer_wizard/layer_template.tsx @@ -19,6 +19,7 @@ import { EuiTitle, } from '@elastic/eui'; import { IndexPatternField, IndexPattern } from 'src/plugins/data/public'; +import { getDataViewLabel, getDataViewSelectPlaceholder } from '../../../../common/i18n_getters'; import { RenderWizardArguments } from '../layer_wizard_registry'; import { EMSFileSelect } from '../../../components/ems_file_select'; import { GeoIndexPatternSelect } from '../../../components/geo_index_pattern_select'; @@ -426,15 +427,9 @@ export class LayerTemplate extends Component { - + { const hasImportPermission = await getFileUpload().hasImportPermission({ diff --git a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx index 6dac22581efdb3..03c235ba9824f6 100644 --- a/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx +++ b/x-pack/plugins/maps/public/classes/layers/new_vector_layer_wizard/wizard.tsx @@ -128,7 +128,7 @@ export class NewVectorLayerEditor extends Component Overview.', + 'Cannot find APM data view. To get started with Observably, go to Observability > Overview.', }), description: i18n.translate('xpack.maps.observability.desc', { defaultMessage: 'APM layers', diff --git a/x-pack/plugins/maps/public/classes/layers/solution_layers/security/index_pattern_select.tsx b/x-pack/plugins/maps/public/classes/layers/solution_layers/security/index_pattern_select.tsx index 36e9457fa17faa..336b67f32fa439 100644 --- a/x-pack/plugins/maps/public/classes/layers/solution_layers/security/index_pattern_select.tsx +++ b/x-pack/plugins/maps/public/classes/layers/solution_layers/security/index_pattern_select.tsx @@ -7,8 +7,8 @@ import React, { ChangeEvent, Component } from 'react'; import { EuiFormRow, EuiSelect, EuiSelectOption } from '@elastic/eui'; -import { i18n } from '@kbn/i18n'; import { getSecurityIndexPatterns, IndexPatternMeta } from './security_index_pattern_utils'; +import { getDataViewLabel } from '../../../../../common/i18n_getters'; interface Props { value: string; @@ -81,11 +81,7 @@ export class IndexPatternSelect extends Component { } return ( - + Overview.', + 'Cannot find security data view. To get started with Security, go to Security > Overview.', }), description: i18n.translate('xpack.maps.security.desc', { defaultMessage: 'Security layers', diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx index f0cec4abf0b14d..eec252ad8544a6 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/es_geo_grid_source.tsx @@ -32,7 +32,7 @@ import { SOURCE_TYPES, VECTOR_SHAPE_TYPE, } from '../../../../common/constants'; -import { getDataSourceLabel } from '../../../../common/i18n_getters'; +import { getDataSourceLabel, getDataViewLabel } from '../../../../common/i18n_getters'; import { AbstractESAggSource } from '../es_agg_source'; import { DataRequestAbortError } from '../../util/data_request'; import { registerSource } from '../source_registry'; @@ -127,9 +127,7 @@ export class ESGeoGridSource extends AbstractESAggSource implements ITiledSingle value: this._descriptor.requestType === RENDER_AS.HEATMAP ? heatmapTitle : clustersTitle, }, { - label: i18n.translate('xpack.maps.source.esGrid.indexPatternLabel', { - defaultMessage: 'Index pattern', - }), + label: getDataViewLabel(), value: indexPatternName, }, { diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js index e111b310cb56c6..c2a0935c237196 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_grid_source/update_source_editor.js @@ -7,11 +7,11 @@ import React, { Fragment, Component } from 'react'; +import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters'; import { GRID_RESOLUTION, LAYER_TYPE } from '../../../../common/constants'; import { MetricsEditor } from '../../../components/metrics_editor'; import { getIndexPatternService } from '../../../kibana_services'; import { ResolutionEditor } from './resolution_editor'; -import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui'; import { isMetricCountable } from '../../util/is_metric_countable'; @@ -39,12 +39,7 @@ export class UpdateSourceEditor extends Component { } catch (err) { if (this._isMounted) { this.setState({ - loadError: i18n.translate('xpack.maps.source.esGrid.noIndexPatternErrorMessage', { - defaultMessage: `Unable to find Index pattern {id}`, - values: { - id: this.props.indexPatternId, - }, - }), + loadError: getDataViewNotFoundMessage(this.props.indexPatternId), }); } return; diff --git a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx index 4755781147e5be..56b6cd02b479b7 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_geo_line_source/es_geo_line_source.tsx @@ -23,7 +23,7 @@ import { ESGeoLineSourceResponseMeta, VectorSourceRequestMeta, } from '../../../../common/descriptor_types'; -import { getDataSourceLabel } from '../../../../common/i18n_getters'; +import { getDataSourceLabel, getDataViewLabel } from '../../../../common/i18n_getters'; import { AbstractESAggSource } from '../es_agg_source'; import { DataRequest } from '../../util/data_request'; import { registerSource } from '../source_registry'; @@ -121,9 +121,7 @@ export class ESGeoLineSource extends AbstractESAggSource { value: geoLineTitle, }, { - label: i18n.translate('xpack.maps.source.esGeoLine.indexPatternLabel', { - defaultMessage: 'Index pattern', - }), + label: getDataViewLabel(), value: indexPatternTitle, }, { diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js index 088366298fd2a1..2edda4a17c1bb9 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js +++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/create_source_editor.js @@ -16,6 +16,7 @@ import { FormattedMessage } from '@kbn/i18n/react'; import { EuiFormRow, EuiCallOut, EuiPanel } from '@elastic/eui'; import { getFieldsWithGeoTileAgg } from '../../../index_pattern_util'; +import { getDataViewLabel, getDataViewSelectPlaceholder } from '../../../../common/i18n_getters'; import { ES_GEO_FIELD_TYPE } from '../../../../common/constants'; export class CreateSourceEditor extends Component { @@ -168,17 +169,11 @@ export class CreateSourceEditor extends Component { const IndexPatternSelect = getIndexPatternSelectComponent(); return ( - + @@ -193,7 +188,7 @@ export class CreateSourceEditor extends Component {

diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js index 86dd63be4b67b8..8a916192cfe162 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js +++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/es_pew_pew_source.js @@ -12,7 +12,7 @@ import { multiPoint } from '@turf/helpers'; import { UpdateSourceEditor } from './update_source_editor'; import { i18n } from '@kbn/i18n'; import { SOURCE_TYPES, VECTOR_SHAPE_TYPE } from '../../../../common/constants'; -import { getDataSourceLabel } from '../../../../common/i18n_getters'; +import { getDataSourceLabel, getDataViewLabel } from '../../../../common/i18n_getters'; import { convertToLines } from './convert_to_lines'; import { AbstractESAggSource } from '../es_agg_source'; import { registerSource } from '../source_registry'; @@ -81,9 +81,7 @@ export class ESPewPewSource extends AbstractESAggSource { value: sourceTitle, }, { - label: i18n.translate('xpack.maps.source.pewPew.indexPatternLabel', { - defaultMessage: 'Index pattern', - }), + label: getDataViewLabel(), value: indexPatternTitle, }, { diff --git a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js index 28213698816985..561a21a7072689 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js +++ b/x-pack/plugins/maps/public/classes/sources/es_pew_pew_source/update_source_editor.js @@ -7,9 +7,9 @@ import React, { Component, Fragment } from 'react'; +import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters'; import { MetricsEditor } from '../../../components/metrics_editor'; import { getIndexPatternService } from '../../../kibana_services'; -import { i18n } from '@kbn/i18n'; import { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n/react'; import { indexPatterns } from '../../../../../../../src/plugins/data/public'; @@ -35,12 +35,7 @@ export class UpdateSourceEditor extends Component { } catch (err) { if (this._isMounted) { this.setState({ - loadError: i18n.translate('xpack.maps.source.pewPew.noIndexPatternErrorMessage', { - defaultMessage: `Unable to find Index pattern {id}`, - values: { - id: this.props.indexPatternId, - }, - }), + loadError: getDataViewNotFoundMessage(this.props.indexPatternId), }); } return; diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx index 1ca7ddb5862934..066b15754281e9 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/es_search_source.tsx @@ -41,7 +41,7 @@ import { SOURCE_TYPES, VECTOR_SHAPE_TYPE, } from '../../../../common/constants'; -import { getDataSourceLabel } from '../../../../common/i18n_getters'; +import { getDataSourceLabel, getDataViewLabel } from '../../../../common/i18n_getters'; import { getSourceFields } from '../../../index_pattern_util'; import { loadIndexSettings } from './util/load_index_settings'; import { DEFAULT_FILTER_BY_MAP_BOUNDS } from './constants'; @@ -222,9 +222,7 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye value: sourceTitle, }, { - label: i18n.translate('xpack.maps.source.esSearch.indexPatternLabel', { - defaultMessage: `Index pattern`, - }), + label: getDataViewLabel(), value: indexPatternName, }, { @@ -762,14 +760,14 @@ export class ESSearchSource extends AbstractESSource implements ITiledSingleLaye if (indexList.length === 0) { throw new Error( i18n.translate('xpack.maps.source.esSearch.indexZeroLengthEditError', { - defaultMessage: `Your index pattern doesn't point to any indices.`, + defaultMessage: `Your data view doesn't point to any indices.`, }) ); } if (indexList.length > 1) { throw new Error( i18n.translate('xpack.maps.source.esSearch.indexOverOneLengthEditError', { - defaultMessage: `Your index pattern points to multiple indices. Only one index is allowed per index pattern.`, + defaultMessage: `Your data view points to multiple indices. Only one index is allowed per data view.`, }) ); } diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx index 33f0d3c1d98407..ef36b70a9c1b7c 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx +++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/top_hits/update_source_editor.tsx @@ -10,6 +10,7 @@ import { EuiFormRow, EuiTitle, EuiPanel, EuiSpacer, EuiSwitch, EuiSwitchEvent } import { i18n } from '@kbn/i18n'; import { FormattedMessage } from '@kbn/i18n/react'; import type { IndexPatternField } from 'src/plugins/data/public'; +import { getDataViewNotFoundMessage } from '../../../../../common/i18n_getters'; import { FIELD_ORIGIN } from '../../../../../common/constants'; import { TooltipSelector } from '../../../../components/tooltip_selector'; @@ -66,12 +67,7 @@ export class TopHitsUpdateSourceEditor extends Component { } catch (err) { if (this._isMounted) { this.setState({ - loadError: i18n.translate('xpack.maps.source.esSearch.loadErrorMessage', { - defaultMessage: `Unable to find Index pattern {id}`, - values: { - id: this.props.indexPatternId, - }, - }), + loadError: getDataViewNotFoundMessage(this.props.indexPatternId), }); } return; diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js index 7e9c864c508438..c28c8bedafaf94 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js +++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/update_source_editor.js @@ -8,6 +8,7 @@ import React, { Fragment, Component } from 'react'; import PropTypes from 'prop-types'; import { EuiFormRow, EuiSelect, EuiTitle, EuiPanel, EuiSpacer } from '@elastic/eui'; +import { getDataViewNotFoundMessage } from '../../../../common/i18n_getters'; import { FIELD_ORIGIN } from '../../../../common/constants'; import { SingleFieldSelect } from '../../../components/single_field_select'; import { TooltipSelector } from '../../../components/tooltip_selector'; @@ -60,12 +61,7 @@ export class UpdateSourceEditor extends Component { } catch (err) { if (this._isMounted) { this.setState({ - loadError: i18n.translate('xpack.maps.source.esSearch.loadErrorMessage', { - defaultMessage: `Unable to find Index pattern {id}`, - values: { - id: this.props.indexPatternId, - }, - }), + loadError: getDataViewNotFoundMessage(this.props.indexPatternId), }); } return; diff --git a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/load_index_settings.ts b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/load_index_settings.ts index 5e4748fb168199..a736fc664a155c 100644 --- a/x-pack/plugins/maps/public/classes/sources/es_search_source/util/load_index_settings.ts +++ b/x-pack/plugins/maps/public/classes/sources/es_search_source/util/load_index_settings.ts @@ -44,7 +44,7 @@ async function fetchIndexSettings(indexPatternTitle: string): Promise @@ -30,7 +30,7 @@ exports[`should render no index pattern warning when there are no matching index

@@ -71,12 +71,12 @@ exports[`should render no index pattern warning when there are no matching index diff --git a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx index 3db7dd322ae1ce..1659b6019f0526 100644 --- a/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx +++ b/x-pack/plugins/maps/public/components/geo_index_pattern_select.tsx @@ -15,6 +15,7 @@ import { getIndexPatternService, getHttp, } from '../kibana_services'; +import { getDataViewLabel, getDataViewSelectPlaceholder } from '../../common/i18n_getters'; import { ES_GEO_FIELD_TYPE, ES_GEO_FIELD_TYPES } from '../../common/constants'; interface Props { @@ -83,7 +84,7 @@ export class GeoIndexPatternSelect extends Component { <> @@ -95,7 +96,7 @@ export class GeoIndexPatternSelect extends Component {

@@ -122,28 +123,20 @@ export class GeoIndexPatternSelect extends Component { const isIndexPatternInvalid = !!this.props.value && !this.state.doesIndexPatternHaveGeoField; const error = isIndexPatternInvalid ? i18n.translate('xpack.maps.noGeoFieldInIndexPattern.message', { - defaultMessage: 'Index pattern does not contain any geospatial fields', + defaultMessage: 'Data view does not contain any geospatial fields', }) : ''; return ( <> {this._renderNoIndexPatternWarning()} - + diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx index c636047e2be377..69090bc228489c 100644 --- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx +++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join.tsx @@ -25,6 +25,7 @@ import { ILayer } from '../../../../classes/layers/layer'; import { indexPatterns } from '../../../../../../../../src/plugins/data/public'; import { getIndexPatternService } from '../../../../kibana_services'; +import { getDataViewNotFoundMessage } from '../../../../../common/i18n_getters'; import { AGG_TYPE, SOURCE_TYPES } from '../../../../../common/constants'; import type { JoinField } from '../join_editor'; @@ -72,10 +73,7 @@ export class Join extends Component { } catch (err) { if (this._isMounted) { this.setState({ - loadError: i18n.translate('xpack.maps.layerPanel.join.noIndexPatternErrorMessage', { - defaultMessage: `Unable to find Index pattern {indexPatternId}`, - values: { indexPatternId }, - }), + loadError: getDataViewNotFoundMessage(indexPatternId), }); } return; diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx index 19a47736b19581..71aa5bf1ad88aa 100644 --- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx +++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/join_editor/resources/join_expression.tsx @@ -20,6 +20,7 @@ import { i18n } from '@kbn/i18n'; import { IndexPatternField } from 'src/plugins/data/public'; import { FormattedMessage } from '@kbn/i18n/react'; +import { getDataViewSelectPlaceholder } from '../../../../../common/i18n_getters'; import { DEFAULT_MAX_BUCKETS_LIMIT } from '../../../../../common/constants'; import { SingleFieldSelect } from '../../../../components/single_field_select'; import { ValidatedNumberInput } from '../../../../components/validated_number_input'; @@ -157,12 +158,7 @@ export class JoinExpression extends Component { })} > ［概要］に移動します。", - "xpack.maps.security.indexPatternLabel": "インデックスパターン", "xpack.maps.security.title": "セキュリティ", "xpack.maps.sescurity.destinationLayerLabel": "{indexPatternTitle} | ディスティネーションポイント", "xpack.maps.sescurity.lineLayerLabel": "{indexPatternTitle} | Line", @@ -14148,7 +14141,6 @@ "xpack.maps.source.esGeoLine.geofieldLabel": "地理空間フィールド", "xpack.maps.source.esGeoLine.geofieldPlaceholder": "ジオフィールドを選択", "xpack.maps.source.esGeoLine.geospatialFieldLabel": "地理空間フィールド", - "xpack.maps.source.esGeoLine.indexPatternLabel": "インデックスパターン", "xpack.maps.source.esGeoLine.isTrackCompleteLabel": "トラックは完了しました", "xpack.maps.source.esGeoLine.metricsLabel": "トラックメトリック", "xpack.maps.source.esGeoLine.sortFieldLabel": "並べ替え", @@ -14168,10 +14160,8 @@ "xpack.maps.source.esGrid.finestDropdownOption": "最も細かい", "xpack.maps.source.esGrid.geospatialFieldLabel": "地理空間フィールド", "xpack.maps.source.esGrid.geoTileGridLabel": "グリッドパラメーター", - "xpack.maps.source.esGrid.indexPatternLabel": "インデックスパターン", "xpack.maps.source.esGrid.inspectorDescription": "Elasticsearch ジオグリッド集約リクエスト", "xpack.maps.source.esGrid.metricsLabel": "メトリック", - "xpack.maps.source.esGrid.noIndexPatternErrorMessage": "インデックスパターン {id} が見つかりません", "xpack.maps.source.esGrid.resolutionParamErrorMessage": "グリッド解像度パラメーターが認識されません：{resolution}", "xpack.maps.source.esGrid.superFineDropDownOption": "高精細 (ベータ) ", "xpack.maps.source.esGridClustersDescription": "それぞれのグリッド付きセルのメトリックでグリッドにグループ分けされた地理空間データです。", @@ -14189,11 +14179,9 @@ "xpack.maps.source.esSearch.geofieldLabel": "地理空間フィールド", "xpack.maps.source.esSearch.geoFieldLabel": "地理空間フィールド", "xpack.maps.source.esSearch.geoFieldTypeLabel": "地理空間フィールドタイプ", - "xpack.maps.source.esSearch.indexPatternLabel": "インデックスパターン", "xpack.maps.source.esSearch.joinsDisabledReason": "クラスターでスケーリングするときに、結合はサポートされていません", "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "mvtベクトルタイルでスケーリングするときに、結合はサポートされていません", "xpack.maps.source.esSearch.limitScalingLabel": "結果を {maxResultWindow} に限定。", - "xpack.maps.source.esSearch.loadErrorMessage": "インデックスパターン {id} が見つかりません", "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "ドキュメントが見つかりません。_id：{docId}", "xpack.maps.source.esSearch.mvtDescription": "大きいデータセットを高速表示するために、ベクトルタイルを使用します。", "xpack.maps.source.esSearch.selectLabel": "ジオフィールドを選択", @@ -14207,7 +14195,6 @@ "xpack.maps.source.esSearchDescription": "Elasticsearch の点、線、多角形", "xpack.maps.source.esSearchTitle": "ドキュメント", "xpack.maps.source.esSource.noGeoFieldErrorMessage": "インデックスパターン {indexPatternTitle} には現在ジオフィールド {geoField} が含まれていません", - "xpack.maps.source.esSource.noIndexPatternErrorMessage": "ID {indexPatternId} のインデックスパターンが見つかりません", "xpack.maps.source.esSource.requestFailedErrorMessage": "Elasticsearch 検索リクエストに失敗。エラー：{message}", "xpack.maps.source.esSource.stylePropsMetaRequestDescription": "シンボル化バンドを計算するために使用されるフィールドメタデータを取得するElasticsearchリクエスト。", "xpack.maps.source.esSource.stylePropsMetaRequestName": "{layerName} - メタデータ", @@ -14234,11 +14221,8 @@ "xpack.maps.source.mvtVectorSourceWizard": "Mapboxベクトルタイル仕様を実装するデータサービス", "xpack.maps.source.pewPew.destGeoFieldLabel": "送信先", "xpack.maps.source.pewPew.destGeoFieldPlaceholder": "デスティネーション地理情報フィールドを選択", - "xpack.maps.source.pewPew.indexPatternLabel": "インデックスパターン", - "xpack.maps.source.pewPew.indexPatternPlaceholder": "インデックスパターンを選択", "xpack.maps.source.pewPew.inspectorDescription": "ソースとデスティネーションの接続リクエスト", "xpack.maps.source.pewPew.metricsLabel": "メトリック", - "xpack.maps.source.pewPew.noIndexPatternErrorMessage": "インデックスパターン {id} が見つかりません", "xpack.maps.source.pewPew.noSourceAndDestDetails": "選択されたインデックスパターンにはソースとデスティネーションのフィールドが含まれていません。", "xpack.maps.source.pewPew.sourceGeoFieldLabel": "送信元", "xpack.maps.source.pewPew.sourceGeoFieldPlaceholder": "ソース地理情報フィールドを選択", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index fa143727e8f4eb..f04ce54b773052 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -14199,7 +14199,6 @@ "xpack.maps.choropleth.geofieldPlaceholder": "选择地理字段", "xpack.maps.choropleth.joinFieldLabel": "联接字段", "xpack.maps.choropleth.joinFieldPlaceholder": "选择字段", - "xpack.maps.choropleth.rightSourceLabel": "索引模式", "xpack.maps.choropleth.statisticsLabel": "统计源", "xpack.maps.choropleth.title": "分级统计图", "xpack.maps.common.esSpatialRelation.containsLabel": "contains", @@ -14269,8 +14268,6 @@ "xpack.maps.heatmapLegend.coldLabel": "冷", "xpack.maps.heatmapLegend.hotLabel": "热", "xpack.maps.indexData.indexExists": "找不到索引“{index}”。必须提供有效的索引", - "xpack.maps.indexPatternSelectLabel": "索引模式", - "xpack.maps.indexPatternSelectPlaceholder": "选择索引模式", "xpack.maps.indexSettings.fetchErrorMsg": "无法提取索引模式“{indexPatternTitle}”的索引设置。\n 确保您具有“{viewIndexMetaRole}”角色。", "xpack.maps.initialLayers.unableToParseMessage": "无法解析“initialLayers”参数的内容。错误：{errorMsg}", "xpack.maps.initialLayers.unableToParseTitle": "初始图层未添加到地图", @@ -14314,7 +14311,6 @@ "xpack.maps.layerPanel.join.applyGlobalTimeCheckboxLabel": "应用全局时间到联接", "xpack.maps.layerPanel.join.deleteJoinAriaLabel": "删除联接", "xpack.maps.layerPanel.join.deleteJoinTitle": "删除联接", - "xpack.maps.layerPanel.join.noIndexPatternErrorMessage": "找不到索引模式 {indexPatternId}", "xpack.maps.layerPanel.joinEditor.addJoinAriaLabel": "添加联接", "xpack.maps.layerPanel.joinEditor.addJoinButtonLabel": "添加联接", "xpack.maps.layerPanel.joinEditor.termJoinsTitle": "词联接", @@ -14330,7 +14326,6 @@ "xpack.maps.layerPanel.joinExpression.rightSourceLabel": "右源", "xpack.maps.layerPanel.joinExpression.rightSourceLabelHelpText": "包含共享密钥的右源字段。", "xpack.maps.layerPanel.joinExpression.selectFieldPlaceholder": "选择字段", - "xpack.maps.layerPanel.joinExpression.selectIndexPatternPlaceholder": "选择索引模式", "xpack.maps.layerPanel.joinExpression.selectPlaceholder": "-- 选择 --", "xpack.maps.layerPanel.joinExpression.sizeFragment": "排名前 {rightSize} 的词 - 来自", "xpack.maps.layerPanel.joinExpression.value": "{leftSourceName}:{leftValue}，{sizeFragment} {rightSourceName}:{rightValue}", @@ -14378,7 +14373,6 @@ "xpack.maps.mapListing.errorAttemptingToLoadSavedMaps": "无法加载地图", "xpack.maps.mapListing.tableCaption": "Maps", "xpack.maps.mapListing.titleFieldTitle": "标题", - "xpack.maps.maps.choropleth.rightSourcePlaceholder": "选择索引模式", "xpack.maps.mapSavedObjectLabel": "地图", "xpack.maps.mapSettingsPanel.autoFitToBoundsLocationLabel": "使地图自适应数据边界", "xpack.maps.mapSettingsPanel.autoFitToDataBoundsLabel": "使地图自动适应数据边界", @@ -14464,7 +14458,6 @@ "xpack.maps.sampleDataLinkLabel": "地图", "xpack.maps.security.desc": "安全层", "xpack.maps.security.disabledDesc": "找不到安全索引模式。要开始使用“安全性”，请前往“安全性”>“概览”。", - "xpack.maps.security.indexPatternLabel": "索引模式", "xpack.maps.security.title": "安全", "xpack.maps.sescurity.destinationLayerLabel": "{indexPatternTitle} | 目标点", "xpack.maps.sescurity.lineLayerLabel": "{indexPatternTitle} | 线", @@ -14511,7 +14504,6 @@ "xpack.maps.source.esGeoLine.geofieldLabel": "地理空间字段", "xpack.maps.source.esGeoLine.geofieldPlaceholder": "选择地理字段", "xpack.maps.source.esGeoLine.geospatialFieldLabel": "地理空间字段", - "xpack.maps.source.esGeoLine.indexPatternLabel": "索引模式", "xpack.maps.source.esGeoLine.isTrackCompleteLabel": "轨迹完整", "xpack.maps.source.esGeoLine.metricsLabel": "轨迹指标", "xpack.maps.source.esGeoLine.sortFieldLabel": "排序", @@ -14531,10 +14523,8 @@ "xpack.maps.source.esGrid.finestDropdownOption": "最精致化", "xpack.maps.source.esGrid.geospatialFieldLabel": "地理空间字段", "xpack.maps.source.esGrid.geoTileGridLabel": "网格参数", - "xpack.maps.source.esGrid.indexPatternLabel": "索引模式", "xpack.maps.source.esGrid.inspectorDescription": "Elasticsearch 地理网格聚合请求", "xpack.maps.source.esGrid.metricsLabel": "指标", - "xpack.maps.source.esGrid.noIndexPatternErrorMessage": "找不到索引模式 {id}", "xpack.maps.source.esGrid.resolutionParamErrorMessage": "无法识别网格分辨率参数：{resolution}", "xpack.maps.source.esGrid.superFineDropDownOption": "超精细（公测版）", "xpack.maps.source.esGridClustersDescription": "地理空间数据以网格进行分组，每个网格单元格都具有指标", @@ -14552,11 +14542,9 @@ "xpack.maps.source.esSearch.geofieldLabel": "地理空间字段", "xpack.maps.source.esSearch.geoFieldLabel": "地理空间字段", "xpack.maps.source.esSearch.geoFieldTypeLabel": "地理空间字段类型", - "xpack.maps.source.esSearch.indexPatternLabel": "索引模式", "xpack.maps.source.esSearch.joinsDisabledReason": "按集群缩放时不支持联接", "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "按 mvt 矢量磁贴缩放时不支持联接", "xpack.maps.source.esSearch.limitScalingLabel": "将结果数限制到 {maxResultWindow}。", - "xpack.maps.source.esSearch.loadErrorMessage": "找不到索引模式 {id}", "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "找不到文档，_id：{docId}", "xpack.maps.source.esSearch.mvtDescription": "使用矢量磁贴可更快速地显示大型数据集。", "xpack.maps.source.esSearch.selectLabel": "选择地理字段", @@ -14570,7 +14558,6 @@ "xpack.maps.source.esSearchDescription": "Elasticsearch 的点、线和多边形", "xpack.maps.source.esSearchTitle": "文档", "xpack.maps.source.esSource.noGeoFieldErrorMessage": "索引模式“{indexPatternTitle}”不再包含地理字段 {geoField}", - "xpack.maps.source.esSource.noIndexPatternErrorMessage": "找不到 ID {indexPatternId} 的索引模式", "xpack.maps.source.esSource.requestFailedErrorMessage": "Elasticsearch 搜索请求失败，错误：{message}", "xpack.maps.source.esSource.stylePropsMetaRequestDescription": "检索用于计算符号化带的字段元数据的 Elasticsearch 请求。", "xpack.maps.source.esSource.stylePropsMetaRequestName": "{layerName} - 元数据", @@ -14597,11 +14584,8 @@ "xpack.maps.source.mvtVectorSourceWizard": "实施 Mapbox 矢量文件规范的数据服务", "xpack.maps.source.pewPew.destGeoFieldLabel": "目标", "xpack.maps.source.pewPew.destGeoFieldPlaceholder": "选择目标地理位置字段", - "xpack.maps.source.pewPew.indexPatternLabel": "索引模式", - "xpack.maps.source.pewPew.indexPatternPlaceholder": "选择索引模式", "xpack.maps.source.pewPew.inspectorDescription": "源-目标连接请求", "xpack.maps.source.pewPew.metricsLabel": "指标", - "xpack.maps.source.pewPew.noIndexPatternErrorMessage": "找不到索引模式 {id}", "xpack.maps.source.pewPew.noSourceAndDestDetails": "选定的索引模式不包含源和目标字段。", "xpack.maps.source.pewPew.sourceGeoFieldLabel": "源", "xpack.maps.source.pewPew.sourceGeoFieldPlaceholder": "选择源地理位置字段", From 9288cee3a87bfb51f9584bb9f3a211deba1783b9 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Wed, 1 Sep 2021 21:33:50 -0500 Subject: [PATCH 05/25] [data plugin] index pattern => data view text changes (#109576) * data plugin index pattern => data view text changes --- .../expressions/load_index_pattern.ts | 8 ++++---- .../index_patterns/index_patterns.ts | 16 ++++++++-------- .../data/common/index_patterns/lib/errors.ts | 2 +- .../data/common/search/aggs/param_types/field.ts | 4 ++-- .../search/expressions/esaggs/esaggs_fn.ts | 2 +- .../data/common/search/expressions/esdsl.ts | 6 +++--- .../search_source/inspect/inspector_stats.ts | 12 ++++++------ .../public/components/form_schema.ts | 2 +- .../plugins/translations/translations/ja-JP.json | 8 -------- .../plugins/translations/translations/zh-CN.json | 8 -------- 10 files changed, 26 insertions(+), 42 deletions(-) diff --git a/src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts b/src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts index 8fe9e40e0ac6c7..7bbf59310a82df 100644 --- a/src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts +++ b/src/plugins/data/common/index_patterns/expressions/load_index_pattern.ts @@ -46,15 +46,15 @@ export const getIndexPatternLoadMeta = (): Omit< name, type, inputTypes: ['null'], - help: i18n.translate('data.functions.indexPatternLoad.help', { - defaultMessage: 'Loads an index pattern', + help: i18n.translate('data.functions.dataViewLoad.help', { + defaultMessage: 'Loads a data view', }), args: { id: { types: ['string'], required: true, - help: i18n.translate('data.functions.indexPatternLoad.id.help', { - defaultMessage: 'index pattern id to load', + help: i18n.translate('data.functions.dataViewLoad.id.help', { + defaultMessage: 'data view id to load', }), }, }, diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts index a72224d1c3fe81..28bde724be5b28 100644 --- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts +++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts @@ -293,8 +293,8 @@ export class DataViewsService { } this.onError(err, { - title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', { - defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})', + title: i18n.translate('data.dataViews.fetchFieldErrorTitle', { + defaultMessage: 'Error fetching fields for data view {title} (ID: {id})', values: { id: indexPattern.id, title: indexPattern.title }, }), }); @@ -339,8 +339,8 @@ export class DataViewsService { } this.onError(err, { - title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', { - defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})', + title: i18n.translate('data.dataViews.fetchFieldErrorTitle', { + defaultMessage: 'Error fetching fields for data view {title} (ID: {id})', values: { id, title }, }), }); @@ -481,8 +481,8 @@ export class DataViewsService { }); } else { this.onError(err, { - title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', { - defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})', + title: i18n.translate('data.dataViews.fetchFieldErrorTitle', { + defaultMessage: 'Error fetching fields for data view {title} (ID: {id})', values: { id: savedObject.id, title }, }), }); @@ -652,9 +652,9 @@ export class DataViewsService { if (ignoreErrors) { return; } - const title = i18n.translate('data.indexPatterns.unableWriteLabel', { + const title = i18n.translate('data.dataViews.unableWriteLabel', { defaultMessage: - 'Unable to write index pattern! Refresh the page to get the most up to date changes for this index pattern.', + 'Unable to write data view! Refresh the page to get the most up to date changes for this data view.', }); this.onNotification({ title, color: 'danger' }); diff --git a/src/plugins/data/common/index_patterns/lib/errors.ts b/src/plugins/data/common/index_patterns/lib/errors.ts index 20f422c5124e68..be639c338706e6 100644 --- a/src/plugins/data/common/index_patterns/lib/errors.ts +++ b/src/plugins/data/common/index_patterns/lib/errors.ts @@ -15,7 +15,7 @@ import { KbnError } from '../../../../kibana_utils/common/'; */ export class DataViewMissingIndices extends KbnError { constructor(message: string) { - const defaultMessage = "IndexPattern's configured pattern does not match any indices"; + const defaultMessage = "Data view's title does not match any indices"; super( message && message.length ? `No matching indices found: ${message}` : defaultMessage diff --git a/src/plugins/data/common/search/aggs/param_types/field.ts b/src/plugins/data/common/search/aggs/param_types/field.ts index 62dac9831211a9..058acf1341318d 100644 --- a/src/plugins/data/common/search/aggs/param_types/field.ts +++ b/src/plugins/data/common/search/aggs/param_types/field.ts @@ -56,7 +56,7 @@ export class FieldParamType extends BaseParamType { 'data.search.aggs.paramTypes.field.notFoundSavedFieldParameterErrorMessage', { defaultMessage: - 'The field "{fieldParameter}" associated with this object no longer exists in the index pattern. Please use another field.', + 'The field "{fieldParameter}" associated with this object no longer exists in the data view. Please use another field.', values: { fieldParameter: field.name, }, @@ -75,7 +75,7 @@ export class FieldParamType extends BaseParamType { 'data.search.aggs.paramTypes.field.invalidSavedFieldParameterErrorMessage', { defaultMessage: - 'Saved field "{fieldParameter}" of index pattern "{indexPatternTitle}" is invalid for use with the "{aggType}" aggregation. Please select a new field.', + 'Saved field "{fieldParameter}" of data view "{indexPatternTitle}" is invalid for use with the "{aggType}" aggregation. Please select a new field.', values: { fieldParameter: field.name, aggType: aggConfig?.type?.title, diff --git a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts index 496225ad9f00ba..fd81e4dac93189 100644 --- a/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts +++ b/src/plugins/data/common/search/expressions/esaggs/esaggs_fn.ts @@ -62,7 +62,7 @@ export const getEsaggsMeta: () => Omit types: ['index_pattern'], required: true, help: i18n.translate('data.search.functions.esaggs.index.help', { - defaultMessage: 'Index pattern retrieved with indexPatternLoad', + defaultMessage: 'Data view retrieved with indexPatternLoad', }), }, aggs: { diff --git a/src/plugins/data/common/search/expressions/esdsl.ts b/src/plugins/data/common/search/expressions/esdsl.ts index a5834001143e48..20c531e7029eb3 100644 --- a/src/plugins/data/common/search/expressions/esdsl.ts +++ b/src/plugins/data/common/search/expressions/esdsl.ts @@ -115,12 +115,12 @@ export const getEsdslFn = ({ request.stats({ indexPattern: { - label: i18n.translate('data.search.es_search.indexPatternLabel', { - defaultMessage: 'Index pattern', + label: i18n.translate('data.search.es_search.dataViewLabel', { + defaultMessage: 'Data view', }), value: args.index, description: i18n.translate('data.search.es_search.indexPatternDescription', { - defaultMessage: 'The index pattern that connected to the Elasticsearch indices.', + defaultMessage: 'The data view that connected to the Elasticsearch indices.', }), }, }); diff --git a/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts b/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts index e5a3acc23eee89..67c23fb16b8ded 100644 --- a/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts +++ b/src/plugins/data/common/search/search_source/inspect/inspector_stats.ts @@ -25,17 +25,17 @@ export function getRequestInspectorStats(searchSource: ISearchSource) { if (index) { stats.indexPattern = { - label: i18n.translate('data.search.searchSource.indexPatternLabel', { - defaultMessage: 'Index pattern', + label: i18n.translate('data.search.searchSource.dataViewLabel', { + defaultMessage: 'Data view', }), value: index.title, - description: i18n.translate('data.search.searchSource.indexPatternDescription', { - defaultMessage: 'The index pattern that connected to the Elasticsearch indices.', + description: i18n.translate('data.search.searchSource.dataViewDescription', { + defaultMessage: 'The data view that was queried.', }), }; stats.indexPatternId = { - label: i18n.translate('data.search.searchSource.indexPatternIdLabel', { - defaultMessage: 'Index pattern ID', + label: i18n.translate('data.search.searchSource.dataViewIdLabel', { + defaultMessage: 'Data view ID', }), value: index.id!, description: i18n.translate('data.search.searchSource.indexPatternIdDescription', { diff --git a/src/plugins/index_pattern_editor/public/components/form_schema.ts b/src/plugins/index_pattern_editor/public/components/form_schema.ts index a66e25059096b2..826c9db6a82712 100644 --- a/src/plugins/index_pattern_editor/public/components/form_schema.ts +++ b/src/plugins/index_pattern_editor/public/components/form_schema.ts @@ -47,7 +47,7 @@ export const schema = { }, id: { label: i18n.translate('indexPatternEditor.editor.form.customIdLabel', { - defaultMessage: 'Custom index pattern ID', + defaultMessage: 'Custom data view ID', }), helpText: i18n.translate('indexPatternEditor.editor.form.customIdHelp', { defaultMessage: diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index a98b9c6b056e8e..e7ba8cd04dee60 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -818,12 +818,8 @@ "data.functions.esaggs.help": "AggConfig 集約を実行します", "data.functions.esaggs.inspector.dataRequest.description": "このリクエストはElasticsearchにクエリし、ビジュアライゼーション用のデータを取得します。", "data.functions.esaggs.inspector.dataRequest.title": "データ", - "data.functions.indexPatternLoad.help": "インデックスパターンを読み込みます", - "data.functions.indexPatternLoad.id.help": "読み込むインデックスパターンID", "data.indexPatterns.ensureDefaultIndexPattern.bannerLabel": "Kibanaでデータの可視化と閲覧を行うには、Elasticsearchからデータを取得するためのインデックスパターンの作成が必要です。", - "data.indexPatterns.fetchFieldErrorTitle": "インデックスパターンのフィールド取得中にエラーが発生 {title} (ID：{id}) ", "data.indexPatterns.indexPatternLoad.error.kibanaRequest": "サーバーでこの検索を実行するには、KibanaRequest が必要です。式実行パラメーターに要求オブジェクトを渡してください。", - "data.indexPatterns.unableWriteLabel": "インデックスパターンを書き込めません。このインデックスパターンへの最新の変更を取得するには、ページを更新してください。", "data.inspector.table..dataDescriptionTooltip": "ビジュアライゼーションの元のデータを表示", "data.inspector.table.dataTitle": "データ", "data.inspector.table.downloadCSVToggleButtonLabel": "CSV をダウンロード", @@ -1301,7 +1297,6 @@ "data.search.es_search.hitsTotalDescription": "クエリに一致するドキュメントの数です。", "data.search.es_search.hitsTotalLabel": "ヒット数 (合計) ", "data.search.es_search.indexPatternDescription": "Elasticsearchインデックスに接続したインデックスパターンです。", - "data.search.es_search.indexPatternLabel": "インデックスパターン", "data.search.es_search.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザーでのパースの時間は含まれません。", "data.search.es_search.queryTimeLabel": "クエリ時間", "data.search.es_search.queryTimeValue": "{queryTime}ms", @@ -1403,10 +1398,7 @@ "data.search.searchSource.hitsLabel": "ヒット数", "data.search.searchSource.hitsTotalDescription": "クエリに一致するドキュメントの数です。", "data.search.searchSource.hitsTotalLabel": "ヒット数 (合計) ", - "data.search.searchSource.indexPatternDescription": "Elasticsearchインデックスに接続したインデックスパターンです。", "data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} インデックス内の ID です。", - "data.search.searchSource.indexPatternIdLabel": "インデックスパターン ID", - "data.search.searchSource.indexPatternLabel": "インデックスパターン", "data.search.searchSource.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザーでのパースの時間は含まれません。", "data.search.searchSource.queryTimeLabel": "クエリ時間", "data.search.searchSource.queryTimeValue": "{queryTime}ms", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index f04ce54b773052..9d92d4590a16a7 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -821,12 +821,8 @@ "data.functions.esaggs.help": "运行 AggConfig 聚合", "data.functions.esaggs.inspector.dataRequest.description": "此请求查询 Elasticsearch，以获取可视化的数据。", "data.functions.esaggs.inspector.dataRequest.title": "数据", - "data.functions.indexPatternLoad.help": "加载索引模式", - "data.functions.indexPatternLoad.id.help": "要加载的索引模式 id", "data.indexPatterns.ensureDefaultIndexPattern.bannerLabel": "要在 Kibana 中可视化和浏览数据，必须创建索引模式，以从 Elasticsearch 中检索数据。", - "data.indexPatterns.fetchFieldErrorTitle": "提取索引模式 {title} (ID: {id}) 的字段时出错", "data.indexPatterns.indexPatternLoad.error.kibanaRequest": "在服务器上执行此搜索时需要 Kibana 请求。请向表达式执行模式参数提供请求对象。", - "data.indexPatterns.unableWriteLabel": "无法写入索引模式！请刷新页面以获取此索引模式的最新更改。", "data.inspector.table..dataDescriptionTooltip": "查看可视化后面的数据", "data.inspector.table.dataTitle": "数据", "data.inspector.table.downloadCSVToggleButtonLabel": "下载 CSV", @@ -1305,7 +1301,6 @@ "data.search.es_search.hitsTotalDescription": "与查询匹配的文档数目。", "data.search.es_search.hitsTotalLabel": "命中数（总数）", "data.search.es_search.indexPatternDescription": "连接到 Elasticsearch 索引的索引模式。", - "data.search.es_search.indexPatternLabel": "索引模式", "data.search.es_search.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。", "data.search.es_search.queryTimeLabel": "查询时间", "data.search.es_search.queryTimeValue": "{queryTime}ms", @@ -1407,10 +1402,7 @@ "data.search.searchSource.hitsLabel": "命中数", "data.search.searchSource.hitsTotalDescription": "与查询匹配的文档数目。", "data.search.searchSource.hitsTotalLabel": "命中数（总数）", - "data.search.searchSource.indexPatternDescription": "连接到 Elasticsearch 索引的索引模式。", "data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} 索引中的 ID。", - "data.search.searchSource.indexPatternIdLabel": "索引模式 ID", - "data.search.searchSource.indexPatternLabel": "索引模式", "data.search.searchSource.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。", "data.search.searchSource.queryTimeLabel": "查询时间", "data.search.searchSource.queryTimeValue": "{queryTime}ms", From dcbb5beebd463aeb956e994838e9df4be23d9555 Mon Sep 17 00:00:00 2001 From: ymao1 Date: Tue, 7 Sep 2021 15:26:07 -0400 Subject: [PATCH 06/25] [Alerting] Rename index pattern to data view (#111137) * Rename index pattern to data view in alerting managed plugins * Tests * Tests * Tests * Using data source attribute in docs Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- docs/user/alerting/rule-types/es-query.asciidoc | 2 +- .../alerting/rule-types/geo-rule-types.asciidoc | 10 +++++----- .../alerting/rule-types/index-threshold.asciidoc | 2 +- x-pack/plugins/event_log/README.md | 2 +- ...containment_alert_type_expression.test.tsx.snap | 6 +++--- .../expressions/boundary_index_expression.tsx | 2 +- .../expressions/entity_index_expression.tsx | 2 +- .../geo_index_pattern_select.test.tsx.snap | 12 ++++++------ .../geo_index_pattern_select.test.tsx | 2 +- .../util_components/geo_index_pattern_select.tsx | 10 +++++----- .../util_components/single_field_select.tsx | 2 +- .../public/alert_types/geo_containment/readme.md | 14 +++++++------- .../alert_types/geo_containment/validation.test.ts | 4 ++-- .../alert_types/geo_containment/validation.ts | 4 ++-- .../public/common/index_controls/index.ts | 2 +- .../event_log/public_api_integration.ts | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/user/alerting/rule-types/es-query.asciidoc b/docs/user/alerting/rule-types/es-query.asciidoc index 65d39ba170c3c9..500514b816ff26 100644 --- a/docs/user/alerting/rule-types/es-query.asciidoc +++ b/docs/user/alerting/rule-types/es-query.asciidoc @@ -17,7 +17,7 @@ Define properties to detect the condition. [role="screenshot"] image::user/alerting/images/rule-types-es-query-conditions.png[Five clauses define the condition to detect] -Index:: This clause requires an *index or index pattern* and a *time field* that will be used for the *time window*. +Index:: This clause requires an *index or {data-source}* and a *time field* that will be used for the *time window*. Size:: This clause specifies the number of documents to pass to the configured actions when the the threshold condition is met. {es} query:: This clause specifies the ES DSL query to execute. The number of documents that match this query will be evaulated against the threshold condition. Aggregations are not supported at this time. diff --git a/docs/user/alerting/rule-types/geo-rule-types.asciidoc b/docs/user/alerting/rule-types/geo-rule-types.asciidoc index 244cf90c855a7e..cda5abb23ce138 100644 --- a/docs/user/alerting/rule-types/geo-rule-types.asciidoc +++ b/docs/user/alerting/rule-types/geo-rule-types.asciidoc @@ -10,17 +10,17 @@ In the event that an entity is contained within a boundary, an alert may be gene ==== Requirements To create a Tracking containment rule, the following requirements must be present: -- *Tracks index or index pattern*: An index containing a `geo_point` field, `date` field, +- *Tracks index or {data-source}*: An index containing a `geo_point` field, `date` field, and some form of entity identifier. An entity identifier is a `keyword` or `number` field that consistently identifies the entity to be tracked. The data in this index should be dynamically updating so that there are entity movements to alert upon. -- *Boundaries index or index pattern*: An index containing `geo_shape` data, such as boundary data and bounding box data. +- *Boundaries index or {data-source}*: An index containing `geo_shape` data, such as boundary data and bounding box data. This data is presumed to be static (not updating). Shape data matching the query is harvested once when the rule is created and anytime after when the rule is re-enabled after disablement. By design, current interval entity locations (_current_ is determined by `date` in -the *Tracked index or index pattern*) are queried to determine if they are contained +the *Tracked index or {data-source}*) are queried to determine if they are contained within any monitored boundaries. Entity data should be somewhat "real time", meaning the dates of new documents aren’t older than the current time minus the amount of the interval. If data older than @@ -39,13 +39,13 @@ as well as 2 Kuery bars used to provide additional filtering context for each of [role="screenshot"] image::user/alerting/images/alert-types-tracking-containment-conditions.png[Five clauses define the condition to detect] -Index (entity):: This clause requires an *index or index pattern*, a *time field* that will be used for the *time window*, and a *`geo_point` field* for tracking. +Index (entity):: This clause requires an *index or {data-source}*, a *time field* that will be used for the *time window*, and a *`geo_point` field* for tracking. When entity:: This clause specifies which crossing option to track. The values *Entered*, *Exited*, and *Crossed* can be selected to indicate which crossing conditions should trigger a rule. *Entered* alerts on entry into a boundary, *Exited* alerts on exit from a boundary, and *Crossed* alerts on all boundary crossings whether they be entrances or exits. -Index (Boundary):: This clause requires an *index or index pattern*, a *`geo_shape` field* +Index (Boundary):: This clause requires an *index or {data-source}*, a *`geo_shape` field* identifying boundaries, and an optional *Human-readable boundary name* for better alerting messages. diff --git a/docs/user/alerting/rule-types/index-threshold.asciidoc b/docs/user/alerting/rule-types/index-threshold.asciidoc index 8c45c158414f4b..ca80c4c3e98fb4 100644 --- a/docs/user/alerting/rule-types/index-threshold.asciidoc +++ b/docs/user/alerting/rule-types/index-threshold.asciidoc @@ -17,7 +17,7 @@ Define properties to detect the condition. [role="screenshot"] image::user/alerting/images/rule-types-index-threshold-conditions.png[Five clauses define the condition to detect] -Index:: This clause requires an *index or index pattern* and a *time field* that will be used for the *time window*. +Index:: This clause requires an *index or {data-source}* and a *time field* that will be used for the *time window*. When:: This clause specifies how the value to be compared to the threshold is calculated. The value is calculated by aggregating a numeric field a the *time window*. The aggregation options are: `count`, `average`, `sum`, `min`, and `max`. When using `count` the document count is used, and an aggregation field is not necessary. Over/Grouped Over:: This clause lets you configure whether the aggregation is applied over all documents, or should be split into groups using a grouping field. If grouping is used, an <> will be created for each group when it exceeds the threshold. To limit the number of alerts on high cardinality fields, you must specify the number of groups to check against the threshold. Only the *top* groups are checked. Threshold:: This clause defines a threshold value and a comparison operator (one of `is above`, `is above or equals`, `is below`, `is below or equals`, or `is between`). The result of the aggregation is compared to this threshold. diff --git a/x-pack/plugins/event_log/README.md b/x-pack/plugins/event_log/README.md index f637187c1c1807..61f79c662fad6b 100644 --- a/x-pack/plugins/event_log/README.md +++ b/x-pack/plugins/event_log/README.md @@ -204,7 +204,7 @@ For ad-hoc diagnostic purposes, your go to tools are Discover and Lens. Your user will need to have access to the index, which is considered a Kibana system index due to it's prefix. -Add the event log index as an index pattern. The only customization needed is +Add the event log index as a data view. The only customization needed is to set the `event.duration` field to a duration in nanoseconds. You'll probably want it displayed as milliseconds. diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/__snapshots__/geo_containment_alert_type_expression.test.tsx.snap b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/__snapshots__/geo_containment_alert_type_expression.test.tsx.snap index 860686b5211d83..65dff2bd3a6c6d 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/__snapshots__/geo_containment_alert_type_expression.test.tsx.snap +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/__snapshots__/geo_containment_alert_type_expression.test.tsx.snap @@ -2,7 +2,7 @@ exports[`should render BoundaryIndexExpression 1`] = ` @@ -77,7 +77,7 @@ exports[`should render BoundaryIndexExpression 1`] = ` exports[`should render EntityIndexExpression 1`] = ` = ({ return ( = ({ isInvalid={isInvalid} value={indexPattern.title} defaultValue={i18n.translate('xpack.stackAlerts.geoContainment.entityIndexSelect', { - defaultMessage: 'Select an index pattern and geo point field', + defaultMessage: 'Select a data view and geo point field', })} popoverContent={indexPopover} expressionDescription={i18n.translate('xpack.stackAlerts.geoContainment.entityIndexLabel', { diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap index 84ba07b3c015be..14528de235c9f7 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/__snapshots__/geo_index_pattern_select.test.tsx.snap @@ -1,16 +1,16 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`should render with error when index pattern does not have geo_point field 1`] = ` +exports[`should render with error when data view does not have geo_point field 1`] = ` @@ -41,7 +41,7 @@ exports[`should render without error after mounting 1`] = ` hasChildLabel={true} hasEmptyLabelSpace={false} isInvalid={false} - label="Index pattern" + label="Data view" labelType="label" > diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx index f587e8ed35e17f..48148dd1a25166 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/geo_index_pattern_select.test.tsx @@ -53,7 +53,7 @@ test('should render without error after mounting', async () => { expect(component).toMatchSnapshot(); }); -test('should render with error when index pattern does not have geo_point field', async () => { +test('should render with error when data view does not have geo_point field', async () => { const component = shallow( { <> @@ -105,7 +105,7 @@ export class GeoIndexPatternSelect extends Component { >

@@ -135,7 +135,7 @@ export class GeoIndexPatternSelect extends Component { const error = isIndexPatternInvalid ? i18n.translate('xpack.stackAlerts.geoContainment.noGeoFieldInIndexPattern.message', { defaultMessage: - 'Index pattern does not contain any allowed geospatial fields. Must have one of type {geoFields}.', + 'Data view does not contain any allowed geospatial fields. Must have one of type {geoFields}.', values: { geoFields: this.props.includedGeoTypes.join(', '), }, @@ -148,7 +148,7 @@ export class GeoIndexPatternSelect extends Component { { placeholder={i18n.translate( 'xpack.stackAlerts.geoContainment.indexPatternSelectPlaceholder', { - defaultMessage: 'Select index pattern', + defaultMessage: 'Select data view', } )} fieldTypes={this.props.includedGeoTypes} diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx index 6fc10da5962ca7..9c4977ca5e87bf 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/query_builder/util_components/single_field_select.tsx @@ -34,7 +34,7 @@ function fieldsToOptions(fields?: IFieldType[]): Array void; fields: IFieldType[]; } diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md index b48a28fbdf99ba..786f3f1309950a 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/readme.md @@ -43,7 +43,7 @@ quantities of data the frequency listed below (20000ms = 20s) or higher: There are 3 separate tabs you'll need for a combination of loading and viewing the data. Since you'll be jumping between them, it might be easiest to just open them upfront. Each is preceded by `https://localhost:5601//app/`: -- Stack Management > Index Patterns: `management/kibana/indexPatterns` +- Stack Management > Data Views: `management/kibana/indexPatterns` - Stack Management > Alerts & Actions: `management/insightsAndAlerting/triggersActions/alerts` - Maps: `maps` @@ -58,11 +58,11 @@ _ When finished uploading and adding the layer, save the map using a name of you choice. - Keep the Maps tab open, you'll come back to this -### 7. Create index pattern for generated tracks -- Go to the index pattern tab to create a new index pattern. +### 7. Create data view for generated tracks +- Go to the data view tab to create a new data view. - Give it the index name `mtatracks*` - For `Time field` select `@timestamp` -- Click `Create index pattern` +- Click `Create data view` - Leave this tab open, you'll come back to this ### 8. Create containment alert @@ -102,11 +102,11 @@ Entity: {{context.entityId}} with document ID: {{context.entityDocumentId}} has - Boundary layer - This layer should already be added from when you uploaded the GeoJSON file earlier. If it's not already added, it can be added by selecting `Documents` - > `Index patterns` > `nyc-neighborhoods` then accept the defaults and add the layer. + > `Data views` > `nyc-neighborhoods` then accept the defaults and add the layer. - Vehicle tracks - - Add `Tracks` > `Index patterns` > `mtatracks*`, accept the defaults selected and set `Entity` > `entity_id`. Add the layer and style appropriately. + - Add `Tracks` > `Data views` > `mtatracks*`, accept the defaults selected and set `Entity` > `entity_id`. Add the layer and style appropriately. - Last known location - - Add `Documents` > `Index patterns` > `mtatracks*` and select `Show top hits per entity` + - Add `Documents` > `Data views` > `mtatracks*` and select `Show top hits per entity` - For `Entity` select `entity_id` and add the layer. - The only required setting on the following screen is to set `Sorting` to sort on `@timestamp` - Update time scope of data diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.test.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.test.ts index f40854482be73d..5312f5018d933a 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.test.ts +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.test.ts @@ -22,7 +22,7 @@ describe('expression params validation', () => { boundaryGeoField: 'testField', }; expect(validateExpression(initialParams).errors.index.length).toBeGreaterThan(0); - expect(validateExpression(initialParams).errors.index[0]).toBe('Index pattern is required.'); + expect(validateExpression(initialParams).errors.index[0]).toBe('Data view is required.'); }); test('if geoField property is invalid should return proper error message', () => { @@ -105,7 +105,7 @@ describe('expression params validation', () => { }; expect(validateExpression(initialParams).errors.boundaryIndexTitle.length).toBeGreaterThan(0); expect(validateExpression(initialParams).errors.boundaryIndexTitle[0]).toBe( - 'Boundary index pattern title is required.' + 'Boundary data view title is required.' ); }); diff --git a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts index efd3be858c1891..0465ffefbdebfb 100644 --- a/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts +++ b/x-pack/plugins/stack_alerts/public/alert_types/geo_containment/validation.ts @@ -36,7 +36,7 @@ export const validateExpression = (alertParams: GeoContainmentAlertParams): Vali if (!index) { errors.index.push( i18n.translate('xpack.stackAlerts.geoContainment.error.requiredIndexTitleText', { - defaultMessage: 'Index pattern is required.', + defaultMessage: 'Data view is required.', }) ); } @@ -76,7 +76,7 @@ export const validateExpression = (alertParams: GeoContainmentAlertParams): Vali if (!boundaryIndexTitle) { errors.boundaryIndexTitle.push( i18n.translate('xpack.stackAlerts.geoContainment.error.requiredBoundaryIndexTitleText', { - defaultMessage: 'Boundary index pattern title is required.', + defaultMessage: 'Boundary data view title is required.', }) ); } diff --git a/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts index 78777cff48202a..e9f6a2a38b5136 100644 --- a/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts +++ b/x-pack/plugins/triggers_actions_ui/public/common/index_controls/index.ts @@ -55,7 +55,7 @@ export const getIndexOptions = async ( label: i18n.translate( 'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.indicesAndIndexPatternsLabel', { - defaultMessage: 'Based on your index patterns', + defaultMessage: 'Based on your data views', } ), options: matchingOptions.map((match) => { diff --git a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts index 5424d7068529ef..978123860499c8 100644 --- a/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts +++ b/x-pack/test/plugin_api_integration/test_suites/event_log/public_api_integration.ts @@ -160,7 +160,7 @@ export default function ({ getService }: FtrProviderContext) { } describe(`Index Lifecycle`, () => { - it('should query across indicies matching the Event Log index pattern', async () => { + it('should query across indices matching the Event Log data view', async () => { await esArchiver.load('x-pack/test/functional/es_archives/event_log_multiple_indicies'); const id = `421f2511-5cd1-44fd-95df-e0df83e354d5`; From ec0172941e2cb2939ebce4b1b3929bf991acb334 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Sun, 12 Sep 2021 22:54:09 -0500 Subject: [PATCH 07/25] fix i18n --- .../translations/translations/ja-JP.json | 34 ------------------- .../translations/translations/zh-CN.json | 34 ------------------- 2 files changed, 68 deletions(-) diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 8ae41705e077c6..98293fc2048487 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -1669,12 +1669,8 @@ "data.functions.esaggs.help": "AggConfig 集約を実行します", "data.functions.esaggs.inspector.dataRequest.description": "このリクエストはElasticsearchにクエリし、ビジュアライゼーション用のデータを取得します。", "data.functions.esaggs.inspector.dataRequest.title": "データ", - "data.functions.indexPatternLoad.help": "インデックスパターンを読み込みます", - "data.functions.indexPatternLoad.id.help": "読み込むインデックスパターンID", "data.indexPatterns.ensureDefaultIndexPattern.bannerLabel": "Kibanaでデータの可視化と閲覧を行うには、Elasticsearchからデータを取得するためのインデックスパターンの作成が必要です。", - "data.indexPatterns.fetchFieldErrorTitle": "インデックスパターンのフィールド取得中にエラーが発生 {title}（ID：{id}）", "data.indexPatterns.indexPatternLoad.error.kibanaRequest": "サーバーでこの検索を実行するには、KibanaRequest が必要です。式実行パラメーターに要求オブジェクトを渡してください。", - "data.indexPatterns.unableWriteLabel": "インデックスパターンを書き込めません。このインデックスパターンへの最新の変更を取得するには、ページを更新してください。", "data.inspector.table..dataDescriptionTooltip": "ビジュアライゼーションの元のデータを表示", "data.inspector.table.dataTitle": "データ", "data.inspector.table.downloadCSVToggleButtonLabel": "CSV をダウンロード", @@ -2153,7 +2149,6 @@ "data.search.es_search.hitsTotalDescription": "クエリに一致するドキュメントの数です。", "data.search.es_search.hitsTotalLabel": "ヒット数（合計）", "data.search.es_search.indexPatternDescription": "Elasticsearchインデックスに接続したインデックスパターンです。", - "data.search.es_search.indexPatternLabel": "インデックスパターン", "data.search.es_search.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザーでのパースの時間は含まれません。", "data.search.es_search.queryTimeLabel": "クエリ時間", "data.search.es_search.queryTimeValue": "{queryTime}ms", @@ -2290,10 +2285,7 @@ "data.search.searchSource.hitsLabel": "ヒット数", "data.search.searchSource.hitsTotalDescription": "クエリに一致するドキュメントの数です。", "data.search.searchSource.hitsTotalLabel": "ヒット数（合計）", - "data.search.searchSource.indexPatternDescription": "Elasticsearchインデックスに接続したインデックスパターンです。", "data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} インデックス内の ID です。", - "data.search.searchSource.indexPatternIdLabel": "インデックスパターン ID", - "data.search.searchSource.indexPatternLabel": "インデックスパターン", "data.search.searchSource.queryTimeDescription": "クエリの処理の所要時間です。リクエストの送信やブラウザーでのパースの時間は含まれません。", "data.search.searchSource.queryTimeLabel": "クエリ時間", "data.search.searchSource.queryTimeValue": "{queryTime}ms", @@ -3739,7 +3731,6 @@ "indexPatternEditor.createIndex.noMatch": "名前は1つ以上のデータストリーム、インデックス、またはインデックスエイリアスと一致する必要があります。", "indexPatternEditor.createIndexPattern.emptyState.checkDataButton": "新規データを確認", "indexPatternEditor.createIndexPattern.emptyState.createAnyway": "一部のインデックスは表示されない場合があります。{link}してください。", - "indexPatternEditor.createIndexPattern.emptyState.createAnywayLink": "インデックスパターンを作成します", "indexPatternEditor.createIndexPattern.emptyState.haveData": "すでにデータがある場合", "indexPatternEditor.createIndexPattern.emptyState.integrationCardDescription": "さまざまなソースからデータを追加します。", "indexPatternEditor.createIndexPattern.emptyState.integrationCardTitle": "統合の追加", @@ -3770,26 +3761,17 @@ "indexPatternEditor.editor.form.TypeLabel": "インデックスパターンタイプ", "indexPatternEditor.editor.form.typeSelectAriaLabel": "タイプフィールド", "indexPatternEditor.emptyIndexPatternPrompt.documentation": "ドキュメンテーションを表示", - "indexPatternEditor.emptyIndexPatternPrompt.indexPatternExplanation": "Kibanaでは、探索するデータストリーム、インデックス、インデックスエイリアスを特定するためにインデックスパターンが必要です。インデックスパターンは、昨日のログデータなど特定のインデックス、またはログデータを含むすべてのインデックスを参照できます。", "indexPatternEditor.emptyIndexPatternPrompt.learnMore": "詳細について", - "indexPatternEditor.emptyIndexPatternPrompt.nowCreate": "インデックスパターンを作成します。", "indexPatternEditor.emptyIndexPatternPrompt.youHaveData": "Elasticsearchにデータがあります。", "indexPatternEditor.form.allowHiddenAriaLabel": "非表示のインデックスとシステムインデックスを許可", "indexPatternEditor.form.customIndexPatternIdLabel": "カスタムインデックスパターンID", "indexPatternEditor.form.titleAriaLabel": "タイトルフィールド", "indexPatternEditor.frozenLabel": "凍結", "indexPatternEditor.indexLabel": "インデックス", - "indexPatternEditor.indexPatternExists.ValidationErrorMessage": "このタイトルのインデックスパターンがすでに存在します。", - "indexPatternEditor.indexPatterns.unableSaveLabel": "インデックスパターンを保存できませんでした。", - "indexPatternEditor.indexPatternTable.createBtn": "インデックスパターンを作成", "indexPatternEditor.loadingHeader": "一致するインデックスを検索中…", "indexPatternEditor.pagingLabel": "ページごとの行数：{perPage}", "indexPatternEditor.requireTimestampOption.ValidationErrorMessage": "タイムスタンプフィールドを選択します。", "indexPatternEditor.rollup.uncaughtError": "ロールアップインデックスパターンエラー：{error}", - "indexPatternEditor.rollupIndexPattern.createIndex.noMatchError": "ロールアップインデックスパターンエラー：ロールアップインデックスの 1 つと一致している必要があります", - "indexPatternEditor.rollupIndexPattern.createIndex.tooManyMatchesError": "ロールアップインデックスパターンエラー：一致できるロールアップインデックスは 1 つだけです", - "indexPatternEditor.rollupIndexPattern.warning.textParagraphOne": "ロールアップインデックスパターンのKibanaのサポートはベータ版です。保存された検索、可視化、ダッシュボードでこれらのパターンを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。", - "indexPatternEditor.rollupIndexPattern.warning.textParagraphTwo": "ロールアップインデックスパターンは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップインデックスパターンでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。", "indexPatternEditor.rollupIndexPattern.warning.title": "ベータ機能", "indexPatternEditor.rollupLabel": "ロールアップ", "indexPatternEditor.saved": "Saved '{indexPatternTitle}'", @@ -3960,9 +3942,7 @@ "indexPatternManagement.disabledCallOutLabel": "Elasticsearchでのすべてのインラインスクリプティングが無効になっています。Kibanaでスクリプトフィールドを使用するには、インラインスクリプティングを有効にする必要があります。", "indexPatternManagement.editHeader": "{fieldName}を編集", "indexPatternManagement.editIndexPattern.deleteButton": "削除", - "indexPatternManagement.editIndexPattern.deleteHeader": "インデックスパターンを削除しますか？", "indexPatternManagement.editIndexPattern.deprecation": "スクリプトフィールドは廃止予定です。代わりに{runtimeDocs}を使用してください。", - "indexPatternManagement.editIndexPattern.detailsAria": "インデックスパターンの詳細", "indexPatternManagement.editIndexPattern.fields.addFieldButtonLabel": "フィールドの追加", "indexPatternManagement.editIndexPattern.fields.allLangsDropDown": "すべての言語", "indexPatternManagement.editIndexPattern.fields.allTypesDropDown": "すべてのフィールドタイプ", @@ -3988,7 +3968,6 @@ "indexPatternManagement.editIndexPattern.fields.table.nameHeader": "名前", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeAriaLabel": "プライマリ時間フィールド", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeTooltip": "このフィールドはイベントの発生時刻を表します。", - "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipText": "このフィールドはインデックスパターンにのみ存在します。", "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipTitle": "ランタイムフィールド", "indexPatternManagement.editIndexPattern.fields.table.searchableDescription": "これらのフィールドはフィルターバーで使用できます", "indexPatternManagement.editIndexPattern.fields.table.searchableHeader": "検索可能", @@ -3999,8 +3978,6 @@ "indexPatternManagement.editIndexPattern.list.histogramSummary": "{aggName} (間隔：{interval})", "indexPatternManagement.editIndexPattern.list.rollupIndexPatternListName": "ロールアップ", "indexPatternManagement.editIndexPattern.mappingConflictHeader": "マッピングの矛盾", - "indexPatternManagement.editIndexPattern.removeAria": "インデックスパターンを削除します。", - "indexPatternManagement.editIndexPattern.removeTooltip": "インデックスパターンを削除します。", "indexPatternManagement.editIndexPattern.scripted.addFieldButton": "スクリプトフィールドを追加", "indexPatternManagement.editIndexPattern.scripted.deleteField.cancelButton": "キャンセル", "indexPatternManagement.editIndexPattern.scripted.deleteField.deleteButton": "削除", @@ -4009,7 +3986,6 @@ "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "次の廃止された言語が使用されています。{deprecatedLangsInUse}これらの言語は、KibanaとElasticsearchの次のメジャーバージョンでサポートされなくなります。問題を避けるため、スクリプトフィールドを{link}に変換してください。", "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "Painless", "indexPatternManagement.editIndexPattern.scripted.newFieldPlaceholder": "新規スクリプトフィールド", - "indexPatternManagement.editIndexPattern.scripted.noFieldLabel": "「{indexPatternTitle}」インデックスパターンには「{fieldName}」というスクリプトフィールドがありません", "indexPatternManagement.editIndexPattern.scripted.table.deleteDescription": "このフィールドを削除します", "indexPatternManagement.editIndexPattern.scripted.table.deleteHeader": "削除", "indexPatternManagement.editIndexPattern.scripted.table.editDescription": "このフィールドを編集します", @@ -4023,8 +3999,6 @@ "indexPatternManagement.editIndexPattern.scripted.table.scriptDescription": "フィールドのスクリプトです", "indexPatternManagement.editIndexPattern.scripted.table.scriptHeader": "スクリプト", "indexPatternManagement.editIndexPattern.scriptedLabel": "スクリプトフィールドはビジュアライゼーションで使用され、ドキュメントに表示できます。ただし、検索することはできません。", - "indexPatternManagement.editIndexPattern.setDefaultAria": "デフォルトのインデックスに設定します。", - "indexPatternManagement.editIndexPattern.setDefaultTooltip": "デフォルトのインデックスに設定します。", "indexPatternManagement.editIndexPattern.source.addButtonLabel": "追加", "indexPatternManagement.editIndexPattern.source.deleteFilter.cancelButtonLabel": "キャンセル", "indexPatternManagement.editIndexPattern.source.deleteFilter.deleteButtonLabel": "削除", @@ -4052,15 +4026,8 @@ "indexPatternManagement.formatLabel": "フォーマットは、特定の値の表示形式を管理できます。また、値を完全に変更したり、Discover でのハイライト機能を無効にしたりすることも可能です。", "indexPatternManagement.header.runtimeLink": "ランタイムフィールド", "indexPatternManagement.indexNameLabel": "インデックス名", - "indexPatternManagement.indexPattern.sectionsHeader": "インデックスパターン", "indexPatternManagement.indexPatterns.badge.readOnly.text": "読み取り専用", - "indexPatternManagement.indexPatterns.badge.readOnly.tooltip": "インデックスパターンを保存できません", - "indexPatternManagement.indexPatterns.createBreadcrumb": "インデックスパターンを作成", "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "フィールドを作成", - "indexPatternManagement.indexPatterns.listBreadcrumb": "インデックスパターン", - "indexPatternManagement.indexPatternTable.createBtn": "インデックスパターンを作成", - "indexPatternManagement.indexPatternTable.indexPatternExplanation": "Elasticsearchからのデータの取得に役立つインデックスパターンを作成して管理します。", - "indexPatternManagement.indexPatternTable.title": "インデックスパターン", "indexPatternManagement.labelHelpText": "このフィールドが Discover、Maps、Visualize に表示されるときに使用するカスタムラベルを設定します。現在、クエリとフィルターはカスタムラベルをサポートせず、元のフィールド名が使用されます。", "indexPatternManagement.languageLabel": "言語", "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict} {fieldName}というフィールドはすでに存在します。スクリプトフィールドに同じ名前を付けると、同時に両方のフィールドにクエリが実行できなくなります。", @@ -14922,7 +14889,6 @@ "xpack.maps.source.esSearch.joinsDisabledReason": "クラスターでスケーリングするときに、結合はサポートされていません", "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "mvtベクトルタイルでスケーリングするときに、結合はサポートされていません", "xpack.maps.source.esSearch.limitScalingLabel": "結果を{maxResultWindow}に限定", - "xpack.maps.source.esSearch.loadErrorMessage": "インデックスパターン {id} が見つかりません", "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "ドキュメントが見つかりません。_id：{docId}", "xpack.maps.source.esSearch.mvtDescription": "大きいデータセットを高速表示するために、ベクトルタイルを使用します。", "xpack.maps.source.esSearch.selectLabel": "ジオフィールドを選択", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 6b3f4713c6e26d..c2f1ad4d4eb46e 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -1687,12 +1687,8 @@ "data.functions.esaggs.help": "运行 AggConfig 聚合", "data.functions.esaggs.inspector.dataRequest.description": "此请求查询 Elasticsearch，以获取可视化的数据。", "data.functions.esaggs.inspector.dataRequest.title": "数据", - "data.functions.indexPatternLoad.help": "加载索引模式", - "data.functions.indexPatternLoad.id.help": "要加载的索引模式 id", "data.indexPatterns.ensureDefaultIndexPattern.bannerLabel": "要在 Kibana 中可视化和浏览数据，必须创建索引模式，以从 Elasticsearch 中检索数据。", - "data.indexPatterns.fetchFieldErrorTitle": "提取索引模式 {title} (ID: {id}) 的字段时出错", "data.indexPatterns.indexPatternLoad.error.kibanaRequest": "在服务器上执行此搜索时需要 Kibana 请求。请向表达式执行模式参数提供请求对象。", - "data.indexPatterns.unableWriteLabel": "无法写入索引模式！请刷新页面以获取此索引模式的最新更改。", "data.inspector.table..dataDescriptionTooltip": "查看可视化后面的数据", "data.inspector.table.dataTitle": "数据", "data.inspector.table.downloadCSVToggleButtonLabel": "下载 CSV", @@ -2172,7 +2168,6 @@ "data.search.es_search.hitsTotalDescription": "与查询匹配的文档数目。", "data.search.es_search.hitsTotalLabel": "命中数（总数）", "data.search.es_search.indexPatternDescription": "连接到 Elasticsearch 索引的索引模式。", - "data.search.es_search.indexPatternLabel": "索引模式", "data.search.es_search.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。", "data.search.es_search.queryTimeLabel": "查询时间", "data.search.es_search.queryTimeValue": "{queryTime}ms", @@ -2309,10 +2304,7 @@ "data.search.searchSource.hitsLabel": "命中数", "data.search.searchSource.hitsTotalDescription": "与查询匹配的文档数目。", "data.search.searchSource.hitsTotalLabel": "命中数（总数）", - "data.search.searchSource.indexPatternDescription": "连接到 Elasticsearch 索引的索引模式。", "data.search.searchSource.indexPatternIdDescription": "{kibanaIndexPattern} 索引中的 ID。", - "data.search.searchSource.indexPatternIdLabel": "索引模式 ID", - "data.search.searchSource.indexPatternLabel": "索引模式", "data.search.searchSource.queryTimeDescription": "处理查询所花费的时间。不包括发送请求或在浏览器中解析它的时间。", "data.search.searchSource.queryTimeLabel": "查询时间", "data.search.searchSource.queryTimeValue": "{queryTime}ms", @@ -3772,7 +3764,6 @@ "indexPatternEditor.createIndex.noMatch": "名称必须匹配一个或多个数据流、索引或索引别名。", "indexPatternEditor.createIndexPattern.emptyState.checkDataButton": "检查新数据", "indexPatternEditor.createIndexPattern.emptyState.createAnyway": "部分索引可能已隐藏。仍然尝试{link}。", - "indexPatternEditor.createIndexPattern.emptyState.createAnywayLink": "创建索引模式", "indexPatternEditor.createIndexPattern.emptyState.haveData": "假设您已有数据？", "indexPatternEditor.createIndexPattern.emptyState.integrationCardDescription": "从各种源添加数据。", "indexPatternEditor.createIndexPattern.emptyState.integrationCardTitle": "添加集成", @@ -3803,26 +3794,17 @@ "indexPatternEditor.editor.form.TypeLabel": "索引模式类型", "indexPatternEditor.editor.form.typeSelectAriaLabel": "类型字段", "indexPatternEditor.emptyIndexPatternPrompt.documentation": "阅读文档", - "indexPatternEditor.emptyIndexPatternPrompt.indexPatternExplanation": "Kibana 需要索引模式来识别您要浏览的数据链、索引和索引别名。索引模式可以指向特定索引（例如昨天的日志数据），或包含日志数据的所有索引。", "indexPatternEditor.emptyIndexPatternPrompt.learnMore": "希望了解详情？", - "indexPatternEditor.emptyIndexPatternPrompt.nowCreate": "现在，创建索引模式。", "indexPatternEditor.emptyIndexPatternPrompt.youHaveData": "您在 Elasticsearch 中有数据。", "indexPatternEditor.form.allowHiddenAriaLabel": "允许使用隐藏索引和系统索引", "indexPatternEditor.form.customIndexPatternIdLabel": "定制索引模式 ID", "indexPatternEditor.form.titleAriaLabel": "标题字段", "indexPatternEditor.frozenLabel": "已冻结", "indexPatternEditor.indexLabel": "索引", - "indexPatternEditor.indexPatternExists.ValidationErrorMessage": "具有此名称的索引模式已存在。", - "indexPatternEditor.indexPatterns.unableSaveLabel": "无法保存索引模式。", - "indexPatternEditor.indexPatternTable.createBtn": "创建索引模式", "indexPatternEditor.loadingHeader": "正在寻找匹配的索引......", "indexPatternEditor.pagingLabel": "每页行数：{perPage}", "indexPatternEditor.requireTimestampOption.ValidationErrorMessage": "选择时间戳字段。", "indexPatternEditor.rollup.uncaughtError": "汇总索引模式错误：{error}", - "indexPatternEditor.rollupIndexPattern.createIndex.noMatchError": "汇总/打包索引模式错误：必须匹配一个汇总/打包索引", - "indexPatternEditor.rollupIndexPattern.createIndex.tooManyMatchesError": "汇总/打包索引模式错误：只能匹配一个汇总/打包索引", - "indexPatternEditor.rollupIndexPattern.warning.textParagraphOne": "Kibana 对汇总/打包索引模式的支持处于公测版状态。将这些模式用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。", - "indexPatternEditor.rollupIndexPattern.warning.textParagraphTwo": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包索引模式。汇总/打包索引模式的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。", "indexPatternEditor.rollupIndexPattern.warning.title": "公测版功能", "indexPatternEditor.rollupLabel": "汇总/打包", "indexPatternEditor.saved": "已保存“{indexPatternTitle}”", @@ -3998,9 +3980,7 @@ "indexPatternManagement.disabledCallOutLabel": "所有内联脚本在 Elasticsearch 中已禁用。必须至少为一种语言启用内联脚本，才能在 Kibana 中使用脚本字段。", "indexPatternManagement.editHeader": "编辑 {fieldName}", "indexPatternManagement.editIndexPattern.deleteButton": "删除", - "indexPatternManagement.editIndexPattern.deleteHeader": "删除索引模式？", "indexPatternManagement.editIndexPattern.deprecation": "脚本字段已弃用。改用 {runtimeDocs}。", - "indexPatternManagement.editIndexPattern.detailsAria": "索引模式详细信息", "indexPatternManagement.editIndexPattern.fields.addFieldButtonLabel": "添加字段", "indexPatternManagement.editIndexPattern.fields.allLangsDropDown": "所有语言", "indexPatternManagement.editIndexPattern.fields.allTypesDropDown": "所有字段类型", @@ -4026,7 +4006,6 @@ "indexPatternManagement.editIndexPattern.fields.table.nameHeader": "名称", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeAriaLabel": "主要时间字段", "indexPatternManagement.editIndexPattern.fields.table.primaryTimeTooltip": "此字段表示事件发生的时间。", - "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipText": "此字段仅在索引模式上存在。", "indexPatternManagement.editIndexPattern.fields.table.runtimeIconTipTitle": "运行时字段", "indexPatternManagement.editIndexPattern.fields.table.searchableDescription": "这些字段可用于筛选栏", "indexPatternManagement.editIndexPattern.fields.table.searchableHeader": "可搜索", @@ -4038,8 +4017,6 @@ "indexPatternManagement.editIndexPattern.list.rollupIndexPatternListName": "汇总/打包", "indexPatternManagement.editIndexPattern.mappingConflictHeader": "映射冲突", "indexPatternManagement.editIndexPattern.mappingConflictLabel": "{conflictFieldsLength, plural, one {一个字段} other {# 个字段}}已在匹配此模式的各个索引中定义为多个类型（字符串、整数等）。您也许仍能够在 Kibana 的各个部分中使用这些冲突字段，但它们将无法用于需要 Kibana 知道其类型的函数。要解决此问题，需要重新索引您的数据。", - "indexPatternManagement.editIndexPattern.removeAria": "移除索引模式。", - "indexPatternManagement.editIndexPattern.removeTooltip": "移除索引模式。", "indexPatternManagement.editIndexPattern.scripted.addFieldButton": "添加脚本字段", "indexPatternManagement.editIndexPattern.scripted.deleteField.cancelButton": "取消", "indexPatternManagement.editIndexPattern.scripted.deleteField.deleteButton": "删除", @@ -4048,7 +4025,6 @@ "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.deprecationLangDetail": "以下过时的语言仍在使用：{deprecatedLangsInUse}。Kibana 和 Elasticsearch 的下一主要版本将移除对这些语言的支持。将您的脚本字段转换成 {link} 以避免问题。", "indexPatternManagement.editIndexPattern.scripted.deprecationLangLabel.painlessDescription": "Painless", "indexPatternManagement.editIndexPattern.scripted.newFieldPlaceholder": "新建脚本字段", - "indexPatternManagement.editIndexPattern.scripted.noFieldLabel": "“{indexPatternTitle}”索引模式没有称作“{fieldName}”的脚本字段", "indexPatternManagement.editIndexPattern.scripted.table.deleteDescription": "删除此字段", "indexPatternManagement.editIndexPattern.scripted.table.deleteHeader": "删除", "indexPatternManagement.editIndexPattern.scripted.table.editDescription": "编辑此字段", @@ -4062,8 +4038,6 @@ "indexPatternManagement.editIndexPattern.scripted.table.scriptDescription": "字段的脚本", "indexPatternManagement.editIndexPattern.scripted.table.scriptHeader": "脚本", "indexPatternManagement.editIndexPattern.scriptedLabel": "脚本字段可用于可视化中并显示在文档中。不过，它们不可搜索。", - "indexPatternManagement.editIndexPattern.setDefaultAria": "设置为默认索引。", - "indexPatternManagement.editIndexPattern.setDefaultTooltip": "设置为默认索引。", "indexPatternManagement.editIndexPattern.source.addButtonLabel": "添加", "indexPatternManagement.editIndexPattern.source.deleteFilter.cancelButtonLabel": "取消", "indexPatternManagement.editIndexPattern.source.deleteFilter.deleteButtonLabel": "删除", @@ -4091,15 +4065,8 @@ "indexPatternManagement.formatLabel": "设置格式允许您控制特定值的显示方式。其还会导致值完全更改，并阻止 Discover 中的突出显示起作用。", "indexPatternManagement.header.runtimeLink": "运行时字段", "indexPatternManagement.indexNameLabel": "索引名称", - "indexPatternManagement.indexPattern.sectionsHeader": "索引模式", "indexPatternManagement.indexPatterns.badge.readOnly.text": "只读", - "indexPatternManagement.indexPatterns.badge.readOnly.tooltip": "无法保存索引模式", - "indexPatternManagement.indexPatterns.createBreadcrumb": "创建索引模式", "indexPatternManagement.indexPatterns.createFieldBreadcrumb": "创建字段", - "indexPatternManagement.indexPatterns.listBreadcrumb": "索引模式", - "indexPatternManagement.indexPatternTable.createBtn": "创建索引模式", - "indexPatternManagement.indexPatternTable.indexPatternExplanation": "创建和管理帮助您从 Elasticsearch 中检索数据的索引模式。", - "indexPatternManagement.indexPatternTable.title": "索引模式", "indexPatternManagement.labelHelpText": "设置此字段在 Discover、Maps 和 Visualize 中显示时要使用的定制标签。当前查询和筛选不支持定制标签，将使用原始字段名称。", "indexPatternManagement.languageLabel": "语言", "indexPatternManagement.mappingConflictLabel.mappingConflictDetail": "{mappingConflict}您已经有名称为 {fieldName} 的字段。使用相同的名称命名您的脚本字段意味着您将无法同时查找两个字段。", @@ -15120,7 +15087,6 @@ "xpack.maps.source.esSearch.joinsDisabledReason": "按集群缩放时不支持联接", "xpack.maps.source.esSearch.joinsDisabledReasonMvt": "按 mvt 矢量磁贴缩放时不支持联接", "xpack.maps.source.esSearch.limitScalingLabel": "将结果数限制到 {maxResultWindow}", - "xpack.maps.source.esSearch.loadErrorMessage": "找不到索引模式 {id}", "xpack.maps.source.esSearch.loadTooltipPropertiesErrorMsg": "找不到文档，_id：{docId}", "xpack.maps.source.esSearch.mvtDescription": "使用矢量磁贴可更快速地显示大型数据集。", "xpack.maps.source.esSearch.selectLabel": "选择地理字段", From a66ceee52d9150f460497b22a6eade28c292ae00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cau=C3=AA=20Marcondes?= <55978943+cauemarcondes@users.noreply.github.com> Date: Wed, 15 Sep 2021 09:12:47 -0400 Subject: [PATCH 08/25] [APM] Change terminology: "index pattern" becomes "data view" (#112166) * renaming texts to data view * renaming comments and tests * renaming createStaticDataView * renaming create_static_data_view * renaiming getApmDataViewTitle * renaiming getApmDataViewTitle * renaiming getDynamicIndexPattern * renaming index_pattern folder * renaming apis * renaming hook and rest service * renaming hook * renaming * removing prop from test --- x-pack/plugins/apm/common/processor_event.ts | 2 +- x-pack/plugins/apm/e2e/ci/kibana.e2e.yml | 2 +- .../public/application/application.test.tsx | 4 +- .../plugins/apm/public/application/index.tsx | 8 ++-- .../plugins/apm/public/application/uxApp.tsx | 8 ++-- .../app/RumDashboard/LocalUIFilters/index.tsx | 8 ++-- ...{use_index_pattern.ts => use_data_view.ts} | 26 ++++++------ .../app/Settings/ApmIndices/index.tsx | 2 +- .../app/correlations/use_field_names.ts | 31 +++++++------- .../service_inventory.test.tsx | 6 +-- .../service_overview.test.tsx | 6 +-- .../components/shared/kuery_bar/index.tsx | 21 +++++----- ...ex_pattern.ts => use_dynamic_data_view.ts} | 6 +-- .../rest/{index_pattern.ts => data_view.ts} | 4 +- .../plugins/apm/public/utils/testHelpers.tsx | 1 - .../aggregate-latency-metrics/index.ts | 2 +- .../create_anomaly_detection_jobs.ts | 10 ++--- .../create_static_data_view.test.ts} | 32 +++++++-------- .../create_static_data_view.ts} | 40 +++++++++---------- .../get_apm_data_view_title.test.ts} | 10 ++--- .../get_apm_data_view_title.ts} | 2 +- .../get_dynamic_data_view.ts} | 26 ++++++------ .../create_es_client/get_inspect_response.ts | 10 ++--- .../server/lib/helpers/setup_request.test.ts | 4 +- .../lib/transactions/breakdown/index.test.ts | 1 - .../routes/{index_pattern.ts => data_view.ts} | 26 ++++++------ .../get_global_apm_server_route_repository.ts | 4 +- x-pack/plugins/apm/server/tutorial/index.ts | 14 +++---- .../plugins/apm/server/utils/test_helpers.tsx | 1 - 29 files changed, 154 insertions(+), 163 deletions(-) rename x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/{use_index_pattern.ts => use_data_view.ts} (50%) rename x-pack/plugins/apm/public/hooks/{use_dynamic_index_pattern.ts => use_dynamic_data_view.ts} (75%) rename x-pack/plugins/apm/public/services/rest/{index_pattern.ts => data_view.ts} (77%) rename x-pack/plugins/apm/server/lib/{index_pattern/create_static_index_pattern.test.ts => data_view/create_static_data_view.test.ts} (78%) rename x-pack/plugins/apm/server/lib/{index_pattern/create_static_index_pattern.ts => data_view/create_static_data_view.ts} (62%) rename x-pack/plugins/apm/server/lib/{index_pattern/get_apm_index_pattern_title.test.ts => data_view/get_apm_data_view_title.test.ts} (77%) rename x-pack/plugins/apm/server/lib/{index_pattern/get_apm_index_pattern_title.ts => data_view/get_apm_data_view_title.ts} (88%) rename x-pack/plugins/apm/server/lib/{index_pattern/get_dynamic_index_pattern.ts => data_view/get_dynamic_data_view.ts} (65%) rename x-pack/plugins/apm/server/routes/{index_pattern.ts => data_view.ts} (62%) diff --git a/x-pack/plugins/apm/common/processor_event.ts b/x-pack/plugins/apm/common/processor_event.ts index 57705e7ed4ce0a..a7b0a303b55ae7 100644 --- a/x-pack/plugins/apm/common/processor_event.ts +++ b/x-pack/plugins/apm/common/processor_event.ts @@ -16,7 +16,7 @@ export enum ProcessorEvent { * Processor events that are searchable in the UI via the query bar. * * Some client-sideroutes will define 1 or more processor events that - * will be used to fetch the dynamic index pattern for the query bar. + * will be used to fetch the dynamic data view for the query bar. */ export type UIProcessorEvent = diff --git a/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml b/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml index 19f3f7c8978fa7..5b665a4f9c6b11 100644 --- a/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml +++ b/x-pack/plugins/apm/e2e/ci/kibana.e2e.yml @@ -11,7 +11,7 @@ elasticsearch.hosts: http://localhost:9201 elasticsearch.username: 'kibana_system_user' elasticsearch.password: 'changeme' -# APM index pattern +# APM data view apm_oss.indexPattern: apm-* # APM Indices diff --git a/x-pack/plugins/apm/public/application/application.test.tsx b/x-pack/plugins/apm/public/application/application.test.tsx index 144da47828bf76..54d4388ec3833e 100644 --- a/x-pack/plugins/apm/public/application/application.test.tsx +++ b/x-pack/plugins/apm/public/application/application.test.tsx @@ -18,8 +18,8 @@ import { dataPluginMock } from 'src/plugins/data/public/mocks'; import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks'; import { ApmPluginStartDeps } from '../plugin'; -jest.mock('../services/rest/index_pattern', () => ({ - createStaticIndexPattern: () => Promise.resolve(undefined), +jest.mock('../services/rest/data_view', () => ({ + createStaticDataView: () => Promise.resolve(undefined), })); describe('renderApp', () => { diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx index feb1ff372dc96a..d32fb72bbe3087 100644 --- a/x-pack/plugins/apm/public/application/index.tsx +++ b/x-pack/plugins/apm/public/application/index.tsx @@ -17,7 +17,7 @@ import { } from '../../../../../src/core/public'; import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin'; import { createCallApmApi } from '../services/rest/createCallApmApi'; -import { createStaticIndexPattern } from '../services/rest/index_pattern'; +import { createStaticDataView } from '../services/rest/data_view'; import { setHelpExtension } from '../setHelpExtension'; import { setReadonlyBadge } from '../updateBadge'; import { ApmAppRoot } from '../components/routing/app_root'; @@ -58,10 +58,10 @@ export const renderApp = ({ setReadonlyBadge(coreStart); createCallApmApi(coreStart); - // Automatically creates static index pattern and stores as saved object - createStaticIndexPattern().catch((e) => { + // Automatically creates static data view and stores as saved object + createStaticDataView().catch((e) => { // eslint-disable-next-line no-console - console.log('Error creating static index pattern', e); + console.log('Error creating static data view', e); }); // add .kbnAppWrappers class to root element diff --git a/x-pack/plugins/apm/public/application/uxApp.tsx b/x-pack/plugins/apm/public/application/uxApp.tsx index ddcccf45ccab5e..fd9c11b9a1a01b 100644 --- a/x-pack/plugins/apm/public/application/uxApp.tsx +++ b/x-pack/plugins/apm/public/application/uxApp.tsx @@ -28,7 +28,7 @@ import { UrlParamsProvider } from '../context/url_params_context/url_params_cont import { ConfigSchema } from '../index'; import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin'; import { createCallApmApi } from '../services/rest/createCallApmApi'; -import { createStaticIndexPattern } from '../services/rest/index_pattern'; +import { createStaticDataView } from '../services/rest/data_view'; import { UXActionMenu } from '../components/app/RumDashboard/ActionMenu'; import { redirectTo } from '../components/routing/redirect_to'; import { useBreadcrumbs } from '../../../observability/public'; @@ -160,10 +160,10 @@ export const renderApp = ({ createCallApmApi(core); - // Automatically creates static index pattern and stores as saved object - createStaticIndexPattern().catch((e) => { + // Automatically creates static data view and stores as saved object + createStaticDataView().catch((e) => { // eslint-disable-next-line no-console - console.log('Error creating static index pattern', e); + console.log('Error creating static data view', e); }); ReactDOM.render( diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx index d6897599f52881..655bf93e4fb934 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/index.tsx @@ -31,7 +31,7 @@ import { TRANSACTION_TYPE, } from '../../../../../common/elasticsearch_fieldnames'; import { TRANSACTION_PAGE_LOAD } from '../../../../../common/transaction_types'; -import { useIndexPattern } from './use_index_pattern'; +import { useDataView } from './use_data_view'; import { environmentQuery } from './queries'; import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values'; import { useUxUrlParams } from '../../../../context/url_params_context/use_ux_url_params'; @@ -52,7 +52,7 @@ const RUM_DATA_FILTERS = [ ]; function LocalUIFilters() { - const { indexPatternTitle, indexPattern } = useIndexPattern(); + const { dataViewTitle, dataView } = useDataView(); const { filters = [], @@ -108,7 +108,7 @@ function LocalUIFilters() { ); diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/use_index_pattern.ts b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/use_data_view.ts similarity index 50% rename from x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/use_index_pattern.ts rename to x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/use_data_view.ts index 8c421aebd17f17..ba997292933683 100644 --- a/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/use_index_pattern.ts +++ b/x-pack/plugins/apm/public/components/app/RumDashboard/LocalUIFilters/use_data_view.ts @@ -5,31 +5,31 @@ * 2.0. */ -import { useDynamicIndexPatternFetcher } from '../../../../hooks/use_dynamic_index_pattern'; +import { useDynamicDataViewFetcher } from '../../../../hooks/use_dynamic_data_view'; import { - IndexPattern, - IndexPatternSpec, + DataView, + DataViewSpec, } from '../../../../../../../../src/plugins/data/common'; import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public'; import { useFetcher } from '../../../../hooks/use_fetcher'; import { DataPublicPluginStart } from '../../../../../../../../src/plugins/data/public'; -export function useIndexPattern() { - const { indexPattern: indexPatternDynamic } = useDynamicIndexPatternFetcher(); +export function useDataView() { + const { dataView } = useDynamicDataViewFetcher(); const { services: { - data: { indexPatterns }, + data: { dataViews }, }, } = useKibana<{ data: DataPublicPluginStart }>(); - const { data } = useFetcher>(async () => { - if (indexPatternDynamic?.title) { - return indexPatterns.create({ - pattern: indexPatternDynamic?.title, - } as IndexPatternSpec); + const { data } = useFetcher>(async () => { + if (dataView?.title) { + return dataViews.create({ + pattern: dataView?.title, + } as DataViewSpec); } - }, [indexPatternDynamic?.title, indexPatterns]); + }, [dataView?.title, dataViews]); - return { indexPatternTitle: indexPatternDynamic?.title, indexPattern: data }; + return { dataViewTitle: dataView?.title, dataView: data }; } diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx index 2d74187f9d83b9..7780bb9e7fbe82 100644 --- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx +++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx @@ -177,7 +177,7 @@ export function ApmIndices() { <> {i18n.translate('xpack.apm.settings.apmIndices.description', { - defaultMessage: `The APM UI uses index patterns to query your APM indices. If you've customized the index names that APM Server writes events to, you may need to update these patterns for the APM UI to work. Settings here take precedence over those set in kibana.yml.`, + defaultMessage: `The APM UI uses data views to query your APM indices. If you've customized the index names that APM Server writes events to, you may need to update these patterns for the APM UI to work. Settings here take precedence over those set in kibana.yml.`, })} diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_field_names.ts b/x-pack/plugins/apm/public/components/app/correlations/use_field_names.ts index ff88808c51d15a..eb8097fa647474 100644 --- a/x-pack/plugins/apm/public/components/app/correlations/use_field_names.ts +++ b/x-pack/plugins/apm/public/components/app/correlations/use_field_names.ts @@ -9,44 +9,44 @@ import { memoize } from 'lodash'; import { useEffect, useMemo, useState } from 'react'; import { isRumAgentName } from '../../../../common/agent_name'; import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context'; -import { useDynamicIndexPatternFetcher } from '../../../hooks/use_dynamic_index_pattern'; +import { useDynamicDataViewFetcher } from '../../../hooks/use_dynamic_data_view'; -interface IndexPattern { +interface DataView { fields: Array<{ name: string; esTypes: string[] }>; } export function useFieldNames() { const { agentName } = useApmServiceContext(); const isRumAgent = isRumAgentName(agentName); - const { indexPattern } = useDynamicIndexPatternFetcher(); + const { dataView } = useDynamicDataViewFetcher(); const [defaultFieldNames, setDefaultFieldNames] = useState( - getDefaultFieldNames(indexPattern, isRumAgent) + getDefaultFieldNames(dataView, isRumAgent) ); const getSuggestions = useMemo( () => memoize((searchValue: string) => - getMatchingFieldNames(indexPattern, searchValue) + getMatchingFieldNames(dataView, searchValue) ), - [indexPattern] + [dataView] ); useEffect(() => { - setDefaultFieldNames(getDefaultFieldNames(indexPattern, isRumAgent)); - }, [indexPattern, isRumAgent]); + setDefaultFieldNames(getDefaultFieldNames(dataView, isRumAgent)); + }, [dataView, isRumAgent]); return { defaultFieldNames, getSuggestions }; } function getMatchingFieldNames( - indexPattern: IndexPattern | undefined, + dataView: DataView | undefined, inputValue: string ) { - if (!indexPattern) { + if (!dataView) { return []; } - return indexPattern.fields + return dataView.fields .filter( ({ name, esTypes }) => name.startsWith(inputValue) && esTypes[0] === 'keyword' // only show fields of type 'keyword' @@ -55,20 +55,17 @@ function getMatchingFieldNames( } function getDefaultFieldNames( - indexPattern: IndexPattern | undefined, + dataView: DataView | undefined, isRumAgent: boolean ) { - const labelFields = getMatchingFieldNames(indexPattern, 'labels.').slice( - 0, - 6 - ); + const labelFields = getMatchingFieldNames(dataView, 'labels.').slice(0, 6); return isRumAgent ? [ ...labelFields, 'user_agent.name', 'user_agent.os.name', 'url.original', - ...getMatchingFieldNames(indexPattern, 'user.').slice(0, 6), + ...getMatchingFieldNames(dataView, 'user.').slice(0, 6), ] : [...labelFields, 'service.version', 'service.node.name', 'host.ip']; } diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx index 2ff3f2702cb533..cee12fc0028de5 100644 --- a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx +++ b/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.test.tsx @@ -21,7 +21,7 @@ import { } from '../../../context/apm_plugin/mock_apm_plugin_context'; import { FETCH_STATUS } from '../../../hooks/use_fetcher'; import { clearCache } from '../../../services/rest/callApi'; -import * as useDynamicIndexPatternHooks from '../../../hooks/use_dynamic_index_pattern'; +import * as useDynamicDataViewHooks from '../../../hooks/use_dynamic_data_view'; import { SessionStorageMock } from '../../../services/__mocks__/SessionStorageMock'; import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider'; import * as hook from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context'; @@ -85,9 +85,9 @@ describe('ServiceInventory', () => { }); jest - .spyOn(useDynamicIndexPatternHooks, 'useDynamicIndexPatternFetcher') + .spyOn(useDynamicDataViewHooks, 'useDynamicDataViewFetcher') .mockReturnValue({ - indexPattern: undefined, + dataView: undefined, status: FETCH_STATUS.SUCCESS, }); }); diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.test.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview.test.tsx index b3c1afb32b0fdd..c26f2296e97415 100644 --- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.test.tsx +++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview.test.tsx @@ -15,7 +15,7 @@ import { mockApmPluginContextValue, MockApmPluginContextWrapper, } from '../../../context/apm_plugin/mock_apm_plugin_context'; -import * as useDynamicIndexPatternHooks from '../../../hooks/use_dynamic_index_pattern'; +import * as useDynamicDataViewHooks from '../../../hooks/use_dynamic_data_view'; import { FETCH_STATUS } from '../../../hooks/use_fetcher'; import * as useAnnotationsHooks from '../../../context/annotations/use_annotations_context'; import * as useTransactionBreakdownHooks from '../../shared/charts/transaction_breakdown_chart/use_transaction_breakdown'; @@ -91,9 +91,9 @@ describe('ServiceOverview', () => { .spyOn(useAnnotationsHooks, 'useAnnotationsContext') .mockReturnValue({ annotations: [] }); jest - .spyOn(useDynamicIndexPatternHooks, 'useDynamicIndexPatternFetcher') + .spyOn(useDynamicDataViewHooks, 'useDynamicDataViewFetcher') .mockReturnValue({ - indexPattern: undefined, + dataView: undefined, status: FETCH_STATUS.SUCCESS, }); diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx b/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx index c0417f4a8bbdab..b3a972bcd59e32 100644 --- a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx +++ b/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx @@ -10,15 +10,15 @@ import { i18n } from '@kbn/i18n'; import { uniqueId } from 'lodash'; import React, { useState } from 'react'; import { useHistory, useLocation } from 'react-router-dom'; +import { DataView } from '../../../../../../../src/plugins/data/common'; import { esKuery, - IndexPattern, QuerySuggestion, } from '../../../../../../../src/plugins/data/public'; import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context'; import { useUrlParams } from '../../../context/url_params_context/use_url_params'; import { useApmParams } from '../../../hooks/use_apm_params'; -import { useDynamicIndexPatternFetcher } from '../../../hooks/use_dynamic_index_pattern'; +import { useDynamicDataViewFetcher } from '../../../hooks/use_dynamic_data_view'; import { fromQuery, toQuery } from '../Links/url_helpers'; import { getBoolFilter } from './get_bool_filter'; // @ts-expect-error @@ -30,9 +30,9 @@ interface State { isLoadingSuggestions: boolean; } -function convertKueryToEsQuery(kuery: string, indexPattern: IndexPattern) { +function convertKueryToEsQuery(kuery: string, dataView: DataView) { const ast = esKuery.fromKueryExpression(kuery); - return esKuery.toElasticsearchQuery(ast, indexPattern); + return esKuery.toElasticsearchQuery(ast, dataView); } export function KueryBar(props: { @@ -70,7 +70,7 @@ export function KueryBar(props: { const example = examples[processorEvent || 'defaults']; - const { indexPattern } = useDynamicIndexPatternFetcher(); + const { dataView } = useDynamicDataViewFetcher(); const placeholder = props.placeholder ?? @@ -88,7 +88,7 @@ export function KueryBar(props: { }); async function onChange(inputValue: string, selectionStart: number) { - if (indexPattern == null) { + if (dataView == null) { return; } @@ -101,7 +101,7 @@ export function KueryBar(props: { const suggestions = ( (await data.autocomplete.getQuerySuggestions({ language: 'kuery', - indexPatterns: [indexPattern], + indexPatterns: [dataView], boolFilter: props.boolFilter ?? getBoolFilter({ @@ -130,15 +130,12 @@ export function KueryBar(props: { } function onSubmit(inputValue: string) { - if (indexPattern == null) { + if (dataView == null) { return; } try { - const res = convertKueryToEsQuery( - inputValue, - indexPattern as IndexPattern - ); + const res = convertKueryToEsQuery(inputValue, dataView as DataView); if (!res) { return; } diff --git a/x-pack/plugins/apm/public/hooks/use_dynamic_index_pattern.ts b/x-pack/plugins/apm/public/hooks/use_dynamic_data_view.ts similarity index 75% rename from x-pack/plugins/apm/public/hooks/use_dynamic_index_pattern.ts rename to x-pack/plugins/apm/public/hooks/use_dynamic_data_view.ts index 9c637dc1336add..f6bea37b4ce9a4 100644 --- a/x-pack/plugins/apm/public/hooks/use_dynamic_index_pattern.ts +++ b/x-pack/plugins/apm/public/hooks/use_dynamic_data_view.ts @@ -7,16 +7,16 @@ import { useFetcher } from './use_fetcher'; -export function useDynamicIndexPatternFetcher() { +export function useDynamicDataViewFetcher() { const { data, status } = useFetcher((callApmApi) => { return callApmApi({ - endpoint: 'GET /api/apm/index_pattern/dynamic', + endpoint: 'GET /api/apm/data_view/dynamic', isCachable: true, }); }, []); return { - indexPattern: data?.dynamicIndexPattern, + dataView: data?.dynamicDataView, status, }; } diff --git a/x-pack/plugins/apm/public/services/rest/index_pattern.ts b/x-pack/plugins/apm/public/services/rest/data_view.ts similarity index 77% rename from x-pack/plugins/apm/public/services/rest/index_pattern.ts rename to x-pack/plugins/apm/public/services/rest/data_view.ts index 0bb5839759f64e..75ef67a32b2b77 100644 --- a/x-pack/plugins/apm/public/services/rest/index_pattern.ts +++ b/x-pack/plugins/apm/public/services/rest/data_view.ts @@ -7,9 +7,9 @@ import { callApmApi } from './createCallApmApi'; -export const createStaticIndexPattern = async () => { +export const createStaticDataView = async () => { return await callApmApi({ - endpoint: 'POST /api/apm/index_pattern/static', + endpoint: 'POST /api/apm/data_view/static', signal: null, }); }; diff --git a/x-pack/plugins/apm/public/utils/testHelpers.tsx b/x-pack/plugins/apm/public/utils/testHelpers.tsx index 465155dbf166bc..080e56be48caf1 100644 --- a/x-pack/plugins/apm/public/utils/testHelpers.tsx +++ b/x-pack/plugins/apm/public/utils/testHelpers.tsx @@ -193,7 +193,6 @@ export async function inspectSearchParams( apmAgentConfigurationIndex: 'myIndex', apmCustomLinkIndex: 'myIndex', }, - dynamicIndexPattern: null as any, }; try { response = await fn(mockSetup); diff --git a/x-pack/plugins/apm/scripts/aggregate-latency-metrics/index.ts b/x-pack/plugins/apm/scripts/aggregate-latency-metrics/index.ts index c2d989c1dbf215..3d0f0bd3c3c724 100644 --- a/x-pack/plugins/apm/scripts/aggregate-latency-metrics/index.ts +++ b/x-pack/plugins/apm/scripts/aggregate-latency-metrics/index.ts @@ -40,7 +40,7 @@ import { ESClient, getEsClient } from '../shared/get_es_client'; // - from: start of the date range that should be processed. Should be a valid ISO timestamp. // - to: end of the date range that should be processed. Should be a valid ISO timestamp. // - source: from which transaction documents should be read. Should be location of ES (basic auth -// is supported) plus the index name (or an index pattern). Example: +// is supported) plus the index name (or an data view). Example: // https://foo:bar@apm.elstc.co:9999/apm-8.0.0-transaction // - dest: to which metric documents should be written. If this is not set, no metric documents // will be created.Should be location of ES (basic auth is supported) plus the index name. diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts index 1ea9ae6b65ac53..c8a637b3cb5021 100644 --- a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts +++ b/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts @@ -50,10 +50,10 @@ export async function createAnomalyDetectionJobs( `Creating ML anomaly detection jobs for environments: [${uniqueMlJobEnvs}].` ); - const indexPatternName = indices['apm_oss.transactionIndices']; + const dataViewName = indices['apm_oss.transactionIndices']; const responses = await Promise.all( uniqueMlJobEnvs.map((environment) => - createAnomalyDetectionJob({ ml, environment, indexPatternName }) + createAnomalyDetectionJob({ ml, environment, dataViewName }) ) ); const jobResponses = responses.flatMap((response) => response.jobs); @@ -73,11 +73,11 @@ export async function createAnomalyDetectionJobs( async function createAnomalyDetectionJob({ ml, environment, - indexPatternName, + dataViewName, }: { ml: Required['ml']; environment: string; - indexPatternName: string; + dataViewName: string; }) { return withApmSpan('create_anomaly_detection_job', async () => { const randomToken = uuid().substr(-4); @@ -86,7 +86,7 @@ async function createAnomalyDetectionJob({ moduleId: ML_MODULE_ID_APM_TRANSACTION, prefix: `${APM_ML_JOB_GROUP}-${snakeCase(environment)}-${randomToken}-`, groups: [APM_ML_JOB_GROUP], - indexPatternName, + indexPatternName: dataViewName, applyToAllSpaces: true, start: moment().subtract(4, 'weeks').valueOf(), query: { diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts b/x-pack/plugins/apm/server/lib/data_view/create_static_data_view.test.ts similarity index 78% rename from x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts rename to x-pack/plugins/apm/server/lib/data_view/create_static_data_view.test.ts index 46596d8ac864ac..93cb45db2db959 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.test.ts +++ b/x-pack/plugins/apm/server/lib/data_view/create_static_data_view.test.ts @@ -6,17 +6,17 @@ */ /* eslint-disable @typescript-eslint/naming-convention */ -import { createStaticIndexPattern } from './create_static_index_pattern'; +import { createStaticDataView } from './create_static_data_view'; import { Setup } from '../helpers/setup_request'; import * as HistoricalAgentData from '../../routes/historical_data/has_historical_agent_data'; import { InternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client'; import { APMConfig } from '../..'; -function getMockSavedObjectsClient(existingIndexPatternTitle: string) { +function getMockSavedObjectsClient(existingDataViewTitle: string) { return ({ get: jest.fn(() => ({ attributes: { - title: existingIndexPatternTitle, + title: existingDataViewTitle, }, })), create: jest.fn(), @@ -32,10 +32,10 @@ const setup = ({ }, } as unknown) as Setup; -describe('createStaticIndexPattern', () => { - it(`should not create index pattern if 'xpack.apm.autocreateApmIndexPattern=false'`, async () => { +describe('createStaticDataView', () => { + it(`should not create data view if 'xpack.apm.autocreateApmIndexPattern=false'`, async () => { const savedObjectsClient = getMockSavedObjectsClient('apm-*'); - await createStaticIndexPattern({ + await createStaticDataView({ setup, config: { 'xpack.apm.autocreateApmIndexPattern': false } as APMConfig, savedObjectsClient, @@ -44,7 +44,7 @@ describe('createStaticIndexPattern', () => { expect(savedObjectsClient.create).not.toHaveBeenCalled(); }); - it(`should not create index pattern if no APM data is found`, async () => { + it(`should not create data view if no APM data is found`, async () => { // does not have APM data jest .spyOn(HistoricalAgentData, 'hasHistoricalAgentData') @@ -52,7 +52,7 @@ describe('createStaticIndexPattern', () => { const savedObjectsClient = getMockSavedObjectsClient('apm-*'); - await createStaticIndexPattern({ + await createStaticDataView({ setup, config: { 'xpack.apm.autocreateApmIndexPattern': true } as APMConfig, savedObjectsClient, @@ -61,7 +61,7 @@ describe('createStaticIndexPattern', () => { expect(savedObjectsClient.create).not.toHaveBeenCalled(); }); - it(`should create index pattern`, async () => { + it(`should create data view`, async () => { // does have APM data jest .spyOn(HistoricalAgentData, 'hasHistoricalAgentData') @@ -69,7 +69,7 @@ describe('createStaticIndexPattern', () => { const savedObjectsClient = getMockSavedObjectsClient('apm-*'); - await createStaticIndexPattern({ + await createStaticDataView({ setup, config: { 'xpack.apm.autocreateApmIndexPattern': true } as APMConfig, savedObjectsClient, @@ -79,17 +79,17 @@ describe('createStaticIndexPattern', () => { expect(savedObjectsClient.create).toHaveBeenCalled(); }); - it(`should overwrite the index pattern if the new index pattern title does not match the old index pattern title`, async () => { + it(`should overwrite the data view if the new data view title does not match the old data view title`, async () => { // does have APM data jest .spyOn(HistoricalAgentData, 'hasHistoricalAgentData') .mockResolvedValue(true); const savedObjectsClient = getMockSavedObjectsClient('apm-*'); - const expectedIndexPatternTitle = + const expectedDataViewTitle = 'apm-*-transaction-*,apm-*-span-*,apm-*-error-*,apm-*-metrics-*'; - await createStaticIndexPattern({ + await createStaticDataView({ setup, config: { 'xpack.apm.autocreateApmIndexPattern': true, @@ -102,13 +102,13 @@ describe('createStaticIndexPattern', () => { expect(savedObjectsClient.create).toHaveBeenCalled(); // @ts-ignore expect(savedObjectsClient.create.mock.calls[0][1].title).toBe( - expectedIndexPatternTitle + expectedDataViewTitle ); // @ts-ignore expect(savedObjectsClient.create.mock.calls[0][2].overwrite).toBe(true); }); - it(`should not overwrite an index pattern if the new index pattern title matches the old index pattern title`, async () => { + it(`should not overwrite an data view if the new data view title matches the old data view title`, async () => { // does have APM data jest .spyOn(HistoricalAgentData, 'hasHistoricalAgentData') @@ -118,7 +118,7 @@ describe('createStaticIndexPattern', () => { 'apm-*-transaction-*,apm-*-span-*,apm-*-error-*,apm-*-metrics-*' ); - await createStaticIndexPattern({ + await createStaticDataView({ setup, config: { 'xpack.apm.autocreateApmIndexPattern': true, diff --git a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts b/x-pack/plugins/apm/server/lib/data_view/create_static_data_view.ts similarity index 62% rename from x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts rename to x-pack/plugins/apm/server/lib/data_view/create_static_data_view.ts index 6fa96de0b9413f..a953bc19b80c8e 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/create_static_index_pattern.ts +++ b/x-pack/plugins/apm/server/lib/data_view/create_static_data_view.ts @@ -7,19 +7,19 @@ import { SavedObjectsErrorHelpers } from '../../../../../../src/core/server'; import { APM_STATIC_INDEX_PATTERN_ID } from '../../../common/index_pattern_constants'; -import apmIndexPattern from '../../tutorial/index_pattern.json'; +import apmDataView from '../../tutorial/index_pattern.json'; import { hasHistoricalAgentData } from '../../routes/historical_data/has_historical_agent_data'; import { Setup } from '../helpers/setup_request'; import { APMRouteHandlerResources } from '../../routes/typings'; import { InternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client.js'; import { withApmSpan } from '../../utils/with_apm_span'; -import { getApmIndexPatternTitle } from './get_apm_index_pattern_title'; +import { getApmDataViewTitle } from './get_apm_data_view_title'; -type ApmIndexPatternAttributes = typeof apmIndexPattern.attributes & { +type ApmDataViewAttributes = typeof apmDataView.attributes & { title: string; }; -export async function createStaticIndexPattern({ +export async function createStaticDataView({ setup, config, savedObjectsClient, @@ -32,22 +32,22 @@ export async function createStaticIndexPattern({ spaceId?: string; overwrite?: boolean; }): Promise { - return withApmSpan('create_static_index_pattern', async () => { - // don't autocreate APM index pattern if it's been disabled via the config + return withApmSpan('create_static_data_view', async () => { + // don't autocreate APM data view if it's been disabled via the config if (!config['xpack.apm.autocreateApmIndexPattern']) { return false; } - // Discover and other apps will throw errors if an index pattern exists without having matching indices. - // The following ensures the index pattern is only created if APM data is found + // Discover and other apps will throw errors if an data view exists without having matching indices. + // The following ensures the data view is only created if APM data is found const hasData = await hasHistoricalAgentData(setup); if (!hasData) { return false; } - const apmIndexPatternTitle = getApmIndexPatternTitle(setup.indices); + const apmDataViewTitle = getApmDataViewTitle(setup.indices); const forceOverwrite = await getForceOverwrite({ - apmIndexPatternTitle, + apmDataViewTitle, overwrite, savedObjectsClient, }); @@ -57,8 +57,8 @@ export async function createStaticIndexPattern({ savedObjectsClient.create( 'index-pattern', { - ...apmIndexPattern.attributes, - title: apmIndexPatternTitle, + ...apmDataView.attributes, + title: apmDataViewTitle, }, { id: APM_STATIC_INDEX_PATTERN_ID, @@ -69,7 +69,7 @@ export async function createStaticIndexPattern({ ); return true; } catch (e) { - // if the index pattern (saved object) already exists a conflict error (code: 409) will be thrown + // if the data view (saved object) already exists a conflict error (code: 409) will be thrown // that error should be silenced if (SavedObjectsErrorHelpers.isConflictError(e)) { return false; @@ -79,27 +79,27 @@ export async function createStaticIndexPattern({ }); } -// force an overwrite of the index pattern if the index pattern has been changed +// force an overwrite of the data view if the data view has been changed async function getForceOverwrite({ savedObjectsClient, overwrite, - apmIndexPatternTitle, + apmDataViewTitle, }: { savedObjectsClient: InternalSavedObjectsClient; overwrite: boolean; - apmIndexPatternTitle: string; + apmDataViewTitle: string; }) { if (!overwrite) { try { - const existingIndexPattern = await savedObjectsClient.get( + const existingDataView = await savedObjectsClient.get( 'index-pattern', APM_STATIC_INDEX_PATTERN_ID ); - // if the existing index pattern does not matches the new one, force an update - return existingIndexPattern.attributes.title !== apmIndexPatternTitle; + // if the existing data view does not matches the new one, force an update + return existingDataView.attributes.title !== apmDataViewTitle; } catch (e) { - // ignore exception if the index pattern (saved object) is not found + // ignore exception if the data view (saved object) is not found if (SavedObjectsErrorHelpers.isNotFoundError(e)) { return false; } diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts b/x-pack/plugins/apm/server/lib/data_view/get_apm_data_view_title.test.ts similarity index 77% rename from x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts rename to x-pack/plugins/apm/server/lib/data_view/get_apm_data_view_title.test.ts index 81036301575847..19bdaca08d89c0 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.test.ts +++ b/x-pack/plugins/apm/server/lib/data_view/get_apm_data_view_title.test.ts @@ -8,11 +8,11 @@ /* eslint-disable @typescript-eslint/naming-convention */ import { ApmIndicesConfig } from '../settings/apm_indices/get_apm_indices'; -import { getApmIndexPatternTitle } from './get_apm_index_pattern_title'; +import { getApmDataViewTitle } from './get_apm_data_view_title'; -describe('getApmIndexPatternTitle', () => { - it('returns an index pattern title by combining existing indicies', () => { - const title = getApmIndexPatternTitle({ +describe('getApmDataViewTitle', () => { + it('returns an data view title by combining existing indicies', () => { + const title = getApmDataViewTitle({ 'apm_oss.transactionIndices': 'apm-*-transaction-*', 'apm_oss.spanIndices': 'apm-*-span-*', 'apm_oss.errorIndices': 'apm-*-error-*', @@ -24,7 +24,7 @@ describe('getApmIndexPatternTitle', () => { }); it('removes duplicates', () => { - const title = getApmIndexPatternTitle({ + const title = getApmDataViewTitle({ 'apm_oss.transactionIndices': 'apm-*', 'apm_oss.spanIndices': 'apm-*', 'apm_oss.errorIndices': 'apm-*', diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts b/x-pack/plugins/apm/server/lib/data_view/get_apm_data_view_title.ts similarity index 88% rename from x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts rename to x-pack/plugins/apm/server/lib/data_view/get_apm_data_view_title.ts index e65f200130e9a4..83fea80efae1f9 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/get_apm_index_pattern_title.ts +++ b/x-pack/plugins/apm/server/lib/data_view/get_apm_data_view_title.ts @@ -8,7 +8,7 @@ import { uniq } from 'lodash'; import { ApmIndicesConfig } from '../settings/apm_indices/get_apm_indices'; -export function getApmIndexPatternTitle(apmIndicesConfig: ApmIndicesConfig) { +export function getApmDataViewTitle(apmIndicesConfig: ApmIndicesConfig) { return uniq([ apmIndicesConfig['apm_oss.transactionIndices'], apmIndicesConfig['apm_oss.spanIndices'], diff --git a/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts b/x-pack/plugins/apm/server/lib/data_view/get_dynamic_data_view.ts similarity index 65% rename from x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts rename to x-pack/plugins/apm/server/lib/data_view/get_dynamic_data_view.ts index 19bd801a1f0e1a..24e846cf73ee41 100644 --- a/x-pack/plugins/apm/server/lib/index_pattern/get_dynamic_index_pattern.ts +++ b/x-pack/plugins/apm/server/lib/data_view/get_dynamic_data_view.ts @@ -12,51 +12,51 @@ import { import { APMRouteHandlerResources } from '../../routes/typings'; import { withApmSpan } from '../../utils/with_apm_span'; import { getApmIndices } from '../settings/apm_indices/get_apm_indices'; -import { getApmIndexPatternTitle } from './get_apm_index_pattern_title'; +import { getApmDataViewTitle } from './get_apm_data_view_title'; -export interface IndexPatternTitleAndFields { +export interface DataViewTitleAndFields { title: string; timeFieldName: string; fields: FieldDescriptor[]; } -export const getDynamicIndexPattern = ({ +export const getDynamicDataView = ({ config, context, logger, }: Pick) => { - return withApmSpan('get_dynamic_index_pattern', async () => { + return withApmSpan('get_dynamic_data_view', async () => { const apmIndicies = await getApmIndices({ savedObjectsClient: context.core.savedObjects.client, config, }); - const indexPatternTitle = getApmIndexPatternTitle(apmIndicies); + const dataViewTitle = getApmDataViewTitle(apmIndicies); - const indexPatternsFetcher = new IndexPatternsFetcher( + const DataViewsFetcher = new IndexPatternsFetcher( context.core.elasticsearch.client.asCurrentUser ); - // Since `getDynamicIndexPattern` is called in setup_request (and thus by every endpoint) + // Since `getDynamicDataView` is called in setup_request (and thus by every endpoint) // and since `getFieldsForWildcard` will throw if the specified indices don't exist, // we have to catch errors here to avoid all endpoints returning 500 for users without APM data // (would be a bad first time experience) try { - const fields = await indexPatternsFetcher.getFieldsForWildcard({ - pattern: indexPatternTitle, + const fields = await DataViewsFetcher.getFieldsForWildcard({ + pattern: dataViewTitle, }); - const indexPattern: IndexPatternTitleAndFields = { + const dataView: DataViewTitleAndFields = { fields, timeFieldName: '@timestamp', - title: indexPatternTitle, + title: dataViewTitle, }; - return indexPattern; + return dataView; } catch (e) { const notExists = e.output?.statusCode === 404; if (notExists) { logger.error( - `Could not get dynamic index pattern because indices "${indexPatternTitle}" don't exist` + `Could not get dynamic data view because indices "${dataViewTitle}" don't exist` ); return; } diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/get_inspect_response.ts b/x-pack/plugins/apm/server/lib/helpers/create_es_client/get_inspect_response.ts index ae91daf9d2e0dd..dc8d01f5637946 100644 --- a/x-pack/plugins/apm/server/lib/helpers/create_es_client/get_inspect_response.ts +++ b/x-pack/plugins/apm/server/lib/helpers/create_es_client/get_inspect_response.ts @@ -63,16 +63,16 @@ function getStats({ kibanaRequest.route.path }`, }, - indexPattern: { - label: i18n.translate('xpack.apm.inspector.stats.indexPatternLabel', { - defaultMessage: 'Index pattern', + dataView: { + label: i18n.translate('xpack.apm.inspector.stats.dataViewLabel', { + defaultMessage: 'Data view', }), value: esRequestParams.index, description: i18n.translate( - 'xpack.apm.inspector.stats.indexPatternDescription', + 'xpack.apm.inspector.stats.dataViewDescription', { defaultMessage: - 'The index pattern that connected to the Elasticsearch indices.', + 'The data view that connected to the Elasticsearch indices.', } ), }, diff --git a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts index 00f3f15786ad61..ef8668d3bc418a 100644 --- a/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts +++ b/x-pack/plugins/apm/server/lib/helpers/setup_request.test.ts @@ -25,8 +25,8 @@ jest.mock('../settings/apm_indices/get_apm_indices', () => ({ }), })); -jest.mock('../index_pattern/get_dynamic_index_pattern', () => ({ - getDynamicIndexPattern: async () => { +jest.mock('../data_view/get_dynamic_data_view', () => ({ + getDynamicDataView: async () => { return; }, })); diff --git a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts index 6c021fcada480a..fc88dd86e29793 100644 --- a/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts +++ b/x-pack/plugins/apm/server/lib/transactions/breakdown/index.test.ts @@ -40,7 +40,6 @@ function getMockSetup(esResponse: any) { ) as APMConfig, uiFilters: {}, indices: mockIndices, - dynamicIndexPattern: null as any, }; } diff --git a/x-pack/plugins/apm/server/routes/index_pattern.ts b/x-pack/plugins/apm/server/routes/data_view.ts similarity index 62% rename from x-pack/plugins/apm/server/routes/index_pattern.ts rename to x-pack/plugins/apm/server/routes/data_view.ts index c957e828bf12a3..dbdd45d11706ff 100644 --- a/x-pack/plugins/apm/server/routes/index_pattern.ts +++ b/x-pack/plugins/apm/server/routes/data_view.ts @@ -5,14 +5,14 @@ * 2.0. */ -import { createStaticIndexPattern } from '../lib/index_pattern/create_static_index_pattern'; +import { createStaticDataView } from '../lib/data_view/create_static_data_view'; import { createApmServerRouteRepository } from './create_apm_server_route_repository'; import { setupRequest } from '../lib/helpers/setup_request'; -import { getDynamicIndexPattern } from '../lib/index_pattern/get_dynamic_index_pattern'; +import { getDynamicDataView } from '../lib/data_view/get_dynamic_data_view'; import { createApmServerRoute } from './create_apm_server_route'; -const staticIndexPatternRoute = createApmServerRoute({ - endpoint: 'POST /api/apm/index_pattern/static', +const staticDataViewRoute = createApmServerRoute({ + endpoint: 'POST /api/apm/data_view/static', options: { tags: ['access:apm'] }, handler: async (resources) => { const { @@ -31,30 +31,30 @@ const staticIndexPatternRoute = createApmServerRoute({ const spaceId = spaces?.setup.spacesService.getSpaceId(request); - const didCreateIndexPattern = await createStaticIndexPattern({ + const didCreateDataView = await createStaticDataView({ setup, config, savedObjectsClient, spaceId, }); - return { created: didCreateIndexPattern }; + return { created: didCreateDataView }; }, }); -const dynamicIndexPatternRoute = createApmServerRoute({ - endpoint: 'GET /api/apm/index_pattern/dynamic', +const dynamicDataViewRoute = createApmServerRoute({ + endpoint: 'GET /api/apm/data_view/dynamic', options: { tags: ['access:apm'] }, handler: async ({ context, config, logger }) => { - const dynamicIndexPattern = await getDynamicIndexPattern({ + const dynamicDataView = await getDynamicDataView({ context, config, logger, }); - return { dynamicIndexPattern }; + return { dynamicDataView }; }, }); -export const indexPatternRouteRepository = createApmServerRouteRepository() - .add(staticIndexPatternRoute) - .add(dynamicIndexPatternRoute); +export const dataViewRouteRepository = createApmServerRouteRepository() + .add(staticDataViewRoute) + .add(dynamicDataViewRoute); diff --git a/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts b/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts index 9bc9108da90559..2b18e680b32787 100644 --- a/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts +++ b/x-pack/plugins/apm/server/routes/get_global_apm_server_route_repository.ts @@ -17,7 +17,7 @@ import { createApmServerRouteRepository } from './create_apm_server_route_reposi import { environmentsRouteRepository } from './environments'; import { errorsRouteRepository } from './errors'; import { apmFleetRouteRepository } from './fleet'; -import { indexPatternRouteRepository } from './index_pattern'; +import { dataViewRouteRepository } from './data_view'; import { metricsRouteRepository } from './metrics'; import { observabilityOverviewRouteRepository } from './observability_overview'; import { rumRouteRepository } from './rum_client'; @@ -37,7 +37,7 @@ import { historicalDataRouteRepository } from './historical_data'; const getTypedGlobalApmServerRouteRepository = () => { const repository = createApmServerRouteRepository() - .merge(indexPatternRouteRepository) + .merge(dataViewRouteRepository) .merge(environmentsRouteRepository) .merge(errorsRouteRepository) .merge(metricsRouteRepository) diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/apm/server/tutorial/index.ts index 78dd1110e7c624..7226ebf30f6d2d 100644 --- a/x-pack/plugins/apm/server/tutorial/index.ts +++ b/x-pack/plugins/apm/server/tutorial/index.ts @@ -14,11 +14,11 @@ import { } from '../../../../../src/plugins/home/server'; import { CloudSetup } from '../../../cloud/server'; import { APM_STATIC_INDEX_PATTERN_ID } from '../../common/index_pattern_constants'; -import { getApmIndexPatternTitle } from '../lib/index_pattern/get_apm_index_pattern_title'; +import { getApmDataViewTitle } from '../lib/data_view/get_apm_data_view_title'; import { ApmIndicesConfig } from '../lib/settings/apm_indices/get_apm_indices'; import { createElasticCloudInstructions } from './envs/elastic_cloud'; import { onPremInstructions } from './envs/on_prem'; -import apmIndexPattern from './index_pattern.json'; +import apmDataView from './index_pattern.json'; const apmIntro = i18n.translate('xpack.apm.tutorial.introduction', { defaultMessage: @@ -37,15 +37,15 @@ export const tutorialProvider = ({ cloud?: CloudSetup; isFleetPluginEnabled: boolean; }) => () => { - const indexPatternTitle = getApmIndexPatternTitle(apmIndices); + const dataViewTitle = getApmDataViewTitle(apmIndices); const savedObjects = [ { - ...apmIndexPattern, + ...apmDataView, id: APM_STATIC_INDEX_PATTERN_ID, attributes: { - ...apmIndexPattern.attributes, - title: indexPatternTitle, + ...apmDataView.attributes, + title: dataViewTitle, }, }, ]; @@ -111,7 +111,7 @@ It allows you to monitor the performance of thousands of applications in real ti 'xpack.apm.tutorial.specProvider.savedObjectsInstallMsg', { defaultMessage: - 'An APM index pattern is required for some features in the APM UI.', + 'An APM data view is required for some features in the APM UI.', } ), } as TutorialSchema; diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/apm/server/utils/test_helpers.tsx index e4fabe815d572e..292d83c2a60c9e 100644 --- a/x-pack/plugins/apm/server/utils/test_helpers.tsx +++ b/x-pack/plugins/apm/server/utils/test_helpers.tsx @@ -106,7 +106,6 @@ export async function inspectSearchParams( apmAgentConfigurationIndex: 'myIndex', apmCustomLinkIndex: 'myIndex', }, - dynamicIndexPattern: null as any, }; try { response = await fn(mockSetup); From add9c02878ce2c7650404df3e0f5d54534187061 Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Thu, 23 Sep 2021 10:02:02 +0100 Subject: [PATCH 09/25] [ML] Transforms: Index pattern to data view in user facing copy (#112824) --- .../transform/common/api_schemas/common.ts | 2 +- x-pack/plugins/transform/common/constants.ts | 2 +- .../common/types/index_pattern.test.ts | 2 +- .../public/app/hooks/use_delete_transform.tsx | 20 +++++++------- .../app/hooks/use_search_items/common.ts | 2 +- .../use_search_items/use_search_items.ts | 2 +- .../clone_transform_section.tsx | 2 +- .../step_create/step_create_form.tsx | 27 +++++++++---------- .../hooks/use_latest_function_config.ts | 2 +- .../step_define/step_define_form.test.tsx | 2 +- .../step_define/step_define_form.tsx | 4 +-- .../step_define/step_define_summary.tsx | 4 +-- .../step_details/step_details_form.tsx | 17 +++++------- .../step_details/step_details_summary.tsx | 8 +++--- .../step_details/step_details_time_field.tsx | 6 ++--- .../action_clone/use_clone_action.tsx | 12 ++++----- .../action_delete/delete_action_modal.tsx | 8 +++--- .../discover_action_name.test.tsx | 8 +++--- .../action_discover/discover_action_name.tsx | 4 +-- .../action_edit/use_edit_action.tsx | 12 ++++----- .../edit_transform_flyout_form.tsx | 2 +- .../search_selection/search_selection.tsx | 4 +-- .../transform/server/routes/api/transforms.ts | 2 +- .../translations/translations/ja-JP.json | 20 -------------- .../translations/translations/zh-CN.json | 21 --------------- .../test/functional/apps/transform/cloning.ts | 4 +-- .../apps/transform/creation_index_pattern.ts | 2 +- .../transform/creation_runtime_mappings.ts | 2 +- .../apps/transform/creation_saved_search.ts | 2 +- .../functional/services/transform/wizard.ts | 2 +- 30 files changed, 79 insertions(+), 128 deletions(-) diff --git a/x-pack/plugins/transform/common/api_schemas/common.ts b/x-pack/plugins/transform/common/api_schemas/common.ts index 5354598dc24754..d29059864a7dd0 100644 --- a/x-pack/plugins/transform/common/api_schemas/common.ts +++ b/x-pack/plugins/transform/common/api_schemas/common.ts @@ -29,7 +29,7 @@ export const transformStateSchema = schema.oneOf([ ]); export const indexPatternTitleSchema = schema.object({ - /** Title of the index pattern for which to return stats. */ + /** Title of the data view for which to return stats. */ indexPatternTitle: schema.string(), }); diff --git a/x-pack/plugins/transform/common/constants.ts b/x-pack/plugins/transform/common/constants.ts index 423b2d001381cf..0abaedbbb7800d 100644 --- a/x-pack/plugins/transform/common/constants.ts +++ b/x-pack/plugins/transform/common/constants.ts @@ -44,7 +44,7 @@ export const API_BASE_PATH = '/api/transform/'; // - dest index: monitor (applied to df-*) // - cluster: monitor // -// Note that users with kibana_admin can see all Kibana index patterns and saved searches +// Note that users with kibana_admin can see all Kibana data views and saved searches // in the source selection modal when creating a transform, but the wizard will trigger // error callouts when there are no sufficient privileges to read the actual source indices. diff --git a/x-pack/plugins/transform/common/types/index_pattern.test.ts b/x-pack/plugins/transform/common/types/index_pattern.test.ts index bb872dcd23136c..57d57473d99de6 100644 --- a/x-pack/plugins/transform/common/types/index_pattern.test.ts +++ b/x-pack/plugins/transform/common/types/index_pattern.test.ts @@ -15,7 +15,7 @@ describe('index_pattern', () => { expect(isIndexPattern({})).toBe(false); expect(isIndexPattern({ attribute: 'value' })).toBe(false); expect( - isIndexPattern({ fields: [], title: 'Index Pattern Title', getComputedFields: () => {} }) + isIndexPattern({ fields: [], title: 'Data View Title', getComputedFields: () => {} }) ).toBe(true); }); }); diff --git a/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx b/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx index f3633e8c5e943c..7b558f6a05d3c1 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx +++ b/x-pack/plugins/transform/public/app/hooks/use_delete_transform.tsx @@ -52,11 +52,10 @@ export const useDeleteIndexAndTargetIndex = (items: TransformListRow[]) => { toastNotifications.addDanger( i18n.translate( - 'xpack.transform.deleteTransform.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage', + 'xpack.transform.deleteTransform.errorWithCheckingIfDataViewExistsNotificationErrorMessage', { - defaultMessage: - 'An error occurred checking if index pattern {indexPattern} exists: {error}', - values: { indexPattern: indexName, error }, + defaultMessage: 'An error occurred checking if data view {dataView} exists: {error}', + values: { dataView: indexName, error }, } ) ); @@ -171,10 +170,9 @@ export const useDeleteTransforms = () => { if (status.destIndexPatternDeleted?.success) { toastNotifications.addSuccess( i18n.translate( - 'xpack.transform.deleteTransform.deleteAnalyticsWithIndexPatternSuccessMessage', + 'xpack.transform.deleteTransform.deleteAnalyticsWithDataViewSuccessMessage', { - defaultMessage: - 'Request to delete index pattern {destinationIndex} acknowledged.', + defaultMessage: 'Request to delete data view {destinationIndex} acknowledged.', values: { destinationIndex }, } ) @@ -220,9 +218,9 @@ export const useDeleteTransforms = () => { const error = status.destIndexPatternDeleted.error.reason; toastNotifications.addDanger({ title: i18n.translate( - 'xpack.transform.deleteTransform.deleteAnalyticsWithIndexPatternErrorMessage', + 'xpack.transform.deleteTransform.deleteAnalyticsWithDataViewErrorMessage', { - defaultMessage: 'An error occurred deleting index pattern {destinationIndex}', + defaultMessage: 'An error occurred deleting data view {destinationIndex}', values: { destinationIndex }, } ), @@ -257,9 +255,9 @@ export const useDeleteTransforms = () => { } if (successCount.destIndexPatternDeleted > 0) { toastNotifications.addSuccess( - i18n.translate('xpack.transform.transformList.bulkDeleteDestIndexPatternSuccessMessage', { + i18n.translate('xpack.transform.transformList.bulkDeleteDestDataViewSuccessMessage', { defaultMessage: - 'Successfully deleted {count} destination index {count, plural, one {pattern} other {patterns}}.', + 'Successfully deleted {count} destination data {count, plural, one {view} other {views}}.', values: { count: successCount.destIndexPatternDeleted }, }) ); diff --git a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts index 3e85f5d4d49a4f..de06f995a1409a 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts +++ b/x-pack/plugins/transform/public/app/hooks/use_search_items/common.ts @@ -123,7 +123,7 @@ export function createSearchItems( } if (!isIndexPattern(indexPattern)) { - throw new Error('Index Pattern is not defined.'); + throw new Error('Data view is not defined.'); } return { diff --git a/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts b/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts index 44e3cc347824d8..7fca28fd73878d 100644 --- a/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts +++ b/x-pack/plugins/transform/public/app/hooks/use_search_items/use_search_items.ts @@ -60,7 +60,7 @@ export const useSearchItems = (defaultSavedObjectId: string | undefined) => { if (!isIndexPattern(fetchedIndexPattern) && fetchedSavedSearch === undefined) { setError( i18n.translate('xpack.transform.searchItems.errorInitializationTitle', { - defaultMessage: `An error occurred initializing the Kibana index pattern or saved search.`, + defaultMessage: `An error occurred initializing the Kibana data view or saved search.`, }) ); return; diff --git a/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx b/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx index 8aecf403186c5c..d9a566c3ebdb82 100644 --- a/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx +++ b/x-pack/plugins/transform/public/app/sections/clone_transform/clone_transform_section.tsx @@ -75,7 +75,7 @@ export const CloneTransformSection: FC = ({ match, location }) => { if (indexPatternId === undefined) { throw new Error( i18n.translate('xpack.transform.clone.fetchErrorPromptText', { - defaultMessage: 'Could not fetch the Kibana index pattern ID.', + defaultMessage: 'Could not fetch the Kibana data view ID.', }) ); } diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx index 7ccf986d5d497d..8ec779e39d035c 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_create/step_create_form.tsx @@ -227,7 +227,7 @@ export const StepCreateForm: FC = React.memo( const createKibanaIndexPattern = async () => { setLoading(true); - const indexPatternName = transformConfig.dest.index; + const dataViewName = transformConfig.dest.index; const runtimeMappings = transformConfig.source.runtime_mappings as Record< string, RuntimeField @@ -236,7 +236,7 @@ export const StepCreateForm: FC = React.memo( try { const newIndexPattern = await indexPatterns.createAndSave( { - title: indexPatternName, + title: dataViewName, timeFieldName, ...(isPopulatedObject(runtimeMappings) && isLatestTransform(transformConfig) ? { runtimeFieldMap: runtimeMappings } @@ -247,9 +247,9 @@ export const StepCreateForm: FC = React.memo( ); toastNotifications.addSuccess( - i18n.translate('xpack.transform.stepCreateForm.createIndexPatternSuccessMessage', { - defaultMessage: 'Kibana index pattern {indexPatternName} created successfully.', - values: { indexPatternName }, + i18n.translate('xpack.transform.stepCreateForm.createDataViewSuccessMessage', { + defaultMessage: 'Kibana data view {dataViewName} created successfully.', + values: { dataViewName }, }) ); @@ -259,18 +259,17 @@ export const StepCreateForm: FC = React.memo( } catch (e) { if (e instanceof DuplicateDataViewError) { toastNotifications.addDanger( - i18n.translate('xpack.transform.stepCreateForm.duplicateIndexPatternErrorMessage', { + i18n.translate('xpack.transform.stepCreateForm.duplicateDataViewErrorMessage', { defaultMessage: - 'An error occurred creating the Kibana index pattern {indexPatternName}: The index pattern already exists.', - values: { indexPatternName }, + 'An error occurred creating the Kibana data view {dataViewName}: The data view already exists.', + values: { dataViewName }, }) ); } else { toastNotifications.addDanger({ - title: i18n.translate('xpack.transform.stepCreateForm.createIndexPatternErrorMessage', { - defaultMessage: - 'An error occurred creating the Kibana index pattern {indexPatternName}:', - values: { indexPatternName }, + title: i18n.translate('xpack.transform.stepCreateForm.createDataViewErrorMessage', { + defaultMessage: 'An error occurred creating the Kibana data view {dataViewName}:', + values: { dataViewName }, }), text: toMountPoint( @@ -503,9 +502,9 @@ export const StepCreateForm: FC = React.memo(

{i18n.translate( - 'xpack.transform.stepCreateForm.creatingIndexPatternMessage', + 'xpack.transform.stepCreateForm.creatingDataViewMessage', { - defaultMessage: 'Creating Kibana index pattern ...', + defaultMessage: 'Creating Kibana data view ...', } )}

diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts index 34b47b50a7c9ed..d6473abb04702c 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/hooks/use_latest_function_config.ts @@ -44,7 +44,7 @@ function getOptions( const filteredIndexPatternFields = param ? (param as unknown as FieldParamType) .getAvailableFields(aggConfig) - // runtimeMappings may already include runtime fields defined by the index pattern + // runtimeMappings may already include runtime fields defined by the data view .filter((ip) => ip.runtimeField === undefined) : []; diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx index 0443a9c8bdf1a2..772168aaa31519 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.test.tsx @@ -83,7 +83,7 @@ describe('Transform: ', () => { // Act // Assert - expect(getByText('Index pattern')).toBeInTheDocument(); + expect(getByText('Data view')).toBeInTheDocument(); expect(getByText(searchItems.indexPattern.title)).toBeInTheDocument(); }); }); diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx index 31367c73bd0dcd..8d023e2ae430d3 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_form.tsx @@ -207,8 +207,8 @@ export const StepDefineForm: FC = React.memo((props) => { {searchItems.savedSearch === undefined && ( {indexPattern.title} diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.tsx index 27e25596c980fa..ebadc97b59fc2a 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/step_define_summary.tsx @@ -88,8 +88,8 @@ export const StepDefineSummary: FC = ({ {searchItems.savedSearch === undefined && ( {searchItems.indexPattern.title} diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx index 0d39ec77d059fb..f37e4045f29fe6 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_form.tsx @@ -180,12 +180,9 @@ export const StepDetailsForm: FC = React.memo( setIndexPatternTitles(await deps.data.indexPatterns.getTitles()); } catch (e) { toastNotifications.addDanger({ - title: i18n.translate( - 'xpack.transform.stepDetailsForm.errorGettingIndexPatternTitles', - { - defaultMessage: 'An error occurred getting the existing index pattern titles:', - } - ), + title: i18n.translate('xpack.transform.stepDetailsForm.errorGettingDataViewTitles', { + defaultMessage: 'An error occurred getting the existing data view titles:', + }), text: toMountPoint( ), @@ -449,16 +446,16 @@ export const StepDetailsForm: FC = React.memo( error={ createIndexPattern && indexPatternTitleExists && [ - i18n.translate('xpack.transform.stepDetailsForm.indexPatternTitleError', { - defaultMessage: 'An index pattern with this title already exists.', + i18n.translate('xpack.transform.stepDetailsForm.dataViewTitleError', { + defaultMessage: 'A data view with this title already exists.', }), ] } > setCreateIndexPattern(!createIndexPattern)} diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_summary.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_summary.tsx index f39132da819859..60423e0eb4eb01 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_summary.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_summary.tsx @@ -35,8 +35,8 @@ export const StepDetailsSummary: FC = React.memo((props } const destinationIndexHelpText = createIndexPattern - ? i18n.translate('xpack.transform.stepDetailsSummary.createIndexPatternMessage', { - defaultMessage: 'A Kibana index pattern will be created for this transform.', + ? i18n.translate('xpack.transform.stepDetailsSummary.createDataViewMessage', { + defaultMessage: 'A Kibana data view will be created for this transform.', }) : ''; @@ -70,8 +70,8 @@ export const StepDetailsSummary: FC = React.memo((props {createIndexPattern && indexPatternTimeField !== undefined && indexPatternTimeField !== '' && ( {indexPatternTimeField} diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_time_field.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_time_field.tsx index 3fbc35f43f488d..1c5d9aadbcd670 100644 --- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_time_field.tsx +++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_details/step_details_time_field.tsx @@ -43,13 +43,13 @@ export const StepDetailsTimeField: FC = ({ } helpText={ } diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx index 55576c3f3ee7dd..cf2ec765dc06b3 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_clone/use_clone_action.tsx @@ -33,17 +33,17 @@ export const useCloneAction = (forceDisable: boolean, transformNodes: number) => async (item: TransformListRow) => { try { await loadIndexPatterns(savedObjectsClient, indexPatterns); - const indexPatternTitle = Array.isArray(item.config.source.index) + const dataViewTitle = Array.isArray(item.config.source.index) ? item.config.source.index.join(',') : item.config.source.index; - const indexPatternId = getIndexPatternIdByTitle(indexPatternTitle); + const indexPatternId = getIndexPatternIdByTitle(dataViewTitle); if (indexPatternId === undefined) { toastNotifications.addDanger( - i18n.translate('xpack.transform.clone.noIndexPatternErrorPromptText', { + i18n.translate('xpack.transform.clone.noDataViewErrorPromptText', { defaultMessage: - 'Unable to clone the transform {transformId}. No index pattern exists for {indexPattern}.', - values: { indexPattern: indexPatternTitle, transformId: item.id }, + 'Unable to clone the transform {transformId}. No data view exists for {dataViewTitle}.', + values: { dataViewTitle, transformId: item.id }, }) ); } else { @@ -54,7 +54,7 @@ export const useCloneAction = (forceDisable: boolean, transformNodes: number) => } catch (e) { toastNotifications.addError(e, { title: i18n.translate('xpack.transform.clone.errorPromptText', { - defaultMessage: 'An error occurred checking if source index pattern exists', + defaultMessage: 'An error occurred checking if source data view exists', }), }); } diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx index fb846d041bd17c..4292f96859aafc 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_delete/delete_action_modal.tsx @@ -67,9 +67,9 @@ export const DeleteActionModal: FC = ({ = ({ { it('should be disabled when forceDisable is true', () => { expect(isDiscoverActionDisabled([item], true, true)).toBe(true); }); - it('should be disabled when the index pattern is not available', () => { + it('should be disabled when the data view is not available', () => { expect(isDiscoverActionDisabled([item], false, false)).toBe(true); }); - it('should be disabled when the transform started but has no index pattern', () => { + it('should be disabled when the transform started but has no data view', () => { const itemCopy = cloneDeep(item); itemCopy.stats.state = 'started'; expect(isDiscoverActionDisabled([itemCopy], false, false)).toBe(true); }); - it('should be enabled when the transform started and has an index pattern', () => { + it('should be enabled when the transform started and has a data view', () => { const itemCopy = cloneDeep(item); itemCopy.stats.state = 'started'; expect(isDiscoverActionDisabled([itemCopy], false, true)).toBe(false); }); - it('should be enabled when the index pattern is available', () => { + it('should be enabled when the data view is available', () => { expect(isDiscoverActionDisabled([item], false, true)).toBe(false); }); }); diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.tsx index 259bf82371dba3..0a5342b3b0c251 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_discover/discover_action_name.tsx @@ -67,9 +67,9 @@ export const DiscoverActionName: FC = ({ indexPatternEx ); } else if (!indexPatternExists) { disabledTransformMessage = i18n.translate( - 'xpack.transform.transformList.discoverTransformNoIndexPatternToolTip', + 'xpack.transform.transformList.discoverTransformNoDataViewToolTip', { - defaultMessage: `A Kibana index pattern is required for the destination index to be viewable in Discover`, + defaultMessage: `A Kibana data view is required for the destination index to be viewable in Discover`, } ); } else if (transformNeverStarted) { diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx index 03e45b82719525..f789327a051e29 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/action_edit/use_edit_action.tsx @@ -34,17 +34,17 @@ export const useEditAction = (forceDisable: boolean, transformNodes: number) => const clickHandler = useCallback( async (item: TransformListRow) => { try { - const indexPatternTitle = Array.isArray(item.config.source.index) + const dataViewTitle = Array.isArray(item.config.source.index) ? item.config.source.index.join(',') : item.config.source.index; - const currentIndexPatternId = getIndexPatternIdByTitle(indexPatternTitle); + const currentIndexPatternId = getIndexPatternIdByTitle(dataViewTitle); if (currentIndexPatternId === undefined) { toastNotifications.addWarning( - i18n.translate('xpack.transform.edit.noIndexPatternErrorPromptText', { + i18n.translate('xpack.transform.edit.noDataViewErrorPromptText', { defaultMessage: - 'Unable to get index pattern the transform {transformId}. No index pattern exists for {indexPattern}.', - values: { indexPattern: indexPatternTitle, transformId: item.id }, + 'Unable to get the data view for the transform {transformId}. No data view exists for {dataViewTitle}.', + values: { dataViewTitle, transformId: item.id }, }) ); } @@ -54,7 +54,7 @@ export const useEditAction = (forceDisable: boolean, transformNodes: number) => } catch (e) { toastNotifications.addError(e, { title: i18n.translate('xpack.transform.edit.errorPromptText', { - defaultMessage: 'An error occurred checking if source index pattern exists', + defaultMessage: 'An error occurred checking if source data view exists', }), }); } diff --git a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx index 40ccd68724400b..3b1c83c3acd4eb 100644 --- a/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx +++ b/x-pack/plugins/transform/public/app/sections/transform_management/components/edit_transform_flyout/edit_transform_flyout_form.tsx @@ -148,7 +148,7 @@ export const EditTransformFlyoutForm: FC = ({ >
{ - // If index pattern or date fields info not available + // If data view or date fields info not available // gracefully defaults to text input indexPatternId ? ( = ({ onSearchSelected }) type: 'index-pattern', getIconForSavedObject: () => 'indexPatternApp', name: i18n.translate( - 'xpack.transform.newTransform.searchSelection.savedObjectType.indexPattern', + 'xpack.transform.newTransform.searchSelection.savedObjectType.dataView', { - defaultMessage: 'Index pattern', + defaultMessage: 'Data view', } ), }, diff --git a/x-pack/plugins/transform/server/routes/api/transforms.ts b/x-pack/plugins/transform/server/routes/api/transforms.ts index 76aac9686c37ef..72e97743a7c98e 100644 --- a/x-pack/plugins/transform/server/routes/api/transforms.ts +++ b/x-pack/plugins/transform/server/routes/api/transforms.ts @@ -485,7 +485,7 @@ async function deleteTransforms( } } - // Delete the index pattern if there's an index pattern that matches the name of dest index + // Delete the data view if there's a data view that matches the name of dest index if (destinationIndex && deleteDestIndexPattern) { try { const indexPatternId = await getIndexPatternId( diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 4fb8da082abc91..a6ae0df6d971e3 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -24585,9 +24585,7 @@ "xpack.timelines.timelineEvents.failSearchDescription": "タイムラインイベントで検索を実行できませんでした", "xpack.timelines.toolbar.bulkActions.clearSelectionTitle": "選択した項目をクリア", "xpack.transform.actionDeleteTransform.bulkDeleteDestinationIndexTitle": "ディスティネーションインデックスの削除", - "xpack.transform.actionDeleteTransform.bulkDeleteDestIndexPatternTitle": "ディスティネーションインデックスパターンの削除", "xpack.transform.actionDeleteTransform.deleteDestinationIndexTitle": "ディスティネーションインデックス{destinationIndex}の削除", - "xpack.transform.actionDeleteTransform.deleteDestIndexPatternTitle": "インデックスパターン{destinationIndex}の削除", "xpack.transform.agg.popoverForm.aggLabel": "アグリゲーション", "xpack.transform.agg.popoverForm.aggNameAlreadyUsedError": "別の集約ですでに同じ名前が使用されています。", "xpack.transform.agg.popoverForm.aggNameInvalidCharError": "無効な名前です。「[」、「]」「>」は使用できず、名前の始めと終わりにはスペースを使用できません。", @@ -24624,10 +24622,7 @@ "xpack.transform.cloneTransform.breadcrumbTitle": "クローン変換", "xpack.transform.createTransform.breadcrumbTitle": "変換の作成", "xpack.transform.deleteTransform.deleteAnalyticsWithIndexErrorMessage": "ディスティネーションインデックス{destinationIndex}の削除中にエラーが発生しました", - "xpack.transform.deleteTransform.deleteAnalyticsWithIndexPatternErrorMessage": "インデックスパターン{destinationIndex}の削除中にエラーが発生しました", - "xpack.transform.deleteTransform.deleteAnalyticsWithIndexPatternSuccessMessage": "インデックスパターン{destinationIndex}を削除する要求が確認されました。", "xpack.transform.deleteTransform.deleteAnalyticsWithIndexSuccessMessage": "ディスティネーションインデックス{destinationIndex}を削除する要求が確認されました。", - "xpack.transform.deleteTransform.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage": "インデックスパターン{indexPattern}が存在するかどうかを確認するときにエラーが発生しました。{error}", "xpack.transform.description": "説明", "xpack.transform.groupby.popoverForm.aggLabel": "アグリゲーション", "xpack.transform.groupBy.popoverForm.aggNameAlreadyUsedError": "別のグループ分けの構成がすでにこの名前を使用しています。", @@ -24659,7 +24654,6 @@ "xpack.transform.newTransform.chooseSourceTitle": "ソースの選択", "xpack.transform.newTransform.newTransformTitle": "新規変換", "xpack.transform.newTransform.searchSelection.notFoundLabel": "一致インデックスまたは保存した検索が見つかりません。", - "xpack.transform.newTransform.searchSelection.savedObjectType.indexPattern": "インデックスパターン", "xpack.transform.newTransform.searchSelection.savedObjectType.search": "保存検索", "xpack.transform.pivotPreview.copyClipboardTooltip": "変換プレビューの開発コンソールステートメントをクリップボードにコピーします。", "xpack.transform.pivotPreview.PivotPreviewIncompleteConfigCalloutBody": "group-by フィールドと集約を 1 つ以上選んでください。", @@ -24680,17 +24674,12 @@ "xpack.transform.stepCreateForm.copyTransformConfigToClipboardDescription": "ジョブを作成する Kibana 開発コンソールのコマンドをクリップボードにコピーします。", "xpack.transform.stepCreateForm.createAndStartTransformButton": "作成して開始", "xpack.transform.stepCreateForm.createAndStartTransformDescription": "変換を作成して開始します。変換は、クラスターの検索とインデックスによる負荷を増やします。過剰な負荷が生じた場合は変換を停止してください。変換の開始後、変換の閲覧を続けるオプションが提供されます。", - "xpack.transform.stepCreateForm.createIndexPatternErrorMessage": "Kibana インデックスパターン {indexPatternName} の作成中にエラーが発生しました：", - "xpack.transform.stepCreateForm.createIndexPatternLabel": "Kibanaインデックスパターンを作成", - "xpack.transform.stepCreateForm.createIndexPatternSuccessMessage": "Kibana インデックスパターン {indexPatternName} が作成されました。", "xpack.transform.stepCreateForm.createTransformButton": "作成", "xpack.transform.stepCreateForm.createTransformDescription": "変換を開始せずに作成します。変換は後程変換リストに戻って開始できます。", "xpack.transform.stepCreateForm.createTransformErrorMessage": "変換 {transformId} の取得中にエラーが発生しました。", "xpack.transform.stepCreateForm.createTransformSuccessMessage": "データフレームジョブ {transformId} が作成されました。", - "xpack.transform.stepCreateForm.creatingIndexPatternMessage": "Kibana インデックスパターンを作成中...", "xpack.transform.stepCreateForm.discoverCardDescription": "ディスカバリでデータフレームピボットを閲覧します。", "xpack.transform.stepCreateForm.discoverCardTitle": "Discover", - "xpack.transform.stepCreateForm.duplicateIndexPatternErrorMessage": "Kibana インデックスパターン {indexPatternName} の作成中にエラーが発生しました：インデックスパターンがすでに存在します。", "xpack.transform.stepCreateForm.progressErrorMessage": "進捗パーセンテージの取得中にエラーが発生しました：", "xpack.transform.stepCreateForm.progressTitle": "進捗", "xpack.transform.stepCreateForm.retentionPolicyLabel": "保持ポリシー", @@ -24727,7 +24716,6 @@ "xpack.transform.stepDefineForm.groupByExistsErrorMessage": "「{aggName}」という名前のgroup by構成はすでに存在します。", "xpack.transform.stepDefineForm.groupByLabel": "グループ分けの条件", "xpack.transform.stepDefineForm.groupByPlaceholder": "グループ分けの条件フィールドを追加...", - "xpack.transform.stepDefineForm.indexPatternLabel": "インデックスパターン", "xpack.transform.stepDefineForm.invalidKuerySyntaxErrorMessageQueryBar": "無効なクエリ：{errorMessage}", "xpack.transform.stepDefineForm.latestHelperText": "最新のデータを追跡", "xpack.transform.stepDefineForm.latestLabel": "最新", @@ -24755,7 +24743,6 @@ "xpack.transform.stepDefineForm.uniqueKeysPlaceholder": "一意キーを追加...", "xpack.transform.stepDefineSummary.aggregationsLabel": "アグリゲーション（集計）", "xpack.transform.stepDefineSummary.groupByLabel": "グループ分けの条件", - "xpack.transform.stepDefineSummary.indexPatternLabel": "インデックスパターン", "xpack.transform.stepDefineSummary.queryCodeBlockLabel": "クエリ", "xpack.transform.stepDefineSummary.queryLabel": "クエリ", "xpack.transform.stepDefineSummary.savedSearchLabel": "保存検索", @@ -24778,16 +24765,12 @@ "xpack.transform.stepDetailsForm.editFlyoutFormFrequencyPlaceholderText": "デフォルト：{defaultValue}", "xpack.transform.stepDetailsForm.editFlyoutFormMaxPageSearchSizePlaceholderText": "デフォルト：{defaultValue}", "xpack.transform.stepDetailsForm.errorGettingIndexNames": "既存のインデックス名の取得中にエラーが発生しました。", - "xpack.transform.stepDetailsForm.errorGettingIndexPatternTitles": "既存のインデックスパターンのタイトルの取得中にエラーが発生しました。", "xpack.transform.stepDetailsForm.errorGettingTransformList": "既存の変換 ID の取得中にエラーが発生しました：", "xpack.transform.stepDetailsForm.errorGettingTransformPreview": "変換プレビューの取得中にエラーが発生しました。", "xpack.transform.stepDetailsForm.frequencyAriaLabel": "頻度を選択してください。", "xpack.transform.stepDetailsForm.frequencyError": "無効な頻度形式", "xpack.transform.stepDetailsForm.frequencyHelpText": "変換が連続実行されているときにソースインデックスで変更を確認する間の間隔。また、変換が検索またはインデックス中に一時障害が発生した場合に、再試行する間隔も決定します。最小値は1秒で、最大値は1時間です。", "xpack.transform.stepDetailsForm.frequencyLabel": "頻度", - "xpack.transform.stepDetailsForm.indexPatternTimeFieldHelpText": "グローバル時間フィルターで使用するためのプライマリ時間フィールドを選択してください。", - "xpack.transform.stepDetailsForm.indexPatternTimeFieldLabel": "Kibanaインデックスパターン時間フィールド", - "xpack.transform.stepDetailsForm.indexPatternTitleError": "このタイトルのインデックスパターンがすでに存在します。", "xpack.transform.stepDetailsForm.maxPageSearchSizeAriaLabel": "最大ページ検索サイズを選択してください。", "xpack.transform.stepDetailsForm.maxPageSearchSizeError": "max_page_search_sizeは10～10000の範囲の数値でなければなりません。", "xpack.transform.stepDetailsForm.maxPageSearchSizeHelpText": "各チェックポイントの複合集計で使用する、初期ページサイズを定義します。", @@ -24811,10 +24794,8 @@ "xpack.transform.stepDetailsForm.transformIdLabel": "ジョブ ID", "xpack.transform.stepDetailsSummary.advancedSettingsAccordionButtonContent": "高度な設定", "xpack.transform.stepDetailsSummary.continuousModeDateFieldLabel": "連続モード日付フィールド", - "xpack.transform.stepDetailsSummary.createIndexPatternMessage": "このジョブの Kibana インデックスパターンが作成されます。", "xpack.transform.stepDetailsSummary.destinationIndexLabel": "デスティネーションインデックス", "xpack.transform.stepDetailsSummary.frequencyLabel": "頻度", - "xpack.transform.stepDetailsSummary.indexPatternTimeFieldLabel": "Kibanaインデックスパターン時間フィールド", "xpack.transform.stepDetailsSummary.maxPageSearchSizeLabel": "最大ページ検索サイズ", "xpack.transform.stepDetailsSummary.retentionPolicyDateFieldLabel": "保持ポリシーの日付フィールド", "xpack.transform.stepDetailsSummary.retentionPolicyMaxAgeLabel": "保持ポリシーの最大年齢", @@ -24840,7 +24821,6 @@ "xpack.transform.transformList.deleteTransformSuccessMessage": "データフレームジョブ {transformId} が削除されました。", "xpack.transform.transformList.discoverActionNameText": "Discoverに表示", "xpack.transform.transformList.discoverTransformBulkToolTip": "Discoverへのリンクは一括アクションとしてサポートされていません。", - "xpack.transform.transformList.discoverTransformNoIndexPatternToolTip": "対象インデックスをDiscoverで表示可能にするには、Kibanaインデックスパターンが必要です", "xpack.transform.transformList.discoverTransformToolTip": "Discoverで使用できるようにする前に、変換を開始する必要があります。", "xpack.transform.transformList.editActionNameText": "編集", "xpack.transform.transformList.editFlyoutCalloutDocs": "ドキュメントを表示", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 933f3b450e46b2..9b4b847245dfe6 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -25006,9 +25006,7 @@ "xpack.timelines.toolbar.bulkActions.selectAllAlertsTitle": "选择全部 {totalAlertsFormatted} 个{totalAlerts, plural, other {告警}}", "xpack.timelines.toolbar.bulkActions.selectedAlertsTitle": "已选择 {selectedAlertsFormatted} 个{selectedAlerts, plural, other {告警}}", "xpack.transform.actionDeleteTransform.bulkDeleteDestinationIndexTitle": "删除目标索引", - "xpack.transform.actionDeleteTransform.bulkDeleteDestIndexPatternTitle": "删除目标索引模式", "xpack.transform.actionDeleteTransform.deleteDestinationIndexTitle": "删除目标索引 {destinationIndex}", - "xpack.transform.actionDeleteTransform.deleteDestIndexPatternTitle": "删除索引模式 {destinationIndex}", "xpack.transform.agg.popoverForm.aggLabel": "聚合", "xpack.transform.agg.popoverForm.aggNameAlreadyUsedError": "其他聚合已使用该名称。", "xpack.transform.agg.popoverForm.aggNameInvalidCharError": "名称无效。不允许使用字符“[”、“]”和“>”，且名称不得以空格字符开头或结束。", @@ -25045,10 +25043,7 @@ "xpack.transform.cloneTransform.breadcrumbTitle": "克隆转换", "xpack.transform.createTransform.breadcrumbTitle": "创建转换", "xpack.transform.deleteTransform.deleteAnalyticsWithIndexErrorMessage": "删除目标索引 {destinationIndex} 时发生错误", - "xpack.transform.deleteTransform.deleteAnalyticsWithIndexPatternErrorMessage": "删除索引模式 {destinationIndex} 时发生错误", - "xpack.transform.deleteTransform.deleteAnalyticsWithIndexPatternSuccessMessage": "删除索引模式 {destinationIndex} 的请求已确认。", "xpack.transform.deleteTransform.deleteAnalyticsWithIndexSuccessMessage": "删除目标索引 {destinationIndex} 的请求已确认。", - "xpack.transform.deleteTransform.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage": "检查索引模式 {indexPattern} 是否存在时发生错误：{error}", "xpack.transform.description": "描述", "xpack.transform.groupby.popoverForm.aggLabel": "聚合", "xpack.transform.groupBy.popoverForm.aggNameAlreadyUsedError": "其他分组依据配置已使用该名称。", @@ -25081,7 +25076,6 @@ "xpack.transform.newTransform.chooseSourceTitle": "选择源", "xpack.transform.newTransform.newTransformTitle": "新转换", "xpack.transform.newTransform.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。", - "xpack.transform.newTransform.searchSelection.savedObjectType.indexPattern": "索引模式", "xpack.transform.newTransform.searchSelection.savedObjectType.search": "已保存搜索", "xpack.transform.pivotPreview.copyClipboardTooltip": "将转换预览的开发控制台语句复制到剪贴板。", "xpack.transform.pivotPreview.PivotPreviewIncompleteConfigCalloutBody": "请至少选择一个分组依据字段和聚合。", @@ -25102,17 +25096,12 @@ "xpack.transform.stepCreateForm.copyTransformConfigToClipboardDescription": "将用于创建作业的 Kibana 开发控制台命令复制到剪贴板。", "xpack.transform.stepCreateForm.createAndStartTransformButton": "创建并启动", "xpack.transform.stepCreateForm.createAndStartTransformDescription": "创建并启动转换。转换将增加集群的搜索和索引负荷。如果负荷超载，请停止转换。转换启动后，系统将为您提供继续浏览转换的选项。", - "xpack.transform.stepCreateForm.createIndexPatternErrorMessage": "创建 Kibana 索引模式 {indexPatternName} 时发生错误：", - "xpack.transform.stepCreateForm.createIndexPatternLabel": "创建 Kibana 索引模式", - "xpack.transform.stepCreateForm.createIndexPatternSuccessMessage": "Kibana 索引模式 {indexPatternName} 成功创建。", "xpack.transform.stepCreateForm.createTransformButton": "创建", "xpack.transform.stepCreateForm.createTransformDescription": "在不启动转换的情况下创建转换。您之后能够通过返回到转换列表，来启动转换。", "xpack.transform.stepCreateForm.createTransformErrorMessage": "创建数据帧转换 {transformId} 时发生错误：", "xpack.transform.stepCreateForm.createTransformSuccessMessage": "数据帧作业 {transformId} 创建成功。", - "xpack.transform.stepCreateForm.creatingIndexPatternMessage": "正在创建 Kibana 索引模式......", "xpack.transform.stepCreateForm.discoverCardDescription": "使用 Discover 浏览数据帧透视表。", "xpack.transform.stepCreateForm.discoverCardTitle": "Discover", - "xpack.transform.stepCreateForm.duplicateIndexPatternErrorMessage": "创建 Kibana 索引模式 {indexPatternName} 时发生错误：该索引模式已存在。", "xpack.transform.stepCreateForm.progressErrorMessage": "获取进度百分比时出错：", "xpack.transform.stepCreateForm.progressTitle": "进度", "xpack.transform.stepCreateForm.retentionPolicyLabel": "保留策略", @@ -25149,7 +25138,6 @@ "xpack.transform.stepDefineForm.groupByExistsErrorMessage": "名称为“{aggName}”的分组依据配置已存在。", "xpack.transform.stepDefineForm.groupByLabel": "分组依据", "xpack.transform.stepDefineForm.groupByPlaceholder": "添加分组依据字段……", - "xpack.transform.stepDefineForm.indexPatternLabel": "索引模式", "xpack.transform.stepDefineForm.invalidKuerySyntaxErrorMessageQueryBar": "查询无效：{errorMessage}", "xpack.transform.stepDefineForm.latestHelperText": "跟踪您的最新数据", "xpack.transform.stepDefineForm.latestLabel": "最新", @@ -25177,7 +25165,6 @@ "xpack.transform.stepDefineForm.uniqueKeysPlaceholder": "添加唯一键……", "xpack.transform.stepDefineSummary.aggregationsLabel": "聚合", "xpack.transform.stepDefineSummary.groupByLabel": "分组依据", - "xpack.transform.stepDefineSummary.indexPatternLabel": "索引模式", "xpack.transform.stepDefineSummary.queryCodeBlockLabel": "查询", "xpack.transform.stepDefineSummary.queryLabel": "查询", "xpack.transform.stepDefineSummary.savedSearchLabel": "已保存搜索", @@ -25200,16 +25187,12 @@ "xpack.transform.stepDetailsForm.editFlyoutFormFrequencyPlaceholderText": "默认值：{defaultValue}", "xpack.transform.stepDetailsForm.editFlyoutFormMaxPageSearchSizePlaceholderText": "默认值：{defaultValue}", "xpack.transform.stepDetailsForm.errorGettingIndexNames": "获取现有索引名称时发生错误：", - "xpack.transform.stepDetailsForm.errorGettingIndexPatternTitles": "获取现有索引模式标题时发生错误：", "xpack.transform.stepDetailsForm.errorGettingTransformList": "获取现有转换 ID 时发生错误：", "xpack.transform.stepDetailsForm.errorGettingTransformPreview": "提取转换预览时发生错误", "xpack.transform.stepDetailsForm.frequencyAriaLabel": "选择频率。", "xpack.transform.stepDetailsForm.frequencyError": "频率格式无效", "xpack.transform.stepDetailsForm.frequencyHelpText": "在转换不间断地执行时检查源索引更改的时间间隔。还确定在转换搜索或索引时发生暂时失败时的重试时间间隔。最小值为 1 秒，最大值为 1 小时。", "xpack.transform.stepDetailsForm.frequencyLabel": "频率", - "xpack.transform.stepDetailsForm.indexPatternTimeFieldHelpText": "选择用于全局时间筛选的主要时间字段。", - "xpack.transform.stepDetailsForm.indexPatternTimeFieldLabel": "Kibana 索引模式的时间字段", - "xpack.transform.stepDetailsForm.indexPatternTitleError": "具有此名称的索引模式已存在。", "xpack.transform.stepDetailsForm.maxPageSearchSizeAriaLabel": "选择最大页面搜索大小。", "xpack.transform.stepDetailsForm.maxPageSearchSizeError": "max_page_search_size 必须是介于 10 到 10000 之间的数字。", "xpack.transform.stepDetailsForm.maxPageSearchSizeHelpText": "定义用于每个检查点的组合聚合的初始页面大小。", @@ -25233,10 +25216,8 @@ "xpack.transform.stepDetailsForm.transformIdLabel": "作业 ID", "xpack.transform.stepDetailsSummary.advancedSettingsAccordionButtonContent": "高级设置", "xpack.transform.stepDetailsSummary.continuousModeDateFieldLabel": "连续模式日期字段", - "xpack.transform.stepDetailsSummary.createIndexPatternMessage": "将为此作业创建 Kibana 索引模式。", "xpack.transform.stepDetailsSummary.destinationIndexLabel": "目标索引", "xpack.transform.stepDetailsSummary.frequencyLabel": "频率", - "xpack.transform.stepDetailsSummary.indexPatternTimeFieldLabel": "Kibana 索引模式时间字段", "xpack.transform.stepDetailsSummary.maxPageSearchSizeLabel": "最大页面搜索大小", "xpack.transform.stepDetailsSummary.retentionPolicyDateFieldLabel": "保留策略日期字段", "xpack.transform.stepDetailsSummary.retentionPolicyMaxAgeLabel": "保留策略最大存在时间", @@ -25247,7 +25228,6 @@ "xpack.transform.toastText.modalTitle": "错误详细信息", "xpack.transform.toastText.openModalButtonText": "查看详情", "xpack.transform.transformForm.sizeNotationPlaceholder": "示例：{example1}、{example2}、{example3}、{example4}", - "xpack.transform.transformList.bulkDeleteDestIndexPatternSuccessMessage": "已成功删除 {count} 个目标索引{count, plural, other {模式}}。", "xpack.transform.transformList.bulkDeleteDestIndexSuccessMessage": "已成功删除 {count} 个目标{count, plural, other {索引}}。", "xpack.transform.transformList.bulkDeleteModalTitle": "删除 {count} 个 {count, plural, other {转换}}？", "xpack.transform.transformList.bulkDeleteTransformSuccessMessage": "已成功删除 {count} 个{count, plural, other {转换}}。", @@ -25267,7 +25247,6 @@ "xpack.transform.transformList.deleteTransformSuccessMessage": "数据帧作业 {transformId} 删除成功。", "xpack.transform.transformList.discoverActionNameText": "在 Discover 中查看", "xpack.transform.transformList.discoverTransformBulkToolTip": "不支持 Discover 的链接作为批量操作。", - "xpack.transform.transformList.discoverTransformNoIndexPatternToolTip": "需要 Kibana 索引模式，才能在 Discover 中查看目标索引", "xpack.transform.transformList.discoverTransformToolTip": "转换需要启动后才能在 Discover 中使用。", "xpack.transform.transformList.editActionNameText": "编辑", "xpack.transform.transformList.editFlyoutCalloutDocs": "查看文档", diff --git a/x-pack/test/functional/apps/transform/cloning.ts b/x-pack/test/functional/apps/transform/cloning.ts index a6a46888edda81..313ecc3c433935 100644 --- a/x-pack/test/functional/apps/transform/cloning.ts +++ b/x-pack/test/functional/apps/transform/cloning.ts @@ -322,9 +322,7 @@ export default function ({ getService }: FtrProviderContext) { await transform.wizard.assertDestinationIndexValue(''); await transform.wizard.setDestinationIndex(testData.destinationIndex); - await transform.testExecution.logTestStep( - 'should display the create index pattern switch' - ); + await transform.testExecution.logTestStep('should display the create data view switch'); await transform.wizard.assertCreateIndexPatternSwitchExists(); await transform.wizard.assertCreateIndexPatternSwitchCheckState(true); diff --git a/x-pack/test/functional/apps/transform/creation_index_pattern.ts b/x-pack/test/functional/apps/transform/creation_index_pattern.ts index a6b3e8e41be999..49211deaa2c422 100644 --- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts +++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts @@ -528,7 +528,7 @@ export default function ({ getService }: FtrProviderContext) { await transform.wizard.assertDestinationIndexValue(''); await transform.wizard.setDestinationIndex(testData.destinationIndex); - await transform.testExecution.logTestStep('displays the create index pattern switch'); + await transform.testExecution.logTestStep('displays the create data view switch'); await transform.wizard.assertCreateIndexPatternSwitchExists(); await transform.wizard.assertCreateIndexPatternSwitchCheckState(true); diff --git a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts index 5fe9d02c58dc77..590f184ca39d61 100644 --- a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts +++ b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts @@ -398,7 +398,7 @@ export default function ({ getService }: FtrProviderContext) { await transform.wizard.assertDestinationIndexValue(''); await transform.wizard.setDestinationIndex(testData.destinationIndex); - await transform.testExecution.logTestStep('displays the create index pattern switch'); + await transform.testExecution.logTestStep('displays the create data view switch'); await transform.wizard.assertCreateIndexPatternSwitchExists(); await transform.wizard.assertCreateIndexPatternSwitchCheckState(true); diff --git a/x-pack/test/functional/apps/transform/creation_saved_search.ts b/x-pack/test/functional/apps/transform/creation_saved_search.ts index b79bef82267d78..9193d301ce1234 100644 --- a/x-pack/test/functional/apps/transform/creation_saved_search.ts +++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts @@ -229,7 +229,7 @@ export default function ({ getService }: FtrProviderContext) { await transform.wizard.assertDestinationIndexValue(''); await transform.wizard.setDestinationIndex(testData.destinationIndex); - await transform.testExecution.logTestStep('displays the create index pattern switch'); + await transform.testExecution.logTestStep('displays the create data view switch'); await transform.wizard.assertCreateIndexPatternSwitchExists(); await transform.wizard.assertCreateIndexPatternSwitchCheckState(true); diff --git a/x-pack/test/functional/services/transform/wizard.ts b/x-pack/test/functional/services/transform/wizard.ts index 39809d4805064e..434653be49c14f 100644 --- a/x-pack/test/functional/services/transform/wizard.ts +++ b/x-pack/test/functional/services/transform/wizard.ts @@ -737,7 +737,7 @@ export function TransformWizardProvider({ getService, getPageObjects }: FtrProvi 'true'; expect(actualCheckState).to.eql( expectedCheckState, - `Create index pattern switch check state should be '${expectedCheckState}' (got '${actualCheckState}')` + `Create data view switch check state should be '${expectedCheckState}' (got '${actualCheckState}')` ); }, From 013f591d0d8112bd66a57b2c35d8da35d86a046a Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Fri, 24 Sep 2021 07:15:45 -0500 Subject: [PATCH 10/25] change name of index pattern management for roles priv (#113053) --- x-pack/plugins/features/server/oss_features.ts | 4 ++-- x-pack/plugins/translations/translations/ja-JP.json | 1 - x-pack/plugins/translations/translations/zh-CN.json | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/features/server/oss_features.ts b/x-pack/plugins/features/server/oss_features.ts index 7c8432b8d9ec7a..0c240d541f80e5 100644 --- a/x-pack/plugins/features/server/oss_features.ts +++ b/x-pack/plugins/features/server/oss_features.ts @@ -368,8 +368,8 @@ export const buildOSSFeatures = ({ }, { id: 'indexPatterns', - name: i18n.translate('xpack.features.indexPatternFeatureName', { - defaultMessage: 'Index Pattern Management', + name: i18n.translate('xpack.features.dataViewFeatureName', { + defaultMessage: 'Data View Management', }), order: 1600, category: DEFAULT_APP_CATEGORIES.management, diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 886dc873e419fc..ee538f9420ab78 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -10320,7 +10320,6 @@ "xpack.features.devToolsFeatureName": "開発ツール", "xpack.features.devToolsPrivilegesTooltip": "また、ユーザーに適切な Elasticsearch クラスターとインデックスの権限が与えられている必要があります。", "xpack.features.discoverFeatureName": "Discover", - "xpack.features.indexPatternFeatureName": "インデックスパターン管理", "xpack.features.ossFeatures.dashboardCreateShortUrlPrivilegeName": "短い URL を作成", "xpack.features.ossFeatures.dashboardSearchSessionsFeatureName": "検索セッションの保存", "xpack.features.ossFeatures.dashboardShortUrlSubFeatureName": "短い URL", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index d0aa91296b83f8..258f899858924b 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -10422,7 +10422,6 @@ "xpack.features.devToolsFeatureName": "开发工具", "xpack.features.devToolsPrivilegesTooltip": "还应向用户授予适当的 Elasticsearch 集群和索引权限", "xpack.features.discoverFeatureName": "Discover", - "xpack.features.indexPatternFeatureName": "索引模式管理", "xpack.features.ossFeatures.dashboardCreateShortUrlPrivilegeName": "创建短 URL", "xpack.features.ossFeatures.dashboardSearchSessionsFeatureName": "存储搜索会话", "xpack.features.ossFeatures.dashboardShortUrlSubFeatureName": "短 URL", From be03ad5e6e7d0488ca3c4849f873e742dff2137a Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Mon, 27 Sep 2021 14:09:04 +0100 Subject: [PATCH 11/25] [ML] Updates index pattern to data view in user facing copy (#112984) * [ML] Updates index pattern to data view in user facing copy * [ML] Updates translations * [ML] Fix failing tests Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- x-pack/plugins/ml/common/constants/locator.ts | 2 +- .../components/anomalies_table/links_menu.js | 6 +-- .../components/data_grid/data_grid.tsx | 2 +- .../full_time_range_selector.test.tsx.snap | 4 +- .../full_time_range_selector.test.tsx | 2 +- .../full_time_range_selector.tsx | 4 +- .../data_frame_analytics/common/fields.ts | 4 +- .../common/use_results_view_config.ts | 15 +++----- .../configuration_step_form.tsx | 2 +- .../supported_fields_message.tsx | 8 ++-- .../create_analytics_advanced_editor.tsx | 13 +++---- .../details_step/details_step_form.tsx | 12 +++--- .../pages/analytics_creation/page.tsx | 4 +- .../index_pattern_prompt.tsx | 10 ++--- .../action_clone/clone_action_name.tsx | 18 ++++----- .../action_delete/delete_action_modal.tsx | 11 ++---- .../action_delete/use_delete_action.tsx | 13 +++---- .../source_selection.test.tsx | 32 ++++++++-------- .../source_selection/source_selection.tsx | 22 +++++------ .../use_create_analytics_form/reducer.test.ts | 10 ++--- .../use_create_analytics_form/reducer.ts | 4 +- .../hooks/use_create_analytics_form/state.ts | 2 +- .../use_create_analytics_form.ts | 35 ++++++++--------- .../analytics_service/delete_analytics.ts | 15 +++----- .../pages/job_map/components/controls.tsx | 4 +- .../datavisualizer_selector.tsx | 10 ++--- .../index_based/data_loader/data_loader.ts | 2 +- .../explorer_chart_config_builder.js | 2 +- .../formatters/kibana_field_format.ts | 2 +- .../__snapshots__/editor.test.tsx.snap | 16 ++++---- .../custom_url_editor/editor.test.tsx | 4 +- .../components/custom_url_editor/editor.tsx | 4 +- .../components/custom_url_editor/utils.js | 2 +- .../components/edit_job_flyout/edit_utils.js | 4 +- .../edit_job_flyout/tabs/custom_urls.tsx | 4 +- .../components/job_actions/management.js | 4 +- .../job_creator/categorization_job_creator.ts | 2 +- .../json_editor_flyout/json_editor_flyout.tsx | 2 +- .../components/time_field/description.tsx | 2 +- .../invalid_ccs_version_valid_callout.tsx | 2 +- .../new_job/pages/index_or_search/page.tsx | 10 ++--- .../jobs/new_job/pages/job_type/page.tsx | 20 +++++----- .../jobs/new_job/pages/new_job/page.tsx | 6 +-- .../new_job/pages/new_job/wizard_steps.tsx | 11 ++---- .../jobs/new_job/recognize/page.tsx | 6 +-- .../jobs/new_job/utils/new_job_utils.test.ts | 2 +- .../services/field_format_service.ts | 14 +++---- .../services/ml_api_service/index.ts | 6 +-- .../load_new_job_capabilities.ts | 8 ++-- .../ml/public/application/util/index_utils.ts | 16 ++++---- .../anomaly_charts_embeddable.tsx | 6 +-- .../ml/public/locator/ml_locator.test.ts | 2 +- .../models/data_recognizer/data_recognizer.ts | 12 +++--- .../models/data_visualizer/data_visualizer.ts | 14 +++---- .../ml/server/routes/data_frame_analytics.ts | 4 +- .../ml/server/routes/data_visualizer.ts | 24 +++++------- .../routes/schemas/data_visualizer_schema.ts | 6 +-- .../translations/translations/ja-JP.json | 38 ------------------- .../translations/translations/zh-CN.json | 38 ------------------- .../apis/ml/modules/setup_module.ts | 6 +-- .../classification_creation.ts | 2 +- .../outlier_detection_creation.ts | 2 +- .../regression_creation.ts | 2 +- .../data_visualizer/file_data_visualizer.ts | 2 +- .../apps/ml/permissions/full_ml_access.ts | 2 +- .../apps/ml/permissions/read_ml_access.ts | 2 +- .../ml/data_frame_analytics_creation.ts | 2 +- 67 files changed, 236 insertions(+), 343 deletions(-) diff --git a/x-pack/plugins/ml/common/constants/locator.ts b/x-pack/plugins/ml/common/constants/locator.ts index 2949cdde1d47bd..fe34557504a08b 100644 --- a/x-pack/plugins/ml/common/constants/locator.ts +++ b/x-pack/plugins/ml/common/constants/locator.ts @@ -22,7 +22,7 @@ export const ML_PAGES = { DATA_VISUALIZER: 'datavisualizer', /** * Page: Data Visualizer - * Open data visualizer by selecting a Kibana index pattern or saved search + * Open data visualizer by selecting a Kibana data view or saved search */ DATA_VISUALIZER_INDEX_SELECT: 'datavisualizer_index_select', /** diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js index 1c4760db5d640d..18fc10e69bc052 100644 --- a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js +++ b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js @@ -258,10 +258,10 @@ class LinksMenuUI extends Component { }; const createAndOpenUrl = (index, categorizationFieldType) => { - // Find the ID of the index pattern with a title attribute which matches the - // index configured in the datafeed. If a Kibana index pattern has not been created + // Find the ID of the data view with a title attribute which matches the + // index configured in the datafeed. If a Kibana data view has not been created // for this index, then the user will see a warning message on the Discover tab advising - // them that no matching index pattern has been configured. + // them that no matching data view has been configured. const indexPatternId = getIndexPatternIdFromName(index) || index; // Get the definition of the category and use the terms or regex to view the diff --git a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx index be2b8207df49a9..fc2061e9cee3d1 100644 --- a/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx +++ b/x-pack/plugins/ml/public/application/components/data_grid/data_grid.tsx @@ -322,7 +322,7 @@ export const DataGrid: FC = memo(

{i18n.translate('xpack.ml.dataGrid.CcsWarningCalloutBody', { defaultMessage: - 'There was an issue retrieving data for the index pattern. Source preview in combination with cross-cluster search is only supported for versions 7.10 and above. You may still configure and create the transform.', + 'There was an issue retrieving data for the data view. Source preview in combination with cross-cluster search is only supported for versions 7.10 and above. You may still configure and create the transform.', })}

diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap b/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap index d633b755ec6bab..eb9705f3438aa0 100644 --- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap +++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/__snapshots__/full_time_range_selector.test.tsx.snap @@ -7,11 +7,11 @@ exports[`FullTimeRangeSelector renders the selector 1`] = ` onClick={[Function]} > diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx index f9f8d9a370bab6..d8e72c89f638bf 100644 --- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx +++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx @@ -24,7 +24,7 @@ describe('FullTimeRangeSelector', () => { const indexPattern = { id: '0844fc70-5ab5-11e9-935e-836737467b0f', fields: [], - title: 'test-index-pattern', + title: 'test-data-view', timeFieldName: '@timestamp', } as unknown as IndexPattern; diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx index f087754bd275b0..ab972d6922a4ed 100644 --- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx @@ -37,9 +37,9 @@ export const FullTimeRangeSelector: FC = ({ indexPattern, query, disabled > diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts index fee610797577f3..d5e0e736b768ec 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/fields.ts @@ -197,7 +197,7 @@ export const getDefaultFieldsFromJobCaps = ( ); } - // Only need to add these fields if we didn't use dest index pattern to get the fields + // Only need to add these fields if we didn't use dest data view to get the fields if (needsDestIndexFields === true) { allFields.push({ id: `${resultsField}.${OUTLIER_SCORE}`, @@ -243,7 +243,7 @@ export const getDefaultFieldsFromJobCaps = ( ); } - // Only need to add these fields if we didn't use dest index pattern to get the fields + // Only need to add these fields if we didn't use dest data view to get the fields if (needsDestIndexFields === true) { allFields.push( { diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts index e1f0db4e9291c0..1dba6cbd3b9d1d 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts @@ -52,7 +52,7 @@ export const useResultsViewConfig = (jobId: string) => { TotalFeatureImportance[] | undefined >(undefined); - // get analytics configuration, index pattern and field caps + // get analytics configuration, data view and field caps useEffect(() => { (async function () { setIsLoadingJobConfig(false); @@ -106,7 +106,7 @@ export const useResultsViewConfig = (jobId: string) => { // Force refreshing the fields list here because a user directly coming // from the job creation wizard might land on the page without the - // index pattern being fully initialized because it was created + // data view being fully initialized because it was created // before the analytics job populated the destination index. await mlContext.indexPatterns.refreshFields(indexP); } catch (e) { @@ -132,13 +132,10 @@ export const useResultsViewConfig = (jobId: string) => { setIsLoadingJobConfig(false); } else { setIndexPatternErrorMessage( - i18n.translate( - 'xpack.ml.dataframe.analytics.results.indexPatternsMissingErrorMessage', - { - defaultMessage: - 'To view this page, a Kibana index pattern is necessary for either the destination or source index of this analytics job.', - } - ) + i18n.translate('xpack.ml.dataframe.analytics.results.dataViewMissingErrorMessage', { + defaultMessage: + 'To view this page, a Kibana data view is necessary for either the destination or source index of this analytics job.', + }) ); } } catch (e) { diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx index 47f7c2621802e5..9b29d9108a1a14 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx @@ -586,7 +586,7 @@ export const ConfigurationStepForm: FC = ({ i18n.translate( 'xpack.ml.dataframe.analytics.create.dependentVariableOptionsNoNumericalFields', { - defaultMessage: 'No numeric type fields were found for this index pattern.', + defaultMessage: 'No numeric type fields were found for this data view.', } ) } diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx index 08ed279ae777b8..95eb180585e5dd 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/supported_fields_message.tsx @@ -46,19 +46,19 @@ const messages: Record = { [ANALYSIS_CONFIG_TYPE.CLASSIFICATION]: ( ), [ANALYSIS_CONFIG_TYPE.REGRESSION]: ( ), [ANALYSIS_CONFIG_TYPE.OUTLIER_DETECTION]: ( ), }; @@ -73,7 +73,7 @@ export const SupportedFieldsMessage: FC = ({ jobType }) => { const [sourceIndexFieldsCheckFailed, setSourceIndexFieldsCheckFailed] = useState(false); const { fields } = newJobCapsServiceAnalytics; - // Find out if index pattern contains supported fields for job type. Provides a hint in the form + // Find out if data view contains supported fields for job type. Provides a hint in the form // that job may not run correctly if no supported fields are found. const validateFields = () => { if (fields && jobType !== undefined) { diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx index 2f05e0e22da847..31072089b8d5cf 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/create_analytics_advanced_editor/create_analytics_advanced_editor.tsx @@ -204,20 +204,17 @@ export const CreateAnalyticsAdvancedEditor: FC = (prop error={ createIndexPattern && destinationIndexPatternTitleExists && [ - i18n.translate( - 'xpack.ml.dataframe.analytics.create.indexPatternAlreadyExistsError', - { - defaultMessage: 'An index pattern with this title already exists.', - } - ), + i18n.translate('xpack.ml.dataframe.analytics.create.dataViewAlreadyExistsError', { + defaultMessage: 'A data view with this title already exists.', + }), ] } > setFormState({ createIndexPattern: !createIndexPattern })} diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx index 824538a56acd79..c9acccb9b15547 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/details_step/details_step_form.tsx @@ -352,8 +352,8 @@ export const DetailsStepForm: FC = ({ error={[ ...(createIndexPattern && destinationIndexPatternTitleExists ? [ - i18n.translate('xpack.ml.dataframe.analytics.create.indexPatternExistsError', { - defaultMessage: 'An index pattern with this title already exists.', + i18n.translate('xpack.ml.dataframe.analytics.create.dataViewExistsError', { + defaultMessage: 'A data view with this title already exists.', }), ] : []), @@ -361,10 +361,10 @@ export const DetailsStepForm: FC = ({ ? [ {i18n.translate( - 'xpack.ml.dataframe.analytics.create.shouldCreateIndexPatternMessage', + 'xpack.ml.dataframe.analytics.create.shouldCreateDataViewMessage', { defaultMessage: - 'You may not be able to view job results if an index pattern is not created for the destination index.', + 'You may not be able to view job results if a data view is not created for the destination index.', } )} , @@ -375,8 +375,8 @@ export const DetailsStepForm: FC = ({ setFormState({ createIndexPattern: !createIndexPattern })} diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx index 8bccbb5a90c29a..42a56d6327a600 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx @@ -191,8 +191,8 @@ export const Page: FC = ({ jobId }) => {

diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/index_pattern_prompt/index_pattern_prompt.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/index_pattern_prompt/index_pattern_prompt.tsx index 0533aa3e550519..684cb2046afc52 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/index_pattern_prompt/index_pattern_prompt.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_exploration/components/index_pattern_prompt/index_pattern_prompt.tsx @@ -25,18 +25,18 @@ export const IndexPatternPrompt: FC = ({ destIndex }) => { <> ), diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx index a3f18801b88f9e..dfe9e07f9117e6 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_clone/clone_action_name.tsx @@ -430,10 +430,10 @@ export const useNavigateToWizardWithClonedJob = () => { sourceIndexId = ip.id; } else { toasts.addDanger( - i18n.translate('xpack.ml.dataframe.analyticsList.noSourceIndexPatternForClone', { + i18n.translate('xpack.ml.dataframe.analyticsList.noSourceDataViewForClone', { defaultMessage: - 'Unable to clone the analytics job. No index pattern exists for index {indexPattern}.', - values: { indexPattern: sourceIndex }, + 'Unable to clone the analytics job. No data view exists for index {dataView}.', + values: { dataView: sourceIndex }, }) ); } @@ -441,14 +441,10 @@ export const useNavigateToWizardWithClonedJob = () => { const error = extractErrorMessage(e); toasts.addDanger( - i18n.translate( - 'xpack.ml.dataframe.analyticsList.fetchSourceIndexPatternForCloneErrorMessage', - { - defaultMessage: - 'An error occurred checking if index pattern {indexPattern} exists: {error}', - values: { indexPattern: sourceIndex, error }, - } - ) + i18n.translate('xpack.ml.dataframe.analyticsList.fetchSourceDataViewForCloneErrorMessage', { + defaultMessage: 'An error occurred checking if data view {dataView} exists: {error}', + values: { dataView: sourceIndex, error }, + }) ); } diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx index e2e1ec852d1a95..6767ee439ca615 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/delete_action_modal.tsx @@ -79,13 +79,10 @@ export const DeleteActionModal: FC = ({ {userCanDeleteIndex && indexPatternExists && ( diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx index 4abe70435d37c5..3d212c22fefec8 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/action_delete/use_delete_action.tsx @@ -79,11 +79,10 @@ export const useDeleteAction = (canDeleteDataFrameAnalytics: boolean) => { toastNotificationService.displayDangerToast( i18n.translate( - 'xpack.ml.dataframe.analyticsList.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage', + 'xpack.ml.dataframe.analyticsList.errorWithCheckingIfDataViewExistsNotificationErrorMessage', { - defaultMessage: - 'An error occurred checking if index pattern {indexPattern} exists: {error}', - values: { indexPattern: indexName, error }, + defaultMessage: 'An error occurred checking if data view {dataView} exists: {error}', + values: { dataView: indexName, error }, } ) ); @@ -114,10 +113,10 @@ export const useDeleteAction = (canDeleteDataFrameAnalytics: boolean) => { useEffect(() => { setIsLoading(true); - // Check if an index pattern exists corresponding to current DFA job - // if pattern does exist, show it to user + // Check if a data view exists corresponding to current DFA job + // if data view does exist, show it to user checkIndexPatternExists(); - // Check if an user has permission to delete the index & index pattern + // Check if an user has permission to delete the index & data view checkUserIndexPermission(); }, [isModalVisible]); diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx index 7e90a4e3ed44ac..52ebfd1663ef9b 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx @@ -102,12 +102,12 @@ jest.mock('../../../../../util/index_utils', () => { }); const mockOnClose = jest.fn(); -const mockGetIndexPatternAndSavedSearch = getIndexPatternAndSavedSearch as jest.Mock; +const mockGetDataViewAndSavedSearch = getIndexPatternAndSavedSearch as jest.Mock; describe('Data Frame Analytics: ', () => { afterEach(() => { mockNavigateToPath.mockClear(); - mockGetIndexPatternAndSavedSearch.mockClear(); + mockGetDataViewAndSavedSearch.mockClear(); }); it('renders the title text', async () => { @@ -121,10 +121,10 @@ describe('Data Frame Analytics: ', () => { // assert expect(screen.queryByText('New analytics job')).toBeInTheDocument(); expect(mockNavigateToPath).toHaveBeenCalledTimes(0); - expect(mockGetIndexPatternAndSavedSearch).toHaveBeenCalledTimes(0); + expect(mockGetDataViewAndSavedSearch).toHaveBeenCalledTimes(0); }); - it('shows the error callout when clicking a remote index pattern', async () => { + it('shows the error callout when clicking a remote data view', async () => { // prepare render( @@ -138,13 +138,13 @@ describe('Data Frame Analytics: ', () => { // assert expect( - screen.queryByText('Index patterns using cross-cluster search are not supported.') + screen.queryByText('Data views using cross-cluster search are not supported.') ).toBeInTheDocument(); expect(mockNavigateToPath).toHaveBeenCalledTimes(0); - expect(mockGetIndexPatternAndSavedSearch).toHaveBeenCalledTimes(0); + expect(mockGetDataViewAndSavedSearch).toHaveBeenCalledTimes(0); }); - it('calls navigateToPath for a plain index pattern ', async () => { + it('calls navigateToPath for a plain data view ', async () => { // prepare render( @@ -158,16 +158,16 @@ describe('Data Frame Analytics: ', () => { // assert await waitFor(() => { expect( - screen.queryByText('Index patterns using cross-cluster search are not supported.') + screen.queryByText('Data views using cross-cluster search are not supported.') ).not.toBeInTheDocument(); expect(mockNavigateToPath).toHaveBeenCalledWith( '/data_frame_analytics/new_job?index=the-plain-index-pattern-id' ); - expect(mockGetIndexPatternAndSavedSearch).toHaveBeenCalledTimes(0); + expect(mockGetDataViewAndSavedSearch).toHaveBeenCalledTimes(0); }); }); - it('shows the error callout when clicking a saved search using a remote index pattern', async () => { + it('shows the error callout when clicking a saved search using a remote data view', async () => { // prepare render( @@ -181,18 +181,18 @@ describe('Data Frame Analytics: ', () => { // assert expect( - screen.queryByText('Index patterns using cross-cluster search are not supported.') + screen.queryByText('Data views using cross-cluster search are not supported.') ).toBeInTheDocument(); expect( screen.queryByText( - `The saved search 'the-remote-saved-search-title' uses the index pattern 'my_remote_cluster:index-pattern-title'.` + `The saved search 'the-remote-saved-search-title' uses the data view 'my_remote_cluster:index-pattern-title'.` ) ).toBeInTheDocument(); expect(mockNavigateToPath).toHaveBeenCalledTimes(0); - expect(mockGetIndexPatternAndSavedSearch).toHaveBeenCalledWith('the-remote-saved-search-id'); + expect(mockGetDataViewAndSavedSearch).toHaveBeenCalledWith('the-remote-saved-search-id'); }); - it('calls navigateToPath for a saved search using a plain index pattern ', async () => { + it('calls navigateToPath for a saved search using a plain data view ', async () => { // prepare render( @@ -206,12 +206,12 @@ describe('Data Frame Analytics: ', () => { // assert await waitFor(() => { expect( - screen.queryByText('Index patterns using cross-cluster search are not supported.') + screen.queryByText('Data views using cross-cluster search are not supported.') ).not.toBeInTheDocument(); expect(mockNavigateToPath).toHaveBeenCalledWith( '/data_frame_analytics/new_job?savedSearchId=the-plain-saved-search-id' ); - expect(mockGetIndexPatternAndSavedSearch).toHaveBeenCalledWith('the-plain-saved-search-id'); + expect(mockGetDataViewAndSavedSearch).toHaveBeenCalledWith('the-plain-saved-search-id'); }); }); }); diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx index b6424c12283ef6..c2f17a45c1e066 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx @@ -48,30 +48,30 @@ export const SourceSelection: FC = ({ onClose }) => { fullName: string, savedObject: SimpleSavedObject ) => { - // Kibana index patterns including `:` are cross-cluster search indices + // Kibana data views including `:` are cross-cluster search indices // and are not supported by Data Frame Analytics yet. For saved searches - // and index patterns that use cross-cluster search we intercept + // and data views that use cross-cluster search we intercept // the selection before redirecting and show an error callout instead. - let indexPatternTitle = ''; + let dataViewName = ''; if (type === 'index-pattern') { - indexPatternTitle = getNestedProperty(savedObject, 'attributes.title'); + dataViewName = getNestedProperty(savedObject, 'attributes.title'); } else if (type === 'search') { const indexPatternAndSavedSearch = await getIndexPatternAndSavedSearch(id); - indexPatternTitle = indexPatternAndSavedSearch.indexPattern?.title ?? ''; + dataViewName = indexPatternAndSavedSearch.indexPattern?.title ?? ''; } - if (isCcsIndexPattern(indexPatternTitle)) { + if (isCcsIndexPattern(dataViewName)) { setIsCcsCallOut(true); if (type === 'search') { setCcsCallOutBodyText( i18n.translate( 'xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutBody', { - defaultMessage: `The saved search '{savedSearchTitle}' uses the index pattern '{indexPatternTitle}'.`, + defaultMessage: `The saved search '{savedSearchTitle}' uses the data view '{dataViewName}'.`, values: { savedSearchTitle: getNestedProperty(savedObject, 'attributes.title'), - indexPatternTitle, + dataViewName, }, } ) @@ -104,7 +104,7 @@ export const SourceSelection: FC = ({ onClose }) => { /{' '} @@ -116,7 +116,7 @@ export const SourceSelection: FC = ({ onClose }) => { title={i18n.translate( 'xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutTitle', { - defaultMessage: 'Index patterns using cross-cluster search are not supported.', + defaultMessage: 'Data views using cross-cluster search are not supported.', } )} color="danger" @@ -153,7 +153,7 @@ export const SourceSelection: FC = ({ onClose }) => { name: i18n.translate( 'xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.indexPattern', { - defaultMessage: 'Index pattern', + defaultMessage: 'Data view', } ), }, diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts index 6d2aecec4ea683..39589c71fb62bf 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.test.ts @@ -98,19 +98,19 @@ describe('useCreateAnalyticsForm', () => { expect(resetMessageState.requestMessages).toHaveLength(0); }); - test('validateAdvancedEditor(): check index pattern variations', () => { - // valid single index pattern + test('validateAdvancedEditor(): check data view variations', () => { + // valid single index expect(validateAdvancedEditor(getMockState({ index: 'the-source-index' })).isValid).toBe(true); - // valid array with one ES index pattern + // valid array with one ES index expect(validateAdvancedEditor(getMockState({ index: ['the-source-index'] })).isValid).toBe( true ); - // valid array with two ES index patterns + // valid array with two ES indices expect( validateAdvancedEditor(getMockState({ index: ['the-source-index-1', 'the-source-index-2'] })) .isValid ).toBe(true); - // invalid comma-separated index pattern, this is only allowed in the simple form + // invalid comma-separated indices, this is only allowed in the simple form // but not the advanced editor. expect( validateAdvancedEditor(getMockState({ index: 'the-source-index-1,the-source-index-2' })) diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts index 71da56c9e14e5e..9137ce42a465c0 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/reducer.ts @@ -112,11 +112,11 @@ const isSourceIndexNameValid = ( sourceIndexName: string, sourceIndex: string | Array | undefined ) => { - // general check against Kibana index pattern names, but since this is about the advanced editor + // general check against Kibana data view names, but since this is about the advanced editor // with support for arrays in the job config, we also need to check that each individual name // doesn't include a comma if index names are supplied as an array. // `indexPatterns.validate()` returns a map of messages, we're only interested here if it's valid or not. - // If there are no messages, it means the index pattern is valid. + // If there are no messages, it means the source index name is valid. let sourceIndexNameValid = Object.keys(indexPatterns.validate(sourceIndexName)).length === 0; if (sourceIndexNameValid) { if (typeof sourceIndex === 'string') { diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts index 3c9e394190733c..e7a263520af31f 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/state.ts @@ -220,7 +220,7 @@ export const getJobConfigFromFormState = ( const jobConfig: DeepPartial = { description: formState.description, source: { - // If a Kibana index patterns includes commas, we need to split + // If a Kibana data view name includes commas, we need to split // the into an array of indices to be in the correct format for // the data frame analytics API. index: formState.sourceIndex.includes(',') diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts index 9f629402b86084..18abc9be270be3 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts @@ -124,12 +124,12 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => { }; const createKibanaIndexPattern = async () => { - const indexPatternName = destinationIndex; + const dataViewName = destinationIndex; try { await mlContext.indexPatterns.createAndSave( { - title: indexPatternName, + title: dataViewName, }, false, true @@ -137,10 +137,10 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => { addRequestMessage({ message: i18n.translate( - 'xpack.ml.dataframe.analytics.create.createIndexPatternSuccessMessage', + 'xpack.ml.dataframe.analytics.create.createDataViewSuccessMessage', { - defaultMessage: 'Kibana index pattern {indexPatternName} created.', - values: { indexPatternName }, + defaultMessage: 'Kibana data view {dataViewName} created.', + values: { dataViewName }, } ), }); @@ -148,16 +148,16 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => { if (e instanceof DuplicateDataViewError) { addRequestMessage({ error: i18n.translate( - 'xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessageError', + 'xpack.ml.dataframe.analytics.create.duplicateDataViewErrorMessageError', { - defaultMessage: 'The index pattern {indexPatternName} already exists.', - values: { indexPatternName }, + defaultMessage: 'The data view {dataViewName} already exists.', + values: { dataViewName }, } ), message: i18n.translate( - 'xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessage', + 'xpack.ml.dataframe.analytics.create.duplicateDataViewErrorMessage', { - defaultMessage: 'An error occurred creating the Kibana index pattern:', + defaultMessage: 'An error occurred creating the Kibana data view:', } ), }); @@ -165,9 +165,9 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => { addRequestMessage({ error: extractErrorMessage(e), message: i18n.translate( - 'xpack.ml.dataframe.analytics.create.createIndexPatternErrorMessage', + 'xpack.ml.dataframe.analytics.create.createDataViewErrorMessage', { - defaultMessage: 'An error occurred creating the Kibana index pattern:', + defaultMessage: 'An error occurred creating the Kibana data view:', } ), }); @@ -177,7 +177,7 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => { const prepareFormValidation = async () => { try { - // Set the existing index pattern titles. + // Set the existing data view names. const indexPatternsMap: SourceIndexMap = {}; const savedObjects = (await mlContext.indexPatterns.getCache()) || []; savedObjects.forEach((obj) => { @@ -193,12 +193,9 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => { } catch (e) { addRequestMessage({ error: extractErrorMessage(e), - message: i18n.translate( - 'xpack.ml.dataframe.analytics.create.errorGettingIndexPatternTitles', - { - defaultMessage: 'An error occurred getting the existing index pattern titles:', - } - ), + message: i18n.translate('xpack.ml.dataframe.analytics.create.errorGettingDataViewNames', { + defaultMessage: 'An error occurred getting the existing data view names:', + }), }); } }; diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts index c831c02ade9192..537b2016d9af3c 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/services/analytics_service/delete_analytics.ts @@ -101,9 +101,9 @@ export const deleteAnalyticsAndDestIndex = async ( if (status.destIndexPatternDeleted?.success) { toastNotificationService.displaySuccessToast( i18n.translate( - 'xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternSuccessMessage', + 'xpack.ml.dataframe.analyticsList.deleteAnalyticsWithDataViewSuccessMessage', { - defaultMessage: 'Request to delete index pattern {destinationIndex} acknowledged.', + defaultMessage: 'Request to delete data view {destinationIndex} acknowledged.', values: { destinationIndex }, } ) @@ -112,13 +112,10 @@ export const deleteAnalyticsAndDestIndex = async ( if (status.destIndexPatternDeleted?.error) { const error = extractErrorMessage(status.destIndexPatternDeleted.error); toastNotificationService.displayDangerToast( - i18n.translate( - 'xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternErrorMessage', - { - defaultMessage: 'An error occurred deleting index pattern {destinationIndex}: {error}', - values: { destinationIndex, error }, - } - ) + i18n.translate('xpack.ml.dataframe.analyticsList.deleteAnalyticsWithDataViewErrorMessage', { + defaultMessage: 'An error occurred deleting data view {destinationIndex}: {error}', + values: { destinationIndex, error }, + }) ); } } catch (e) { diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx index 7d77fcc91fa46b..1b961c05b2f308 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx @@ -123,9 +123,9 @@ export const Controls: FC = React.memo( await navigateToPath(path); } else { toasts.addDanger( - i18n.translate('xpack.ml.dataframe.analyticsMap.flyout.indexPatternMissingMessage', { + i18n.translate('xpack.ml.dataframe.analyticsMap.flyout.dataViewMissingMessage', { defaultMessage: - 'To create a job from this index please create an index pattern for {indexTitle}.', + 'To create a job from this index please create a data view for {indexTitle}.', values: { indexTitle: nodeLabel }, }) ); diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx index f9df1b452f4753..608b1ef28a2e06 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx +++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx @@ -141,13 +141,13 @@ export const DatavisualizerSelector: FC = () => { icon={} title={ } description={ } @@ -158,8 +158,8 @@ export const DatavisualizerSelector: FC = () => { data-test-subj="mlDataVisualizerSelectIndexButton" > } diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts index a5fabc12c83df5..0c83402d8ca784 100644 --- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts +++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/data_loader/data_loader.ts @@ -43,7 +43,7 @@ export class DataLoader { editorRuntimeMappings?: RuntimeMappings ): Promise { const stats = await ml.getVisualizerFieldHistograms({ - indexPatternTitle: this._indexPatternTitle, + indexPattern: this._indexPatternTitle, query, fields, samplerShardSize, diff --git a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js index 574c28b664c65f..7d723995e3ac4a 100644 --- a/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js +++ b/x-pack/plugins/ml/public/application/explorer/explorer_charts/explorer_chart_config_builder.js @@ -19,7 +19,7 @@ import { ML_JOB_AGGREGATION } from '../../../../common/constants/aggregation_typ // Builds the chart configuration for the provided anomaly record, returning // an object with properties used for the display (series function and field, aggregation interval etc), -// and properties for the data feed used for the job (index pattern, time field etc). +// and properties for the datafeed used for the job (indices, time field etc). export function buildConfig(record) { const job = mlJobService.getJob(record.job_id); const detectorIndex = record.detector_index; diff --git a/x-pack/plugins/ml/public/application/formatters/kibana_field_format.ts b/x-pack/plugins/ml/public/application/formatters/kibana_field_format.ts index 0218b7d62655c2..e1484c44438d1e 100644 --- a/x-pack/plugins/ml/public/application/formatters/kibana_field_format.ts +++ b/x-pack/plugins/ml/public/application/formatters/kibana_field_format.ts @@ -6,7 +6,7 @@ */ /* - * Formatter which uses the fieldFormat object of a Kibana index pattern + * Formatter which uses the fieldFormat object of a Kibana data view * field to format the value of a field. */ diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap index d14fc6df066933..6533405a0770f6 100644 --- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap +++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/__snapshots__/editor.test.tsx.snap @@ -295,8 +295,8 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti hasEmptyLabelSpace={false} label={ } @@ -309,11 +309,11 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with an enti options={ Array [ Object { - "text": "Index Pattern 1", + "text": "Data view 1", "value": "pattern1", }, Object { - "text": "Index Pattern 2", + "text": "Data view 2", "value": "pattern2", }, ] @@ -535,8 +535,8 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t hasEmptyLabelSpace={false} label={ } @@ -549,11 +549,11 @@ exports[`CustomUrlEditor renders the editor for a discover type URL with valid t options={ Array [ Object { - "text": "Index Pattern 1", + "text": "Data view 1", "value": "pattern1", }, Object { - "text": "Index Pattern 2", + "text": "Data view 2", "value": "pattern2", }, ] diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx index f6769abb610b89..a16825c216e59b 100644 --- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx +++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx @@ -48,8 +48,8 @@ function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: Url ]; const indexPatterns = [ - { id: 'pattern1', title: 'Index Pattern 1' }, - { id: 'pattern2', title: 'Index Pattern 2' }, + { id: 'pattern1', title: 'Data view 1' }, + { id: 'pattern2', title: 'Data view 2' }, ] as IIndexPattern[]; const queryEntityFieldNames = ['airline']; diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx index e22eb1484df2e8..dc7e23f769fbcf 100644 --- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx +++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx @@ -267,8 +267,8 @@ export const CustomUrlEditor: FC = ({ } display="rowCompressed" diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js index 4f4cd0f6ef1c9a..0f12afe36b3886 100644 --- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js +++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js @@ -36,7 +36,7 @@ export function getNewCustomUrlDefaults(job, dashboards, indexPatterns) { urlType = URL_TYPE.KIBANA_DISCOVER; } - // For the Discover option, set the default index pattern to that + // For the Discover option, set the default data view to that // which matches the indices configured in the job datafeed. const datafeedConfig = job.datafeed_config; if ( diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js index 8ce92ffa384798..cca33e5a751e11 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js @@ -103,9 +103,7 @@ export function loadSavedDashboards(maxNumber) { } export function loadIndexPatterns(maxNumber) { - // Loads the list of Kibana index patterns, as used in editing custom URLs. - // TODO - amend loadIndexPatterns in index_utils.js to do the request, - // without needing an Angular Provider. + // Loads the list of Kibana data views, as used in editing custom URLs. return new Promise((resolve, reject) => { const savedObjectsClient = getSavedObjectsClient(); savedObjectsClient diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx index ce93080558016a..86d30d8f1c13f7 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx @@ -109,9 +109,9 @@ class CustomUrlsUI extends Component { console.error('Error loading list of dashboards:', resp); toasts.addDanger( i18n.translate( - 'xpack.ml.jobsList.editJobFlyout.customUrls.loadIndexPatternsErrorNotificationMessage', + 'xpack.ml.jobsList.editJobFlyout.customUrls.loadDataViewsErrorNotificationMessage', { - defaultMessage: 'An error occurred loading the list of saved index patterns', + defaultMessage: 'An error occurred loading the list of saved data views', } ) ); diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js index 2bee4cd1716370..1124052f863671 100644 --- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js +++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js @@ -142,9 +142,9 @@ export function actionsMenuContent( if (!jobIndicesAvailable) { getToastNotifications().addDanger( - i18n.translate('xpack.ml.jobsList.managementActions.noSourceIndexPatternForClone', { + i18n.translate('xpack.ml.jobsList.managementActions.noSourceDataViewForClone', { defaultMessage: - 'Unable to clone the anomaly detection job {jobId}. No index pattern exists for index {indexPatternTitle}.', + 'Unable to clone the anomaly detection job {jobId}. No data view exists for index {indexPatternTitle}.', values: { jobId: item.id, indexPatternTitle }, }) ); diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts index 128a541ff9f960..7aa15e64e1c887 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts +++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/categorization_job_creator.ts @@ -127,7 +127,7 @@ export class CategorizationJobCreator extends JobCreator { this._ccsVersionFailure = this._checkCcsFailure(examples, overallValidStatus, validationChecks); if (this._ccsVersionFailure === true) { - // if the index pattern contains a cross-cluster search, one of the clusters may + // if the data view contains a cross-cluster search, one of the clusters may // be on a version which doesn't support the fields API (e.g. 6.8) // and so the categorization examples endpoint will fail // if this is the case, we need to allow the user to progress in the wizard. diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx index ce71cd80e45c08..2840d4425334cc 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/common/json_editor_flyout/json_editor_flyout.tsx @@ -204,7 +204,7 @@ export const JsonEditorFlyout: FC = ({ isDisabled, jobEditorMode, datafee > diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/time_field/description.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/time_field/description.tsx index bf00b560746bc4..a9109f41ea078b 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/time_field/description.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/datafeed_step/components/time_field/description.tsx @@ -20,7 +20,7 @@ export const Description: FC = memo(({ children }) => { description={ } > diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/invalid_ccs_version_valid_callout.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/invalid_ccs_version_valid_callout.tsx index 112634b83780d2..3bd41166b96b35 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/invalid_ccs_version_valid_callout.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/invalid_ccs_version_valid_callout.tsx @@ -17,7 +17,7 @@ export const InvalidCssVersionCallout: FC = () => { title={i18n.translate( 'xpack.ml.newJob.wizard.pickFieldsStep.invalidCssVersionCallout.title', { - defaultMessage: 'The index pattern appears to be cross-cluster', + defaultMessage: 'The data view appears to be cross-cluster', } )} > diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx index 69eb9e7d306aee..b2611cf1095ac9 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/page.tsx @@ -44,8 +44,8 @@ export const Page: FC = ({ nextStepPath }) => {

@@ -57,7 +57,7 @@ export const Page: FC = ({ nextStepPath }) => { onChoose={onObjectSelection} showFilter noItemsMessage={i18n.translate('xpack.ml.newJob.wizard.searchSelection.notFoundLabel', { - defaultMessage: 'No matching indices or saved searches found.', + defaultMessage: 'No matching data views or saved searches found.', })} savedObjectMetaData={[ { @@ -74,9 +74,9 @@ export const Page: FC = ({ nextStepPath }) => { type: 'index-pattern', getIconForSavedObject: () => 'indexPatternApp', name: i18n.translate( - 'xpack.ml.newJob.wizard.searchSelection.savedObjectType.indexPattern', + 'xpack.ml.newJob.wizard.searchSelection.savedObjectType.dataView', { - defaultMessage: 'Index pattern', + defaultMessage: 'Data view', } ), }, diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx index dd6eb80fee4a05..15ca0b82695ffb 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx @@ -51,19 +51,19 @@ export const Page: FC = () => { const indexWarningTitle = !isTimeBasedIndex && isSavedSearchSavedObject(currentSavedSearch) ? i18n.translate( - 'xpack.ml.newJob.wizard.jobType.indexPatternFromSavedSearchNotTimeBasedMessage', + 'xpack.ml.newJob.wizard.jobType.dataViewFromSavedSearchNotTimeBasedMessage', { defaultMessage: - '{savedSearchTitle} uses index pattern {indexPatternTitle} which is not time based', + '{savedSearchTitle} uses data view {dataViewName} which is not time based', values: { savedSearchTitle: currentSavedSearch.attributes.title as string, - indexPatternTitle: currentIndexPattern.title, + dataViewName: currentIndexPattern.title, }, } ) - : i18n.translate('xpack.ml.newJob.wizard.jobType.indexPatternNotTimeBasedMessage', { - defaultMessage: 'Index pattern {indexPatternTitle} is not time based', - values: { indexPatternTitle: currentIndexPattern.title }, + : i18n.translate('xpack.ml.newJob.wizard.jobType.dataViewNotTimeBasedMessage', { + defaultMessage: 'Data view {dataViewName} is not time based', + values: { dataViewName: currentIndexPattern.title }, }); const pageTitleLabel = isSavedSearchSavedObject(currentSavedSearch) @@ -71,9 +71,9 @@ export const Page: FC = () => { defaultMessage: 'saved search {savedSearchTitle}', values: { savedSearchTitle: currentSavedSearch.attributes.title as string }, }) - : i18n.translate('xpack.ml.newJob.wizard.jobType.indexPatternPageTitleLabel', { - defaultMessage: 'index pattern {indexPatternTitle}', - values: { indexPatternTitle: currentIndexPattern.title }, + : i18n.translate('xpack.ml.newJob.wizard.jobType.dataViewPageTitleLabel', { + defaultMessage: 'data view {dataViewName}', + values: { dataViewName: currentIndexPattern.title }, }); const recognizerResults = { @@ -238,7 +238,7 @@ export const Page: FC = () => { diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx index c5d9acce1ee934..f708ea83f1d0d3 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx @@ -216,9 +216,9 @@ export const Page: FC = ({ existingJobsAndGroups, jobType }) => { diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx index 39ba634ba4d2d5..c24fb2521ea580 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx @@ -41,13 +41,10 @@ export const WizardSteps: FC = ({ currentStep, setCurrentStep }) => { values: { title: mlContext.currentSavedSearch.attributes.title as string }, }); } else if (mlContext.currentIndexPattern.id !== undefined) { - return i18n.translate( - 'xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleIndexPattern', - { - defaultMessage: 'New job from index pattern {title}', - values: { title: mlContext.currentIndexPattern.title }, - } - ); + return i18n.translate('xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleDataView', { + defaultMessage: 'New job from data view {dataViewName}', + values: { dataViewName: mlContext.currentIndexPattern.title }, + }); } return ''; } diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx index 478af8e981b088..dbf9bce64b114e 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx +++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx @@ -101,9 +101,9 @@ export const Page: FC = ({ moduleId, existingGroupIds }) => { defaultMessage: 'saved search {savedSearchTitle}', values: { savedSearchTitle: savedSearch.attributes.title as string }, }) - : i18n.translate('xpack.ml.newJob.recognize.indexPatternPageTitle', { - defaultMessage: 'index pattern {indexPatternTitle}', - values: { indexPatternTitle: indexPattern.title }, + : i18n.translate('xpack.ml.newJob.recognize.dataViewPageTitle', { + defaultMessage: 'data view {dataViewName}', + values: { dataViewName: indexPattern.title }, }); const displayQueryWarning = savedSearch !== null; const tempQuery = savedSearch === null ? undefined : combinedQuery; diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts index 3f19f3137934ed..20f2a382131ede 100644 --- a/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts +++ b/x-pack/plugins/ml/public/application/jobs/new_job/utils/new_job_utils.test.ts @@ -56,7 +56,7 @@ describe('createSearchItems', () => { } as unknown as SavedSearchSavedObject; }); - test('should match index pattern', () => { + test('should match data view', () => { const resp = createSearchItems(kibanaConfig, indexPattern, null); expect(resp).toStrictEqual({ combinedQuery: { bool: { must: [{ match_all: {} }] } }, diff --git a/x-pack/plugins/ml/public/application/services/field_format_service.ts b/x-pack/plugins/ml/public/application/services/field_format_service.ts index 18b489682318e5..05c6acc7262fb8 100644 --- a/x-pack/plugins/ml/public/application/services/field_format_service.ts +++ b/x-pack/plugins/ml/public/application/services/field_format_service.ts @@ -13,23 +13,23 @@ import { IndexPattern } from '../../../../../../src/plugins/data/public'; type FormatsByJobId = Record; type IndexPatternIdsByJob = Record; -// Service for accessing FieldFormat objects configured for a Kibana index pattern +// Service for accessing FieldFormat objects configured for a Kibana data view // for use in formatting the actual and typical values from anomalies. class FieldFormatService { indexPatternIdsByJob: IndexPatternIdsByJob = {}; formatsByJob: FormatsByJobId = {}; // Populate the service with the FieldFormats for the list of jobs with the - // specified IDs. List of Kibana index patterns is passed, with a title - // attribute set in each pattern which will be compared to the index pattern + // specified IDs. List of Kibana data views is passed, with a title + // attribute set in each pattern which will be compared to the indices // configured in the datafeed of each job. // Builds a map of Kibana FieldFormats (plugins/data/common/field_formats) // against detector index by job ID. populateFormats(jobIds: string[]): Promise { return new Promise((resolve, reject) => { - // Populate a map of index pattern IDs against job ID, by finding the ID of the index - // pattern with a title attribute which matches the index configured in the datafeed. - // If a Kibana index pattern has not been created + // Populate a map of data view IDs against job ID, by finding the ID of the data + // view with a title attribute which matches the indices configured in the datafeed. + // If a Kibana data view has not been created // for this index, then no custom field formatting will occur. jobIds.forEach((jobId) => { const jobObj = mlJobService.getJob(jobId); @@ -93,7 +93,7 @@ class FieldFormatService { const indexPatternId = this.indexPatternIdsByJob[jobId]; if (indexPatternId !== undefined) { - // Load the full index pattern configuration to obtain the formats of each field. + // Load the full data view configuration to obtain the formats of each field. getIndexPatternById(indexPatternId) .then((indexPatternData) => { // Store the FieldFormat for each job by detector_index. diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts index 883e5d499c3d43..c5fa06dbfff9e4 100644 --- a/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts +++ b/x-pack/plugins/ml/public/application/services/ml_api_service/index.ts @@ -474,13 +474,13 @@ export function mlApiServicesProvider(httpService: HttpService) { }, getVisualizerFieldHistograms({ - indexPatternTitle, + indexPattern, query, fields, samplerShardSize, runtimeMappings, }: { - indexPatternTitle: string; + indexPattern: string; query: any; fields: FieldHistogramRequestConfig[]; samplerShardSize?: number; @@ -494,7 +494,7 @@ export function mlApiServicesProvider(httpService: HttpService) { }); return httpService.http({ - path: `${basePath()}/data_visualizer/get_field_histograms/${indexPatternTitle}`, + path: `${basePath()}/data_visualizer/get_field_histograms/${indexPattern}`, method: 'POST', body, }); diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts index d3b407c2bb65a8..80137a8c8089e1 100644 --- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts +++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts @@ -15,7 +15,7 @@ export const ANOMALY_DETECTOR = 'anomaly-detector'; export const DATA_FRAME_ANALYTICS = 'data-frame-analytics'; // called in the routing resolve block to initialize the NewJobCapabilites -// service for the corresponding job type with the currently selected index pattern +// service for the corresponding job type with the currently selected data view export function loadNewJobCapabilities( indexPatternId: string, savedSearchId: string, @@ -28,18 +28,18 @@ export function loadNewJobCapabilities( jobType === ANOMALY_DETECTOR ? newJobCapsService : newJobCapsServiceAnalytics; if (indexPatternId !== undefined) { - // index pattern is being used + // data view is being used const indexPattern: IIndexPattern = await indexPatterns.get(indexPatternId); await serviceToUse.initializeFromIndexPattern(indexPattern); resolve(serviceToUse.newJobCaps); } else if (savedSearchId !== undefined) { // saved search is being used - // load the index pattern from the saved search + // load the data view from the saved search const { indexPattern } = await getIndexPatternAndSavedSearch(savedSearchId); if (indexPattern === null) { // eslint-disable-next-line no-console - console.error('Cannot retrieve index pattern from saved search'); + console.error('Cannot retrieve data view from saved search'); reject(); return; } diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts index 9d705c8cd725fb..320846521688af 100644 --- a/x-pack/plugins/ml/public/application/util/index_utils.ts +++ b/x-pack/plugins/ml/public/application/util/index_utils.ts @@ -114,7 +114,7 @@ export function getIndexPatternById(id: string): Promise { return indexPatternsContract.create({}); } } else { - throw new Error('Index patterns are not initialized!'); + throw new Error('Data views are not initialized!'); } } @@ -132,11 +132,11 @@ export function timeBasedIndexCheck(indexPattern: IndexPattern, showNotification if (showNotification) { const toastNotifications = getToastNotifications(); toastNotifications.addWarning({ - title: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle', { - defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', - values: { indexPatternTitle: indexPattern.title }, + title: i18n.translate('xpack.ml.dataViewNotBasedOnTimeSeriesNotificationTitle', { + defaultMessage: 'The data view {dataViewName} is not based on a time series', + values: { dataViewName: indexPattern.title }, }), - text: i18n.translate('xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription', { + text: i18n.translate('xpack.ml.dataViewNotBasedOnTimeSeriesNotificationDescription', { defaultMessage: 'Anomaly detection only runs over time-based indices', }), }); @@ -148,9 +148,9 @@ export function timeBasedIndexCheck(indexPattern: IndexPattern, showNotification } /** - * Returns true if the index pattern contains a : + * Returns true if the data view name contains a : * which means it is cross-cluster */ -export function isCcsIndexPattern(indexPatternTitle: string) { - return indexPatternTitle.includes(':'); +export function isCcsIndexPattern(dataViewName: string) { + return dataViewName.includes(':'); } diff --git a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx index 65d26b844e960e..ab14165f49a221 100644 --- a/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx +++ b/x-pack/plugins/ml/public/embeddables/anomaly_charts/anomaly_charts_embeddable.tsx @@ -65,7 +65,7 @@ export class AnomalyChartsEmbeddable extends Embeddable< // First get list of unique indices from the selected jobs const indices = new Set(jobs.map((j) => j.datafeed_config.indices).flat()); - // Then find the index patterns assuming the index pattern title matches the index name + // Then find the data view assuming the data view title matches the index name const indexPatterns: Record = {}; for (const indexName of indices) { const response = await indexPatternsService.find(`"${indexName}"`); @@ -83,12 +83,12 @@ export class AnomalyChartsEmbeddable extends Embeddable< indexPatterns: Object.values(indexPatterns), }); } catch (e) { - // Unable to find and load index pattern but we can ignore the error + // Unable to find and load data view but we can ignore the error // as we only load it to support the filter & query bar // the visualizations should still work correctly // eslint-disable-next-line no-console - console.error(`Unable to load index patterns for ${jobIds}`, e); + console.error(`Unable to load data views for ${jobIds}`, e); } } diff --git a/x-pack/plugins/ml/public/locator/ml_locator.test.ts b/x-pack/plugins/ml/public/locator/ml_locator.test.ts index 3b736a9af4e3e0..4f0aa933857023 100644 --- a/x-pack/plugins/ml/public/locator/ml_locator.test.ts +++ b/x-pack/plugins/ml/public/locator/ml_locator.test.ts @@ -290,7 +290,7 @@ describe('MlUrlGenerator', () => { }); }); - it('should generate valid URL for the Index Data Visualizer select index pattern or saved search page', async () => { + it('should generate valid URL for the Index Data Visualizer select data view or saved search page', async () => { const location = await definition.getLocation({ page: ML_PAGES.DATA_VISUALIZER_INDEX_SELECT, }); diff --git a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts index f9c609803217e4..89dd992f0232ac 100644 --- a/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts +++ b/x-pack/plugins/ml/server/models/data_recognizer/data_recognizer.ts @@ -463,21 +463,21 @@ export class DataRecognizer { this._indexPatternId = await this._getIndexPatternId(this._indexPatternName); // the module's jobs contain custom URLs which require an index patten id - // but there is no corresponding index pattern, throw an error + // but there is no corresponding data view, throw an error if (this._indexPatternId === undefined && this._doJobUrlsContainIndexPatternId(moduleConfig)) { throw Boom.badRequest( - `Module's jobs contain custom URLs which require a kibana index pattern (${this._indexPatternName}) which cannot be found.` + `Module's jobs contain custom URLs which require a Kibana data view (${this._indexPatternName}) which cannot be found.` ); } // the module's saved objects require an index patten id - // but there is no corresponding index pattern, throw an error + // but there is no corresponding data view, throw an error if ( this._indexPatternId === undefined && this._doSavedObjectsContainIndexPatternId(moduleConfig) ) { throw Boom.badRequest( - `Module's saved objects contain custom URLs which require a kibana index pattern (${this._indexPatternName}) which cannot be found.` + `Module's saved objects contain custom URLs which require a Kibana data view (${this._indexPatternName}) which cannot be found.` ); } @@ -622,7 +622,7 @@ export class DataRecognizer { }); } - // returns a id based on an index pattern name + // returns a id based on a data viewn name private async _getIndexPatternId(name: string) { try { const indexPatterns = await this._loadIndexPatterns(); @@ -632,7 +632,7 @@ export class DataRecognizer { const ip = indexPatterns.saved_objects.find((i) => i.attributes.title === name); return ip !== undefined ? ip.id : undefined; } catch (error) { - mlLog.warn(`Error loading index patterns, ${error}`); + mlLog.warn(`Error loading data views, ${error}`); return; } } diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts index e58b849cddfaca..5d841ce5d94d0b 100644 --- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts +++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts @@ -180,7 +180,7 @@ type BatchStats = const getAggIntervals = async ( { asCurrentUser }: IScopedClusterClient, - indexPatternTitle: string, + indexPattern: string, query: any, fields: HistogramField[], samplerShardSize: number, @@ -205,7 +205,7 @@ const getAggIntervals = async ( }, {} as Record); const { body } = await asCurrentUser.search({ - index: indexPatternTitle, + index: indexPattern, size: 0, body: { query, @@ -239,7 +239,7 @@ const getAggIntervals = async ( // export for re-use by transforms plugin export const getHistogramsForFields = async ( client: IScopedClusterClient, - indexPatternTitle: string, + indexPattern: string, query: any, fields: HistogramField[], samplerShardSize: number, @@ -248,7 +248,7 @@ export const getHistogramsForFields = async ( const { asCurrentUser } = client; const aggIntervals = await getAggIntervals( client, - indexPatternTitle, + indexPattern, query, fields, samplerShardSize, @@ -291,7 +291,7 @@ export const getHistogramsForFields = async ( } const { body } = await asCurrentUser.search({ - index: indexPatternTitle, + index: indexPattern, size: 0, body: { query, @@ -446,7 +446,7 @@ export class DataVisualizer { // returned array depend on the type of the field (keyword, number, date etc). // Sampling will be used if supplied samplerShardSize > 0. async getHistogramsForFields( - indexPatternTitle: string, + indexPattern: string, query: any, fields: HistogramField[], samplerShardSize: number, @@ -454,7 +454,7 @@ export class DataVisualizer { ): Promise { return await getHistogramsForFields( this._client, - indexPatternTitle, + indexPattern, query, fields, samplerShardSize, diff --git a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts index bedc70566a62f0..1d9fb838356c92 100644 --- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts +++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts @@ -418,7 +418,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout } } - // Delete the index pattern if there's an index pattern that matches the name of dest index + // Delete the data view if there's a data view that matches the name of dest index if (destinationIndex && deleteDestIndexPattern) { try { const indexPatternId = await getIndexPatternId(context, destinationIndex); @@ -701,7 +701,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout /** * @apiGroup DataFrameAnalytics * - * @api {get} api/data_frame/analytics/fields/:indexPattern Get index pattern fields for analytics + * @api {get} api/data_frame/analytics/fields/:indexPattern Get fields for a pattern of indices used for analytics * @apiName AnalyticsNewJobCaps * @apiDescription Retrieve the index fields for analytics */ diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts index 39cbb3e9d35f66..fa84779ace71b5 100644 --- a/x-pack/plugins/ml/server/routes/data_visualizer.ts +++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts @@ -11,27 +11,21 @@ import { DataVisualizer } from '../models/data_visualizer'; import { HistogramField } from '../models/data_visualizer/data_visualizer'; import { dataVisualizerFieldHistogramsSchema, - indexPatternTitleSchema, + indexPatternSchema, } from './schemas/data_visualizer_schema'; import { RouteInitialization } from '../types'; import { RuntimeMappings } from '../../common/types/fields'; function getHistogramsForFields( client: IScopedClusterClient, - indexPatternTitle: string, + indexPattern: string, query: any, fields: HistogramField[], samplerShardSize: number, runtimeMappings: RuntimeMappings ) { const dv = new DataVisualizer(client); - return dv.getHistogramsForFields( - indexPatternTitle, - query, - fields, - samplerShardSize, - runtimeMappings - ); + return dv.getHistogramsForFields(indexPattern, query, fields, samplerShardSize, runtimeMappings); } /** @@ -41,20 +35,20 @@ export function dataVisualizerRoutes({ router, routeGuard }: RouteInitialization /** * @apiGroup DataVisualizer * - * @api {post} /api/ml/data_visualizer/get_field_histograms/:indexPatternTitle Get histograms for fields + * @api {post} /api/ml/data_visualizer/get_field_histograms/:indexPattern Get histograms for fields * @apiName GetHistogramsForFields * @apiDescription Returns the histograms on a list fields in the specified index pattern. * - * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (params) indexPatternSchema * @apiSchema (body) dataVisualizerFieldHistogramsSchema * * @apiSuccess {Object} fieldName histograms by field, keyed on the name of the field. */ router.post( { - path: '/api/ml/data_visualizer/get_field_histograms/{indexPatternTitle}', + path: '/api/ml/data_visualizer/get_field_histograms/{indexPattern}', validate: { - params: indexPatternTitleSchema, + params: indexPatternSchema, body: dataVisualizerFieldHistogramsSchema, }, options: { @@ -64,13 +58,13 @@ export function dataVisualizerRoutes({ router, routeGuard }: RouteInitialization routeGuard.basicLicenseAPIGuard(async ({ client, request, response }) => { try { const { - params: { indexPatternTitle }, + params: { indexPattern }, body: { query, fields, samplerShardSize, runtimeMappings }, } = request; const results = await getHistogramsForFields( client, - indexPatternTitle, + indexPattern, query, fields, samplerShardSize, diff --git a/x-pack/plugins/ml/server/routes/schemas/data_visualizer_schema.ts b/x-pack/plugins/ml/server/routes/schemas/data_visualizer_schema.ts index 50b48aad9cee41..37ed15a41c4a57 100644 --- a/x-pack/plugins/ml/server/routes/schemas/data_visualizer_schema.ts +++ b/x-pack/plugins/ml/server/routes/schemas/data_visualizer_schema.ts @@ -8,9 +8,9 @@ import { schema } from '@kbn/config-schema'; import { runtimeMappingsSchema } from './runtime_mappings_schema'; -export const indexPatternTitleSchema = schema.object({ - /** Title of the index pattern for which to return stats. */ - indexPatternTitle: schema.string(), +export const indexPatternSchema = schema.object({ + /** Pattern of index or indices for which to return stats. */ + indexPattern: schema.string(), }); export const dataVisualizerFieldHistogramsSchema = schema.object({ diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 06e3229df56840..84df024fef0e14 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -15321,7 +15321,6 @@ "xpack.ml.customUrlEditorList.urlLabel": "URL", "xpack.ml.customUrlsEditor.createNewCustomUrlTitle": "新規カスタム URL の作成", "xpack.ml.customUrlsEditor.dashboardNameLabel": "ダッシュボード名", - "xpack.ml.customUrlsEditor.indexPatternLabel": "インデックスパターン", "xpack.ml.customUrlsEditor.intervalLabel": "間隔", "xpack.ml.customUrlsEditor.invalidLabelErrorMessage": "固有のラベルが供給されました", "xpack.ml.customUrlsEditor.labelLabel": "ラベル", @@ -15438,9 +15437,6 @@ "xpack.ml.dataframe.analytics.create.configDetails.sourceIndex": "ソースインデックス", "xpack.ml.dataframe.analytics.create.configDetails.standardizationEnabled": "標準化が有効です", "xpack.ml.dataframe.analytics.create.configDetails.trainingPercent": "トレーニングパーセンテージ", - "xpack.ml.dataframe.analytics.create.createIndexPatternErrorMessage": "Kibanaインデックスパターンの作成中にエラーが発生しました。", - "xpack.ml.dataframe.analytics.create.createIndexPatternLabel": "インデックスパターンを作成", - "xpack.ml.dataframe.analytics.create.createIndexPatternSuccessMessage": "Kibanaインデックスパターン{indexPatternName}が作成されました。", "xpack.ml.dataframe.analytics.create.dependentVariableClassificationPlaceholder": "予測する数値、カテゴリ、ブール値フィールドを選択します。", "xpack.ml.dataframe.analytics.create.dependentVariableInputAriaLabel": "従属変数として使用するフィールドを入力してください。", "xpack.ml.dataframe.analytics.create.dependentVariableLabel": "従属変数", @@ -15457,12 +15453,9 @@ "xpack.ml.dataframe.analytics.create.downsampleFactorInputAriaLabel": "ツリー学習の損失関数の導関数を計算するために使用されるデータの比率。", "xpack.ml.dataframe.analytics.create.downsampleFactorLabel": "ダウンサンプリング係数", "xpack.ml.dataframe.analytics.create.downsampleFactorText": "ツリー学習の損失関数の導関数を計算するために使用されるデータの比率。0～1の範囲でなければなりません。", - "xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessage": "Kibanaインデックスパターンの作成中にエラーが発生しました。", - "xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessageError": "インデックスパターン{indexPatternName}はすでに作成されています。", "xpack.ml.dataframe.analytics.create.errorCheckingIndexExists": "既存のインデックス名の取得中に次のエラーが発生しました：{error}", "xpack.ml.dataframe.analytics.create.errorCheckingJobIdExists": "ジョブIDが存在するかどうかの確認中に次のエラーが発生しました。{error}", "xpack.ml.dataframe.analytics.create.errorCreatingDataFrameAnalyticsJob": "データフレーム分析ジョブの作成中にエラーが発生しました。", - "xpack.ml.dataframe.analytics.create.errorGettingIndexPatternTitles": "既存のインデックスパターンのタイトルの取得中にエラーが発生しました。", "xpack.ml.dataframe.analytics.create.errorStartingDataFrameAnalyticsJob": "データフレーム分析ジョブの開始中にエラーが発生しました。", "xpack.ml.dataframe.analytics.create.etaGrowthRatePerTreeInputAriaLabel": "フォレストに追加される新しい各ツリーのetaが増加する比率。", "xpack.ml.dataframe.analytics.create.etaGrowthRatePerTreeLabel": "ツリー単位のeta成長率", @@ -15481,8 +15474,6 @@ "xpack.ml.dataframe.analytics.create.hyperParametersDetailsTitle": "ハイパーパラメータ", "xpack.ml.dataframe.analytics.create.hyperParametersSectionTitle": "ハイパーパラメータ", "xpack.ml.dataframe.analytics.create.includedFieldsLabel": "含まれるフィールド", - "xpack.ml.dataframe.analytics.create.indexPatternAlreadyExistsError": "このタイトルのインデックスパターンがすでに存在します。", - "xpack.ml.dataframe.analytics.create.indexPatternExistsError": "このタイトルのインデックスパターンがすでに存在します。", "xpack.ml.dataframe.analytics.create.isIncludedOption": "含まれる", "xpack.ml.dataframe.analytics.create.isNotIncludedOption": "含まれない", "xpack.ml.dataframe.analytics.create.jobDescription.helpText": "オプションの説明テキストです", @@ -15544,12 +15535,10 @@ "xpack.ml.dataframe.analytics.create.savedSearchLabel": "保存検索", "xpack.ml.dataframe.analytics.create.scatterplotMatrixLabel": "散布図マトリックス", "xpack.ml.dataframe.analytics.create.scatterplotMatrixLabelHelpText": "選択した含まれるフィールドのペアの間の関係を可視化します。", - "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutBody": "保存された検索'{savedSearchTitle}'はインデックスパターン'{indexPatternTitle}'を使用します。", "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutTitle": "クラスター横断検索を使用するインデックスパターンはサポートされていません。", "xpack.ml.dataFrame.analytics.create.searchSelection.notFoundLabel": "一致インデックスまたは保存した検索が見つかりません。", "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.indexPattern": "インデックスパターン", "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.search": "保存検索", - "xpack.ml.dataframe.analytics.create.shouldCreateIndexPatternMessage": "ディスティネーションインデックスのインデックスパターンが作成されていない場合は、ジョブ結果を表示できないことがあります。", "xpack.ml.dataframe.analytics.create.softTreeDepthLimitInputAriaLabel": "この深さを超える決定木は、損失計算でペナルティがあります。", "xpack.ml.dataframe.analytics.create.softTreeDepthLimitLabel": "ソフトツリー深さ上限値", "xpack.ml.dataframe.analytics.create.softTreeDepthLimitText": "この深さを超える決定木は、損失計算でペナルティがあります。0以上でなければなりません。", @@ -15601,7 +15590,6 @@ "xpack.ml.dataframe.analytics.creation.createStepTitle": "作成", "xpack.ml.dataframe.analytics.creation.detailsStepTitle": "ジョブの詳細", "xpack.ml.dataframe.analytics.creation.validationStepTitle": "検証", - "xpack.ml.dataframe.analytics.creationPageSourceIndexTitle": "ソースインデックスパターン：{indexTitle}", "xpack.ml.dataframe.analytics.creationPageTitle": "ジョブを作成", "xpack.ml.dataframe.analytics.decisionPathFeatureBaselineTitle": "ベースライン", "xpack.ml.dataframe.analytics.decisionPathFeatureOtherTitle": "その他", @@ -15646,8 +15634,6 @@ "xpack.ml.dataframe.analytics.explorationResults.regressionDecisionPathDataMissingCallout": "決定パスデータがありません。", "xpack.ml.dataframe.analytics.explorationResults.testingSubsetLabel": "テスト", "xpack.ml.dataframe.analytics.explorationResults.trainingSubsetLabel": "トレーニング", - "xpack.ml.dataframe.analytics.indexPatternPromptLinkText": "インデックスパターンを作成します", - "xpack.ml.dataframe.analytics.indexPatternPromptMessage": "{destIndex}のインデックス{destIndex}. {linkToIndexPatternManagement}にはインデックスパターンが存在しません。", "xpack.ml.dataframe.analytics.jobCaps.errorTitle": "結果を取得できません。インデックスのフィールドデータの読み込み中にエラーが発生しました。", "xpack.ml.dataframe.analytics.jobConfig.errorTitle": "結果を取得できません。ジョブ構成データの読み込み中にエラーが発生しました。", "xpack.ml.dataframe.analytics.outlierExploration.legacyFeatureInfluenceFormatCalloutTitle": "結果のインデックスはサポートされていないレガシー形式を使用しているため、特徴量の影響度に基づく色分けされた表のセルは使用できません。ジョブを複製して再実行してください。", @@ -15668,7 +15654,6 @@ "xpack.ml.dataframe.analytics.regressionExploration.tableJobIdTitle": "回帰ジョブID {jobId}のデスティネーションインデックス", "xpack.ml.dataframe.analytics.regressionExploration.trainingErrorTitle": "トレーニングエラー", "xpack.ml.dataframe.analytics.regressionExploration.trainingFilterText": ".テストデータをフィルタリングしています。", - "xpack.ml.dataframe.analytics.results.indexPatternsMissingErrorMessage": "このページを表示するには、この分析ジョブのターゲットまたはソースインデックスの Kibana インデックスパターンが必要です。", "xpack.ml.dataframe.analytics.rocChartSpec.xAxisTitle": "誤検出率（FPR）", "xpack.ml.dataframe.analytics.rocChartSpec.yAxisTitle": "検出率（TRP）（Recall）", "xpack.ml.dataframe.analytics.rocCurveAuc": "このプロットでは、曲線（AUC）値の下の領域を計算できます。これは0～1の数値です。1に近いほど、アルゴリズムのパフォーマンスが高くなります。", @@ -15689,14 +15674,11 @@ "xpack.ml.dataframe.analyticsList.deleteAnalyticsPrivilegeErrorMessage": "ユーザーはインデックス{indexName}を削除する権限がありません。{error}", "xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage": "データフレーム分析ジョブ{analyticsId}の削除リクエストが受け付けられました。", "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexErrorMessage": "ディスティネーションインデックス{destinationIndex}の削除中にエラーが発生しました", - "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternErrorMessage": "インデックスパターン{destinationIndex}の削除中にエラーが発生しました。{error}", - "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternSuccessMessage": "インデックスパターン{destinationIndex}を削除する要求が確認されました。", "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexSuccessMessage": "ディスティネーションインデックス{destinationIndex}を削除する要求が確認されました。", "xpack.ml.dataframe.analyticsList.deleteDestinationIndexTitle": "ディスティネーションインデックス{indexName}を削除", "xpack.ml.dataframe.analyticsList.deleteModalCancelButton": "キャンセル", "xpack.ml.dataframe.analyticsList.deleteModalDeleteButton": "削除", "xpack.ml.dataframe.analyticsList.deleteModalTitle": "{analyticsId}を削除しますか？", - "xpack.ml.dataframe.analyticsList.deleteTargetIndexPatternTitle": "インデックスパターン{indexPattern}の削除", "xpack.ml.dataframe.analyticsList.description": "説明", "xpack.ml.dataframe.analyticsList.destinationIndex": "デスティネーションインデックス", "xpack.ml.dataframe.analyticsList.editActionNameText": "編集", @@ -15722,7 +15704,6 @@ "xpack.ml.dataFrame.analyticsList.emptyPromptButtonText": "ジョブを作成", "xpack.ml.dataFrame.analyticsList.emptyPromptTitle": "最初のデータフレーム分析ジョブを作成", "xpack.ml.dataFrame.analyticsList.errorPromptTitle": "データフレーム分析リストの取得中にエラーが発生しました。", - "xpack.ml.dataframe.analyticsList.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage": "インデックスパターン{indexPattern}が存在するかどうかを確認するときにエラーが発生しました。{error}", "xpack.ml.dataframe.analyticsList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "ユーザーが{destinationIndex}を削除できるかどうかを確認するときにエラーが発生しました。{error}", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.analysisStats": "分析統計情報", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.phase": "フェーズ", @@ -15730,7 +15711,6 @@ "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.state": "ステータス", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.stats": "統計", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettingsLabel": "ジョブの詳細", - "xpack.ml.dataframe.analyticsList.fetchSourceIndexPatternForCloneErrorMessage": "インデックスパターン{indexPattern}が存在するかどうかを確認するときにエラーが発生しました。{error}", "xpack.ml.dataframe.analyticsList.forceStopModalBody": "{analyticsId}は失敗状態です。ジョブを停止して、エラーを修正する必要があります。", "xpack.ml.dataframe.analyticsList.forceStopModalCancelButton": "キャンセル", "xpack.ml.dataframe.analyticsList.forceStopModalStartButton": "強制停止", @@ -15739,7 +15719,6 @@ "xpack.ml.dataframe.analyticsList.mapActionDisabledTooltipContent": "不明な分析タイプです。", "xpack.ml.dataframe.analyticsList.mapActionName": "マップ", "xpack.ml.dataframe.analyticsList.memoryStatus": "メモリー状態", - "xpack.ml.dataframe.analyticsList.noSourceIndexPatternForClone": "分析ジョブを複製できません。インデックス{indexPattern}のインデックスパターンが存在しません。", "xpack.ml.dataframe.analyticsList.progress": "進捗", "xpack.ml.dataframe.analyticsList.progressOfPhase": "フェーズ{currentPhase}の進捗：{progress}%", "xpack.ml.dataframe.analyticsList.refreshButtonLabel": "更新", @@ -15777,7 +15756,6 @@ "xpack.ml.dataframe.analyticsMap.flyout.createJobButton": "このインデックスからジョブを作成", "xpack.ml.dataframe.analyticsMap.flyout.deleteJobButton": "ジョブを削除します", "xpack.ml.dataframe.analyticsMap.flyout.fetchRelatedNodesButton": "関連するノードを取得", - "xpack.ml.dataframe.analyticsMap.flyout.indexPatternMissingMessage": "このインデックスからジョブを作成するには、{indexTitle} のインデックスパターンを作成してください。", "xpack.ml.dataframe.analyticsMap.flyout.nodeActionsButton": "ノードアクション", "xpack.ml.dataframe.analyticsMap.flyoutHeaderTitle": "{type} {id} の詳細", "xpack.ml.dataframe.analyticsMap.legend.analyticsJobLabel": "分析ジョブ", @@ -15816,9 +15794,6 @@ "xpack.ml.datavisualizer.selector.dataVisualizerTitle": "データビジュアライザー", "xpack.ml.datavisualizer.selector.importDataDescription": "ログファイルからデータをインポートします。最大{maxFileSize}のファイルをアップロードできます。", "xpack.ml.datavisualizer.selector.importDataTitle": "データのインポート", - "xpack.ml.datavisualizer.selector.selectIndexButtonLabel": "インデックスパターンを選択", - "xpack.ml.datavisualizer.selector.selectIndexPatternDescription": "既存の Elasticsearch インデックスのデータを可視化します。", - "xpack.ml.datavisualizer.selector.selectIndexPatternTitle": "インデックスパターンの選択", "xpack.ml.datavisualizer.selector.startTrialButtonLabel": "トライアルを開始", "xpack.ml.datavisualizer.selector.startTrialTitle": "トライアルを開始", "xpack.ml.datavisualizer.selector.uploadFileButtonLabel": "ファイルを選択", @@ -15979,7 +15954,6 @@ "xpack.ml.formatters.metricChangeDescription.unusuallyLowDescription": "異常に低い", "xpack.ml.formatters.metricChangeDescription.unusualValuesDescription": "異常な値", "xpack.ml.fullTimeRangeSelector.errorSettingTimeRangeNotification": "時間範囲の設定中にエラーが発生しました。", - "xpack.ml.fullTimeRangeSelector.useFullDataButtonLabel": "完全な {indexPatternTitle} データを使用", "xpack.ml.helpPopover.ariaLabel": "ヘルプ", "xpack.ml.importExport.exportButton": "ジョブのエクスポート", "xpack.ml.importExport.exportFlyout.adJobsError": "異常検知ジョブを読み込めませんでした", @@ -16025,8 +15999,6 @@ "xpack.ml.indexDatavisualizer.actionsPanel.anomalyDetectionTitle": "高度な異常検知", "xpack.ml.indexDatavisualizer.actionsPanel.dataframeDescription": "異常値検出、回帰分析、分類分析を作成します。", "xpack.ml.indexDatavisualizer.actionsPanel.dataframeTitle": "データフレーム分析", - "xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription": "異常検知は時間ベースのインデックスでのみ実行されます", - "xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle": "インデックスパターン {indexPatternTitle} は時系列に基づくものではありません", "xpack.ml.inference.modelsList.analyticsMapActionLabel": "分析マップ", "xpack.ml.influencerResultType.description": "時間範囲で最も異常なエンティティ。", "xpack.ml.influencerResultType.title": "影響因子", @@ -16161,7 +16133,6 @@ "xpack.ml.jobsList.editJobFlyout.customUrls.buildUrlErrorNotificationMessage": "提供された設定からテスト用のカスタム URL を作成中にエラーが発生しました", "xpack.ml.jobsList.editJobFlyout.customUrls.closeEditorAriaLabel": "カスタム URL エディターを閉じる", "xpack.ml.jobsList.editJobFlyout.customUrls.getTestUrlErrorNotificationMessage": "構成をテストするための URL の取得中にエラーが発生しました", - "xpack.ml.jobsList.editJobFlyout.customUrls.loadIndexPatternsErrorNotificationMessage": "保存されたインデックスパターンのリストの読み込み中にエラーが発生しました", "xpack.ml.jobsList.editJobFlyout.customUrls.loadSavedDashboardsErrorNotificationMessage": "保存された Kibana ダッシュボードのリストの読み込み中にエラーが発生しました", "xpack.ml.jobsList.editJobFlyout.customUrls.testButtonLabel": "テスト", "xpack.ml.jobsList.editJobFlyout.customUrlsTitle": "カスタムURL", @@ -16254,7 +16225,6 @@ "xpack.ml.jobsList.managementActions.deleteJobLabel": "ジョブを削除します", "xpack.ml.jobsList.managementActions.editJobDescription": "ジョブを編集します", "xpack.ml.jobsList.managementActions.editJobLabel": "ジョブを編集します", - "xpack.ml.jobsList.managementActions.noSourceIndexPatternForClone": "異常検知ジョブ{jobId}を複製できません。インデックス{indexPatternTitle}のインデックスパターンが存在しません。", "xpack.ml.jobsList.managementActions.resetJobDescription": "ジョブをリセット", "xpack.ml.jobsList.managementActions.resetJobLabel": "ジョブをリセット", "xpack.ml.jobsList.managementActions.startDatafeedDescription": "データフィードを開始します", @@ -16496,7 +16466,6 @@ "xpack.ml.navMenu.overviewTabLinkText": "概要", "xpack.ml.navMenu.settingsTabLinkText": "設定", "xpack.ml.newJob.page.createJob": "ジョブを作成", - "xpack.ml.newJob.page.createJob.indexPatternTitle": "インデックスパターン{index}の使用", "xpack.ml.newJob.recognize.advancedLabel": "高度な設定", "xpack.ml.newJob.recognize.advancedSettingsAriaLabel": "高度な設定", "xpack.ml.newJob.recognize.alreadyExistsLabel": "（すでに存在します）", @@ -16506,7 +16475,6 @@ "xpack.ml.newJob.recognize.datafeed.savedAriaLabel": "保存されました", "xpack.ml.newJob.recognize.datafeed.saveFailedAriaLabel": "保存に失敗", "xpack.ml.newJob.recognize.datafeedLabel": "データフィード", - "xpack.ml.newJob.recognize.indexPatternPageTitle": "インデックスパターン {indexPatternTitle}", "xpack.ml.newJob.recognize.job.overrideJobConfigurationLabel": "ジョブの構成を上書き", "xpack.ml.newJob.recognize.job.savedAriaLabel": "保存されました", "xpack.ml.newJob.recognize.job.saveFailedAriaLabel": "保存に失敗", @@ -16618,9 +16586,6 @@ "xpack.ml.newJob.wizard.jobType.dataVisualizerDescription": "機械学習により、データのより詳しい特徴や、分析するフィールドを把握できます。", "xpack.ml.newJob.wizard.jobType.dataVisualizerTitle": "データビジュアライザー", "xpack.ml.newJob.wizard.jobType.howToRunAnomalyDetectionDescription": "異常検知は時間ベースのインデックスのみに実行できます。", - "xpack.ml.newJob.wizard.jobType.indexPatternFromSavedSearchNotTimeBasedMessage": "{savedSearchTitle} は時間ベースではないインデックスパターン {indexPatternTitle} を使用します", - "xpack.ml.newJob.wizard.jobType.indexPatternNotTimeBasedMessage": "インデックスパターン {indexPatternTitle} は時間ベースではありません", - "xpack.ml.newJob.wizard.jobType.indexPatternPageTitleLabel": "インデックスパターン {indexPatternTitle}", "xpack.ml.newJob.wizard.jobType.learnMoreAboutDataDescription": "作成するジョブのタイプがわからない場合は、まず初めにデータのフィールドとメトリックを見てみましょう。", "xpack.ml.newJob.wizard.jobType.learnMoreAboutDataTitle": "データに関する詳細", "xpack.ml.newJob.wizard.jobType.multiMetricAriaLabel": "マルチメトリックジョブ", @@ -16753,9 +16718,7 @@ "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.warningCallout.contents": "{date}後のすべての異常検知結果は削除されます。", "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.warningCallout.title": "異常値データが削除されます", "xpack.ml.newJob.wizard.searchSelection.notFoundLabel": "一致インデックスまたは保存した検索が見つかりません。", - "xpack.ml.newJob.wizard.searchSelection.savedObjectType.indexPattern": "インデックスパターン", "xpack.ml.newJob.wizard.searchSelection.savedObjectType.search": "保存検索", - "xpack.ml.newJob.wizard.selectIndexPatternOrSavedSearch": "インデックスパターンまたは保存検索を選択してください", "xpack.ml.newJob.wizard.step.configureDatafeedTitle": "データフィードの構成", "xpack.ml.newJob.wizard.step.jobDetailsTitle": "ジョブの詳細", "xpack.ml.newJob.wizard.step.pickFieldsTitle": "フィールドの選択", @@ -16765,7 +16728,6 @@ "xpack.ml.newJob.wizard.stepComponentWrapper.configureDatafeedTitle": "データフィードの構成", "xpack.ml.newJob.wizard.stepComponentWrapper.jobDetailsTitle": "ジョブの詳細", "xpack.ml.newJob.wizard.stepComponentWrapper.pickFieldsTitle": "フィールドの選択", - "xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleIndexPattern": "インデックスパターン {title} からの新規ジョブ", "xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleSavedSearch": "保存された検索 {title} からの新規ジョブ", "xpack.ml.newJob.wizard.stepComponentWrapper.timeRangeTitle": "時間範囲", "xpack.ml.newJob.wizard.stepComponentWrapper.validationTitle": "検証", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 9aa794b0d22aea..d5563237ecdd05 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -15522,7 +15522,6 @@ "xpack.ml.customUrlEditorList.urlLabel": "URL", "xpack.ml.customUrlsEditor.createNewCustomUrlTitle": "新建定制 URL", "xpack.ml.customUrlsEditor.dashboardNameLabel": "仪表板名称", - "xpack.ml.customUrlsEditor.indexPatternLabel": "索引模式", "xpack.ml.customUrlsEditor.intervalLabel": "时间间隔", "xpack.ml.customUrlsEditor.invalidLabelErrorMessage": "必须提供唯一的标签", "xpack.ml.customUrlsEditor.labelLabel": "标签", @@ -15640,9 +15639,6 @@ "xpack.ml.dataframe.analytics.create.configDetails.sourceIndex": "源索引", "xpack.ml.dataframe.analytics.create.configDetails.standardizationEnabled": "标准化已启用", "xpack.ml.dataframe.analytics.create.configDetails.trainingPercent": "训练百分比", - "xpack.ml.dataframe.analytics.create.createIndexPatternErrorMessage": "创建 Kibana 索引模式时发生错误：", - "xpack.ml.dataframe.analytics.create.createIndexPatternLabel": "创建索引模式", - "xpack.ml.dataframe.analytics.create.createIndexPatternSuccessMessage": "Kibana 索引模式 {indexPatternName} 已创建。", "xpack.ml.dataframe.analytics.create.dependentVariableClassificationPlaceholder": "选择要预测的数值、类别或布尔值字段。", "xpack.ml.dataframe.analytics.create.dependentVariableInputAriaLabel": "输入要用作因变量的字段。", "xpack.ml.dataframe.analytics.create.dependentVariableLabel": "因变量", @@ -15659,12 +15655,9 @@ "xpack.ml.dataframe.analytics.create.downsampleFactorInputAriaLabel": "用于为树训练计算损失函数导数的数据比例。", "xpack.ml.dataframe.analytics.create.downsampleFactorLabel": "降采样因子", "xpack.ml.dataframe.analytics.create.downsampleFactorText": "用于为树训练计算损失函数导数的数据比例。必须介于 0 和 1 之间。", - "xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessage": "创建 Kibana 索引模式时发生错误：", - "xpack.ml.dataframe.analytics.create.duplicateIndexPatternErrorMessageError": "索引模式 {indexPatternName} 已存在。", "xpack.ml.dataframe.analytics.create.errorCheckingIndexExists": "获取现有索引名称时发生以下错误：{error}", "xpack.ml.dataframe.analytics.create.errorCheckingJobIdExists": "检查作业 ID 是否存在时发生以下错误：{error}", "xpack.ml.dataframe.analytics.create.errorCreatingDataFrameAnalyticsJob": "创建数据帧分析作业时发生错误：", - "xpack.ml.dataframe.analytics.create.errorGettingIndexPatternTitles": "获取现有索引模式标题时发生错误：", "xpack.ml.dataframe.analytics.create.errorStartingDataFrameAnalyticsJob": "启动数据帧分析作业时发生错误：", "xpack.ml.dataframe.analytics.create.etaGrowthRatePerTreeInputAriaLabel": "添加到林的每个新树的 eta 增加速率。", "xpack.ml.dataframe.analytics.create.etaGrowthRatePerTreeLabel": "每个树的 Eta 增长率", @@ -15684,8 +15677,6 @@ "xpack.ml.dataframe.analytics.create.hyperParametersSectionTitle": "超参数", "xpack.ml.dataframe.analytics.create.includedFieldsCount": "分析中包括了{numFields, plural, other {# 个字段}}", "xpack.ml.dataframe.analytics.create.includedFieldsLabel": "已包括字段", - "xpack.ml.dataframe.analytics.create.indexPatternAlreadyExistsError": "具有此名称的索引模式已存在。", - "xpack.ml.dataframe.analytics.create.indexPatternExistsError": "具有此名称的索引模式已存在。", "xpack.ml.dataframe.analytics.create.isIncludedOption": "已包括", "xpack.ml.dataframe.analytics.create.isNotIncludedOption": "未包括", "xpack.ml.dataframe.analytics.create.jobDescription.helpText": "可选的描述文本", @@ -15748,12 +15739,10 @@ "xpack.ml.dataframe.analytics.create.savedSearchLabel": "已保存搜索", "xpack.ml.dataframe.analytics.create.scatterplotMatrixLabel": "散点图矩阵", "xpack.ml.dataframe.analytics.create.scatterplotMatrixLabelHelpText": "可视化选定包括字段对之间的关系。", - "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutBody": "已保存搜索“{savedSearchTitle}”使用索引模式“{indexPatternTitle}”。", "xpack.ml.dataFrame.analytics.create.searchSelection.CcsErrorCallOutTitle": "不支持使用跨集群搜索的索引模式。", "xpack.ml.dataFrame.analytics.create.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。", "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.indexPattern": "索引模式", "xpack.ml.dataFrame.analytics.create.searchSelection.savedObjectType.search": "已保存搜索", - "xpack.ml.dataframe.analytics.create.shouldCreateIndexPatternMessage": "如果没有为目标索引创建索引模式，则可能无法查看作业结果。", "xpack.ml.dataframe.analytics.create.softTreeDepthLimitInputAriaLabel": "超过此深度的决策树将在损失计算中被罚分。", "xpack.ml.dataframe.analytics.create.softTreeDepthLimitLabel": "软性树深度限制", "xpack.ml.dataframe.analytics.create.softTreeDepthLimitText": "超过此深度的决策树将在损失计算中被罚分。必须大于或等于 0。", @@ -15805,7 +15794,6 @@ "xpack.ml.dataframe.analytics.creation.createStepTitle": "创建", "xpack.ml.dataframe.analytics.creation.detailsStepTitle": "作业详情", "xpack.ml.dataframe.analytics.creation.validationStepTitle": "验证", - "xpack.ml.dataframe.analytics.creationPageSourceIndexTitle": "源索引模式：{indexTitle}", "xpack.ml.dataframe.analytics.creationPageTitle": "创建作业", "xpack.ml.dataframe.analytics.decisionPathFeatureBaselineTitle": "基线", "xpack.ml.dataframe.analytics.decisionPathFeatureOtherTitle": "其他", @@ -15850,8 +15838,6 @@ "xpack.ml.dataframe.analytics.explorationResults.regressionDecisionPathDataMissingCallout": "无可用决策路径数据。", "xpack.ml.dataframe.analytics.explorationResults.testingSubsetLabel": "测试", "xpack.ml.dataframe.analytics.explorationResults.trainingSubsetLabel": "训练", - "xpack.ml.dataframe.analytics.indexPatternPromptLinkText": "创建索引模式", - "xpack.ml.dataframe.analytics.indexPatternPromptMessage": "不存在索引 {destIndex} 的索引模式。{destIndex} 的{linkToIndexPatternManagement}。", "xpack.ml.dataframe.analytics.jobCaps.errorTitle": "无法提取结果。加载索引的字段数据时发生错误。", "xpack.ml.dataframe.analytics.jobConfig.errorTitle": "无法提取结果。加载作业配置数据时发生错误。", "xpack.ml.dataframe.analytics.outlierExploration.legacyFeatureInfluenceFormatCalloutTitle": "因为结果索引使用不受支持的旧格式，所以基于特征影响进行颜色编码的表单元格不可用。请克隆并重新运行作业。", @@ -15874,7 +15860,6 @@ "xpack.ml.dataframe.analytics.regressionExploration.trainingDocsCount": "{docsCount, plural, other {# 个文档}}已评估", "xpack.ml.dataframe.analytics.regressionExploration.trainingErrorTitle": "训练误差", "xpack.ml.dataframe.analytics.regressionExploration.trainingFilterText": ".正在筛留测试数据。", - "xpack.ml.dataframe.analytics.results.indexPatternsMissingErrorMessage": "要查看此页面，此分析作业的目标或源索引都必须使用 Kibana 索引模式。", "xpack.ml.dataframe.analytics.rocChartSpec.xAxisTitle": "假正类率 (FPR)", "xpack.ml.dataframe.analytics.rocChartSpec.yAxisTitle": "真正类率 (TPR)（也称为查全率）", "xpack.ml.dataframe.analytics.rocCurveAuc": "在此绘图中，将计算曲线 (AUC) 值下的面积，其是介于 0 到 1 之间的数字。越接近 1，算法性能越佳。", @@ -15895,14 +15880,11 @@ "xpack.ml.dataframe.analyticsList.deleteAnalyticsPrivilegeErrorMessage": "用户无权删除索引 {indexName}：{error}", "xpack.ml.dataframe.analyticsList.deleteAnalyticsSuccessMessage": "删除的数据帧分析作业 {analyticsId} 的请求已确认。", "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexErrorMessage": "删除目标索引 {destinationIndex} 时发生错误", - "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternErrorMessage": "删除索引模式 {destinationIndex} 时发生错误：{error}", - "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexPatternSuccessMessage": "删除索引模式 {destinationIndex} 的请求已确认。", "xpack.ml.dataframe.analyticsList.deleteAnalyticsWithIndexSuccessMessage": "删除目标索引 {destinationIndex} 的请求已确认。", "xpack.ml.dataframe.analyticsList.deleteDestinationIndexTitle": "删除目标索引 {indexName}", "xpack.ml.dataframe.analyticsList.deleteModalCancelButton": "取消", "xpack.ml.dataframe.analyticsList.deleteModalDeleteButton": "删除", "xpack.ml.dataframe.analyticsList.deleteModalTitle": "删除 {analyticsId}？", - "xpack.ml.dataframe.analyticsList.deleteTargetIndexPatternTitle": "删除索引模式 {indexPattern}", "xpack.ml.dataframe.analyticsList.description": "描述", "xpack.ml.dataframe.analyticsList.destinationIndex": "目标索引", "xpack.ml.dataframe.analyticsList.editActionNameText": "编辑", @@ -15928,7 +15910,6 @@ "xpack.ml.dataFrame.analyticsList.emptyPromptButtonText": "创建作业", "xpack.ml.dataFrame.analyticsList.emptyPromptTitle": "创建您的首个数据帧分析作业", "xpack.ml.dataFrame.analyticsList.errorPromptTitle": "获取数据帧分析列表时发生错误。", - "xpack.ml.dataframe.analyticsList.errorWithCheckingIfIndexPatternExistsNotificationErrorMessage": "检查索引模式 {indexPattern} 是否存在时发生错误：{error}", "xpack.ml.dataframe.analyticsList.errorWithCheckingIfUserCanDeleteIndexNotificationErrorMessage": "检查用户是否能够删除 {destinationIndex} 时发生错误：{error}", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.analysisStats": "分析统计信息", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.phase": "阶段", @@ -15936,7 +15917,6 @@ "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.state": "状态", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettings.stats": "统计信息", "xpack.ml.dataframe.analyticsList.expandedRow.tabs.jobSettingsLabel": "作业详情", - "xpack.ml.dataframe.analyticsList.fetchSourceIndexPatternForCloneErrorMessage": "检查索引模式 {indexPattern} 是否存在时发生错误：{error}", "xpack.ml.dataframe.analyticsList.forceStopModalBody": "{analyticsId} 处于失败状态。您必须停止该作业并修复失败问题。", "xpack.ml.dataframe.analyticsList.forceStopModalCancelButton": "取消", "xpack.ml.dataframe.analyticsList.forceStopModalStartButton": "强制停止", @@ -15945,7 +15925,6 @@ "xpack.ml.dataframe.analyticsList.mapActionDisabledTooltipContent": "未知的分析类型。", "xpack.ml.dataframe.analyticsList.mapActionName": "地图", "xpack.ml.dataframe.analyticsList.memoryStatus": "内存状态", - "xpack.ml.dataframe.analyticsList.noSourceIndexPatternForClone": "无法克隆分析作业。对于索引 {indexPattern}，不存在索引模式。", "xpack.ml.dataframe.analyticsList.progress": "进度", "xpack.ml.dataframe.analyticsList.progressOfPhase": "阶段 {currentPhase} 的进度：{progress}%", "xpack.ml.dataframe.analyticsList.refreshButtonLabel": "刷新", @@ -15983,7 +15962,6 @@ "xpack.ml.dataframe.analyticsMap.flyout.createJobButton": "从此索引创建作业", "xpack.ml.dataframe.analyticsMap.flyout.deleteJobButton": "删除作业", "xpack.ml.dataframe.analyticsMap.flyout.fetchRelatedNodesButton": "获取相关节点", - "xpack.ml.dataframe.analyticsMap.flyout.indexPatternMissingMessage": "要从此索引创建作业，请为 {indexTitle} 创建索引模式。", "xpack.ml.dataframe.analyticsMap.flyout.nodeActionsButton": "节点操作", "xpack.ml.dataframe.analyticsMap.flyoutHeaderTitle": "{type} {id} 的详细信息", "xpack.ml.dataframe.analyticsMap.legend.analyticsJobLabel": "分析作业", @@ -16024,9 +16002,6 @@ "xpack.ml.datavisualizer.selector.dataVisualizerTitle": "数据可视化工具", "xpack.ml.datavisualizer.selector.importDataDescription": "从日志文件导入数据。您可以上传不超过 {maxFileSize} 的文件。", "xpack.ml.datavisualizer.selector.importDataTitle": "导入数据", - "xpack.ml.datavisualizer.selector.selectIndexButtonLabel": "选择索引模式", - "xpack.ml.datavisualizer.selector.selectIndexPatternDescription": "可视化现有 Elasticsearch 索引中的数据。", - "xpack.ml.datavisualizer.selector.selectIndexPatternTitle": "选择索引模式", "xpack.ml.datavisualizer.selector.startTrialButtonLabel": "开始试用", "xpack.ml.datavisualizer.selector.startTrialTitle": "开始试用", "xpack.ml.datavisualizer.selector.uploadFileButtonLabel": "选择文件", @@ -16191,7 +16166,6 @@ "xpack.ml.formatters.metricChangeDescription.unusuallyLowDescription": "异常低", "xpack.ml.formatters.metricChangeDescription.unusualValuesDescription": "异常值", "xpack.ml.fullTimeRangeSelector.errorSettingTimeRangeNotification": "设置时间范围时出错。", - "xpack.ml.fullTimeRangeSelector.useFullDataButtonLabel": "使用完整的 {indexPatternTitle} 数据", "xpack.ml.helpPopover.ariaLabel": "帮助", "xpack.ml.importExport.exportButton": "导出作业", "xpack.ml.importExport.exportFlyout.adJobsError": "无法加载异常检测作业", @@ -16251,8 +16225,6 @@ "xpack.ml.indexDatavisualizer.actionsPanel.anomalyDetectionTitle": "高级异常检测", "xpack.ml.indexDatavisualizer.actionsPanel.dataframeDescription": "创建离群值检测、回归或分类分析。", "xpack.ml.indexDatavisualizer.actionsPanel.dataframeTitle": "数据帧分析", - "xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationDescription": "仅针对基于时间的索引运行异常检测", - "xpack.ml.indexPatternNotBasedOnTimeSeriesNotificationTitle": "索引模式 {indexPatternTitle} 不基于时间序列", "xpack.ml.inference.modelsList.analyticsMapActionLabel": "分析地图", "xpack.ml.influencerResultType.description": "时间范围中最异常的实体是什么？", "xpack.ml.influencerResultType.title": "影响因素", @@ -16393,7 +16365,6 @@ "xpack.ml.jobsList.editJobFlyout.customUrls.buildUrlErrorNotificationMessage": "基于提供的设置构建用于测试的定制 URL 时出错", "xpack.ml.jobsList.editJobFlyout.customUrls.closeEditorAriaLabel": "关闭定制 URL 编辑器", "xpack.ml.jobsList.editJobFlyout.customUrls.getTestUrlErrorNotificationMessage": "获取 URL 用于测试配置时出错", - "xpack.ml.jobsList.editJobFlyout.customUrls.loadIndexPatternsErrorNotificationMessage": "加载已保存的索引模式列表时出错", "xpack.ml.jobsList.editJobFlyout.customUrls.loadSavedDashboardsErrorNotificationMessage": "加载已保存的 Kibana 仪表板列表时出错", "xpack.ml.jobsList.editJobFlyout.customUrls.testButtonLabel": "测试", "xpack.ml.jobsList.editJobFlyout.customUrlsTitle": "定制 URL", @@ -16487,7 +16458,6 @@ "xpack.ml.jobsList.managementActions.deleteJobLabel": "删除作业", "xpack.ml.jobsList.managementActions.editJobDescription": "编辑作业", "xpack.ml.jobsList.managementActions.editJobLabel": "编辑作业", - "xpack.ml.jobsList.managementActions.noSourceIndexPatternForClone": "无法克隆异常检测作业 {jobId}。对于索引 {indexPatternTitle}，不存在索引模式。", "xpack.ml.jobsList.managementActions.resetJobDescription": "重置作业", "xpack.ml.jobsList.managementActions.resetJobLabel": "重置作业", "xpack.ml.jobsList.managementActions.startDatafeedDescription": "开始数据馈送", @@ -16746,7 +16716,6 @@ "xpack.ml.navMenu.overviewTabLinkText": "概览", "xpack.ml.navMenu.settingsTabLinkText": "设置", "xpack.ml.newJob.page.createJob": "创建作业", - "xpack.ml.newJob.page.createJob.indexPatternTitle": "使用索引模式 {index}", "xpack.ml.newJob.recognize.advancedLabel": "高级", "xpack.ml.newJob.recognize.advancedSettingsAriaLabel": "高级设置", "xpack.ml.newJob.recognize.alreadyExistsLabel": "（已存在）", @@ -16757,7 +16726,6 @@ "xpack.ml.newJob.recognize.datafeed.savedAriaLabel": "已保存", "xpack.ml.newJob.recognize.datafeed.saveFailedAriaLabel": "保存失败", "xpack.ml.newJob.recognize.datafeedLabel": "数据馈送", - "xpack.ml.newJob.recognize.indexPatternPageTitle": "索引模式 {indexPatternTitle}", "xpack.ml.newJob.recognize.job.overrideJobConfigurationLabel": "覆盖作业配置", "xpack.ml.newJob.recognize.job.savedAriaLabel": "已保存", "xpack.ml.newJob.recognize.job.saveFailedAriaLabel": "保存失败", @@ -16871,9 +16839,6 @@ "xpack.ml.newJob.wizard.jobType.dataVisualizerDescription": "详细了解数据的特征，并通过 Machine Learning 识别分析字段。", "xpack.ml.newJob.wizard.jobType.dataVisualizerTitle": "数据可视化工具", "xpack.ml.newJob.wizard.jobType.howToRunAnomalyDetectionDescription": "异常检测只能在基于时间的索引上运行。", - "xpack.ml.newJob.wizard.jobType.indexPatternFromSavedSearchNotTimeBasedMessage": "{savedSearchTitle} 使用了不基于时间的索引模式 {indexPatternTitle}", - "xpack.ml.newJob.wizard.jobType.indexPatternNotTimeBasedMessage": "索引模式 {indexPatternTitle} 不基于时间", - "xpack.ml.newJob.wizard.jobType.indexPatternPageTitleLabel": "索引模式 {indexPatternTitle}", "xpack.ml.newJob.wizard.jobType.learnMoreAboutDataDescription": "如果您不确定要创建的作业类型，请先浏览数据中的字段和指标。", "xpack.ml.newJob.wizard.jobType.learnMoreAboutDataTitle": "深入了解数据", "xpack.ml.newJob.wizard.jobType.multiMetricAriaLabel": "多指标作业", @@ -17006,9 +16971,7 @@ "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.warningCallout.contents": "将删除 {date} 后的所有异常检测结果。", "xpack.ml.newJob.wizard.revertModelSnapshotFlyout.warningCallout.title": "将删除异常数据", "xpack.ml.newJob.wizard.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。", - "xpack.ml.newJob.wizard.searchSelection.savedObjectType.indexPattern": "索引模式", "xpack.ml.newJob.wizard.searchSelection.savedObjectType.search": "已保存搜索", - "xpack.ml.newJob.wizard.selectIndexPatternOrSavedSearch": "选择索引模式或已保存搜索", "xpack.ml.newJob.wizard.step.configureDatafeedTitle": "配置数据馈送", "xpack.ml.newJob.wizard.step.jobDetailsTitle": "作业详情", "xpack.ml.newJob.wizard.step.pickFieldsTitle": "选取字段", @@ -17018,7 +16981,6 @@ "xpack.ml.newJob.wizard.stepComponentWrapper.configureDatafeedTitle": "配置数据馈送", "xpack.ml.newJob.wizard.stepComponentWrapper.jobDetailsTitle": "作业详情", "xpack.ml.newJob.wizard.stepComponentWrapper.pickFieldsTitle": "选取字段", - "xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleIndexPattern": "从索引模式 {title} 新建作业", "xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleSavedSearch": "从已保存搜索 {title} 新建作业", "xpack.ml.newJob.wizard.stepComponentWrapper.timeRangeTitle": "时间范围", "xpack.ml.newJob.wizard.stepComponentWrapper.validationTitle": "验证", diff --git a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts index c4dd529ac14f59..c538fc0d9cb55d 100644 --- a/x-pack/test/api_integration/apis/ml/modules/setup_module.ts +++ b/x-pack/test/api_integration/apis/ml/modules/setup_module.ts @@ -963,18 +963,18 @@ export default ({ getService }: FtrProviderContext) => { const testDataListNegative = [ { - testTitleSuffix: 'for non existent index pattern', + testTitleSuffix: 'for non existent data view', module: 'sample_data_weblogs', user: USER.ML_POWERUSER, requestBody: { - indexPatternName: 'non-existent-index-pattern', + indexPatternName: 'non-existent-data-view', startDatafeed: false, }, expected: { responseCode: 400, error: 'Bad Request', message: - "Module's jobs contain custom URLs which require a kibana index pattern (non-existent-index-pattern) which cannot be found.", + "Module's jobs contain custom URLs which require a Kibana data view (non-existent-data-view) which cannot be found.", }, }, { diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts index 04bc12687a3b3e..7e07ac82c9dcf8 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts @@ -195,7 +195,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataFrameAnalyticsCreation.assertDestIndexInputExists(); await ml.dataFrameAnalyticsCreation.setDestIndex(testData.destinationIndex); - await ml.testExecution.logTestStep('sets the create index pattern switch'); + await ml.testExecution.logTestStep('sets the create data view switch'); await ml.dataFrameAnalyticsCreation.assertCreateIndexPatternSwitchExists(); await ml.dataFrameAnalyticsCreation.setCreateIndexPatternSwitchState( testData.createIndexPattern diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts index 14edb19cd9adb8..384d6fa43cac8c 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts @@ -217,7 +217,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataFrameAnalyticsCreation.assertDestIndexInputExists(); await ml.dataFrameAnalyticsCreation.setDestIndex(testData.destinationIndex); - await ml.testExecution.logTestStep('sets the create index pattern switch'); + await ml.testExecution.logTestStep('sets the create data view switch'); await ml.dataFrameAnalyticsCreation.assertCreateIndexPatternSwitchExists(); await ml.dataFrameAnalyticsCreation.setCreateIndexPatternSwitchState( testData.createIndexPattern diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts index 6b7b7f2f87fd03..66d0ba0ec6e367 100644 --- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts +++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts @@ -189,7 +189,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataFrameAnalyticsCreation.assertDestIndexInputExists(); await ml.dataFrameAnalyticsCreation.setDestIndex(testData.destinationIndex); - await ml.testExecution.logTestStep('sets the create index pattern switch'); + await ml.testExecution.logTestStep('sets the create data view switch'); await ml.dataFrameAnalyticsCreation.assertCreateIndexPatternSwitchExists(); await ml.dataFrameAnalyticsCreation.setCreateIndexPatternSwitchState( testData.createIndexPattern diff --git a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts index c00d0aeda04148..fe0baae9ed945d 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/file_data_visualizer.ts @@ -309,7 +309,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.testExecution.logTestStep('sets the index name'); await ml.dataVisualizerFileBased.setIndexName(testData.indexName); - await ml.testExecution.logTestStep('sets the create index pattern checkbox'); + await ml.testExecution.logTestStep('sets the create data view checkbox'); await ml.dataVisualizerFileBased.setCreateIndexPatternCheckboxState( testData.createIndexPattern ); diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts index 86cdc84f86d76f..448774f1a0c7f1 100644 --- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts @@ -331,7 +331,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizer.assertUploadFileButtonEnabled(true); await ml.testExecution.logTestStep( - 'should display the "select index pattern" card with enabled button' + 'should display the "select data view" card with enabled button' ); await ml.dataVisualizer.assertDataVisualizerIndexDataCardExists(); await ml.dataVisualizer.assertSelectIndexButtonEnabled(true); diff --git a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts index 920d82ed381c0b..b96da748507866 100644 --- a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts +++ b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts @@ -324,7 +324,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizer.assertUploadFileButtonEnabled(true); await ml.testExecution.logTestStep( - 'should display the "select index pattern" card with enabled button' + 'should display the "select data view" card with enabled button' ); await ml.dataVisualizer.assertDataVisualizerIndexDataCardExists(); await ml.dataVisualizer.assertSelectIndexButtonEnabled(true); diff --git a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts index 45ba4c5c348330..f18a6584983570 100644 --- a/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts +++ b/x-pack/test/functional/services/ml/data_frame_analytics_creation.ts @@ -546,7 +546,7 @@ export function MachineLearningDataFrameAnalyticsCreationProvider( const actualCheckState = await this.getCreateIndexPatternSwitchCheckState(); expect(actualCheckState).to.eql( expectedCheckState, - `Create index pattern switch check state should be '${expectedCheckState}' (got '${actualCheckState}')` + `Create data view switch check state should be '${expectedCheckState}' (got '${actualCheckState}')` ); }, From b21b8a3c31ad27de1e8af567369e9a4df201a0c7 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Tue, 28 Sep 2021 07:15:43 -0500 Subject: [PATCH 12/25] change index patterns to data views for deprecation UI (#113209) --- .../server/data_views/deprecations/scripted_fields.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/data/server/data_views/deprecations/scripted_fields.ts b/src/plugins/data/server/data_views/deprecations/scripted_fields.ts index 65cb9621968050..cff39701e85ed5 100644 --- a/src/plugins/data/server/data_views/deprecations/scripted_fields.ts +++ b/src/plugins/data/server/data_views/deprecations/scripted_fields.ts @@ -42,10 +42,10 @@ export const createScriptedFieldsDeprecationsConfig: ( return [ { title: i18n.translate('data.deprecations.scriptedFieldsTitle', { - defaultMessage: 'Found index patterns using scripted fields', + defaultMessage: 'Found data views using scripted fields', }), message: i18n.translate('data.deprecations.scriptedFieldsMessage', { - defaultMessage: `You have {numberOfIndexPatternsWithScriptedFields} index patterns ({titlesPreview}...) that use scripted fields. Scripted fields are deprecated and will be removed in future. Use runtime fields instead.`, + defaultMessage: `You have {numberOfIndexPatternsWithScriptedFields} data views ({titlesPreview}...) that use scripted fields. Scripted fields are deprecated and will be removed in future. Use runtime fields instead.`, values: { titlesPreview: indexPatternTitles.slice(0, PREVIEW_LIMIT).join('; '), numberOfIndexPatternsWithScriptedFields: indexPatternsWithScriptedFields.length, @@ -57,11 +57,11 @@ export const createScriptedFieldsDeprecationsConfig: ( correctiveActions: { manualSteps: [ i18n.translate('data.deprecations.scriptedFields.manualStepOneMessage', { - defaultMessage: 'Navigate to Stack Management > Kibana > Index Patterns.', + defaultMessage: 'Navigate to Stack Management > Kibana > Data Views.', }), i18n.translate('data.deprecations.scriptedFields.manualStepTwoMessage', { defaultMessage: - 'Update {numberOfIndexPatternsWithScriptedFields} index patterns that have scripted fields to use runtime fields instead. In most cases, to migrate existing scripts, you will need to change "return ;" to "emit();". Index patterns with at least one scripted field: {allTitles}', + 'Update {numberOfIndexPatternsWithScriptedFields} data views that have scripted fields to use runtime fields instead. In most cases, to migrate existing scripts, you will need to change "return ;" to "emit();". Data views with at least one scripted field: {allTitles}', values: { allTitles: indexPatternTitles.join('; '), numberOfIndexPatternsWithScriptedFields: indexPatternsWithScriptedFields.length, From 664d64aaedca4dc8d2c7980318d5b07877ee3b14 Mon Sep 17 00:00:00 2001 From: Matthew Kime Date: Wed, 29 Sep 2021 07:34:21 -0500 Subject: [PATCH 13/25] add display name to index pattern saved objects (#113350) --- src/plugins/data/server/saved_objects/index_patterns.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/data/server/saved_objects/index_patterns.ts b/src/plugins/data/server/saved_objects/index_patterns.ts index a809f2ce73e1ba..a274a73b355380 100644 --- a/src/plugins/data/server/saved_objects/index_patterns.ts +++ b/src/plugins/data/server/saved_objects/index_patterns.ts @@ -8,13 +8,14 @@ import type { SavedObjectsType } from 'kibana/server'; import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations'; -import { INDEX_PATTERN_SAVED_OBJECT_TYPE } from '../../common'; +import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common'; export const indexPatternSavedObjectType: SavedObjectsType = { - name: INDEX_PATTERN_SAVED_OBJECT_TYPE, + name: DATA_VIEW_SAVED_OBJECT_TYPE, hidden: false, namespaceType: 'single', management: { + displayName: 'Data view', icon: 'indexPatternApp', defaultSearchField: 'title', importableAndExportable: true, From 68bf0d1839b3fb9cdad6852fbb9513563f46b8ad Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 5 Oct 2021 23:28:09 -0500 Subject: [PATCH 14/25] fix merge mistake --- src/plugins/data_views/server/saved_objects/data_views.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/data_views/server/saved_objects/data_views.ts b/src/plugins/data_views/server/saved_objects/data_views.ts index a274a73b355380..68443609f3fc65 100644 --- a/src/plugins/data_views/server/saved_objects/data_views.ts +++ b/src/plugins/data_views/server/saved_objects/data_views.ts @@ -10,7 +10,7 @@ import type { SavedObjectsType } from 'kibana/server'; import { indexPatternSavedObjectTypeMigrations } from './index_pattern_migrations'; import { DATA_VIEW_SAVED_OBJECT_TYPE } from '../../common'; -export const indexPatternSavedObjectType: SavedObjectsType = { +export const dataViewSavedObjectType: SavedObjectsType = { name: DATA_VIEW_SAVED_OBJECT_TYPE, hidden: false, namespaceType: 'single', From fd54eb15acb1c6612cb467fa58ebdbb7ee930408 Mon Sep 17 00:00:00 2001 From: Matt Kime Date: Tue, 5 Oct 2021 23:51:17 -0500 Subject: [PATCH 15/25] fix i18n --- x-pack/plugins/translations/translations/ja-JP.json | 2 -- x-pack/plugins/translations/translations/zh-CN.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 98d3d6c7b5dbc5..35f68bb009c63a 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -2287,8 +2287,6 @@ "data.searchSessions.sessionService.sessionObjectFetchError": "検索セッション情報を取得できませんでした", "data.triggers.applyFilterDescription": "Kibanaフィルターが適用されるとき。単一の値または範囲フィルターにすることができます。", "data.triggers.applyFilterTitle": "フィルターを適用", - "dataViews.indexPatternLoad.help": "インデックスパターンを読み込みます", - "dataViews.functions.indexPatternLoad.id.help": "読み込むインデックスパターンID", "dataViews.ensureDefaultIndexPattern.bannerLabel": "Kibanaでデータの可視化と閲覧を行うには、Elasticsearchからデータを取得するためのインデックスパターンの作成が必要です。", "dataViews.fetchFieldErrorTitle": "インデックスパターンのフィールド取得中にエラーが発生 {title}（ID：{id}）", "dataViews.indexPatternLoad.error.kibanaRequest": "サーバーでこの検索を実行するには、KibanaRequest が必要です。式実行パラメーターに要求オブジェクトを渡してください。", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 8c3f8f61820c36..a9370bc5c878f4 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -2309,8 +2309,6 @@ "data.searchSessions.sessionService.sessionObjectFetchError": "无法提取搜索会话信息", "data.triggers.applyFilterDescription": "应用 kibana 筛选时。可能是单个值或范围筛选。", "data.triggers.applyFilterTitle": "应用筛选", - "dataViews.indexPatternLoad.help": "加载索引模式", - "dataViews.functions.indexPatternLoad.id.help": "要加载的索引模式 id", "dataViews.ensureDefaultIndexPattern.bannerLabel": "要在 Kibana 中可视化和浏览数据，必须创建索引模式，以从 Elasticsearch 中检索数据。", "dataViews.fetchFieldErrorTitle": "提取索引模式 {title} (ID: {id}) 的字段时出错", "dataViews.indexPatternLoad.error.kibanaRequest": "在服务器上执行此搜索时需要 Kibana 请求。请向表达式执行模式参数提供请求对象。", From bf69e106a76297a747cdc09f35142bd30d4ab5eb Mon Sep 17 00:00:00 2001 From: Pete Harverson Date: Thu, 7 Oct 2021 21:09:44 +0100 Subject: [PATCH 16/25] [ML] Data Visualizer: index pattern to data view in user facing copy (#114258) --- .../field_data_row/action_menu/actions.ts | 16 +++---- .../field_type_icon/field_type_icon.tsx | 2 +- .../results_links/results_links.tsx | 4 +- .../components/utils/kibana_field_format.ts | 2 +- .../components/import_errors/errors.tsx | 4 +- .../import_progress/import_progress.tsx | 24 +++++----- .../components/import_settings/advanced.tsx | 8 ++-- .../components/import_settings/simple.tsx | 4 +- .../import_summary/import_summary.tsx | 4 +- .../components/import_view/import_view.js | 10 ++--- .../full_time_range_selector.tsx | 2 +- .../index_data_visualizer_view.tsx | 16 +++---- .../index_pattern_management.tsx | 14 +++--- .../index_data_visualizer.tsx | 4 +- .../locator/locator.test.ts | 2 +- .../utils/saved_search_utils.test.ts | 2 +- .../data_visualizer/check_fields_exist.ts | 2 +- .../models/data_visualizer/data_visualizer.ts | 2 +- .../data_visualizer/server/routes/routes.ts | 44 +++++++++---------- .../schemas/index_data_visualizer_schemas.ts | 6 +-- .../translations/translations/ja-JP.json | 20 --------- .../translations/translations/zh-CN.json | 20 --------- .../data_visualizer/index_data_visualizer.ts | 8 ++-- ...ata_visualizer_index_pattern_management.ts | 4 +- 24 files changed, 92 insertions(+), 132 deletions(-) diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts index 933d65a9763b8c..4c8949ca222249 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.ts @@ -62,16 +62,16 @@ export function getActions( }); } - // Allow to edit index pattern field + // Allow to edit data view field if (services.indexPatternFieldEditor?.userPermissions.editIndexPattern()) { actions.push({ - name: i18n.translate('xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldTitle', { - defaultMessage: 'Edit index pattern field', + name: i18n.translate('xpack.dataVisualizer.index.dataGrid.editDataViewFieldTitle', { + defaultMessage: 'Edit data view field', }), description: i18n.translate( - 'xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldDescription', + 'xpack.dataVisualizer.index.dataGrid.editDataViewFieldDescription', { - defaultMessage: 'Edit index pattern field', + defaultMessage: 'Edit data view field', } ), type: 'icon', @@ -86,13 +86,13 @@ export function getActions( 'data-test-subj': 'dataVisualizerActionEditIndexPatternFieldButton', }); actions.push({ - name: i18n.translate('xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldTitle', { - defaultMessage: 'Delete index pattern field', + name: i18n.translate('xpack.dataVisualizer.index.dataGrid.deleteDataViewFieldTitle', { + defaultMessage: 'Delete data view field', }), description: i18n.translate( 'xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldDescription', { - defaultMessage: 'Delete index pattern field', + defaultMessage: 'Delete data view field', } ), type: 'icon', diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx index 3f84950c1345bd..2373cfe1f32841 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx @@ -32,7 +32,7 @@ const defaultIcon = { iconType: 'questionInCircle', color: 'gray' }; // Extended & modified version of src/plugins/kibana_react/public/field_icon/field_icon.tsx export const typeToEuiIconMap: Record = { boolean: { iconType: 'tokenBoolean' }, - // icon for an index pattern mapping conflict in discover + // icon for a data view mapping conflict in discover conflict: { iconType: 'alert', color: 'euiColorVis9' }, date: { iconType: 'tokenDate' }, date_range: { iconType: 'tokenDate' }, diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx index 24918432601b69..f1de0b0b8b8fa2 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx +++ b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx @@ -241,8 +241,8 @@ export const ResultsLinks: FC = ({ icon={} title={ } description="" diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts index 0218b7d62655c2..e1484c44438d1e 100644 --- a/x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts +++ b/x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts @@ -6,7 +6,7 @@ */ /* - * Formatter which uses the fieldFormat object of a Kibana index pattern + * Formatter which uses the fieldFormat object of a Kibana data view * field to format the value of a field. */ diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx index 1a54b844574c59..4a871a4c98ec66 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx @@ -73,8 +73,8 @@ function title(statuses: Statuses) { case statuses.indexPatternCreatedStatus: return ( ); case statuses.permissionCheckStatus: diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx index a058afca84c768..2950a7ca9ed88c 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx @@ -103,10 +103,10 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { defaultMessage: 'Upload data', } ); - let createIndexPatternTitle = i18n.translate( - 'xpack.dataVisualizer.file.importProgress.createIndexPatternTitle', + let createDataViewTitle = i18n.translate( + 'xpack.dataVisualizer.file.importProgress.createDataViewTitle', { - defaultMessage: 'Create index pattern', + defaultMessage: 'Create data view', } ); @@ -199,17 +199,17 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } ); if (createIndexPattern === true) { - createIndexPatternTitle = i18n.translate( - 'xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle', + createDataViewTitle = i18n.translate( + 'xpack.dataVisualizer.file.importProgress.creatingDataViewTitle', { - defaultMessage: 'Creating index pattern', + defaultMessage: 'Creating data view', } ); statusInfo = (

); @@ -218,10 +218,10 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { } } if (completedStep >= 5) { - createIndexPatternTitle = i18n.translate( - 'xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle', + createDataViewTitle = i18n.translate( + 'xpack.dataVisualizer.file.importProgress.dataViewCreatedTitle', { - defaultMessage: 'Index pattern created', + defaultMessage: 'Data view created', } ); statusInfo = null; @@ -267,7 +267,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => { if (createIndexPattern === true) { steps.push({ - title: createIndexPatternTitle, + title: createDataViewTitle, isSelected: uploadStatus === IMPORT_STATUS.COMPLETE, isComplete: indexPatternCreatedStatus === IMPORT_STATUS.COMPLETE, status: indexPatternCreatedStatus, diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx index a60b291d7e723a..83e7c556f033f1 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx @@ -102,8 +102,8 @@ export const AdvancedSettings: FC = ({ id="createIndexPattern" label={ } checked={createIndexPattern === true} @@ -116,8 +116,8 @@ export const AdvancedSettings: FC = ({ } isInvalid={indexPatternNameError !== ''} diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx index 02f33c49b77c4d..284a5aa3d4f3f0 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx @@ -73,8 +73,8 @@ export const SimpleSettings: FC = ({ id="createIndexPattern" label={ } checked={createIndexPattern === true} diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx index 1d8217d8df223d..fd4f956f9f69fb 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx @@ -135,8 +135,8 @@ function createDisplayItems( items.splice(1, 0, { title: ( ), description: indexPattern, diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js index 7e3c6d0c65d3ea..3b3a11a5dff22e 100644 --- a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js +++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js @@ -433,7 +433,7 @@ export class ImportView extends Component { this.setState({ indexPatternNames }); } catch (error) { - console.error('failed to load index patterns', error); + console.error('failed to load data views', error); } } @@ -704,8 +704,8 @@ function isIndexPatternNameValid(name, indexPatternNames, index) { if (indexPatternNames.find((i) => i === name)) { return ( ); } @@ -720,8 +720,8 @@ function isIndexPatternNameValid(name, indexPatternNames, index) { // name should match index return ( ); } diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx index 59f00bf00c270a..e5bd7a0d6f5267 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.tsx @@ -23,7 +23,7 @@ interface Props { } // Component for rendering a button which automatically sets the range of the time filter -// to the time range of data in the index(es) mapped to the supplied Kibana index pattern or query. +// to the time range of data in the index(es) mapped to the supplied Kibana data view or query. export const FullTimeRangeSelector: FC = ({ timefilter, indexPattern, diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx index fdd723dea34871..cdf4b718a93b78 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx @@ -157,7 +157,7 @@ export const IndexDataVisualizerView: FC = (dataVi useEffect(() => { return () => { - // When navigating away from the index pattern + // When navigating away from the data view // Reset all previously set filters // to make sure new page doesn't have unrelated filters data.query.filterManager.removeAll(); @@ -206,10 +206,10 @@ export const IndexDataVisualizerView: FC = (dataVi if (!currentIndexPattern.isTimeBased()) { toasts.addWarning({ title: i18n.translate( - 'xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationTitle', + 'xpack.dataVisualizer.index.dataViewNotBasedOnTimeSeriesNotificationTitle', { - defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series', - values: { indexPatternTitle: currentIndexPattern.title }, + defaultMessage: 'The data view {dataViewTitle} is not based on a time series', + values: { dataViewTitle: currentIndexPattern.title }, } ), text: i18n.translate( @@ -225,7 +225,7 @@ export const IndexDataVisualizerView: FC = (dataVi const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields; const fieldTypes = useMemo(() => { - // Obtain the list of non metric field types which appear in the index pattern. + // Obtain the list of non metric field types which appear in the data view. const indexedFieldTypes: JobFieldType[] = []; indexPatternFields.forEach((field) => { if (!OMIT_FIELDS.includes(field.name) && field.scripted !== true) { @@ -275,7 +275,7 @@ export const IndexDataVisualizerView: FC = (dataVi filters: Filter[]; }) => { // When the user loads saved search and then clear or modify the query - // we should remove the saved search and replace it with the index pattern id + // we should remove the saved search and replace it with the data view id if (currentSavedSearch !== null) { setCurrentSavedSearch(null); } @@ -689,7 +689,7 @@ export const IndexDataVisualizerView: FC = (dataVi }); // Obtain the list of all non-metric fields which appear in documents // (aggregatable or not aggregatable). - const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields. + const populatedNonMetricFields: any[] = []; // Kibana data view non metric fields. let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats. const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || []; const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || []; @@ -743,7 +743,7 @@ export const IndexDataVisualizerView: FC = (dataVi deletable: field.runtimeField !== undefined, }; - // Map the field type from the Kibana index pattern to the field type + // Map the field type from the Kibana data view to the field type // used in the data visualizer. const dataVisualizerType = kbnTypeToJobType(field); if (dataVisualizerType !== undefined) { diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx index 38f6a66a5ef29b..ade16e61050bc9 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_pattern_management/index_pattern_management.tsx @@ -14,7 +14,7 @@ import { dataVisualizerRefresh$, Refresh } from '../../services/timefilter_refre export interface DataVisualizerIndexPatternManagementProps { /** - * Currently selected index pattern + * Currently selected data view */ currentIndexPattern?: IndexPattern; /** @@ -79,9 +79,9 @@ export function DataVisualizerIndexPatternManagement( iconType="boxesHorizontal" data-test-subj="dataVisualizerIndexPatternManagementButton" aria-label={i18n.translate( - 'xpack.dataVisualizer.index.indexPatternManagement.actionsPopoverLabel', + 'xpack.dataVisualizer.index.dataViewManagement.actionsPopoverLabel', { - defaultMessage: 'Index pattern settings', + defaultMessage: 'Data view settings', } )} onClick={() => { @@ -103,8 +103,8 @@ export function DataVisualizerIndexPatternManagement( addField(); }} > - {i18n.translate('xpack.dataVisualizer.index.indexPatternManagement.addFieldButton', { - defaultMessage: 'Add field to index pattern', + {i18n.translate('xpack.dataVisualizer.index.dataViewManagement.addFieldButton', { + defaultMessage: 'Add field to data view', })} , - {i18n.translate('xpack.dataVisualizer.index.indexPatternManagement.manageFieldButton', { - defaultMessage: 'Manage index pattern fields', + {i18n.translate('xpack.dataVisualizer.index.dataViewManagement.manageFieldButton', { + defaultMessage: 'Manage data view fields', })} , ]} diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx index c3f3d744a39784..a474ed3521580e 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx @@ -77,8 +77,8 @@ export const DataVisualizerUrlStateContextProvider: FC { }); }); - it('should prioritize savedSearchId even when index pattern id is available', async () => { + it('should prioritize savedSearchId even when data view id is available', async () => { const location = await definition.getLocation({ indexPatternId: '3da93760-e0af-11ea-9ad3-3bcfc330e42a', savedSearchId: '45014020-dffa-11eb-b120-a105fbbe93b3', diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts index 3dd81015393b4c..43d815f6e9d411 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.test.ts @@ -18,7 +18,7 @@ import { IndexPattern } from '../../../../../../../src/plugins/data/common'; import { fieldFormatsMock } from '../../../../../../../src/plugins/field_formats/common/mocks'; import { uiSettingsServiceMock } from 'src/core/public/mocks'; -// helper function to create index patterns +// helper function to create data views function createMockDataView(id: string) { const { type, diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts index ca7287394b8e35..f0cbffbfa70c3d 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts @@ -41,7 +41,7 @@ export const checkAggregatableFieldsExist = async ( // filter aggregation with exists query. const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {}; - // Combine runtime fields from the index pattern as well as the datafeed + // Combine runtime fields from the data view as well as the datafeed const combinedRuntimeMappings: estypes.MappingRuntimeFields = { ...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}), ...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings) diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts index 155cf09ebb8dbc..003d5a7d86015a 100644 --- a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts +++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts @@ -40,7 +40,7 @@ export class DataVisualizer { this._client = client; } - // Obtains overall stats on the fields in the supplied index pattern, returning an object + // Obtains overall stats on the fields in the supplied data view, returning an object // containing the total document count, and four arrays showing which of the supplied // aggregatable and non-aggregatable fields do or do not exist in documents. // Sampling will be used if supplied samplerShardSize > 0. diff --git a/x-pack/plugins/data_visualizer/server/routes/routes.ts b/x-pack/plugins/data_visualizer/server/routes/routes.ts index 13a0031a25dfd9..74afae26346367 100644 --- a/x-pack/plugins/data_visualizer/server/routes/routes.ts +++ b/x-pack/plugins/data_visualizer/server/routes/routes.ts @@ -11,7 +11,7 @@ import { dataVisualizerFieldHistogramsSchema, dataVisualizerFieldStatsSchema, dataVisualizerOverallStatsSchema, - indexPatternTitleSchema, + dataViewTitleSchema, } from './schemas'; import type { Field, StartDeps, HistogramField } from '../types'; import { DataVisualizer } from '../models/data_visualizer'; @@ -97,33 +97,33 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup) { /** * @apiGroup DataVisualizer * - * @api {post} /internal/data_visualizer/get_field_histograms/:indexPatternTitle Get histograms for fields + * @api {post} /internal/data_visualizer/get_field_histograms/:dataViewTitle Get histograms for fields * @apiName GetHistogramsForFields - * @apiDescription Returns the histograms on a list fields in the specified index pattern. + * @apiDescription Returns the histograms on a list fields in the specified data view. * - * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (params) dataViewTitleSchema * @apiSchema (body) dataVisualizerFieldHistogramsSchema * * @apiSuccess {Object} fieldName histograms by field, keyed on the name of the field. */ router.post( { - path: '/internal/data_visualizer/get_field_histograms/{indexPatternTitle}', + path: '/internal/data_visualizer/get_field_histograms/{dataViewTitle}', validate: { - params: indexPatternTitleSchema, + params: dataViewTitleSchema, body: dataVisualizerFieldHistogramsSchema, }, }, async (context, request, response) => { try { const { - params: { indexPatternTitle }, + params: { dataViewTitle }, body: { query, fields, samplerShardSize, runtimeMappings }, } = request; const results = await getHistogramsForFields( context.core.elasticsearch.client, - indexPatternTitle, + dataViewTitle, query, fields, samplerShardSize, @@ -142,27 +142,27 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup) { /** * @apiGroup DataVisualizer * - * @api {post} /internal/data_visualizer/get_field_stats/:indexPatternTitle Get stats for fields + * @api {post} /internal/data_visualizer/get_field_stats/:dataViewTitle Get stats for fields * @apiName GetStatsForFields - * @apiDescription Returns the stats on individual fields in the specified index pattern. + * @apiDescription Returns the stats on individual fields in the specified data view. * - * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (params) dataViewTitleSchema * @apiSchema (body) dataVisualizerFieldStatsSchema * * @apiSuccess {Object} fieldName stats by field, keyed on the name of the field. */ router.post( { - path: '/internal/data_visualizer/get_field_stats/{indexPatternTitle}', + path: '/internal/data_visualizer/get_field_stats/{dataViewTitle}', validate: { - params: indexPatternTitleSchema, + params: dataViewTitleSchema, body: dataVisualizerFieldStatsSchema, }, }, async (context, request, response) => { try { const { - params: { indexPatternTitle }, + params: { dataViewTitle }, body: { query, fields, @@ -177,7 +177,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup) { } = request; const results = await getStatsForFields( context.core.elasticsearch.client, - indexPatternTitle, + dataViewTitle, query, fields, samplerShardSize, @@ -201,11 +201,11 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup) { /** * @apiGroup DataVisualizer * - * @api {post} /internal/data_visualizer/get_overall_stats/:indexPatternTitle Get overall stats + * @api {post} /internal/data_visualizer/get_overall_stats/:dataViewTitle Get overall stats * @apiName GetOverallStats - * @apiDescription Returns the top level overall stats for the specified index pattern. + * @apiDescription Returns the top level overall stats for the specified data view. * - * @apiSchema (params) indexPatternTitleSchema + * @apiSchema (params) dataViewTitleSchema * @apiSchema (body) dataVisualizerOverallStatsSchema * * @apiSuccess {number} totalCount total count of documents. @@ -216,16 +216,16 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup) { */ router.post( { - path: '/internal/data_visualizer/get_overall_stats/{indexPatternTitle}', + path: '/internal/data_visualizer/get_overall_stats/{dataViewTitle}', validate: { - params: indexPatternTitleSchema, + params: dataViewTitleSchema, body: dataVisualizerOverallStatsSchema, }, }, async (context, request, response) => { try { const { - params: { indexPatternTitle }, + params: { dataViewTitle }, body: { query, aggregatableFields, @@ -240,7 +240,7 @@ export function dataVisualizerRoutes(coreSetup: CoreSetup) { const results = await getOverallStats( context.core.elasticsearch.client, - indexPatternTitle, + dataViewTitle, query, aggregatableFields, nonAggregatableFields, diff --git a/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts b/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts index 0f145081d8cec8..3b5797622734f0 100644 --- a/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts +++ b/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts @@ -20,9 +20,9 @@ export const runtimeMappingsSchema = schema.object( } ); -export const indexPatternTitleSchema = schema.object({ - /** Title of the index pattern for which to return stats. */ - indexPatternTitle: schema.string(), +export const dataViewTitleSchema = schema.object({ + /** Title of the data view for which to return stats. */ + dataViewTitle: schema.string(), }); export const dataVisualizerFieldHistogramsSchema = schema.object({ diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index e3f2f51fc1b90d..70fba7cc15c9be 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -8785,11 +8785,9 @@ "xpack.dataVisualizer.fieldTypeSelect": "フィールド型", "xpack.dataVisualizer.file.aboutPanel.analyzingDataTitle": "データを分析中", "xpack.dataVisualizer.file.aboutPanel.selectOrDragAndDropFileDescription": "ファイルを選択するかドラッグ & ドロップしてください", - "xpack.dataVisualizer.file.advancedImportSettings.createIndexPatternLabel": "インデックスパターンを作成", "xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド", "xpack.dataVisualizer.file.advancedImportSettings.indexNameLabel": "インデックス名", "xpack.dataVisualizer.file.advancedImportSettings.indexNamePlaceholder": "インデックス名", - "xpack.dataVisualizer.file.advancedImportSettings.indexPatternNameLabel": "インデックスパターン名", "xpack.dataVisualizer.file.advancedImportSettings.indexSettingsLabel": "インデックス設定", "xpack.dataVisualizer.file.advancedImportSettings.ingestPipelineLabel": "パイプラインを投入", "xpack.dataVisualizer.file.advancedImportSettings.mappingsLabel": "マッピング", @@ -8849,7 +8847,6 @@ "xpack.dataVisualizer.file.geoPointForm.submitButtonLabel": "追加", "xpack.dataVisualizer.file.importErrors.checkingPermissionErrorMessage": "パーミッションエラーをインポートします", "xpack.dataVisualizer.file.importErrors.creatingIndexErrorMessage": "インデックスの作成中にエラーが発生しました", - "xpack.dataVisualizer.file.importErrors.creatingIndexPatternErrorMessage": "インデックスパターンの作成中にエラーが発生しました", "xpack.dataVisualizer.file.importErrors.creatingIngestPipelineErrorMessage": "投入パイプラインの作成中にエラーが発生しました", "xpack.dataVisualizer.file.importErrors.defaultErrorMessage": "エラー", "xpack.dataVisualizer.file.importErrors.moreButtonLabel": "詳細", @@ -8857,17 +8854,13 @@ "xpack.dataVisualizer.file.importErrors.readingFileErrorMessage": "ファイルの読み込み中にエラーが発生しました", "xpack.dataVisualizer.file.importErrors.unknownErrorMessage": "不明なエラー", "xpack.dataVisualizer.file.importErrors.uploadingDataErrorMessage": "データのアップロード中にエラーが発生しました", - "xpack.dataVisualizer.file.importProgress.createIndexPatternTitle": "インデックスパターンを作成", "xpack.dataVisualizer.file.importProgress.createIndexTitle": "インデックスの作成", "xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle": "投入パイプラインの作成", - "xpack.dataVisualizer.file.importProgress.creatingIndexPatternDescription": "インデックスパターンを作成中です", - "xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle": "インデックスパターンを作成中です", "xpack.dataVisualizer.file.importProgress.creatingIndexTitle": "インデックスを作成中です", "xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle": "投入パイプラインを作成中", "xpack.dataVisualizer.file.importProgress.dataUploadedTitle": "データがアップロードされました", "xpack.dataVisualizer.file.importProgress.fileProcessedTitle": "ファイルが処理されました", "xpack.dataVisualizer.file.importProgress.indexCreatedTitle": "インデックスが作成されました", - "xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle": "インデックスパターンが作成されました", "xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle": "投入パイプラインが作成されました", "xpack.dataVisualizer.file.importProgress.processFileTitle": "ファイルの処理", "xpack.dataVisualizer.file.importProgress.processingFileTitle": "ファイルを処理中", @@ -8885,7 +8878,6 @@ "xpack.dataVisualizer.file.importSummary.failedDocumentsButtonLabel": "失敗したドキュメント", "xpack.dataVisualizer.file.importSummary.failedDocumentsTitle": "失敗したドキュメント", "xpack.dataVisualizer.file.importSummary.importCompleteTitle": "インポート完了", - "xpack.dataVisualizer.file.importSummary.indexPatternTitle": "インデックスパターン", "xpack.dataVisualizer.file.importSummary.indexTitle": "インデックス", "xpack.dataVisualizer.file.importSummary.ingestPipelineTitle": "パイプラインを投入", "xpack.dataVisualizer.file.importView.importButtonLabel": "インポート", @@ -8893,8 +8885,6 @@ "xpack.dataVisualizer.file.importView.importPermissionError": "インデックス {index} にデータを作成またはインポートするパーミッションがありません。", "xpack.dataVisualizer.file.importView.indexNameAlreadyExistsErrorMessage": "インデックス名がすでに存在します", "xpack.dataVisualizer.file.importView.indexNameContainsIllegalCharactersErrorMessage": "インデックス名に許可されていない文字が含まれています。", - "xpack.dataVisualizer.file.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "インデックスパターンがインデックス名と一致しません", - "xpack.dataVisualizer.file.importView.indexPatternNameAlreadyExistsErrorMessage": "インデックスパターン名がすでに存在します", "xpack.dataVisualizer.file.importView.parseMappingsError": "マッピングのパース中にエラーが発生しました：", "xpack.dataVisualizer.file.importView.parsePipelineError": "投入パイプラインのパース中にエラーが発生しました：", "xpack.dataVisualizer.file.importView.parseSettingsError": "設定のパース中にエラーが発生しました：", @@ -8906,12 +8896,10 @@ "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText1": "Filebeat を使用して {index} インデックスに追加データをアップロードできます。", "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText2": "{filebeatYml} を修正して接続情報を設定します。", "xpack.dataVisualizer.file.resultsLinks.indexManagementTitle": "インデックス管理", - "xpack.dataVisualizer.file.resultsLinks.indexPatternManagementTitle": "インデックスパターン管理", "xpack.dataVisualizer.file.resultsLinks.viewIndexInDiscoverTitle": "インデックスを Discover で表示", "xpack.dataVisualizer.file.resultsView.analysisExplanationButtonLabel": "分析説明", "xpack.dataVisualizer.file.resultsView.fileStatsName": "ファイル統計", "xpack.dataVisualizer.file.resultsView.overrideSettingsButtonLabel": "上書き設定", - "xpack.dataVisualizer.file.simpleImportSettings.createIndexPatternLabel": "インデックスパターンを作成", "xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド", "xpack.dataVisualizer.file.simpleImportSettings.indexNameFormRowLabel": "インデックス名", "xpack.dataVisualizer.file.simpleImportSettings.indexNamePlaceholder": "インデックス名", @@ -8931,9 +8919,6 @@ "xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription": "インデックスのドキュメントを調査します。", "xpack.dataVisualizer.index.dataGrid.actionsColumnLabel": "アクション", "xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldDescription": "インデックスパターンフィールドを削除", - "xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldTitle": "インデックスパターンフィールドを削除", - "xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldDescription": "インデックスパターンフィールドを編集", - "xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldTitle": "インデックスパターンフィールドを編集", "xpack.dataVisualizer.index.dataGrid.exploreInLensDescription": "Lensで検索", "xpack.dataVisualizer.index.dataGrid.exploreInLensTitle": "Lensで検索", "xpack.dataVisualizer.index.dataLoader.internalServerErrorMessage": "インデックス {index} のデータの読み込み中にエラーが発生。{message}。リクエストがタイムアウトした可能性があります。小さなサンプルサイズを使うか、時間範囲を狭めてみてください。", @@ -8942,12 +8927,7 @@ "xpack.dataVisualizer.index.fieldTypeSelect": "フィールド型", "xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification": "時間範囲の設定中にエラーが発生しました。", "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataButtonLabel": "完全な {indexPatternTitle} データを使用", - "xpack.dataVisualizer.index.indexPatternErrorMessage": "インデックスパターンの検索エラー", - "xpack.dataVisualizer.index.indexPatternManagement.actionsPopoverLabel": "インデックスパターン設定", - "xpack.dataVisualizer.index.indexPatternManagement.addFieldButton": "フィールドをインデックスパターンに追加", - "xpack.dataVisualizer.index.indexPatternManagement.manageFieldButton": "インデックスパターンを管理", "xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationDescription": "異常検知は時間ベースのインデックスでのみ実行されます", - "xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationTitle": "インデックスパターン {indexPatternTitle} は時系列に基づくものではありません", "xpack.dataVisualizer.index.lensChart.averageOfLabel": "{fieldName}の平均", "xpack.dataVisualizer.index.lensChart.chartTitle": "{fieldName}のLens", "xpack.dataVisualizer.index.lensChart.countLabel": "カウント", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index 8d44f1942aefaa..be2e896a3695e5 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -8868,11 +8868,9 @@ "xpack.dataVisualizer.fieldTypeSelect": "字段类型", "xpack.dataVisualizer.file.aboutPanel.analyzingDataTitle": "正在分析数据", "xpack.dataVisualizer.file.aboutPanel.selectOrDragAndDropFileDescription": "选择或拖放文件", - "xpack.dataVisualizer.file.advancedImportSettings.createIndexPatternLabel": "创建索引模式", "xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel": "索引名称，必填字段", "xpack.dataVisualizer.file.advancedImportSettings.indexNameLabel": "索引名称", "xpack.dataVisualizer.file.advancedImportSettings.indexNamePlaceholder": "索引名称", - "xpack.dataVisualizer.file.advancedImportSettings.indexPatternNameLabel": "索引模式名称", "xpack.dataVisualizer.file.advancedImportSettings.indexSettingsLabel": "索引设置", "xpack.dataVisualizer.file.advancedImportSettings.ingestPipelineLabel": "采集管道", "xpack.dataVisualizer.file.advancedImportSettings.mappingsLabel": "映射", @@ -8934,7 +8932,6 @@ "xpack.dataVisualizer.file.geoPointForm.submitButtonLabel": "添加", "xpack.dataVisualizer.file.importErrors.checkingPermissionErrorMessage": "导入权限错误", "xpack.dataVisualizer.file.importErrors.creatingIndexErrorMessage": "创建索引时出错", - "xpack.dataVisualizer.file.importErrors.creatingIndexPatternErrorMessage": "创建索引模式时出错", "xpack.dataVisualizer.file.importErrors.creatingIngestPipelineErrorMessage": "创建采集管道时出错", "xpack.dataVisualizer.file.importErrors.defaultErrorMessage": "错误", "xpack.dataVisualizer.file.importErrors.moreButtonLabel": "更多", @@ -8942,17 +8939,13 @@ "xpack.dataVisualizer.file.importErrors.readingFileErrorMessage": "读取文件时出错", "xpack.dataVisualizer.file.importErrors.unknownErrorMessage": "未知错误", "xpack.dataVisualizer.file.importErrors.uploadingDataErrorMessage": "上传数据时出错", - "xpack.dataVisualizer.file.importProgress.createIndexPatternTitle": "创建索引模式", "xpack.dataVisualizer.file.importProgress.createIndexTitle": "创建索引", "xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle": "创建采集管道", - "xpack.dataVisualizer.file.importProgress.creatingIndexPatternDescription": "正在创建索引模式", - "xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle": "正在创建索引模式", "xpack.dataVisualizer.file.importProgress.creatingIndexTitle": "正在创建索引", "xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle": "正在创建采集管道", "xpack.dataVisualizer.file.importProgress.dataUploadedTitle": "数据已上传", "xpack.dataVisualizer.file.importProgress.fileProcessedTitle": "文件已处理", "xpack.dataVisualizer.file.importProgress.indexCreatedTitle": "索引已创建", - "xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle": "索引模式已创建", "xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle": "采集管道已创建", "xpack.dataVisualizer.file.importProgress.processFileTitle": "处理文件", "xpack.dataVisualizer.file.importProgress.processingFileTitle": "正在处理文件", @@ -8970,7 +8963,6 @@ "xpack.dataVisualizer.file.importSummary.failedDocumentsButtonLabel": "失败的文档", "xpack.dataVisualizer.file.importSummary.failedDocumentsTitle": "失败的文档", "xpack.dataVisualizer.file.importSummary.importCompleteTitle": "导入完成", - "xpack.dataVisualizer.file.importSummary.indexPatternTitle": "索引模式", "xpack.dataVisualizer.file.importSummary.indexTitle": "索引", "xpack.dataVisualizer.file.importSummary.ingestPipelineTitle": "采集管道", "xpack.dataVisualizer.file.importView.importButtonLabel": "导入", @@ -8978,8 +8970,6 @@ "xpack.dataVisualizer.file.importView.importPermissionError": "您无权创建或将数据导入索引 {index}", "xpack.dataVisualizer.file.importView.indexNameAlreadyExistsErrorMessage": "索引名称已存在", "xpack.dataVisualizer.file.importView.indexNameContainsIllegalCharactersErrorMessage": "索引名称包含非法字符", - "xpack.dataVisualizer.file.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "索引模式与索引名称不匹配", - "xpack.dataVisualizer.file.importView.indexPatternNameAlreadyExistsErrorMessage": "索引模式名称已存在", "xpack.dataVisualizer.file.importView.parseMappingsError": "解析映射时出错：", "xpack.dataVisualizer.file.importView.parsePipelineError": "解析采集管道时出错：", "xpack.dataVisualizer.file.importView.parseSettingsError": "解析设置时出错：", @@ -8991,12 +8981,10 @@ "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText1": "可以使用 Filebeat 将其他数据上传到 {index} 索引。", "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText2": "修改 {filebeatYml} 以设置连接信息：", "xpack.dataVisualizer.file.resultsLinks.indexManagementTitle": "索引管理", - "xpack.dataVisualizer.file.resultsLinks.indexPatternManagementTitle": "索引模式管理", "xpack.dataVisualizer.file.resultsLinks.viewIndexInDiscoverTitle": "在 Discover 中查看索引", "xpack.dataVisualizer.file.resultsView.analysisExplanationButtonLabel": "分析说明", "xpack.dataVisualizer.file.resultsView.fileStatsName": "文件统计", "xpack.dataVisualizer.file.resultsView.overrideSettingsButtonLabel": "替代设置", - "xpack.dataVisualizer.file.simpleImportSettings.createIndexPatternLabel": "创建索引模式", "xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel": "索引名称，必填字段", "xpack.dataVisualizer.file.simpleImportSettings.indexNameFormRowLabel": "索引名称", "xpack.dataVisualizer.file.simpleImportSettings.indexNamePlaceholder": "索引名称", @@ -9016,9 +9004,6 @@ "xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription": "浏览您的索引中的文档。", "xpack.dataVisualizer.index.dataGrid.actionsColumnLabel": "操作", "xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldDescription": "删除索引模式字段", - "xpack.dataVisualizer.index.dataGrid.deleteIndexPatternFieldTitle": "删除索引模式字段", - "xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldDescription": "编辑索引模式字段", - "xpack.dataVisualizer.index.dataGrid.editIndexPatternFieldTitle": "编辑索引模式字段", "xpack.dataVisualizer.index.dataGrid.exploreInLensDescription": "在 Lens 中浏览", "xpack.dataVisualizer.index.dataGrid.exploreInLensTitle": "在 Lens 中浏览", "xpack.dataVisualizer.index.dataLoader.internalServerErrorMessage": "加载索引 {index} 中的数据时出错。{message}。请求可能已超时。请尝试使用较小的样例大小或缩小时间范围。", @@ -9027,12 +9012,7 @@ "xpack.dataVisualizer.index.fieldTypeSelect": "字段类型", "xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification": "设置时间范围时出错。", "xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataButtonLabel": "使用完整的 {indexPatternTitle} 数据", - "xpack.dataVisualizer.index.indexPatternErrorMessage": "查找索引模式时出错", - "xpack.dataVisualizer.index.indexPatternManagement.actionsPopoverLabel": "索引模式设置", - "xpack.dataVisualizer.index.indexPatternManagement.addFieldButton": "将字段添加到索引模式", - "xpack.dataVisualizer.index.indexPatternManagement.manageFieldButton": "管理索引模式字段", "xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationDescription": "仅针对基于时间的索引运行异常检测", - "xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationTitle": "索引模式 {indexPatternTitle} 不基于时间序列", "xpack.dataVisualizer.index.lensChart.averageOfLabel": "{fieldName} 的平均值", "xpack.dataVisualizer.index.lensChart.chartTitle": "{fieldName} 的 Lens", "xpack.dataVisualizer.index.lensChart.countLabel": "计数", diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts index 031074876f39c7..542f7f3116c944 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer.ts @@ -50,8 +50,8 @@ export default function ({ getService }: FtrProviderContext) { const esArchiver = getService('esArchiver'); const ml = getService('ml'); - const farequoteIndexPatternTestData: TestData = { - suiteTitle: 'index pattern', + const farequoteDataViewTestData: TestData = { + suiteTitle: 'data view', sourceIndexOrSavedSearch: 'ft_farequote', fieldNameFilters: ['airline', '@timestamp'], fieldTypeFilters: [ML_JOB_FIELD_TYPES.KEYWORD], @@ -513,13 +513,13 @@ export default function ({ getService }: FtrProviderContext) { describe('with farequote', function () { // Run tests on full farequote index. - it(`${farequoteIndexPatternTestData.suiteTitle} loads the data visualizer selector page`, async () => { + it(`${farequoteDataViewTestData.suiteTitle} loads the data visualizer selector page`, async () => { // Start navigation from the base of the ML app. await ml.navigation.navigateToMl(); await ml.navigation.navigateToDataVisualizer(); }); - runTests(farequoteIndexPatternTestData); + runTests(farequoteDataViewTestData); // Run tests on farequote KQL saved search. it(`${farequoteKQLSearchTestData.suiteTitle} loads the data visualizer selector page`, async () => { diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts index 0d9163a872043a..c5461e3bb9c219 100644 --- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts +++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_index_pattern_management.ts @@ -46,7 +46,7 @@ export default function ({ getService }: FtrProviderContext) { const ml = getService('ml'); const originalTestData: TestData = { - suiteTitle: 'original index pattern', + suiteTitle: 'original data view', sourceIndexOrSavedSearch: 'ft_farequote', expected: { totalDocCountFormatted: '86,274', @@ -188,7 +188,7 @@ export default function ({ getService }: FtrProviderContext) { await ml.dataVisualizerIndexBased.assertTotalFieldsCount(testData.expected.totalFieldsCount); } - describe('index pattern management', function () { + describe('data view management', function () { this.tags(['mlqa']); const indexPatternTitle = 'ft_farequote'; before(async () => { From d393aeb38256bd16ce57c359d579e2083b868958 Mon Sep 17 00:00:00 2001 From: Diana Derevyankina <54894989+DziyanaDzeraviankina@users.noreply.github.com> Date: Fri, 8 Oct 2021 12:04:17 +0300 Subject: [PATCH 17/25] [Discover] Rename Index pattern to Data view (#110402) * [Discover] Rename Index pattern to Data view * Revert changes for somethingWentWrongDescriptionAddon translation Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../public/application/apps/doc/components/doc.tsx | 4 ++-- ...discover_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 ++++++------ src/plugins/discover/server/ui_settings.ts | 8 ++++---- .../plugins/translations/translations/ja-JP.json | 14 -------------- .../plugins/translations/translations/zh-CN.json | 14 -------------- 9 files changed, 23 insertions(+), 51 deletions(-) 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 f33ffe561e490c..f9f85acd2fe96c 100644 --- a/src/plugins/discover/public/application/apps/doc/components/doc.tsx +++ b/src/plugins/discover/public/application/apps/doc/components/doc.tsx @@ -52,8 +52,8 @@ export function Doc(props: DocProps) { iconType="alert" title={ } 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 ebb06e0b2ecd36..ae4c2bacb4266f 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={