Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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
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
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