Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] [UA] Remove index_mapper_dynamic setting when reindexing and remove duped copy from header #119569

Merged
merged 2 commits into from
Nov 24, 2021
Merged

[main] [UA] Remove index_mapper_dynamic setting when reindexing and remove duped copy from header #119569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbbf2f9
[Upgrade Assistant] Remove index_mapper_dynamic setting when reindexi…
sabarasaba Nov 23, 2021
846a5ca
[Upgrade Assistant] Remove duped copy from header (#119476)
sabarasaba Nov 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...ugins/upgrade_assistant/public/application/components/es_deprecations/es_deprecations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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…',
Expand Down Expand Up @@ -136,8 +136,7 @@ export const EsDeprecations = withRouter(({ history }: RouteComponentProps) => {
pageTitle={i18nTexts.pageTitle}
description={
<>
{i18nTexts.pageDescription}
{getBatchReindexLink(docLinks)}
{i18nTexts.pageDescription} {getBatchReindexLink(docLinks)}
</>
}
>
Expand Down
1 change: 1 addition & 0 deletions x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
3 changes: 3 additions & 0 deletions x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
]);
Expand Down