Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Upgrade Assistant] Support Kibana deprecations #97159

Merged
merged 25 commits into from
Apr 30, 2021
Merged

[Upgrade Assistant] Support Kibana deprecations #97159

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8fe94fb
add support for kibana deprecations
alisonelizabeth Apr 14, 2021
16ba626
design fixes
alisonelizabeth Apr 14, 2021
e68a6a0
fix build errors
alisonelizabeth Apr 14, 2021
98a8c30
update overview tests
alisonelizabeth Apr 14, 2021
a0376ea
add tests for kibana deprecations
alisonelizabeth Apr 15, 2021
ac3d921
Merge branch 'master' of https://github.com/elastic/kibana into ua/ki…
alisonelizabeth Apr 15, 2021
413deba
Merge branch 'master' of https://github.com/elastic/kibana into ua/ki…
alisonelizabeth Apr 20, 2021
373f815
Merge branch 'master' of https://github.com/elastic/kibana into ua/ki…
alisonelizabeth Apr 21, 2021
cbc289c
address design feedback
alisonelizabeth Apr 21, 2021
9755153
support for auto resolving kibana deprecations
alisonelizabeth Apr 22, 2021
edbc2a4
add test for error condition
alisonelizabeth Apr 22, 2021
480b6cd
TEMP commit: test Kibana API action
alisonelizabeth Apr 22, 2021
68cff12
Revert "TEMP commit: test Kibana API action"
alisonelizabeth Apr 22, 2021
b6f83b6
update a11y tests and fix issue
alisonelizabeth Apr 23, 2021
7a8291b
Merge branch 'master' of https://github.com/elastic/kibana into ua/ki…
alisonelizabeth Apr 23, 2021
9db7acf
Merge branch 'master' into ua/kibana_deprecations
kibanamachine Apr 26, 2021
67bd309
add descriptions to telemetry
alisonelizabeth Apr 26, 2021
0aa953e
update xpack_plugins.json
alisonelizabeth Apr 26, 2021
f3c9fe8
Merge branch 'master' of https://github.com/elastic/kibana into ua/ki…
alisonelizabeth Apr 27, 2021
0f227f9
address review feedback
alisonelizabeth Apr 27, 2021
138cd07
remove unnecessary code comment
alisonelizabeth Apr 27, 2021
52fe1fd
address review feedback
alisonelizabeth Apr 28, 2021
5ebb45a
fix telemetry
alisonelizabeth Apr 28, 2021
59412ce
update copy
alisonelizabeth Apr 28, 2021
38c7e61
Merge branch 'master' into ua/kibana_deprecations
kibanamachine Apr 29, 2021
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
26 changes: 22 additions & 4 deletions x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5314,7 +5314,10 @@
"deprecation_logging": {
"properties": {
"enabled": {
"type": "boolean"
"type": "boolean",
"_meta": {
"description": "Whether user has enabled Elasticsearch deprecation logging"
}
}
}
}
Expand All @@ -5323,13 +5326,28 @@
"ui_open": {
"properties": {
"cluster": {
"type": "long"
"type": "long",
"_meta": {
"description": "Number of times a user opened the Elasticsearch cluster deprecations page"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit: this is technically a tab, not a page. Might be more future-proof to generically say "a user viewed the list of Elasticsearch cluster deprecations." Same idea with the index deprecations, below.

}
},
"indices": {
"type": "long"
"type": "long",
"_meta": {
"description": "Number of times a user opened the Elasticsearch index deprecations page"
}
},
"overview": {
"type": "long"
"type": "long",
"_meta": {
"description": "Number of times a user opened the overview page"
}
},
"kibana": {
"type": "long",
"_meta": {
"description": "Number of times a user opened the Kibana deprecations page"
}
}
}
},
Expand Down
9 changes: 0 additions & 9 deletions x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22304,15 +22304,9 @@
"xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "無効なフォーマット。例：{exampleUrl}",
"xpack.upgradeAssistant.appTitle": "{version} アップグレードアシスタント",
"xpack.upgradeAssistant.checkupTab.changeFiltersShowMoreLabel": "より多く表示させるにはフィルターを変更します。",
"xpack.upgradeAssistant.checkupTab.controls.collapseAllButtonLabel": "すべて縮小",
"xpack.upgradeAssistant.checkupTab.controls.expandAllButtonLabel": "すべて拡張",
"xpack.upgradeAssistant.checkupTab.controls.filterBar.criticalButtonLabel": "致命的",
"xpack.upgradeAssistant.checkupTab.controls.filterErrorMessageLabel": "フィルター無効：{searchTermError}",
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel": "インデックス別",
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel": "問題別",
"xpack.upgradeAssistant.checkupTab.controls.refreshButtonLabel": "更新",
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholder": "フィルター",
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholderAriaLabel": "フィルター",
"xpack.upgradeAssistant.checkupTab.deprecations.criticalActionTooltip": "アップグレード前にこの問題を解決してください。",
"xpack.upgradeAssistant.checkupTab.deprecations.criticalLabel": "致命的",
"xpack.upgradeAssistant.checkupTab.deprecations.documentationButtonLabel": "ドキュメント",
Expand All @@ -22321,9 +22315,6 @@
"xpack.upgradeAssistant.checkupTab.deprecations.warningActionTooltip": "アップグレード前にこの問題を解決することをお勧めしますが、必須ではありません。",
"xpack.upgradeAssistant.checkupTab.deprecations.warningLabel": "警告",
"xpack.upgradeAssistant.checkupTab.noDeprecationsLabel": "説明がありません",
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail": "{overviewTabButton} で次のステップを確認してください。",
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail.overviewTabButtonLabel": "概要タブ",
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesTitle": "完璧です！",
"xpack.upgradeAssistant.checkupTab.numDeprecationsShownLabel": "{total} 件中 {numShown} 件を表示中",
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "キャンセル",
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "閉じる",
Expand Down
9 changes: 0 additions & 9 deletions x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22660,15 +22660,9 @@
"xpack.uiActionsEnhanced.drilldowns.urlDrilldownValidation.urlFormatGeneralErrorMessage": "格式无效。例如：{exampleUrl}",
"xpack.upgradeAssistant.appTitle": "{version} 升级助手",
"xpack.upgradeAssistant.checkupTab.changeFiltersShowMoreLabel": "更改筛选以显示更多内容。",
"xpack.upgradeAssistant.checkupTab.controls.collapseAllButtonLabel": "折叠全部",
"xpack.upgradeAssistant.checkupTab.controls.expandAllButtonLabel": "展开全部",
"xpack.upgradeAssistant.checkupTab.controls.filterBar.criticalButtonLabel": "紧急",
"xpack.upgradeAssistant.checkupTab.controls.filterErrorMessageLabel": "筛选无效：{searchTermError}",
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIndexLabel": "按索引",
"xpack.upgradeAssistant.checkupTab.controls.groupByBar.byIssueLabel": "按问题",
"xpack.upgradeAssistant.checkupTab.controls.refreshButtonLabel": "刷新",
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholder": "筛选",
"xpack.upgradeAssistant.checkupTab.controls.searchBarPlaceholderAriaLabel": "筛选",
"xpack.upgradeAssistant.checkupTab.deprecations.criticalActionTooltip": "请解决此问题后再升级。",
"xpack.upgradeAssistant.checkupTab.deprecations.criticalLabel": "紧急",
"xpack.upgradeAssistant.checkupTab.deprecations.documentationButtonLabel": "文档",
Expand All @@ -22678,9 +22672,6 @@
"xpack.upgradeAssistant.checkupTab.deprecations.warningLabel": "警告",
"xpack.upgradeAssistant.checkupTab.indicesBadgeLabel": "{numIndices, plural, other { 个索引}}",
"xpack.upgradeAssistant.checkupTab.noDeprecationsLabel": "无弃用内容",
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail": "选中 {overviewTabButton} 以执行后续步骤。",
"xpack.upgradeAssistant.checkupTab.noIssues.nextStepsDetail.overviewTabButtonLabel": "“概述”选项卡",
"xpack.upgradeAssistant.checkupTab.noIssues.noIssuesTitle": "全部清除！",
"xpack.upgradeAssistant.checkupTab.numDeprecationsShownLabel": "显示 {numShown} 个，共 {total} 个",
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.cancelButtonLabel": "取消",
"xpack.upgradeAssistant.checkupTab.reindexing.flyout.checklistStep.closeButtonLabel": "关闭",
Expand Down
5 changes: 4 additions & 1 deletion x-pack/plugins/upgrade_assistant/common/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,14 @@ export enum IndexGroup {
// Telemetry types
export const UPGRADE_ASSISTANT_TYPE = 'upgrade-assistant-telemetry';
export const UPGRADE_ASSISTANT_DOC_ID = 'upgrade-assistant-telemetry';
export type UIOpenOption = 'overview' | 'cluster' | 'indices';
export type UIOpenOption = 'overview' | 'cluster' | 'indices' | 'kibana';
export type UIReindexOption = 'close' | 'open' | 'start' | 'stop';

export interface UIOpen {
overview: boolean;
cluster: boolean;
indices: boolean;
kibana: boolean;
}

export interface UIReindex {
Expand All @@ -138,6 +139,7 @@ export interface UpgradeAssistantTelemetrySavedObject {
overview: number;
cluster: number;
indices: number;
kibana: number;
};
ui_reindex: {
close: number;
Expand All @@ -152,6 +154,7 @@ export interface UpgradeAssistantTelemetry {
overview: number;
cluster: number;
indices: number;
kibana: number;
};
ui_reindex: {
close: number;
Expand Down
2 changes: 2 additions & 0 deletions x-pack/plugins/upgrade_assistant/public/application/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { I18nStart, ScopedHistory } from 'src/core/public';
import { AppContextProvider, ContextValue, useAppContext } from './app_context';
import { ComingSoonPrompt } from './components/coming_soon_prompt';
import { EsDeprecationsContent } from './components/es_deprecations';
import { KibanaDeprecationsContent } from './components/kibana_deprecations';
import { DeprecationsOverview } from './components/overview';

export interface AppDependencies extends ContextValue {
Expand All @@ -30,6 +31,7 @@ const App: React.FunctionComponent = () => {
<Switch>
<Route exact path="/overview" component={DeprecationsOverview} />
<Route exact path="/es_deprecations/:tabName" component={EsDeprecationsContent} />
<Route exact path="/kibana_deprecations" component={KibanaDeprecationsContent} />
<Redirect from="/" to="/overview" />
</Switch>
);
Expand Down
9 changes: 8 additions & 1 deletion x-pack/plugins/upgrade_assistant/public/application/app_context.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
* 2.0.
*/

import { CoreStart, DocLinksStart, HttpSetup, NotificationsStart } from 'src/core/public';
import {
CoreStart,
DeprecationsServiceStart,
DocLinksStart,
HttpSetup,
NotificationsStart,
} from 'src/core/public';
import React, { createContext, useContext } from 'react';
import { ApiService } from './lib/api';
import { BreadcrumbService } from './lib/breadcrumbs';
Expand All @@ -26,6 +32,7 @@ export interface ContextValue {
api: ApiService;
breadcrumbs: BreadcrumbService;
getUrlForApp: CoreStart['application']['getUrlForApp'];
deprecations: DeprecationsServiceStart;
}

export const AppContext = createContext<ContextValue>({} as any);
Expand Down
4 changes: 3 additions & 1 deletion .../components/es_deprecations/constants.tsx → ...blic/application/components/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { IconColor } from '@elastic/eui';
import { invert } from 'lodash';
import { DeprecationInfo } from '../../../../common/types';
import { DeprecationInfo } from '../../../common/types';

export const LEVEL_MAP: { [level: string]: number } = {
warning: 0,
Expand All @@ -24,3 +24,5 @@ export const COLOR_MAP: { [level: string]: IconColor } = {
warning: 'default',
critical: 'danger',
};

export const DEPRECATIONS_PER_PAGE = 25;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe its worth allowing the user to change this number?

Copy link
Contributor Author

@alisonelizabeth alisonelizabeth Apr 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a great point. This was the behavior from the old implementation (for showing ES deprecations). I think I'd prefer to address this in a separate PR, but agree it would be better to not hard code this.

108 changes: 0 additions & 108 deletions x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/controls.tsx
View file
Open in desktop

This file was deleted.

Loading