Skip to content

Commit 92ead83

Browse files
alisonelizabethalisonelizabeth
authored
[Upgrade Assistant] Support Kibana deprecations (#97159) (#98911)
1 parent 2837125 commit 92ead83

Some content is hidden

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

62 files changed

+2282
-957
lines changed

‎x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5314,7 +5314,10 @@
53145314
"deprecation_logging": {
53155315
"properties": {
53165316
"enabled": {
5317-
"type": "boolean"
5317+
"type": "boolean",
5318+
"_meta": {
5319+
"description": "Whether user has enabled Elasticsearch deprecation logging"
5320+
}
53185321
}
53195322
}
53205323
}
@@ -5323,13 +5326,28 @@
53235326
"ui_open": {
53245327
"properties": {
53255328
"cluster": {
5326-
"type": "long"
5329+
"type": "long",
5330+
"_meta": {
5331+
"description": "Number of times a user viewed the list of Elasticsearch cluster deprecations."
5332+
}
53275333
},
53285334
"indices": {
5329-
"type": "long"
5335+
"type": "long",
5336+
"_meta": {
5337+
"description": "Number of times a user viewed the list of Elasticsearch index deprecations."
5338+
}
53305339
},
53315340
"overview": {
5332-
"type": "long"
5341+
"type": "long",
5342+
"_meta": {
5343+
"description": "Number of times a user viewed the Overview page."
5344+
}
5345+
},
5346+
"kibana": {
5347+
"type": "long",
5348+
"_meta": {
5349+
"description": "Number of times a user viewed the list of Kibana deprecations"
5350+
}
53335351
}
53345352
}
53355353
},

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22111,15 +22111,9 @@
2211122111
"xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "無効なフォーマット。例：{exampleUrl}",
2211222112
"xpack.upgradeAssistant.appTitle": "{version} アップグレードアシスタント",
2211322113
"xpack.upgradeAssistant.checkupTab.changeFiltersShowMoreLabel": "より多く表示させるにはフィルターを変更します。",
22114-
"xpack.upgradeAssistant.checkupTab.controls.collapseAllButtonLabel": "すべて縮小",
22115-
"xpack.upgradeAssistant.checkupTab.controls.expandAllButtonLabel": "すべて拡張",
2211622114
"xpack.upgradeAssistant.checkupTab.controls.filterBar.criticalButtonLabel": "致命的",
22117-
"xpack.upgradeAssistant.checkupTab.controls.filterErrorMessageLabel": "フィルター無効：{searchTermError}",
2211822115
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel": "インデックス別",
2211922116
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel": "問題別",
22120-
"xpack.upgradeAssistant.checkupTab.controls.refreshButtonLabel": "更新",
22121-
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholder": "フィルター",
22122-
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholderAriaLabel": "フィルター",
2212322117
"xpack.upgradeAssistant.checkupTab.deprecations.criticalActionTooltip": "アップグレード前にこの問題を解決してください。",
2212422118
"xpack.upgradeAssistant.checkupTab.deprecations.criticalLabel": "致命的",
2212522119
"xpack.upgradeAssistant.checkupTab.deprecations.documentationButtonLabel": "ドキュメント",
@@ -22128,9 +22122,6 @@
2212822122
"xpack.upgradeAssistant.checkupTab.deprecations.warningActionTooltip": "アップグレード前にこの問題を解決することをお勧めしますが、必須ではありません。",
2212922123
"xpack.upgradeAssistant.checkupTab.deprecations.warningLabel": "警告",
2213022124
"xpack.upgradeAssistant.checkupTab.noDeprecationsLabel": "説明がありません",
22131-
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail": "{overviewTabButton} で次のステップを確認してください。",
22132-
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail.overviewTabButtonLabel": "概要タブ",
22133-
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesTitle": "完璧です！",
2213422125
"xpack.upgradeAssistant.checkupTab.numDeprecationsShownLabel": "{total} 件中 {numShown} 件を表示中",
2213522126
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "キャンセル",
2213622127
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "閉じる",

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22462,15 +22462,9 @@
2246222462
"xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "格式无效。例如：{exampleUrl}",
2246322463
"xpack.upgradeAssistant.appTitle": "{version} 升级助手",
2246422464
"xpack.upgradeAssistant.checkupTab.changeFiltersShowMoreLabel": "更改筛选以显示更多内容。",
22465-
"xpack.upgradeAssistant.checkupTab.controls.collapseAllButtonLabel": "折叠全部",
22466-
"xpack.upgradeAssistant.checkupTab.controls.expandAllButtonLabel": "展开全部",
2246722465
"xpack.upgradeAssistant.checkupTab.controls.filterBar.criticalButtonLabel": "紧急",
22468-
"xpack.upgradeAssistant.checkupTab.controls.filterErrorMessageLabel": "筛选无效：{searchTermError}",
2246922466
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel": "按索引",
2247022467
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel": "按问题",
22471-
"xpack.upgradeAssistant.checkupTab.controls.refreshButtonLabel": "刷新",
22472-
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholder": "筛选",
22473-
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholderAriaLabel": "筛选",
2247422468
"xpack.upgradeAssistant.checkupTab.deprecations.criticalActionTooltip": "请解决此问题后再升级。",
2247522469
"xpack.upgradeAssistant.checkupTab.deprecations.criticalLabel": "紧急",
2247622470
"xpack.upgradeAssistant.checkupTab.deprecations.documentationButtonLabel": "文档",
@@ -22480,9 +22474,6 @@
2248022474
"xpack.upgradeAssistant.checkupTab.deprecations.warningLabel": "警告",
2248122475
"xpack.upgradeAssistant.checkupTab.indicesBadgeLabel": "{numIndices, plural, other { 个索引}}",
2248222476
"xpack.upgradeAssistant.checkupTab.noDeprecationsLabel": "无弃用内容",
22483-
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail": "选中 {overviewTabButton} 以执行后续步骤。",
22484-
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail.overviewTabButtonLabel": "“概述”选项卡",
22485-
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesTitle": "全部清除！",
2248622477
"xpack.upgradeAssistant.checkupTab.numDeprecationsShownLabel": "显示 {numShown} 个，共 {total} 个",
2248722478
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "取消",
2248822479
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "关闭",

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,14 @@ export enum IndexGroup {
117117
// Telemetry types
118118
export const UPGRADE_ASSISTANT_TYPE = 'upgrade-assistant-telemetry';
119119
export const UPGRADE_ASSISTANT_DOC_ID = 'upgrade-assistant-telemetry';
120-
export type UIOpenOption = 'overview' | 'cluster' | 'indices';
120+
export type UIOpenOption = 'overview' | 'cluster' | 'indices' | 'kibana';
121121
export type UIReindexOption = 'close' | 'open' | 'start' | 'stop';
122122

123123
export interface UIOpen {
124124
overview: boolean;
125125
cluster: boolean;
126126
indices: boolean;
127+
kibana: boolean;
127128
}
128129

129130
export interface UIReindex {
@@ -138,6 +139,7 @@ export interface UpgradeAssistantTelemetrySavedObject {
138139
overview: number;
139140
cluster: number;
140141
indices: number;
142+
kibana: number;
141143
};
142144
ui_reindex: {
143145
close: number;
@@ -152,6 +154,7 @@ export interface UpgradeAssistantTelemetry {
152154
overview: number;
153155
cluster: number;
154156
indices: number;
157+
kibana: number;
155158
};
156159
ui_reindex: {
157160
close: number;

‎x-pack/plugins/upgrade_assistant/public/application/app.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { I18nStart, ScopedHistory } from 'src/core/public';
1111
import { AppContextProvider, ContextValue, useAppContext } from './app_context';
1212
import { ComingSoonPrompt } from './components/coming_soon_prompt';
1313
import { EsDeprecationsContent } from './components/es_deprecations';
14+
import { KibanaDeprecationsContent } from './components/kibana_deprecations';
1415
import { DeprecationsOverview } from './components/overview';
1516

1617
export interface AppDependencies extends ContextValue {
@@ -30,6 +31,7 @@ const App: React.FunctionComponent = () => {
3031
<Switch>
3132
<Route exact path="/overview" component={DeprecationsOverview} />
3233
<Route exact path="/es_deprecations/:tabName" component={EsDeprecationsContent} />
34+
<Route exact path="/kibana_deprecations" component={KibanaDeprecationsContent} />
3335
<Redirect from="/" to="/overview" />
3436
</Switch>
3537
);

‎x-pack/plugins/upgrade_assistant/public/application/app_context.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@
55
* 2.0.
66
*/
77

8-
import { CoreStart, DocLinksStart, HttpSetup, NotificationsStart } from 'src/core/public';
8+
import {
9+
CoreStart,
10+
DeprecationsServiceStart,
11+
DocLinksStart,
12+
HttpSetup,
13+
NotificationsStart,
14+
} from 'src/core/public';
915
import React, { createContext, useContext } from 'react';
1016
import { ApiService } from './lib/api';
1117
import { BreadcrumbService } from './lib/breadcrumbs';
@@ -26,6 +32,7 @@ export interface ContextValue {
2632
api: ApiService;
2733
breadcrumbs: BreadcrumbService;
2834
getUrlForApp: CoreStart['application']['getUrlForApp'];
35+
deprecations: DeprecationsServiceStart;
2936
}
3037

3138
export const AppContext = createContext<ContextValue>({} as any);

‎x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/constants.tsx‎ renamed to ‎x-pack/plugins/upgrade_assistant/public/application/components/constants.tsx‎

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

88
import { IconColor } from '@elastic/eui';
99
import { invert } from 'lodash';
10-
import { DeprecationInfo } from '../../../../common/types';
10+
import { DeprecationInfo } from '../../../common/types';
1111

1212
export const LEVEL_MAP: { [level: string]: number } = {
1313
warning: 0,
@@ -24,3 +24,5 @@ export const COLOR_MAP: { [level: string]: IconColor } = {
2424
warning: 'default',
2525
critical: 'danger',
2626
};
27+
28+
export const DEPRECATIONS_PER_PAGE = 25;

‎x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/controls.tsx‎

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

0 commit comments

Comments
 (0)