[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
elastic · Feb 25, 2021 · cd9da66 · cd9da66
1 parent e98eba2
commit cd9da66
Show file tree

Hide file tree

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

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

diff --git a/x-pack/plugins/upgrade_assistant/common/constants.ts b/x-pack/plugins/upgrade_assistant/common/constants.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import SemVer from 'semver/classes/semver';
+
+/*
+ * These constants are used only in tests to add conditional logic based on Kibana version
+ * On master, the version should represent the next major version (e.g., master --> 8.0.0)
+ * The release branch should match the release version (e.g., 7.x --> 7.0.0)
+ */
+export const mockKibanaVersion = '7.0.0';
+export const mockKibanaSemverVersion = new SemVer(mockKibanaVersion);
diff --git a/x-pack/plugins/upgrade_assistant/common/types.ts b/x-pack/plugins/upgrade_assistant/common/types.ts
@@ -94,8 +94,9 @@ export type ReindexSavedObject = SavedObject<ReindexOperation>;
 
 export enum ReindexWarning {
   // 7.0 -> 8.0 warnings
-  apmReindex,
   customTypeName,
+
+  // 8.0 -> 9.0 warnings
 }
 
 export enum IndexGroup {

diff --git a/x-pack/plugins/upgrade_assistant/kibana.json b/x-pack/plugins/upgrade_assistant/kibana.json
@@ -4,6 +4,6 @@
   "server": true,
   "ui": true,
   "configPath": ["xpack", "upgrade_assistant"],
-  "requiredPlugins": ["management", "licensing", "apmOss", "features"],
+  "requiredPlugins": ["management", "licensing", "features"],
   "optionalPlugins": ["cloud", "usageCollection"]
 }
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/tabs.test.tsx
@@ -6,9 +6,9 @@
  */
 
 import React from 'react';
-import SemVer from 'semver/classes/semver';
 import { mountWithIntl } from '@kbn/test/jest';
 import { httpServiceMock } from 'src/core/public/mocks';
+import { mockKibanaSemverVersion } from '../../../common/constants';
 import { UpgradeAssistantTabs } from './tabs';
 import { LoadingState } from './types';
 
@@ -18,7 +18,6 @@ import { OverviewTab } from './tabs/overview';
 const promisesToResolve = () => new Promise((resolve) => setTimeout(resolve, 0));
 
 const mockHttp = httpServiceMock.createSetupContract();
-const mockKibanaVersion = new SemVer('7.0.0');
 
 jest.mock('../app_context', () => {
   return {
@@ -29,9 +28,9 @@ jest.mock('../app_context', () => {
           ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
         },
         kibanaVersionInfo: {
-          currentMajor: mockKibanaVersion.major,
-          prevMajor: mockKibanaVersion.major - 1,
-          nextMajor: mockKibanaVersion.major + 1,
+          currentMajor: mockKibanaSemverVersion.major,
+          prevMajor: mockKibanaSemverVersion.major - 1,
+          nextMajor: mockKibanaSemverVersion.major + 1,
         },
       };
     },

diff --git a/...plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx b/...plugins/upgrade_assistant/public/application/components/tabs/checkup/checkup_tab.test.tsx
@@ -7,7 +7,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import SemVer from 'semver/classes/semver';
+import { mockKibanaSemverVersion } from '../../../../../common/constants';
 
 import { LoadingState } from '../../types';
 import AssistanceData from '../__fixtures__/checkup_api_response.json';
@@ -22,8 +22,6 @@ const defaultProps = {
   setSelectedTabIndex: jest.fn(),
 };
 
-const mockKibanaVersion = new SemVer('7.0.0');
-
 jest.mock('../../../app_context', () => {
   return {
     useAppContext: () => {
@@ -33,9 +31,9 @@ jest.mock('../../../app_context', () => {
           ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
         },
         kibanaVersionInfo: {
-          currentMajor: mockKibanaVersion.major,
-          prevMajor: mockKibanaVersion.major - 1,
-          nextMajor: mockKibanaVersion.major + 1,
+          currentMajor: mockKibanaSemverVersion.major,
+          prevMajor: mockKibanaSemverVersion.major - 1,
+          nextMajor: mockKibanaSemverVersion.major + 1,
         },
       };
     },

diff --git a/...lugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx b/...lugins/upgrade_assistant/public/application/components/tabs/checkup/deprecations/cell.tsx
@@ -17,7 +17,6 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { FixDefaultFieldsButton } from './default_fields/button';
 import { ReindexButton } from './reindex';
 import { AppContext } from '../../../../app_context';
 import { EnrichedDeprecationInfo } from '../../../../../../common/types';
@@ -99,14 +98,6 @@ export const DeprecationCell: FunctionComponent<DeprecationCellProps> = ({
           </AppContext.Consumer>
         </EuiFlexItem>
       )}
-
-      {needsDefaultFields && (
-        <EuiFlexItem grow={false}>
-          <AppContext.Consumer>
-            {({ http }) => <FixDefaultFieldsButton indexName={indexName!} http={http} />}
-          </AppContext.Consumer>
-        </EuiFlexItem>
-      )}
     </EuiFlexGroup>
 
     <EuiSpacer size="s" />

diff --git a/...sistant/public/application/components/tabs/checkup/deprecations/default_fields/button.tsx b/...sistant/public/application/components/tabs/checkup/deprecations/default_fields/button.tsx
diff --git a/...upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx b/...upgrade_assistant/public/application/components/tabs/checkup/deprecations/index_table.tsx
@@ -10,7 +10,6 @@ import React from 'react';
 
 import { EuiBasicTable } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FixDefaultFieldsButton } from './default_fields/button';
 import { ReindexButton } from './reindex';
 import { AppContext } from '../../../../app_context';
 import { EnrichedDeprecationInfo } from '../../../../../../common/types';
@@ -145,40 +144,32 @@ export class IndexDeprecationTable extends React.Component<
 
   private generateActionsColumn() {
     // NOTE: this naive implementation assumes all indices in the table are
-    // should show the reindex button. This should work for known usecases.
+    // should show the reindex button. This should work for known use cases.
     const { indices } = this.props;
-    const showReindexButton = indices.find((i) => i.reindex === true);
-    const showNeedsDefaultFieldsButton = indices.find((i) => i.needsDefaultFields === true);
-    if (!showReindexButton && !showNeedsDefaultFieldsButton) {
+    const hasActionsColumn = Boolean(indices.find((i) => i.reindex === true));
+
+    if (hasActionsColumn === false) {
       return null;
     }
 
     return {
       actions: [
         {
           render(indexDep: IndexDeprecationDetails) {
-            if (showReindexButton) {
-              return (
-                <AppContext.Consumer>
-                  {({ http, docLinks }) => {
-                    return (
-                      <ReindexButton
-                        docLinks={docLinks}
-                        reindexBlocker={indexDep.blockerForReindexing}
-                        indexName={indexDep.index!}
-                        http={http}
-                      />
-                    );
-                  }}
-                </AppContext.Consumer>
-              );
-            } else {
-              return (
-                <AppContext.Consumer>
-                  {({ http }) => <FixDefaultFieldsButton indexName={indexDep.index!} http={http} />}
-                </AppContext.Consumer>
-              );
-            }
+            return (
+              <AppContext.Consumer>
+                {({ http, docLinks }) => {
+                  return (
+                    <ReindexButton
+                      docLinks={docLinks}
+                      reindexBlocker={indexDep.blockerForReindexing}
+                      indexName={indexDep.index!}
+                      http={http}
+                    />
+                  );
+                }}
+              </AppContext.Consumer>
+            );
           },
         },
       ],