Skip to content

Commit a0ca05e

Browse files
committed
[Upgrade Assistant] Overview page redesign (#106521)
1 parent 4a0e2ef commit a0ca05e

63 files changed

Lines changed: 1975 additions & 1125 deletions

Some content is hidden

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

src/core/public/doc_links/doc_links_service.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ export class DocLinksService {
199199
transportSettings: `${ELASTICSEARCH_DOCS}modules-network.html#common-network-settings`,
200200
typesRemoval: `${ELASTICSEARCH_DOCS}removal-of-types.html`,
201201
deprecationLogging: `${ELASTICSEARCH_DOCS}logging.html#deprecation-logging`,
202+
setupUpgrade: `${ELASTICSEARCH_DOCS}setup-upgrade.html`,
203+
releaseHighlights: `${ELASTICSEARCH_DOCS}release-highlights.html`,
202204
},
203205
siem: {
204206
guide: `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/index.html`,

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24990,7 +24990,6 @@
2499024990
"xpack.upgradeAssistant.deprecationListSearchBar.placeholderAriaLabel": "フィルター",
2499124991
"xpack.upgradeAssistant.deprecationListSearchBar.placeholderLabel": "フィルター",
2499224992
"xpack.upgradeAssistant.deprecationListSearchBar.reloadButtonLabel": "再読み込み",
24993-
"xpack.upgradeAssistant.deprecationLoggingDescription.deprecationLoggingLink": "廃止予定ログ",
2499424993
"xpack.upgradeAssistant.emptyPrompt.learnMoreDescription": "{nextMajor}への移行に関する詳細をご覧ください。",
2499524994
"xpack.upgradeAssistant.emptyPrompt.title": "{uaVersion} アップグレードアシスタント",
2499624995
"xpack.upgradeAssistant.emptyPrompt.upgradeAssistantDescription": "アップグレードアシスタントはクラスターの廃止予定の設定を特定し、アップグレード前に問題を解決できるようにします。Elastic {nextMajor}にアップグレードするときにここに戻って確認してください。",
@@ -25012,9 +25011,7 @@
2501225011
"xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsTitle": "重大",
2501325012
"xpack.upgradeAssistant.esDeprecationStats.loadingText": "Elasticsearchの廃止統計情報を読み込んでいます...",
2501425013
"xpack.upgradeAssistant.esDeprecationStats.statsTitle": "Elasticsearch",
25015-
"xpack.upgradeAssistant.esDeprecationStats.totalDeprecationsTitle": "廃止予定",
2501625014
"xpack.upgradeAssistant.esDeprecationStats.totalDeprecationsTooltip": "このクラスターは{clusterCount}個の廃止予定のクラスター設定と{indexCount}個の廃止予定のインデックス設定を使用しています。",
25017-
"xpack.upgradeAssistant.esDeprecationStats.viewDeprecationsLinkText": "廃止予定を表示",
2501825015
"xpack.upgradeAssistant.kibanaDeprecationErrors.loadingErrorDescription": "エラーについては、Kibanaサーバーログを確認してください。",
2501925016
"xpack.upgradeAssistant.kibanaDeprecationErrors.loadingErrorTitle": "Kibana廃止予定を取得できませんでした",
2502025017
"xpack.upgradeAssistant.kibanaDeprecationErrors.pluginErrorDescription": "エラーについては、Kibanaサーバーログを確認してください。",
@@ -25038,33 +25035,19 @@
2503825035
"xpack.upgradeAssistant.kibanaDeprecationStats.loadingErrorMessage": "Kibana廃止予定の取得中にエラーが発生しました。",
2503925036
"xpack.upgradeAssistant.kibanaDeprecationStats.loadingText": "Kibana廃止予定統計情報を読み込んでいます…",
2504025037
"xpack.upgradeAssistant.kibanaDeprecationStats.statsTitle": "Kibana",
25041-
"xpack.upgradeAssistant.kibanaDeprecationStats.totalDeprecationsLabel": "Kibanaには合計{totalDeprecations}個の廃止予定があります",
25042-
"xpack.upgradeAssistant.kibanaDeprecationStats.totalDeprecationsTitle": "廃止予定",
25043-
"xpack.upgradeAssistant.kibanaDeprecationStats.viewDeprecationsLinkText": "廃止予定を表示",
2504425038
"xpack.upgradeAssistant.noDeprecationsPrompt.description": "構成は最新です。",
2504525039
"xpack.upgradeAssistant.noDeprecationsPrompt.nextStepsDescription": "他のスタック廃止予定については、{overviewButton}を確認してください。",
2504625040
"xpack.upgradeAssistant.noDeprecationsPrompt.overviewLinkText": "概要ページ",
2504725041
"xpack.upgradeAssistant.noDeprecationsPrompt.title": "アップグレードする準備ができました。",
25048-
"xpack.upgradeAssistant.overview.deprecationLogging.loadingLabel": "ロギング状態を取得しています",
25049-
"xpack.upgradeAssistant.overview.deprecationLoggingDescription": "{deprecationLoggingLink}を有効にすると、Elastic {nextMajor}にアップグレードした後に使用できない廃止予定の機能を使用しているかどうかがわかります。",
25050-
"xpack.upgradeAssistant.overview.deprecationLoggingTitle": "廃止ログ",
25051-
"xpack.upgradeAssistant.overview.deprecationLogs.disableButtonLabel": "廃止ログを無効にする",
2505225042
"xpack.upgradeAssistant.overview.deprecationLogs.disabledToastMessage": "廃止予定のアクションをログに出力しません。",
25053-
"xpack.upgradeAssistant.overview.deprecationLogs.disablingButtonLabel": "廃止ログを無効にしています",
25054-
"xpack.upgradeAssistant.overview.deprecationLogs.enableButtonLabel": "廃止ログを有効にする",
2505525043
"xpack.upgradeAssistant.overview.deprecationLogs.enabledToastMessage": "廃止予定のアクションをログに出力します。",
25056-
"xpack.upgradeAssistant.overview.deprecationLogs.enablingButtonLabel": "廃止ログを有効にしています",
25057-
"xpack.upgradeAssistant.overview.deprecationLogs.fetchErrorButtonLabel": "廃止ログがありません",
2505825044
"xpack.upgradeAssistant.overview.deprecationLogs.fetchErrorMessage": "ログ情報を取得できませんでした。",
2505925045
"xpack.upgradeAssistant.overview.deprecationLogs.reloadButtonLabel": "再試行",
2506025046
"xpack.upgradeAssistant.overview.deprecationLogs.updateErrorMessage": "ログ状態を更新できませんでした。",
2506125047
"xpack.upgradeAssistant.overview.documentationLinkText": "ドキュメント",
2506225048
"xpack.upgradeAssistant.overview.pageDescription": "廃止予定の設定を特定し、構成を更新して、アップグレードの準備を行います。",
2506325049
"xpack.upgradeAssistant.overview.pageTitle": "アップグレードアシスタント",
2506425050
"xpack.upgradeAssistant.reindex.reindexPrivilegesErrorBatch": "「{indexName}」に再インデックスするための権限が不十分です。",
25065-
"xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.breackingChangesDocButtonLabel": "廃止と互換性を破る変更",
25066-
"xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.calloutDetail": "Elasticsearch {nextEsVersion} の {breakingChangesDocButton} の完全なリストは、最終の {currentEsVersion} マイナーリリースで確認できます。この警告は、リストがすべて解決されると消えます。",
25067-
"xpack.upgradeAssistant.tabs.incompleteCallout.calloutTitle": "リストの問題がすべて解決されていない可能性があります。",
2506825051
"xpack.uptime.addDataButtonLabel": "データの追加",
2506925052
"xpack.uptime.alerts.anomaly.criteriaExpression.ariaLabel": "選択したモニターの条件を表示する式。",
2507025053
"xpack.uptime.alerts.anomaly.criteriaExpression.description": "監視するとき",

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25371,7 +25371,6 @@
2537125371
"xpack.upgradeAssistant.deprecationListSearchBar.placeholderAriaLabel": "筛选",
2537225372
"xpack.upgradeAssistant.deprecationListSearchBar.placeholderLabel": "筛选",
2537325373
"xpack.upgradeAssistant.deprecationListSearchBar.reloadButtonLabel": "重新加载",
25374-
"xpack.upgradeAssistant.deprecationLoggingDescription.deprecationLoggingLink": "弃用日志记录",
2537525374
"xpack.upgradeAssistant.emptyPrompt.learnMoreDescription": "详细了解如何迁移到 {nextMajor}。",
2537625375
"xpack.upgradeAssistant.emptyPrompt.title": "{uaVersion} 升级助手",
2537725376
"xpack.upgradeAssistant.emptyPrompt.upgradeAssistantDescription": "升级助手识别集群中弃用的设置,帮助您在升级前解决问题。需要升级到 Elastic {nextMajor} 时,回到这里查看。",
@@ -25393,9 +25392,7 @@
2539325392
"xpack.upgradeAssistant.esDeprecationStats.criticalDeprecationsTitle": "紧急",
2539425393
"xpack.upgradeAssistant.esDeprecationStats.loadingText": "正在加载 Elasticsearch 弃用统计……",
2539525394
"xpack.upgradeAssistant.esDeprecationStats.statsTitle": "Elasticsearch",
25396-
"xpack.upgradeAssistant.esDeprecationStats.totalDeprecationsTitle": "弃用",
2539725395
"xpack.upgradeAssistant.esDeprecationStats.totalDeprecationsTooltip": "此集群正在使用 {clusterCount} 个已弃用集群设置和 {indexCount} 个已弃用的索引设置",
25398-
"xpack.upgradeAssistant.esDeprecationStats.viewDeprecationsLinkText": "查看弃用",
2539925396
"xpack.upgradeAssistant.kibanaDeprecationErrors.loadingErrorDescription": "请在 Kibana 服务器日志中查看错误。",
2540025397
"xpack.upgradeAssistant.kibanaDeprecationErrors.loadingErrorTitle": "无法检索 Kibana 弃用",
2540125398
"xpack.upgradeAssistant.kibanaDeprecationErrors.pluginErrorDescription": "请在 Kibana 服务器日志中查看错误。",
@@ -25419,33 +25416,19 @@
2541925416
"xpack.upgradeAssistant.kibanaDeprecationStats.loadingErrorMessage": "检索 Kibana 弃用时发生错误。",
2542025417
"xpack.upgradeAssistant.kibanaDeprecationStats.loadingText": "正在加载 Kibana 弃用统计……",
2542125418
"xpack.upgradeAssistant.kibanaDeprecationStats.statsTitle": "Kibana",
25422-
"xpack.upgradeAssistant.kibanaDeprecationStats.totalDeprecationsLabel": "Kibana 总共有 {totalDeprecations} 个弃用",
25423-
"xpack.upgradeAssistant.kibanaDeprecationStats.totalDeprecationsTitle": "弃用",
25424-
"xpack.upgradeAssistant.kibanaDeprecationStats.viewDeprecationsLinkText": "查看弃用",
2542525419
"xpack.upgradeAssistant.noDeprecationsPrompt.description": "您的配置是最新的。",
2542625420
"xpack.upgradeAssistant.noDeprecationsPrompt.nextStepsDescription": "查看{overviewButton}以了解其他 Stack 弃用。",
2542725421
"xpack.upgradeAssistant.noDeprecationsPrompt.overviewLinkText": "“概览”页面",
2542825422
"xpack.upgradeAssistant.noDeprecationsPrompt.title": "准备好升级!",
25429-
"xpack.upgradeAssistant.overview.deprecationLogging.loadingLabel": "正在检索日志记录状态",
25430-
"xpack.upgradeAssistant.overview.deprecationLoggingDescription": "启用{deprecationLoggingLink}以查看是否正在使用升级到 Elastic {nextMajor} 后将不再可用的已弃用功能。",
25431-
"xpack.upgradeAssistant.overview.deprecationLoggingTitle": "弃用日志",
25432-
"xpack.upgradeAssistant.overview.deprecationLogs.disableButtonLabel": "禁用弃用日志记录",
2543325423
"xpack.upgradeAssistant.overview.deprecationLogs.disabledToastMessage": "不记录弃用的操作。",
25434-
"xpack.upgradeAssistant.overview.deprecationLogs.disablingButtonLabel": "正在禁用弃用日志记录",
25435-
"xpack.upgradeAssistant.overview.deprecationLogs.enableButtonLabel": "启用弃用日志记录",
2543625424
"xpack.upgradeAssistant.overview.deprecationLogs.enabledToastMessage": "记录弃用的操作。",
25437-
"xpack.upgradeAssistant.overview.deprecationLogs.enablingButtonLabel": "正在启用弃用日志记录",
25438-
"xpack.upgradeAssistant.overview.deprecationLogs.fetchErrorButtonLabel": "弃用日志记录不可用",
2543925425
"xpack.upgradeAssistant.overview.deprecationLogs.fetchErrorMessage": "无法检索日志记录信息。",
2544025426
"xpack.upgradeAssistant.overview.deprecationLogs.reloadButtonLabel": "重试",
2544125427
"xpack.upgradeAssistant.overview.deprecationLogs.updateErrorMessage": "无法更新日志记录状态。",
2544225428
"xpack.upgradeAssistant.overview.documentationLinkText": "文档",
2544325429
"xpack.upgradeAssistant.overview.pageDescription": "通过识别弃用的设置并更新配置来准备升级。",
2544425430
"xpack.upgradeAssistant.overview.pageTitle": "升级助手",
2544525431
"xpack.upgradeAssistant.reindex.reindexPrivilegesErrorBatch": "您没有足够的权限重新索引“{indexName}”。",
25446-
"xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.breackingChangesDocButtonLabel": "弃用内容和重大更改",
25447-
"xpack.upgradeAssistant.tabs.incompleteCallout.calloutBody.calloutDetail": "Elasticsearch {nextEsVersion} 中的 {breakingChangesDocButton} 完整列表将在最终的 {currentEsVersion} 次要版本中提供。完成列表后,此警告将消失。",
25448-
"xpack.upgradeAssistant.tabs.incompleteCallout.calloutTitle": "问题列表可能不完整",
2544925432
"xpack.uptime.addDataButtonLabel": "添加数据",
2545025433
"xpack.uptime.alerts.anomaly.criteriaExpression.ariaLabel": "显示选定监测的条件的表达式。",
2545125434
"xpack.uptime.alerts.anomaly.criteriaExpression.description": "当监测",

x-pack/plugins/upgrade_assistant/__jest__/client_integration/cluster.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,10 @@ describe('Cluster tab', () => {
4343

4444
beforeEach(async () => {
4545
httpRequestsMockHelpers.setLoadEsDeprecationsResponse(esDeprecationsMockResponse);
46-
httpRequestsMockHelpers.setLoadDeprecationLoggingResponse({ isEnabled: true });
46+
httpRequestsMockHelpers.setLoadDeprecationLoggingResponse({
47+
isDeprecationLogIndexingEnabled: true,
48+
isDeprecationLoggingEnabled: true,
49+
});
4750

4851
await act(async () => {
4952
testBed = await setupClusterPage({ isReadOnlyMode: false });

x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/http_requests.ts

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

88
import sinon, { SinonFakeServer } from 'sinon';
99
import { API_BASE_PATH } from '../../../common/constants';
10-
import { ESUpgradeStatus } from '../../../common/types';
10+
import { ESUpgradeStatus, DeprecationLoggingStatus } from '../../../common/types';
1111
import { ResponseError } from '../../../public/application/lib/api';
1212

1313
// Register helpers to mock HTTP Requests
@@ -24,7 +24,7 @@ const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
2424
};
2525

2626
const setLoadDeprecationLoggingResponse = (
27-
response?: { isEnabled: boolean },
27+
response?: DeprecationLoggingStatus,
2828
error?: ResponseError
2929
) => {
3030
const status = error ? error.statusCode || 400 : 200;
@@ -38,7 +38,7 @@ const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
3838
};
3939

4040
const setUpdateDeprecationLoggingResponse = (
41-
response?: { isEnabled: boolean },
41+
response?: DeprecationLoggingStatus,
4242
error?: ResponseError
4343
) => {
4444
const status = error ? error.statusCode || 400 : 200;

x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/overview.helpers.ts

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

88
import { act } from 'react-dom/test-utils';
99
import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
10-
import { DeprecationsOverview } from '../../../public/application/components/overview';
10+
import { Overview } from '../../../public/application/components/overview';
1111
import { WithAppDependencies } from './setup_environment';
1212

1313
const testBedConfig: TestBedConfig = {
@@ -31,7 +31,7 @@ const createActions = (testBed: TestBed) => {
3131
const { find, component } = testBed;
3232

3333
await act(async () => {
34-
find('upgradeAssistantDeprecationToggle').simulate('click');
34+
find('deprecationLoggingToggle').simulate('click');
3535
});
3636

3737
component.update();
@@ -43,10 +43,7 @@ const createActions = (testBed: TestBed) => {
4343
};
4444

4545
export const setup = async (overrides?: Record<string, unknown>): Promise<OverviewTestBed> => {
46-
const initTestBed = registerTestBed(
47-
WithAppDependencies(DeprecationsOverview, overrides),
48-
testBedConfig
49-
);
46+
const initTestBed = registerTestBed(WithAppDependencies(Overview, overrides), testBedConfig);
5047
const testBed = await initTestBed();
5148

5249
return {
@@ -56,21 +53,27 @@ export const setup = async (overrides?: Record<string, unknown>): Promise<Overvi
5653
};
5754

5855
export type OverviewTestSubjects =
59-
| 'overviewPageContent'
6056
| 'esStatsPanel'
61-
| 'esStatsPanel.totalDeprecations'
57+
| 'esStatsPanel.warningDeprecations'
6258
| 'esStatsPanel.criticalDeprecations'
6359
| 'kibanaStatsPanel'
64-
| 'kibanaStatsPanel.totalDeprecations'
60+
| 'kibanaStatsPanel.warningDeprecations'
6561
| 'kibanaStatsPanel.criticalDeprecations'
6662
| 'deprecationLoggingFormRow'
67-
| 'requestErrorIconTip'
63+
| 'esRequestErrorIconTip'
64+
| 'kibanaRequestErrorIconTip'
6865
| 'partiallyUpgradedErrorIconTip'
6966
| 'upgradedErrorIconTip'
7067
| 'unauthorizedErrorIconTip'
7168
| 'upgradedPrompt'
7269
| 'partiallyUpgradedPrompt'
73-
| 'upgradeAssistantDeprecationToggle'
70+
| 'deprecationLoggingToggle'
7471
| 'updateLoggingError'
7572
| 'fetchLoggingError'
73+
| 'noDeprecationsLabel'
74+
| 'viewObserveLogs'
75+
| 'viewDiscoverLogs'
76+
| 'upgradeSetupDocsLink'
77+
| 'upgradeSetupCloudLink'
78+
| 'deprecationWarningCallout'
7679
| 'upgradeStatusError';
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
8+
import { dataPluginMock } from '../../../../../../src/plugins/data/public/mocks';
9+
import { discoverPluginMock } from '../../../../../../src/plugins/discover/public/mocks';
10+
import { applicationServiceMock } from '../../../../../../src/core/public/application/application_service.mock';
11+
12+
const discoverMock = discoverPluginMock.createStartContract();
13+
14+
export const servicesMock = {
15+
data: dataPluginMock.createStartContract(),
16+
application: applicationServiceMock.createStartContract(),
17+
discover: {
18+
...discoverMock,
19+
locator: {
20+
...discoverMock.locator,
21+
getLocation: jest.fn(() =>
22+
Promise.resolve({
23+
app: '/discover',
24+
path: 'logs',
25+
state: {},
26+
})
27+
),
28+
},
29+
},
30+
};

x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/setup_environment.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ import {
1414
deprecationsServiceMock,
1515
docLinksServiceMock,
1616
notificationServiceMock,
17+
applicationServiceMock,
1718
} from 'src/core/public/mocks';
1819
import { HttpSetup } from 'src/core/public';
1920

21+
import { KibanaContextProvider } from '../../../public/shared_imports';
2022
import { mockKibanaSemverVersion } from '../../../common/constants';
2123
import { AppContextProvider } from '../../../public/application/app_context';
2224
import { apiService } from '../../../public/application/lib/api';
2325
import { breadcrumbService } from '../../../public/application/lib/breadcrumbs';
26+
import { servicesMock } from './services_mock';
2427
import { init as initHttpRequests } from './http_requests';
2528

2629
const mockHttpClient = axios.create({ adapter: axiosXhrAdapter });
@@ -39,18 +42,22 @@ export const WithAppDependencies = (Comp: any, overrides: Record<string, unknown
3942
prevMajor: mockKibanaSemverVersion.major - 1,
4043
nextMajor: mockKibanaSemverVersion.major + 1,
4144
},
42-
isReadOnlyMode: false,
4345
notifications: notificationServiceMock.createStartContract(),
46+
isReadOnlyMode: false,
4447
api: apiService,
4548
breadcrumbs: breadcrumbService,
46-
getUrlForApp: () => '',
49+
getUrlForApp: applicationServiceMock.createStartContract().getUrlForApp,
4750
deprecations: deprecationsServiceMock.createStartContract(),
4851
};
4952

53+
const { servicesOverrides, ...contextOverrides } = overrides;
54+
5055
return (
51-
<AppContextProvider value={{ ...contextValue, ...overrides }}>
52-
<Comp {...props} />
53-
</AppContextProvider>
56+
<KibanaContextProvider services={{ ...servicesMock, ...(servicesOverrides as {}) }}>
57+
<AppContextProvider value={{ ...contextValue, ...contextOverrides }}>
58+
<Comp {...props} />
59+
</AppContextProvider>
60+
</KibanaContextProvider>
5461
);
5562
};
5663

x-pack/plugins/upgrade_assistant/__jest__/client_integration/indices.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ describe('Indices tab', () => {
3939

4040
beforeEach(async () => {
4141
httpRequestsMockHelpers.setLoadEsDeprecationsResponse(esDeprecationsMockResponse);
42-
httpRequestsMockHelpers.setLoadDeprecationLoggingResponse({ isEnabled: true });
42+
httpRequestsMockHelpers.setLoadDeprecationLoggingResponse({
43+
isDeprecationLogIndexingEnabled: true,
44+
isDeprecationLoggingEnabled: true,
45+
});
4346

4447
await act(async () => {
4548
testBed = await setupIndicesPage({ isReadOnlyMode: false });

0 commit comments

Comments
 (0)