From bbbf2f96303d9d000573dddf64250ca65749497f Mon Sep 17 00:00:00 2001 From: Ignacio Rivas Date: Tue, 23 Nov 2021 14:44:51 +0100 Subject: [PATCH 1/2] [Upgrade Assistant] Remove index_mapper_dynamic setting when reindexing (#119441) * Add index_mapper_dynamic to removeList * commit using @elastic.co --- .../server/lib/reindexing/index_settings.test.ts | 1 + .../upgrade_assistant/server/lib/reindexing/index_settings.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts index 957198cde8da9..0c31a5b8d2fe5 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts @@ -64,6 +64,7 @@ describe('transformFlatSettings', () => { 'index.verified_before_close': 'true', 'index.version.created': '123123', 'index.version.upgraded': '123123', + 'index.mapper.dynamic': 'true', // Deprecated settings 'index.force_memory_term_dictionary': '1024', diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts index b65984af5deb3..870dd3ae45c30 100644 --- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts +++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts @@ -178,6 +178,9 @@ const removeUnsettableSettings = (settings: FlatSettings['settings']) => 'index.verified_before_close', 'index.version.created', + // Ignored since 6.x and forbidden in 7.x + 'index.mapper.dynamic', + // Deprecated in 9.0 'index.version.upgraded', ]); From 846a5caf9d821587acfb8b4b04cd4fed385062e8 Mon Sep 17 00:00:00 2001 From: Ignacio Rivas Date: Wed, 24 Nov 2021 09:55:03 +0100 Subject: [PATCH 2/2] [Upgrade Assistant] Remove duped copy from header (#119476) * Remove duped copy from header * commit using @elastic.co Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> --- .../components/es_deprecations/es_deprecations.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx index 270f597cb964f..831494806e34e 100644 --- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx +++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx @@ -46,7 +46,7 @@ const i18nTexts = { }), pageDescription: i18n.translate('xpack.upgradeAssistant.esDeprecations.pageDescription', { defaultMessage: - 'Resolve all critical issues before upgrading. Before making changes, ensure you have a current snapshot of your cluster. Indices created before 7.0 must be reindexed or removed. To start multiple reindexing tasks in a single request, use the Kibana batch reindexing API.', + 'Resolve all critical issues before upgrading. Before making changes, ensure you have a current snapshot of your cluster. Indices created before 7.0 must be reindexed or removed.', }), isLoading: i18n.translate('xpack.upgradeAssistant.esDeprecations.loadingText', { defaultMessage: 'Loading deprecation issues…', @@ -136,8 +136,7 @@ export const EsDeprecations = withRouter(({ history }: RouteComponentProps) => { pageTitle={i18nTexts.pageTitle} description={ <> - {i18nTexts.pageDescription} - {getBatchReindexLink(docLinks)} + {i18nTexts.pageDescription} {getBatchReindexLink(docLinks)} } >