Skip to content

Commit cd9da66

Browse files
alisonelizabethalisonelizabeth
authored
[7.x] [Upgrade Assistant] Align code between branches (#91862) (#92718)
* [Upgrade Assistant] Align code between branches (#91862) # Conflicts: # x-pack/plugins/translations/translations/ja-JP.json # x-pack/plugins/translations/translations/zh-CN.json # x-pack/plugins/upgrade_assistant/common/types.ts # x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx # x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx # x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx # x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/__snapshots__/warning_step.test.tsx.snap # x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warning_step.test.tsx # x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/reindex/flyout/warnings_step.tsx # x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts # x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts # x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts # x-pack/plugins/upgrade_assistant/server/lib/reindexing/types.ts * fix backport
1 parent e98eba2 commit cd9da66

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+241
-3346
lines changed

‎x-pack/plugins/translations/translations/ja-JP.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21493,10 +21493,6 @@
2149321493
"xpack.upgradeAssistant.checkupTab.deprecations.indexTable.indexColumnLabel": "インデックス",
2149421494
"xpack.upgradeAssistant.checkupTab.deprecations.warningActionTooltip": "アップグレード前にこの問題を解決することをお勧めしますが、必須ではありません。",
2149521495
"xpack.upgradeAssistant.checkupTab.deprecations.warningLabel": "警告",
21496-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.failedLabel": "失敗",
21497-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.fixedLabel": "修正済み",
21498-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.fixingLabel": "修正中…",
21499-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.reindexLabel": "修正",
2150021496
"xpack.upgradeAssistant.checkupTab.indexLabel": "インデックス",
2150121497
"xpack.upgradeAssistant.checkupTab.indicesBadgeLabel": "{numIndices, plural, other {インデックス}}",
2150221498
"xpack.upgradeAssistant.checkupTab.indicesTabLabel": "インデックス",
@@ -21506,8 +21502,6 @@
2150621502
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesLabel": "{strongCheckupLabel} の問題がありません。",
2150721503
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesTitle": "完璧です！",
2150821504
"xpack.upgradeAssistant.checkupTab.numDeprecationsShownLabel": "{total} 件中 {numShown} 件を表示中",
21509-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.apmIndexPatternCallout.apmSetupLinkLabel": "APMのセットアップ手順",
21510-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.apmIndexPatternCallout.calloutTitle": "APMインデックスの再インデックス後、{apmSetupLink}に戻ってKibanaオブジェクトを再度読み込んでください。これは1度だけ必要な作業です。",
2151121505
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "キャンセル",
2151221506
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "閉じる",
2151321507
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.continueButtonLabel": "再インデックスを続ける",
@@ -21538,10 +21532,6 @@
2153821532
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutDetails.reindexingTakesLongerEmphasis": "再インデックスには通常よりも時間がかかることがあります",
2153921533
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutTitle": "インデックスが閉じました",
2154021534
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.openAndCloseDocumentation": "ドキュメンテーション",
21541-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.apmReindexWarningDetail": "バージョン 7.0.0 以降、APM データは Elastic Common Schema で表示されます。過去の APM データは再インデックスされるまで表示されません。",
21542-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.apmReindexWarningTitle": "このインデックスは ECS 形式に変換されます",
21543-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningDetail": "マッピングタイプは8.xではサポートされていません。このインデックスマッピングはデフォルトのタイプ名、{defaultType}を使用しておらず、再インデックス時に更新されます。アプリケーションコードまたはスクリプトが異なるタイプに依存していないことを確認してください。",
21544-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningTitle": "マッピングタイプが{defaultType}に変更されます",
2154521535
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.destructiveCallout.calloutDetail": "インデックスをバックアップして、互換性を破るそれぞれの変更に同意することで再インデックスしてください。",
2154621536
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.destructiveCallout.calloutTitle": "このインデックスには元に戻すことのできない破壊的な変更が含まれています",
2154721537
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.documentationLinkLabel": "ドキュメント",

‎x-pack/plugins/translations/translations/zh-CN.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21543,10 +21543,6 @@
2154321543
"xpack.upgradeAssistant.checkupTab.deprecations.indexTable.indexColumnLabel": "索引",
2154421544
"xpack.upgradeAssistant.checkupTab.deprecations.warningActionTooltip": "建议在升级之前先解决此问题，但这不是必需的。",
2154521545
"xpack.upgradeAssistant.checkupTab.deprecations.warningLabel": "警告",
21546-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.failedLabel": "失败",
21547-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.fixedLabel": "已修复",
21548-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.fixingLabel": "正在修复……",
21549-
"xpack.upgradeAssistant.checkupTab.fixMetricbeatIndexButton.reindexLabel": "修复",
2155021546
"xpack.upgradeAssistant.checkupTab.indexLabel": "索引",
2155121547
"xpack.upgradeAssistant.checkupTab.indicesBadgeLabel": "{numIndices, plural, other { 个索引}}",
2155221548
"xpack.upgradeAssistant.checkupTab.indicesTabLabel": "索引",
@@ -21556,8 +21552,6 @@
2155621552
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesLabel": "您没有 {strongCheckupLabel} 问题。",
2155721553
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesTitle": "全部清除！",
2155821554
"xpack.upgradeAssistant.checkupTab.numDeprecationsShownLabel": "显示 {numShown} 个，共 {total} 个",
21559-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.apmIndexPatternCallout.apmSetupLinkLabel": "APM 设置说明",
21560-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.apmIndexPatternCallout.calloutTitle": "重新索引 APM 索引后，返回 {apmSetupLink} 以重新加载 Kibana 对象。您只需执行一次此操作。",
2156121555
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "取消",
2156221556
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "关闭",
2156321557
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.continueButtonLabel": "继续重新索引",
@@ -21588,10 +21582,6 @@
2158821582
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutDetails.reindexingTakesLongerEmphasis": "重新索引可能比通常花费更多的时间",
2158921583
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.indexClosedCallout.calloutTitle": "索引已关闭",
2159021584
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.openAndCloseDocumentation": "文档",
21591-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.apmReindexWarningDetail": "从版本 7.0.0 开始，将以 Elastic Common Schema 格式表示 APM 数据。只有重新索引历史 APM 数据后，其才可见。",
21592-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.apmReindexWarningTitle": "此索引将转换成 ECS 格式",
21593-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningDetail": "映射类型在 8.x 中不再受支持。此索引映射不使用默认类型名称 {defaultType}，并将在重新索引时更新。确保没有应用程序代码或脚本依赖其他类型。",
21594-
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.customTypeNameWarningTitle": "映射类型将更改为 {defaultType}",
2159521585
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.destructiveCallout.calloutDetail": "备份您的索引，然后通过接受每个重大更改来继续重新索引。",
2159621586
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.destructiveCallout.calloutTitle": "此索引需要无法撤消的破坏性更改",
2159721587
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.warningsStep.documentationLinkLabel": "文档",

‎x-pack/plugins/upgrade_assistant/common/constants.ts‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the Elastic License
4+
* 2.0; you may not use this file except in compliance with the Elastic License
5+
* 2.0.
6+
*/
7+
import SemVer from 'semver/classes/semver';
8+
9+
/*
10+
* These constants are used only in tests to add conditional logic based on Kibana version
11+
* On master, the version should represent the next major version (e.g., master --> 8.0.0)
12+
* The release branch should match the release version (e.g., 7.x --> 7.0.0)
13+
*/
14+
export const mockKibanaVersion = '7.0.0';
15+
export const mockKibanaSemverVersion = new SemVer(mockKibanaVersion);

‎x-pack/plugins/upgrade_assistant/common/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ export type ReindexSavedObject = SavedObject<ReindexOperation>;
9494

9595
export enum ReindexWarning {
9696
// 7.0 -> 8.0 warnings
97-
apmReindex,
9897
customTypeName,
98+
99+
// 8.0 -> 9.0 warnings
99100
}
100101

101102
export enum IndexGroup {

‎x-pack/plugins/upgrade_assistant/kibana.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"server": true,
55
"ui": true,
66
"configPath": ["xpack", "upgrade_assistant"],
7-
"requiredPlugins": ["management", "licensing", "apmOss", "features"],
7+
"requiredPlugins": ["management", "licensing", "features"],
88
"optionalPlugins": ["cloud", "usageCollection"]
99
}

‎x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
*/
77

88
import React from 'react';
9-
import SemVer from 'semver/classes/semver';
109
import { mountWithIntl } from '@kbn/test/jest';
1110
import { httpServiceMock } from 'src/core/public/mocks';
11+
import { mockKibanaSemverVersion } from '../../../common/constants';
1212
import { UpgradeAssistantTabs } from './tabs';
1313
import { LoadingState } from './types';
1414

@@ -18,7 +18,6 @@ import { OverviewTab } from './tabs/overview';
1818
const promisesToResolve = () => new Promise((resolve) => setTimeout(resolve, 0));
1919

2020
const mockHttp = httpServiceMock.createSetupContract();
21-
const mockKibanaVersion = new SemVer('7.0.0');
2221

2322
jest.mock('../app_context', () => {
2423
return {
@@ -29,9 +28,9 @@ jest.mock('../app_context', () => {
2928
ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
3029
},
3130
kibanaVersionInfo: {
32-
currentMajor: mockKibanaVersion.major,
33-
prevMajor: mockKibanaVersion.major - 1,
34-
nextMajor: mockKibanaVersion.major + 1,
31+
currentMajor: mockKibanaSemverVersion.major,
32+
prevMajor: mockKibanaSemverVersion.major - 1,
33+
nextMajor: mockKibanaSemverVersion.major + 1,
3534
},
3635
};
3736
},

‎x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import { shallow } from 'enzyme';
99
import React from 'react';
10-
import SemVer from 'semver/classes/semver';
10+
import { mockKibanaSemverVersion } from '../../../../../common/constants';
1111

1212
import { LoadingState } from '../../types';
1313
import AssistanceData from '../__fixtures__/checkup_api_response.json';
@@ -22,8 +22,6 @@ const defaultProps = {
2222
setSelectedTabIndex: jest.fn(),
2323
};
2424

25-
const mockKibanaVersion = new SemVer('7.0.0');
26-
2725
jest.mock('../../../app_context', () => {
2826
return {
2927
useAppContext: () => {
@@ -33,9 +31,9 @@ jest.mock('../../../app_context', () => {
3331
ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
3432
},
3533
kibanaVersionInfo: {
36-
currentMajor: mockKibanaVersion.major,
37-
prevMajor: mockKibanaVersion.major - 1,
38-
nextMajor: mockKibanaVersion.major + 1,
34+
currentMajor: mockKibanaSemverVersion.major,
35+
prevMajor: mockKibanaSemverVersion.major - 1,
36+
nextMajor: mockKibanaSemverVersion.major + 1,
3937
},
4038
};
4139
},

‎x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
EuiTitle,
1818
} from '@elastic/eui';
1919
import { FormattedMessage } from '@kbn/i18n/react';
20-
import { FixDefaultFieldsButton } from './default_fields/button';
2120
import { ReindexButton } from './reindex';
2221
import { AppContext } from '../../../../app_context';
2322
import { EnrichedDeprecationInfo } from '../../../../../../common/types';
@@ -99,14 +98,6 @@ export const DeprecationCell: FunctionComponent<DeprecationCellProps> = ({
9998
</AppContext.Consumer>
10099
</EuiFlexItem>
101100
)}
102-
103-
{needsDefaultFields && (
104-
<EuiFlexItem grow={false}>
105-
<AppContext.Consumer>
106-
{({ http }) => <FixDefaultFieldsButton indexName={indexName!} http={http} />}
107-
</AppContext.Consumer>
108-
</EuiFlexItem>
109-
)}
110101
</EuiFlexGroup>
111102

112103
<EuiSpacer size="s" />

‎x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/default_fields/button.tsx‎

Lines changed: 0 additions & 133 deletions
This file was deleted.

‎x-pack/plugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import React from 'react';
1010

1111
import { EuiBasicTable } from '@elastic/eui';
1212
import { i18n } from '@kbn/i18n';
13-
import { FixDefaultFieldsButton } from './default_fields/button';
1413
import { ReindexButton } from './reindex';
1514
import { AppContext } from '../../../../app_context';
1615
import { EnrichedDeprecationInfo } from '../../../../../../common/types';
@@ -145,40 +144,32 @@ export class IndexDeprecationTable extends React.Component<
145144

146145
private generateActionsColumn() {
147146
// NOTE: this naive implementation assumes all indices in the table are
148-
// should show the reindex button. This should work for known usecases.
147+
// should show the reindex button. This should work for known use cases.
149148
const { indices } = this.props;
150-
const showReindexButton = indices.find((i) => i.reindex === true);
151-
const showNeedsDefaultFieldsButton = indices.find((i) => i.needsDefaultFields === true);
152-
if (!showReindexButton && !showNeedsDefaultFieldsButton) {
149+
const hasActionsColumn = Boolean(indices.find((i) => i.reindex === true));
150+
151+
if (hasActionsColumn === false) {
153152
return null;
154153
}
155154

156155
return {
157156
actions: [
158157
{
159158
render(indexDep: IndexDeprecationDetails) {
160-
if (showReindexButton) {
161-
return (
162-
<AppContext.Consumer>
163-
{({ http, docLinks }) => {
164-
return (
165-
<ReindexButton
166-
docLinks={docLinks}
167-
reindexBlocker={indexDep.blockerForReindexing}
168-
indexName={indexDep.index!}
169-
http={http}
170-
/>
171-
);
172-
}}
173-
</AppContext.Consumer>
174-
);
175-
} else {
176-
return (
177-
<AppContext.Consumer>
178-
{({ http }) => <FixDefaultFieldsButton indexName={indexDep.index!} http={http} />}
179-
</AppContext.Consumer>
180-
);
181-
}
159+
return (
160+
<AppContext.Consumer>
161+
{({ http, docLinks }) => {
162+
return (
163+
<ReindexButton
164+
docLinks={docLinks}
165+
reindexBlocker={indexDep.blockerForReindexing}
166+
indexName={indexDep.index!}
167+
http={http}
168+
/>
169+
);
170+
}}
171+
</AppContext.Consumer>
172+
);
182173
},
183174
},
184175
],

0 commit comments

Comments
 (0)